Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
J
jiedao-api-boot-master
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
lanbaoming
jiedao-api-boot-master
Commits
00039723
Commit
00039723
authored
Oct 23, 2024
by
zhangfeng
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
bugfix(member): 注册/分享地址写入配置文件
parent
265fcb42
Changes
6
Show whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
23 additions
and
14 deletions
+23
-14
ScoreRuleServiceImpl.java
...module/member/service/scoreRule/ScoreRuleServiceImpl.java
+8
-14
application-dev.yaml
yudao-server/src/main/resources/application-dev.yaml
+3
-0
application-local.yaml
yudao-server/src/main/resources/application-local.yaml
+3
-0
application-pro.yaml
yudao-server/src/main/resources/application-pro.yaml
+3
-0
application-test.yaml
yudao-server/src/main/resources/application-test.yaml
+3
-0
application-uat.yaml
yudao-server/src/main/resources/application-uat.yaml
+3
-0
No files found.
yudao-module-member/yudao-module-member-impl/src/main/java/cn/iocoder/yudao/module/member/service/scoreRule/ScoreRuleServiceImpl.java
View file @
00039723
...
...
@@ -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
View file @
00039723
...
...
@@ -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
View file @
00039723
...
...
@@ -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
View file @
00039723
...
...
@@ -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
View file @
00039723
...
...
@@ -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
View file @
00039723
...
...
@@ -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
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment