解决cookie冲突

acs/nladmin-system/src/main/java/org/nl/acs/autotask/CleanLog.java

@@ -1,4 +1,4 @@
-package org.nl.wms.autotask;
+package org.nl.acs.autotask;
 
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;

acs/nladmin-system/src/main/java/org/nl/modules/security/satoken/TokenKeyExpirationListener.java

@@ -1,51 +0,0 @@
-package org.nl.modules.security.satoken;
-
-
-import lombok.extern.slf4j.Slf4j;
-import org.nl.modules.mnt.websocket.MsgType;
-import org.nl.modules.mnt.websocket.SocketMsg;
-import org.nl.modules.mnt.websocket.WebSocketServer;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.data.redis.connection.Message;
-import org.springframework.data.redis.core.StringRedisTemplate;
-import org.springframework.data.redis.listener.KeyExpirationEventMessageListener;
-import org.springframework.data.redis.listener.RedisMessageListenerContainer;
-import org.springframework.stereotype.Component;
-
-import java.io.IOException;
-import java.nio.charset.StandardCharsets;
-
-/**
- * @author: lyd
- * @description:
- * @Date: 2022/10/8
- */
-@Slf4j
-@Component
-public class TokenKeyExpirationListener extends KeyExpirationEventMessageListener  {
-    @Autowired
-    private StringRedisTemplate redisTemplate;
-
-    public TokenKeyExpirationListener(RedisMessageListenerContainer listenerContainer) {
-        super(listenerContainer);
-    }
-
-    @Override
-    public void onMessage(Message message, byte[] pattern) {
-        // 监听过期的key
-        String expireKey = new String(message.getBody(), StandardCharsets.UTF_8);
-        //获取key原本的value 获取不到 是null
-        String expireKeyValue = redisTemplate.opsForValue().get("my-satoken");
-        //我是根据tokenvalues作为主键ID的
-        String[] split = expireKey.split(":");
-        String s = split[split.length - 1];
-        try {
-            WebSocketServer.sendInfo(new SocketMsg("token会话过期！", MsgType.INFO), "exp-token");
-        } catch (IOException e) {
-            log.error(e.getMessage(), e);
-        }
-        log.info("expireKey---"+expireKey);
-        log.info("expireKeyValue---"+expireKeyValue);
-    }
-
-}

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

@@ -12,7 +12,7 @@ https://juejin.cn/post/6844903775631572999
     <contextName>nlAdmin</contextName>
     <property name="log.charset" value="utf-8"/>
     <property name="log.pattern"
-              value="%black(%contextName-) %red(%d{yyyy-MM-dd HH:mm:ss}) %green([%thread]) %highlight(%-5level) %boldMagenta(%logger{36}) - %gray(%msg%n)"/>
+              value="%black(%contextName-) %red(%d{yyyy-MM-dd HH:mm:ss.SSS}) %green([%thread]) %highlight(%-5level) %boldMagenta(%logger{36}) - %gray(%msg%n)"/>
     <springProperty scope="context" name="logPath" source="logging.file.path" defaultValue="logs"/>
     <springProperty scope="context" name="lokiUrl" source="loki.url"/>
     <springProperty scope="context" name="systemName" source="loki.systemName"/>

lms/nladmin-system/src/main/java/org/nl/start/Init.java

@@ -1,7 +1,10 @@
 package org.nl.start;
 
+import com.alibaba.fastjson.JSONArray;
+import com.alibaba.fastjson.JSONObject;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
+import org.nl.modules.wql.core.bean.WQLObject;
 import org.springframework.boot.ApplicationArguments;
 import org.springframework.boot.ApplicationRunner;
 import org.springframework.stereotype.Component;
@@ -19,4 +22,32 @@ public class Init implements ApplicationRunner {
         System.out.println("项目启动成功!");
     }
 
+    private void initPoint() {
+        WQLObject pointTab = WQLObject.getWQLObject("sch_base_point");
+        JSONArray arr = WQLObject.getWQLObject("sch_base_point").query("block_num>0").getResultJSONArray(0);
+        for (int i = 0; i < arr.size(); i++) {
+            JSONObject json = arr.getJSONObject(i);
+            Integer block_num = json.getInteger("block_num");
+            Integer col_num = json.getInteger("col_num");
+
+            String col_numS = "0" + col_num;
+            if (col_num > 9) {
+                col_numS = String.valueOf(col_num);
+            }
+
+            Integer row_num = json.getInteger("row_num");
+            String row_numS = "0" + row_num;
+            if (row_num > 9) {
+                row_numS = String.valueOf(row_num);
+            }
+
+
+            String point_code = 2+""+block_num + col_numS+"-" + row_numS +"-"+ "01";
+            String point_name = col_num + "排" + row_num + "列1层";
+            json.put("point_code", point_code);
+            json.put("point_name", point_name);
+            pointTab.update(json);
+        }
+    }
+
 }

lms/nladmin-system/src/main/java/org/nl/wms/sch/manage/AutoCreateTask.java

@@ -97,7 +97,7 @@ public class AutoCreateTask {
             taskList.forEach(item -> {
                 JSONObject taskObj = new JSONObject();
                 taskObj.put("task_id", item.getTask_id());
-                taskObj.put("task_status", TaskStatusEnum.ISSUE.getCode());
+//                taskObj.put("task_status", TaskStatusEnum.ISSUE.getCode());
                 taskObj.put("remark", "下发失败:" + message);
                 taskObj.put("update_time", DateUtil.now());
                 taskTab.update(taskObj);

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

@@ -6,9 +6,9 @@ spring:
     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:47.111.78.178}:${DB_PORT:3306}/${DB_NAME:ndxy3_lms}?serverTimezone=Asia/Shanghai&characterEncoding=utf8&useSSL=false&useOldAliasMetadataBehavior=true
       username: ${DB_USER:root}
-      password: ${DB_PWD:whxr_root}
+      password: ${DB_PWD:P@ssw0rd}
       # 初始连接数
       initial-size: 5
       # 最小连接数
@@ -54,7 +54,7 @@ spring:
   redis:
     #数据库索引
     database: ${REDIS_DB:15}
-    host: ${REDIS_HOST:10.16.1.25}
+    host: ${REDIS_HOST:127.0.0.1}
     port: ${REDIS_PORT:6379}
     password: ${REDIS_PWD:}
     #连接超时时间
@@ -137,3 +137,27 @@ logging:
   file:
     path: /app/jar/logs
   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: Bearer
+
+loki:
+  url: http://localhost:3100/loki/api/v1
+  systemName: lms

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

@@ -1,42 +1,22 @@
 server:
   port: 8010
-#ERP系统相关
-erp:
-  oracle:
-    enabled: false
-    jdbcurl: jdbc:oracle:thin:@192.168.81.251:1522:ORCL2
-    username: system
-    password: 123456
-  sqlserver:
-    enabled: false
-    jdbcurl: jdbc:sqlserver://47.97.157.227:1433;DatabaseName=testdb-lx
-    username: sa
-    password: Nl@123
-
 #配置数据源
 spring:
   datasource:
     druid:
       db-type: com.alibaba.druid.pool.DruidDataSource
       driverClassName: net.sf.log4jdbc.sql.jdbcapi.DriverSpy
-      # url: jdbc:log4jdbc:mysql://${DB_HOST:localhost}:${DB_PORT:3306}/${DB_NAME:whxr}?serverTimezone=Asia/Shanghai&characterEncoding=utf8&useSSL=false&useOldAliasMetadataBehavior=true
-      url: jdbc:log4jdbc:mysql://${DB_HOST:192.168.81.252}:${DB_PORT:3306}/${DB_NAME:whxr_mes1}?serverTimezone=Asia/Shanghai&characterEncoding=utf8&useSSL=false&useOldAliasMetadataBehavior=true
+      url: jdbc:log4jdbc:mysql://${DB_HOST:47.111.78.178}:${DB_PORT:3306}/${DB_NAME:ndxy3_lms}?serverTimezone=Asia/Shanghai&characterEncoding=utf8&useSSL=false&useOldAliasMetadataBehavior=true
       username: ${DB_USER:root}
-      password: ${DB_PWD:Root.123456}
-      #      username: ${DB_USER:root}
-      #  password: ${DB_PWD:root}
+      password: ${DB_PWD:P@ssw0rd}
       # 初始连接数
       initial-size: 5
       # 最小连接数
       min-idle: 15
       # 最大连接数
-      max-active: 30
-      # 是否自动回收超时连接
-      remove-abandoned: true
-      # 超时时间(以秒数为单位)
-      remove-abandoned-timeout: 180
+      max-active: 60
       # 获取连接超时时间
-      max-wait: 3000
+      max-wait: 5000
       # 连接有效性检测时间
       time-between-eviction-runs-millis: 60000
       # 连接在池中最小生存的时间
@@ -56,8 +36,11 @@ spring:
         enabled: true
       stat-view-servlet:
         enabled: true
+        # 控制台管理用户名和密码
         url-pattern: /druid/*
         reset-enable: false
+        login-username: admin
+        login-password: 123456
       filter:
         stat:
           enabled: true
@@ -70,16 +53,16 @@ spring:
             multi-statement-allow: true
   redis:
     #数据库索引
-    database: ${REDIS_DB:1}
-    host: ${REDIS_HOST:47.111.78.178}
+    database: ${REDIS_DB:15}
+    host: ${REDIS_HOST:127.0.0.1}
     port: ${REDIS_PORT:6379}
     password: ${REDIS_PWD:}
     #连接超时时间
-    timeout: 10000
+    timeout: 5000
 # 登录相关配置
 login:
   # 登录缓存
-  cache-enable: false
+  cache-enable: true
   #  是否限制单用户登录
   single-login: false
   #  验证码
@@ -94,7 +77,7 @@ login:
     heigth: 36
     # 内容长度
     length: 2
-    # 字体名称，为空则使用默认字体
+    # 字体名称，为空则使用默认字体，如遇到线上乱码，设置其他字体即可
     font-name:
     # 字体大小
     font-size: 25
@@ -106,29 +89,36 @@ jwt:
   token-start-with: Bearer
   # 必须使用最少88位的Base64对该令牌进行编码
   base64-secret: ZmQ0ZGI5NjQ0MDQwY2I4MjMxY2Y3ZmI3MjdhN2ZmMjNhODViOTg1ZGE0NTBjMGM4NDA5NzYxMjdjOWMwYWRmZTBlZjlhNGY3ZTg4Y2U3YTE1ODVkZDU5Y2Y3OGYwZWE1NzUzNWQ2YjFjZDc0NGMxZWU2MmQ3MjY1NzJmNTE0MzI=
-  # 令牌过期时间 此处单位/毫秒 ，默认4小时，可在此网站生成 https://www.convertworld.com/zh-hans/time/milliseconds.html
-  token-validity-in-seconds: 14400000
+  # 令牌过期时间 此处单位/毫秒 ，默认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续期
+  # 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:
@@ -145,5 +135,29 @@ file:
   avatarMaxSize: 5
 logging:
   file:
-    path: C:\log\wms
+    path: /app/jar/logs
   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: Bearer
+
+loki:
+  url: http://localhost:3100/loki/api/v1
+  systemName: lms