From 9bb61a70ab78aeb414fd44a50c1ae7932e6d7d93 Mon Sep 17 00:00:00 2001 From: mk1990 <153958232@qq.com> Date: 星期三, 22 六月 2022 14:26:46 +0800 Subject: [PATCH] 添加国标级联录像控制功能 --- pom.xml | 135 +++++++++++++++++++++++++++++++++----------- 1 files changed, 101 insertions(+), 34 deletions(-) diff --git a/pom.xml b/pom.xml index 20bf6d8..1209124 100644 --- a/pom.xml +++ b/pom.xml @@ -10,9 +10,10 @@ </parent> <groupId>com.genersoft</groupId> - <artifactId>wvp-gb28181</artifactId> - <version>2.0.0</version> + <artifactId>wvp-pro</artifactId> + <version>2.3.1</version> <name>web video platform</name> + <description>鍥芥爣28181瑙嗛骞冲彴</description> <repositories> <repository> @@ -44,11 +45,11 @@ <properties> <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> - <maven.build.timestamp.format>yyyyMMddHHmmss</maven.build.timestamp.format> + <maven.build.timestamp.format>MMddHHmm</maven.build.timestamp.format> <maven-jar-plugin.version>3.1.1</maven-jar-plugin.version> + <jedis-version>3.1.0</jedis-version> <!-- 渚濊禆鐗堟湰 --> - <pagehelper.version>5.2.0</pagehelper.version> <snippetsDirectory>${project.build.directory}/generated-snippets</snippetsDirectory> <asciidoctor.input.directory>${project.basedir}/docs/asciidoc</asciidoctor.input.directory> <generated.asciidoc.directory>${project.build.directory}/asciidoc</generated.asciidoc.directory> @@ -66,6 +67,11 @@ <artifactId>spring-boot-starter-web</artifactId> </dependency> <dependency> + <groupId>org.springframework.boot</groupId> + <artifactId>spring-boot-configuration-processor</artifactId> + <optional>true</optional> + </dependency> + <dependency> <groupId>org.mybatis.spring.boot</groupId> <artifactId>mybatis-spring-boot-starter</artifactId> <version>2.1.4</version> @@ -75,11 +81,17 @@ <artifactId>spring-boot-starter-security</artifactId> </dependency> + <dependency> + <groupId>redis.clients</groupId> + <artifactId>jedis</artifactId> + <version>${jedis-version}</version> + </dependency> + <!-- druid鏁版嵁搴撹繛鎺ユ睜 --> <dependency> <groupId>com.alibaba</groupId> - <artifactId>druid</artifactId> - <version>1.2.3</version> + <artifactId>druid-spring-boot-starter</artifactId> + <version>1.1.22</version> </dependency> <!-- mysql鏁版嵁搴� --> @@ -89,18 +101,11 @@ <version>8.0.22</version> </dependency> - <!-- 娣诲姞sqlite-jdbc鏁版嵁搴撻┍鍔� --> - <dependency> - <groupId>org.xerial</groupId> - <artifactId>sqlite-jdbc</artifactId> - <version>3.32.3.2</version> - </dependency> - <!--Mybatis鍒嗛〉鎻掍欢 --> <dependency> <groupId>com.github.pagehelper</groupId> <artifactId>pagehelper-spring-boot-starter</artifactId> - <version>1.2.10</version> + <version>1.4.1</version> </dependency> <!--Swagger3 --> @@ -136,10 +141,11 @@ <version>1.3.0-91</version> </dependency> + <!-- 鍙栦唬log4j --> <dependency> - <groupId>log4j</groupId> - <artifactId>log4j</artifactId> - <version>1.2.17</version> + <groupId>org.slf4j</groupId> + <artifactId>log4j-over-slf4j</artifactId> + <version>1.7.35</version> </dependency> <!-- xml瑙f瀽搴� --> @@ -149,19 +155,13 @@ <version>2.1.3</version> </dependency> - <!-- https://mvnrepository.com/artifact/com.alibaba/fastjson --> + <!-- json瑙f瀽搴揻astjson --> <dependency> <groupId>com.alibaba</groupId> <artifactId>fastjson</artifactId> - <version>1.2.73</version> + <version>1.2.83</version> </dependency> - <!--Guava鏄竴绉嶅熀浜庡紑婧愮殑Java搴�--> - <dependency> - <groupId>com.google.guava</groupId> - <artifactId>guava</artifactId> - <version>30.0-jre</version> - </dependency> <!-- okhttp --> <dependency> @@ -170,11 +170,20 @@ <version>4.9.0</version> </dependency> + <!-- okhttp 璋冭瘯鏃ュ織 --> + <dependency> + <groupId>com.squareup.okhttp3</groupId> + <artifactId>logging-interceptor</artifactId> + <version>4.9.0</version> + </dependency> + + + <!-- okhttp-digest --> <dependency> - <groupId>com.burgstaller</groupId> + <groupId>io.github.rburgst</groupId> <artifactId>okhttp-digest</artifactId> - <version>2.1</version> + <version>2.5</version> </dependency> <!-- https://mvnrepository.com/artifact/net.sf.kxml/kxml2 --> @@ -191,24 +200,57 @@ <version>1.12</version> </dependency> - <!-- onvif鍗忚鏍� --> + <!--excel瑙f瀽搴�--> <dependency> - <groupId>be.teletask</groupId> - <artifactId>onvif-java</artifactId> - <version>1.0.2</version> - <scope>system</scope> - <systemPath>${project.basedir}/libs/onvif-java-1.0.2.jar</systemPath> + <groupId>com.alibaba</groupId> + <artifactId>easyexcel</artifactId> + <version>3.0.4</version> + </dependency> + + <!-- 鑾峰彇绯荤粺淇℃伅 --> + <dependency> + <groupId>com.github.oshi</groupId> + <artifactId>oshi-core</artifactId> + <version>6.1.0</version> + </dependency> + + <dependency> + <groupId>org.springframework.session</groupId> + <artifactId>spring-session-core</artifactId> + </dependency> + +<!-- <!– 妫�娴嬫枃浠剁紪鐮� –>--> +<!-- <!– https://mvnrepository.com/artifact/cpdetector/cpdetector –>--> +<!-- <dependency>--> +<!-- <groupId>cpdetector</groupId>--> +<!-- <artifactId>cpdetector</artifactId>--> +<!-- <version>1.0.8</version>--> +<!-- </dependency>--> + + <!-- https://mvnrepository.com/artifact/com.google.guava/guava --> + <dependency> + <groupId>com.google.guava</groupId> + <artifactId>guava</artifactId> + <version>31.0.1-jre</version> + </dependency> + + + <dependency> + <groupId>org.springframework.boot</groupId> + <artifactId>spring-boot-starter-test</artifactId> +<!-- <scope>test</scope>--> </dependency> </dependencies> - + <build> <finalName>${project.artifactId}-${project.version}-${maven.build.timestamp}</finalName> <plugins> <plugin> <groupId>org.springframework.boot</groupId> <artifactId>spring-boot-maven-plugin</artifactId> + <version>2.3.5.RELEASE</version> <configuration> <includeSystemScope>true</includeSystemScope> </configuration> @@ -216,6 +258,7 @@ <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-compiler-plugin</artifactId> + <version>3.8.1</version> <configuration> <source>1.8</source> <target>1.8</target> @@ -223,10 +266,34 @@ </plugin> <plugin> + <groupId>pl.project13.maven</groupId> + <artifactId>git-commit-id-plugin</artifactId> + <version>3.0.1</version> + <configuration> + <offline>true</offline> + </configuration> + </plugin> + + <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-surefire-plugin</artifactId> + <version>2.22.2</version> + <configuration> + <skipTests>true</skipTests> + </configuration> </plugin> </plugins> + <resources> + <resource> + <directory>src/main/resources</directory> + </resource> + <resource> + <directory>src/main/java</directory> + <includes> + <include>**/*.xml</include> + </includes> + </resource> + </resources> </build> </project> -- Gitblit v1.8.0