Merge branch 'hz_master' into dev

# Conflicts:
#	ace-modules/ace-admin/src/main/java/com/github/wxiaoqi/security/admin/rpc/AppUserRest.java

ace-auth/ace-auth-server/src/main/java/com/github/wxiaoqi/security/auth/controller/AuthController.java

@@ -247,4 +247,15 @@ public class AuthController {
         return authService.checkToken(token);
     }
 
+
+    @RequestMapping(value = "/updUsername", method = RequestMethod.POST)
+    public ObjectRestResponse updUsername(@RequestParam(value="username",defaultValue="")String  username,
+                            @RequestParam(value="mobilecode",defaultValue="")String mobilecode,
+                                  HttpServletRequest request)throws Exception {
+        log.info(username + "----require updUsername...");
+        String token = request.getHeader(tokenHeader);
+        return appAuthService.updUsername(username, mobilecode, token);
+
+    }
+
 }

ace-auth/ace-auth-server/src/main/java/com/github/wxiaoqi/security/auth/feign/IUserService.java

@@ -5,6 +5,8 @@ import com.github.wxiaoqi.security.api.vo.user.AppUserInfo;
 import com.github.wxiaoqi.security.api.vo.user.UserInfo;
 import com.github.wxiaoqi.security.auth.configuration.FeignConfiguration;
 import com.github.wxiaoqi.security.auth.util.user.JwtAuthenticationRequest;
+import com.github.wxiaoqi.security.common.msg.ObjectRestResponse;
+import io.swagger.annotations.ApiModelProperty;
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.web.bind.annotation.*;
 
@@ -78,4 +80,8 @@ public interface IUserService {
 
     @PostMapping("/api/app/imi/login")
     String loginImiWithToken();
+
+    @ApiModelProperty("修改手机号码")
+    @GetMapping("/api/app/updUsername")
+    public ObjectRestResponse updUsername(@RequestParam(value = "username") String username, @RequestParam(value = "mobilecode") String mobilecode, @RequestParam(value = "userId",defaultValue = "0") Integer userId);
 }

ace-auth/ace-auth-server/src/main/java/com/github/wxiaoqi/security/auth/service/AuthService.java

@@ -6,6 +6,8 @@ import com.github.wxiaoqi.security.auth.util.user.JwtAuthenticationRequest;
 import com.github.wxiaoqi.security.common.msg.ObjectRestResponse;
 import org.springframework.web.bind.annotation.RequestParam;
 
+import javax.servlet.http.HttpServletRequest;
+
 public interface AuthService {
     String login(JwtAuthenticationRequest authenticationRequest) throws Exception;
     ObjectRestResponse loginSmall(JwtAuthenticationRequest authenticationRequest) throws Exception;
@@ -39,4 +41,6 @@ public interface AuthService {
     String loginImiWithToken();
 
     ObjectRestResponse checkToken(String token);
+
+    ObjectRestResponse updUsername(String username, String mobilecode, String token);
 }

ace-auth/ace-auth-server/src/main/java/com/github/wxiaoqi/security/auth/service/impl/AppAuthServiceImpl.java

@@ -13,10 +13,13 @@ import com.github.wxiaoqi.security.common.constant.RequestTypeConstants;
 import com.github.wxiaoqi.security.common.exception.auth.UserInvalidException;
 import com.github.wxiaoqi.security.common.msg.ObjectRestResponse;
 import com.github.wxiaoqi.security.common.util.process.ResultCode;
+import io.swagger.models.auth.In;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.util.StringUtils;
 
+import javax.servlet.http.HttpServletRequest;
+
 /**
  * @author keliii
  */
@@ -138,4 +141,27 @@ public class AppAuthServiceImpl implements AuthService {
 
     }
 
+    @Override
+    public ObjectRestResponse updUsername(String username, String mobilecode, String token) {
+        if (StringUtils.isEmpty(token)){
+            return ObjectRestResponse.createFailedResult(ResultCode.NULL_CODE,"token不能为空");
+        }
+        try {
+            IJWTInfo ijwtInfo=jwtTokenUtil.getInfoFromToken(token);
+            if (ijwtInfo==null){
+                return ObjectRestResponse.createFailedResult(10009,"token失效");
+            }
+            Integer userId= Integer.parseInt(ijwtInfo.getId());
+            ObjectRestResponse objectRestResponse=userService.updUsername(username,mobilecode,userId);
+            if (objectRestResponse.getStatus()==ResultCode.SUCCESS_CODE){
+                token=getToken(username,userId);
+                objectRestResponse.setData(token);
+            }
+            return objectRestResponse;
+        }catch (Exception e){
+            e.printStackTrace();
+            return ObjectRestResponse.createFailedResult(ResultCode.FAILED_CODE,"操作失败");
+        }
+    }
+
 }

ace-auth/ace-auth-server/src/main/java/com/github/wxiaoqi/security/auth/service/impl/AuthServiceImpl.java

@@ -134,4 +134,27 @@ public class AuthServiceImpl implements AuthService {
         }
 
     }
+
+    @Override
+    public ObjectRestResponse updUsername(String username, String mobilecode, String token) {
+        if (StringUtils.isEmpty(token)){
+            return ObjectRestResponse.createFailedResult(ResultCode.NULL_CODE,"token不能为空");
+        }
+        try {
+            IJWTInfo ijwtInfo=jwtTokenUtil.getInfoFromToken(token);
+            if (ijwtInfo==null){
+                return ObjectRestResponse.createFailedResult(10009,"token失效");
+            }
+            Integer userId= Integer.parseInt(ijwtInfo.getId());
+            ObjectRestResponse objectRestResponse=userService.updUsername(username,mobilecode,userId);
+            if (objectRestResponse.getStatus()==ResultCode.SUCCESS_CODE){
+                token=getToken(username,userId);
+                objectRestResponse.setData(token);
+            }
+            return objectRestResponse;
+        }catch (Exception e){
+            e.printStackTrace();
+            return ObjectRestResponse.createFailedResult(ResultCode.FAILED_CODE,"操作失败");
+        }
+    }
 }

ace-modules/ace-admin/src/main/java/com/github/wxiaoqi/security/admin/rpc/AppUserRest.java

@@ -257,15 +257,25 @@ public class AppUserRest {
     @ApiModelProperty("检查手机号验证码")
     @GetMapping("/unauth/checkMobilecode")
     public ObjectRestResponse checkMobilecode(@RequestParam(value = "phone") String phone,
-                                    @RequestParam(value = "mobilecode") String mobilecode){
-        if (StringUtils.isBlank(phone)||StringUtils.isBlank(mobilecode)){
+                                    @RequestParam(value = "mobilecode") String mobilecode) {
+        if (StringUtils.isBlank(phone) || StringUtils.isBlank(mobilecode)) {
             return ObjectRestResponse.createFailedResult(ResultCode.NULL_CODE, "参数为空");
         }
-        String redisKey=appPermissionService.checkCodeByUsername(phone,mobilecode);
-        if (StringUtils.isBlank(redisKey)){
+        String redisKey = appPermissionService.checkCodeByUsername(phone, mobilecode);
+        if (StringUtils.isBlank(redisKey)) {
             return ObjectRestResponse.createFailedResult(ResultCode.NOTEXIST_CODE, "验证码错误");
         }
         return ObjectRestResponse.succ();
+
+    }
+
+    @ApiModelProperty("修改手机号码")
+    @GetMapping("/updUsername")
+    public ObjectRestResponse updUsername(@RequestParam(value = "username") String username,
+                                    @RequestParam(value = "mobilecode") String mobilecode,
+                                    @RequestParam(value = "userId",defaultValue = "0") Integer userId){
+        return appPermissionService.updUsername(userId,username,mobilecode);
+
     }
 
 

ace-modules/ace-admin/src/main/java/com/github/wxiaoqi/security/admin/rpc/service/AppPermissionService.java

@@ -1134,4 +1134,26 @@ public class AppPermissionService {
         public static final String CITY_NAME = "city";
     }
 
+    //修改手机号码
+    public  ObjectRestResponse  updUsername(Integer userId,String username,String mobileCode){
+        if (StringUtils.isBlank(username)||StringUtils.isBlank(mobileCode)||userId==0||userId==null){
+            return  ObjectRestResponse.createFailedResult(ResultCode.NULL_CODE,"参数不能为空");
+        }
+        if (StringUtils.isBlank(checkCodeByUsername(username,mobileCode))){
+            return  ObjectRestResponse.createFailedResult(ResultCode.FAILED_CODE,"验证码错误");
+        }
+        log.info("----updUsername----userId==="+userId+"---username==="+username);
+        // 是否已存在
+        AppUserLogin user = appUserLoginBiz.checkeUserLogin(username);
+        if (null != user) {
+            return ObjectRestResponse.createFailedResult(ResultCode.EXIST_CODE, "用户已存在");
+        }
+        AppUserLogin userLogin=new AppUserLogin();
+        userLogin.setId(userId);
+        userLogin.setUsername(username);
+        appUserLoginBiz.updateSelectiveById(userLogin);
+        return  ObjectRestResponse.succ();
+
+    }
+
 }