12/12

authorize-api-service/src/main/java/com/xy/entity/SysMenu.java

@@ -56,8 +56,8 @@ public class SysMenu extends BaseEntity2<SysMenu> {
     private String webJson;
 
     /**
-     * 状态;1=启用 2=禁用
+     * 状态
      */
-    private Integer status;
+    private Boolean status;
 
 }

authorize-api-service/src/main/java/com/xy/entity/SysRole.java

@@ -36,13 +36,13 @@ public class SysRole extends BaseEntity2<SysRole> {
     private String name;
 
     /**
-     * 状态;1=启用 2=禁用
+     * 状态
      */
-    private Integer status;
+    private Boolean status;
 
     /**
-     * 是否预留角色;1=是 2=否
+     * 是否预留角色
      */
-    private Integer isLeave;
+    private Boolean isLeave;
 
 }

authorize-api-service/src/main/java/com/xy/entity/SysSystem.java

@@ -46,8 +46,8 @@ public class SysSystem extends BaseEntity2<SysSystem> {
     private Integer type2;
 
     /**
-     * 状态;1=启用 2=禁用
+     * 状态
      */
-    private Integer status;
+    private Boolean status;
 
 }

authorize-api-service/src/main/java/com/xy/entity/SysSystemUser.java

@@ -43,8 +43,8 @@ public class SysSystemUser extends BaseEntity2<SysSystemUser> {
     private Integer loginNum;
 
     /**
-     * 状态;1=启用 2=禁用
+     * 状态
      */
-    private Integer status;
+    private Boolean status;
 
 }

authorize-api-service/src/main/java/com/xy/entity/SysSystemValue.java

@@ -36,8 +36,8 @@ public class SysSystemValue extends BaseEntity2<SysSystemValue> {
     private String value;
 
     /**
-     * 状态;1=启用 2=禁用
+     * 状态
      */
-    private Integer status;
+    private Boolean status;
 
 }

authorize-api-service/src/main/java/com/xy/entity/SysWorkUser.java

@@ -63,8 +63,8 @@ public class SysWorkUser extends BaseEntity2<SysWorkUser> {
     private Integer loginNum;
 
     /**
-     * 状态;状态 1=启用 2=禁用
+     * 状态
      */
-    private Integer status;
+    private Boolean status;
 
 }

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

@@ -1,21 +1,19 @@
 package com.xy.service.impl;
 
+import cn.dev33.satoken.stp.StpUtil;
+import cn.hutool.crypto.SecureUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.github.yitter.idgen.YitIdHelper;
 import com.xy.dto.SysSystemUserDto;
 import com.xy.entity.SysSystemUser;
 import com.xy.mapper.SysSystemUserMapper;
 import com.xy.service.SysSystemUserService;
 import com.xy.utils.R;
-import com.xy.utils.SaTokenUtils;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
-import lombok.Data;
-import lombok.experimental.Accessors;
 import org.springframework.stereotype.Service;
-import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.RequestBody;
+
+import java.time.LocalDateTime;
 
 import static com.xy.utils.Beans.copy;
 
@@ -31,18 +29,45 @@ import static com.xy.utils.Beans.copy;
 @Api(tags = "权限用户接口")
 public class SysSystemUserServiceImpl extends ServiceImpl<SysSystemUserMapper, SysSystemUser> implements SysSystemUserService {
 
+    @Override
+    @ApiOperation("登录")
+    public R<String> login(SysSystemUserDto sysSystemUserDto) {
+        //校验账密
+        SysSystemUser sysSystemUser = getOne(new LambdaQueryWrapper<SysSystemUser>()
+                .eq(SysSystemUser::getAccount, sysSystemUserDto.getAccount())
+                .eq(SysSystemUser::getPassword, SecureUtil.md5(sysSystemUserDto.getPassword()))
+        );
+        if (sysSystemUser == null) {
+            return R.fail("账号或密码错误");
+        }
+        if (!sysSystemUser.getStatus()) {
+            return R.fail("账号已被封禁");
+        }
+        //生成token
+        StpUtil.login(sysSystemUser.getId());
+        //更新登录信息
+        updateById(new SysSystemUser()
+                .setId(sysSystemUser.getId())
+                .setLastLoginTime(LocalDateTime.now())
+                .setLoginNum(sysSystemUser.getLoginNum() + 1)
+        );
+        return R.ok(StpUtil.getTokenValue());
+    }
+
     @Override
     @ApiOperation("注册")
-    public R<Boolean> register(@RequestBody @Validated SysSystemUserDto sysSystemUserDto) {
-        Object loginId = SaTokenUtils.getId();
+    public R<Boolean> register(SysSystemUserDto sysSystemUserDto) {
+        //校验重复
         long count = count(new LambdaQueryWrapper<SysSystemUser>()
                 .eq(SysSystemUser::getAccount, sysSystemUserDto.getAccount())
-                .eq(SysSystemUser::getId, loginId)
         );
         if (count > 0) {
-            return R.fail("账户已存在");
+            return R.fail("账号已存在");
         }
-        SysSystemUser sysSystemUser = copy(SysSystemUser.class, sysSystemUserDto).create(Long.parseLong(loginId.toString()));
+        //注册
+        SysSystemUser sysSystemUser = copy(SysSystemUser.class, sysSystemUserDto)
+                .setPassword(SecureUtil.md5(sysSystemUserDto.getPassword()))
+                .create(null);
         save(sysSystemUser);
         return R.ok();
     }

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

@@ -6,18 +6,21 @@ import lombok.Data;
 import lombok.experimental.Accessors;
 
 import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.Pattern;
 
 @Data
 @ApiModel("权限用户交互类")
 @Accessors(chain = true)
 public class SysSystemUserDto {
 
+    @ApiModelProperty(value = "账号", required = true)
     @NotBlank(message = "account不能为空")
-    @ApiModelProperty("账号")
+    @Pattern(regexp = "^[a-zA-z0-9]{6,11}$", message = "account必须为数字或字母，长度6-11位之间")
     private String account;
 
+    @ApiModelProperty(value = "密码", required = true)
     @NotBlank(message = "password不能为空")
-    @ApiModelProperty("密码")
+    @Pattern(regexp = "^[a-zA-z0-9]{6,11}$", message = "password必须为数字或字母，长度6-11位之间")
     private String password;
 
 }

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

@@ -3,7 +3,9 @@ package com.xy.service;
 import com.xy.annotate.RestMappingController;
 import com.xy.dto.SysSystemUserDto;
 import com.xy.utils.R;
+import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
 
 /**
  * <p>
@@ -16,6 +18,15 @@ import org.springframework.web.bind.annotation.PostMapping;
 @RestMappingController("sys-system-user")
 public interface SysSystemUserService {
 
+    /**
+     * 登录
+     *
+     * @param sysSystemUserDto
+     * @return
+     */
+    @PostMapping("login")
+    R<String> login(@RequestBody @Validated SysSystemUserDto sysSystemUserDto);
+
     /**
      * 注册
      *
@@ -23,5 +34,5 @@ public interface SysSystemUserService {
      * @return
      */
     @PostMapping("register")
-    R<Boolean> register(SysSystemUserDto sysSystemUserDto);
+    R<Boolean> register(@RequestBody @Validated SysSystemUserDto sysSystemUserDto);
 }

authorize-start/src/main/resources/bootstrap-uat.yml

@@ -3,7 +3,6 @@ cloud:
   service:
     name: authorize
     ip: 119.96.213.127
-    port: 9052
 
 #雪花ID唯一标识
 workerId: 20