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
a58a698c
Commit
a58a698c
authored
Aug 26, 2020
by
xuxin
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
修改测试环境 日志输出配置
parent
597b40dd
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
4 additions
and
6 deletions
+4
-6
IpResourceServiceImpl.java
...erbackend/browser/service/Impl/IpResourceServiceImpl.java
+3
-5
logback-spring.xml
src/main/resources/logback-spring.xml
+1
-1
No files found.
src/main/java/com/edgec/browserbackend/browser/service/Impl/IpResourceServiceImpl.java
View file @
a58a698c
...
...
@@ -644,10 +644,9 @@ public class IpResourceServiceImpl implements IpResourceService {
// 获取当前用户的账户
Account
account
=
accountRepository
.
findByName
(
username
).
orElseThrow
(()
->
new
ClientRequestException
(
AccountErrorCode
.
NAMENOTEXIST
));
// 获取当前用户对应的 groupType 的 ip 资及未使用的 ip资源
List
<
IpResource
>
ipResources
=
new
ArrayList
<>();
List
<
IpResource
>
notUsed
=
new
ArrayList
<>();
// 获取当前用户的 ip 资及未使用的 ip资源
dealIpResourceByGroup
(
ipResources
,
notUsed
,
account
,
username
,
groupType
);
if
(
CollectionUtils
.
isNotEmpty
(
notUsed
))
{
...
...
@@ -932,9 +931,8 @@ public class IpResourceServiceImpl implements IpResourceService {
List
<
String
>
accountNameList
=
new
ArrayList
<>();
accountNameList
.
add
(
account
.
getName
());
boolean
isParent
=
false
;
if
(
account
.
getParent
()
==
null
)
{
isParent
=
true
;
boolean
isParent
=
account
.
getParent
()
==
null
;
if
(
isParent
)
{
// 获取当前用户的 子账户名
List
<
String
>
children
=
accountRepository
.
findByParent
(
account
.
getName
()).
stream
().
map
(
Account:
:
getName
).
collect
(
Collectors
.
toList
());
accountNameList
.
addAll
(
children
);
...
...
src/main/resources/logback-spring.xml
View file @
a58a698c
...
...
@@ -72,7 +72,7 @@
</root>
</springProfile>
<springProfile
name=
"
test
"
>
<springProfile
name=
"
staging
"
>
<!-- In production env, logging info++ -->
<root
level=
"info"
>
<appender-ref
ref=
"info_file"
/>
...
...
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