rev：修改

acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/auto/run/OneNDCSocketConnectionAutoRun.java

@@ -223,6 +223,7 @@ public class OneNDCSocketConnectionAutoRun extends AbstractAutoRunnable {
                             StandardAutodoorDeviceDriver driver = (StandardAutodoorDeviceDriver) device.getDeviceDriver();
 
                             log.info("agv车号为"+carno+",进入自动门:"+device_code+"区域，请求开门中");
+                            // 状态不为0且门开到位
                             if (driver.getMode() != 0) {
                                 flag = true;
                             } else {

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

@@ -2,49 +2,84 @@ server:
   port: 8010
 #配置数据源
 spring:
-  autoconfigure:
+  messages:
-    exclude: com.alibaba.druid.spring.boot.autoconfigure.DruidDataSourceAutoConfigure
+    basename: language/login/login,language/error/error,language/buss/buss,language/task/task,language/monitor/one_device/one_device,language/monitor/two_device/two_device,language/monitor/universal/universal
   datasource:
-    dynamic:
+    druid:
-      primary: mysql
+      db-type: com.alibaba.druid.pool.DruidDataSource
-      datasource:
+      driverClassName: net.sf.log4jdbc.sql.jdbcapi.DriverSpy
-        mysql:
+      #      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
-          driver-class-name: net.sf.log4jdbc.sql.jdbcapi.DriverSpy
+#      url: jdbc:log4jdbc:mysql://${DB_HOST:127.0.0.1}:${DB_PORT:3306}/${DB_NAME:beian_xinshengacs}?serverTimezone=Asia/Shanghai&characterEncoding=utf8&useSSL=false&useOldAliasMetadataBehavior=true
-          url: jdbc:log4jdbc:mysql://${DB_HOST:10.93.41.198}:${DB_PORT:3306}/${DB_NAME:lz_lms_two}?serverTimezone=Asia/Shanghai&characterEncoding=utf8&useSSL=false&useOldAliasMetadataBehavior=true
+      url: jdbc:log4jdbc:mysql://${DB_HOST:192.168.200.200}:${DB_PORT:3306}/${DB_NAME:acs}?serverTimezone=Asia/Shanghai&characterEncoding=utf8&useSSL=false&useOldAliasMetadataBehavior=true&allowPublicKeyRetrieval=true
       username: ${DB_USER:root}
+      #      password: ${DB_PWD:Root.123456}
       password: ${DB_PWD:123456}
-#          url: jdbc:log4jdbc:mysql://${DB_HOST:127.0.0.1}:${DB_PORT:3306}/${DB_NAME:rtmg_lms}?serverTimezone=Asia/Shanghai&characterEncoding=utf8&useSSL=false&useOldAliasMetadataBehavior=true
+      # 初始连接数
-#          username: ${DB_USER:root}
+      initial-size: 5
-#          password: ${DB_PWD:12356}
+      # 最小连接数
-          type: com.alibaba.druid.pool.DruidDataSource
+      min-idle: 15
-        oracle:
+      # 最大连接数
-          driver-class-name: oracle.jdbc.OracleDriver
+      max-active: 30
-          url: jdbc:oracle:thin:@172.27.37.66:1521:RTMES
+      # 超时时间(以秒数为单位)
-          username: ${DB_USER:LMSTELCOM}
+      remove-abandoned-timeout: 180
-          password: ${DB_PWD:LMSTELCOM_6463}
+      # 获取连接超时时间
-          type: com.alibaba.druid.pool.DruidDataSource
+      max-wait: 3000
-        sqlserver:
+      # 连接有效性检测时间
-          driver-class-name: com.microsoft.sqlserver.jdbc.SQLServerDriver
+      time-between-eviction-runs-millis: 60000
-          url: jdbc:sqlserver://10.93.41.2\WINCC;DatabaseName=马钢_RH
+      # 连接在池中最小生存的时间
-          username: ${DB_USER:sa}
+      min-evictable-idle-time-millis: 300000
-          password: ${DB_PWD:123}
+      # 连接在池中最大生存的时间
-          type: com.alibaba.druid.pool.DruidDataSource
+      max-evictable-idle-time-millis: 900000
+      # 指明连接是否被空闲连接回收器(如果有)进行检验.如果检测失败,则连接将被从池中去除
+      test-while-idle: true
+      # 指明是否在从池中取出连接前进行检验,如果检验失败, 则从池中去除连接并尝试取出另一个
+      test-on-borrow: true
+      # 是否在归还到池中前进行检验
+      test-on-return: false
+      # 检测连接是否有效
+      validation-query: select 1
+      # 配置监控统计
+      webStatFilter:
+        enabled: true
+      stat-view-servlet:
+        enabled: true
+        url-pattern: /druid/*
+        reset-enable: false
+      filter:
+        stat:
+          enabled: true
+          # 记录慢SQL
+          log-slow-sql: true
+          slow-sql-millis: 1000
+          merge-sql: true
+        wall:
+          config:
+            multi-statement-allow: true
+  flyway:
+    # 是否启用flyway
+    enabled: true
+    # 编码格式，默认UTF-8
+    encoding: UTF-8
+    # 迁移sql脚本文件存放路径，默认db/migration
+    locations: classpath:db/migration
+    # 迁移sql脚本文件名称的前缀，默认V
+    sql-migration-prefix: V
+    # 迁移sql脚本文件名称的分隔符，默认2个下划线__
+    sql-migration-separator: __
+    # 迁移sql脚本文件名称的后缀
+    sql-migration-suffixes: .sql
+    # 迁移时是否进行校验，默认true
+    validate-on-migrate: true
+    # 当迁移发现数据库非空且存在没有元数据的表时，自动执行基准迁移，新建schema_version表
+    baseline-on-migrate: true
   redis:
     #数据库索引
+    database: ${REDIS_DB:2}
     host: ${REDIS_HOST:127.0.0.1}
     port: ${REDIS_PORT:6379}
-    password: ${REDIS_PWD:}
+  jpa:
-    redisson:
+    show-sql: true
-      config: |
+
-        threads: 4
-        nettyThreads: 4
-        singleServerConfig:
-          database: 15
-          connectionMinimumIdleSize: 8
-          connectionPoolSize: 8
-          address: redis://127.0.0.1:6379
-          idleConnectionTimeout: 10000
-          timeout: 3000
 # 登录相关配置
 login:
   # 登录缓存
@@ -63,36 +98,19 @@ login:
     heigth: 36
     # 内容长度
     length: 2
-    # 字体名称，为空则使用默认字体，如遇到线上乱码，设置其他字体即可
+    # 字体名称，为空则使用默认字体
     font-name:
     # 字体大小
     font-size: 25
 
-#jwt
+#是否允许生成代码，生产环境设置为false
-jwt:
+generator:
-  header: Authorization
+  enabled: true
-  # 令牌前缀
-  token-start-with: Bearer
-  # 必须使用最少88位的Base64对该令牌进行编码
-  base64-secret: ZmQ0ZGI5NjQ0MDQwY2I4MjMxY2Y3ZmI3MjdhN2ZmMjNhODViOTg1ZGE0NTBjMGM4NDA5NzYxMjdjOWMwYWRmZTBlZjlhNGY3ZTg4Y2U3YTE1ODVkZDU5Y2Y3OGYwZWE1NzUzNWQ2YjFjZDc0NGMxZWU2MmQ3MjY1NzJmNTE0MzI=
-  # 令牌过期时间 此处单位/毫秒 ，默认2小时，可在此网站生成 https://www.convertworld.com/zh-hans/time/milliseconds.html
-  token-validity-in-seconds: 7200000
-  # 在线用户key
-  online-key: online-token-
-  # 验证码
-  code-key: code-key-
-  # token 续期检查时间范围（默认30分钟，单位默认毫秒），在token即将过期的一段时间内用户操作了，则给用户的token续期
-  detect: 1800000
-  # 续期时间范围，默认 1小时，这里单位毫秒
-  renew: 3600000
 
 # IP 本地解析
 ip:
   local-parsing: true
 
-#是否允许生成代码，生产环境设置为false
-generator:
-  enabled: false
 # 文件存储路径
 file:
   mac:
@@ -109,8 +127,11 @@ file:
   avatarMaxSize: 5
 logging:
   file:
-    path: /app/jar/logs
+    path: D:\log\beian\acs # /Users/onepiece/myFile/acs_logs
   config: classpath:logback-spring.xml
+lucene:
+  index:
+    path: D:\lucene\index
 
 # Sa-Token配置
 sa-token:
@@ -151,7 +172,7 @@ sa-token:
   token-session-check-login: false
   alone-redis:
     # Redis数据库索引（默认为0）
-    database: 9
+    database: 2
     # Redis服务器地址
     host: 127.0.0.1
     # Redis服务器连接端口
@@ -160,6 +181,12 @@ sa-token:
     password:
     # 连接超时时间
     timeout: 10s
-lucene:
+#comPort:
-  index:
+#  need: true
-    path: D:\lucene\index
+#  cname: COM5
+#  newBaudRate: 9600
+#  newDataBits: 8
+#  newStopBits: 1
+#  newParity: 0
+agvToAcs:
+  addr: http://localhost

acs/nladmin-system/nlsso-server/src/main/resources/config/application.yml

@@ -106,7 +106,7 @@ rsa:
   private_key: MIIBUwIBADANBgkqhkiG9w0BAQEFAASCAT0wggE5AgEAAkEA0vfvyTdGJkdbHkB8mp0f3FE0GYP3AYPaJF7jUd1M0XxFSE2ceK3k2kw20YvQ09NJKk+OMjWQl9WitG9pB6tSCQIDAQABAkA2SimBrWC2/wvauBuYqjCFwLvYiRYqZKThUS3MZlebXJiLB+Ue/gUifAAKIg1avttUZsHBHrop4qfJCwAI0+YRAiEA+W3NK/RaXtnRqmoUUkb59zsZUBLpvZgQPfj1MhyHDz0CIQDYhsAhPJ3mgS64NbUZmGWuuNKp5coY2GIj/zYDMJp6vQIgUueLFXv/eZ1ekgz2Oi67MNCk5jeTF2BurZqNLR3MSmUCIFT3Q6uHMtsB9Eha4u7hS31tj1UWE+D+ADzp59MGnoftAiBeHT7gDMuqeJHPL4b+kC+gzV4FGTfhR9q3tTbklZkD2A==
 logging:
   file:
-    path: D:\log\beian\lms
+    path: D:\log\beian\acs
   config: classpath:logback-spring.xml
 # sa-token白名单配置
 security:

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

@@ -8,7 +8,7 @@ nl:
       port: 3306
       username: root
       password: 12356
-      database: nl-platform
+      database: wms
     redis:
       ip: 127.0.0.1
       port: 6379