Merge branch '1.0.x' into dev

continew-admin-common/src/main/java/top/charles7c/cnadmin/common/base/BaseController.java

@@ -75,7 +75,7 @@ public abstract class BaseController<S extends BaseService<V, D, Q, C>, V, D, Q,
     @Operation(summary = "分页查询列表")
     @ResponseBody
     @GetMapping
-    protected R<PageDataVO<V>> page(@Validated Q query, @Validated PageQuery pageQuery) {
+    public R<PageDataVO<V>> page(@Validated Q query, @Validated PageQuery pageQuery) {
         this.checkPermission("list");
         PageDataVO<V> pageDataVO = baseService.page(query, pageQuery);
         return R.ok(pageDataVO);
@@ -93,7 +93,7 @@ public abstract class BaseController<S extends BaseService<V, D, Q, C>, V, D, Q,
     @Operation(summary = "查询树列表")
     @ResponseBody
     @GetMapping("/tree")
-    protected R<List<Tree<Long>>> tree(@Validated Q query, @Validated SortQuery sortQuery) {
+    public R<List<Tree<Long>>> tree(@Validated Q query, @Validated SortQuery sortQuery) {
         this.checkPermission("list");
         List<Tree<Long>> list = baseService.tree(query, sortQuery, false);
         return R.ok(list);
@@ -111,7 +111,7 @@ public abstract class BaseController<S extends BaseService<V, D, Q, C>, V, D, Q,
     @Operation(summary = "查询列表")
     @ResponseBody
     @GetMapping("/list")
-    protected R<List<V>> list(@Validated Q query, @Validated SortQuery sortQuery) {
+    public R<List<V>> list(@Validated Q query, @Validated SortQuery sortQuery) {
         this.checkPermission("list");
         List<V> list = baseService.list(query, sortQuery);
         return R.ok(list);
@@ -128,7 +128,7 @@ public abstract class BaseController<S extends BaseService<V, D, Q, C>, V, D, Q,
     @Parameter(name = "id", description = "ID", in = ParameterIn.PATH)
     @ResponseBody
     @GetMapping("/{id}")
-    protected R<D> get(@PathVariable Long id) {
+    public R<D> get(@PathVariable Long id) {
         this.checkPermission("list");
         D detail = baseService.get(id);
         return R.ok(detail);
@@ -144,7 +144,7 @@ public abstract class BaseController<S extends BaseService<V, D, Q, C>, V, D, Q,
     @Operation(summary = "新增数据")
     @ResponseBody
     @PostMapping
-    protected R<Long> add(@Validated(BaseRequest.Add.class) @RequestBody C request) {
+    public R<Long> add(@Validated(BaseRequest.Add.class) @RequestBody C request) {
         this.checkPermission("add");
         Long id = baseService.add(request);
         return R.ok("新增成功", id);
@@ -162,7 +162,7 @@ public abstract class BaseController<S extends BaseService<V, D, Q, C>, V, D, Q,
     @Operation(summary = "修改数据")
     @ResponseBody
     @PutMapping("/{id}")
-    protected R update(@Validated(BaseRequest.Update.class) @RequestBody C request, @PathVariable Long id) {
+    public R update(@Validated(BaseRequest.Update.class) @RequestBody C request, @PathVariable Long id) {
         this.checkPermission("update");
         baseService.update(request, id);
         return R.ok("修改成功");
@@ -179,7 +179,7 @@ public abstract class BaseController<S extends BaseService<V, D, Q, C>, V, D, Q,
     @Parameter(name = "ids", description = "ID 列表", in = ParameterIn.PATH)
     @ResponseBody
     @DeleteMapping("/{ids}")
-    protected R delete(@PathVariable List<Long> ids) {
+    public R delete(@PathVariable List<Long> ids) {
         this.checkPermission("delete");
         baseService.delete(ids);
         return R.ok("删除成功");
@@ -197,7 +197,7 @@ public abstract class BaseController<S extends BaseService<V, D, Q, C>, V, D, Q,
      */
     @Operation(summary = "导出数据")
     @GetMapping("/export")
-    protected void export(@Validated Q query, @Validated SortQuery sortQuery, HttpServletResponse response) {
+    public void export(@Validated Q query, @Validated SortQuery sortQuery, HttpServletResponse response) {
         this.checkPermission("export");
         baseService.export(query, sortQuery, response);
     }

continew-admin-common/src/main/java/top/charles7c/cnadmin/common/util/helper/QueryHelper.java

@@ -142,7 +142,8 @@ public class QueryHelper {
         String property = queryAnnotation.property();
         fieldName = StrUtil.blankToDefault(property, fieldName);
         String columnName = StrUtil.toUnderlineCase(fieldName);
-        switch (queryAnnotation.type()) {
+        Query.Type queryType = queryAnnotation.type();
+        switch (queryType) {
             case EQUAL:
                 queryWrapper.eq(columnName, fieldValue);
                 break;
@@ -163,7 +164,9 @@ public class QueryHelper {
                 break;
             case BETWEEN:
                 List<Object> between = new ArrayList<>((List<Object>)fieldValue);
+                if (between.size() >= 2) {
                     queryWrapper.between(columnName, between.get(0), between.get(1));
+                }
                 break;
             case LEFT_LIKE:
                 queryWrapper.likeLeft(columnName, fieldValue);
@@ -191,7 +194,7 @@ public class QueryHelper {
                 queryWrapper.isNotNull(columnName);
                 break;
             default:
-                break;
+                throw new IllegalArgumentException(String.format("暂不支持 [%s] 查询类型", queryType));
         }
     }
 }

continew-admin-system/src/main/java/top/charles7c/cnadmin/system/model/request/UserRequest.java

@@ -19,6 +19,7 @@ package top.charles7c.cnadmin.system.model.request;
 import java.util.List;
 
 import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotEmpty;
 import javax.validation.constraints.NotNull;
 import javax.validation.constraints.Pattern;
 
@@ -86,12 +87,14 @@ public class UserRequest extends BaseRequest {
      * 所属部门
      */
     @Schema(description = "所属部门")
+    @NotNull(message = "所属部门不能为空")
     private Long deptId;
 
     /**
      * 所属角色
      */
     @Schema(description = "所属角色")
+    @NotEmpty(message = "所属角色不能为空")
     private List<Long> roleIds;
 
     /**

continew-admin-ui/src/views/system/user/index.vue

@@ -554,8 +554,8 @@
     rules: {
       username: [{ required: true, message: '请输入用户名' }],
       nickname: [{ required: true, message: '请输入昵称' }],
-      roleIds: [{ required: true, message: '请选择所属角色' }],
       deptId: [{ required: true, message: '请选择所属部门' }],
+      roleIds: [{ required: true, message: '请选择所属角色' }],
     },
   });
   const { queryParams, form, rules } = toRefs(data);

continew-admin-webapi/src/main/java/top/charles7c/cnadmin/webapi/controller/system/MenuController.java

@@ -52,14 +52,14 @@ public class MenuController extends BaseController<MenuService, MenuVO, MenuVO,
 
     @Override
     @SaCheckPermission("system:menu:add")
-    protected R<Long> add(@Validated(BaseRequest.Add.class) @RequestBody MenuRequest request) {
+    public R<Long> add(@Validated(BaseRequest.Add.class) @RequestBody MenuRequest request) {
         this.checkPath(request);
         return super.add(request);
     }
 
     @Override
     @SaCheckPermission("system:menu:update")
-    protected R update(@Validated(BaseRequest.Update.class) @RequestBody MenuRequest request, @PathVariable Long id) {
+    public R update(@Validated(BaseRequest.Update.class) @RequestBody MenuRequest request, @PathVariable Long id) {
         this.checkPath(request);
         return super.update(request, id);
     }

continew-admin-webapi/src/main/java/top/charles7c/cnadmin/webapi/controller/system/UserController.java

@@ -53,7 +53,7 @@ public class UserController extends BaseController<UserService, UserVO, UserDeta
 
     @Override
     @SaCheckPermission("system:user:add")
-    protected R<Long> add(@Validated(BaseRequest.Add.class) @RequestBody UserRequest request) {
+    public R<Long> add(@Validated(BaseRequest.Add.class) @RequestBody UserRequest request) {
         Long id = baseService.add(request);
         return R.ok(String.format("新增成功，请牢记默认密码：%s", SysConsts.DEFAULT_PASSWORD), id);
     }

continew-admin-webapi/src/main/resources/application-dev.yml

@@ -4,8 +4,7 @@ server:
   port: 8000
 
 --- ### 数据源配置
-spring:
+spring.datasource:
-  datasource:
   type: com.zaxxer.hikari.HikariDataSource
   ## 动态数据源配置（可配多主多从：m1、s1...、纯粹多库：mysql、oracle...、混合配置：m1、s1、oracle...）
   dynamic:
@@ -68,8 +67,7 @@ spring:
     ssl: false
 
 --- ### 邮件配置
-spring:
+spring.mail:
-  mail:
   # 根据需要更换
   host: smtp.126.com
   port: 465
@@ -109,10 +107,8 @@ captcha:
     # 模板路径
     templatePath: mail/captcha.ftl
 
---- ### 安全配置
+--- ### 安全配置-排除路径配置
-security:
+security.excludes:
-  # 排除路径配置
-  excludes:
   # 静态资源
   - /*.html
   - /**/*.html
@@ -141,8 +137,7 @@ springdoc:
     enabled: true
 
 --- ### 文件上传配置
-spring:
+spring.servlet:
-  servlet:
   multipart:
     enabled: true
     # 单文件上传大小限制

continew-admin-webapi/src/main/resources/application-prod.yml

@@ -4,8 +4,7 @@ server:
   port: 18000
 
 --- ### 数据源配置
-spring:
+spring.datasource:
-  datasource:
   type: com.zaxxer.hikari.HikariDataSource
   ## 动态数据源配置（可配多主多从：m1、s1...、纯粹多库：mysql、oracle...、混合配置：m1、s1、oracle...）
   dynamic:
@@ -68,8 +67,7 @@ spring:
     ssl: false
 
 --- ### 邮件配置
-spring:
+spring.mail:
-  mail:
   # 根据需要更换
   host: smtp.126.com
   port: 465
@@ -109,10 +107,8 @@ captcha:
     # 模板路径
     templatePath: mail/captcha.ftl
 
---- ### 安全配置
+--- ### 安全配置-排除路径配置
-security:
+security.excludes:
-  # 排除路径配置
-  excludes:
   # 静态资源
   - /*.html
   - /**/*.html
@@ -134,8 +130,7 @@ springdoc:
     enabled: false
 
 --- ### 文件上传配置
-spring:
+spring.servlet:
-  servlet:
   multipart:
     enabled: true
     # 单文件上传大小限制

continew-admin-webapi/src/main/resources/application.yml

@@ -188,6 +188,12 @@ spring:
       # 允许反序列化不存在的属性
       FAIL_ON_UNKNOWN_PROPERTIES: false
 
+--- ### 健康检查配置
+management.health:
+  mail:
+    # 关闭邮箱健康检查（邮箱配置错误或邮箱服务器不可用时，健康检查会报错）
+    enabled: false
+
 --- ### 线程池配置
 thread-pool:
   # 是否启用线程池