Merge remote-tracking branch 'origin/base-modify' into base-modify

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

@@ -253,7 +253,7 @@ public class AppPermissionService {
             Map<String,Object> map=registerIm(username,appUserLogin.getPassword(),nickname);
             if(map!=null){
                 Integer imUserId=Integer.parseInt(map.get("userId").toString());
-                String access_token=map.get("access_token").toString();
+                //String access_token=map.get("access_token").toString();
                 String imPassword=map.get("password").toString();
                 if(imUserId!=null&&imUserId>0&&StringUtils.isNotBlank(imPassword)){
                     AppUserLogin userLogin = new AppUserLogin();
@@ -264,7 +264,7 @@ public class AppPermissionService {
                     appUserLoginBiz.updateSelectiveById(userLogin);
                     log.info(username+"----userLogin updateSelectiveById---username====="+username+"----imPassword===="+imPassword);
                 }
-                data.put("imToken",access_token);
+                //data.put("imToken",access_token);
                 data.put("imUserId",imUserId);
             }
             if (data != null) {
@@ -282,13 +282,11 @@ public class AppPermissionService {
      * 自动登录
      */
     public JSONObject autoLogin(Integer userid, String username, String headimgurl, String nickname) {
-        JSONObject data = new JSONObject();
-        AppUserLogin userLoign = appUserLoginBiz.selectById(userid);
-        if (userLoign != null) {
-            data.put("nickname", nickname);
-            data.put("headerurl", headimgurl);
+            JSONObject data = new JSONObject();
             AppUserVo userVo = appUserDetailBiz.getUserInfoById(userid);
             if (userVo != null) {
+                data.put("nickname", nickname);
+                data.put("headerurl", headimgurl);
                 if (StringUtils.isNotBlank(userVo.getNickname())) {
                     data.put("nickname", userVo.getNickname());
                 }
@@ -296,21 +294,23 @@ public class AppPermissionService {
                     data.put("headerurl", userVo.getHeadimgurl());
                 }
                 data.put("certificationStatus", userVo.getCertificationStatus());
+                // 缓存操作
+                String token = "";
+                String imtoken_ = "";
+                //userRedisTemplate.opsForValue().set("token_" + userid,token, SystemConfig.REDISTOKENTIME, TimeUnit.SECONDS);
+                //userRedisTemplate.opsForValue().set("imtoken_" + userid,imtoken_,SystemConfig.REDISTOKENTIME, TimeUnit.SECONDS);
+                // 返回结果
+                // data.put("token", token);
+                data.put("username", StringUtils.isNotEmpty(username)?username:userVo.getUsername());
+                data.put("userId", userid);
+                data.put("imUserId", userVo.getImUserid());
+                //更新登录时间 和 ip
+                AppUserLogin userLoign= new AppUserLogin();
+                EntityUtils.setCreateInfo(userLoign);
+                appUserLoginBiz.updateLoginInfo(userid,userLoign.getCrtHost());
             }
-            // 缓存操作
-            String token = "";
-            String imtoken_ = "";
-            //userRedisTemplate.opsForValue().set("token_" + userid,token, SystemConfig.REDISTOKENTIME, TimeUnit.SECONDS);
-            //userRedisTemplate.opsForValue().set("imtoken_" + userid,imtoken_,SystemConfig.REDISTOKENTIME, TimeUnit.SECONDS);
-            // 返回结果
-            // data.put("token", token);
-            data.put("username", StringUtils.isNotEmpty(username)?username:userLoign.getUsername());
-            data.put("userId", userid);
-
-            //更新登录时间 和 ip
-            EntityUtils.setCreatAndUpdatInfo(userLoign);
-            appUserLoginBiz.updateLoginInfo(userid,userLoign.getCrtHost());
-        }
+
+
         return data;
     }
 
@@ -353,6 +353,14 @@ public class AppPermissionService {
                     headimgurl = SystemConfig.USER_HEADER_URL_DEFAULT;
                 }
                 if (type == 1) { // 绑定
+                    String redisLockKey = RedisKey.CONSTANT_CODE_PREFIX + username + mobilecode;
+                    String mobilecodeRedis = userRedisTemplate.opsForValue().get(redisLockKey) == null ? "" : userRedisTemplate.opsForValue().get(redisLockKey).toString();
+                    log.error("注册接口，获取redis中的验证码：" + mobilecodeRedis);
+                    // 获取到缓存的验证码后要先清空缓存对应键的值
+                    userRedisTemplate.delete(redisLockKey);
+                    if (StringUtils.isBlank(mobilecodeRedis)) {
+                        return JsonResultUtil.createFailedResult(ResultCode.NOTEXIST_CODE, "验证码错误");
+                    }
                     Long now = System.currentTimeMillis() / 1000;
                     AppUserLogin userLogin = appUserLoginBiz.checkeUserLogin(username);
                     if ((isQQ == 1 && StringUtils.isNotBlank(userLogin.getOpenid())) || (isQQ == 0 && StringUtils.isNotBlank(userLogin.getWxOpenid()))) {
@@ -387,14 +395,14 @@ public class AppPermissionService {
                     }*/
                     // 登录结果要做做统一处理
                     JSONObject data = autoLogin(userid, username, headimgurl, nickname);
-                    // 到im注册，获取返回结果
-                    Integer  imUserId=userLogin.getImUserid();
+                    // 到im登录，获取返回结果
+                    /*Integer  imUserId=userLogin.getImUserid();
                     String imPassword=userLogin.getImPassword();
                     if(StringUtils.isNotBlank(imPassword)&&imUserId!=null&&imUserId>0){
                         String  access_token=loginIm(username,imPassword,imUserId);
                         data.put("imToken",access_token);
                         data.put("imUserId",imUserId);
-                    }
+                    }*/
                     if (data != null) {
                         return JsonResultUtil.createSuccessResultWithObj(data);
                     }
@@ -474,14 +482,14 @@ public class AppPermissionService {
             nickname = userVo.getNickname();
         }
         JSONObject data = autoLogin(userid, userLogin.getUsername(), headimgurl, nickname);
-        // 到im注册，获取返回结果
+       /* // 到im注册，获取返回结果
         Integer  imUserId=userLogin.getImUserid();
         String imPassword=userLogin.getImPassword();
         if(StringUtils.isNotBlank(imPassword)&&imUserId!=null&&imUserId>0){
             String  access_token=loginIm(userLogin.getUsername(),imPassword,imUserId);
             data.put("imToken",access_token);
             data.put("imUserId",imUserId);
-        }
+        }*/
         if (data != null) {
             return JsonResultUtil.createSuccessResultWithObj(data);
         }
@@ -516,14 +524,14 @@ public class AppPermissionService {
             Integer userid = user.getId();
             String nickname = SystemConfig.USER_NIKENAME_DEFAULT + (int) ((Math.random() * 9 + 1) * 100000);
             JSONObject data = autoLogin(userid, user.getUsername(), SystemConfig.USER_HEADER_URL_DEFAULT, nickname);
-            // 到im注册，获取返回结果
+            /*// 到im注册，获取返回结果
             Integer  imUserId=user.getImUserid();
             String imPassword=user.getImPassword();
             if(StringUtils.isNotBlank(imPassword)&&imUserId!=null&&imUserId>0){
                 String  access_token=loginIm(username,imPassword,imUserId);
                 data.put("imToken",access_token);
                 data.put("imUserId",imUserId);
-            }
+            }*/
             if (data != null) {
                 return JsonResultUtil.createSuccessResultWithObj(data);
             }
@@ -557,14 +565,14 @@ public class AppPermissionService {
             Integer userid = user.getId();
             String nickname = SystemConfig.USER_NIKENAME_DEFAULT + (int) ((Math.random() * 9 + 1) * 100000);
             JSONObject data = autoLogin(userid, user.getUsername(), SystemConfig.USER_HEADER_URL_DEFAULT, nickname);
-            // 到im注册，获取返回结果
+           /* // 到im登录，获取返回结果
             Integer  imUserId=user.getImUserid();
             String imPassword=user.getImPassword();
             if(StringUtils.isNotBlank(imPassword)&&imUserId!=null&&imUserId>0){
                 String  access_token=loginIm(username,imPassword,imUserId);
                 data.put("imToken",access_token);
                 data.put("imUserId",imUserId);
-            }
+            }*/
             if (data != null) {
                 return JsonResultUtil.createSuccessResultWithObj(data);
             }
@@ -638,10 +646,10 @@ public class AppPermissionService {
                 log.error("------im注册----data======"+data);
                 if (data != null) {
                     map.put("userId", data.getString("userId"));
-                    map.put("access_token", data.getString("access_token"));
+                   // map.put("access_token", data.getString("access_token"));
                 } else {
                     map.put("userId", "");
-                    map.put("access_token", "");
+                   // map.put("access_token", "");
                 }
             }
         }
@@ -658,7 +666,7 @@ public class AppPermissionService {
         map.put("password", password);
         map.put("userId", userId);
         BaseResponse response = imFeign.login(map);
-        log.error("registerIm->response:{}", response);
+        log.error("loginIm->response:{}", response);
         String access_token = "";
         if (response.getStatus() == ResultCode.SUCCESS_CODE) {
             String result = response.getMessage();
@@ -721,7 +729,6 @@ public class AppPermissionService {
             //主要是ip地址
             EntityUtils.setCreatAndUpdatInfo(appUserLogin);
             setCreateIPInfo(appUserLogin);
-
             appUserLogin.setUsername(username);
             appUserLogin.setPassword(password);
             appUserLogin.setIsdel(0);
@@ -745,17 +752,15 @@ public class AppPermissionService {
             log.error("注册：新增用户详情： " + userid);
              //上线绑定
             relationBiz.bindByUserId(userid,small_id);
-            //自动登录获取优惠卷
-            authCoupn(userid);
             //发送短信通知用户
             thirdFeign.sendCode(username,password,SystemConfig.TEMPLATECODE);
             // 登录结果要做做统一处理
             JSONObject data = autoLogin(userid, username, headimgurl, nickname);
             // 到im注册，获取返回结果
-            /*Map<String,Object> map=registerIm(username,appUserLogin.getPassword(),nickname);
+            Map<String,Object> map=registerIm(username,appUserLogin.getPassword(),nickname);
             if(map!=null){
                 Integer imUserId=Integer.parseInt(map.get("userId").toString());
-                String access_token=map.get("access_token").toString();
+                //String access_token=map.get("access_token").toString();
                 String imPassword=map.get("password").toString();
                 if(imUserId!=null&&imUserId>0&&StringUtils.isNotBlank(imPassword)){
                     AppUserLogin userLogin = new AppUserLogin();
@@ -766,11 +771,10 @@ public class AppPermissionService {
                     appUserLoginBiz.updateSelectiveById(userLogin);
                     log.info(username+"----userLogin updateSelectiveById---username====="+username+"----imPassword===="+imPassword);
                 }
-                data.put("imToken",access_token);
+                //data.put("imToken",access_token);
                 data.put("imUserId",imUserId);
-            }*/
+            }
             if (data != null) {
-
                 return JsonResultUtil.createSuccessResultWithObj(data);
             } else {
                 return JsonResultUtil.createDefaultFail();

xx-campsite/xx-campsite-server/src/main/java/com/xxfc/platform/campsite/biz/CampsiteShopBiz.java

@@ -63,6 +63,7 @@ public class CampsiteShopBiz extends BaseBiz<CampsiteShopMapper, CampsiteShop> {
     private static final String CAMPSITE_CACHE = "campsite_cache:";
     private static final String CAMSITE_DETAIL_CACHE="campsite:detail:cache:";
     private static final String CAMPSITE_CACHE_ALL = "all";
+    private static final long  CAMPSITE_EXPIRE_TIME=6000;
 
     /**
      * 根据店铺类型查找列表

xx-campsite/xx-campsite-server/src/main/java/com/xxfc/platform/campsite/rest/CampsiteShopController.java

@@ -61,5 +61,4 @@ public class CampsiteShopController extends BaseController<CampsiteShopBiz, Camp
         return getBaseBiz().getAllByHome(page,limit);
     }
 
-
 }
\ No newline at end of file

xx-im/xx-im-server/src/main/java/com/xxfc/platform/im/model/Msg.java

@@ -566,7 +566,7 @@ public class Msg {
 
 		Msg entity = new Msg();
 		entity.id = ObjectId.get();
-		entity.userId = Integer.parseInt(user.getId().toString());
+		entity.userId = user.getId();
 		if("10000" ==user.getId().toString())
 			entity.nickname ="客服公众号";
 		else

xx-im/xx-im-server/src/main/java/com/xxfc/platform/im/model/User.java

@@ -4,7 +4,6 @@ import java.util.List;
 import java.util.Map;
 
 import com.xxfc.platform.im.utils.DateUtil;
-import org.bson.types.ObjectId;
 import org.mongodb.morphia.annotations.Embedded;
 import org.mongodb.morphia.annotations.Entity;
 import org.mongodb.morphia.annotations.Id;
@@ -28,7 +27,7 @@ import lombok.Setter;
 public class User {
 
 	@Id
-	private ObjectId id;// 用户Id
+	private Integer id;// 用户Id
 
 	//@JSONField(serialize = false)
 	
@@ -189,7 +188,7 @@ public class User {
 	
 	// ********************引用字段********************
 	
-	public ObjectId getId() {
+	public Integer getId() {
 		return id;
 	}
 
@@ -210,7 +209,7 @@ public class User {
 		this.num = num;
 	}
 
-	public void setid(ObjectId id) {
+	public void setId(Integer id) {
 		this.id = id;
 	}
 

xx-universal/xx-universal-server/src/main/java/com/xxfc/platform/universal/biz/SysRegionBiz.java

@@ -148,7 +148,7 @@ public class SysRegionBiz extends BaseBiz<SysRegionMapper, SysRegion> {
     /**
      * 5分钟内刷新数据到缓存
      */
-    @Scheduled(cron = "0 */5 * * * *")//每5分钟刷新一次数据
+    //@Scheduled(cron = "0 */5 * * * *")//每5分钟刷新一次数据
     public void  refreshCache(){
 
         String redisLockKey = RedisKey.SYS_REGION_REFRESH_LOCK +(DateTime.now().getMinuteOfDay()/5);//同一日每5分钟只刷新一次