Merge remote-tracking branch 'origin/release' into release

sql/member/member_user_level_config.sql

@@ -11,7 +11,7 @@
  Target Server Version : 80031 (8.0.31)
  File Encoding         : 65001
 
- Date: 18/10/2024 09:26:20
+ Date: 24/10/2024 09:12:01
 */
 
 SET NAMES utf8mb4;
@@ -35,4 +35,8 @@ CREATE TABLE `member_user_level_config`  (
   PRIMARY KEY (`id`) USING BTREE
 ) ENGINE = InnoDB AUTO_INCREMENT = 1 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '会员等级配置表' ROW_FORMAT = DYNAMIC;
 
+-- ----------------------------
+-- Records of member_user_level_config
+-- ----------------------------
+INSERT INTO `member_user_level_config` VALUES (1, 'vip1', 0, 100, 'https://statictest.groupage.cn/2024/09/06/66dac1dfe4b0e404e1c7816f.png', '1', '2024-09-03 10:05:14', '1', '2024-09-06 16:48:34', 0);
 SET FOREIGN_KEY_CHECKS = 1;

yudao-module-member/yudao-module-member-impl/src/main/java/cn/iocoder/yudao/module/member/service/scoreRule/ScoreRuleServiceImpl.java

@@ -60,12 +60,10 @@ import static cn.iocoder.yudao.module.member.enums.TransportTypeEnum.SPECIAL_LIN
 @Service
 @Validated
 public class ScoreRuleServiceImpl extends AbstractService<ScoreRuleMapper, ScoreRuleDO> implements ScoreRuleService {
-    private static final String PROD_REGISTER_URL = "https://app2.groupage.cn/#/pages/register/shareRegister?code=";
-    private static final String UAT_REGISTER_URL = "https://apptest.groupage.cn/#/pages/register/shareRegister?code=";
-    private static final String PROD_SHARE_URL = "https://app2.groupage.cn/#";
-    private static final String UAT_SHARE_URL = "https://apptest.groupage.cn/#";
-    @Value("${spring.profiles.active}")
-    private String env;
+    @Value("${yudao.member.register-url}")
+    private String registerUrl;
+    @Value("${yudao.member.share-url}")
+    private String shareUrl;
     @Resource
     private ScoreRuleMapper scoreRuleMapper;
     @Resource
@@ -659,19 +657,15 @@ public class ScoreRuleServiceImpl extends AbstractService<ScoreRuleMapper, Score
                     ScoreRulerRecommendExtraVO scoreRulerRecommendExtraVO = JsonUtils.parseObject(scoreRuleDO.getExtra(), ScoreRulerRecommendExtraVO.class);
                     appScoreRuleListBackVO.setExtraRecommend(scoreRulerRecommendExtraVO);
                     MemberUserDO memberUserDO = memberUserService.getUser(reqVO.getMemberId());
-                    if (memberUserDO != null && !"pro".equals(env)) {
-                        appScoreRuleListBackVO.setRecommendUrl(UAT_REGISTER_URL + memberUserDO.getCode());
-                    } else if (memberUserDO != null) {
-                        appScoreRuleListBackVO.setRecommendUrl(PROD_REGISTER_URL + memberUserDO.getCode());
+                    if (memberUserDO != null) {
+                        appScoreRuleListBackVO.setRecommendUrl(registerUrl + memberUserDO.getCode());
                     }
                 } else if (scoreRuleDO.getType() == ScoreRuleTypeEnum.SHARE.getValue()) {
                     ScoreRuleShareExtraVO scoreRuleShareExtraVO = JsonUtils.parseObject(scoreRuleDO.getExtra(), ScoreRuleShareExtraVO.class);
                     MemberUserDO memberUserDO = memberUserService.getUser(reqVO.getMemberId());
                     String activityUrl = scoreRuleShareExtraVO.getActivityUrl();
-                    if (memberUserDO != null && !"pro".equals(env)) {
-                        scoreRuleShareExtraVO.setActivityUrl(UAT_SHARE_URL + activityUrl);
-                    } else if (memberUserDO != null) {
-                        scoreRuleShareExtraVO.setActivityUrl(PROD_SHARE_URL + activityUrl);
+                    if (memberUserDO != null) {
+                        scoreRuleShareExtraVO.setActivityUrl(shareUrl + activityUrl);
                     }
                     appScoreRuleListBackVO.setExtraShare(scoreRuleShareExtraVO);
                 }

yudao-server/src/main/resources/application-dev.yaml

@@ -221,6 +221,9 @@ yudao:
     send-maximum-quantity-per-day: 50
     begin-code: 9999 # 验证码最小值
     end-code: 9999 # 验证码最大值。
+  member: # 会员相关配置
+    register-url: https://apptest.groupage.cn/#/pages/register/shareRegister?code=
+    share-url: https://apptest.groupage.cn/#
 
 justauth:
   enabled: true

yudao-server/src/main/resources/application-local.yaml

@@ -225,6 +225,9 @@ yudao:
     send-maximum-quantity-per-day: 50
     begin-code: 9999 # 验证码最小值
     end-code: 9999 # 验证码最大值。
+  member: # 会员相关配置
+    register-url: https://applocal.groupage.cn/#/pages/register/shareRegister?code=
+    share-url: https://applocal.groupage.cn/#
 
 justauth:
   enabled: true

yudao-server/src/main/resources/application-pro.yaml

@@ -217,6 +217,9 @@ yudao:
     send-maximum-quantity-per-day: 50
     begin-code: 1000 # 验证码最小值
     end-code: 9999 # 验证码最大值。
+  member: # 会员相关配置
+    register-url: https://app2.groupage.cn/#/pages/register/shareRegister?code=
+    share-url: https://app2.groupage.cn/#
 
 justauth:
   enabled: true

yudao-server/src/main/resources/application-test.yaml

@@ -217,6 +217,9 @@ yudao:
     send-maximum-quantity-per-day: 50
     begin-code: 9999 # 验证码最小值
     end-code: 9999 # 验证码最大值。
+  member: # 会员相关配置
+    register-url: https://apptest.groupage.cn/#/pages/register/shareRegister?code=
+    share-url: https://apptest.groupage.cn/#
 
 justauth:
   enabled: true

yudao-server/src/main/resources/application-uat.yaml

@@ -218,6 +218,9 @@ yudao:
     send-maximum-quantity-per-day: 50
     begin-code: 9999 # 验证码最小值
     end-code: 9999 # 验证码最大值。
+  member: # 会员相关配置
+    register-url: https://apptest.groupage.cn/#/pages/register/shareRegister?code=
+    share-url: https://apptest.groupage.cn/#
 
 justauth:
   enabled: true