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

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分钟只刷新一次