add:x

lms/nladmin-system/pom.xml

@@ -343,7 +343,7 @@
         <dependency>
             <groupId>org.redisson</groupId>
             <artifactId>redisson-spring-boot-starter</artifactId>
-            <version>3.19.1</version>
+            <version>3.12.3</version>
             <exclusions>
                 <exclusion>
                     <artifactId>spring-boot-starter-actuator</artifactId>

lms/nladmin-system/src/main/java/org/nl/AppRun.java

@@ -39,8 +39,11 @@ import org.springframework.web.bind.annotation.RestController;
 public class AppRun {
 
     public static void main(String[] args) {
-
+        try {
             SpringApplication.run(AppRun.class, args);
+        }catch (Exception ex){
+            ex.printStackTrace();
+        }
     }
 
     @Bean

lms/nladmin-system/src/main/java/org/nl/wms/ext/acs/service/impl/AcsToWmsServiceImpl.java

@@ -28,6 +28,8 @@ import org.nl.wms.sch.tasks.EmptyVehicleTask;
 import org.nl.wms.sch.tasks.SendOutTask;
 import org.nl.wms.st.inbill.service.RawAssistIStorService;
 import org.nl.wms.st.inbill.service.StorPublicService;
+import org.redisson.api.RLock;
+import org.redisson.api.RedissonClient;
 import org.springframework.http.HttpStatus;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
@@ -55,6 +57,8 @@ public class AcsToWmsServiceImpl implements AcsToWmsService {
 
     private final CutConveyorTask cutConveyorTask;
 
+    private final RedissonClient redissonClient;
+
     /**
      * task_id：任务标识
      * task_code：任务编码
@@ -192,7 +196,11 @@ public class AcsToWmsServiceImpl implements AcsToWmsService {
         log.info("apply请求参数：---------------------------------------------"+whereJson.toString());
         String type = whereJson.getString("type");
         JSONObject result = new JSONObject();
-        synchronized (lock.intern(type)){
+        RLock lock = redissonClient.getLock("acs_to_wms:" + type);
+        boolean tryLock = lock.tryLock(5, TimeUnit.SECONDS);
+        try {
+            if (tryLock){
+                {
                     String device_code = whereJson.getString("device_code");
                     String vehicle_code = whereJson.getString("vehicle_code");
                     WQLObject point_table = WQLObject.getWQLObject("SCH_BASE_Point");
@@ -440,9 +448,17 @@ public class AcsToWmsServiceImpl implements AcsToWmsService {
                     result.put("status", HttpStatus.OK.value());
                     result.put("message", "下发成功!");
                     return result;
-
                 }
             }
+        }finally {
+            if (tryLock){
+                lock.unlock();
+            }
+        }
+        result.put("status", HttpStatus.BAD_REQUEST.value());
+        result.put("message", "申请任务超时！"+type);
+        return result;
+    }
 
     @Override
     public JSONObject deviceApply(JSONObject whereJson) {

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

@@ -1,22 +1,27 @@
 server:
-  port: 8010
+  port: 8013
 #配置数据源
 spring:
   datasource:
     druid:
       db-type: com.alibaba.druid.pool.DruidDataSource
       driverClassName: net.sf.log4jdbc.sql.jdbcapi.DriverSpy
-      url: jdbc:log4jdbc:mysql://${DB_HOST:10.16.1.25}:${DB_PORT:3306}/${DB_NAME:whxr_mes}?serverTimezone=Asia/Shanghai&characterEncoding=utf8&useSSL=false&useOldAliasMetadataBehavior=true
+      url: jdbc:log4jdbc:mysql://${DB_HOST:10.1.3.91}:${DB_PORT:3306}/${DB_NAME:lms_test2}?serverTimezone=Asia/Shanghai&characterEncoding=utf8&useSSL=false&useOldAliasMetadataBehavior=true
+      #      url: jdbc:log4jdbc:mysql://${DB_HOST:127.0.0.1}:${DB_PORT:3306}/${DB_NAME:hl_tb_lms}?serverTimezone=Asia/Shanghai&characterEncoding=utf8&useSSL=false&useOldAliasMetadataBehavior=true
+      #      username: ${DB_USER:root}
       username: ${DB_USER:root}
-      password: ${DB_PWD:whxr_root}
+      password: ${DB_PWD:123456}
+      #      password: ${DB_PWD:root}
       # 初始连接数
       initial-size: 5
       # 最小连接数
       min-idle: 15
       # 最大连接数
-      max-active: 60
+      max-active: 30
+      # 超时时间(以秒数为单位)
+      remove-abandoned-timeout: 180
       # 获取连接超时时间
-      max-wait: 5000
+      max-wait: 3000
       # 连接有效性检测时间
       time-between-eviction-runs-millis: 60000
       # 连接在池中最小生存的时间
@@ -36,11 +41,8 @@ spring:
         enabled: true
       stat-view-servlet:
         enabled: true
-        # 控制台管理用户名和密码
         url-pattern: /druid/*
         reset-enable: false
-        login-username: admin
-        login-password: 123456
       filter:
         stat:
           enabled: true
@@ -53,14 +55,13 @@ spring:
             multi-statement-allow: true
   redis:
     #数据库索引
-    database: ${REDIS_DB:15}
+    database: ${REDIS_DB:14}
-    host: ${REDIS_HOST:10.16.1.25}
+    host: ${REDIS_HOST:127.0.0.1}
     port: ${REDIS_PORT:6379}
     password: ${REDIS_PWD:}
-    #连接超时时间
+#    redisson:
-    timeout: 5000
+#      config: classpath:/config/redisson.yml
-    redisson:
+
-      config: classpath:/config/redisson.yml
 # 登录相关配置
 login:
   # 登录缓存
@@ -79,7 +80,7 @@ login:
     heigth: 36
     # 内容长度
     length: 2
-    # 字体名称，为空则使用默认字体，如遇到线上乱码，设置其他字体即可
+    # 字体名称，为空则使用默认字体
     font-name:
     # 字体大小
     font-size: 25
@@ -91,36 +92,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
 
+#是否允许生成代码，生产环境设置为false
+generator:
+  enabled: true
+
+#是否开启 swagger-ui
+swagger:
+  enabled: true
+
 # IP 本地解析
 ip:
   local-parsing: true
 
-#是否允许生成代码，生产环境设置为false
-generator:
-  enabled: false
-
-#如果生产环境要开启swagger，需要配置请求地址
-#springfox:
-#  documentation:
-#    swagger:
-#      v2:
-#        host: # 接口域名或外网ip
-
-#是否开启 swagger-ui
-swagger:
-  enabled: false
-
 # 文件存储路径
 file:
   mac:
@@ -137,5 +131,32 @@ file:
   avatarMaxSize: 5
 logging:
   file:
-    path: /app/jar/logs
+    path: C:\log\wms
   config: classpath:logback-spring.xml
+
+# Sa-Token配置
+sa-token:
+  # token 名称 (同时也是cookie名称)
+  token-name: Authorization
+  # token 有效期，单位s 默认30天, -1代表永不过期
+  timeout: 2592000
+  # token 临时有效期 (指定时间内无操作就视为token过期) 单位: 秒
+  activity-timeout: -1
+  # 是否允许同一账号并发登录 (为true时允许一起登录, 为false时新登录挤掉旧登录)
+  is-concurrent: true
+  # 在多人登录同一账号时，是否共用一个token (为true时所有登录共用一个token, 为false时每次登录新建一个token)
+  is-share: false
+  # token风格
+  token-style: random-128
+  # 是否输出操作日志
+  is-log: false
+  jwt-secret-key: opsjajisdnnca0sdkksdfaaasdfwwq
+  # token 前缀
+  token-prefix:
+  cookie:
+    # 配置 Cookie 作用域:根据二级域名实现sso登入如lms.sso.com;acs.sso.com
+    domain:
+
+loki:
+  url: http://localhost:3100/loki/api/v1
+  systemName: lms

lms/nladmin-system/src/main/resources/config/application.yml

@@ -2,7 +2,7 @@ spring:
   freemarker:
     check-template-location: false
   profiles:
-    active: dev
+    active: prod
   jackson:
     time-zone: GMT+8
   data:

lms/nladmin-system/src/main/resources/config/redisson.yml

@@ -1,8 +1,7 @@
 singleServerConfig:
   connectionMinimumIdleSize: 8
   connectionPoolSize: 8
-  address: redis://10.16.1.25:6379
+  address: redis://127.0.0.1:6379
-  password: 942464Yy
   idleConnectionTimeout: 10000
   timeout: 3000
 threads: 8

lms/nladmin-system/src/main/resources/logback-spring.xml

@@ -56,6 +56,26 @@ https://juejin.cn/post/6844903775631572999
 
     </appender>
 
+    <appender name="ERROR" class="ch.qos.logback.core.rolling.RollingFileAppender">
+        <file>${LOG_HOME}/%d{yyyy-MM-dd}.%i.error.log</file>
+        <filter class="ch.qos.logback.classic.filter.ThresholdFilter">
+            <level>error</level>
+        </filter>
+        <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
+            <fileNamePattern>${LOG_HOME}/%d{yyyy-MM-dd}.%i.error.log</fileNamePattern>
+            <cleanHistoryOnStart>true</cleanHistoryOnStart>
+            <maxHistory>15</maxHistory>
+            <totalSizeCap>300MB</totalSizeCap>
+            <timeBasedFileNamingAndTriggeringPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedFNATP">
+                <maxFileSize>3</maxFileSize>
+            </timeBasedFileNamingAndTriggeringPolicy>
+        </rollingPolicy>
+        <encoder>
+            <pattern>${log.pattern}</pattern>
+            <charset>${log.charset}</charset>
+        </encoder>
+    </appender>
+
     <!--异步到文件-->
     <appender name="asyncFileAppender" class="ch.qos.logback.classic.AsyncAppender">
         <discardingThreshold>0</discardingThreshold>
@@ -68,6 +88,7 @@ https://juejin.cn/post/6844903775631572999
         <root level="debug">
             <appender-ref ref="CONSOLE"/>
             <appender-ref ref="asyncFileAppender"/>
+            <appender-ref ref="ERROR" />
         </root>
         <logger name="org.springframework" level="ERROR" additivity="false">
             <appender-ref ref="CONSOLE"/>
@@ -113,6 +134,7 @@ https://juejin.cn/post/6844903775631572999
         <root level="debug">
             <appender-ref ref="CONSOLE"/>
             <appender-ref ref="asyncFileAppender"/>
+            <appender-ref ref="ERROR" />
         </root>
         <logger name="org.springframework" level="ERROR" additivity="false">
             <appender-ref ref="asyncFileAppender"/>