From badee2db259c155ece00bf33f8adb0d8f5a68a9a Mon Sep 17 00:00:00 2001
From: doum <doum>
Date: 星期三, 28 一月 2026 10:38:14 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
server/web/src/main/java/com/doumee/api/web/LoginController.java | 3 +++
server/services/src/main/java/com/doumee/biz/system/impl/SystemDictDataBizImpl.java | 1 -
server/services/lib/zos-sdk.jar | 0
server/services/src/main/java/com/doumee/biz/system/SystemDictDataBiz.java | 1 +
server/services/src/main/java/com/doumee/config/jwt/JwtTokenUtil.java | 4 +---
5 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/server/services/lib/zos-sdk.jar b/server/services/lib/zos-sdk.jar
new file mode 100644
index 0000000..e4254fb
--- /dev/null
+++ b/server/services/lib/zos-sdk.jar
Binary files differ
diff --git a/server/services/src/main/java/com/doumee/biz/system/SystemDictDataBiz.java b/server/services/src/main/java/com/doumee/biz/system/SystemDictDataBiz.java
index 9e9844b..78ace21 100644
--- a/server/services/src/main/java/com/doumee/biz/system/SystemDictDataBiz.java
+++ b/server/services/src/main/java/com/doumee/biz/system/SystemDictDataBiz.java
@@ -34,6 +34,7 @@
*/
void sort(UpdateSortDTO dto);
+
void updateByIdNew(SystemDictData systemDictData);
SystemDictData queryByCode(String dicCode, String label);
String queryCodeById(Integer id);
diff --git a/server/services/src/main/java/com/doumee/biz/system/impl/SystemDictDataBizImpl.java b/server/services/src/main/java/com/doumee/biz/system/impl/SystemDictDataBizImpl.java
index 27b3615..8c3ed57 100644
--- a/server/services/src/main/java/com/doumee/biz/system/impl/SystemDictDataBizImpl.java
+++ b/server/services/src/main/java/com/doumee/biz/system/impl/SystemDictDataBizImpl.java
@@ -51,7 +51,6 @@
systemDictDataService.updateById(systemDictData);
}
-
@Override
public void sort(UpdateSortDTO dto) {
SystemDictData dictData = systemDictDataService.findById(dto.getId());
diff --git a/server/services/src/main/java/com/doumee/config/jwt/JwtTokenUtil.java b/server/services/src/main/java/com/doumee/config/jwt/JwtTokenUtil.java
index c065f29..f0fca7a 100644
--- a/server/services/src/main/java/com/doumee/config/jwt/JwtTokenUtil.java
+++ b/server/services/src/main/java/com/doumee/config/jwt/JwtTokenUtil.java
@@ -105,9 +105,7 @@
.setExpiration(expirationDate)
.signWith(SignatureAlgorithm.HS512, jwtProperties.getSecret())
.compact();
- redisTemplate.opsForValue().set(Constants.REDIS_TOKEN_KEY+token,JSONObject.toJSONString(member)
-// , jwtProperties.getExpiration(), TimeUnit.MILLISECONDS
- );
+ redisTemplate.opsForValue().set(Constants.REDIS_TOKEN_KEY+token,JSONObject.toJSONString(member));
return token;
}
diff --git a/server/web/src/main/java/com/doumee/api/web/LoginController.java b/server/web/src/main/java/com/doumee/api/web/LoginController.java
index 4548846..0015f4f 100644
--- a/server/web/src/main/java/com/doumee/api/web/LoginController.java
+++ b/server/web/src/main/java/com/doumee/api/web/LoginController.java
@@ -48,6 +48,7 @@
@Autowired
private CategoryService categoryService;
+
@Autowired
private SystemDictDataBiz systemDictDataBiz;
@@ -84,6 +85,8 @@
String token = UUID.randomUUID().toString()+"_doumee";
response.sendRedirect(requestParam.getRediUrl()+"?token="+token);
}
+
+
private String enCode(String string) {
// TODO Auto-generated method stub
String str = "";
--
Gitblit v1.9.3