From 2eaffac48dd2a78c83e9c9559bddaf50bec11a35 Mon Sep 17 00:00:00 2001
From: yq183 <645046984@qq.com>
Date: Fri, 24 Jan 2025 11:24:59 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8F=90=E4=BA=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pom.xml                                             |   8 +++++---
 yq-common/pom.xml                                   |   3 +--
 .../src/main/java/yq/common/utils/EzvizUtil.java    |   4 ++--
 .../main/java/yq/common/utils/html/EscapeUtil.java  |   4 ++--
 .../resources}/libs/arcsoft-sdk-face-3.0.0.0.jar    | Bin
 yq-system/pom.xml                                   |   2 +-
 6 files changed, 11 insertions(+), 10 deletions(-)
 rename yq-common/{ => src/main/resources}/libs/arcsoft-sdk-face-3.0.0.0.jar (100%)

diff --git a/pom.xml b/pom.xml
index da3686a..4b27c63 100644
--- a/pom.xml
+++ b/pom.xml
@@ -5,10 +5,10 @@
 	<modelVersion>4.0.0</modelVersion>
 	
     <groupId>yq</groupId>
-    <artifactId>yq</artifactId>
+    <artifactId>yq_0bject_detection</artifactId>
     <version>3.8.6</version>
 
-    <name>yq</name>
+    <name>yq_0bject_detection</name>
     <url>http://www.ruoyi.vip</url>
     <description>人体适岗性一体化检测系统</description>
     
@@ -16,7 +16,7 @@
         <yq.version>3.8.6</yq.version>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <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>
         <druid.version>1.2.16</druid.version>
         <bitwalker.version>1.21</bitwalker.version>
@@ -195,6 +195,8 @@
                     <encoding>${project.build.sourceEncoding}</encoding>
                 </configuration>
             </plugin>
+
+
         </plugins>
     </build>
 
diff --git a/yq-common/pom.xml b/yq-common/pom.xml
index 27d37dd..9e93162 100644
--- a/yq-common/pom.xml
+++ b/yq-common/pom.xml
@@ -164,8 +164,6 @@
             <groupId>com.arcsoft.face</groupId>
             <artifactId>arcsoft-sdk-face</artifactId>
             <version>3.0.0.0</version>
-            <scope>system</scope>
-            <systemPath>${basedir}/libs/arcsoft-sdk-face-3.0.0.0.jar</systemPath>
         </dependency>
     </dependencies>
     <build>
@@ -177,6 +175,7 @@
                     <!-- 加入下面这一行 -->
                     <includeSystemScope>true</includeSystemScope>
                 </configuration>
+
             </plugin>
         </plugins>
     </build>
diff --git a/yq-common/src/main/java/yq/common/utils/EzvizUtil.java b/yq-common/src/main/java/yq/common/utils/EzvizUtil.java
index 5051855..fdd3986 100644
--- a/yq-common/src/main/java/yq/common/utils/EzvizUtil.java
+++ b/yq-common/src/main/java/yq/common/utils/EzvizUtil.java
@@ -89,9 +89,9 @@ public class EzvizUtil {
         return liveUrl;
     }
 
-    public static void main(String[] args) {
+/*    public static void main(String[] args) {
         System.out.println(getLiveAddress("F51723886",4));
-    }
+    }*/
     public static JSONObject getLiveAddress(String deviceSerial, Map<String,Object> params) {
         String url = "https://open.ys7.com/api/lapp/v2/live/address/get";
         String accessToken = getAccessToken();
diff --git a/yq-common/src/main/java/yq/common/utils/html/EscapeUtil.java b/yq-common/src/main/java/yq/common/utils/html/EscapeUtil.java
index fbb32b9..707b35e 100644
--- a/yq-common/src/main/java/yq/common/utils/html/EscapeUtil.java
+++ b/yq-common/src/main/java/yq/common/utils/html/EscapeUtil.java
@@ -153,7 +153,7 @@ public class EscapeUtil
         return tmp.toString();
     }
 
-    public static void main(String[] args)
+  /*  public static void main(String[] args)
     {
         String html = "<script>alert(1);</script>";
         String escape = EscapeUtil.escape(html);
@@ -163,5 +163,5 @@ public class EscapeUtil
         System.out.println("clean: " + EscapeUtil.clean(html));
         System.out.println("escape: " + escape);
         System.out.println("unescape: " + EscapeUtil.unescape(escape));
-    }
+    }*/
 }
diff --git a/yq-common/libs/arcsoft-sdk-face-3.0.0.0.jar b/yq-common/src/main/resources/libs/arcsoft-sdk-face-3.0.0.0.jar
similarity index 100%
rename from yq-common/libs/arcsoft-sdk-face-3.0.0.0.jar
rename to yq-common/src/main/resources/libs/arcsoft-sdk-face-3.0.0.0.jar
diff --git a/yq-system/pom.xml b/yq-system/pom.xml
index ebda188..cf9ae7b 100644
--- a/yq-system/pom.xml
+++ b/yq-system/pom.xml
@@ -3,8 +3,8 @@
          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">
     <parent>
-        <artifactId>yq</artifactId>
         <groupId>yq</groupId>
+        <artifactId>yq_0bject_detection</artifactId>
         <version>3.8.6</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>