Merge remote-tracking branch 'origin/master'

doum

2026-01-28 badee2db259c155ece00bf33f8adb0d8f5a68a9a

Merge remote-tracking branch 'origin/master'

# Conflicts:
#	server/services/src/main/java/com/doumee/biz/system/SystemDictDataBiz.java
#	server/services/src/main/java/com/doumee/biz/system/impl/SystemDictDataBizImpl.java

 server/services/lib/zos-sdk.jar

Binary files differ

 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);

 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());

 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;
    }


 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 = "";