xtools/xtools-app
1
0
Fork 0
Code Pull Requests Actions Packages Projects Releases Activity

优化代码语法，token采用jwt加强

Browse Source
This commit is contained in:
xujun
2026-08-06 17:11:08 +08:00
parent 0dc12c2d2f
commit 68dbec4aea
21 changed files with 387 additions and 203 deletions
Download Patch File Download Diff File Expand all files Collapse all files
xtools-app-sys/xtools-app-sys-biz/src/main/java/xtools/app/sys/controller/SysLoginController.java
+3 -2
View File
@@ -62,9 +62,10 @@ public class SysLoginController {
public Result<TokenDto> refresh(
@Schema(description = "刷新令牌", example = "refreshToken")
@NotNull(message = "不能为空")
@PathVariable String refreshToken
@PathVariable String refreshToken,
HttpServletRequest request
) {
return Result.ok(AuthUtils.refreshToken(refreshToken));
return Result.ok(AuthUtils.refreshToken(refreshToken, AuthUtils.getUid(request)));
}
}
xtools-app-sys/xtools-app-sys-biz/src/main/java/xtools/app/sys/service/base/SysDictBaseService.java
+2 -1
View File
@@ -5,7 +5,8 @@ import com.baomidou.mybatisplus.spring.service.impl.ServiceImpl;
import org.springframework.stereotype.Component;
import xtools.app.sys.mapper.SysDictMapper;
import xtools.app.sys.model.entity.SysDict;
import static xtools.base.config.Constants.*;
import static xtools.base.config.Constants.CP_NUM1;
/**
* <p>Title : SysDictBaseService</p>
xtools-app-sys/xtools-app-sys-biz/src/main/java/xtools/app/sys/service/impl/SysAddressServiceImpl.java
-1
View File
@@ -14,7 +14,6 @@ import xtools.app.sys.model.dto.resp.SysAddressResp;
import xtools.app.sys.model.entity.SysAddress;
import xtools.app.sys.service.SysAddressService;
import xtools.app.sys.service.base.SysAddressBaseService;
import static xtools.base.config.Constants.*;
import xtools.boot.api.model.dto.Result;
import xtools.boot.cache.redis.base.RedisService;
import xtools.core.StringUtils;
xtools-app-sys/xtools-app-sys-biz/src/main/java/xtools/app/sys/service/impl/SysBaseServiceImpl.java
+4 -1
View File
@@ -26,7 +26,6 @@ import xtools.app.sys.service.SysUserPasswdRuleService;
import xtools.app.sys.service.SysUserService;
import xtools.app.sys.service.base.SysUserBaseService;
import xtools.app.sys.utils.PasswdUtils;
import static xtools.base.config.Constants.*;
import xtools.boot.api.exection.BizError;
import xtools.boot.api.exection.BizWarning;
import xtools.boot.api.model.dto.Result;
@@ -42,6 +41,10 @@ import java.util.ArrayList;
import java.util.List;
import java.util.Objects;
import static xtools.base.config.Constants.CP_NUM0;
import static xtools.base.config.Constants.CP_NUM1;
import static xtools.base.config.Constants.CP_NUM20;
/**
* <p>Title : SysBaseServiceImpl</p>
* <p>Description : SysBaseServiceImpl</p>
xtools-app-sys/xtools-app-sys-biz/src/main/java/xtools/app/sys/service/impl/SysDeptServiceImpl.java
+4 -1
View File
@@ -15,7 +15,6 @@ import xtools.app.sys.model.dto.resp.SysDeptTreeResp;
import xtools.app.sys.model.entity.SysDept;
import xtools.app.sys.service.SysDeptService;
import xtools.app.sys.service.base.SysDeptBaseService;
import static xtools.base.config.Constants.*;
import xtools.boot.api.exection.BizError;
import xtools.boot.api.exection.BizWarning;
import xtools.boot.api.model.dto.Result;
@@ -38,6 +37,10 @@ import java.util.Set;
import java.util.StringJoiner;
import java.util.stream.Collectors;
import static xtools.base.config.Constants.CP_COMMA;
import static xtools.base.config.Constants.CP_EMPTY_JSON;
import static xtools.base.config.Constants.CP_NUM1;
/**
* <p>Title : SysDeptServiceImpl</p>
* <p>Description : 部门管理表 ServiceImpl</p>
xtools-app-sys/xtools-app-sys-biz/src/main/java/xtools/app/sys/service/impl/SysDictServiceImpl.java
-1
View File
@@ -16,7 +16,6 @@ import xtools.app.sys.model.entity.SysDict;
import xtools.app.sys.service.SysDictItemService;
import xtools.app.sys.service.SysDictService;
import xtools.app.sys.service.base.SysDictBaseService;
import static xtools.base.config.Constants.*;
import xtools.boot.api.enums.StatusEnum;
import xtools.boot.api.exection.BizError;
import xtools.boot.api.exection.BizWarning;
xtools-app-sys/xtools-app-sys-biz/src/main/java/xtools/app/sys/service/impl/SysLoginServiceImpl.java
+2 -2
View File
@@ -145,7 +145,7 @@ public class SysLoginServiceImpl implements SysLoginService {
redisService.set(cacheParam.key(uid), arithmeticDto.getResult(), cacheParam.expireTime());
// 转换为base64的验证码
return "data:image/png;base64," + new String(Base64Utils.encode(imgCode));
return "data:image/png;base64," + new String(Base64Utils.encode(imgCode) == null ? new byte[0] : imgCode);
}
/**
@@ -208,7 +208,7 @@ public class SysLoginServiceImpl implements SysLoginService {
LoginUserDto loginUserDto = sysLoginConvert.entityToCacheDto(user);
loginUserDto.setRoleIds(sysUserRoleBaseService.getUserRole(user.getId()));
redisService.del(captchaKey);
return Result.ok(AuthUtils.createToken(loginUserDto));
return Result.ok(AuthUtils.createToken(loginUserDto, uid));
}
xtools-app-sys/xtools-app-sys-biz/src/main/java/xtools/app/sys/service/impl/SysNoticeServiceImpl.java
+3 -1
View File
@@ -23,7 +23,6 @@ import xtools.app.sys.service.SysUserNoticeService;
import xtools.app.sys.service.base.SysNoticeBaseService;
import xtools.app.sys.service.base.SysUserBaseService;
import xtools.app.sys.service.base.SysUserNoticeBaseService;
import static xtools.base.config.Constants.*;
import xtools.boot.api.exection.BizError;
import xtools.boot.api.exection.BizWarning;
import xtools.boot.api.model.dto.Result;
@@ -41,6 +40,9 @@ import java.util.Map;
import java.util.Objects;
import java.util.stream.Collectors;
import static xtools.base.config.Constants.CP_NUM1;
import static xtools.base.config.Constants.CP_NUM2;
/**
* <p>Title : SysNoticeServiceImpl</p>
* <p>Description : 系统通知公告表 ServiceImpl</p>
xtools-app-sys/xtools-app-sys-biz/src/main/java/xtools/app/sys/service/impl/SysPasswdServiceImpl.java
+4 -1
View File
@@ -6,7 +6,6 @@ import org.springframework.stereotype.Service;
import xtools.app.sys.model.entity.SysUserPasswdRule;
import xtools.app.sys.service.SysPasswdService;
import xtools.app.sys.service.SysUserPasswdRuleService;
import static xtools.base.config.Constants.*;
import xtools.boot.api.exection.BizError;
import xtools.boot.api.exection.BizWarning;
import xtools.core.StringUtils;
@@ -16,6 +15,10 @@ import java.util.Set;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
import static xtools.base.config.Constants.CP_EMPTY;
import static xtools.base.config.Constants.CP_NUM0;
import static xtools.base.config.Constants.CP_NUM3;
/**
* <p>Title : SysPasswdServiceImpl</p>
* <p>Description : SysPasswdServiceImpl</p>
xtools-app-sys/xtools-app-sys-biz/src/main/java/xtools/app/sys/service/impl/SysUserNoticeInfoServiceImpl.java
+2 -1
View File
@@ -17,7 +17,6 @@ import xtools.app.sys.service.SysUserNoticeInfoService;
import xtools.app.sys.service.base.SysNoticeBaseService;
import xtools.app.sys.service.base.SysUserNoticeBaseService;
import xtools.app.sys.service.base.SysUserNoticeInfoBaseService;
import static xtools.base.config.Constants.*;
import xtools.boot.api.enums.DeleteEnum;
import xtools.boot.api.exection.BizError;
import xtools.boot.api.model.dto.Result;
@@ -31,6 +30,8 @@ import java.time.Instant;
import java.util.List;
import java.util.Objects;
import static xtools.base.config.Constants.CP_NUM1;
/**
* <p>Title : SysUserNoticeInfoServiceImpl</p>
* <p>Description : 系统用户通知公告信息表 ServiceImpl</p>
xtools-app-sys/xtools-app-sys-biz/src/main/java/xtools/app/sys/service/impl/SysUserServiceImpl.java
+2 -1
View File
@@ -23,7 +23,6 @@ import xtools.app.sys.service.base.SysDeptBaseService;
import xtools.app.sys.service.base.SysUserBaseService;
import xtools.app.sys.service.base.SysUserRoleBaseService;
import xtools.app.sys.utils.PasswdUtils;
import static xtools.base.config.Constants.*;
import xtools.boot.api.exection.BizError;
import xtools.boot.api.exection.BizWarning;
import xtools.boot.api.model.dto.Result;
@@ -46,6 +45,8 @@ import java.util.ArrayList;
import java.util.List;
import java.util.Objects;
import static xtools.base.config.Constants.CP_NUM0;
/**
* <p>Title : SysUserServiceImpl</p>
* <p>Description : 系统用户表 ServiceImpl</p>