From 2fa7a5424794a3aa58a1c1c464b5a79cda7739fe Mon Sep 17 00:00:00 2001
From: LENOVO <1793460677@qq.com>
Date: Mon, 18 Mar 2024 10:59:44 +0800
Subject: [PATCH] =?UTF-8?q?add:=20=E8=A1=8C=E6=9E=B6=E7=BC=93=E5=AD=98?=
 =?UTF-8?q?=E4=B8=BA=E9=A1=B5=E9=9D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/resources/config/application-dev.yml          | 7 ++++---
 acs2/nladmin-ui/src/views/acs/device/config.vue            | 4 +++-
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/acs2/nladmin-system/nlsso-server/src/main/resources/config/application-dev.yml b/acs2/nladmin-system/nlsso-server/src/main/resources/config/application-dev.yml
index ae420fba8..e6a974ebe 100644
--- a/acs2/nladmin-system/nlsso-server/src/main/resources/config/application-dev.yml
+++ b/acs2/nladmin-system/nlsso-server/src/main/resources/config/application-dev.yml
@@ -9,11 +9,12 @@ spring:
       db-type: com.alibaba.druid.pool.DruidDataSource
       driverClassName: net.sf.log4jdbc.sql.jdbcapi.DriverSpy
 #      url: jdbc:log4jdbc:mysql://${DB_HOST:192.168.81.252}:${DB_PORT:3306}/${DB_NAME:stand_acs}?serverTimezone=Asia/Shanghai&characterEncoding=utf8&useSSL=false&useOldAliasMetadataBehavior=true
-      url: jdbc:log4jdbc:mysql://${DB_HOST:47.111.78.178}:${DB_PORT:3306}/${DB_NAME:lzhl_two_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:lzhl_two_acs}?serverTimezone=Asia/Shanghai&characterEncoding=utf8&useSSL=false&useOldAliasMetadataBehavior=true
+#      url: jdbc:log4jdbc:mysql://${DB_HOST:47.111.78.178}:${DB_PORT:3306}/${DB_NAME:lzhl_two_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:lzhl_two_acs}?serverTimezone=Asia/Shanghai&characterEncoding=utf8&useSSL=false&useOldAliasMetadataBehavior=true&allowPublicKeyRetrieval=true
+
       username: ${DB_USER:root}
 #      password: ${DB_PWD:Root.123456}
-      password: ${DB_PWD:p@ssw0rd}
+      password: ${DB_PWD:123456}
       # 初始连接数
       initial-size: 5
       # 最小连接数
diff --git a/acs2/nladmin-ui/src/views/acs/device/config.vue b/acs2/nladmin-ui/src/views/acs/device/config.vue
index 4ee8ce4ef..2eb9742a6 100644
--- a/acs2/nladmin-ui/src/views/acs/device/config.vue
+++ b/acs2/nladmin-ui/src/views/acs/device/config.vue
@@ -125,6 +125,7 @@ import return_good_manipulator from '@/views/acs/device/driver/one_manipulator/r
 import volume_two_manipulator from '@/views/acs/device/driver/one_manipulator/volume_two_manipulator.vue'
 import box_storage_out_conveyor from '@/views/acs/device/driver/one_conveyor/box_storage_out_conveyor.vue'
 import box_subvolumes_conveyor from '@/views/acs/device/driver/one_conveyor/box_subvolumes_conveyor.vue'
+import manipulator_cache from '@/views/acs/device/driver/one_conveyor/manipulator_cache.vue'
 import finished_product_out_with_bind_lable_conveyor from '@/views/acs/device/driver/one_conveyor/finished_product_out_with_bind_lable_conveyor.vue'
 import fold_disc_site from '@/views/acs/device/driver/one_conveyor/fold_disc_site.vue'
 import scanner_weight_conveyor from '@/views/acs/device/driver/one_conveyor/scanner_weight_conveyor.vue'
@@ -188,7 +189,8 @@ export default {
     xg_agv_car,
     oven_inspect_site,
     manipulator_agv_station,
-    volume_two_manipulator
+    volume_two_manipulator,
+    manipulator_cache
   },
   dicts: ['device_type'],
   mixins: [crud],