Merge branch 'dev-caomeihuizhang' into container-test

# Conflicts:
#	liquidnet-bus-common/liquidnet-common-service-base/src/main/java/com/liquidnet/service/base/constant/RedisKeyExpireConst.java

liquidnet-bus-common/liquidnet-common-service-base/src/main/java/com/liquidnet/service/base/constant/RedisKeyExpireConst.java

@@ -71,4 +71,7 @@ public class RedisKeyExpireConst {
      * 收钱吧下单防重锁过期时间 (10秒)
      */
     public static final long SQB_ORDER_LOCK_EXPIRE = 10;
+
+    // 已发布状态徽章过期时间：30天
+    public static final long CAOMEI_BADGE_PUBLISHED_EXPIRE = 30 * 24 * 60 * 60;
 }

liquidnet-bus-service/liquidnet-service-adam/liquidnet-service-adam-impl/src/main/java/com/liquidnet/service/adam/service/AdamRdmService.java

@@ -641,7 +641,7 @@ public class AdamRdmService {
     /* - - - - - - - - - - - - - - - - - - - - - - - - - - - - - | 草莓徽章缓存 */
 
     public boolean setPublishedCaomeiBadges(List<AdamCaomeiBadge> badges) {
-        return redisUtil.set(AdamRedisConst.INFO_CAOMEI_BADGE_PUBLISHED, badges, 300);
+        return redisUtil.set(AdamRedisConst.INFO_CAOMEI_BADGE_PUBLISHED, badges, RedisKeyExpireConst.CAOMEI_BADGE_PUBLISHED_EXPIRE);
     }
 
     /**