Commit 66b07419 authored by zhangfeng's avatar zhangfeng

bugfix(member): 注册/分享地址写入配置文件

parent 4f0a26fa
......@@ -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);
}
......
......@@ -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
......
......@@ -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
......
......@@ -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
......
......@@ -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
......
......@@ -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
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment