Merge remote-tracking branch 'origin/dev' into dev

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

@@ -114,7 +114,6 @@ public class AppUserRelationBiz extends BaseBiz<AppUserRelationMapper, AppUserRe
      * @param userId
      * @param parentId
      */
-    @Transactional(rollbackFor = Exception.class, propagation = Propagation.REQUIRED)
     public   void bindRelation(Integer userId,Integer parentId,Integer type){
         try {
             if (userId.equals(parentId)){
@@ -175,6 +174,24 @@ public class AppUserRelationBiz extends BaseBiz<AppUserRelationMapper, AppUserRe
 
     }
 
+    private void insertLock(Integer userId, Integer type) {
+        try {
+            if (parentLock(userId)) {
+                AppUserRelation relation = getMyBiz().getRelationByUserId(userId);
+                if (relation == null) {
+                    log.info("insertLock----parentId===" +userId);
+                    relation = new AppUserRelation();
+                    relation.setUserId(userId);
+                    relation.setBindType(type);
+                    insertSelective(relation);
+                }
+            }
+        }catch (Exception e){
+        }finally {
+            unParentLock(userId);
+        }
+    }
+    
     //首页关系绑定
     public ObjectRestResponse appBindRelation(Integer userId, String code) {
         Integer parentId = 0;

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

@@ -79,7 +79,7 @@ public class BaseUserMemberBiz extends BaseBiz<BaseUserMemberMapper, BaseUserMem
     @Cache(key = "user:member{1}")
     public UserMemberVo getMemberInfoByUserId(Integer userId) {
         return mapper.getInfoByUserId(userId);
-    }
+}
 
     //更新会员信息
     @Override
@@ -309,24 +309,28 @@ public class BaseUserMemberBiz extends BaseBiz<BaseUserMemberMapper, BaseUserMem
         mapper.deleteByExample(example);
     }
     private void setModifyData(UserMemberVo beforeMember, BaseUserMember aftereMember) throws Exception {
+
         log.info("保存修改会员记录={}",aftereMember);
         IJWTInfo infoFromToken = userAuthUtil.getInfoFromToken(userAuthConfig.getToken(request));
         log.info("token信息={}",infoFromToken);
-
+        if (beforeMember==null) {
+             beforeMember = new UserMemberVo();
+        }
+        UserMemberVo finalBeforeMember = beforeMember;
         executorService.submit(()->{
             try {
-                AppUserVo qppUser = detailBiz.getUserInfoById(beforeMember.getUserId());
+                AppUserVo qppUser = detailBiz.getUserInfoById(aftereMember.getUserId());
                 BaseUserMemberExport baseUserMemberExport = BaseUserMemberExport
                         .builder()
                         .username(qppUser.getUsername())
-                        .beforeMemberLevel(beforeMember.getMemberLevel())
+                        .beforeMemberLevel(finalBeforeMember.getMemberLevel())
                         .memberLevel(aftereMember.getMemberLevel())
-                        .totalNumber(aftereMember.getTotalNumber() - beforeMember.getTotalNumber())
-                        .rentFreeDays(aftereMember.getRentFreeDays() - beforeMember.getRentFreeDays())
-                        .beforeDiscount(beforeMember.getDiscount())
+                        .totalNumber(aftereMember.getTotalNumber() - (finalBeforeMember.getTotalNumber()==null?0:finalBeforeMember.getTotalNumber()))
+                        .rentFreeDays(aftereMember.getRentFreeDays() - (finalBeforeMember.getRentFreeDays()==null?0:finalBeforeMember.getRentFreeDays()))
+                        .beforeDiscount(finalBeforeMember.getDiscount())
                         .discount(aftereMember.getDiscount())
                         .status(1)
-                        .userId(beforeMember.getUserId())
+                        .userId(aftereMember.getUserId())
                         .crtTime(System.currentTimeMillis())
                         .crtId(Integer.valueOf(infoFromToken.getId()))
                         .crtName(infoFromToken.getUniqueName())

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

@@ -8,6 +8,7 @@ import com.github.wxiaoqi.security.admin.rpc.service.AppPermissionService;
 import com.github.wxiaoqi.security.admin.vo.ImiVo;
 import com.github.wxiaoqi.security.api.vo.authority.PermissionInfo;
 import com.github.wxiaoqi.security.api.vo.user.AppUserInfo;
+import com.github.wxiaoqi.security.auth.client.annotation.IgnoreUserToken;
 import com.github.wxiaoqi.security.auth.client.config.UserAuthConfig;
 import com.github.wxiaoqi.security.auth.client.jwt.UserAuthUtil;
 import com.github.wxiaoqi.security.auth.common.util.jwt.IJWTInfo;
@@ -277,4 +278,12 @@ public class AppUserRest {
     }
 
 
+    /*@GetMapping("/app/unauth/test")
+    @IgnoreUserToken
+    public ObjectRestResponse test(){
+        appPermissionService.test();
+        return ObjectRestResponse.succ();
+    }
+*/
+
 }

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

@@ -262,7 +262,7 @@ public class AppPermissionService {
                 }
             }
         }
-        /*String redisLockKey = RedisKey.CONSTANT_CODE_PREFIX + username + mobilecode;
+       /* String redisLockKey = RedisKey.CONSTANT_CODE_PREFIX + username + mobilecode;
         String mobilecodeRedis = userRedisTemplate.opsForValue().get(redisLockKey) == null ? "" : userRedisTemplate.opsForValue().get(redisLockKey).toString();
         log.info("注册接口，获取redis中的验证码：" + mobilecodeRedis+"---time===="+System.currentTimeMillis()/1000L);
         // 获取到缓存的验证码后要先清空缓存对应键的值
@@ -407,6 +407,7 @@ public class AppPermissionService {
             rsUserDetail.setUserid(userId);
             rsUserDetail = appUserDetailBiz.selectOne(rsUserDetail);
             if (rsUserDetail == null) {
+                rsUserDetail=new AppUserDetail();
                 rsUserDetail.setUserid(userId);
                 rsUserDetail.setNickname(nickname);
                 rsUserDetail.setHeadimgurl(SystemConfig.USER_HEADER_URL_DEFAULT); // 默认路径，待写