From 67a7abb5ca80c44d0a2292f25963c0b47d6b4849 Mon Sep 17 00:00:00 2001
From: songxiaopeng <1393756821@qq.com>
Date: Thu, 7 Mar 2024 10:28:40 +0800
Subject: [PATCH] =?UTF-8?q?fix:=E6=95=B0=E6=8D=AE=E5=BA=93=E8=BF=9E?=
 =?UTF-8?q?=E6=8E=A5=E9=97=AE=E9=A2=98=E3=80=81opc=E8=BF=9E=E6=8E=A5?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 acs/nladmin-system/pom.xml                    | 37 +++++++++++--------
 .../resources/config/application-prod.yml     |  2 +-
 .../service/dao/DeviceConditionVo.java        | 15 --------
 3 files changed, 22 insertions(+), 32 deletions(-)
 delete mode 100644 lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/cockpit/service/dao/DeviceConditionVo.java

diff --git a/acs/nladmin-system/pom.xml b/acs/nladmin-system/pom.xml
index fe40fdb..2d19689 100644
--- a/acs/nladmin-system/pom.xml
+++ b/acs/nladmin-system/pom.xml
@@ -73,6 +73,11 @@
                 </exclusion>
             </exclusions>
         </dependency>
+        <dependency>
+            <groupId>org.bouncycastle</groupId>
+            <artifactId>bcprov-jdk15on</artifactId>
+            <version>1.50</version>
+        </dependency>
         <dependency>
             <groupId>com.squareup.okhttp3</groupId>
             <artifactId>okhttp</artifactId>
@@ -425,22 +430,22 @@
         </dependency>
     </dependencies>
 
-    <distributionManagement>
-        <!--正式版本-->
-        <repository>
-            <!-- nexus服务器中用户名：在settings.xml中<server>的id-->
-            <id>nexus</id>
-            <!-- 这个名称自己定义 -->
-            <name>nexus</name>
-            <url>http://121.40.234.130:8081/repository/maven-releases/</url>
-        </repository>
-        <!--快照
-        <snapshotRepository>
-            <id>nexus-snapshots</id>
-            <name>Snapshots repository</name>
-            <url>http://192.168.1.105/repository/yang/</url>
-        </snapshotRepository>-->
-    </distributionManagement>
+<!--    <distributionManagement>-->
+<!--        &lt;!&ndash;正式版本&ndash;&gt;-->
+<!--        <repository>-->
+<!--            &lt;!&ndash; nexus服务器中用户名：在settings.xml中<server>的id&ndash;&gt;-->
+<!--            <id>nexus</id>-->
+<!--            &lt;!&ndash; 这个名称自己定义 &ndash;&gt;-->
+<!--            <name>nexus</name>-->
+<!--            <url>http://121.40.234.130:8081/repository/maven-releases/</url>-->
+<!--        </repository>-->
+<!--        &lt;!&ndash;快照-->
+<!--        <snapshotRepository>-->
+<!--            <id>nexus-snapshots</id>-->
+<!--            <name>Snapshots repository</name>-->
+<!--            <url>http://192.168.1.105/repository/yang/</url>-->
+<!--        </snapshotRepository>&ndash;&gt;-->
+<!--    </distributionManagement>-->
 
     <!-- 打包 -->
     <build>
diff --git a/acs/nladmin-system/src/main/resources/config/application-prod.yml b/acs/nladmin-system/src/main/resources/config/application-prod.yml
index 11e8128..2ffea4b 100644
--- a/acs/nladmin-system/src/main/resources/config/application-prod.yml
+++ b/acs/nladmin-system/src/main/resources/config/application-prod.yml
@@ -7,7 +7,7 @@ spring:
       db-type: com.alibaba.druid.pool.DruidDataSource
       driverClassName: net.sf.log4jdbc.sql.jdbcapi.DriverSpy
       #      url: jdbc:log4jdbc:mysql://${DB_HOST:10.93.41.198}:${DB_PORT:3306}/${DB_NAME:rl_mg_acs}?serverTimezone=Asia/Shanghai&characterEncoding=utf8&useSSL=false&useOldAliasMetadataBehavior=true
-      url: jdbc:log4jdbc:mysql://${DB_HOST:127.0.0.1}:${DB_PORT:3306}/${DB_NAME:rl_mg_acs}?serverTimezone=Asia/Shanghai&characterEncoding=utf8&useSSL=false&useOldAliasMetadataBehavior=true
+      url: jdbc:log4jdbc:mysql://${DB_HOST:127.0.0.1}:${DB_PORT:3306}/${DB_NAME:rl_mg_acs}?serverTimezone=Asia/Shanghai&characterEncoding=utf8&useSSL=false&useOldAliasMetadataBehavior=true&allowPublicKeyRetrieval=true
       username: ${DB_USER:root}
       password: ${DB_PWD:123456}
       # 初始连接数
diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/cockpit/service/dao/DeviceConditionVo.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/cockpit/service/dao/DeviceConditionVo.java
deleted file mode 100644
index 2ed9d79..0000000
--- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/cockpit/service/dao/DeviceConditionVo.java
+++ /dev/null
@@ -1,15 +0,0 @@
-package org.nl.wms.cockpit.service.dao;
-
-import lombok.Data;
-
-/**
- * @author Administrator
- */
-@Data
-public class DeviceConditionVo {
-    private String deviceName;
-    private Integer failure;
-    private Integer shutdown;
-    private Integer standby;
-    private Integer running;
-}