fix 根据环境调整限制

pcloud-service-book/src/main/java/com/pcloud/book/group/biz/impl/BookGroupClassifyBizImpl.java

@@ -62,6 +62,7 @@ import com.pcloud.book.group.vo.UpdateRankVO;
 import com.pcloud.book.keywords.dao.BookKeywordDao;
 import com.pcloud.book.keywords.entity.BookKeyword;
 import com.pcloud.book.util.common.ThreadPoolUtils;
+import com.pcloud.book.util.properties.BookProps;
 import com.pcloud.common.core.aspect.ParamLog;
 import com.pcloud.common.core.constant.SystemCode;
 import com.pcloud.common.core.enums.NotifyOriginTypeEnum;
@@ -185,9 +186,12 @@ public class BookGroupClassifyBizImpl implements BookGroupClassifyBiz {
         bookGroupClassify.setRank(rank);
         bookGroupClassifyDao.insert(bookGroupClassify);
         final Long wechatGroupNum = weixinQrcodeBiz.countWechatGroup();
-        if(null == wechatGroupNum || wechatGroupNum <= 30) {
-            log.info("[新增分类] : 可用微信群数量：{}个", wechatGroupNum);
-            throw new BookBizException(BookBizException.PARAM_IS_NULL, "群二维码数量不足，您可以明天再创建群。");
+        // 只有生产环境才有30个限制
+        if ("pro".equalsIgnoreCase(BookProps.getSystemEnv())) {
+            if(null == wechatGroupNum || wechatGroupNum <= 30) {
+                log.info("[新增分类] : 可用微信群数量：{}个", wechatGroupNum);
+                throw new BookBizException(BookBizException.PARAM_IS_NULL, "群二维码数量不足，您可以明天再创建群。");
+            }
         }
         WeixinQrcodeDTO oneQrcode = weixinQrcodeBiz.getOneQrcode();
         if (oneQrcode == null) {

pcloud-service-book/src/main/java/com/pcloud/book/keywords/biz/impl/BookGuideBizImpl.java

@@ -15,7 +15,11 @@ import com.pcloud.book.group.dao.BookGroupClassifyDao;
 import com.pcloud.book.group.dao.BookGroupDao;
 import com.pcloud.book.group.dao.GroupQrcodeDao;
 import com.pcloud.book.group.dao.JoinGroupCipherDao;
-import com.pcloud.book.group.dto.*;
+import com.pcloud.book.group.dto.BookGroupDTO;
+import com.pcloud.book.group.dto.GroupClassifyQrcodeDTO;
+import com.pcloud.book.group.dto.GroupQrcodeDTO;
+import com.pcloud.book.group.dto.JoinGroupCipherDTO;
+import com.pcloud.book.group.dto.PushAddUserMessageDTO;
 import com.pcloud.book.group.entity.AppTouchRecord;
 import com.pcloud.book.group.entity.GroupQrcode;
 import com.pcloud.book.group.enums.TouchTypeEnum;
@@ -37,6 +41,7 @@ import com.pcloud.book.keywords.vo.GuideVO;
 import com.pcloud.book.keywords.vo.ReplyMessageVO;
 import com.pcloud.book.keywords.vo.SetGuideVO;
 import com.pcloud.book.keywords.vo.UpdateGuideVO;
+import com.pcloud.book.util.properties.BookProps;
 import com.pcloud.channelcenter.wechat.dto.AccountSettingDto;
 import com.pcloud.common.core.aspect.ParamLog;
 import com.pcloud.common.utils.ListUtils;
@@ -149,7 +154,9 @@ public class BookGuideBizImpl implements BookGuideBiz {
             log.info("[同意加好友发送欢迎语] 拉群 没有找到群 bookGroupClassifyBiz.getGroupQrcode4ClassifyWechat JoinGroupCipherDTO :{}", dto);
             return;
         }
-        if ((!StringUtil.isBlank(num) && Integer.parseInt(num) >= 30) || peopleCounts >= 30) {
+        // 生产环境限制30，其它5和10
+        final boolean isPro = "pro".equalsIgnoreCase(BookProps.getSystemEnv());
+        if ((!StringUtil.isBlank(num) && Integer.parseInt(num) >= (isPro ? 30 : 5)) || peopleCounts >= (isPro ? 30 : 10)) {
             SendGroupInviteVO sendGroupInviteVO = new SendGroupInviteVO();
             sendGroupInviteVO.setAltId(agreeAddUserDTO.getRobotWxId());
             sendGroupInviteVO.setWxId(agreeAddUserDTO.getUserWxId());

pcloud-service-book/src/main/java/com/pcloud/book/util/properties/BookProps.java

@@ -34,8 +34,7 @@ public class BookProps {
 	 */
 	private static String jisuAppKey;
 
-	@Value("group.luck.url")
-	private String groupLuckUrl;
+	private static String systemEnv;
 
 	public static String getJisuAppKey() {
 		return jisuAppKey;
@@ -73,11 +72,13 @@ public class BookProps {
 		BookProps.appCode = appCode;
 	}
 
-	public String getGroupLuckUrl() {
-		return groupLuckUrl;
+
+	public static String getSystemEnv() {
+		return systemEnv;
 	}
 
-	public void setGroupLuckUrl(String groupLuckUrl) {
-		this.groupLuckUrl = groupLuckUrl;
+	@Value("${system.env}")
+	public void setSystemEnv(String systemEnv) {
+		BookProps.systemEnv = systemEnv;
 	}
 }