rev:工单导入/缓存线物料更新

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

@@ -1,5 +1,5 @@
 server:
-  port: 8099
+  port: 8011
 #配置数据源
 spring:
   data:
@@ -8,30 +8,32 @@ spring:
         enabled: true
       client:
         reactive:
-          #endpoints: 172.31.185.110:9200,172.31.154.9:9200 #内网
-          #          endpoints: 192.168.46.2255:8200 #外网
-          endpoints: http://192.168.46.2255:9200 #外网
+          #endpoints: 172.31.185.110:8200,172.31.154.9:8200 #内网
+          #          endpoints: 47.96.133.178:8200 #外网
+          endpoints: http://192.168.46.225:9200 #外网
   elasticsearch:
     rest:
-      #uris: 172.31.185.110:9200,172.31.154.9:9200 #内网
-      #      uris: 192.168.46.2255:8200 #外网
-      uris: http://192.168.46.2255:8200 #外网
-      username: elastic
-      password: 123456
+      #uris: 172.31.185.110:8200,172.31.154.9:8200 #内网
+      #      uris: 47.96.133.178:8200 #外网
+      uris: http://192.168.46.225:9200 #外网
+  #      username: elastic
+  #      password: 123456
   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:hl_one_mes}?serverTimezone=Asia/Shanghai&characterEncoding=utf8&useSSL=false&useOldAliasMetadataBehavior=true&allowPublicKeyRetrieval=true&useSSL=false
+      url: jdbc:log4jdbc:mysql://${DB_HOST:192.168.46.5}:${DB_PORT:3306}/${DB_NAME:hl_one_mes}?serverTimezone=Asia/Shanghai&characterEncoding=utf8&useSSL=false&useOldAliasMetadataBehavior=true&allowPublicKeyRetrieval=true&useSSL=false
+      #      url: jdbc:log4jdbc:mysql://${DB_HOST:localhost}:${DB_PORT:3306}/${DB_NAME:hl_one_mes}?serverTimezone=Asia/Shanghai&characterEncoding=utf8&useSSL=false&useOldAliasMetadataBehavior=true&allowPublicKeyRetrieval=true&useSSL=false
       username: ${DB_USER:root}
+      #      password: ${DB_PWD:123456}
       password: ${DB_PWD:123456}
-      #password: ${DB_PWD:Root.123456}
+
       # 初始连接数
-      initial-size: 15
+      initial-size: 5
       # 最小连接数
-      min-idle: 45
+      min-idle: 15
       # 最大连接数
-      max-active: 90
+      max-active: 30
       # 是否自动回收超时连接
       remove-abandoned: true
       # 超时时间(以秒数为单位)
@@ -61,11 +63,12 @@ spring:
         reset-enable: false
       filters:
         DruidFilter,stat
+
   redis:
     #数据库索引
-    database: ${REDIS_DB:6}
-    host: ${REDIS_HOST:127.0.0.1}
-    #host: ${REDIS_HOST:localhost}
+    database: ${REDIS_DB:1}
+    #host: ${REDIS_HOST:127.0.0.1}
+    host: ${REDIS_HOST:localhost}
     port: ${REDIS_PORT:6379}
     password: ${REDIS_PWD:}
     #连接超时时间
@@ -169,29 +172,31 @@ sa-token:
   cookie:
     # 配置 Cookie 作用域:根据二级域名实现sso登入如lms.sso.com;acs.sso.com
     domain:
+  is-read-cookie: false
 
-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
+#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
 es:
   index: mes_log
+schedulerFile: C:\mes\scheduler.xml

mes/hd/nladmin-system/src/main/resources/logback-spring.xml

@@ -145,11 +145,11 @@ https://juejin.cn/post/6844903775631572999
             <appender-ref ref="CONSOLE"/>
         </logger>
     </springProfile>
-    <springProfile name="dev3">
-        <root level="debug">
+    <springProfile name="prod">
+        <root level="info">
             <appender-ref ref="CONSOLE"/>
+            <appender-ref ref="esLogAppender"/>
         </root>
-
         <logger name="jdbc.audit" level="ERROR" additivity="false">
             <appender-ref ref="CONSOLE"/>
         </logger>
@@ -185,7 +185,7 @@ https://juejin.cn/post/6844903775631572999
 
     <!--生产环境:打印控制台和输出到文件-->
     <springProfile name="prod">
-        <root level="warn">
+        <root level="info">
             <appender-ref ref="CONSOLE"/>
             <appender-ref ref="asyncFileAppender"/>
         </root>