Merge branch 'hz_master' into dev

ace-modules/ace-admin-api/src/main/java/com/github/wxiaoqi/security/admin/entity/AppUserPhoneNotes.java

+package com.github.wxiaoqi.security.admin.entity;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import javax.persistence.Column;
+import javax.persistence.GeneratedValue;
+import javax.persistence.Id;
+import javax.persistence.Table;
+
+/**
+ * 手机号码记录表
+ */
+@Table(name = "app_user_phone_notes")
+@Data
+public class AppUserPhoneNotes {
+	@Id
+	@GeneratedValue(generator = "JDBC")
+	private Integer id;
+
+	@ApiModelProperty("用户id")
+	@Column(name = "user_id")
+	private Integer userId;
+
+	@ApiModelProperty("旧手机号码")
+	@Column(name = "old_phone")
+	private String oldPhone;
+
+	@ApiModelProperty("新手机号码")
+	@Column(name = "new_phone")
+	private String newPhone;
+
+	@ApiModelProperty("创建时间")
+	@Column(name = "crt_time")
+	private Long crtTime;
+
+}

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

+package com.github.wxiaoqi.security.admin.biz;
+
+
+import com.github.wxiaoqi.security.admin.entity.AppUserPhoneNotes;
+import com.github.wxiaoqi.security.admin.mapper.AppUserPhoneNotesMapper;
+import com.github.wxiaoqi.security.common.biz.BaseBiz;
+import org.springframework.stereotype.Service;
+
+
+/**
+ * @author keliii
+ */
+@Service
+public class AppUserPhoneNotesBiz extends BaseBiz<AppUserPhoneNotesMapper, AppUserPhoneNotes> {
+
+
+}

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

@@ -214,9 +214,12 @@ public class AppUserRelationBiz extends BaseBiz<AppUserRelationMapper,AppUserRel
     public  AppUserRelation getRelationByIdUserIdAndTime(Integer userId){
         AppUserRelation userRelation= getMyBiz().getRelationByUserId(userId);
         if (userRelation==null){
-            return    null;
+            return   null;
         }
         log.info("---userId==="+userId+"-----isForever==="+userRelation.getIsForever());
+        if (validTime==null||validTime==0){
+            return  userRelation;
+        }
         Long time=System.currentTimeMillis()-validTime;
         if (userRelation.getIsForever()==1||userRelation.getBindTime()>time){
             return  userRelation;

ace-modules/ace-admin/src/main/java/com/github/wxiaoqi/security/admin/mapper/AppUserPhoneNotesMapper.java

+package com.github.wxiaoqi.security.admin.mapper;
+
+
+import com.github.wxiaoqi.security.admin.entity.AppUserPhoneNotes;
+import tk.mybatis.mapper.additional.idlist.SelectByIdListMapper;
+import tk.mybatis.mapper.common.Mapper;
+
+public interface AppUserPhoneNotesMapper extends Mapper<AppUserPhoneNotes>, SelectByIdListMapper<AppUserPhoneNotes,Integer> {
+
+
+}
\ No newline at end of file

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

@@ -45,8 +45,10 @@ public class AppUserRelationController extends BaseController<AppUserRelationBiz
             @RequestParam(value = "code",defaultValue = "")String code,
             HttpServletRequest request){
         try {
-        Integer userid = Integer.parseInt(userAuthUtil.getInfoFromToken(userAuthConfig.getToken(request)).getId());
-        return baseBiz.appBindRelation(userid,code);
+            //屏蔽分享绑定
+        /*Integer userid = Integer.parseInt(userAuthUtil.getInfoFromToken(userAuthConfig.getToken(request)).getId());
+        return baseBiz.appBindRelation(userid,code);*/
+        return ObjectRestResponse.succ();
         } catch (Exception e) {
             e.printStackTrace();
             throw new BaseException(e);

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

@@ -10,10 +10,7 @@ import com.github.wxiaoqi.security.admin.dto.BaseUserMemberExportDTO;
 import com.github.wxiaoqi.security.admin.dto.RegisterParamDTO;
 import com.github.wxiaoqi.security.admin.dto.RegisterQueueDTO;
 import com.github.wxiaoqi.security.admin.dto.UserMemberDTO;
-import com.github.wxiaoqi.security.admin.entity.AppUser;
-import com.github.wxiaoqi.security.admin.entity.AppUserDetail;
-import com.github.wxiaoqi.security.admin.entity.AppUserLogin;
-import com.github.wxiaoqi.security.admin.entity.Element;
+import com.github.wxiaoqi.security.admin.entity.*;
 import com.github.wxiaoqi.security.admin.vo.AppUserVo;
 import com.github.wxiaoqi.security.admin.vo.ImiVo;
 import com.github.wxiaoqi.security.api.vo.authority.PermissionInfo;
@@ -111,6 +108,9 @@ public class AppPermissionService {
     @Value("${admin.smallName}")
     private  String  smallName;
 
+    @Autowired
+    private  AppUserPhoneNotesBiz notesBiz;
+
 
     public AppUserInfo validate(String username, String password) {
         AppUserInfo info = new AppUserInfo();
@@ -434,13 +434,14 @@ public class AppPermissionService {
             if(type!=null&&type==1){
                 try {
                     Integer parentId=0;
-                    if (StringUtils.isNotBlank(code)) {
+                    //屏蔽app登录的绑定关系
+                    /*if (StringUtils.isNotBlank(code)) {
                         parentId = appUserDetailBiz.getUserByCode(code);
                     }
                     //绑定上下线关系
                     if (parentId != null && parentId > 0) {
                         relationBiz.bindRelation(userid, parentId, 1);
-                    }
+                    }*/
                     //活动消息
                     Integer state=userVo.getState();
                     log.info("-----------autoLogin----state==="+state);
@@ -1147,12 +1148,21 @@ public class AppPermissionService {
         // 是否已存在
         AppUserLogin user = appUserLoginBiz.checkeUserLogin(username);
         if (null != user) {
-            return ObjectRestResponse.createFailedResult(ResultCode.EXIST_CODE, "用户已存在");
+            return ObjectRestResponse.createFailedResult(ResultCode.EXIST_CODE, "手机号已存在");
+        }
+        user=appUserLoginBiz.selectById(userId);
+        if (user==null){
+            return ObjectRestResponse.createFailedResult(ResultCode.EXIST_CODE, "用户不存在");
         }
         AppUserLogin userLogin=new AppUserLogin();
         userLogin.setId(userId);
         userLogin.setUsername(username);
         appUserLoginBiz.disable(userLogin);
+        AppUserPhoneNotes notes=new AppUserPhoneNotes();
+        notes.setUserId(userId);
+        notes.setNewPhone(username);
+        notes.setOldPhone(user.getUsername());
+        notesBiz.insertSelective(notes);
         return  ObjectRestResponse.succ();
 
     }