entities = new ArrayList<>();
diff --git a/cutejava/cutejava-framework/src/main/java/cn/odboy/util/FileUtil.java b/cutejava/cutejava-framework/src/main/java/cn/odboy/util/FileUtil.java
index 23f6f32f..d0e829b5 100644
--- a/cutejava/cutejava-framework/src/main/java/cn/odboy/util/FileUtil.java
+++ b/cutejava/cutejava-framework/src/main/java/cn/odboy/util/FileUtil.java
@@ -30,7 +30,7 @@ import java.util.stream.Collectors;
import static cn.odboy.constant.SystemConst.*;
/**
- * File工具类,扩展 hutool 工具包
+ * File工具类, 扩展 hutool 工具包
*/
@Slf4j
@UtilityClass
@@ -39,9 +39,9 @@ public final class FileUtil extends cn.hutool.core.io.FileUtil {
/**
* 系统临时目录
*
- * windows 包含路径分割符,但Linux 不包含,
- * 在windows \\==\ 前提下,
- * 为安全起见 同意拼装 路径分割符,
+ * windows 包含路径分割符, 但Linux 不包含,
+ * 在windows \\==\ 前提下,
+ * 为安全起见 同意拼装 路径分割符,
*
* java.io.tmpdir
* windows : C:\Users/xxx\AppData\Local\Temp\
@@ -77,7 +77,7 @@ public final class FileUtil extends cn.hutool.core.io.FileUtil {
String prefix = "." + getSuffix(fileName);
File file = null;
try {
- // 用uuid作为文件名,防止生成的临时文件重复
+ // 用uuid作为文件名, 防止生成的临时文件重复
file = new File(SYS_TEM_DIR + IdUtil.simpleUUID() + prefix);
// MultipartFile to File
multipartFile.transferTo(file);
@@ -189,7 +189,7 @@ public final class FileUtil extends cn.hutool.core.io.FileUtil {
});
return sanitizedMap;
}).collect(Collectors.toList());
- // 一次性写出内容,使用默认样式,强制输出标题
+ // 一次性写出内容, 使用默认样式,强制输出标题
writer.write(sanitizedList, true);
SXSSFSheet sheet = (SXSSFSheet) writer.getSheet();
//上面需要强转SXSSFSheet 不然没有trackAllColumnsForAutoSizing方法
diff --git a/cutejava/cutejava-framework/src/main/java/cn/odboy/util/IpUtil.java b/cutejava/cutejava-framework/src/main/java/cn/odboy/util/IpUtil.java
index 09996cb2..35749f6b 100644
--- a/cutejava/cutejava-framework/src/main/java/cn/odboy/util/IpUtil.java
+++ b/cutejava/cutejava-framework/src/main/java/cn/odboy/util/IpUtil.java
@@ -48,10 +48,10 @@ public final class IpUtil {
// 排除loopback类型地址
if (!inetAddr.isLoopbackAddress()) {
if (inetAddr.isSiteLocalAddress()) {
- // 如果是site-local地址,就是它了
+ // 如果是site-local地址, 就是它了
return inetAddr.getHostAddress();
} else if (candidateAddress == null) {
- // site-local类型的地址未被发现,先记录候选地址
+ // site-local类型的地址未被发现, 先记录候选地址
candidateAddress = inetAddr;
}
}
diff --git a/cutejava/cutejava-framework/src/main/java/cn/odboy/util/RsaEncryptUtil.java b/cutejava/cutejava-framework/src/main/java/cn/odboy/util/RsaEncryptUtil.java
index d2817cb8..927b2bd6 100644
--- a/cutejava/cutejava-framework/src/main/java/cn/odboy/util/RsaEncryptUtil.java
+++ b/cutejava/cutejava-framework/src/main/java/cn/odboy/util/RsaEncryptUtil.java
@@ -12,7 +12,7 @@ import java.security.spec.PKCS8EncodedKeySpec;
import java.security.spec.X509EncodedKeySpec;
/**
- * Rsa 工具类,公钥私钥生成,加解密
+ * Rsa 工具类, 公钥私钥生成, 加解密
*/
@UtilityClass
public final class RsaEncryptUtil {
@@ -42,7 +42,7 @@ public final class RsaEncryptUtil {
System.out.println("加密后:" + text1);
System.out.println("解密后:" + text2);
if (RsaEncryptUtil.SRC.equals(text2)) {
- System.out.println("解密字符串和原始字符串一致,解密成功");
+ System.out.println("解密字符串和原始字符串一致, 解密成功");
} else {
System.out.println("解密字符串和原始字符串不一致,解密失败");
}
diff --git a/cutejava/cutejava-module-system/pom.xml b/cutejava/cutejava-module-system/pom.xml
index b5419fd5..e10ef109 100644
--- a/cutejava/cutejava-module-system/pom.xml
+++ b/cutejava/cutejava-module-system/pom.xml
@@ -17,5 +17,11 @@
cutejava-framework
1.4.1
+
+
+ io.minio
+ minio
+ 8.5.17
+
diff --git a/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/controller/SystemAuthController.java b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/controller/SystemAuthController.java
index 5a475dca..b8220ca6 100644
--- a/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/controller/SystemAuthController.java
+++ b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/controller/SystemAuthController.java
@@ -3,19 +3,19 @@ package cn.odboy.system.controller;
import cn.hutool.core.bean.BeanUtil;
import cn.hutool.core.util.IdUtil;
import cn.odboy.annotation.AnonymousPostMapping;
-import cn.odboy.constant.SystemConst;
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.RedisHelper;
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.SystemRedisKey;
import cn.odboy.system.dal.redis.SystemUserOnlineInfoDAO;
-import cn.odboy.system.framework.permission.core.SecurityHelper;
+import cn.odboy.system.framework.permission.core.CsSecurityHelper;
import cn.odboy.system.framework.permission.core.handler.TokenProvider;
import cn.odboy.system.framework.permission.core.handler.UserDetailsHandler;
-import cn.odboy.framework.properties.AppProperties;
-import cn.odboy.framework.exception.BadRequestException;
-import cn.odboy.framework.redis.RedisHelper;
import cn.odboy.util.RsaEncryptUtil;
import cn.odboy.util.StringUtil;
import com.wf.captcha.base.Captcha;
@@ -99,7 +99,7 @@ public class SystemAuthController {
@ApiOperation("获取用户信息")
@PostMapping(value = "/info")
public ResponseEntity getUserInfo() {
- SystemUserJwtVo jwtUser = (SystemUserJwtVo) SecurityHelper.getCurrentUser();
+ SystemUserJwtVo jwtUser = (SystemUserJwtVo) CsSecurityHelper.getCurrentUser();
SystemUserInfoVo userInfoVo = BeanUtil.copyProperties(jwtUser, SystemUserInfoVo.class);
return ResponseEntity.ok(userInfoVo);
}
@@ -110,7 +110,7 @@ public class SystemAuthController {
// 获取运算的结果
Captcha captcha = properties.getLogin().getCaptchaSetting().getCaptcha();
String uuid = SystemRedisKey.CAPTCHA_LOGIN + IdUtil.simpleUUID();
- //当验证码类型为 arithmetic时且长度 >= 2 时,captcha.text()的结果有几率为浮点型
+ //当验证码类型为 arithmetic时且长度 >= 2 时, captcha.text()的结果有几率为浮点型
String captchaValue = captcha.text();
if (captcha.getCharType() - 1 == CaptchaCodeEnum.ARITHMETIC.ordinal() && captchaValue.contains(SystemConst.SYMBOL_DOT)) {
captchaValue = captchaValue.split("\\.")[0];
diff --git a/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/controller/SystemCaptchaController.java b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/controller/SystemCaptchaController.java
index 148a166e..b53febaa 100644
--- a/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/controller/SystemCaptchaController.java
+++ b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/controller/SystemCaptchaController.java
@@ -18,7 +18,7 @@ import org.springframework.web.bind.annotation.*;
public class SystemCaptchaController {
private final SystemEmailService systemEmailService;
- @ApiOperation("重置邮箱,发送验证码")
+ @ApiOperation("重置邮箱, 发送验证码")
@PostMapping(value = "/sendResetEmailCaptcha")
public ResponseEntity sendResetEmailCaptcha(@RequestParam String email) {
systemEmailService.sendCaptcha(SystemCaptchaBizEnum.EMAIL_RESET_EMAIL_CODE, email);
diff --git a/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/controller/SystemDeptController.java b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/controller/SystemDeptController.java
index 23085802..4a4c5b85 100644
--- a/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/controller/SystemDeptController.java
+++ b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/controller/SystemDeptController.java
@@ -3,8 +3,8 @@ package cn.odboy.system.controller;
import cn.odboy.base.CsPageArgs;
import cn.odboy.base.CsResultVo;
import cn.odboy.system.dal.dataobject.SystemDeptTb;
-import cn.odboy.system.dal.model.CreateSystemDeptArgs;
-import cn.odboy.system.dal.model.QuerySystemDeptArgs;
+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 io.swagger.annotations.Api;
@@ -33,15 +33,15 @@ public class SystemDeptController {
@ApiOperation("导出部门数据")
@GetMapping(value = "/download")
@PreAuthorize("@el.check('dept:list')")
- public void exportDept(HttpServletResponse response, QuerySystemDeptArgs criteria) throws Exception {
+ public void exportDept(HttpServletResponse response, SystemQueryDeptArgs criteria) throws Exception {
systemDeptService.exportDeptExcel(systemDeptService.queryAllDept(criteria, false), response);
}
@ApiOperation("查询部门")
@PostMapping
@PreAuthorize("@el.check('user:list','dept:list')")
- public ResponseEntity>> queryDept(@Validated @RequestBody CsPageArgs args) throws Exception {
- QuerySystemDeptArgs criteria = args.getArgs();
+ public ResponseEntity>> queryDept(@Validated @RequestBody CsPageArgs args) throws Exception {
+ SystemQueryDeptArgs criteria = args.getArgs();
List depts = systemDeptService.queryAllDept(criteria, true);
return new ResponseEntity<>(CsPageUtil.toPage(depts), HttpStatus.OK);
}
@@ -62,7 +62,7 @@ public class SystemDeptController {
data.setSubCount(data.getSubCount() - 1);
}
}
- // 编辑部门时不显示自己以及自己下级的数据,避免出现PID数据环形问题
+ // 编辑部门时不显示自己以及自己下级的数据, 避免出现PID数据环形问题
depts = depts.stream().filter(i -> !ids.contains(i.getId())).collect(Collectors.toList());
}
deptSet.addAll(depts);
@@ -73,7 +73,7 @@ public class SystemDeptController {
@ApiOperation("新增部门")
@PostMapping(value = "/saveDept")
@PreAuthorize("@el.check('dept:add')")
- public ResponseEntity saveDept(@Validated @RequestBody CreateSystemDeptArgs resources) {
+ public ResponseEntity saveDept(@Validated @RequestBody SystemCreateDeptArgs resources) {
systemDeptService.saveDept(resources);
return new ResponseEntity<>(HttpStatus.CREATED);
}
@@ -90,7 +90,7 @@ public class SystemDeptController {
@PostMapping(value = "/removeDeptByIds")
@PreAuthorize("@el.check('dept:del')")
public ResponseEntity removeDeptByIds(@RequestBody Set ids) {
- // 获取部门,和其所有子部门
+ // 获取部门, 和其所有子部门
Set depts = systemDeptService.traverseDeptByIdWithPids(ids);
// 验证是否被角色或用户关联
systemDeptService.verifyBindRelationByIds(depts);
diff --git a/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/controller/SystemDictController.java b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/controller/SystemDictController.java
index 7f13bed5..57fb3d1b 100644
--- a/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/controller/SystemDictController.java
+++ b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/controller/SystemDictController.java
@@ -3,8 +3,8 @@ package cn.odboy.system.controller;
import cn.odboy.base.CsPageArgs;
import cn.odboy.base.CsResultVo;
import cn.odboy.system.dal.dataobject.SystemDictTb;
-import cn.odboy.system.dal.model.CreateSystemDictArgs;
-import cn.odboy.system.dal.model.QuerySystemDictArgs;
+import cn.odboy.system.dal.model.SystemCreateDictArgs;
+import cn.odboy.system.dal.model.SystemQueryDictArgs;
import cn.odboy.system.service.SystemDictService;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import io.swagger.annotations.Api;
@@ -31,7 +31,7 @@ public class SystemDictController {
@ApiOperation("导出字典数据")
@GetMapping(value = "/download")
@PreAuthorize("@el.check('dict:list')")
- public void exportDict(HttpServletResponse response, QuerySystemDictArgs criteria) throws IOException {
+ public void exportDict(HttpServletResponse response, SystemQueryDictArgs criteria) throws IOException {
systemDictService.exportDictExcel(systemDictService.queryDictByArgs(criteria), response);
}
@@ -39,14 +39,14 @@ public class SystemDictController {
@PostMapping(value = "/queryAllDict")
@PreAuthorize("@el.check('dict:list')")
public ResponseEntity> queryAllDict() {
- return new ResponseEntity<>(systemDictService.queryDictByArgs(new QuerySystemDictArgs()), HttpStatus.OK);
+ return new ResponseEntity<>(systemDictService.queryDictByArgs(new SystemQueryDictArgs()), HttpStatus.OK);
}
@ApiOperation("查询字典")
@PostMapping
@PreAuthorize("@el.check('dict:list')")
- public ResponseEntity>> queryDictByArgs(@Validated @RequestBody CsPageArgs args) {
- QuerySystemDictArgs criteria = args.getArgs();
+ public ResponseEntity>> queryDictByArgs(@Validated @RequestBody CsPageArgs args) {
+ SystemQueryDictArgs criteria = args.getArgs();
Page page = new Page<>(criteria.getPage(), criteria.getSize());
return new ResponseEntity<>(systemDictService.queryDictByArgs(criteria, page), HttpStatus.OK);
}
@@ -54,7 +54,7 @@ public class SystemDictController {
@ApiOperation("新增字典")
@PostMapping(value = "/saveDict")
@PreAuthorize("@el.check('dict:add')")
- public ResponseEntity saveDict(@Validated @RequestBody CreateSystemDictArgs resources) {
+ public ResponseEntity saveDict(@Validated @RequestBody SystemCreateDictArgs resources) {
systemDictService.saveDict(resources);
return new ResponseEntity<>(HttpStatus.CREATED);
}
diff --git a/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/controller/SystemDictDetailController.java b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/controller/SystemDictDetailController.java
index 2285e980..33773ace 100644
--- a/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/controller/SystemDictDetailController.java
+++ b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/controller/SystemDictDetailController.java
@@ -3,8 +3,8 @@ package cn.odboy.system.controller;
import cn.odboy.base.CsPageArgs;
import cn.odboy.base.CsResultVo;
import cn.odboy.system.dal.dataobject.SystemDictDetailTb;
-import cn.odboy.system.dal.model.CreateSystemDictDetailArgs;
-import cn.odboy.system.dal.model.QuerySystemDictDetailArgs;
+import cn.odboy.system.dal.model.SystemCreateDictDetailArgs;
+import cn.odboy.system.dal.model.SystemQueryDictDetailArgs;
import cn.odboy.system.service.SystemDictDetailService;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import io.swagger.annotations.Api;
@@ -29,14 +29,14 @@ public class SystemDictDetailController {
@ApiOperation("查询字典详情")
@PostMapping
- public ResponseEntity>> queryDictDetailByCrud(@Validated @RequestBody CsPageArgs args) {
+ public ResponseEntity>> queryDictDetailByCrud(@Validated @RequestBody CsPageArgs args) {
return queryDictDetailByArgs(args);
}
@ApiOperation("查询字典详情")
@PostMapping(value = "/queryDictDetailByArgs")
- public ResponseEntity>> queryDictDetailByArgs(@Validated @RequestBody CsPageArgs args) {
- QuerySystemDictDetailArgs criteria = args.getArgs();
+ public ResponseEntity>> queryDictDetailByArgs(@Validated @RequestBody CsPageArgs args) {
+ SystemQueryDictDetailArgs criteria = args.getArgs();
Page