Commit a58a698c authored by xuxin's avatar xuxin

修改测试环境 日志输出配置

parent 597b40dd
...@@ -644,10 +644,9 @@ public class IpResourceServiceImpl implements IpResourceService { ...@@ -644,10 +644,9 @@ public class IpResourceServiceImpl implements IpResourceService {
// 获取当前用户的账户 // 获取当前用户的账户
Account account = accountRepository.findByName(username).orElseThrow(() -> new ClientRequestException(AccountErrorCode.NAMENOTEXIST)); Account account = accountRepository.findByName(username).orElseThrow(() -> new ClientRequestException(AccountErrorCode.NAMENOTEXIST));
// 获取当前用户对应的 groupType 的 ip 资及未使用的 ip资源
List<IpResource> ipResources = new ArrayList<>(); List<IpResource> ipResources = new ArrayList<>();
List<IpResource> notUsed = new ArrayList<>(); List<IpResource> notUsed = new ArrayList<>();
// 获取当前用户的 ip 资及未使用的 ip资源
dealIpResourceByGroup(ipResources, notUsed, account, username, groupType); dealIpResourceByGroup(ipResources, notUsed, account, username, groupType);
if (CollectionUtils.isNotEmpty(notUsed)) { if (CollectionUtils.isNotEmpty(notUsed)) {
...@@ -932,9 +931,8 @@ public class IpResourceServiceImpl implements IpResourceService { ...@@ -932,9 +931,8 @@ public class IpResourceServiceImpl implements IpResourceService {
List<String> accountNameList = new ArrayList<>(); List<String> accountNameList = new ArrayList<>();
accountNameList.add(account.getName()); accountNameList.add(account.getName());
boolean isParent = false; boolean isParent = account.getParent() == null;
if (account.getParent() == null) { if (isParent) {
isParent = true;
// 获取当前用户的 子账户名 // 获取当前用户的 子账户名
List<String> children = accountRepository.findByParent(account.getName()).stream().map(Account::getName).collect(Collectors.toList()); List<String> children = accountRepository.findByParent(account.getName()).stream().map(Account::getName).collect(Collectors.toList());
accountNameList.addAll(children); accountNameList.addAll(children);
......
...@@ -72,7 +72,7 @@ ...@@ -72,7 +72,7 @@
</root> </root>
</springProfile> </springProfile>
<springProfile name="test"> <springProfile name="staging">
<!-- In production env, logging info++ --> <!-- In production env, logging info++ -->
<root level="info"> <root level="info">
<appender-ref ref="info_file"/> <appender-ref ref="info_file"/>
......
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