Merge branch 'dx-C1000884' of ssh://begitlab.chubanyun.me:12122/rays/pcloud-book into dx-C1000884

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

@@ -29,6 +29,7 @@ import com.pcloud.book.group.vo.*;
 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;
@@ -151,10 +152,13 @@ public class BookGroupClassifyBizImpl implements BookGroupClassifyBiz {
         bookGroupClassify.setRank(rank);
         bookGroupClassifyDao.insert(bookGroupClassify);
         final Long wechatGroupNum = weixinQrcodeBiz.countWechatGroup();
+        // 只有生产环境才有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) {
             throw new BookBizException(BookBizException.PARAM_IS_NULL, "系统二维码数量不足，请联系客服人员补充二维码数量！");

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;
 	}
 }