Merge branch 'master_position' into dev

ace-modules/ace-admin-api/src/main/java/com/github/wxiaoqi/security/admin/dto/UserRelationDTO.java

+package com.github.wxiaoqi.security.admin.dto;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @author libin
+ * @version 1.0
+ * @description
+ * @data 2019/7/12 9:20
+ */
+@Data
+public class UserRelationDTO {
+
+    @ApiModelProperty("用户ID")
+    private Integer userId;
+
+
+    @ApiModelProperty(value = "手机号码")
+    private String phone;
+
+}

ace-modules/ace-admin/src/main/java/com/github/wxiaoqi/security/admin/biz/AppUserRelationBiz.java

@@ -2,6 +2,7 @@ package com.github.wxiaoqi.security.admin.biz;
 
 import com.ace.cache.annotation.Cache;
 import com.ace.cache.annotation.CacheClear;
+import com.github.wxiaoqi.security.admin.dto.UserRelationDTO;
 import com.github.wxiaoqi.security.admin.entity.AppUserDetail;
 import com.github.wxiaoqi.security.admin.entity.AppUserLogin;
 import com.github.wxiaoqi.security.admin.entity.AppUserRelationTemp;
@@ -126,8 +127,9 @@ public class AppUserRelationBiz extends BaseBiz<AppUserRelationMapper,AppUserRel
     }
 
     //后台关系绑定
-    public  ObjectRestResponse  adminBindRelation(Integer userId,String phone){
-
+    public  ObjectRestResponse  adminBindRelation(UserRelationDTO relationDTO){
+        String phone=relationDTO.getPhone();
+        Integer userId=relationDTO.getUserId();
         if (StringUtils.isBlank(phone)||userId==null||userId==0){
             return  ObjectRestResponse.createFailedResult(ResultCode.NULL_CODE,"参数不能为空");
         }

ace-modules/ace-admin/src/main/java/com/github/wxiaoqi/security/admin/rest/admin/AdminUserRelationController.java

 package com.github.wxiaoqi.security.admin.rest.admin;
 
 import com.github.wxiaoqi.security.admin.biz.AppUserRelationBiz;
+import com.github.wxiaoqi.security.admin.dto.UserRelationDTO;
 import com.github.wxiaoqi.security.admin.entity.AppUserRelation;
 import com.github.wxiaoqi.security.common.exception.BaseException;
 import com.github.wxiaoqi.security.common.msg.ObjectRestResponse;
@@ -15,11 +16,9 @@ public class AdminUserRelationController extends BaseController<AppUserRelationB
 
     @RequestMapping(value = "/bind",method = RequestMethod.POST)
     @ApiModelProperty("后台绑定")
-    public ObjectRestResponse bind(
-            @RequestParam(value = "phone",defaultValue = "0")String phone,
-            @RequestParam(value = "userId",defaultValue = "0")Integer userId){
+    public ObjectRestResponse bind(@RequestBody UserRelationDTO relationDTO){
         try {
-        return baseBiz.adminBindRelation(userId,phone);
+        return baseBiz.adminBindRelation(relationDTO);
         } catch (Exception e) {
             e.printStackTrace();
             throw new BaseException(e);