Merge remote-tracking branch 'origin/fix-issue#5'

src/main/java/cn/meteor/beyondclouds/modules/user/api/UserApi.java

@@ -68,7 +68,7 @@ public class UserApi {
     @ApiOperation("修改我的基本信息")
     @ApiOperation("修改我的基本信息")
     @PutMapping("/my/baseinfo")
     @PutMapping("/my/baseinfo")
     public Response alterBaseInfo(@RequestBody @Valid UserBaseInfoFrom userBaseinfoFrom, BindingResult result,
     public Response alterBaseInfo(@RequestBody @Valid UserBaseInfoFrom userBaseinfoFrom, BindingResult result,
-                                  @CurrentSubject Subject subject){
+                                  @CurrentSubject Subject subject) throws UserServiceException {
         if (result.hasErrors()) {
         if (result.hasErrors()) {
             return Response.fieldError(result.getFieldError());
             return Response.fieldError(result.getFieldError());
         }
         }

src/main/java/cn/meteor/beyondclouds/modules/user/form/UserBaseInfoFrom.java

 package cn.meteor.beyondclouds.modules.user.form;
 package cn.meteor.beyondclouds.modules.user.form;
 
 
+import cn.meteor.beyondclouds.core.constant.RegexPatterns;
+import cn.meteor.beyondclouds.core.validation.constraints.NullOrNotBlank;
+import cn.meteor.beyondclouds.core.validation.groups.UpdateGroup;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.Data;
 
 
+import javax.validation.constraints.Max;
+import javax.validation.constraints.Min;
+import javax.validation.constraints.Pattern;
+
 /**
 /**
  * @program: beyond-clouds
  * @program: beyond-clouds
  * @description: 用户信息表
  * @description: 用户信息表
@@ -13,17 +21,32 @@ import lombok.Data;
 @ApiModel("用户信息表")
 @ApiModel("用户信息表")
 public class UserBaseInfoFrom {
 public class UserBaseInfoFrom {
 
 
+    @ApiModelProperty("昵称")
+    @NullOrNotBlank(message = "请传入有效的昵称")
     private String nickName;
     private String nickName;
 
 
+    @ApiModelProperty("头像")
+    @NullOrNotBlank(message = "请选择有效的头像")
     private String userAvatar;
     private String userAvatar;
 
 
+    @ApiModelProperty("性别")
+    @Max(value = 2, message = "请输入有效性别")
+    @Min(value = 0, message = "请输入有效性别")
     private Integer gender;
     private Integer gender;
 
 
+    @ApiModelProperty("签名")
+    @NullOrNotBlank(message = "请传入有效的签名")
     private String signature;
     private String signature;
 
 
+    @ApiModelProperty("手机号")
+    @Pattern(regexp = RegexPatterns.MOBILE, message = "手机号格式不正确")
     private String mobile;
     private String mobile;
 
 
+    @ApiModelProperty("微信号")
+    @NullOrNotBlank(message = "请传入有效的微信号")
     private String wxNumber;
     private String wxNumber;
 
 
+    @ApiModelProperty("qq号")
+    @NullOrNotBlank(message = "请传入有效的qq号")
     private String qqNumber;
     private String qqNumber;
 }
 }

src/main/java/cn/meteor/beyondclouds/modules/user/service/IUserService.java

@@ -45,7 +45,7 @@ public interface IUserService extends IService<User> {
      * 修改用户基本信息
      * 修改用户基本信息
      * @param user
      * @param user
      */
      */
-    void alterBaseInfo(User user);
+    void alterBaseInfo(User user) throws UserServiceException;
 
 
     /**
     /**
      * 修改密码
      * 修改密码

src/main/java/cn/meteor/beyondclouds/modules/user/service/impl/UserServiceImpl.java

@@ -61,8 +61,10 @@ public class UserServiceImpl extends ServiceImpl<IUserMapper, User> implements I
 
 
         //3. 创建用户
         //3. 创建用户
         User user = new User();
         User user = new User();
-        user.setNickName("自动生成的昵称");
-        user.setSignature("自动生成的默认签名");
+        user.setNickName("昵称");
+        user.setSignature("默认签名");
+        user.setUserAvatar("https://beyondclouds.oss-cn-beijing.aliyuncs.com/avatar/d389c748-f087-4d8e-a138-6756af8790b1.jpeg");
+        user.setMobile(mobile);
         save(user);
         save(user);
 
 
         //4. 创建认证信息
         //4. 创建认证信息
@@ -99,7 +101,7 @@ public class UserServiceImpl extends ServiceImpl<IUserMapper, User> implements I
         // 1.创建用户
         // 1.创建用户
         User user = new User();
         User user = new User();
         user.setNickName(qqAuthResult.getNickName());
         user.setNickName(qqAuthResult.getNickName());
-        user.setSignature("自动生成的默认签名");
+        user.setSignature("默认签名");
         user.setGender(qqAuthResult.getGender());
         user.setGender(qqAuthResult.getGender());
         user.setUserAvatar(qqAuthResult.getAvatar());
         user.setUserAvatar(qqAuthResult.getAvatar());
 
 
@@ -116,7 +118,7 @@ public class UserServiceImpl extends ServiceImpl<IUserMapper, User> implements I
     }
     }
 
 
     @Override
     @Override
-    public void alterBaseInfo(User user) {
+    public void alterBaseInfo(User user) throws UserServiceException {
         updateById(user);
         updateById(user);
     }
     }
 
 

src/main/resources/application.yml

@@ -3,7 +3,7 @@ spring:
     driver-class-name: com.mysql.cj.jdbc.Driver
     driver-class-name: com.mysql.cj.jdbc.Driver
     url: jdbc:mysql://127.0.0.1:3306/beyond_clouds?useUnicode=true&characterEncoding=UTF-8&useSSL=false&allowPublicKeyRetrieval=true
     url: jdbc:mysql://127.0.0.1:3306/beyond_clouds?useUnicode=true&characterEncoding=UTF-8&useSSL=false&allowPublicKeyRetrieval=true
     username: root
     username: root
-    password: 100Centa30821%mysql
+    password: 2018006709
 
 
 swagger:
 swagger:
   enable: true
   enable: true