From 76e7db8b16b2d9f17dfa1f716d2c75b24d2ebbfe Mon Sep 17 00:00:00 2001 From: ldj_willow Date: Tue, 8 Nov 2022 14:50:56 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E6=9B=B4=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/org/nl/acs/autotask/CleanLog.java | 2 +- .../satoken/TokenKeyExpirationListener.java | 51 --------- acs/nladmin-ui/src/settings.js | 2 +- .../src/main/java/org/nl/start/Init.java | 31 ++++++ .../org/nl/wms/sch/manage/AutoCreateTask.java | 2 +- .../src/main/java/org/nl/wms/wms.xls | Bin 295424 -> 258560 bytes .../resources/config/application-prod.yml | 30 +++++- .../resources/config/application-test.yml | 98 ++++++++++-------- lms/nladmin-ui/src/settings.js | 2 +- 9 files changed, 118 insertions(+), 100 deletions(-) delete mode 100644 acs/nladmin-system/src/main/java/org/nl/modules/security/satoken/TokenKeyExpirationListener.java diff --git a/acs/nladmin-system/src/main/java/org/nl/acs/autotask/CleanLog.java b/acs/nladmin-system/src/main/java/org/nl/acs/autotask/CleanLog.java index 3d82c43..84d7084 100644 --- a/acs/nladmin-system/src/main/java/org/nl/acs/autotask/CleanLog.java +++ b/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; diff --git a/acs/nladmin-system/src/main/java/org/nl/modules/security/satoken/TokenKeyExpirationListener.java b/acs/nladmin-system/src/main/java/org/nl/modules/security/satoken/TokenKeyExpirationListener.java deleted file mode 100644 index 7737724..0000000 --- a/acs/nladmin-system/src/main/java/org/nl/modules/security/satoken/TokenKeyExpirationListener.java +++ /dev/null @@ -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); - } - -} diff --git a/acs/nladmin-ui/src/settings.js b/acs/nladmin-ui/src/settings.js index 1d46e5e..91fbaf4 100644 --- a/acs/nladmin-ui/src/settings.js +++ b/acs/nladmin-ui/src/settings.js @@ -40,7 +40,7 @@ module.exports = { /** * @description token key */ - TokenKey: 'EL-ADMIN-TOEKN', + TokenKey: 'NL-ACS-TOEKN', /** * @description 请求超时时间,毫秒(默认2分钟) */ diff --git a/lms/nladmin-system/src/main/java/org/nl/start/Init.java b/lms/nladmin-system/src/main/java/org/nl/start/Init.java index 3a10572..9417a40 100644 --- a/lms/nladmin-system/src/main/java/org/nl/start/Init.java +++ b/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); + } + } + } diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/sch/manage/AutoCreateTask.java b/lms/nladmin-system/src/main/java/org/nl/wms/sch/manage/AutoCreateTask.java index af2d49e..a299f32 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/sch/manage/AutoCreateTask.java +++ b/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); diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/wms.xls b/lms/nladmin-system/src/main/java/org/nl/wms/wms.xls index 98c0e4d9d5bdf9a931d7fb3b0c4159d3bf19aac3..0c2e02a00975f8f4d718804a9eebbddf3fda853a 100644 GIT binary patch delta 15956 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 XJ;L2)=@p9 Date: Tue, 8 Nov 2022 14:53:57 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E6=97=A5=E5=BF=97=E9=85=8D=E7=BD=AE?= =?UTF-8?q?=E6=96=87=E4=BB=B6=E6=9B=B4=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- acs/nladmin-system/src/main/resources/logback-spring.xml | 2 +- lms/nladmin-system/src/main/resources/logback-spring.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/acs/nladmin-system/src/main/resources/logback-spring.xml b/acs/nladmin-system/src/main/resources/logback-spring.xml index 0494228..4edd8e5 100644 --- a/acs/nladmin-system/src/main/resources/logback-spring.xml +++ b/acs/nladmin-system/src/main/resources/logback-spring.xml @@ -12,7 +12,7 @@ https://juejin.cn/post/6844903775631572999 nlAdmin + value="%black(%contextName-) %red(%d{yyyy-MM-dd HH:mm:ss.SSS}) %green([%thread]) %highlight(%-5level) %boldMagenta(%logger{36}) - %gray(%msg%n)"/> diff --git a/lms/nladmin-system/src/main/resources/logback-spring.xml b/lms/nladmin-system/src/main/resources/logback-spring.xml index dbc1ded..3e68ee7 100644 --- a/lms/nladmin-system/src/main/resources/logback-spring.xml +++ b/lms/nladmin-system/src/main/resources/logback-spring.xml @@ -12,7 +12,7 @@ https://juejin.cn/post/6844903775631572999 nlAdmin + value="%black(%contextName-) %red(%d{yyyy-MM-dd HH:mm:ss.SSS}) %green([%thread]) %highlight(%-5level) %boldMagenta(%logger{36}) - %gray(%msg%n)"/>