配置文件更新

acs/hd/nladmin-system/src/main/java/org/nl/acs/device_driver/lnsh/rljn_package_palletSplit_manipulator/RljnPackagePalletSplitManipulatorDeviceDriver.java

@@ -352,6 +352,7 @@ public class RljnPackagePalletSplitManipulatorDeviceDriver extends AbstractOpcDe
 
             if (mode != last_mode) {
                 this.setRequireSucess(false);
+                this.setResultSucess(false);
                 logServer.deviceItemValue(this.device_code,"mode" ,String.valueOf(mode));
                 logServer.deviceExecuteLog(this.device_code,"","","信号mode：" + last_mode + "->" + mode);
             }
@@ -1133,7 +1134,7 @@ public class RljnPackagePalletSplitManipulatorDeviceDriver extends AbstractOpcDe
             String demosub = linkobj.substring(1,linkobj.length()-1);
             String demoArray[] = demosub.split(",");
             List<String> demoList = Arrays.asList(demoArray);
-            json.put("device_code",demoList.get(getStation-1).replace("\"",""));
+            json.put("device_code",demoList.get(put_station-1).replace("\"",""));
             json.put("vehicle_code",barcode);
             HttpResponse result = acsToWmsService.queryCribbingInfo(json);
 

acs/hd/nladmin-system/src/main/resources/config/application-prod.yml

@@ -8,8 +8,11 @@ spring:
     druid:
       db-type: com.alibaba.druid.pool.DruidDataSource
       driverClassName: net.sf.log4jdbc.sql.jdbcapi.DriverSpy
-      url: jdbc:log4jdbc:mysql://${DB_HOST:127.0.0.1}:${DB_PORT:3306}/${DB_NAME:ch_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:jn_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:rljn_acs}?serverTimezone=Asia/Shanghai&characterEncoding=utf8&useSSL=false&useOldAliasMetadataBehavior=true
       username: ${DB_USER:root}
+      #      password: ${DB_PWD:P@ssw0rd}
+      #      password: ${DB_PWD:Root.123456}
       password: ${DB_PWD:123456}
       # 初始连接数
       initial-size: 5
@@ -17,8 +20,12 @@ spring:
       min-idle: 15
       # 最大连接数
       max-active: 30
+      # 是否自动回收超时连接
+      remove-abandoned: true
+      # 超时时间(以秒数为单位)
+      remove-abandoned-timeout: 180
       # 获取连接超时时间
-      max-wait: 5000
+      max-wait: 3000
       # 连接有效性检测时间
       time-between-eviction-runs-millis: 60000
       # 连接在池中最小生存的时间
@@ -38,7 +45,6 @@ spring:
         enabled: true
       stat-view-servlet:
         enabled: true
-        # 控制台管理用户名和密码
         url-pattern: /druid/*
         reset-enable: false
         login-username: admin
@@ -52,10 +58,11 @@ spring:
           merge-sql: true
         wall:
           config:
-            multi-statement-allow: true
+            multi-statement-alagvslow: true
+
   redis:
     #数据库索引
-    database: ${REDIS_DB:0}
+    database: ${REDIS_DB:2}
     host: ${REDIS_HOST:127.0.0.1}
     port: ${REDIS_PORT:6379}
     password: ${REDIS_PWD:}
@@ -79,7 +86,7 @@ login:
     heigth: 36
     # 内容长度
     length: 2
-    # 字体名称，为空则使用默认字体，如遇到线上乱码，设置其他字体即可
+    # 字体名称，为空则使用默认字体
     font-name:
     # 字体大小
     font-size: 25
@@ -91,36 +98,29 @@ jwt:
   token-start-with: Bearer
   # 必须使用最少88位的Base64对该令牌进行编码
   base64-secret: ZmQ0ZGI5NjQ0MDQwY2I4MjMxY2Y3ZmI3MjdhN2ZmMjNhODViOTg1ZGE0NTBjMGM4NDA5NzYxMjdjOWMwYWRmZTBlZjlhNGY3ZTg4Y2U3YTE1ODVkZDU5Y2Y3OGYwZWE1NzUzNWQ2YjFjZDc0NGMxZWU2MmQ3MjY1NzJmNTE0MzI=
-  # 令牌过期时间 此处单位/毫秒 ，默认2小时，可在此网站生成 https://www.convertworld.com/zh-hans/time/milliseconds.html
+  # 令牌过期时间 此处单位/毫秒 ，默认4小时，可在此网站生成 https://www.convertworld.com/zh-hans/time/milliseconds.html
-  token-validity-in-seconds: 7200000
+  token-validity-in-seconds: 14400000
   # 在线用户key
   online-key: online-token-
   # 验证码
   code-key: code-key-
-  # token 续期检查时间范围（默认30分钟，单位默认毫秒），在token即将过期的一段时间内用户操作了，则给用户的token续期
+  # token 续期检查时间范围（默认30分钟，单位毫秒），在token即将过期的一段时间内用户操作了，则给用户的token续期
   detect: 1800000
-  # 续期时间范围，默认 1小时，这里单位毫秒
+  # 续期时间范围，默认1小时，单位毫秒
   renew: 3600000
 
-# IP 本地解析
-ip:
-  local-parsing: true
-
 #是否允许生成代码，生产环境设置为false
 generator:
-  enabled: false
+  enabled: true
-
-#如果生产环境要开启swagger，需要配置请求地址
-#springfox:
-#  documentation:
-#    swagger:
-#      v2:
-#        host: # 接口域名或外网ip
 
 #是否开启 swagger-ui
 swagger:
   enabled: true
 
+# IP 本地解析
+ip:
+  local-parsing: true
+
 # 文件存储路径
 file:
   mac:
@@ -135,3 +135,33 @@ file:
   # 文件大小 /M
   maxSize: 100
   avatarMaxSize: 5
+
+
+
+jetcache:
+  defaultCacheType: LOCAL
+  statIntervalMinutes: 15
+  areaInCacheName: false
+  hiddenPackages: com.yb
+  local:
+    default:
+      type: caffeine
+      limit: 100
+      keyConvertor: fastjson
+      expireAfterWriteInMillis: 60000
+  remote:
+    default:
+      type: redis.lettuce
+      keyConvertor: fastjson
+      valueEncoder: kryo
+      valueDecoder: kryo
+      poolConfig:
+        minIdle: 5
+        maxIdle: 200
+        maxTotal: 1000
+      uri:
+        - redis://127.0.0.1:6379
+loki:
+  url: http://localhost:3100/loki/api/v1
+  systemName: acs
+

wms/hd/nladmin-system/src/main/resources/config/application-prod.yml

@@ -1,12 +1,12 @@
 server:
-  port: 8010
+  port: 8012
 #配置数据源
 spring:
   datasource:
     druid:
       db-type: com.alibaba.druid.pool.DruidDataSource
       driverClassName: net.sf.log4jdbc.sql.jdbcapi.DriverSpy
-      url: jdbc:log4jdbc:mysql://${DB_HOST:127.0.0.1}:${DB_PORT:3306}/${DB_NAME:ch_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:jn_wms}?serverTimezone=Asia/Shanghai&characterEncoding=utf8&useSSL=false&useOldAliasMetadataBehavior=true
       username: ${DB_USER:root}
       password: ${DB_PWD:123456}
       # 初始连接数
@@ -51,11 +51,11 @@ spring:
         wall:
           config:
             multi-statement-allow: true
-  data:
+#  data:
-    mongodb:
+#    mongodb:
-      host: 127.0.0.1
+#      host: 127.0.0.1
-      port: 27017
+#      port: 27017
-      database: logdb
+#      database: logdb
   redis:
     #数据库索引
     database: ${REDIS_DB:0}