odboy/cutejava
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

refactor(core): rename Cs prefix to Kit for base classes and utilities

Browse Source 
- Renamed CsArgs to KitArgs and updated internal references
- Renamed CsBaseCreateTimeTb to KitBaseCreateTimeTb and extended KitObject
- Renamed CsBaseTimeTb to KitBaseTimeTb and extended KitObject
- Renamed CsBaseUpdateTimeTb to KitBaseUpdateTimeTb and extended KitObject
- Renamed CsBaseUserCreateTimeTb to KitBaseUserCreateTimeTb and extended KitObject
- Renamed CsBaseUserTimeLogicTb to KitBaseUserTimeLogicTb and extended KitObject
- Renamed CsBaseUserTimeTb to KitBaseUserTimeTb and extended KitObject
- Renamed CsObject to KitObject as base serializable class
- Renamed CsPageArgs to KitPageArgs and kept same generic structure
- Renamed CsPageResult to KitPageResult and updated factory methods
- Renamed CsSelectOptionVo to KitSelectOptionVo and extended KitObject
- Updated BootApplication to use KitSpringBeanHolder instead of CsSpringBeanHolder
- Renamed CsRequestHolder to KitRequestHolder and kept same functionality
- Renamed CsScriptHelper to KitScriptHelper and maintained component behavior
- Renamed CsSpringBeanHolder to KitSpringBeanHolder and updated internal usage
- Updated SwaggerConfig to import KitAnonTagUtil instead of CsAnonTagUtil
- Renamed CsHealthCheckPointService to KitHealthCheckPointService in controller and service layers
- Renamed CsMpQTypeEnum to KitMpQTypeEnum for dynamic query types
- Renamed CsMpQuery annotation to KitMpQuery and updated default type reference
- Renamed CsMpMapper to KitMpMapper and updated imports for page utilities
- Renamed CsMpService to KitMpService and updated page result references
- Renamed CsMpServiceImpl to KitMpServiceImpl and updated query utility usage
- Renamed CsMpAnyQUtil to KitMpAnyQUtil and updated internal query builder calls
- Renamed CsMpCmdGenUtil to KitMpCmdGenUtil and updated superclass reference
- Renamed CsMpQUtil to KitMpQUtil and updated annotation and handler references
- Updated model classes (CaptchaModel, ContentRsaEncodeSettingModel, JwtAuthSettingModel, OSSConfigModel) to extend KitObject instead of CsObject
This commit is contained in:
odboy
2025-11-28 15:58:37 +08:00
parent b1fdced5cc
commit 6e3061cf04
289 changed files with 6483 additions and 6482 deletions
Download Patch File Download Diff File Expand all files Collapse all files
cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/controller/SystemAuthController.java
+6 -6
View File
@@ -24,16 +24,16 @@ import cn.odboy.constant.CaptchaCodeEnum;
import cn.odboy.constant.SystemConst;
import cn.odboy.framework.exception.BadRequestException;
import cn.odboy.framework.properties.AppProperties;
import cn.odboy.framework.redis.CsRedisHelper;
import cn.odboy.framework.redis.KitRedisHelper;
import cn.odboy.system.dal.model.SystemUserInfoVo;
import cn.odboy.system.dal.model.SystemUserJwtVo;
import cn.odboy.system.dal.model.SystemUserLoginArgs;
import cn.odboy.system.dal.redis.SystemCacheKey;
import cn.odboy.system.dal.redis.SystemUserOnlineInfoDAO;
import cn.odboy.system.framework.permission.core.CsSecurityHelper;
import cn.odboy.system.framework.permission.core.KitSecurityHelper;
import cn.odboy.system.framework.permission.core.handler.TokenProvider;
import cn.odboy.system.framework.permission.core.handler.UserDetailsHandler;
import cn.odboy.util.CsRsaEncryptUtil;
import cn.odboy.util.KitRsaEncryptUtil;
import com.wf.captcha.base.Captcha;
import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.tags.Tag;
@@ -64,7 +64,7 @@ import java.util.concurrent.TimeUnit;
@Tag(name = "系统：系统授权接口")
public class SystemAuthController {
@Autowired
private CsRedisHelper redisHelper;
private KitRedisHelper redisHelper;
@Autowired
private SystemUserOnlineInfoDAO systemUserOnlineInfoDAO;
@Autowired
@@ -80,7 +80,7 @@ public class SystemAuthController {
@AnonymousPostMapping(value = "/login")
public ResponseEntity<Map<String, Object>> login(@Validated @RequestBody SystemUserLoginArgs loginRequest, HttpServletRequest request) throws Exception {
// 密码解密
String password = CsRsaEncryptUtil.decryptByPrivateKey(properties.getRsa().getPrivateKey(), loginRequest.getPassword());
String password = KitRsaEncryptUtil.decryptByPrivateKey(properties.getRsa().getPrivateKey(), loginRequest.getPassword());
// 查询验证码
String code = redisHelper.get(loginRequest.getUuid(), String.class);
// 清除验证码
@@ -119,7 +119,7 @@ public class SystemAuthController {
@Operation(summary = "获取用户信息")
@PostMapping(value = "/info")
public ResponseEntity<SystemUserInfoVo> getUserInfo() {
SystemUserJwtVo jwtUser = (SystemUserJwtVo)CsSecurityHelper.getCurrentUser();
SystemUserJwtVo jwtUser = (SystemUserJwtVo) KitSecurityHelper.getCurrentUser();
SystemUserInfoVo userInfoVo = BeanUtil.copyProperties(jwtUser, SystemUserInfoVo.class);
return ResponseEntity.ok(userInfoVo);
}
cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/controller/SystemDeptController.java
+7 -7
View File
@@ -16,13 +16,13 @@
package cn.odboy.system.controller;
import cn.odboy.base.CsPageArgs;
import cn.odboy.base.CsPageResult;
import cn.odboy.base.KitPageArgs;
import cn.odboy.base.KitPageResult;
import cn.odboy.system.dal.dataobject.SystemDeptTb;
import cn.odboy.system.dal.model.SystemCreateDeptArgs;
import cn.odboy.system.dal.model.SystemQueryDeptArgs;
import cn.odboy.system.service.SystemDeptService;
import cn.odboy.util.CsPageUtil;
import cn.odboy.util.KitPageUtil;
import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.tags.Tag;
import jakarta.servlet.http.HttpServletResponse;
@@ -54,17 +54,17 @@ public class SystemDeptController {
@Operation(summary = "查询部门")
@PostMapping
@PreAuthorize("@el.check('user:list','dept:list')")
public ResponseEntity<CsPageResult<SystemDeptTb>> queryDept(@Validated @RequestBody CsPageArgs<SystemQueryDeptArgs> args) throws Exception {
public ResponseEntity<KitPageResult<SystemDeptTb>> queryDept(@Validated @RequestBody KitPageArgs<SystemQueryDeptArgs> args) throws Exception {
SystemQueryDeptArgs criteria = args.getArgs();
List<SystemDeptTb> depts = systemDeptService.queryAllDept(criteria, true);
return ResponseEntity.ok(CsPageUtil.toPage(depts));
return ResponseEntity.ok(KitPageUtil.toPage(depts));
}
@Operation(summary = "查询部门:根据ID获取同级与上级数据")
@PostMapping("/queryDeptSuperiorTree")
@PreAuthorize("@el.check('user:list','dept:list')")
public ResponseEntity<CsPageResult<SystemDeptTb>> queryDeptSuperiorTree(@RequestBody List<Long> ids,
@RequestParam(defaultValue = "false") Boolean exclude) {
public ResponseEntity<KitPageResult<SystemDeptTb>> queryDeptSuperiorTree(@RequestBody List<Long> ids,
@RequestParam(defaultValue = "false") Boolean exclude) {
Set<SystemDeptTb> deptSet = new LinkedHashSet<>();
for (Long id : ids) {
// 同级数据
cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/controller/SystemDictController.java
+3 -3
View File
@@ -16,8 +16,8 @@
package cn.odboy.system.controller;
import cn.odboy.base.CsPageArgs;
import cn.odboy.base.CsPageResult;
import cn.odboy.base.KitPageArgs;
import cn.odboy.base.KitPageResult;
import cn.odboy.system.dal.dataobject.SystemDictTb;
import cn.odboy.system.dal.model.SystemCreateDictArgs;
import cn.odboy.system.dal.model.SystemQueryDictArgs;
@@ -60,7 +60,7 @@ public class SystemDictController {
@Operation(summary = "查询字典")
@PostMapping
@PreAuthorize("@el.check('dict:list')")
public ResponseEntity<CsPageResult<SystemDictTb>> queryDictByArgs(@Validated @RequestBody CsPageArgs<SystemQueryDictArgs> args) {
public ResponseEntity<KitPageResult<SystemDictTb>> queryDictByArgs(@Validated @RequestBody KitPageArgs<SystemQueryDictArgs> args) {
Page<SystemDictTb> page;
SystemQueryDictArgs criteria = args.getArgs();
if (args.getSize() != null) {
cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/controller/SystemDictDetailController.java
+4 -4
View File
@@ -16,8 +16,8 @@
package cn.odboy.system.controller;
import cn.odboy.base.CsPageArgs;
import cn.odboy.base.CsPageResult;
import cn.odboy.base.KitPageArgs;
import cn.odboy.base.KitPageResult;
import cn.odboy.system.dal.dataobject.SystemDictDetailTb;
import cn.odboy.system.dal.model.SystemCreateDictDetailArgs;
import cn.odboy.system.dal.model.SystemQueryDictDetailArgs;
@@ -44,13 +44,13 @@ public class SystemDictDetailController {
@Operation(summary = "查询字典详情")
@PostMapping
public ResponseEntity<CsPageResult<SystemDictDetailTb>> queryDictDetailByCrud(@Validated @RequestBody CsPageArgs<SystemQueryDictDetailArgs> args) {
public ResponseEntity<KitPageResult<SystemDictDetailTb>> queryDictDetailByCrud(@Validated @RequestBody KitPageArgs<SystemQueryDictDetailArgs> args) {
return queryDictDetailByArgs(args);
}
@Operation(summary = "查询字典详情")
@PostMapping(value = "/queryDictDetailByArgs")
public ResponseEntity<CsPageResult<SystemDictDetailTb>> queryDictDetailByArgs(@Validated @RequestBody CsPageArgs<SystemQueryDictDetailArgs> args) {
public ResponseEntity<KitPageResult<SystemDictDetailTb>> queryDictDetailByArgs(@Validated @RequestBody KitPageArgs<SystemQueryDictDetailArgs> args) {
SystemQueryDictDetailArgs criteria = args.getArgs();
Page<Object> page = new Page<>(args.getPage(), args.getSize());
return ResponseEntity.ok(systemDictDetailService.queryDictDetailByArgs(criteria, page));
cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/controller/SystemJobController.java
+4 -4
View File
@@ -16,8 +16,8 @@
package cn.odboy.system.controller;
import cn.odboy.base.CsPageArgs;
import cn.odboy.base.CsPageResult;
import cn.odboy.base.KitPageArgs;
import cn.odboy.base.KitPageResult;
import cn.odboy.system.dal.dataobject.SystemJobTb;
import cn.odboy.system.dal.model.SystemCreateJobArgs;
import cn.odboy.system.dal.model.SystemQueryJobArgs;
@@ -52,7 +52,7 @@ public class SystemJobController {
@Operation(summary = "查询岗位")
@PostMapping(value = "/queryAllEnableJob")
@PreAuthorize("@el.check('job:list','user:list')")
public ResponseEntity<CsPageResult<SystemJobTb>> queryJobByArgs(@Validated @RequestBody CsPageArgs<SystemQueryJobArgs> args) {
public ResponseEntity<KitPageResult<SystemJobTb>> queryJobByArgs(@Validated @RequestBody KitPageArgs<SystemQueryJobArgs> args) {
SystemQueryJobArgs criteria = args.getArgs();
Page<SystemJobTb> page = new Page<>(criteria.getPage(), criteria.getSize());
return ResponseEntity.ok(systemJobService.queryJobByArgs(criteria, page));
@@ -61,7 +61,7 @@ public class SystemJobController {
@Operation(summary = "查询岗位")
@PostMapping
@PreAuthorize("@el.check('job:list','user:list')")
public ResponseEntity<CsPageResult<SystemJobTb>> queryJobByCrud(@Validated @RequestBody CsPageArgs<SystemQueryJobArgs> args) {
public ResponseEntity<KitPageResult<SystemJobTb>> queryJobByCrud(@Validated @RequestBody KitPageArgs<SystemQueryJobArgs> args) {
return queryJobByArgs(args);
}
cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/controller/SystemLocalStorageController.java
+6 -6
View File
@@ -16,14 +16,14 @@
package cn.odboy.system.controller;
import cn.odboy.base.CsPageArgs;
import cn.odboy.base.CsPageResult;
import cn.odboy.base.KitPageArgs;
import cn.odboy.base.KitPageResult;
import cn.odboy.constant.FileTypeEnum;
import cn.odboy.framework.exception.BadRequestException;
import cn.odboy.system.dal.dataobject.SystemLocalStorageTb;
import cn.odboy.system.dal.model.SystemQueryStorageArgs;
import cn.odboy.system.service.SystemLocalStorageService;
import cn.odboy.util.CsFileUtil;
import cn.odboy.util.KitFileUtil;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.tags.Tag;
@@ -47,7 +47,7 @@ public class SystemLocalStorageController {
@Operation(summary = "查询文件")
@PostMapping
@PreAuthorize("@el.check('storage:list')")
public ResponseEntity<CsPageResult<SystemLocalStorageTb>> queryLocalStorage(@Validated @RequestBody CsPageArgs<SystemQueryStorageArgs> args) {
public ResponseEntity<KitPageResult<SystemLocalStorageTb>> queryLocalStorage(@Validated @RequestBody KitPageArgs<SystemQueryStorageArgs> args) {
SystemQueryStorageArgs criteria = args.getArgs();
Page<SystemLocalStorageTb> page = new Page<>(criteria.getPage(), criteria.getSize());
return ResponseEntity.ok(localStorageService.queryLocalStorage(criteria, page));
@@ -72,8 +72,8 @@ public class SystemLocalStorageController {
@PostMapping("/uploadPicture")
public ResponseEntity<SystemLocalStorageTb> uploadPicture(@RequestParam MultipartFile file) {
// 判断文件是否为图片
String suffix = CsFileUtil.getSuffix(file.getOriginalFilename());
if (!FileTypeEnum.IMAGE.getCode().equals(CsFileUtil.getFileType(suffix))) {
String suffix = KitFileUtil.getSuffix(file.getOriginalFilename());
if (!FileTypeEnum.IMAGE.getCode().equals(KitFileUtil.getFileType(suffix))) {
throw new BadRequestException("只能上传图片");
}
SystemLocalStorageTb localStorage = localStorageService.uploadFile(null, file);
cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/controller/SystemMenuController.java
+8 -8
View File
@@ -17,16 +17,16 @@
package cn.odboy.system.controller;
import cn.hutool.core.collection.CollectionUtil;
import cn.odboy.base.CsPageArgs;
import cn.odboy.base.CsPageResult;
import cn.odboy.base.KitPageArgs;
import cn.odboy.base.KitPageResult;
import cn.odboy.framework.exception.BadRequestException;
import cn.odboy.system.dal.dataobject.SystemMenuTb;
import cn.odboy.system.dal.model.SystemMenuVo;
import cn.odboy.system.dal.model.SystemQueryMenuArgs;
import cn.odboy.system.dal.mysql.SystemMenuMapper;
import cn.odboy.system.framework.permission.core.CsSecurityHelper;
import cn.odboy.system.framework.permission.core.KitSecurityHelper;
import cn.odboy.system.service.SystemMenuService;
import cn.odboy.util.CsPageUtil;
import cn.odboy.util.KitPageUtil;
import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.tags.Tag;
import jakarta.servlet.http.HttpServletResponse;
@@ -58,7 +58,7 @@ public class SystemMenuController {
@PostMapping(value = "/buildMenus")
@Operation(summary = "获取前端所需菜单")
public ResponseEntity<List<SystemMenuVo>> buildMenus() {
List<SystemMenuTb> menuList = systemMenuService.queryMenuListByUserId(CsSecurityHelper.getCurrentUserId());
List<SystemMenuTb> menuList = systemMenuService.queryMenuListByUserId(KitSecurityHelper.getCurrentUserId());
List<SystemMenuTb> menus = systemMenuService.buildMenuTree(menuList);
return ResponseEntity.ok(systemMenuService.buildMenuVo(menus));
}
@@ -85,17 +85,17 @@ public class SystemMenuController {
@PostMapping
@Operation(summary = "查询菜单")
@PreAuthorize("@el.check('menu:list')")
public ResponseEntity<CsPageResult<SystemMenuTb>> queryAllMenuByCrud(@Validated @RequestBody CsPageArgs<SystemQueryMenuArgs> args) throws Exception {
public ResponseEntity<KitPageResult<SystemMenuTb>> queryAllMenuByCrud(@Validated @RequestBody KitPageArgs<SystemQueryMenuArgs> args) throws Exception {
return queryAllMenu(args);
}
@PostMapping(value = "/queryMenuByArgs")
@Operation(summary = "查询菜单")
@PreAuthorize("@el.check('menu:list')")
public ResponseEntity<CsPageResult<SystemMenuTb>> queryAllMenu(@Validated @RequestBody CsPageArgs<SystemQueryMenuArgs> args) throws Exception {
public ResponseEntity<KitPageResult<SystemMenuTb>> queryAllMenu(@Validated @RequestBody KitPageArgs<SystemQueryMenuArgs> args) throws Exception {
SystemQueryMenuArgs criteria = args.getArgs();
List<SystemMenuTb> menuList = systemMenuService.queryAllMenu(criteria, true);
return ResponseEntity.ok(CsPageUtil.toPage(menuList));
return ResponseEntity.ok(KitPageUtil.toPage(menuList));
}
@Operation(summary = "查询菜单:根据ID获取同级与上级数据")
cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/controller/SystemOnlineController.java
+5 -5
View File
@@ -16,11 +16,11 @@
package cn.odboy.system.controller;
import cn.odboy.base.CsPageArgs;
import cn.odboy.base.CsPageResult;
import cn.odboy.base.KitPageArgs;
import cn.odboy.base.KitPageResult;
import cn.odboy.system.dal.model.SystemUserOnlineVo;
import cn.odboy.system.dal.redis.SystemUserOnlineInfoDAO;
import cn.odboy.util.CsDesEncryptUtil;
import cn.odboy.util.KitDesEncryptUtil;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import io.swagger.v3.oas.annotations.Operation;
@@ -45,7 +45,7 @@ public class SystemOnlineController {
@Operation(summary = "查询在线用户")
@PostMapping
@PreAuthorize("@el.check()")
public ResponseEntity<CsPageResult<SystemUserOnlineVo>> queryOnlineUser(@Validated @RequestBody CsPageArgs<SystemUserOnlineVo> args) {
public ResponseEntity<KitPageResult<SystemUserOnlineVo>> queryOnlineUser(@Validated @RequestBody KitPageArgs<SystemUserOnlineVo> args) {
IPage<SystemUserOnlineVo> page = new Page<>(args.getPage(), args.getSize());
return ResponseEntity.ok(systemUserOnlineInfoDAO.queryUserOnlineModelPage(args.getArgs(), page));
}
@@ -63,7 +63,7 @@ public class SystemOnlineController {
public ResponseEntity<Void> kickOutUser(@RequestBody Set<String> keys) throws Exception {
for (String token : keys) {
// 解密Key
token = CsDesEncryptUtil.desDecrypt(token);
token = KitDesEncryptUtil.desDecrypt(token);
systemUserOnlineInfoDAO.logoutByToken(token);
}
return ResponseEntity.ok(null);
cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/controller/SystemOssStorageController.java
+3 -3
View File
@@ -16,8 +16,8 @@
package cn.odboy.system.controller;
import cn.odboy.base.CsPageArgs;
import cn.odboy.base.CsPageResult;
import cn.odboy.base.KitPageArgs;
import cn.odboy.base.KitPageResult;
import cn.odboy.system.dal.dataobject.SystemOssStorageTb;
import cn.odboy.system.dal.model.SystemOssStorageVo;
import cn.odboy.system.dal.model.SystemQueryStorageArgs;
@@ -47,7 +47,7 @@ public class SystemOssStorageController {
@Operation(summary = "查询文件")
@PostMapping
@PreAuthorize("@el.check('storage:list')")
public ResponseEntity<CsPageResult<SystemOssStorageVo>> queryOssStorage(@Validated @RequestBody CsPageArgs<SystemQueryStorageArgs> args) {
public ResponseEntity<KitPageResult<SystemOssStorageVo>> queryOssStorage(@Validated @RequestBody KitPageArgs<SystemQueryStorageArgs> args) {
SystemQueryStorageArgs criteria = args.getArgs();
Page<SystemOssStorageTb> page = new Page<>(criteria.getPage(), criteria.getSize());
return ResponseEntity.ok(systemOssStorageService.queryOssStorage(criteria, page));
cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/controller/SystemQuartzJobController.java
+6 -6
View File
@@ -16,9 +16,9 @@
package cn.odboy.system.controller;
import cn.odboy.base.CsPageArgs;
import cn.odboy.base.CsPageResult;
import cn.odboy.framework.context.CsSpringBeanHolder;
import cn.odboy.base.KitPageArgs;
import cn.odboy.base.KitPageResult;
import cn.odboy.framework.context.KitSpringBeanHolder;
import cn.odboy.framework.exception.BadRequestException;
import cn.odboy.system.dal.dataobject.SystemQuartzJobTb;
import cn.odboy.system.dal.dataobject.SystemQuartzLogTb;
@@ -50,7 +50,7 @@ public class SystemQuartzJobController {
@Operation(summary = "查询定时任务")
@PostMapping
@PreAuthorize("@el.check('quartzJob:list')")
public ResponseEntity<CsPageResult<SystemQuartzJobTb>> queryQuartzJobByCrud(@Validated @RequestBody CsPageArgs<SystemQueryQuartzJobArgs> args) {
public ResponseEntity<KitPageResult<SystemQuartzJobTb>> queryQuartzJobByCrud(@Validated @RequestBody KitPageArgs<SystemQueryQuartzJobArgs> args) {
SystemQueryQuartzJobArgs criteria = args.getArgs();
Page<SystemQuartzJobTb> page = new Page<>(criteria.getPage(), criteria.getSize());
return ResponseEntity.ok(systemQuartzJobService.queryQuartzJobByArgs(criteria, page));
@@ -73,7 +73,7 @@ public class SystemQuartzJobController {
@Operation(summary = "查询任务执行日志")
@PostMapping(value = "/logs")
@PreAuthorize("@el.check('quartzJob:list')")
public ResponseEntity<CsPageResult<SystemQuartzLogTb>> queryQuartzJobLog(SystemQueryQuartzJobArgs args) {
public ResponseEntity<KitPageResult<SystemQuartzLogTb>> queryQuartzJobLog(SystemQueryQuartzJobArgs args) {
Page<SystemQuartzLogTb> page = new Page<>(args.getPage(), args.getSize());
return ResponseEntity.ok(systemQuartzJobService.queryQuartzLogByArgs(args, page));
}
@@ -133,7 +133,7 @@ public class SystemQuartzJobController {
private void checkBean(String beanName) {
// 避免调用攻击者可以从SpringContextHolder获得控制jdbcTemplate类
// 并使用getDeclaredMethod调用jdbcTemplate的queryForMap函数，执行任意sql命令。
if (!CsSpringBeanHolder.getAllServiceBeanName().contains(beanName)) {
if (!KitSpringBeanHolder.getAllServiceBeanName().contains(beanName)) {
throw new BadRequestException("非法的 Bean，请重新输入！");
}
}
cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/controller/SystemRoleController.java
+5 -5
View File
@@ -17,13 +17,13 @@
package cn.odboy.system.controller;
import cn.hutool.core.lang.Dict;
import cn.odboy.base.CsPageArgs;
import cn.odboy.base.CsPageResult;
import cn.odboy.base.KitPageArgs;
import cn.odboy.base.KitPageResult;
import cn.odboy.framework.exception.BadRequestException;
import cn.odboy.system.dal.dataobject.SystemRoleTb;
import cn.odboy.system.dal.model.SystemCreateRoleArgs;
import cn.odboy.system.dal.model.SystemQueryRoleArgs;
import cn.odboy.system.framework.permission.core.CsSecurityHelper;
import cn.odboy.system.framework.permission.core.KitSecurityHelper;
import cn.odboy.system.service.SystemRoleService;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import io.swagger.v3.oas.annotations.Operation;
@@ -71,7 +71,7 @@ public class SystemRoleController {
@Operation(summary = "查询角色")
@PostMapping
@PreAuthorize("@el.check('roles:list')")
public ResponseEntity<CsPageResult<SystemRoleTb>> queryRoleByArgs(@Validated @RequestBody CsPageArgs<SystemQueryRoleArgs> args) {
public ResponseEntity<KitPageResult<SystemRoleTb>> queryRoleByArgs(@Validated @RequestBody KitPageArgs<SystemQueryRoleArgs> args) {
SystemQueryRoleArgs criteria = args.getArgs();
Page<Object> page = new Page<>(criteria.getPage(), criteria.getSize());
return ResponseEntity.ok(systemRoleService.queryRoleByArgs(criteria, page));
@@ -131,7 +131,7 @@ public class SystemRoleController {
* @return /
*/
private int checkRoleLevels(Integer level) {
List<Integer> levels = systemRoleService.queryRoleByUsersId(CsSecurityHelper.getCurrentUserId()).stream().map(SystemRoleTb::getLevel).toList();
List<Integer> levels = systemRoleService.queryRoleByUsersId(KitSecurityHelper.getCurrentUserId()).stream().map(SystemRoleTb::getLevel).toList();
int min = Collections.min(levels);
if (level != null) {
if (level < min) {
cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/controller/SystemUserController.java
+20 -20
View File
@@ -17,9 +17,9 @@
package cn.odboy.system.controller;
import cn.hutool.core.collection.CollectionUtil;
import cn.odboy.base.CsPageArgs;
import cn.odboy.base.CsPageResult;
import cn.odboy.base.CsSelectOptionVo;
import cn.odboy.base.KitPageArgs;
import cn.odboy.base.KitPageResult;
import cn.odboy.base.KitSelectOptionVo;
import cn.odboy.framework.exception.BadRequestException;
import cn.odboy.framework.properties.AppProperties;
import cn.odboy.system.constant.SystemCaptchaBizEnum;
@@ -28,10 +28,10 @@ import cn.odboy.system.dal.dataobject.SystemRoleTb;
import cn.odboy.system.dal.dataobject.SystemUserTb;
import cn.odboy.system.dal.model.SystemQueryUserArgs;
import cn.odboy.system.dal.model.SystemUpdateUserPasswordArgs;
import cn.odboy.system.framework.permission.core.CsSecurityHelper;
import cn.odboy.system.framework.permission.core.KitSecurityHelper;
import cn.odboy.system.service.*;
import cn.odboy.util.CsPageUtil;
import cn.odboy.util.CsRsaEncryptUtil;
import cn.odboy.util.KitPageUtil;
import cn.odboy.util.KitRsaEncryptUtil;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import io.swagger.v3.oas.annotations.Operation;
@@ -79,7 +79,7 @@ public class SystemUserController {
@Operation(summary = "查询用户")
@PostMapping
@PreAuthorize("@el.check('user:list')")
public ResponseEntity<CsPageResult<SystemUserTb>> queryUserByArgs(@Validated @RequestBody CsPageArgs<SystemQueryUserArgs> args) {
public ResponseEntity<KitPageResult<SystemUserTb>> queryUserByArgs(@Validated @RequestBody KitPageArgs<SystemQueryUserArgs> args) {
Page<SystemUserTb> page = new Page<>(args.getPage(), args.getSize());
SystemQueryUserArgs criteria = args.getArgs();
if (!ObjectUtils.isEmpty(criteria.getDeptId())) {
@@ -90,7 +90,7 @@ public class SystemUserController {
criteria.getDeptIds().addAll(systemDeptService.queryChildDeptIdListByDeptIds(data));
}
// 数据权限
List<Long> dataScopes = systemDataService.queryDeptIdListByArgs(systemUserService.getUserByUsername(CsSecurityHelper.getCurrentUsername()));
List<Long> dataScopes = systemDataService.queryDeptIdListByArgs(systemUserService.getUserByUsername(KitSecurityHelper.getCurrentUsername()));
// criteria.getDeptIds() 不为空并且数据权限不为空则取交集
if (!CollectionUtils.isEmpty(criteria.getDeptIds()) && !CollectionUtils.isEmpty(dataScopes)) {
// 取交集
@@ -103,7 +103,7 @@ public class SystemUserController {
criteria.getDeptIds().addAll(dataScopes);
return ResponseEntity.ok(systemUserService.queryUserByArgs(criteria, page));
}
return ResponseEntity.ok(CsPageUtil.emptyData());
return ResponseEntity.ok(KitPageUtil.emptyData());
}
@Operation(summary = "新增用户")
@@ -129,7 +129,7 @@ public class SystemUserController {
@Operation(summary = "修改用户：个人中心")
@PostMapping(value = "modifyUserCenterInfoById")
public ResponseEntity<Object> modifyUserCenterInfoById(@Validated(SystemUserTb.Update.class) @RequestBody SystemUserTb args) {
if (!args.getId().equals(CsSecurityHelper.getCurrentUserId())) {
if (!args.getId().equals(KitSecurityHelper.getCurrentUserId())) {
throw new BadRequestException("不能修改他人资料");
}
systemUserService.modifyUserCenterInfoById(args);
@@ -142,7 +142,7 @@ public class SystemUserController {
public ResponseEntity<Object> removeUserByIds(@RequestBody Set<Long> ids) {
for (Long id : ids) {
Integer currentLevel =
Collections.min(systemRoleService.queryRoleByUsersId(CsSecurityHelper.getCurrentUserId()).stream().map(SystemRoleTb::getLevel).toList());
Collections.min(systemRoleService.queryRoleByUsersId(KitSecurityHelper.getCurrentUserId()).stream().map(SystemRoleTb::getLevel).toList());
Integer optLevel = Collections.min(systemRoleService.queryRoleByUsersId(id).stream().map(SystemRoleTb::getLevel).toList());
if (currentLevel > optLevel) {
throw new BadRequestException("角色权限不足, 不能删除：" + systemUserService.getUserById(id).getUsername());
@@ -155,9 +155,9 @@ public class SystemUserController {
@Operation(summary = "修改密码")
@PostMapping(value = "/modifyUserPasswordByUsername")
public ResponseEntity<Object> modifyUserPasswordByUsername(@RequestBody SystemUpdateUserPasswordArgs passVo) throws Exception {
String oldPass = CsRsaEncryptUtil.decryptByPrivateKey(properties.getRsa().getPrivateKey(), passVo.getOldPass());
String newPass = CsRsaEncryptUtil.decryptByPrivateKey(properties.getRsa().getPrivateKey(), passVo.getNewPass());
SystemUserTb user = systemUserService.getUserByUsername(CsSecurityHelper.getCurrentUsername());
String oldPass = KitRsaEncryptUtil.decryptByPrivateKey(properties.getRsa().getPrivateKey(), passVo.getOldPass());
String newPass = KitRsaEncryptUtil.decryptByPrivateKey(properties.getRsa().getPrivateKey(), passVo.getNewPass());
SystemUserTb user = systemUserService.getUserByUsername(KitSecurityHelper.getCurrentUsername());
if (!passwordEncoder.matches(oldPass, user.getPassword())) {
throw new BadRequestException("修改失败，旧密码错误");
}
@@ -185,8 +185,8 @@ public class SystemUserController {
@Operation(summary = "修改邮箱")
@PostMapping(value = "/modifyUserEmailByUsername/{code}")
public ResponseEntity<Object> modifyUserEmailByUsername(@PathVariable String code, @RequestBody SystemUserTb args) throws Exception {
String password = CsRsaEncryptUtil.decryptByPrivateKey(properties.getRsa().getPrivateKey(), args.getPassword());
SystemUserTb user = systemUserService.getUserByUsername(CsSecurityHelper.getCurrentUsername());
String password = KitRsaEncryptUtil.decryptByPrivateKey(properties.getRsa().getPrivateKey(), args.getPassword());
SystemUserTb user = systemUserService.getUserByUsername(KitSecurityHelper.getCurrentUsername());
if (!passwordEncoder.matches(password, user.getPassword())) {
throw new BadRequestException("密码错误");
}
@@ -202,7 +202,7 @@ public class SystemUserController {
*/
private void checkLevel(SystemUserTb args) {
Integer currentLevel =
Collections.min(systemRoleService.queryRoleByUsersId(CsSecurityHelper.getCurrentUserId()).stream().map(SystemRoleTb::getLevel).toList());
Collections.min(systemRoleService.queryRoleByUsersId(KitSecurityHelper.getCurrentUserId()).stream().map(SystemRoleTb::getLevel).toList());
Integer optLevel = systemRoleService.getDeptLevelByRoles(args.getRoles());
if (currentLevel > optLevel) {
throw new BadRequestException("角色权限不足");
@@ -212,7 +212,7 @@ public class SystemUserController {
@Operation(summary = "查询用户基础数据")
@PostMapping(value = "/queryUserMetadataOptions")
@PreAuthorize("@el.check('user:list')")
public ResponseEntity<List<CsSelectOptionVo>> queryUserMetadataOptions(@Validated @RequestBody CsPageArgs<SystemQueryUserArgs> args) {
public ResponseEntity<List<KitSelectOptionVo>> queryUserMetadataOptions(@Validated @RequestBody KitPageArgs<SystemQueryUserArgs> args) {
int maxPageSize = 50;
SystemQueryUserArgs criteria = args.getArgs();
LambdaQueryWrapper<SystemUserTb> wrapper = new LambdaQueryWrapper<>();
@@ -225,14 +225,14 @@ public class SystemUserController {
c.or();
c.like(SystemUserTb::getNickName, criteria.getBlurry());
});
List<CsSelectOptionVo> collect =
List<KitSelectOptionVo> collect =
systemUserService.queryUserByBlurry(wrapper, new Page<>(criteria.getPage(), maxPageSize)).getRecords().stream().map(m -> {
Map<String, Object> ext = new HashMap<>(1);
ext.put("id", m.getId());
ext.put("deptId", m.getDeptId());
ext.put("email", m.getEmail());
ext.put("phone", m.getPhone());
return CsSelectOptionVo.builder().label(m.getNickName()).value(String.valueOf(m.getId())).ext(ext).build();
return KitSelectOptionVo.builder().label(m.getNickName()).value(String.valueOf(m.getId())).ext(ext).build();
}).toList();
return ResponseEntity.ok(collect);
}
cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/dataobject/SystemDeptTb.java
+2 -2
View File
@@ -16,7 +16,7 @@
package cn.odboy.system.dal.dataobject;
import cn.odboy.base.CsBaseUserTimeTb;
import cn.odboy.base.KitBaseUserTimeTb;
import com.alibaba.fastjson2.annotation.JSONField;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableField;
@@ -35,7 +35,7 @@ import java.util.Set;
@Getter
@Setter
@TableName("system_dept")
public class SystemDeptTb extends CsBaseUserTimeTb {
public class SystemDeptTb extends KitBaseUserTimeTb {
@NotNull(groups = Update.class)
@TableId(value = "dept_id", type = IdType.AUTO)
cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/dataobject/SystemDictDetailTb.java
+2 -2
View File
@@ -16,7 +16,7 @@
package cn.odboy.system.dal.dataobject;
import cn.odboy.base.CsBaseUserTimeTb;
import cn.odboy.base.KitBaseUserTimeTb;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
@@ -29,7 +29,7 @@ import lombok.Setter;
@Getter
@Setter
@TableName("system_dict_detail")
public class SystemDictDetailTb extends CsBaseUserTimeTb {
public class SystemDictDetailTb extends KitBaseUserTimeTb {
@NotNull(groups = Update.class)
@Schema(name = "ID", hidden = true)
cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/dataobject/SystemDictTb.java
+2 -2
View File
@@ -16,7 +16,7 @@
package cn.odboy.system.dal.dataobject;
import cn.odboy.base.CsBaseUserTimeTb;
import cn.odboy.base.KitBaseUserTimeTb;
import com.baomidou.mybatisplus.annotation.*;
import io.swagger.v3.oas.annotations.media.Schema;
import jakarta.validation.constraints.NotBlank;
@@ -27,7 +27,7 @@ import lombok.Setter;
@Getter
@Setter
@TableName("system_dict")
public class SystemDictTb extends CsBaseUserTimeTb {
public class SystemDictTb extends KitBaseUserTimeTb {
@NotNull(groups = Update.class)
@Schema(name = "ID", hidden = true)
cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/dataobject/SystemEmailConfigTb.java
+2 -2
View File
@@ -16,7 +16,7 @@
package cn.odboy.system.dal.dataobject;
import cn.odboy.base.CsObject;
import cn.odboy.base.KitObject;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import io.swagger.v3.oas.annotations.media.Schema;
@@ -30,7 +30,7 @@ import lombok.EqualsAndHashCode;
@Data
@TableName("system_email_config")
@EqualsAndHashCode(callSuper = false)
public class SystemEmailConfigTb extends CsObject {
public class SystemEmailConfigTb extends KitObject {
@TableId("config_id")
private Long id;
cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/dataobject/SystemJobTb.java
+2 -2
View File
@@ -16,7 +16,7 @@
package cn.odboy.system.dal.dataobject;
import cn.odboy.base.CsBaseUserTimeTb;
import cn.odboy.base.KitBaseUserTimeTb;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
@@ -31,7 +31,7 @@ import java.util.Objects;
@Getter
@Setter
@TableName("system_job")
public class SystemJobTb extends CsBaseUserTimeTb {
public class SystemJobTb extends KitBaseUserTimeTb {
@NotNull(groups = Update.class)
@TableId(value = "id", type = IdType.AUTO)
cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/dataobject/SystemLocalStorageTb.java
+2 -2
View File
@@ -18,7 +18,7 @@ package cn.odboy.system.dal.dataobject;
import cn.hutool.core.bean.BeanUtil;
import cn.hutool.core.bean.copier.CopyOptions;
import cn.odboy.base.CsBaseUserTimeTb;
import cn.odboy.base.KitBaseUserTimeTb;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
@@ -29,7 +29,7 @@ import lombok.Setter;
@Getter
@Setter
@TableName("system_local_storage")
public class SystemLocalStorageTb extends CsBaseUserTimeTb {
public class SystemLocalStorageTb extends KitBaseUserTimeTb {
@TableId(value = "id", type = IdType.AUTO)
@Schema(name = "ID", hidden = true)
cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/dataobject/SystemMenuTb.java
+2 -2
View File
@@ -16,7 +16,7 @@
package cn.odboy.system.dal.dataobject;
import cn.odboy.base.CsBaseUserTimeTb;
import cn.odboy.base.KitBaseUserTimeTb;
import com.alibaba.fastjson2.annotation.JSONField;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableField;
@@ -34,7 +34,7 @@ import java.util.Set;
@Getter
@Setter
@TableName("system_menu")
public class SystemMenuTb extends CsBaseUserTimeTb {
public class SystemMenuTb extends KitBaseUserTimeTb {
@NotNull(groups = {Update.class})
@TableId(value = "menu_id", type = IdType.AUTO)
cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/dataobject/SystemOperationLogTb.java
+2 -2
View File
@@ -16,7 +16,7 @@
package cn.odboy.system.dal.dataobject;
import cn.odboy.base.CsObject;
import cn.odboy.base.KitObject;
import com.baomidou.mybatisplus.annotation.*;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Getter;
@@ -38,7 +38,7 @@ import java.util.Date;
@ToString
@TableName("system_operation_log")
@Schema(name = "SystemOperationLog对象", description = "审计日志")
public class SystemOperationLogTb extends CsObject {
public class SystemOperationLogTb extends KitObject {
/**
* id
cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/dataobject/SystemOssStorageTb.java
+2 -2
View File
@@ -16,7 +16,7 @@
package cn.odboy.system.dal.dataobject;
import cn.odboy.base.CsBaseUserTimeTb;
import cn.odboy.base.KitBaseUserTimeTb;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
@@ -37,7 +37,7 @@ import lombok.Setter;
@Setter
@TableName("system_oss_storage")
@Schema(name = "SystemOssStorage对象", description = "OSS存储")
public class SystemOssStorageTb extends CsBaseUserTimeTb {
public class SystemOssStorageTb extends KitBaseUserTimeTb {
@Schema(name = "ID")
@TableId(value = "id", type = IdType.AUTO)
private Long id;
cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/dataobject/SystemQuartzJobTb.java
+2 -2
View File
@@ -16,7 +16,7 @@
package cn.odboy.system.dal.dataobject;
import cn.odboy.base.CsBaseUserTimeTb;
import cn.odboy.base.KitBaseUserTimeTb;
import com.baomidou.mybatisplus.annotation.*;
import io.swagger.v3.oas.annotations.media.Schema;
import jakarta.validation.constraints.NotBlank;
@@ -27,7 +27,7 @@ import lombok.Setter;
@Getter
@Setter
@TableName("system_quartz_job")
public class SystemQuartzJobTb extends CsBaseUserTimeTb {
public class SystemQuartzJobTb extends KitBaseUserTimeTb {
public static final String JOB_KEY = "JOB_KEY";
cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/dataobject/SystemQuartzLogTb.java
+2 -2
View File
@@ -16,7 +16,7 @@
package cn.odboy.system.dal.dataobject;
import cn.odboy.base.CsObject;
import cn.odboy.base.KitObject;
import com.baomidou.mybatisplus.annotation.*;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
@@ -27,7 +27,7 @@ import java.util.Date;
@Data
@TableName("system_quartz_log")
@EqualsAndHashCode(callSuper = false)
public class SystemQuartzLogTb extends CsObject {
public class SystemQuartzLogTb extends KitObject {
@TableId(value = "id", type = IdType.AUTO)
@Schema(name = "ID", hidden = true)
cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/dataobject/SystemRoleTb.java
+2 -2
View File
@@ -16,7 +16,7 @@
package cn.odboy.system.dal.dataobject;
import cn.odboy.base.CsBaseUserTimeTb;
import cn.odboy.base.KitBaseUserTimeTb;
import cn.odboy.system.constant.SystemDataScopeEnum;
import com.baomidou.mybatisplus.annotation.*;
import io.swagger.v3.oas.annotations.media.Schema;
@@ -34,7 +34,7 @@ import java.util.Set;
@Getter
@Setter
@TableName("system_role")
public class SystemRoleTb extends CsBaseUserTimeTb {
public class SystemRoleTb extends KitBaseUserTimeTb {
@NotNull(groups = {Update.class})
@TableId(value = "role_id", type = IdType.AUTO)
cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/dataobject/SystemUserTb.java
+2 -2
View File
@@ -16,7 +16,7 @@
package cn.odboy.system.dal.dataobject;
import cn.odboy.base.CsBaseUserTimeTb;
import cn.odboy.base.KitBaseUserTimeTb;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
@@ -35,7 +35,7 @@ import java.util.Set;
@Getter
@Setter
@TableName("system_user")
public class SystemUserTb extends CsBaseUserTimeTb {
public class SystemUserTb extends KitBaseUserTimeTb {
@NotNull(groups = Update.class)
@TableId(value = "user_id", type = IdType.AUTO)
cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/SystemCheckEmailCaptchaArgs.java
+2 -2
View File
@@ -16,14 +16,14 @@
package cn.odboy.system.dal.model;
import cn.odboy.base.CsObject;
import cn.odboy.base.KitObject;
import jakarta.validation.constraints.NotBlank;
import lombok.Getter;
import lombok.Setter;
@Getter
@Setter
public class SystemCheckEmailCaptchaArgs extends CsObject {
public class SystemCheckEmailCaptchaArgs extends KitObject {
@NotBlank(message = "邮箱不能为空")
private String email;
@NotBlank(message = "验证码不能为空")
cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/SystemCreateDeptArgs.java
+2 -2
View File
@@ -16,7 +16,7 @@
package cn.odboy.system.dal.model;
import cn.odboy.base.CsObject;
import cn.odboy.base.KitObject;
import jakarta.validation.constraints.NotBlank;
import jakarta.validation.constraints.NotNull;
import lombok.Data;
@@ -24,7 +24,7 @@ import lombok.EqualsAndHashCode;
@Data
@EqualsAndHashCode(callSuper = false)
public class SystemCreateDeptArgs extends CsObject {
public class SystemCreateDeptArgs extends KitObject {
@NotBlank(message = "部门名称必填")
private String name;
@NotNull(message = "部门排序必填")
cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/SystemCreateDictArgs.java
+2 -2
View File
@@ -16,14 +16,14 @@
package cn.odboy.system.dal.model;
import cn.odboy.base.CsObject;
import cn.odboy.base.KitObject;
import jakarta.validation.constraints.NotBlank;
import lombok.Data;
import lombok.EqualsAndHashCode;
@Data
@EqualsAndHashCode(callSuper = false)
public class SystemCreateDictArgs extends CsObject {
public class SystemCreateDictArgs extends KitObject {
@NotBlank(message = "字典名称必填")
private String name;
private String description;
cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/SystemCreateDictDetailArgs.java
+2 -2
View File
@@ -16,7 +16,7 @@
package cn.odboy.system.dal.model;
import cn.odboy.base.CsObject;
import cn.odboy.base.KitObject;
import cn.odboy.system.dal.dataobject.SystemDictTb;
import jakarta.validation.constraints.NotBlank;
import jakarta.validation.constraints.NotNull;
@@ -25,7 +25,7 @@ import lombok.EqualsAndHashCode;
@Data
@EqualsAndHashCode(callSuper = false)
public class SystemCreateDictDetailArgs extends CsObject {
public class SystemCreateDictDetailArgs extends KitObject {
@NotNull(message = "参数dict必填")
private SystemDictTb dict;
@NotBlank(message = "字典标签必填")
cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/SystemCreateJobArgs.java
+2 -2
View File
@@ -16,7 +16,7 @@
package cn.odboy.system.dal.model;
import cn.odboy.base.CsObject;
import cn.odboy.base.KitObject;
import jakarta.validation.constraints.NotBlank;
import jakarta.validation.constraints.NotNull;
import lombok.Data;
@@ -24,7 +24,7 @@ import lombok.EqualsAndHashCode;
@Data
@EqualsAndHashCode(callSuper = false)
public class SystemCreateJobArgs extends CsObject {
public class SystemCreateJobArgs extends KitObject {
@NotBlank(message = "职位名称必填")
private String name;
@NotNull(message = "职位排序必填")
cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/SystemCreateRoleArgs.java
+2 -2
View File
@@ -16,7 +16,7 @@
package cn.odboy.system.dal.model;
import cn.odboy.base.CsObject;
import cn.odboy.base.KitObject;
import cn.odboy.system.dal.dataobject.SystemDeptTb;
import jakarta.validation.constraints.NotBlank;
import jakarta.validation.constraints.NotNull;
@@ -27,7 +27,7 @@ import java.util.Set;
@Data
@EqualsAndHashCode(callSuper = false)
public class SystemCreateRoleArgs extends CsObject {
public class SystemCreateRoleArgs extends KitObject {
@NotBlank(message = "角色名称必填")
private String name;
@NotNull(message = "角色级别必填")
cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/SystemMenuMetaVo.java
+2 -2
View File
@@ -16,7 +16,7 @@
package cn.odboy.system.dal.model;
import cn.odboy.base.CsObject;
import cn.odboy.base.KitObject;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.AllArgsConstructor;
import lombok.Data;
@@ -25,7 +25,7 @@ import lombok.EqualsAndHashCode;
@Data
@AllArgsConstructor
@EqualsAndHashCode(callSuper = false)
public class SystemMenuMetaVo extends CsObject {
public class SystemMenuMetaVo extends KitObject {
@Schema(name = "菜单标题")
private String title;
cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/SystemMenuVo.java
+2 -2
View File
@@ -16,7 +16,7 @@
package cn.odboy.system.dal.model;
import cn.odboy.base.CsObject;
import cn.odboy.base.KitObject;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
import lombok.EqualsAndHashCode;
@@ -28,7 +28,7 @@ import java.util.List;
*/
@Data
@EqualsAndHashCode(callSuper = false)
public class SystemMenuVo extends CsObject {
public class SystemMenuVo extends KitObject {
@Schema(name = "菜单名称")
private String name;
cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/SystemProductLineTreeVo.java
+2 -2
View File
@@ -16,7 +16,7 @@
package cn.odboy.system.dal.model;
import cn.odboy.base.CsObject;
import cn.odboy.base.KitObject;
import lombok.Getter;
import lombok.Setter;
@@ -24,7 +24,7 @@ import java.util.List;
@Getter
@Setter
public class SystemProductLineTreeVo extends CsObject {
public class SystemProductLineTreeVo extends KitObject {
private String value;
private String label;
private List<SystemProductLineTreeVo> children;
cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/SystemProductLineVo.java
+2 -2
View File
@@ -16,13 +16,13 @@
package cn.odboy.system.dal.model;
import cn.odboy.base.CsObject;
import cn.odboy.base.KitObject;
import lombok.Getter;
import lombok.Setter;
@Getter
@Setter
public class SystemProductLineVo extends CsObject {
public class SystemProductLineVo extends KitObject {
/**
* 部门ID（select的value）
*/
cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/SystemQueryDictDetailArgs.java
+2 -2
View File
@@ -16,14 +16,14 @@
package cn.odboy.system.dal.model;
import cn.odboy.base.CsObject;
import cn.odboy.base.KitObject;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Getter;
import lombok.Setter;
@Getter
@Setter
public class SystemQueryDictDetailArgs extends CsObject {
public class SystemQueryDictDetailArgs extends KitObject {
@Schema(name = "标签")
private String label;
cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/SystemQueryUserArgs.java
+2 -2
View File
@@ -16,7 +16,7 @@
package cn.odboy.system.dal.model;
import cn.odboy.base.CsObject;
import cn.odboy.base.KitObject;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
import lombok.EqualsAndHashCode;
@@ -28,7 +28,7 @@ import java.util.Set;
@Data
@EqualsAndHashCode(callSuper = false)
public class SystemQueryUserArgs extends CsObject {
public class SystemQueryUserArgs extends KitObject {
@Schema(name = "ID")
private Long id;
cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/SystemSimpleUserVo.java
+2 -2
View File
@@ -16,7 +16,7 @@
package cn.odboy.system.dal.model;
import cn.odboy.base.CsObject;
import cn.odboy.base.KitObject;
import cn.odboy.system.dal.dataobject.SystemDeptTb;
import cn.odboy.system.dal.dataobject.SystemJobTb;
import cn.odboy.system.dal.dataobject.SystemRoleTb;
@@ -29,7 +29,7 @@ import java.util.Set;
@Data
@EqualsAndHashCode(callSuper = false)
public class SystemSimpleUserVo extends CsObject {
public class SystemSimpleUserVo extends KitObject {
@Schema(name = "ID", hidden = true)
private Long id;
@Schema(name = "用户角色")
cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/SystemUpdateQuartzJobArgs.java
+2 -2
View File
@@ -16,7 +16,7 @@
package cn.odboy.system.dal.model;
import cn.odboy.base.CsObject;
import cn.odboy.base.KitObject;
import jakarta.validation.constraints.NotBlank;
import jakarta.validation.constraints.NotNull;
import lombok.Data;
@@ -24,7 +24,7 @@ import lombok.EqualsAndHashCode;
@Data
@EqualsAndHashCode(callSuper = false)
public class SystemUpdateQuartzJobArgs extends CsObject {
public class SystemUpdateQuartzJobArgs extends KitObject {
@NotNull
private Long id;
private String uuid;
cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/SystemUserInfoVo.java
+2 -2
View File
@@ -16,7 +16,7 @@
package cn.odboy.system.dal.model;
import cn.odboy.base.CsObject;
import cn.odboy.base.KitObject;
import lombok.Data;
import lombok.EqualsAndHashCode;
@@ -26,7 +26,7 @@ import java.util.stream.Collectors;
@Data
@EqualsAndHashCode(callSuper = false)
public class SystemUserInfoVo extends CsObject {
public class SystemUserInfoVo extends KitObject {
private SystemSimpleUserVo user;
private List<Long> dataScopes;
private List<SystemRoleCodeVo> authorities;
cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/redis/SystemUserInfoDAO.java
+2 -2
View File
@@ -2,7 +2,7 @@ package cn.odboy.system.dal.redis;
import cn.hutool.core.util.RandomUtil;
import cn.hutool.core.util.StrUtil;
import cn.odboy.framework.redis.CsRedisHelper;
import cn.odboy.framework.redis.KitRedisHelper;
import cn.odboy.system.dal.model.SystemUserJwtVo;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.scheduling.annotation.Async;
@@ -14,7 +14,7 @@ import org.springframework.stereotype.Component;
@Component
public class SystemUserInfoDAO {
@Autowired
private CsRedisHelper redisHelper;
private KitRedisHelper redisHelper;
/**
* 添加缓存到Redis
cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/redis/SystemUserOnlineInfoDAO.java
+11 -11
View File
@@ -1,9 +1,9 @@
package cn.odboy.system.dal.redis;
import cn.hutool.core.util.StrUtil;
import cn.odboy.base.CsPageResult;
import cn.odboy.base.KitPageResult;
import cn.odboy.framework.properties.AppProperties;
import cn.odboy.framework.redis.CsRedisHelper;
import cn.odboy.framework.redis.KitRedisHelper;
import cn.odboy.system.dal.model.SystemUserJwtVo;
import cn.odboy.system.dal.model.SystemUserOnlineVo;
import cn.odboy.system.framework.permission.core.handler.TokenProvider;
@@ -25,7 +25,7 @@ import java.util.concurrent.TimeUnit;
public class SystemUserOnlineInfoDAO {
private final AppProperties properties;
private final TokenProvider tokenProvider;
private final CsRedisHelper redisHelper;
private final KitRedisHelper redisHelper;
/**
* 保存在线用户信息
@@ -37,10 +37,10 @@ public class SystemUserOnlineInfoDAO {
public void saveUserJwtModelByToken(SystemUserJwtVo userJwtVo, String token, HttpServletRequest request) {
String dept = userJwtVo.getUser().getDept().getName();
String ip = CsBrowserUtil.getIp(request);
String ip = KitBrowserUtil.getIp(request);
String id = tokenProvider.getId(token);
String version = CsBrowserUtil.getVersion(request);
String address = CsIPUtil.getCityInfo(ip);
String version = KitBrowserUtil.getVersion(request);
String address = KitIPUtil.getCityInfo(ip);
SystemUserOnlineVo userOnlineVo = null;
try {
userOnlineVo = new SystemUserOnlineVo();
@@ -51,7 +51,7 @@ public class SystemUserOnlineInfoDAO {
userOnlineVo.setBrowser(version);
userOnlineVo.setIp(ip);
userOnlineVo.setAddress(address);
userOnlineVo.setKey(CsDesEncryptUtil.desEncrypt(token));
userOnlineVo.setKey(KitDesEncryptUtil.desEncrypt(token));
userOnlineVo.setLoginTime(new Date());
} catch (Exception e) {
log.error(e.getMessage(), e);
@@ -91,7 +91,7 @@ public class SystemUserOnlineInfoDAO {
map.put("登录日期", user.getLoginTime());
list.add(map);
}
CsFileUtil.downloadExcel(list, response);
KitFileUtil.downloadExcel(list, response);
}
/**
@@ -113,14 +113,14 @@ public class SystemUserOnlineInfoDAO {
* @return /
*/
public CsPageResult<SystemUserOnlineVo> queryUserOnlineModelPage(SystemUserOnlineVo onlineVo, IPage<SystemUserOnlineVo> pageable) {
public KitPageResult<SystemUserOnlineVo> queryUserOnlineModelPage(SystemUserOnlineVo onlineVo, IPage<SystemUserOnlineVo> pageable) {
String username = null;
if (onlineVo != null) {
username = onlineVo.getUserName();
}
List<SystemUserOnlineVo> onlineUserList = queryUserOnlineModelListByUsername(username);
List<SystemUserOnlineVo> paging = CsPageUtil.softPaging(pageable.getCurrent(), pageable.getSize(), onlineUserList);
return CsPageUtil.toPage(paging, onlineUserList.size());
List<SystemUserOnlineVo> paging = KitPageUtil.softPaging(pageable.getCurrent(), pageable.getSize(), onlineUserList);
return KitPageUtil.toPage(paging, onlineUserList.size());
}
/**
cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/framework/bizlock/BizLockAspect.java
+3 -3
View File
@@ -17,7 +17,7 @@
package cn.odboy.system.framework.bizlock;
import cn.odboy.framework.exception.BadRequestException;
import cn.odboy.framework.redis.CsRedisHelper;
import cn.odboy.framework.redis.KitRedisHelper;
import org.aspectj.lang.ProceedingJoinPoint;
import org.aspectj.lang.annotation.Around;
import org.aspectj.lang.annotation.Aspect;
@@ -33,10 +33,10 @@ import java.lang.reflect.Method;
@Aspect
@Component
public class BizLockAspect {
private final CsRedisHelper redisHelper;
private final KitRedisHelper redisHelper;
private final ExpressionParser parser = new SpelExpressionParser();
public BizLockAspect(CsRedisHelper redisHelper) {
public BizLockAspect(KitRedisHelper redisHelper) {
this.redisHelper = redisHelper;
}
cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/framework/mybatisplus/MpMetaObjectHandler.java
+3 -3
View File
@@ -17,7 +17,7 @@
package cn.odboy.system.framework.mybatisplus;
import cn.hutool.core.date.DateTime;
import cn.odboy.system.framework.permission.core.CsSecurityHelper;
import cn.odboy.system.framework.permission.core.KitSecurityHelper;
import com.baomidou.mybatisplus.core.handlers.MetaObjectHandler;
import org.apache.ibatis.reflection.MetaObject;
import org.springframework.stereotype.Component;
@@ -36,7 +36,7 @@ public class MpMetaObjectHandler implements MetaObjectHandler {
/* 操作人 */
String username = "System";
try {
username = CsSecurityHelper.getCurrentUsername();
username = KitSecurityHelper.getCurrentUsername();
} catch (Exception ignored) {
}
this.strictInsertFill(metaObject, "createBy", String.class, username);
@@ -50,7 +50,7 @@ public class MpMetaObjectHandler implements MetaObjectHandler {
/* 操作人 */
String username = "System";
try {
username = CsSecurityHelper.getCurrentUsername();
username = KitSecurityHelper.getCurrentUsername();
} catch (Exception ignored) {
}
this.strictUpdateFill(metaObject, "updateBy", String.class, username);
cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/framework/operalog/OperationLogAspect.java
+9 -9
View File
@@ -19,12 +19,12 @@ package cn.odboy.system.framework.operalog;
import cn.hutool.core.date.TimeInterval;
import cn.hutool.core.exceptions.ExceptionUtil;
import cn.hutool.core.util.StrUtil;
import cn.odboy.framework.context.CsRequestHolder;
import cn.odboy.framework.context.KitRequestHolder;
import cn.odboy.system.dal.dataobject.SystemOperationLogTb;
import cn.odboy.system.dal.mysql.SystemOperationLogMapper;
import cn.odboy.system.framework.permission.core.CsSecurityHelper;
import cn.odboy.util.CsBrowserUtil;
import cn.odboy.util.CsIPUtil;
import cn.odboy.system.framework.permission.core.KitSecurityHelper;
import cn.odboy.util.KitBrowserUtil;
import cn.odboy.util.KitIPUtil;
import com.alibaba.fastjson2.JSON;
import io.swagger.v3.oas.annotations.Operation;
import jakarta.servlet.http.HttpServletRequest;
@@ -100,11 +100,11 @@ public class OperationLogAspect {
String method = joinPoint.getTarget().getClass().getName() + "." + signature.getName() + "()";
Object[] args = joinPoint.getArgs();
String params = JSON.toJSONString(args);
HttpServletRequest request = CsRequestHolder.getHttpServletRequest();
String requestIp = CsBrowserUtil.getIp(request);
String browserInfo = CsBrowserUtil.getVersion(request);
String address = CsIPUtil.getCityInfo(requestIp);
String username = CsSecurityHelper.getCurrentUsername();
HttpServletRequest request = KitRequestHolder.getHttpServletRequest();
String requestIp = KitBrowserUtil.getIp(request);
String browserInfo = KitBrowserUtil.getVersion(request);
String address = KitIPUtil.getCityInfo(requestIp);
String username = KitSecurityHelper.getCurrentUsername();
SystemOperationLogTb record = new SystemOperationLogTb();
record.setBizName(bizName);
record.setMethod(method);
cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/framework/operalog/core/SystemOperationLogAspect.java
+9 -9
View File
@@ -18,13 +18,13 @@ package cn.odboy.system.framework.operalog.core;
import cn.hutool.core.date.TimeInterval;
import cn.hutool.core.exceptions.ExceptionUtil;
import cn.hutool.core.util.StrUtil;
import cn.odboy.framework.context.CsRequestHolder;
import cn.odboy.framework.context.KitRequestHolder;
import cn.odboy.system.dal.dataobject.SystemOperationLogTb;
import cn.odboy.system.dal.mysql.SystemOperationLogMapper;
import cn.odboy.system.framework.operalog.annotaions.OperationLog;
import cn.odboy.system.framework.permission.core.CsSecurityHelper;
import cn.odboy.util.CsBrowserUtil;
import cn.odboy.util.CsIPUtil;
import cn.odboy.system.framework.permission.core.KitSecurityHelper;
import cn.odboy.util.KitBrowserUtil;
import cn.odboy.util.KitIPUtil;
import com.alibaba.fastjson2.JSON;
import io.swagger.v3.oas.annotations.Operation;
import jakarta.servlet.http.HttpServletRequest;
@@ -102,11 +102,11 @@ public class SystemOperationLogAspect {
String method = joinPoint.getTarget().getClass().getName() + "." + signature.getName() + "()";
Object[] args = joinPoint.getArgs();
String params = JSON.toJSONString(args);
HttpServletRequest request = CsRequestHolder.getHttpServletRequest();
String requestIp = CsBrowserUtil.getIp(request);
String browserInfo = CsBrowserUtil.getVersion(request);
String address = CsIPUtil.getCityInfo(requestIp);
String username = CsSecurityHelper.getCurrentUsername();
HttpServletRequest request = KitRequestHolder.getHttpServletRequest();
String requestIp = KitBrowserUtil.getIp(request);
String browserInfo = KitBrowserUtil.getVersion(request);
String address = KitIPUtil.getCityInfo(requestIp);
String username = KitSecurityHelper.getCurrentUsername();
SystemOperationLogTb record = new SystemOperationLogTb();
record.setBizName(bizName);
record.setMethod(method);
cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/framework/permission/config/AuthorityConfig.java
+2 -2
View File
@@ -16,7 +16,7 @@
package cn.odboy.system.framework.permission.config;
import cn.odboy.system.framework.permission.core.CsSecurityHelper;
import cn.odboy.system.framework.permission.core.KitSecurityHelper;
import org.springframework.security.core.GrantedAuthority;
import org.springframework.stereotype.Service;
@@ -34,7 +34,7 @@ public class AuthorityConfig {
*/
public Boolean check(String... permissions) {
// 获取当前用户的所有权限
List<String> roleList = CsSecurityHelper.getCurrentUser().getAuthorities().stream().map(GrantedAuthority::getAuthority).toList();
List<String> roleList = KitSecurityHelper.getCurrentUser().getAuthorities().stream().map(GrantedAuthority::getAuthority).toList();
// 判断当前用户的所有权限是否包含接口上定义的权限
return roleList.contains("admin") || Arrays.stream(permissions).anyMatch(roleList::contains);
}
cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/framework/permission/config/SpringSecurityConfig.java
+2 -2
View File
@@ -22,7 +22,7 @@ import cn.odboy.system.framework.permission.core.handler.JwtAccessDeniedHandler;
import cn.odboy.system.framework.permission.core.handler.JwtAuthenticationEntryPoint;
import cn.odboy.system.framework.permission.core.handler.TokenFilter;
import cn.odboy.system.framework.permission.core.handler.TokenProvider;
import cn.odboy.util.CsAnonTagUtil;
import cn.odboy.util.KitAnonTagUtil;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.context.ApplicationContext;
import org.springframework.context.annotation.Bean;
@@ -74,7 +74,7 @@ public class SpringSecurityConfig {
@Bean
protected SecurityFilterChain filterChain(HttpSecurity httpSecurity) throws Exception {
// 获取匿名标记
Map<String, Set<String>> anonymousUrls = CsAnonTagUtil.getAnonymousUrl(applicationContext);
Map<String, Set<String>> anonymousUrls = KitAnonTagUtil.getAnonymousUrl(applicationContext);
// 创建TokenFilter实例
TokenFilter customFilter = new TokenFilter(tokenProvider, systemUserOnlineInfoDAO);
cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/framework/permission/core/CsSecurityHelper.java → cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/framework/permission/core/KitSecurityHelper.java
+3 -3
View File
@@ -20,7 +20,7 @@ import cn.hutool.core.collection.CollUtil;
import cn.hutool.jwt.JWT;
import cn.hutool.jwt.JWTUtil;
import cn.odboy.constant.SystemConst;
import cn.odboy.framework.context.CsSpringBeanHolder;
import cn.odboy.framework.context.KitSpringBeanHolder;
import cn.odboy.system.constant.SystemDataScopeEnum;
import com.alibaba.fastjson2.JSON;
import com.alibaba.fastjson2.JSONArray;
@@ -41,14 +41,14 @@ import java.util.Objects;
*/
@Slf4j
@Component
public class CsSecurityHelper {
public class KitSecurityHelper {
/**
* 获取当前登录的用户
*
* @return UserDetails
*/
public static UserDetails getCurrentUser() {
UserDetailsService userDetailsService = CsSpringBeanHolder.getBean(UserDetailsService.class);
UserDetailsService userDetailsService = KitSpringBeanHolder.getBean(UserDetailsService.class);
return userDetailsService.loadUserByUsername(getCurrentUsername());
}
cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/framework/permission/core/handler/TokenProvider.java
+2 -2
View File
@@ -21,7 +21,7 @@ import cn.hutool.core.date.DateUtil;
import cn.hutool.core.util.IdUtil;
import cn.odboy.constant.SystemConst;
import cn.odboy.framework.properties.AppProperties;
import cn.odboy.framework.redis.CsRedisHelper;
import cn.odboy.framework.redis.KitRedisHelper;
import cn.odboy.system.dal.model.SystemUserJwtVo;
import cn.odboy.system.dal.redis.SystemCacheKey;
import io.jsonwebtoken.Claims;
@@ -51,7 +51,7 @@ public class TokenProvider implements InitializingBean {
public static final String AUTHORITIES_UUID_KEY = "uid";
public static final String AUTHORITIES_UID_KEY = "userId";
@Autowired
private CsRedisHelper redisHelper;
private KitRedisHelper redisHelper;
@Autowired
private AppProperties properties;
// 0.11.x版本
cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/framework/quartz/ExecutionJobBean.java
+7 -7
View File
@@ -22,9 +22,9 @@ import cn.hutool.extra.template.Template;
import cn.hutool.extra.template.TemplateConfig;
import cn.hutool.extra.template.TemplateEngine;
import cn.hutool.extra.template.TemplateUtil;
import cn.odboy.framework.context.CsSpringBeanHolder;
import cn.odboy.framework.context.KitSpringBeanHolder;
import cn.odboy.framework.quartz.core.QuartzRunnable;
import cn.odboy.framework.redis.CsRedisHelper;
import cn.odboy.framework.redis.KitRedisHelper;
import cn.odboy.system.dal.dataobject.SystemQuartzJobTb;
import cn.odboy.system.dal.dataobject.SystemQuartzLogTb;
import cn.odboy.system.dal.model.SystemSendEmailArgs;
@@ -47,16 +47,16 @@ public class ExecutionJobBean extends QuartzJobBean {
/**
* 此处仅供参考，可根据任务执行情况自定义线程池参数
*/
private final ThreadPoolTaskExecutor executor = CsSpringBeanHolder.getBean("taskAsync");
private final ThreadPoolTaskExecutor executor = KitSpringBeanHolder.getBean("taskAsync");
@Override
public void executeInternal(JobExecutionContext context) {
// 获取任务
SystemQuartzJobTb quartzJob = (SystemQuartzJobTb)context.getMergedJobDataMap().get(SystemQuartzJobTb.JOB_KEY);
// 获取spring bean
SystemQuartzLogMapper quartzLogMapper = CsSpringBeanHolder.getBean(SystemQuartzLogMapper.class);
SystemQuartzJobService systemQuartzJobService = CsSpringBeanHolder.getBean(SystemQuartzJobService.class);
CsRedisHelper redisHelper = CsSpringBeanHolder.getBean(CsRedisHelper.class);
SystemQuartzLogMapper quartzLogMapper = KitSpringBeanHolder.getBean(SystemQuartzLogMapper.class);
SystemQuartzJobService systemQuartzJobService = KitSpringBeanHolder.getBean(SystemQuartzJobService.class);
KitRedisHelper redisHelper = KitSpringBeanHolder.getBean(KitRedisHelper.class);
String uuid = quartzJob.getUuid();
@@ -104,7 +104,7 @@ public class ExecutionJobBean extends QuartzJobBean {
systemQuartzJobService.switchQuartzJobStatus(quartzJob);
}
if (quartzJob.getEmail() != null) {
SystemEmailService emailService = CsSpringBeanHolder.getBean(SystemEmailService.class);
SystemEmailService emailService = KitSpringBeanHolder.getBean(SystemEmailService.class);
// 邮箱报警
if (StrUtil.isNotBlank(quartzJob.getEmail())) {
SystemSendEmailArgs sendEmailRequest = taskAlarm(quartzJob, ExceptionUtil.stacktraceToString(e));
cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/framework/storage/minio/MinioRepository.java
+9 -9
View File
@@ -28,8 +28,8 @@ import cn.odboy.framework.properties.AppProperties;
import cn.odboy.framework.properties.model.OSSConfigModel;
import cn.odboy.framework.properties.model.StorageOSSModel;
import cn.odboy.system.dal.dataobject.SystemOssStorageTb;
import cn.odboy.util.CsDateUtil;
import cn.odboy.util.CsFileUtil;
import cn.odboy.util.KitDateUtil;
import cn.odboy.util.KitFileUtil;
import io.minio.*;
import io.minio.http.Method;
import io.minio.messages.Bucket;
@@ -140,12 +140,12 @@ public class MinioRepository {
StorageOSSModel ossConfig = properties.getOss();
OSSConfigModel ossMinioConfig = ossConfig.getMinio();
String type = FileTypeUtil.getType(tempFile);
String prefix = CsFileUtil.getPrefix(tempFile);
String suffix = CsFileUtil.getSuffix(tempFile);
String prefix = KitFileUtil.getPrefix(tempFile);
String suffix = KitFileUtil.getSuffix(tempFile);
String fileCode = IdUtil.fastSimpleUUID();
String fileName = fileCode + FileUtil.getSuffix(originalFilename);
String objectName = CsDateUtil.getNowDateStr() + "/" + fileName;
String objectName = KitDateUtil.getNowDateStr() + "/" + fileName;
log.info("上传文件，原文件名：{}，上传后文件名：{}", originalFilename, fileName);
String fileUrl = ossMinioConfig.getEndpoint() + "/" + ossMinioConfig.getBucketName() + "/" + objectName;
@@ -163,7 +163,7 @@ public class MinioRepository {
systemOssStorageTb.setFileCode(fileCode);
systemOssStorageTb.setObjectName(objectName);
try (InputStream fileInputStream = CsFileUtil.getInputStream(tempFile)) {
try (InputStream fileInputStream = KitFileUtil.getInputStream(tempFile)) {
PutObjectArgs objectArgs =
PutObjectArgs.builder().bucket(ossMinioConfig.getBucketName()).object(objectName).stream(fileInputStream, fileSize, -1).contentType(contentType)
.build();
@@ -174,7 +174,7 @@ public class MinioRepository {
log.error("文件上传失败，文件名：{}，错误信息", originalFilename, e);
} finally {
try {
CsFileUtil.del(tempFile);
KitFileUtil.del(tempFile);
} catch (IORuntimeException e) {
// 删除失败忽略
}
@@ -195,11 +195,11 @@ public class MinioRepository {
}
long size = file.getSize();
CsFileUtil.checkSize(properties.getOss().getMaxSize(), size);
KitFileUtil.checkSize(properties.getOss().getMaxSize(), size);
String fileName = UUID.randomUUID() + FileUtil.getSuffix(originalFilename);
// yyyy/MM/dd/fileName.xxx
String objectName = CsDateUtil.getNowDateTimeStr() + "/" + fileName;
String objectName = KitDateUtil.getNowDateTimeStr() + "/" + fileName;
log.info("准备上传文件，原文件名：{}，上传后文件名：{}", originalFilename, fileName);
try (InputStream fileInputStream = file.getInputStream()) {
cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/service/SystemDeptService.java
+10 -10
View File
@@ -21,7 +21,7 @@ import cn.hutool.core.collection.CollUtil;
import cn.hutool.core.collection.CollectionUtil;
import cn.hutool.core.util.ObjectUtil;
import cn.hutool.core.util.StrUtil;
import cn.odboy.base.CsPageResult;
import cn.odboy.base.KitPageResult;
import cn.odboy.framework.exception.BadRequestException;
import cn.odboy.system.constant.SystemDataScopeEnum;
import cn.odboy.system.dal.dataobject.SystemDeptTb;
@@ -32,9 +32,9 @@ import cn.odboy.system.dal.model.SystemQueryDeptArgs;
import cn.odboy.system.dal.mysql.SystemDeptMapper;
import cn.odboy.system.dal.mysql.SystemRoleMapper;
import cn.odboy.system.dal.mysql.SystemUserMapper;
import cn.odboy.system.framework.permission.core.CsSecurityHelper;
import cn.odboy.util.CsClassUtil;
import cn.odboy.util.CsFileUtil;
import cn.odboy.system.framework.permission.core.KitSecurityHelper;
import cn.odboy.util.KitClassUtil;
import cn.odboy.util.KitFileUtil;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import jakarta.servlet.http.HttpServletResponse;
import org.springframework.beans.factory.annotation.Autowired;
@@ -119,7 +119,7 @@ public class SystemDeptService {
map.put("创建日期", dept.getCreateTime());
list.add(map);
}
CsFileUtil.downloadExcel(list, response);
KitFileUtil.downloadExcel(list, response);
}
/**
@@ -161,12 +161,12 @@ public class SystemDeptService {
*/
public List<SystemDeptTb> queryAllDept(SystemQueryDeptArgs criteria, Boolean isQuery) throws Exception {
String dataScopeType = CsSecurityHelper.getDataScopeType();
String dataScopeType = KitSecurityHelper.getDataScopeType();
if (isQuery) {
if (dataScopeType.equals(SystemDataScopeEnum.ALL.getValue())) {
criteria.setPidIsNull(true);
}
List<Field> fields = CsClassUtil.getAllFields(criteria.getClass(), new ArrayList<>());
List<Field> fields = KitClassUtil.getAllFields(criteria.getClass(), new ArrayList<>());
List<String> fieldNames = new ArrayList<>() {{
add("pidIsNull");
add("enabled");
@@ -185,7 +185,7 @@ public class SystemDeptService {
}
}
// 数据权限
criteria.setIds(CsSecurityHelper.getCurrentUserDataScope());
criteria.setIds(KitSecurityHelper.getCurrentUserDataScope());
List<SystemDeptTb> list = systemDeptMapper.selectDeptByArgs(criteria);
// 如果为空, 就代表为自定义权限或者本级权限, 就需要去重, 不理解可以注释掉，看查询结果
if (StrUtil.isBlank(dataScopeType)) {
@@ -291,7 +291,7 @@ public class SystemDeptService {
* @return /
*/
public CsPageResult<SystemDeptTb> buildDeptTree(List<SystemDeptTb> deptList) {
public KitPageResult<SystemDeptTb> buildDeptTree(List<SystemDeptTb> deptList) {
Set<SystemDeptTb> trees = new LinkedHashSet<>();
Set<SystemDeptTb> deptSet = new LinkedHashSet<>();
List<String> deptNames = deptList.stream().map(SystemDeptTb::getName).toList();
@@ -319,7 +319,7 @@ public class SystemDeptService {
if (CollectionUtil.isEmpty(trees)) {
trees = deptSet;
}
CsPageResult<SystemDeptTb> baseResult = new CsPageResult<>();
KitPageResult<SystemDeptTb> baseResult = new KitPageResult<>();
baseResult.setContent(CollectionUtil.isEmpty(trees) ? new ArrayList<>(deptSet) : new ArrayList<>(trees));
baseResult.setTotalElements(deptSet.size());
return baseResult;
cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/service/SystemDictDetailService.java
+4 -4
View File
@@ -17,12 +17,12 @@
package cn.odboy.system.service;
import cn.hutool.core.bean.BeanUtil;
import cn.odboy.base.CsPageResult;
import cn.odboy.base.KitPageResult;
import cn.odboy.system.dal.dataobject.SystemDictDetailTb;
import cn.odboy.system.dal.model.SystemCreateDictDetailArgs;
import cn.odboy.system.dal.model.SystemQueryDictDetailArgs;
import cn.odboy.system.dal.mysql.SystemDictDetailMapper;
import cn.odboy.util.CsPageUtil;
import cn.odboy.util.KitPageUtil;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
@@ -78,8 +78,8 @@ public class SystemDictDetailService {
* @return /
*/
public CsPageResult<SystemDictDetailTb> queryDictDetailByArgs(SystemQueryDictDetailArgs args, Page<Object> page) {
return CsPageUtil.toPage(systemDictDetailMapper.selectDictDetailByArgs(args, page));
public KitPageResult<SystemDictDetailTb> queryDictDetailByArgs(SystemQueryDictDetailArgs args, Page<Object> page) {
return KitPageUtil.toPage(systemDictDetailMapper.selectDictDetailByArgs(args, page));
}
/**
cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/service/SystemDictService.java
+6 -6
View File
@@ -18,7 +18,7 @@ package cn.odboy.system.service;
import cn.hutool.core.bean.BeanUtil;
import cn.hutool.core.collection.CollectionUtil;
import cn.odboy.base.CsPageResult;
import cn.odboy.base.KitPageResult;
import cn.odboy.system.dal.dataobject.SystemDictDetailTb;
import cn.odboy.system.dal.dataobject.SystemDictTb;
import cn.odboy.system.dal.model.SystemCreateDictArgs;
@@ -26,8 +26,8 @@ import cn.odboy.system.dal.model.SystemQueryDictArgs;
import cn.odboy.system.dal.model.SystemQueryDictDetailArgs;
import cn.odboy.system.dal.mysql.SystemDictDetailMapper;
import cn.odboy.system.dal.mysql.SystemDictMapper;
import cn.odboy.util.CsFileUtil;
import cn.odboy.util.CsPageUtil;
import cn.odboy.util.KitFileUtil;
import cn.odboy.util.KitPageUtil;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import jakarta.servlet.http.HttpServletResponse;
import org.springframework.beans.factory.annotation.Autowired;
@@ -117,7 +117,7 @@ public class SystemDictService {
list.add(map);
}
}
CsFileUtil.downloadExcel(list, response);
KitFileUtil.downloadExcel(list, response);
}
/**
@@ -128,8 +128,8 @@ public class SystemDictService {
* @return /
*/
public CsPageResult<SystemDictTb> queryDictByArgs(SystemQueryDictArgs args, Page<SystemDictTb> page) {
return CsPageUtil.toPage(systemDictMapper.selectDictByArgs(args, page));
public KitPageResult<SystemDictTb> queryDictByArgs(SystemQueryDictArgs args, Page<SystemDictTb> page) {
return KitPageUtil.toPage(systemDictMapper.selectDictByArgs(args, page));
}
/**
cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/service/SystemEmailService.java
+8 -8
View File
@@ -22,13 +22,13 @@ import cn.hutool.extra.mail.Mail;
import cn.hutool.extra.mail.MailAccount;
import cn.odboy.framework.exception.BadRequestException;
import cn.odboy.framework.properties.AppProperties;
import cn.odboy.framework.redis.CsRedisHelper;
import cn.odboy.framework.redis.KitRedisHelper;
import cn.odboy.system.constant.SystemCaptchaBizEnum;
import cn.odboy.system.dal.dataobject.SystemEmailConfigTb;
import cn.odboy.system.dal.model.SystemSendEmailArgs;
import cn.odboy.system.dal.mysql.SystemEmailConfigMapper;
import cn.odboy.util.CsDesEncryptUtil;
import cn.odboy.util.CsResourceTemplateUtil;
import cn.odboy.util.KitDesEncryptUtil;
import cn.odboy.util.KitResourceTemplateUtil;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
@@ -43,7 +43,7 @@ public class SystemEmailService {
@Autowired
private SystemEmailConfigMapper systemEmailConfigMapper;
@Autowired
private CsRedisHelper redisHelper;
private KitRedisHelper redisHelper;
@Autowired
private AppProperties properties;
@Value("${spring.application.title}")
@@ -60,7 +60,7 @@ public class SystemEmailService {
SystemEmailConfigTb systemEmailConfigTb = getLastEmailConfig();
if (!emailConfig.getPassword().equals(systemEmailConfigTb.getPassword())) {
// 对称加密
systemEmailConfigTb.setPassword(CsDesEncryptUtil.desEncrypt(emailConfig.getPassword()));
systemEmailConfigTb.setPassword(KitDesEncryptUtil.desEncrypt(emailConfig.getPassword()));
}
systemEmailConfigTb.setId(1L);
systemEmailConfigMapper.insertOrUpdate(systemEmailConfigTb);
@@ -87,7 +87,7 @@ public class SystemEmailService {
account.setAuth(true);
try {
// 对称解密
account.setPass(CsDesEncryptUtil.desDecrypt(systemEmailConfigTb.getPassword()));
account.setPass(KitDesEncryptUtil.desDecrypt(systemEmailConfigTb.getPassword()));
} catch (Exception e) {
throw new BadRequestException(e.getMessage());
}
@@ -144,9 +144,9 @@ public class SystemEmailService {
throw new BadRequestException("服务异常, 请联系网站负责人");
}
// 存在就再次发送原来的验证码
content = CsResourceTemplateUtil.render(null, biEnum.getTemplateName(), Dict.create().set("code", code));
content = KitResourceTemplateUtil.render(null, biEnum.getTemplateName(), Dict.create().set("code", code));
} else {
content = CsResourceTemplateUtil.render(null, biEnum.getTemplateName(), Dict.create().set("code", oldCode));
content = KitResourceTemplateUtil.render(null, biEnum.getTemplateName(), Dict.create().set("code", oldCode));
}
SystemSendEmailArgs sendEmailRequest = new SystemSendEmailArgs(Collections.singletonList(email), applicationTitle, content);
sendEmail(sendEmailRequest);
cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/service/SystemJobService.java
+7 -7
View File
@@ -17,15 +17,15 @@
package cn.odboy.system.service;
import cn.hutool.core.bean.BeanUtil;
import cn.odboy.base.CsPageResult;
import cn.odboy.base.KitPageResult;
import cn.odboy.framework.exception.BadRequestException;
import cn.odboy.system.dal.dataobject.SystemJobTb;
import cn.odboy.system.dal.model.SystemCreateJobArgs;
import cn.odboy.system.dal.model.SystemQueryJobArgs;
import cn.odboy.system.dal.mysql.SystemJobMapper;
import cn.odboy.system.dal.mysql.SystemUserMapper;
import cn.odboy.util.CsFileUtil;
import cn.odboy.util.CsPageUtil;
import cn.odboy.util.KitFileUtil;
import cn.odboy.util.KitPageUtil;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import jakarta.servlet.http.HttpServletResponse;
import org.springframework.beans.factory.annotation.Autowired;
@@ -102,7 +102,7 @@ public class SystemJobService {
map.put("创建日期", job.getCreateTime());
list.add(map);
}
CsFileUtil.downloadExcel(list, response);
KitFileUtil.downloadExcel(list, response);
}
/**
@@ -113,8 +113,8 @@ public class SystemJobService {
* @return
*/
public CsPageResult<SystemJobTb> queryJobByArgs(SystemQueryJobArgs args, Page<SystemJobTb> page) {
return CsPageUtil.toPage(systemJobMapper.selectJobByArgs(args, page));
public KitPageResult<SystemJobTb> queryJobByArgs(SystemQueryJobArgs args, Page<SystemJobTb> page) {
return KitPageUtil.toPage(systemJobMapper.selectJobByArgs(args, page));
}
/**
@@ -125,7 +125,7 @@ public class SystemJobService {
*/
public List<SystemJobTb> queryJobByArgs(SystemQueryJobArgs args) {
return systemJobMapper.selectJobByArgs(args, CsPageUtil.getCount(systemJobMapper)).getRecords();
return systemJobMapper.selectJobByArgs(args, KitPageUtil.getCount(systemJobMapper)).getRecords();
}
/**
cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/service/SystemLocalStorageService.java
+17 -17
View File
@@ -20,15 +20,15 @@ import cn.hutool.core.date.DatePattern;
import cn.hutool.core.date.DateUtil;
import cn.hutool.core.io.IORuntimeException;
import cn.hutool.core.util.StrUtil;
import cn.odboy.base.CsPageResult;
import cn.odboy.base.KitPageResult;
import cn.odboy.framework.exception.BadRequestException;
import cn.odboy.framework.properties.AppProperties;
import cn.odboy.framework.server.core.CsFileLocalUploadHelper;
import cn.odboy.framework.server.core.KitFileLocalUploadHelper;
import cn.odboy.system.dal.dataobject.SystemLocalStorageTb;
import cn.odboy.system.dal.model.SystemQueryStorageArgs;
import cn.odboy.system.dal.mysql.SystemLocalStorageMapper;
import cn.odboy.util.CsFileUtil;
import cn.odboy.util.CsPageUtil;
import cn.odboy.util.KitFileUtil;
import cn.odboy.util.KitPageUtil;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import jakarta.servlet.http.HttpServletResponse;
import org.springframework.beans.factory.annotation.Autowired;
@@ -45,7 +45,7 @@ public class SystemLocalStorageService {
@Autowired
private SystemLocalStorageMapper systemLocalStorageMapper;
@Autowired
private CsFileLocalUploadHelper fileUploadPathHelper;
private KitFileLocalUploadHelper fileUploadPathHelper;
@Autowired
private AppProperties properties;
@@ -59,17 +59,17 @@ public class SystemLocalStorageService {
@Transactional(rollbackFor = Exception.class)
public SystemLocalStorageTb uploadFile(String name, MultipartFile multipartFile) {
long size = multipartFile.getSize();
CsFileUtil.checkSize(properties.getOss().getMaxSize(), size);
String suffix = CsFileUtil.getSuffix(multipartFile.getOriginalFilename());
String type = CsFileUtil.getFileType(suffix);
KitFileUtil.checkSize(properties.getOss().getMaxSize(), size);
String suffix = KitFileUtil.getSuffix(multipartFile.getOriginalFilename());
String type = KitFileUtil.getFileType(suffix);
String uploadDateStr = DateUtil.format(new Date(), DatePattern.PURE_DATE_FORMAT);
File file = CsFileUtil.upload(multipartFile, fileUploadPathHelper.getPath() + uploadDateStr + File.separator);
File file = KitFileUtil.upload(multipartFile, fileUploadPathHelper.getPath() + uploadDateStr + File.separator);
if (file == null) {
throw new BadRequestException("上传失败");
}
try {
String formatSize = CsFileUtil.getSize(size);
String prefixName = StrUtil.isBlank(name) ? CsFileUtil.getPrefix(multipartFile.getOriginalFilename()) : name;
String formatSize = KitFileUtil.getSize(size);
String prefixName = StrUtil.isBlank(name) ? KitFileUtil.getPrefix(multipartFile.getOriginalFilename()) : name;
SystemLocalStorageTb localStorage = new SystemLocalStorageTb();
localStorage.setRealName(file.getName());
localStorage.setName(prefixName);
@@ -81,7 +81,7 @@ public class SystemLocalStorageService {
systemLocalStorageMapper.insert(localStorage);
return localStorage;
} catch (Exception e) {
CsFileUtil.del(file);
KitFileUtil.del(file);
throw e;
}
}
@@ -108,7 +108,7 @@ public class SystemLocalStorageService {
for (Long id : ids) {
SystemLocalStorageTb storage = systemLocalStorageMapper.selectById(id);
try {
CsFileUtil.del(storage.getPath());
KitFileUtil.del(storage.getPath());
systemLocalStorageMapper.deleteById(storage);
} catch (IORuntimeException e) {
throw new BadRequestException("删除文件 " + storage.getName() + " 失败");
@@ -135,7 +135,7 @@ public class SystemLocalStorageService {
map.put("创建日期", localStorage.getCreateTime());
list.add(map);
}
CsFileUtil.downloadExcel(list, response);
KitFileUtil.downloadExcel(list, response);
}
/**
@@ -145,8 +145,8 @@ public class SystemLocalStorageService {
* @param page 分页参数
* @return /
*/
public CsPageResult<SystemLocalStorageTb> queryLocalStorage(SystemQueryStorageArgs criteria, Page<SystemLocalStorageTb> page) {
return CsPageUtil.toPage(systemLocalStorageMapper.selectLocalStorageByArgs(criteria, page));
public KitPageResult<SystemLocalStorageTb> queryLocalStorage(SystemQueryStorageArgs criteria, Page<SystemLocalStorageTb> page) {
return KitPageUtil.toPage(systemLocalStorageMapper.selectLocalStorageByArgs(criteria, page));
}
/**
@@ -156,6 +156,6 @@ public class SystemLocalStorageService {
* @return /
*/
public List<SystemLocalStorageTb> queryLocalStorage(SystemQueryStorageArgs criteria) {
return systemLocalStorageMapper.selectLocalStorageByArgs(criteria, CsPageUtil.getCount(systemLocalStorageMapper)).getRecords();
return systemLocalStorageMapper.selectLocalStorageByArgs(criteria, KitPageUtil.getCount(systemLocalStorageMapper)).getRecords();
}
}
cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/service/SystemMenuService.java
+6 -6
View File
@@ -20,7 +20,7 @@ import cn.hutool.core.collection.CollUtil;
import cn.hutool.core.collection.CollectionUtil;
import cn.hutool.core.util.ObjectUtil;
import cn.hutool.core.util.StrUtil;
import cn.odboy.framework.context.CsSpringBeanHolder;
import cn.odboy.framework.context.KitSpringBeanHolder;
import cn.odboy.framework.exception.BadRequestException;
import cn.odboy.system.constant.TransferProtocolConst;
import cn.odboy.system.dal.dataobject.SystemMenuTb;
@@ -31,8 +31,8 @@ import cn.odboy.system.dal.model.SystemMenuVo;
import cn.odboy.system.dal.model.SystemQueryMenuArgs;
import cn.odboy.system.dal.mysql.SystemMenuMapper;
import cn.odboy.system.dal.mysql.SystemRoleMenuMapper;
import cn.odboy.util.CsClassUtil;
import cn.odboy.util.CsFileUtil;
import cn.odboy.util.KitClassUtil;
import cn.odboy.util.KitFileUtil;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import jakarta.servlet.http.HttpServletResponse;
import org.springframework.beans.factory.annotation.Autowired;
@@ -158,7 +158,7 @@ public class SystemMenuService {
}
List<Long> menuIds = menuSet.stream().map(SystemMenuTb::getId).filter(Objects::nonNull).distinct().toList();
if (CollUtil.isNotEmpty(menuIds)) {
CsSpringBeanHolder.getBean(SystemMenuService.class).removeRoleMenuByMenuIds(menuIds);
KitSpringBeanHolder.getBean(SystemMenuService.class).removeRoleMenuByMenuIds(menuIds);
systemMenuMapper.deleteByIds(menuIds);
}
for (SystemMenuTb menu : menuSet) {
@@ -192,7 +192,7 @@ public class SystemMenuService {
map.put("创建日期", menu.getCreateTime());
list.add(map);
}
CsFileUtil.downloadExcel(list, response);
KitFileUtil.downloadExcel(list, response);
}
@Transactional(rollbackFor = Exception.class)
@@ -215,7 +215,7 @@ public class SystemMenuService {
public List<SystemMenuTb> queryAllMenu(SystemQueryMenuArgs criteria, Boolean isQuery) throws Exception {
if (Boolean.TRUE.equals(isQuery)) {
criteria.setPidIsNull(true);
List<Field> fields = CsClassUtil.getAllFields(criteria.getClass(), new ArrayList<>());
List<Field> fields = KitClassUtil.getAllFields(criteria.getClass(), new ArrayList<>());
for (Field field : fields) {
//设置对象的访问权限, 保证对private的属性的访问
field.setAccessible(true);
cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/service/SystemMonitorService.java
+6 -6
View File
@@ -19,8 +19,8 @@ package cn.odboy.system.service;
import cn.hutool.core.date.BetweenFormatter.Level;
import cn.hutool.core.date.DateUtil;
import cn.odboy.constant.SystemConst;
import cn.odboy.util.CsFileUtil;
import cn.odboy.util.CsIPUtil;
import cn.odboy.util.KitFileUtil;
import cn.odboy.util.KitIPUtil;
import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Service;
import oshi.SystemInfo;
@@ -94,9 +94,9 @@ public class SystemMonitorService {
}
}
long used = total - available;
diskInfo.put("total", total > 0 ? CsFileUtil.getSize(total) : "?");
diskInfo.put("available", CsFileUtil.getSize(available));
diskInfo.put("used", CsFileUtil.getSize(used));
diskInfo.put("total", total > 0 ? KitFileUtil.getSize(total) : "?");
diskInfo.put("available", KitFileUtil.getSize(available));
diskInfo.put("used", KitFileUtil.getSize(used));
if (total != 0) {
diskInfo.put("usageRate", df.format(used / (double)total * 100));
} else {
@@ -197,7 +197,7 @@ public class SystemMonitorService {
// 系统信息
systemInfo.put("os", os.toString());
systemInfo.put("day", formatBetween);
systemInfo.put("ip", CsIPUtil.getLocalIp());
systemInfo.put("ip", KitIPUtil.getLocalIp());
return systemInfo;
}
}
cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/service/SystemOssStorageService.java
+2 -2
View File
@@ -16,7 +16,7 @@
package cn.odboy.system.service;
import cn.odboy.base.CsPageResult;
import cn.odboy.base.KitPageResult;
import cn.odboy.system.dal.dataobject.SystemOssStorageTb;
import cn.odboy.system.dal.model.SystemOssStorageVo;
import cn.odboy.system.dal.model.SystemQueryStorageArgs;
@@ -37,7 +37,7 @@ import java.util.List;
* @since 2025-07-15
*/
public interface SystemOssStorageService extends IService<SystemOssStorageTb> {
CsPageResult<SystemOssStorageVo> queryOssStorage(SystemQueryStorageArgs criteria, Page<SystemOssStorageTb> page);
KitPageResult<SystemOssStorageVo> queryOssStorage(SystemQueryStorageArgs criteria, Page<SystemOssStorageTb> page);
List<SystemOssStorageVo> queryOssStorage(SystemQueryStorageArgs criteria);
cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/service/SystemQuartzJobService.java
+13 -13
View File
@@ -19,9 +19,9 @@ package cn.odboy.system.service;
import cn.hutool.core.bean.BeanUtil;
import cn.hutool.core.util.IdUtil;
import cn.hutool.core.util.StrUtil;
import cn.odboy.base.CsPageResult;
import cn.odboy.base.KitPageResult;
import cn.odboy.framework.exception.BadRequestException;
import cn.odboy.framework.redis.CsRedisHelper;
import cn.odboy.framework.redis.KitRedisHelper;
import cn.odboy.system.dal.dataobject.SystemQuartzJobTb;
import cn.odboy.system.dal.dataobject.SystemQuartzLogTb;
import cn.odboy.system.dal.model.SystemQueryQuartzJobArgs;
@@ -29,8 +29,8 @@ import cn.odboy.system.dal.model.SystemUpdateQuartzJobArgs;
import cn.odboy.system.dal.mysql.SystemQuartzJobMapper;
import cn.odboy.system.dal.mysql.SystemQuartzLogMapper;
import cn.odboy.system.framework.quartz.QuartzManage;
import cn.odboy.util.CsFileUtil;
import cn.odboy.util.CsPageUtil;
import cn.odboy.util.KitFileUtil;
import cn.odboy.util.KitPageUtil;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import jakarta.servlet.http.HttpServletResponse;
import org.quartz.CronExpression;
@@ -50,7 +50,7 @@ public class SystemQuartzJobService {
@Autowired
private QuartzManage quartzManage;
@Autowired
private CsRedisHelper redisHelper;
private KitRedisHelper redisHelper;
/**
* 创建
@@ -193,7 +193,7 @@ public class SystemQuartzJobService {
map.put("创建日期", quartzJob.getCreateTime());
list.add(map);
}
CsFileUtil.downloadExcel(list, response);
KitFileUtil.downloadExcel(list, response);
}
/**
@@ -219,7 +219,7 @@ public class SystemQuartzJobService {
map.put("创建日期", quartzLog.getCreateTime());
list.add(map);
}
CsFileUtil.downloadExcel(list, response);
KitFileUtil.downloadExcel(list, response);
}
/**
@@ -230,8 +230,8 @@ public class SystemQuartzJobService {
* @return /
*/
public CsPageResult<SystemQuartzJobTb> queryQuartzJobByArgs(SystemQueryQuartzJobArgs criteria, Page<SystemQuartzJobTb> page) {
return CsPageUtil.toPage(systemQuartzJobMapper.selectQuartzJobByArgs(criteria, page));
public KitPageResult<SystemQuartzJobTb> queryQuartzJobByArgs(SystemQueryQuartzJobArgs criteria, Page<SystemQuartzJobTb> page) {
return KitPageUtil.toPage(systemQuartzJobMapper.selectQuartzJobByArgs(criteria, page));
}
/**
@@ -242,8 +242,8 @@ public class SystemQuartzJobService {
* @return /
*/
public CsPageResult<SystemQuartzLogTb> queryQuartzLogByArgs(SystemQueryQuartzJobArgs criteria, Page<SystemQuartzLogTb> page) {
return CsPageUtil.toPage(systemQuartzLogMapper.selectQuartzLogByArgs(criteria, page));
public KitPageResult<SystemQuartzLogTb> queryQuartzLogByArgs(SystemQueryQuartzJobArgs criteria, Page<SystemQuartzLogTb> page) {
return KitPageUtil.toPage(systemQuartzLogMapper.selectQuartzLogByArgs(criteria, page));
}
/**
@@ -254,7 +254,7 @@ public class SystemQuartzJobService {
*/
public List<SystemQuartzJobTb> queryQuartzJobByArgs(SystemQueryQuartzJobArgs criteria) {
return systemQuartzJobMapper.selectQuartzJobByArgs(criteria, CsPageUtil.getCount(systemQuartzJobMapper)).getRecords();
return systemQuartzJobMapper.selectQuartzJobByArgs(criteria, KitPageUtil.getCount(systemQuartzJobMapper)).getRecords();
}
/**
@@ -265,7 +265,7 @@ public class SystemQuartzJobService {
*/
public List<SystemQuartzLogTb> queryQuartzLogByArgs(SystemQueryQuartzJobArgs criteria) {
return systemQuartzLogMapper.selectQuartzLogByArgs(criteria, CsPageUtil.getCount(systemQuartzLogMapper)).getRecords();
return systemQuartzLogMapper.selectQuartzLogByArgs(criteria, KitPageUtil.getCount(systemQuartzLogMapper)).getRecords();
}
public SystemQuartzJobTb getQuartzJobById(Long id) {
cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/service/SystemRoleService.java
+6 -6
View File
@@ -20,7 +20,7 @@ import cn.hutool.core.bean.BeanUtil;
import cn.hutool.core.collection.CollUtil;
import cn.hutool.core.collection.CollectionUtil;
import cn.hutool.core.util.StrUtil;
import cn.odboy.base.CsPageResult;
import cn.odboy.base.KitPageResult;
import cn.odboy.framework.exception.BadRequestException;
import cn.odboy.system.dal.dataobject.SystemMenuTb;
import cn.odboy.system.dal.dataobject.SystemRoleTb;
@@ -32,8 +32,8 @@ import cn.odboy.system.dal.mysql.SystemRoleDeptMapper;
import cn.odboy.system.dal.mysql.SystemRoleMapper;
import cn.odboy.system.dal.mysql.SystemRoleMenuMapper;
import cn.odboy.system.dal.mysql.SystemUserMapper;
import cn.odboy.util.CsFileUtil;
import cn.odboy.util.CsPageUtil;
import cn.odboy.util.KitFileUtil;
import cn.odboy.util.KitPageUtil;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import jakarta.servlet.http.HttpServletResponse;
import org.springframework.beans.factory.annotation.Autowired;
@@ -148,7 +148,7 @@ public class SystemRoleService {
map.put("创建日期", role.getCreateTime());
list.add(map);
}
CsFileUtil.downloadExcel(list, response);
KitFileUtil.downloadExcel(list, response);
}
/**
@@ -180,11 +180,11 @@ public class SystemRoleService {
* @return
*/
public CsPageResult<SystemRoleTb> queryRoleByArgs(SystemQueryRoleArgs criteria, Page<Object> page) {
public KitPageResult<SystemRoleTb> queryRoleByArgs(SystemQueryRoleArgs criteria, Page<Object> page) {
criteria.setOffset(page.offset());
List<SystemRoleTb> roles = systemRoleMapper.selectRoleByArgs(criteria);
Long total = systemRoleMapper.countRoleByArgs(criteria);
return CsPageUtil.toPage(roles, total);
return KitPageUtil.toPage(roles, total);
}
/**
cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/service/SystemUserService.java
+14 -14
View File
@@ -17,9 +17,9 @@
package cn.odboy.system.service;
import cn.hutool.core.util.StrUtil;
import cn.odboy.base.CsPageResult;
import cn.odboy.base.KitPageResult;
import cn.odboy.framework.exception.BadRequestException;
import cn.odboy.framework.server.core.CsFileLocalUploadHelper;
import cn.odboy.framework.server.core.KitFileLocalUploadHelper;
import cn.odboy.system.dal.dataobject.SystemJobTb;
import cn.odboy.system.dal.dataobject.SystemRoleTb;
import cn.odboy.system.dal.dataobject.SystemUserTb;
@@ -29,9 +29,9 @@ import cn.odboy.system.dal.mysql.SystemUserMapper;
import cn.odboy.system.dal.mysql.SystemUserRoleMapper;
import cn.odboy.system.dal.redis.SystemUserInfoDAO;
import cn.odboy.system.dal.redis.SystemUserOnlineInfoDAO;
import cn.odboy.system.framework.permission.core.CsSecurityHelper;
import cn.odboy.util.CsFileUtil;
import cn.odboy.util.CsPageUtil;
import cn.odboy.system.framework.permission.core.KitSecurityHelper;
import cn.odboy.util.KitFileUtil;
import cn.odboy.util.KitPageUtil;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@@ -58,7 +58,7 @@ public class SystemUserService {
@Autowired
private SystemUserOnlineInfoDAO systemUserOnlineInfoDAO;
@Autowired
private CsFileLocalUploadHelper fileUploadPathHelper;
private KitFileLocalUploadHelper fileUploadPathHelper;
/**
* 新增用户
@@ -215,26 +215,26 @@ public class SystemUserService {
@Transactional(rollbackFor = Exception.class)
public Map<String, String> modifyUserAvatar(MultipartFile multipartFile) {
SystemUserTb user = systemUserMapper.getUserByUsername(CsSecurityHelper.getCurrentUsername());
SystemUserTb user = systemUserMapper.getUserByUsername(KitSecurityHelper.getCurrentUsername());
String username = user.getUsername();
if (StrUtil.isBlank(username)) {
throw new BadRequestException("异常用户数据, 请联系管理员处理");
}
// 文件大小验证
CsFileUtil.checkSize(fileUploadPathHelper.getAvatarMaxSize(), multipartFile.getSize());
KitFileUtil.checkSize(fileUploadPathHelper.getAvatarMaxSize(), multipartFile.getSize());
// 验证文件上传的格式
String image = "gif jpg png jpeg";
String fileType = CsFileUtil.getSuffix(multipartFile.getOriginalFilename());
String fileType = KitFileUtil.getSuffix(multipartFile.getOriginalFilename());
if (fileType != null && !image.contains(fileType)) {
throw new BadRequestException("文件格式错误！, 仅支持 " + image + " 格式");
}
String oldPath = user.getAvatarPath();
File file = CsFileUtil.upload(multipartFile, fileUploadPathHelper.getPath());
File file = KitFileUtil.upload(multipartFile, fileUploadPathHelper.getPath());
user.setAvatarPath(Objects.requireNonNull(file).getPath());
user.setAvatarName(file.getName());
systemUserMapper.insertOrUpdate(user);
if (StrUtil.isNotBlank(oldPath)) {
CsFileUtil.del(oldPath);
KitFileUtil.del(oldPath);
}
systemUserInfoDAO.deleteUserLoginInfoByUserName(username);
return new HashMap<>(1) {{
@@ -279,7 +279,7 @@ public class SystemUserService {
map.put("创建日期", user.getCreateTime());
list.add(map);
}
CsFileUtil.downloadExcel(list, response);
KitFileUtil.downloadExcel(list, response);
}
/**
@@ -290,9 +290,9 @@ public class SystemUserService {
* @return /
*/
public CsPageResult<SystemUserTb> queryUserByArgs(SystemQueryUserArgs criteria, Page<SystemUserTb> page) {
public KitPageResult<SystemUserTb> queryUserByArgs(SystemQueryUserArgs criteria, Page<SystemUserTb> page) {
IPage<SystemUserTb> users = systemUserMapper.selectUserByArgs(criteria, page);
return CsPageUtil.toPage(users);
return KitPageUtil.toPage(users);
}
/**
cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/service/impl/SystemOssStorageServiceImpl.java
+14 -14
View File
@@ -18,20 +18,20 @@ package cn.odboy.system.service.impl;
import cn.hutool.core.bean.BeanUtil;
import cn.hutool.core.util.StrUtil;
import cn.odboy.base.CsPageResult;
import cn.odboy.base.KitPageResult;
import cn.odboy.framework.exception.BadRequestException;
import cn.odboy.framework.properties.AppProperties;
import cn.odboy.framework.properties.model.StorageOSSModel;
import cn.odboy.framework.server.core.CsFileLocalUploadHelper;
import cn.odboy.framework.server.core.KitFileLocalUploadHelper;
import cn.odboy.system.dal.dataobject.SystemOssStorageTb;
import cn.odboy.system.dal.model.SystemOssStorageVo;
import cn.odboy.system.dal.model.SystemQueryStorageArgs;
import cn.odboy.system.dal.mysql.SystemOssStorageMapper;
import cn.odboy.system.framework.storage.minio.MinioRepository;
import cn.odboy.system.service.SystemOssStorageService;
import cn.odboy.util.CsDateUtil;
import cn.odboy.util.CsFileUtil;
import cn.odboy.util.CsPageUtil;
import cn.odboy.util.KitDateUtil;
import cn.odboy.util.KitFileUtil;
import cn.odboy.util.KitPageUtil;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
@@ -63,17 +63,17 @@ public class SystemOssStorageServiceImpl extends ServiceImpl<SystemOssStorageMap
@Autowired
private AppProperties properties;
@Autowired
private CsFileLocalUploadHelper fileLocalUploadHelper;
private KitFileLocalUploadHelper fileLocalUploadHelper;
@Override
public CsPageResult<SystemOssStorageVo> queryOssStorage(SystemQueryStorageArgs criteria, Page<SystemOssStorageTb> page) {
public KitPageResult<SystemOssStorageVo> queryOssStorage(SystemQueryStorageArgs criteria, Page<SystemOssStorageTb> page) {
IPage<SystemOssStorageTb> ossStorageTbs = baseMapper.selectOssStorageByArgs(criteria, page);
IPage<SystemOssStorageVo> convert = ossStorageTbs.convert(c -> {
SystemOssStorageVo storageVo = BeanUtil.copyProperties(c, SystemOssStorageVo.class);
storageVo.setFileSizeDesc(CsFileUtil.getSize(storageVo.getFileSize()));
storageVo.setFileSizeDesc(KitFileUtil.getSize(storageVo.getFileSize()));
return storageVo;
});
return CsPageUtil.toPage(convert);
return KitPageUtil.toPage(convert);
}
@Override
@@ -98,7 +98,7 @@ public class SystemOssStorageServiceImpl extends ServiceImpl<SystemOssStorageMap
map.put("创建日期", ossStorage.getCreateTime());
list.add(map);
}
CsFileUtil.downloadExcel(list, response);
KitFileUtil.downloadExcel(list, response);
}
@Override
@@ -111,16 +111,16 @@ public class SystemOssStorageServiceImpl extends ServiceImpl<SystemOssStorageMap
StorageOSSModel ossConfig = properties.getOss();
long fileSize = file.getSize();
String contentType = file.getContentType();
CsFileUtil.checkSize(ossConfig.getMaxSize(), fileSize);
KitFileUtil.checkSize(ossConfig.getMaxSize(), fileSize);
// 按天分组
String nowDateStr = CsDateUtil.getNowDateStr();
String nowDateStr = KitDateUtil.getNowDateStr();
// 上传到本地临时目录
File tempFile = CsFileUtil.upload(file, fileLocalUploadHelper.getPath() + nowDateStr + File.separator);
File tempFile = KitFileUtil.upload(file, fileLocalUploadHelper.getPath() + nowDateStr + File.separator);
if (tempFile == null) {
throw new BadRequestException("上传失败");
}
// 校验文件md5, 看是否已存在云端（不确定, 可能云端已经删除, 但是正常来说云端是不允许私自删除的, 所以这里忽略云端不存在的情况）
String md5 = CsFileUtil.getMd5(tempFile);
String md5 = KitFileUtil.getMd5(tempFile);
SystemOssStorageTb systemOssStorageTb = getByMd5(md5);
if (systemOssStorageTb != null) {
// 重新生成7天链接
cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/util/SqlUtil.java → cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/util/KitSqlUtil.java
+4 -4
View File
@@ -18,7 +18,7 @@ package cn.odboy.system.util;
import cn.odboy.framework.exception.BadRequestException;
import cn.odboy.framework.mybatisplus.config.DataTypeEnum;
import cn.odboy.util.CsCloseUtil;
import cn.odboy.util.KitCloseUtil;
import com.baomidou.mybatisplus.core.toolkit.StringUtils;
import com.google.common.collect.Lists;
import com.zaxxer.hikari.HikariDataSource;
@@ -37,7 +37,7 @@ import java.sql.Statement;
import java.util.List;
@Slf4j
public final class SqlUtil {
public final class KitSqlUtil {
/**
* 获取数据源
*
@@ -87,7 +87,7 @@ public final class SqlUtil {
log.error("create connection error, jdbcUrl: {}", jdbcUrl);
throw new BadRequestException("create connection error, jdbcUrl: " + jdbcUrl);
} finally {
CsCloseUtil.close(connection);
KitCloseUtil.close(connection);
}
return connection;
}
@@ -151,7 +151,7 @@ public final class SqlUtil {
} catch (SQLException throwables) {
throwables.printStackTrace();
} finally {
CsCloseUtil.close(st);
KitCloseUtil.close(st);
}
}