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
6dbd46bb
Commit
6dbd46bb
authored
Mar 18, 2020
by
renjie
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
异步任务
parent
3b1002a9
Expand all
Show whitespace changes
Inline
Side-by-side
Showing
7 changed files
with
74 additions
and
11 deletions
+74
-11
BrowserErrorCode.java
...ec/browserbackend/browser/ErrorCode/BrowserErrorCode.java
+4
-1
IpControlloer.java
...dgec/browserbackend/browser/controller/IpControlloer.java
+19
-1
IpTransaction.java
...om/edgec/browserbackend/browser/domain/IpTransaction.java
+15
-3
IpTransactionDto.java
...om/edgec/browserbackend/browser/dto/IpTransactionDto.java
+22
-5
IpTransactionRepository.java
...erbackend/browser/repository/IpTransactionRepository.java
+13
-0
IpResourceServiceImpl.java
...erbackend/browser/service/Impl/IpResourceServiceImpl.java
+0
-0
IpResourceService.java
...gec/browserbackend/browser/service/IpResourceService.java
+1
-1
No files found.
src/main/java/com/edgec/browserbackend/browser/ErrorCode/BrowserErrorCode.java
View file @
6dbd46bb
package
com
.
edgec
.
browserbackend
.
browser
.
ErrorCode
;
package
com
.
edgec
.
browserbackend
.
browser
.
ErrorCode
;
import
com.edgec.browserbackend.browser.domain.IpTransaction
;
import
com.edgec.browserbackend.common.commons.error.ErrorCode
;
import
com.edgec.browserbackend.common.commons.error.ErrorCode
;
import
com.fasterxml.jackson.annotation.JsonValue
;
import
com.fasterxml.jackson.annotation.JsonValue
;
...
@@ -14,7 +15,9 @@ public enum BrowserErrorCode implements ErrorCode {
...
@@ -14,7 +15,9 @@ public enum BrowserErrorCode implements ErrorCode {
IPNOTEXIST
(
BROWSER_BASE
+
201
,
"The ip do not exist"
),
IPNOTEXIST
(
BROWSER_BASE
+
201
,
"The ip do not exist"
),
IPNOTBINDTOSHOP
(
BROWSER_BASE
+
202
,
"The ip do not bind this shop."
),
IPNOTBINDTOSHOP
(
BROWSER_BASE
+
202
,
"The ip do not bind this shop."
),
GROUPNOTEXIST
(
BROWSER_BASE
+
301
,
"The group do not exist"
);
GROUPNOTEXIST
(
BROWSER_BASE
+
301
,
"The group do not exist"
),
IPTRANSACTIONNOTEXIST
(
BROWSER_BASE
+
401
,
"The ipTransaction do not exist"
);
...
...
src/main/java/com/edgec/browserbackend/browser/controller/IpControlloer.java
View file @
6dbd46bb
...
@@ -26,7 +26,7 @@ public class IpControlloer {
...
@@ -26,7 +26,7 @@ public class IpControlloer {
public
ResultDto
buyIp
(
Principal
principal
,
@RequestBody
IpResourceRequestDto
ipResourceRequestDto
){
public
ResultDto
buyIp
(
Principal
principal
,
@RequestBody
IpResourceRequestDto
ipResourceRequestDto
){
ResultDto
resultDto
=
new
ResultDto
();
ResultDto
resultDto
=
new
ResultDto
();
try
{
try
{
List
<
IpResourceDto
>
ipResourceDto
=
ipResourceService
.
buyIp
(
principal
.
getName
(),
ipResourceRequestDto
);
IpTransactionDto
ipResourceDto
=
ipResourceService
.
buyIp
(
principal
.
getName
(),
ipResourceRequestDto
);
resultDto
.
setData
(
ipResourceDto
);
resultDto
.
setData
(
ipResourceDto
);
resultDto
.
setStatus
(
0
);
resultDto
.
setStatus
(
0
);
}
catch
(
ClientRequestException
e
)
{
}
catch
(
ClientRequestException
e
)
{
...
@@ -100,4 +100,22 @@ public class IpControlloer {
...
@@ -100,4 +100,22 @@ public class IpControlloer {
}
}
return
resultDto
;
return
resultDto
;
}
}
@RequestMapping
(
value
=
"/queryTransaction"
,
method
=
RequestMethod
.
POST
)
public
ResultDto
queryTransaction
(
Principal
principal
,
@RequestBody
IpTransactionDto
ipTransactionDto
)
{
ResultDto
resultDto
=
new
ResultDto
();
try
{
IpTransactionDto
ipTransactionDto1
=
ipResourceService
.
queryTransaction
(
principal
.
getName
(),
ipTransactionDto
.
getTid
());
resultDto
.
setData
(
ipTransactionDto1
);
resultDto
.
setStatus
(
0
);
}
catch
(
ClientRequestException
e
)
{
resultDto
.
setStatus
(-
1
);
Map
<
String
,
Object
>
statusInfo
=
new
HashMap
<>();
statusInfo
.
put
(
"code"
,
e
.
getErrorCode
());
statusInfo
.
put
(
"message"
,
e
.
getMessage
());
resultDto
.
setStatusInfo
(
statusInfo
);
}
return
resultDto
;
}
}
}
src/main/java/com/edgec/browserbackend/browser/domain/IpTransaction.java
View file @
6dbd46bb
...
@@ -3,6 +3,8 @@ package com.edgec.browserbackend.browser.domain;
...
@@ -3,6 +3,8 @@ package com.edgec.browserbackend.browser.domain;
import
org.springframework.data.annotation.Id
;
import
org.springframework.data.annotation.Id
;
import
org.springframework.data.mongodb.core.mapping.Document
;
import
org.springframework.data.mongodb.core.mapping.Document
;
import
java.util.List
;
/**
/**
* @Desc
* @Desc
* @Author jason
* @Author jason
...
@@ -13,17 +15,19 @@ public class IpTransaction {
...
@@ -13,17 +15,19 @@ public class IpTransaction {
@Id
@Id
private
String
tid
;
private
String
tid
;
private
int
username
;
private
String
username
;
private
long
createTime
;
private
long
createTime
;
private
int
status
;
private
int
status
;
public
int
getUsername
()
{
private
List
<
String
>
ipIds
;
public
String
getUsername
()
{
return
username
;
return
username
;
}
}
public
void
setUsername
(
int
username
)
{
public
void
setUsername
(
String
username
)
{
this
.
username
=
username
;
this
.
username
=
username
;
}
}
...
@@ -50,4 +54,12 @@ public class IpTransaction {
...
@@ -50,4 +54,12 @@ public class IpTransaction {
public
void
setTid
(
String
tid
)
{
public
void
setTid
(
String
tid
)
{
this
.
tid
=
tid
;
this
.
tid
=
tid
;
}
}
public
List
<
String
>
getIpIds
()
{
return
ipIds
;
}
public
void
setIpIds
(
List
<
String
>
ipIds
)
{
this
.
ipIds
=
ipIds
;
}
}
}
src/main/java/com/edgec/browserbackend/browser/dto/IpTransactionDto.java
View file @
6dbd46bb
package
com
.
edgec
.
browserbackend
.
browser
.
dto
;
package
com
.
edgec
.
browserbackend
.
browser
.
dto
;
import
com.edgec.browserbackend.browser.domain.IpTransaction
;
import
com.fasterxml.jackson.annotation.JsonIgnoreProperties
;
import
java.util.ArrayList
;
import
java.util.List
;
/**
/**
* @Desc
* @Desc
* @Author jason
* @Author jason
* @CreateTime 2020/3/18 9:57 上午
* @CreateTime 2020/3/18 9:57 上午
**/
**/
@JsonIgnoreProperties
(
ignoreUnknown
=
true
)
public
class
IpTransactionDto
{
public
class
IpTransactionDto
{
private
String
tid
;
private
String
tid
;
private
int
status
;
private
int
status
;
private
IpResourceDto
ipResourceDto
;
private
List
<
IpResourceDto
>
ipResourceDtos
;
public
IpTransactionDto
(){
}
public
IpTransactionDto
(
IpTransaction
ipTransaction
)
{
this
.
tid
=
ipTransaction
.
getTid
();
this
.
status
=
ipTransaction
.
getStatus
();
ipResourceDtos
=
new
ArrayList
<>();
}
public
String
getTid
()
{
public
String
getTid
()
{
return
tid
;
return
tid
;
...
@@ -26,11 +43,11 @@ public class IpTransactionDto {
...
@@ -26,11 +43,11 @@ public class IpTransactionDto {
this
.
status
=
status
;
this
.
status
=
status
;
}
}
public
IpResourceDto
getIpResourceDto
()
{
public
List
<
IpResourceDto
>
getIpResourceDtos
()
{
return
ipResourceDto
;
return
ipResourceDto
s
;
}
}
public
void
setIpResourceDto
(
IpResourceDto
ipResourceDto
)
{
public
void
setIpResourceDto
s
(
List
<
IpResourceDto
>
ipResourceDtos
)
{
this
.
ipResourceDto
=
ipResourceDto
;
this
.
ipResourceDto
s
=
ipResourceDtos
;
}
}
}
}
src/main/java/com/edgec/browserbackend/browser/repository/IpTransactionRepository.java
0 → 100644
View file @
6dbd46bb
package
com
.
edgec
.
browserbackend
.
browser
.
repository
;
import
com.edgec.browserbackend.browser.domain.IpTransaction
;
import
org.springframework.data.mongodb.repository.MongoRepository
;
/**
* @Desc
* @Author jason
* @CreateTime 2020/3/18 5:21 下午
**/
public
interface
IpTransactionRepository
extends
MongoRepository
<
IpTransaction
,
String
>
{
}
src/main/java/com/edgec/browserbackend/browser/service/Impl/IpResourceServiceImpl.java
View file @
6dbd46bb
This diff is collapsed.
Click to expand it.
src/main/java/com/edgec/browserbackend/browser/service/IpResourceService.java
View file @
6dbd46bb
...
@@ -7,7 +7,7 @@ import java.util.List;
...
@@ -7,7 +7,7 @@ import java.util.List;
public
interface
IpResourceService
{
public
interface
IpResourceService
{
List
<
IpResourceDto
>
buyIp
(
String
username
,
IpResourceRequestDto
ipResourceRequestDto
)
throws
Exception
;
IpTransactionDto
buyIp
(
String
username
,
IpResourceRequestDto
ipResourceRequestDto
)
throws
Exception
;
IpOperationResultDto
renewIp
(
String
username
,
IpResourceRequestDto
ipResourceRequestDto
)
throws
Exception
;
IpOperationResultDto
renewIp
(
String
username
,
IpResourceRequestDto
ipResourceRequestDto
)
throws
Exception
;
...
...
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