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
80bc3a4c
Commit
80bc3a4c
authored
Apr 03, 2020
by
renjie
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
ipdetail bug
parent
6aae1d14
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
4 additions
and
1 deletion
+4
-1
AccountServiceImpl.java
...owserbackend/account/service/impl/AccountServiceImpl.java
+1
-0
IpResourceServiceImpl.java
...erbackend/browser/service/Impl/IpResourceServiceImpl.java
+3
-1
No files found.
src/main/java/com/edgec/browserbackend/account/service/impl/AccountServiceImpl.java
View file @
80bc3a4c
...
@@ -729,6 +729,7 @@ public class AccountServiceImpl implements AccountService {
...
@@ -729,6 +729,7 @@ public class AccountServiceImpl implements AccountService {
password
=
subUsersRequestDto
.
getPassword
();
password
=
subUsersRequestDto
.
getPassword
();
else
else
password
=
makeRandomPassword
(
8
);
password
=
makeRandomPassword
(
8
);
authUser
.
setPassword
(
password
);
authUser
.
setPassword
(
password
);
authUser
.
setPhone
(
existing
.
getPhoneNumber
());
authUser
.
setPhone
(
existing
.
getPhoneNumber
());
authUser
.
setEnabled
(
true
);
authUser
.
setEnabled
(
true
);
...
...
src/main/java/com/edgec/browserbackend/browser/service/Impl/IpResourceServiceImpl.java
View file @
80bc3a4c
...
@@ -634,7 +634,9 @@ public class IpResourceServiceImpl implements IpResourceService {
...
@@ -634,7 +634,9 @@ public class IpResourceServiceImpl implements IpResourceService {
throw
new
ClientRequestException
(
BrowserErrorCode
.
IPNOTEXIST
);
throw
new
ClientRequestException
(
BrowserErrorCode
.
IPNOTEXIST
);
ShopDto
shopDto
;
ShopDto
shopDto
;
Shop
shop
=
shopRepository
.
findById
(
ipResource
.
getShopId
()).
orElse
(
null
);
Shop
shop
=
null
;
if
(
ipResource
.
getShopId
()
!=
null
)
shop
=
shopRepository
.
findById
(
ipResource
.
getShopId
()).
orElse
(
null
);
if
(
shop
==
null
)
{
if
(
shop
==
null
)
{
shopDto
=
new
ShopDto
();
shopDto
=
new
ShopDto
();
}
else
{
}
else
{
...
...
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