Skip to content
Projects
Groups
Snippets
Help
Loading...
Sign in
Toggle navigation
B
browser-backend
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
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
Administrator
browser-backend
Commits
f11be822
Commit
f11be822
authored
Sep 29, 2020
by
huangjiamin
Browse files
Options
Browse Files
Download
Plain Diff
Merge remote-tracking branch 'remotes/origin/feature-secondaryProxyPort' into staging
parents
be8958ae
31eedd0c
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
0 additions
and
3 deletions
+0
-3
AccountServiceImpl.java
...owserbackend/account/service/impl/AccountServiceImpl.java
+0
-3
No files found.
src/main/java/com/edgec/browserbackend/account/service/impl/AccountServiceImpl.java
View file @
f11be822
...
...
@@ -359,9 +359,6 @@ public class AccountServiceImpl implements AccountService {
current
.
setQueryIpUrlList
(
queryIpUrlList
);
current
.
setWhiteList
(
whiteList
);
List
<
String
>
ownWhiteList
=
current
.
getOwnWhiteList
();
ownWhiteList
.
addAll
(
whiteList
);
current
.
setOwnWhiteList
(
ownWhiteList
.
stream
().
distinct
().
collect
(
Collectors
.
toList
()));
if
(
account
.
getPromotion
()
!=
null
)
{
int
invitedUsers
=
accountRepository
.
countByPromotionCodeAndParentIsNull
(
account
.
getPromotion
().
getCode
());
...
...
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