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
42265750
Commit
42265750
authored
Jan 13, 2021
by
huangjiamin
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'feature-add_own_while_list' into 'master'
Feature add own while list See merge request
!232
parents
07c4a333
5fdc4439
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
7 additions
and
0 deletions
+7
-0
AccountDto.java
...a/com/edgec/browserbackend/account/domain/AccountDto.java
+7
-0
No files found.
src/main/java/com/edgec/browserbackend/account/domain/AccountDto.java
View file @
42265750
...
@@ -60,6 +60,10 @@ public class AccountDto {
...
@@ -60,6 +60,10 @@ public class AccountDto {
}
}
/**
* 测试合并分支
* @param account
*/
public
AccountDto
(
Account
account
)
{
public
AccountDto
(
Account
account
)
{
this
.
setName
(
account
.
getName
());
this
.
setName
(
account
.
getName
());
this
.
setAllowedToCreateSubUser
(
account
.
isAllowedToCreateSubUser
());
this
.
setAllowedToCreateSubUser
(
account
.
isAllowedToCreateSubUser
());
...
@@ -73,6 +77,9 @@ public class AccountDto {
...
@@ -73,6 +77,9 @@ public class AccountDto {
this
.
setWhiteList
(
account
.
getWhiteList
());
this
.
setWhiteList
(
account
.
getWhiteList
());
List
<
String
>
ownWhiteList
=
new
ArrayList
<>(
account
.
getWhiteList
());
List
<
String
>
ownWhiteList
=
new
ArrayList
<>(
account
.
getWhiteList
());
ownWhiteList
.
add
(
"google.com/recaptcha"
);
ownWhiteList
.
add
(
"google.com/recaptcha"
);
ownWhiteList
.
add
(
"google.com/recaptcha"
);
ownWhiteList
.
add
(
"google.com/recaptcha"
);
ownWhiteList
.
add
(
"google.com/recaptcha"
);
ownWhiteList
.
add
(
"google.com/js"
);
ownWhiteList
.
add
(
"google.com/js"
);
ownWhiteList
.
add
(
"cap.attempts.securecode.com"
);
ownWhiteList
.
add
(
"cap.attempts.securecode.com"
);
ownWhiteList
.
add
(
"apis.google.com"
);
ownWhiteList
.
add
(
"apis.google.com"
);
...
...
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