Commit 42265750 authored by huangjiamin's avatar huangjiamin

Merge branch 'feature-add_own_while_list' into 'master'

Feature add own while list

See merge request !232
parents 07c4a333 5fdc4439
...@@ -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");
......
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