Bladeren bron

add(operation-backend):[子账号管理]

wangxiao 4 jaren geleden
bovenliggende
commit
02a6225e3e

+ 4 - 4
operation-backend/src/main/java/com/idiot/operationbackend/controller/AuthController.java

@@ -29,7 +29,7 @@ import java.util.Objects;
 @RestController
 @RequestMapping("/auth")
 @Api(value = "AuthController", tags ="认证、授权登录")
-public class AuthController {
+public class AuthController  {
 
 
     private final Logger logger = LoggerFactory.getLogger(AuthController.class);
@@ -51,7 +51,6 @@ public class AuthController {
 
     @PostMapping("/login")
     @ApiOperation(value = "账号登录")
-    @ApiImplicitParam(value = "authUser",paramType = "body",dataTypeClass = AuthUser.class)
     public ResponseEntity<JsonResult<AuthUser>> login(@RequestBody @Valid AuthUser authUser) {
         logger.info("用户:{}账号密码登录",authUser.getUserCode());
         String captchaCode = authUser.getCaptchaCode();
@@ -111,7 +110,7 @@ public class AuthController {
         String parentUserId = JwtTokenUtil.getUserId(token);
         logger.info("用户:{}创建 子账号",parentUserId);
         AuthUser parentUser = userService.getById(parentUserId);
-        if (Objects.isNull(parentUser) || !StringUtils.isEmpty(parentUser.getParentUerId())) {
+        if (Objects.isNull(parentUser) || !StringUtils.isEmpty(parentUser.getParentUserId())) {
             throw new CustomException(500,"您的账号无权是子账号无权创建子账号");
         }
         if (Objects.isNull(authUser) || StringUtils.isEmpty(authUser.getUserCode())
@@ -123,7 +122,8 @@ public class AuthController {
         }
         authUser.setState(true);
         authUser.setId(null);
-        authUser.setParentUerId(parentUserId);
+        authUser.setAvatarUrl(Constants.DEFAULT_HEAD_IMG);
+        authUser.setParentUserId(parentUserId);
         authUser.setCreateTime(Constants.DATE_TIME_FORMATTER.format(LocalDateTime.now()));
         boolean ifSave = userService.saveUserAndDigPassword(authUser);
         return ResponseEntity.ok(JsonResult.success(ifSave));

+ 5 - 5
operation-backend/src/main/java/com/idiot/operationbackend/entity/AuthUser.java

@@ -28,7 +28,7 @@ public class AuthUser {
 
     private String avatarUrl;
 
-    private String parentUerId;
+    private String parentUserId;
 
     private Boolean state;
 
@@ -86,12 +86,12 @@ public class AuthUser {
         this.avatarUrl = avatarUrl;
     }
 
-    public String getParentUerId() {
-        return parentUerId;
+    public String getParentUserId() {
+        return parentUserId;
     }
 
-    public void setParentUerId(String parentUerId) {
-        this.parentUerId = parentUerId;
+    public void setParentUserId(String parentUserId) {
+        this.parentUserId = parentUserId;
     }
 
     public Boolean getState() {

+ 2 - 3
operation-backend/src/main/java/com/idiot/operationbackend/service/impl/AuthUserServiceImpl.java

@@ -33,14 +33,14 @@ public class AuthUserServiceImpl extends ServiceImpl<AuthUserMapper, AuthUser>
 
     @Override
     public List<AuthUser> querySubAuthUser(String userId) {
-        return list(Wrappers.<AuthUser>lambdaQuery().eq(AuthUser::getParentUerId,userId).eq(AuthUser::getState,"1"));
+        return list(Wrappers.<AuthUser>lambdaQuery().eq(AuthUser::getParentUserId,userId).eq(AuthUser::getState,"1"));
     }
 
 
     @Override
     public AuthUser queryAuthUserByParentIdAndId(String parentId, String id) {
         return getOne(Wrappers.<AuthUser>lambdaQuery().eq(AuthUser::getId,id).
-                eq(AuthUser::getParentUerId,parentId),false);
+                eq(AuthUser::getParentUserId,parentId),false);
     }
 
 
@@ -48,7 +48,6 @@ public class AuthUserServiceImpl extends ServiceImpl<AuthUserMapper, AuthUser>
     public boolean saveUserAndDigPassword(AuthUser authUser) {
         String password = authUser.getPassword();
         if (!StringUtils.isEmpty(password)) {
-            password = DigestUtils.md5DigestAsHex(password.getBytes());
             password = DigestUtils.md5DigestAsHex(password.getBytes());
             authUser.setPassword(password);
         }

+ 3 - 1
operation-backend/src/main/java/com/idiot/operationbackend/support/Constants.java

@@ -1,5 +1,6 @@
 package com.idiot.operationbackend.support;
 
+import java.net.URLDecoder;
 import java.time.format.DateTimeFormatter;
 import java.util.Locale;
 
@@ -15,6 +16,7 @@ public class Constants {
 
     public static final DateTimeFormatter DATE_TIME_FORMATTER = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss",DEFAULT_LOCALE);
 
-
     public static final DateTimeFormatter DATE_FORMATTER = DateTimeFormatter.ofPattern("yyyy-MM-dd",DEFAULT_LOCALE);
+
+    public static final String DEFAULT_HEAD_IMG = "http://pic.51yuansu.com/pic3/cover/01/69/80/595f67c2aff1e_610.jpg";
 }

+ 2 - 0
sql/dataBase.sql

@@ -16,6 +16,8 @@ CREATE TABLE `t_auth_user`  (
   `create_time` datetime(0) NULL DEFAULT NULL COMMENT '创建时间',
   PRIMARY KEY (`id`) USING BTREE
 ) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_bin COMMENT = '登录用户' ROW_FORMAT = Dynamic;
+ -- 初始账号密码 admin/admin123!@#
+INSERT INTO `db_operation`.`t_auth_user`(`id`, `user_code`, `password`, `open_id`, `nike_name`, `avatar_url`, `parent_user_id`, `state`, `create_time`) VALUES ('1305345329560653826', 'admin', '9b045c31ea6aff22f11de768a37fa0e5', NULL, NULL, 'http://pic.51yuansu.com/pic3/cover/01/69/80/595f67c2aff1e_610.jpg', NULL, 1, '2020-09-14 11:19:13');
 
 -- ----------------------------
 -- Table structure for 公众号列表