添加鉴权

authorize-api-service/src/main/java/com/xy/dto/SysSystemUserDto.java

@@ -1,48 +0,0 @@
-package com.xy.dto;
-
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.fasterxml.jackson.annotation.JsonFormat;
-import com.xy.entity.SysSystemUser;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-import lombok.experimental.Accessors;
-
-import java.time.LocalDate;
-
-@Data
-@Accessors(chain = true)
-@ApiModel("权限用户交互类")
-public class SysSystemUserDto extends SysSystemUser {
-
-    @ApiModelProperty("分页对象")
-    private Page<SysSystemUser> page;
-
-    @JsonFormat(pattern = "yyyy-MM-dd")
-    @ApiModelProperty(value = "创建时间-起")
-    private LocalDate beginCreateTime;
-
-    @JsonFormat(pattern = "yyyy-MM-dd")
-    @ApiModelProperty(value = "创建时间-始")
-    private LocalDate endCreateTime;
-
-    @Data
-    @Accessors(chain = true)
-    @ApiModel("权限用户修改交互类")
-    public static class UpdateDto extends SysSystemUser {
-
-        @ApiModelProperty(value = "是否是登录", hidden = true)
-        private Boolean isLogin;
-
-        @ApiModelProperty(value = "是否是重置密码")
-        private Boolean isAgainPwd;
-    }
-
-    @Data
-    @Accessors(chain = true)
-    @ApiModel("权限用户返参类")
-    public static class Vo extends SysSystemUser {
-
-    }
-
-}

authorize-api-service/src/main/java/com/xy/service/impl/SysSystemServiceImpl.java

@@ -1,9 +1,11 @@
 package com.xy.service.impl;
 
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.xy.entity.SysSystem;
 import com.xy.mapper.SysSystemMapper;
 import com.xy.service.SysSystemService;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.xy.utils.R;
+import lombok.AllArgsConstructor;
 import org.springframework.stereotype.Service;
 
 /**
@@ -15,6 +17,11 @@ import org.springframework.stereotype.Service;
  * @since 2022-12-09
  */
 @Service
+@AllArgsConstructor
 public class SysSystemServiceImpl extends ServiceImpl<SysSystemMapper, SysSystem> implements SysSystemService {
 
+    @Override
+    public R<String> save() {
+        return null;
+    }
 }

authorize-api-service/src/main/java/com/xy/service/impl/SysSystemUserServiceImpl.java

@@ -18,7 +18,8 @@ import org.springframework.web.bind.annotation.RequestBody;
 
 import java.time.LocalDateTime;
 
-import static com.xy.utils.Beans.copy;
+import static com.xy.utils.PlusBeans.toIPage;
+import static com.xy.utils.PlusBeans.toPageBean;
 
 /**
  * <p>
@@ -34,11 +35,11 @@ public class SysSystemUserServiceImpl extends ServiceImpl<SysSystemUserMapper, S
 
     @Override
     @ApiOperation("登录")
-    public R<String> login(SysSystemUserDto sysSystemUserDto) {
+    public R<String> login(SysSystemUserDto.Login login) {
         //校验账密
         SysSystemUser sysSystemUser = getOne(new LambdaQueryWrapper<SysSystemUser>()
-                .eq(SysSystemUser::getAccount, sysSystemUserDto.getAccount())
-                .eq(SysSystemUser::getPassword, SecureUtil.md5(sysSystemUserDto.getPassword()))
+                .eq(SysSystemUser::getAccount, login.getAccount())
+                .eq(SysSystemUser::getPassword, SecureUtil.md5(login.getPassword()))
         );
         if (sysSystemUser == null) {
             return R.fail("账号或密码错误");
@@ -49,26 +50,27 @@ public class SysSystemUserServiceImpl extends ServiceImpl<SysSystemUserMapper, S
         //生成token
         StpUtil.login(sysSystemUser.getId());
         //更新登录信息
-        SysSystemUserDto.UpdateDto updateDto = new SysSystemUserDto.UpdateDto()
+        SysSystemUserDto.Update update = new SysSystemUserDto.Update()
                 .setIsLogin(true);
-        updateDto.setId(sysSystemUser.getId());
-        update(updateDto);
+        update.setId(sysSystemUser.getId());
+        update(update);
         return R.ok(StpUtil.getTokenValue());
     }
 
     @Override
     @ApiOperation("注册")
-    public R<Boolean> register(SysSystemUserDto sysSystemUserDto) {
+    public R<Boolean> register(SysSystemUserDto.Login login) {
         //校验重复
         long count = count(new LambdaQueryWrapper<SysSystemUser>()
-                .eq(SysSystemUser::getAccount, sysSystemUserDto.getAccount())
+                .eq(SysSystemUser::getAccount, login.getAccount())
         );
         if (count > 0) {
             return R.fail("账号已存在");
         }
         //注册
-        SysSystemUser sysSystemUser = copy(SysSystemUser.class, sysSystemUserDto)
-                .setPassword(SecureUtil.md5(sysSystemUserDto.getPassword()))
+        SysSystemUser sysSystemUser = new SysSystemUser()
+                .setAccount(login.getAccount())
+                .setPassword(SecureUtil.md5(login.getPassword()))
                 .create(null);
         save(sysSystemUser);
         return R.ok();
@@ -76,34 +78,32 @@ public class SysSystemUserServiceImpl extends ServiceImpl<SysSystemUserMapper, S
 
     @PostMapping("page")
     @ApiOperation("分页查询")
-    public R<IPage<SysSystemUserDto.Vo>> page(@RequestBody SysSystemUserDto sysSystemUserDto) {
-        LambdaQueryWrapper<SysSystemUser> lambdaQueryWrapper = new MybatisPlusQuery().eqWrapper(sysSystemUserDto, SysSystemUser.class)
-                .ge(SysSystemUser::getCreateTime, sysSystemUserDto.getBeginCreateTime().atTime(0, 0, 0))
-                .le(SysSystemUser::getCreateTime, sysSystemUserDto.getEndCreateTime().atTime(23, 59, 59))
-                .build()
-                .select(SysSystemUser.class, info -> !info.getColumn().equals(LambdaUtils.getProperty(SysSystemUser::getPassword)));
-        IPage<SysSystemUser> page = page(sysSystemUserDto.getPage(), lambdaQueryWrapper);
-        IPage<SysSystemUserDto.Vo> result = PlusBeans.copy(SysSystemUserDto.Vo.class, page);
-        return R.ok(result);
+    public R<PageBean<SysSystemUserDto.Vo>> page(@RequestBody SysSystemUserDto.Select select) {
+        LambdaQueryWrapper<SysSystemUser> lambdaQueryWrapper = new MybatisPlusQuery().eqWrapper(select, SysSystemUser.class)
+                .ge(SysSystemUser::getCreateTime, select.getBeginCreateTime().atTime(0, 0, 0))
+                .le(SysSystemUser::getCreateTime, select.getEndCreateTime().atTime(23, 59, 59))
+                .build();
+        IPage<SysSystemUser> page = page(toIPage(select.getPage()), lambdaQueryWrapper);
+        return R.ok(toPageBean(SysSystemUserDto.Vo.class, page));
     }
 
     @PostMapping("update")
     @ApiOperation("修改")
-    public R<Boolean> update(@RequestBody SysSystemUserDto.UpdateDto updateDto) {
+    public R<Boolean> update(@RequestBody SysSystemUserDto.Update update) {
         SysSystemUser sysSystemUser = new SysSystemUser()
-                .setId(updateDto.getId())
-                .setStatus(Emptys.check(updateDto.getStatus()) ? updateDto.getStatus() : null)
-                .setPassword(Emptys.check(updateDto.getIsAgainPwd()) && updateDto.getIsAgainPwd() ? "88888888" : null)
-                .setPassword(Emptys.check(updateDto.getPassword()) ? SecureUtil.md5(updateDto.getPassword()) : null);
+                .setId(update.getId())
+                .setStatus(Emptys.check(update.getStatus()) ? update.getStatus() : null)
+                .setPassword(Emptys.check(update.getIsAgainPwd()) && update.getIsAgainPwd() ? "88888888" : null)
+                .setPassword(Emptys.check(update.getPassword()) ? SecureUtil.md5(update.getPassword()) : null);
         //如果是登录则更新登录时间和次数
-        if (Emptys.check(updateDto.getIsLogin()) && updateDto.getIsLogin()) {
-            sysSystemUser.setLastLoginTime(LocalDateTime.now()).setLoginNum(getById(updateDto.getId()).getLoginNum() + 1);
+        if (Emptys.check(update.getIsLogin()) && update.getIsLogin()) {
+            sysSystemUser.setLastLoginTime(LocalDateTime.now()).setLoginNum(getById(update.getId()).getLoginNum() + 1);
         } else {
             sysSystemUser.update(Long.parseLong(SaTokenUtils.getId().toString()));
         }
         updateById(sysSystemUser);
         //如果封禁账号则踢下线
-        if (Emptys.check(updateDto.getStatus()) && !updateDto.getStatus()) {
+        if (Emptys.check(update.getStatus()) && !update.getStatus()) {
             StpUtil.logout(SaTokenUtils.getId());
         }
         return R.ok();

authorize-api/src/main/java/com/xy/dto/SysSystemDto.java

@@ -0,0 +1,11 @@
+package com.xy.dto;
+
+import io.swagger.annotations.ApiModel;
+import lombok.Data;
+import lombok.experimental.Accessors;
+
+@Data
+@ApiModel("系统交互类")
+@Accessors(chain = true)
+public class SysSystemDto {
+}

authorize-api/src/main/java/com/xy/dto/SysSystemUserDto.java

@@ -1,5 +1,7 @@
 package com.xy.dto;
 
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.xy.utils.PageBean;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -7,20 +9,104 @@ import lombok.experimental.Accessors;
 
 import javax.validation.constraints.NotBlank;
 import javax.validation.constraints.Pattern;
+import java.time.LocalDate;
+import java.time.LocalDateTime;
 
 @Data
 @ApiModel("权限用户交互类")
 @Accessors(chain = true)
 public class SysSystemUserDto {
 
-    @ApiModelProperty(value = "账号", required = true)
-    @NotBlank(message = "account不能为空")
-    @Pattern(regexp = "^[a-zA-z0-9]{6,11}$", message = "account必须为数字或字母，长度6-11位之间")
-    private String account;
+    @Data
+    @ApiModel("查询交互类")
+    @Accessors(chain = true)
+    public static class Select {
+        @ApiModelProperty("分页对象")
+        private PageBean page;
 
-    @ApiModelProperty(value = "密码", required = true)
-    @NotBlank(message = "password不能为空")
-    @Pattern(regexp = "^[a-zA-z0-9]{6,11}$", message = "password必须为数字或字母，长度6-11位之间")
-    private String password;
+        @ApiModelProperty("唯一标识")
+        private Long id;
 
+        @ApiModelProperty("账号")
+        private String account;
+
+        @ApiModelProperty("状态 true=启用 false=封禁")
+        private Boolean status;
+
+        @JsonFormat(pattern = "yyyy-MM-dd")
+        @ApiModelProperty(value = "创建时间-起")
+        private LocalDate beginCreateTime;
+
+        @JsonFormat(pattern = "yyyy-MM-dd")
+        @ApiModelProperty(value = "创建时间-始")
+        private LocalDate endCreateTime;
+    }
+
+    @Data
+    @Accessors(chain = true)
+    @ApiModel("修改交互类")
+    public static class Update {
+
+        @ApiModelProperty("唯一标识")
+        private Long id;
+
+        @ApiModelProperty("密码")
+        private String password;
+
+        @ApiModelProperty("状态 true=启用 false=封禁")
+        private Boolean status;
+
+        @ApiModelProperty(value = "是否是登录", hidden = true)
+        private Boolean isLogin;
+
+        @ApiModelProperty(value = "是否是重置密码")
+        private Boolean isAgainPwd;
+    }
+
+    @Data
+    @Accessors(chain = true)
+    @ApiModel("登录交互类")
+    public static class Login {
+        @ApiModelProperty(value = "账号", required = true)
+        @NotBlank(message = "account不能为空")
+        @Pattern(regexp = "^[a-zA-z0-9]{6,11}$", message = "account必须为数字或字母，长度6-11位之间")
+        private String account;
+
+        @ApiModelProperty(value = "密码", required = true)
+        @NotBlank(message = "password不能为空")
+        @Pattern(regexp = "^[a-zA-z0-9]{6,11}$", message = "password必须为数字或字母，长度6-11位之间")
+        private String password;
+    }
+
+    @Data
+    @Accessors(chain = true)
+    @ApiModel("返参类")
+    public static class Vo {
+        @ApiModelProperty("账号")
+        private String account;
+
+        @ApiModelProperty("最后登录时间")
+        private LocalDateTime lastLoginTime;
+
+        @ApiModelProperty("登录次数")
+        private Integer loginNum;
+
+        @ApiModelProperty("状态 true=启用 false=封禁")
+        private Boolean status;
+
+        @ApiModelProperty("唯一标识")
+        private Long id;
+
+        @ApiModelProperty("创建时间")
+        private LocalDateTime createTime;
+
+        @ApiModelProperty("更新时间")
+        private LocalDateTime updateTime;
+
+        @ApiModelProperty("创建人")
+        private Long createUser;
+
+        @ApiModelProperty("更新人")
+        private Long updateUser;
+    }
 }

authorize-api-service/src/main/java/com/xy/service/SysSystemService.java → authorize-api/src/main/java/com/xy/service/SysSystemService.java

@@ -1,6 +1,8 @@
 package com.xy.service;
 
 import com.xy.annotate.RestMappingController;
+import com.xy.utils.R;
+import org.springframework.web.bind.annotation.PostMapping;
 
 /**
  * <p>
@@ -13,4 +15,11 @@ import com.xy.annotate.RestMappingController;
 @RestMappingController("sys-system")
 public interface SysSystemService {
 
+    /**
+     * 新增
+     *
+     * @return
+     */
+    @PostMapping("save")
+    R<String> save();
 }

authorize-api/src/main/java/com/xy/service/SysSystemUserService.java

@@ -21,18 +21,18 @@ public interface SysSystemUserService {
     /**
      * 登录
      *
-     * @param sysSystemUserDto
+     * @param login
      * @return
      */
     @PostMapping("login")
-    R<String> login(@RequestBody @Validated SysSystemUserDto sysSystemUserDto);
+    R<String> login(@RequestBody @Validated SysSystemUserDto.Login login);
 
     /**
      * 注册
      *
-     * @param sysSystemUserDto
+     * @param login
      * @return
      */
     @PostMapping("register")
-    R<Boolean> register(@RequestBody @Validated SysSystemUserDto sysSystemUserDto);
+    R<Boolean> register(@RequestBody @Validated SysSystemUserDto.Login login);
 }