Browse Source

提交

mine
袁强 5 months ago
parent
commit
2eaffac48d
  1. 8
      pom.xml
  2. 3
      yq-common/pom.xml
  3. 4
      yq-common/src/main/java/yq/common/utils/EzvizUtil.java
  4. 4
      yq-common/src/main/java/yq/common/utils/html/EscapeUtil.java
  5. 0
      yq-common/src/main/resources/libs/arcsoft-sdk-face-3.0.0.0.jar
  6. 2
      yq-system/pom.xml

8
pom.xml

@ -5,10 +5,10 @@
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<groupId>yq</groupId> <groupId>yq</groupId>
<artifactId>yq</artifactId> <artifactId>yq_0bject_detection</artifactId>
<version>3.8.6</version> <version>3.8.6</version>
<name>yq</name> <name>yq_0bject_detection</name>
<url>http://www.ruoyi.vip</url> <url>http://www.ruoyi.vip</url>
<description>人体适岗性一体化检测系统</description> <description>人体适岗性一体化检测系统</description>
@ -16,7 +16,7 @@
<yq.version>3.8.6</yq.version> <yq.version>3.8.6</yq.version>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding> <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
<java.version>1.8</java.version> <java.version>11</java.version>
<maven-jar-plugin.version>3.1.1</maven-jar-plugin.version> <maven-jar-plugin.version>3.1.1</maven-jar-plugin.version>
<druid.version>1.2.16</druid.version> <druid.version>1.2.16</druid.version>
<bitwalker.version>1.21</bitwalker.version> <bitwalker.version>1.21</bitwalker.version>
@ -195,6 +195,8 @@
<encoding>${project.build.sourceEncoding}</encoding> <encoding>${project.build.sourceEncoding}</encoding>
</configuration> </configuration>
</plugin> </plugin>
</plugins> </plugins>
</build> </build>

3
yq-common/pom.xml

@ -164,8 +164,6 @@
<groupId>com.arcsoft.face</groupId> <groupId>com.arcsoft.face</groupId>
<artifactId>arcsoft-sdk-face</artifactId> <artifactId>arcsoft-sdk-face</artifactId>
<version>3.0.0.0</version> <version>3.0.0.0</version>
<scope>system</scope>
<systemPath>${basedir}/libs/arcsoft-sdk-face-3.0.0.0.jar</systemPath>
</dependency> </dependency>
</dependencies> </dependencies>
<build> <build>
@ -177,6 +175,7 @@
<!-- 加入下面这一行 --> <!-- 加入下面这一行 -->
<includeSystemScope>true</includeSystemScope> <includeSystemScope>true</includeSystemScope>
</configuration> </configuration>
</plugin> </plugin>
</plugins> </plugins>
</build> </build>

4
yq-common/src/main/java/yq/common/utils/EzvizUtil.java

@ -89,9 +89,9 @@ public class EzvizUtil {
return liveUrl; return liveUrl;
} }
public static void main(String[] args) { /* public static void main(String[] args) {
System.out.println(getLiveAddress("F51723886",4)); System.out.println(getLiveAddress("F51723886",4));
} }*/
public static JSONObject getLiveAddress(String deviceSerial, Map<String,Object> params) { public static JSONObject getLiveAddress(String deviceSerial, Map<String,Object> params) {
String url = "https://open.ys7.com/api/lapp/v2/live/address/get"; String url = "https://open.ys7.com/api/lapp/v2/live/address/get";
String accessToken = getAccessToken(); String accessToken = getAccessToken();

4
yq-common/src/main/java/yq/common/utils/html/EscapeUtil.java

@ -153,7 +153,7 @@ public class EscapeUtil
return tmp.toString(); return tmp.toString();
} }
public static void main(String[] args) /* public static void main(String[] args)
{ {
String html = "<script>alert(1);</script>"; String html = "<script>alert(1);</script>";
String escape = EscapeUtil.escape(html); String escape = EscapeUtil.escape(html);
@ -163,5 +163,5 @@ public class EscapeUtil
System.out.println("clean: " + EscapeUtil.clean(html)); System.out.println("clean: " + EscapeUtil.clean(html));
System.out.println("escape: " + escape); System.out.println("escape: " + escape);
System.out.println("unescape: " + EscapeUtil.unescape(escape)); System.out.println("unescape: " + EscapeUtil.unescape(escape));
} }*/
} }

0
yq-common/libs/arcsoft-sdk-face-3.0.0.0.jar → yq-common/src/main/resources/libs/arcsoft-sdk-face-3.0.0.0.jar

2
yq-system/pom.xml

@ -3,8 +3,8 @@
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<parent> <parent>
<artifactId>yq</artifactId>
<groupId>yq</groupId> <groupId>yq</groupId>
<artifactId>yq_0bject_detection</artifactId>
<version>3.8.6</version> <version>3.8.6</version>
</parent> </parent>
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>

Loading…
Cancel
Save