refactor(controller): 重构控制器代码结构和依赖管理
This commit is contained in:
+1
-1
@@ -15,7 +15,7 @@
|
||||
*/
|
||||
package cn.odboy.system.constant;
|
||||
|
||||
public interface TransferProtocolConst {
|
||||
public interface SystemTransferProtocolConst {
|
||||
|
||||
String PREFIX_HTTP = "http://";
|
||||
String PREFIX_HTTPS = "https://";
|
||||
+1
-1
@@ -16,8 +16,8 @@
|
||||
package cn.odboy.system.controller;
|
||||
|
||||
import cn.odboy.annotation.AnonymousPostMapping;
|
||||
import cn.odboy.system.dal.model.response.SystemAuthVo;
|
||||
import cn.odboy.system.dal.model.request.SystemUserLoginArgs;
|
||||
import cn.odboy.system.dal.model.response.SystemAuthVo;
|
||||
import cn.odboy.system.service.SystemAuthService;
|
||||
import io.swagger.annotations.Api;
|
||||
import io.swagger.annotations.ApiOperation;
|
||||
|
||||
+3
-5
@@ -19,8 +19,8 @@ import cn.odboy.base.KitPageArgs;
|
||||
import cn.odboy.base.KitPageResult;
|
||||
import cn.odboy.system.dal.dataobject.SystemDeptTb;
|
||||
import cn.odboy.system.dal.model.request.SystemCreateDeptArgs;
|
||||
import cn.odboy.system.dal.model.response.SystemDeptVo;
|
||||
import cn.odboy.system.dal.model.request.SystemQueryDeptArgs;
|
||||
import cn.odboy.system.dal.model.response.SystemDeptVo;
|
||||
import cn.odboy.system.framework.operalog.OperationLog;
|
||||
import cn.odboy.system.service.SystemDeptService;
|
||||
import cn.odboy.util.KitPageUtil;
|
||||
@@ -59,8 +59,7 @@ public class SystemDeptController {
|
||||
@ApiOperation("查询部门")
|
||||
@PostMapping(value = "/searchDept")
|
||||
@PreAuthorize("@el.check('user:list','dept:list')")
|
||||
public ResponseEntity<KitPageResult<SystemDeptTb>> queryDept(
|
||||
@Validated @RequestBody KitPageArgs<SystemQueryDeptArgs> pageArgs) throws Exception {
|
||||
public ResponseEntity<KitPageResult<SystemDeptTb>> queryDept(@Validated @RequestBody KitPageArgs<SystemQueryDeptArgs> pageArgs) throws Exception {
|
||||
List<SystemDeptTb> depts = systemDeptService.queryAllDeptByArgs(pageArgs.getArgs(), true);
|
||||
return ResponseEntity.ok(KitPageUtil.toPage(depts));
|
||||
}
|
||||
@@ -68,8 +67,7 @@ public class SystemDeptController {
|
||||
@ApiOperation("查询部门:根据ID获取同级与上级数据")
|
||||
@PostMapping("/searchDeptTree")
|
||||
@PreAuthorize("@el.check('user:list','dept:list')")
|
||||
public ResponseEntity<KitPageResult<SystemDeptVo>> queryDeptSuperiorTree(@RequestBody List<Long> ids,
|
||||
@RequestParam(defaultValue = "false") Boolean exclude) {
|
||||
public ResponseEntity<KitPageResult<SystemDeptVo>> queryDeptSuperiorTree(@RequestBody List<Long> ids, @RequestParam(defaultValue = "false") Boolean exclude) {
|
||||
return ResponseEntity.ok(systemDeptService.searchDeptTree(ids, exclude));
|
||||
}
|
||||
|
||||
|
||||
+2
-4
@@ -25,7 +25,6 @@ import cn.odboy.system.service.SystemDictService;
|
||||
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
|
||||
import io.swagger.annotations.Api;
|
||||
import io.swagger.annotations.ApiOperation;
|
||||
import java.io.IOException;
|
||||
import java.util.List;
|
||||
import java.util.Set;
|
||||
import jakarta.servlet.http.HttpServletResponse;
|
||||
@@ -51,7 +50,7 @@ public class SystemDictController {
|
||||
@ApiOperation("导出字典数据")
|
||||
@GetMapping(value = "/download")
|
||||
@PreAuthorize("@el.check('dict:list')")
|
||||
public void exportDict(HttpServletResponse response, SystemQueryDictArgs args) throws IOException {
|
||||
public void exportDict(HttpServletResponse response, SystemQueryDictArgs args) {
|
||||
systemDictService.exportDictXlsx(response, args);
|
||||
}
|
||||
|
||||
@@ -66,8 +65,7 @@ public class SystemDictController {
|
||||
@ApiOperation("分页查询字典")
|
||||
@PostMapping(value = "/searchDict")
|
||||
@PreAuthorize("@el.check('dict:list')")
|
||||
public ResponseEntity<KitPageResult<SystemDictTb>> queryDictByArgs(
|
||||
@Validated @RequestBody KitPageArgs<SystemQueryDictArgs> pageArgs) {
|
||||
public ResponseEntity<KitPageResult<SystemDictTb>> queryDictByArgs(@Validated @RequestBody KitPageArgs<SystemQueryDictArgs> pageArgs) {
|
||||
Page<SystemDictTb> page = new Page<>(pageArgs.getPage(), pageArgs.getSize());
|
||||
return ResponseEntity.ok(systemDictService.searchDict(pageArgs.getArgs(), page));
|
||||
}
|
||||
|
||||
+3
-5
@@ -19,8 +19,8 @@ import cn.odboy.base.KitPageArgs;
|
||||
import cn.odboy.base.KitPageResult;
|
||||
import cn.odboy.system.dal.dataobject.SystemDictDetailTb;
|
||||
import cn.odboy.system.dal.model.request.SystemCreateDictDetailArgs;
|
||||
import cn.odboy.system.dal.model.response.SystemDictDetailVo;
|
||||
import cn.odboy.system.dal.model.request.SystemQueryDictDetailArgs;
|
||||
import cn.odboy.system.dal.model.response.SystemDictDetailVo;
|
||||
import cn.odboy.system.framework.operalog.OperationLog;
|
||||
import cn.odboy.system.service.SystemDictDetailService;
|
||||
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
|
||||
@@ -49,8 +49,7 @@ public class SystemDictDetailController {
|
||||
|
||||
@ApiOperation("查询字典详情")
|
||||
@PostMapping(value = "/searchDictDetail")
|
||||
public ResponseEntity<KitPageResult<SystemDictDetailVo>> queryDictDetailByArgs(
|
||||
@Validated @RequestBody KitPageArgs<SystemQueryDictDetailArgs> pageArgs) {
|
||||
public ResponseEntity<KitPageResult<SystemDictDetailVo>> queryDictDetailByArgs(@Validated @RequestBody KitPageArgs<SystemQueryDictDetailArgs> pageArgs) {
|
||||
Page<SystemDictDetailTb> page = new Page<>(pageArgs.getPage(), pageArgs.getSize());
|
||||
return ResponseEntity.ok(systemDictDetailService.searchDictDetail(pageArgs.getArgs(), page));
|
||||
}
|
||||
@@ -75,8 +74,7 @@ public class SystemDictDetailController {
|
||||
@ApiOperation("修改字典详情")
|
||||
@PostMapping(value = "/updateDictDetailById")
|
||||
@PreAuthorize("@el.check('dict:edit')")
|
||||
public ResponseEntity<Void> updateDictDetailById(
|
||||
@Validated(SystemDictDetailTb.Update.class) @RequestBody SystemDictDetailTb args) {
|
||||
public ResponseEntity<Void> updateDictDetailById(@Validated(SystemDictDetailTb.Update.class) @RequestBody SystemDictDetailTb args) {
|
||||
systemDictDetailService.updateDictDetailById(args);
|
||||
return ResponseEntity.ok(null);
|
||||
}
|
||||
|
||||
+1
-2
@@ -49,8 +49,7 @@ public class SystemEmailController {
|
||||
@OperationLog
|
||||
@ApiOperation("修改邮箱配置")
|
||||
@PostMapping(value = "/updateEmailConfigById")
|
||||
public ResponseEntity<Void> updateEmailConfigById(@Validated @RequestBody SystemEmailConfigTb emailConfig)
|
||||
throws Exception {
|
||||
public ResponseEntity<Void> updateEmailConfigById(@Validated @RequestBody SystemEmailConfigTb emailConfig) throws Exception {
|
||||
systemEmailService.updateEmailConfigById(emailConfig);
|
||||
return ResponseEntity.ok(null);
|
||||
}
|
||||
|
||||
+2
-4
@@ -25,7 +25,6 @@ import cn.odboy.system.service.SystemJobService;
|
||||
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
|
||||
import io.swagger.annotations.Api;
|
||||
import io.swagger.annotations.ApiOperation;
|
||||
import java.io.IOException;
|
||||
import java.util.Set;
|
||||
import jakarta.servlet.http.HttpServletResponse;
|
||||
import org.springframework.beans.factory.annotation.Autowired;
|
||||
@@ -50,15 +49,14 @@ public class SystemJobController {
|
||||
@ApiOperation("导出岗位数据")
|
||||
@GetMapping(value = "/download")
|
||||
@PreAuthorize("@el.check('job:list')")
|
||||
public void exportJob(HttpServletResponse response, SystemQueryJobArgs args) throws IOException {
|
||||
public void exportJob(HttpServletResponse response, SystemQueryJobArgs args) {
|
||||
systemJobService.exportJobXlsx(response, args);
|
||||
}
|
||||
|
||||
@ApiOperation("分页查询岗位")
|
||||
@PostMapping(value = "/searchJob")
|
||||
@PreAuthorize("@el.check('job:list','user:list')")
|
||||
public ResponseEntity<KitPageResult<SystemJobTb>> queryJobByArgs(
|
||||
@Validated @RequestBody KitPageArgs<SystemQueryJobArgs> pageArgs) {
|
||||
public ResponseEntity<KitPageResult<SystemJobTb>> queryJobByArgs(@Validated @RequestBody KitPageArgs<SystemQueryJobArgs> pageArgs) {
|
||||
Page<SystemJobTb> page = new Page<>(pageArgs.getPage(), pageArgs.getSize());
|
||||
return ResponseEntity.ok(systemJobService.searchJobByArgs(pageArgs.getArgs(), page));
|
||||
}
|
||||
|
||||
+2
-4
@@ -24,7 +24,6 @@ import cn.odboy.system.service.SystemLocalStorageService;
|
||||
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
|
||||
import io.swagger.annotations.Api;
|
||||
import io.swagger.annotations.ApiOperation;
|
||||
import java.io.IOException;
|
||||
import jakarta.servlet.http.HttpServletResponse;
|
||||
import org.springframework.beans.factory.annotation.Autowired;
|
||||
import org.springframework.http.ResponseEntity;
|
||||
@@ -49,8 +48,7 @@ public class SystemLocalStorageController {
|
||||
@ApiOperation("查询文件")
|
||||
@PostMapping(value = "/searchLocalStorage")
|
||||
@PreAuthorize("@el.check('storage:list')")
|
||||
public ResponseEntity<KitPageResult<SystemLocalStorageTb>> queryLocalStorage(
|
||||
@Validated @RequestBody KitPageArgs<SystemQueryStorageArgs> pageArgs) {
|
||||
public ResponseEntity<KitPageResult<SystemLocalStorageTb>> queryLocalStorage(@Validated @RequestBody KitPageArgs<SystemQueryStorageArgs> pageArgs) {
|
||||
Page<SystemLocalStorageTb> page = new Page<>(pageArgs.getPage(), pageArgs.getSize());
|
||||
return ResponseEntity.ok(localStorageService.searchLocalStorage(pageArgs.getArgs(), page));
|
||||
}
|
||||
@@ -59,7 +57,7 @@ public class SystemLocalStorageController {
|
||||
@ApiOperation("导出本地存储记录数据")
|
||||
@GetMapping(value = "/download")
|
||||
@PreAuthorize("@el.check('storage:list')")
|
||||
public void exportFile(HttpServletResponse response, SystemQueryStorageArgs args) throws IOException {
|
||||
public void exportFile(HttpServletResponse response, SystemQueryStorageArgs args) {
|
||||
localStorageService.exportLocalStorageXlsx(response, args);
|
||||
}
|
||||
|
||||
|
||||
+1
-1
@@ -19,9 +19,9 @@ 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.request.SystemQueryMenuArgs;
|
||||
import cn.odboy.system.dal.model.response.SystemMenuRouterVo;
|
||||
import cn.odboy.system.dal.model.response.SystemMenuVo;
|
||||
import cn.odboy.system.dal.model.request.SystemQueryMenuArgs;
|
||||
import cn.odboy.system.framework.operalog.OperationLog;
|
||||
import cn.odboy.system.service.SystemMenuService;
|
||||
import cn.odboy.util.KitPageUtil;
|
||||
|
||||
+1
-2
@@ -48,8 +48,7 @@ public class SystemOnlineController {
|
||||
@ApiOperation("查询在线用户")
|
||||
@PostMapping(value = "/searchOnlineUser")
|
||||
@PreAuthorize("@el.check()")
|
||||
public ResponseEntity<KitPageResult<SystemUserOnlineVo>> queryOnlineUser(
|
||||
@Validated @RequestBody KitPageArgs<SystemUserOnlineVo> pageArgs) {
|
||||
public ResponseEntity<KitPageResult<SystemUserOnlineVo>> queryOnlineUser(@Validated @RequestBody KitPageArgs<SystemUserOnlineVo> pageArgs) {
|
||||
IPage<SystemUserOnlineVo> page = new Page<>(pageArgs.getPage(), pageArgs.getSize());
|
||||
return ResponseEntity.ok(systemUserOnlineInfoDAO.searchOnlineUser(pageArgs.getArgs(), page));
|
||||
}
|
||||
|
||||
+3
-5
@@ -18,14 +18,13 @@ package cn.odboy.system.controller;
|
||||
import cn.odboy.base.KitPageArgs;
|
||||
import cn.odboy.base.KitPageResult;
|
||||
import cn.odboy.system.dal.dataobject.SystemOssStorageTb;
|
||||
import cn.odboy.system.dal.model.response.SystemOssStorageVo;
|
||||
import cn.odboy.system.dal.model.request.SystemQueryStorageArgs;
|
||||
import cn.odboy.system.dal.model.response.SystemOssStorageVo;
|
||||
import cn.odboy.system.framework.operalog.OperationLog;
|
||||
import cn.odboy.system.service.SystemOssStorageService;
|
||||
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
|
||||
import io.swagger.annotations.Api;
|
||||
import io.swagger.annotations.ApiOperation;
|
||||
import java.io.IOException;
|
||||
import jakarta.servlet.http.HttpServletResponse;
|
||||
import lombok.extern.slf4j.Slf4j;
|
||||
import org.springframework.beans.factory.annotation.Autowired;
|
||||
@@ -52,8 +51,7 @@ public class SystemOssStorageController {
|
||||
@ApiOperation("查询文件")
|
||||
@PostMapping(value = "/searchOssStorage")
|
||||
@PreAuthorize("@el.check('storage:list')")
|
||||
public ResponseEntity<KitPageResult<SystemOssStorageVo>> queryOssStorage(
|
||||
@Validated @RequestBody KitPageArgs<SystemQueryStorageArgs> pageArgs) {
|
||||
public ResponseEntity<KitPageResult<SystemOssStorageVo>> queryOssStorage(@Validated @RequestBody KitPageArgs<SystemQueryStorageArgs> pageArgs) {
|
||||
Page<SystemOssStorageTb> page = new Page<>(pageArgs.getPage(), pageArgs.getSize());
|
||||
return ResponseEntity.ok(systemOssStorageService.searchOssStorage(pageArgs.getArgs(), page));
|
||||
}
|
||||
@@ -62,7 +60,7 @@ public class SystemOssStorageController {
|
||||
@ApiOperation("导出OSS存储记录数据")
|
||||
@GetMapping(value = "/download")
|
||||
@PreAuthorize("@el.check('storage:list')")
|
||||
public void exportFile(HttpServletResponse response, SystemQueryStorageArgs args) throws IOException {
|
||||
public void exportFile(HttpServletResponse response, SystemQueryStorageArgs args) {
|
||||
systemOssStorageService.exportOssStorageXlsx(response, args);
|
||||
}
|
||||
|
||||
|
||||
+2
-3
@@ -19,9 +19,9 @@ import cn.odboy.base.KitPageArgs;
|
||||
import cn.odboy.base.KitPageResult;
|
||||
import cn.odboy.system.dal.dataobject.SystemQuartzJobTb;
|
||||
import cn.odboy.system.dal.dataobject.SystemQuartzLogTb;
|
||||
import cn.odboy.system.dal.model.response.SystemQuartzJobVo;
|
||||
import cn.odboy.system.dal.model.request.SystemQueryQuartzJobArgs;
|
||||
import cn.odboy.system.dal.model.request.SystemUpdateQuartzJobArgs;
|
||||
import cn.odboy.system.dal.model.response.SystemQuartzJobVo;
|
||||
import cn.odboy.system.framework.operalog.OperationLog;
|
||||
import cn.odboy.system.service.SystemQuartzJobService;
|
||||
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
|
||||
@@ -53,8 +53,7 @@ public class SystemQuartzJobController {
|
||||
@ApiOperation("查询定时任务")
|
||||
@PostMapping(value = "/searchQuartzJob")
|
||||
@PreAuthorize("@el.check('quartzJob:list')")
|
||||
public ResponseEntity<KitPageResult<SystemQuartzJobTb>> queryQuartzJobByCrud(
|
||||
@Validated @RequestBody KitPageArgs<SystemQueryQuartzJobArgs> pageArgs) {
|
||||
public ResponseEntity<KitPageResult<SystemQuartzJobTb>> queryQuartzJobByCrud(@Validated @RequestBody KitPageArgs<SystemQueryQuartzJobArgs> pageArgs) {
|
||||
Page<SystemQuartzJobTb> page = new Page<>(pageArgs.getPage(), pageArgs.getSize());
|
||||
return ResponseEntity.ok(systemQuartzJobService.searchQuartzJobByArgs(pageArgs.getArgs(), page));
|
||||
}
|
||||
|
||||
+1
-2
@@ -27,7 +27,6 @@ import cn.odboy.system.service.SystemRoleService;
|
||||
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
|
||||
import io.swagger.annotations.Api;
|
||||
import io.swagger.annotations.ApiOperation;
|
||||
import java.io.IOException;
|
||||
import java.util.List;
|
||||
import java.util.Set;
|
||||
import jakarta.servlet.http.HttpServletResponse;
|
||||
@@ -59,7 +58,7 @@ public class SystemRoleController {
|
||||
@ApiOperation("导出角色数据")
|
||||
@GetMapping(value = "/download")
|
||||
@PreAuthorize("@el.check('role:list')")
|
||||
public void exportRole(HttpServletResponse response, SystemQueryRoleArgs args) throws IOException {
|
||||
public void exportRole(HttpServletResponse response, SystemQueryRoleArgs args) {
|
||||
systemRoleService.exportRoleXlsx(response, args);
|
||||
}
|
||||
|
||||
|
||||
-5
@@ -6,8 +6,6 @@ import io.swagger.annotations.ApiModelProperty;
|
||||
import java.util.List;
|
||||
import java.util.Objects;
|
||||
import java.util.Set;
|
||||
import jakarta.validation.constraints.NotBlank;
|
||||
import jakarta.validation.constraints.NotNull;
|
||||
import lombok.Getter;
|
||||
import lombok.Setter;
|
||||
|
||||
@@ -15,15 +13,12 @@ import lombok.Setter;
|
||||
@Setter
|
||||
public class SystemDeptVo extends KitBaseUserTimeTb {
|
||||
|
||||
@NotNull(groups = Update.class)
|
||||
@ApiModelProperty(value = "ID", hidden = true)
|
||||
private Long id;
|
||||
@ApiModelProperty(value = "排序")
|
||||
private Integer deptSort;
|
||||
@NotBlank
|
||||
@ApiModelProperty(value = "部门名称")
|
||||
private String name;
|
||||
@NotNull
|
||||
@ApiModelProperty(value = "是否启用")
|
||||
private Boolean enabled;
|
||||
@ApiModelProperty(value = "上级部门")
|
||||
|
||||
-2
@@ -18,7 +18,6 @@ package cn.odboy.system.dal.model.response;
|
||||
import cn.odboy.base.KitBaseUserTimeTb;
|
||||
import cn.odboy.system.dal.dataobject.SystemDictTb;
|
||||
import io.swagger.annotations.ApiModelProperty;
|
||||
import jakarta.validation.constraints.NotNull;
|
||||
import lombok.Getter;
|
||||
import lombok.Setter;
|
||||
|
||||
@@ -26,7 +25,6 @@ import lombok.Setter;
|
||||
@Setter
|
||||
public class SystemDictDetailVo extends KitBaseUserTimeTb {
|
||||
|
||||
@NotNull(groups = Update.class)
|
||||
@ApiModelProperty(value = "ID", hidden = true)
|
||||
private Long id;
|
||||
@ApiModelProperty(hidden = true)
|
||||
|
||||
-2
@@ -6,7 +6,6 @@ import io.swagger.annotations.ApiModelProperty;
|
||||
import java.util.List;
|
||||
import java.util.Objects;
|
||||
import java.util.Set;
|
||||
import jakarta.validation.constraints.NotNull;
|
||||
import lombok.Getter;
|
||||
import lombok.Setter;
|
||||
|
||||
@@ -14,7 +13,6 @@ import lombok.Setter;
|
||||
@Setter
|
||||
public class SystemMenuVo extends KitBaseUserTimeTb {
|
||||
|
||||
@NotNull(groups = {Update.class})
|
||||
@ApiModelProperty(value = "ID", hidden = true)
|
||||
private Long id;
|
||||
@ApiModelProperty(value = "菜单标题")
|
||||
|
||||
-9
@@ -2,29 +2,21 @@ package cn.odboy.system.dal.model.response;
|
||||
|
||||
import cn.odboy.base.KitBaseUserTimeTb;
|
||||
import io.swagger.annotations.ApiModelProperty;
|
||||
import jakarta.validation.constraints.NotBlank;
|
||||
import jakarta.validation.constraints.NotNull;
|
||||
import lombok.Getter;
|
||||
import lombok.Setter;
|
||||
|
||||
@Getter
|
||||
@Setter
|
||||
public class SystemQuartzJobVo extends KitBaseUserTimeTb {
|
||||
|
||||
public static final String JOB_KEY = "JOB_KEY";
|
||||
@NotNull(groups = {Update.class})
|
||||
private Long id;
|
||||
@ApiModelProperty(value = "定时器名称")
|
||||
private String jobName;
|
||||
@NotBlank
|
||||
@ApiModelProperty(value = "Bean名称")
|
||||
private String beanName;
|
||||
@NotBlank
|
||||
@ApiModelProperty(value = "方法名称")
|
||||
private String methodName;
|
||||
@ApiModelProperty(value = "参数")
|
||||
private String params;
|
||||
@NotBlank
|
||||
@ApiModelProperty(value = "cron表达式")
|
||||
private String cronExpression;
|
||||
@ApiModelProperty(value = "状态:暂停或启动")
|
||||
@@ -37,7 +29,6 @@ public class SystemQuartzJobVo extends KitBaseUserTimeTb {
|
||||
private String subTask;
|
||||
@ApiModelProperty(value = "失败后暂停")
|
||||
private Boolean pauseAfterFailure;
|
||||
@NotBlank
|
||||
@ApiModelProperty(value = "备注")
|
||||
private String description;
|
||||
/**
|
||||
|
||||
-4
@@ -7,8 +7,6 @@ import cn.odboy.system.dal.dataobject.SystemUserTb;
|
||||
import io.swagger.annotations.ApiModelProperty;
|
||||
import java.util.Objects;
|
||||
import java.util.Set;
|
||||
import jakarta.validation.constraints.NotBlank;
|
||||
import jakarta.validation.constraints.NotNull;
|
||||
import lombok.Getter;
|
||||
import lombok.Setter;
|
||||
|
||||
@@ -16,10 +14,8 @@ import lombok.Setter;
|
||||
@Setter
|
||||
public class SystemRoleVo extends KitBaseUserTimeTb {
|
||||
|
||||
@NotNull(groups = {Update.class})
|
||||
@ApiModelProperty(value = "ID", hidden = true)
|
||||
private Long id;
|
||||
@NotBlank
|
||||
@ApiModelProperty(value = "名称", hidden = true)
|
||||
private String name;
|
||||
@ApiModelProperty(value = "数据权限,全部 、 本级 、 自定义")
|
||||
|
||||
-10
@@ -7,9 +7,6 @@ import io.swagger.annotations.ApiModelProperty;
|
||||
import java.util.Date;
|
||||
import java.util.Objects;
|
||||
import java.util.Set;
|
||||
import jakarta.validation.constraints.Email;
|
||||
import jakarta.validation.constraints.NotBlank;
|
||||
import jakarta.validation.constraints.NotNull;
|
||||
import lombok.Getter;
|
||||
import lombok.Setter;
|
||||
|
||||
@@ -17,22 +14,16 @@ import lombok.Setter;
|
||||
@Setter
|
||||
public class SystemUserVo extends SystemUserTb {
|
||||
|
||||
@NotNull(groups = Update.class)
|
||||
@ApiModelProperty(value = "ID", hidden = true)
|
||||
private Long id;
|
||||
@ApiModelProperty(hidden = true)
|
||||
private Long deptId;
|
||||
@NotBlank
|
||||
@ApiModelProperty(value = "用户名称")
|
||||
private String username;
|
||||
@NotBlank
|
||||
@ApiModelProperty(value = "用户昵称")
|
||||
private String nickName;
|
||||
@Email
|
||||
@NotBlank
|
||||
@ApiModelProperty(value = "邮箱")
|
||||
private String email;
|
||||
@NotBlank
|
||||
@ApiModelProperty(value = "电话号码")
|
||||
private String phone;
|
||||
@ApiModelProperty(value = "用户性别")
|
||||
@@ -43,7 +34,6 @@ public class SystemUserVo extends SystemUserTb {
|
||||
private String avatarPath;
|
||||
@ApiModelProperty(value = "密码")
|
||||
private String password;
|
||||
@NotNull
|
||||
@ApiModelProperty(value = "是否启用")
|
||||
private Boolean enabled;
|
||||
@ApiModelProperty(value = "是否为admin账号", hidden = true)
|
||||
|
||||
+1
-1
@@ -4,8 +4,8 @@ import cn.hutool.core.util.StrUtil;
|
||||
import cn.odboy.base.KitPageResult;
|
||||
import cn.odboy.framework.properties.AppProperties;
|
||||
import cn.odboy.framework.redis.KitRedisHelper;
|
||||
import cn.odboy.system.dal.model.response.SystemUserJwtVo;
|
||||
import cn.odboy.system.dal.model.export.SystemUserOnlineExportRowVo;
|
||||
import cn.odboy.system.dal.model.response.SystemUserJwtVo;
|
||||
import cn.odboy.system.dal.model.response.SystemUserOnlineVo;
|
||||
import cn.odboy.system.framework.permission.core.handler.TokenProvider;
|
||||
import cn.odboy.util.KitBeanUtil;
|
||||
|
||||
+7
-7
@@ -21,7 +21,7 @@ import cn.hutool.core.util.ObjectUtil;
|
||||
import cn.hutool.core.util.StrUtil;
|
||||
import cn.odboy.framework.exception.BadRequestException;
|
||||
import cn.odboy.system.constant.SystemYesOrNoChConst;
|
||||
import cn.odboy.system.constant.TransferProtocolConst;
|
||||
import cn.odboy.system.constant.SystemTransferProtocolConst;
|
||||
import cn.odboy.system.dal.dataobject.SystemMenuTb;
|
||||
import cn.odboy.system.dal.model.export.SystemMenuExportRowVo;
|
||||
import cn.odboy.system.dal.model.response.SystemMenuMetaVo;
|
||||
@@ -81,9 +81,9 @@ public class SystemMenuService {
|
||||
args.setPid(null);
|
||||
}
|
||||
if (args.getIFrame()) {
|
||||
if (!(args.getPath().toLowerCase().startsWith(TransferProtocolConst.PREFIX_HTTP) ||
|
||||
args.getPath().toLowerCase().startsWith(TransferProtocolConst.PREFIX_HTTPS))) {
|
||||
throw new BadRequestException(TransferProtocolConst.PREFIX_HTTPS_BAD_REQUEST);
|
||||
if (!(args.getPath().toLowerCase().startsWith(SystemTransferProtocolConst.PREFIX_HTTP) ||
|
||||
args.getPath().toLowerCase().startsWith(SystemTransferProtocolConst.PREFIX_HTTPS))) {
|
||||
throw new BadRequestException(SystemTransferProtocolConst.PREFIX_HTTPS_BAD_REQUEST);
|
||||
}
|
||||
}
|
||||
systemMenuMapper.insert(args);
|
||||
@@ -105,9 +105,9 @@ public class SystemMenuService {
|
||||
}
|
||||
SystemMenuTb menu = systemMenuMapper.selectById(args.getId());
|
||||
if (args.getIFrame()) {
|
||||
if (!(args.getPath().toLowerCase().startsWith(TransferProtocolConst.PREFIX_HTTP) ||
|
||||
args.getPath().toLowerCase().startsWith(TransferProtocolConst.PREFIX_HTTPS))) {
|
||||
throw new BadRequestException(TransferProtocolConst.PREFIX_HTTPS_BAD_REQUEST);
|
||||
if (!(args.getPath().toLowerCase().startsWith(SystemTransferProtocolConst.PREFIX_HTTP) ||
|
||||
args.getPath().toLowerCase().startsWith(SystemTransferProtocolConst.PREFIX_HTTPS))) {
|
||||
throw new BadRequestException(SystemTransferProtocolConst.PREFIX_HTTPS_BAD_REQUEST);
|
||||
}
|
||||
}
|
||||
SystemMenuTb menu1 = this.getMenuByTitle(args.getTitle());
|
||||
|
||||
Reference in New Issue
Block a user