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
cac1e0c9
Commit
cac1e0c9
authored
Sep 29, 2020
by
huangjiamin
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
购买后将海外的IP添加KCP端口号
parent
1c075f10
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
2 additions
and
3 deletions
+2
-3
IpResourceServiceImpl.java
...erbackend/browser/service/Impl/IpResourceServiceImpl.java
+2
-2
ShopServiceImpl.java
.../browserbackend/browser/service/Impl/ShopServiceImpl.java
+0
-1
No files found.
src/main/java/com/edgec/browserbackend/browser/service/Impl/IpResourceServiceImpl.java
View file @
cac1e0c9
...
@@ -709,9 +709,9 @@ public class IpResourceServiceImpl implements IpResourceService {
...
@@ -709,9 +709,9 @@ public class IpResourceServiceImpl implements IpResourceService {
}
}
// 2. 如果 ip 资源的 status 为 6(未分配) 或者 ( ip资源为专线 且 purchasedTime(购买IP的时间) 在 14 分钟内)
// 2. 如果 ip 资源的 status 为 6(未分配) 或者 ( ip资源为专线 且 purchasedTime(购买IP的时间) 在 14 分钟内)
if
(
x
.
getStatus
()
==
6
||
(
x
.
isSpecialLine
()
&&
x
.
getPurchasedTime
()
>
(
Instant
.
now
().
minusSeconds
(
14
*
60
).
toEpochMilli
())))
{
/*
if (x.getStatus() == 6 || (x.isSpecialLine() && x.getPurchasedTime() > (Instant.now().minusSeconds(14 * 60).toEpochMilli()))) {
x.setStatus(3);
x.setStatus(3);
}
}
*/
// 3. 如果 ip 资源的 status 为 3(正在分配)
// 3. 如果 ip 资源的 status 为 3(正在分配)
if
(
x
.
getStatus
()
==
3
)
{
if
(
x
.
getStatus
()
==
3
)
{
...
...
src/main/java/com/edgec/browserbackend/browser/service/Impl/ShopServiceImpl.java
View file @
cac1e0c9
...
@@ -394,7 +394,6 @@ public class ShopServiceImpl implements ShopService {
...
@@ -394,7 +394,6 @@ public class ShopServiceImpl implements ShopService {
ipResourceDto
=
new
IpResourceDto
(
ipResource
,
null
,
false
);
ipResourceDto
=
new
IpResourceDto
(
ipResource
,
null
,
false
);
}
}
logger
.
error
(
"queryShop ipResource.getRegion : {}"
,
ipResource
.
getRegion
());
if
(
org
.
apache
.
commons
.
lang3
.
StringUtils
.
isNotBlank
(
ipResource
.
getRegion
())
&&
region
.
contains
(
ipResource
.
getRegion
())){
if
(
org
.
apache
.
commons
.
lang3
.
StringUtils
.
isNotBlank
(
ipResource
.
getRegion
())
&&
region
.
contains
(
ipResource
.
getRegion
())){
ipResourceDto
.
setSecondaryProxyPort
(
"20020"
);
ipResourceDto
.
setSecondaryProxyPort
(
"20020"
);
}
}
...
...
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