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
b0ca5495
Commit
b0ca5495
authored
Mar 23, 2020
by
renjie
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
绑定记录
parent
11d018bc
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
11 additions
and
9 deletions
+11
-9
IpResource.java
...a/com/edgec/browserbackend/browser/domain/IpResource.java
+4
-3
ShopServiceImpl.java
.../browserbackend/browser/service/Impl/ShopServiceImpl.java
+7
-6
No files found.
src/main/java/com/edgec/browserbackend/browser/domain/IpResource.java
View file @
b0ca5495
...
...
@@ -7,6 +7,7 @@ import org.springframework.data.annotation.Transient;
import
org.springframework.data.mongodb.core.mapping.Document
;
import
java.util.ArrayList
;
import
java.util.HashMap
;
import
java.util.List
;
@Document
(
collection
=
"ipresource"
)
...
...
@@ -25,7 +26,7 @@ public class IpResource {
private
long
purchasedTime
;
private
long
validTime
;
private
String
details
;
List
<
BindHistory
>
bindHistory
=
new
ArrayList
<>();
List
<
HashMap
<
String
,
String
>
>
bindHistory
=
new
ArrayList
<>();
private
boolean
isDeleted
;
private
String
username
;
private
String
owner
;
...
...
@@ -83,11 +84,11 @@ public class IpResource {
this
.
ipType
=
ipType
;
}
public
List
<
BindHistory
>
getBindHistory
()
{
public
List
<
HashMap
<
String
,
String
>
>
getBindHistory
()
{
return
bindHistory
;
}
public
void
setBindHistory
(
List
<
BindHistory
>
bindHistory
)
{
public
void
setBindHistory
(
List
<
HashMap
<
String
,
String
>
>
bindHistory
)
{
this
.
bindHistory
=
bindHistory
;
}
...
...
src/main/java/com/edgec/browserbackend/browser/service/Impl/ShopServiceImpl.java
View file @
b0ca5495
...
...
@@ -30,6 +30,7 @@ import org.springframework.web.multipart.MultipartFile;
import
java.io.IOException
;
import
java.time.Instant
;
import
java.util.ArrayList
;
import
java.util.HashMap
;
import
java.util.List
;
import
java.util.stream.Collectors
;
...
...
@@ -285,12 +286,12 @@ public class ShopServiceImpl implements ShopService {
if
(!
ipResource
.
getId
().
equals
(
shop
.
getIpId
()))
throw
new
ClientRequestException
(
BrowserErrorCode
.
IPNOTBINDTOSHOP
);
try
{
List
<
BindHistory
>
history
=
ipResource
.
getBindHistory
();
BindHistory
bindHistory
=
new
BindHistory
();
bindHistory
.
setIp
(
ipResource
.
getAddr
());
bindHistory
.
setPlatform
(
shop
.
getShopPlatform
());
bindHistory
.
setShopName
(
shop
.
getShopName
());
history
.
add
(
bindHistory
);
List
<
HashMap
<
String
,
String
>
>
history
=
ipResource
.
getBindHistory
();
HashMap
<
String
,
String
>
map
=
new
HashMap
<>
();
map
.
put
(
"shopName"
,
shop
.
getShopName
());
map
.
put
(
"platform"
,
shop
.
getShopPlatform
());
map
.
put
(
"ip"
,
ipResource
.
getAddr
());
history
.
add
(
map
);
shop
.
setIp
(
null
);
shop
.
setIpId
(
null
);
shop
.
setIpRegion
(
null
);
...
...
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