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
e694e3cb
Commit
e694e3cb
authored
Jul 17, 2020
by
xuxin
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
将专线回落的代码移动到 adminController 下
parent
358f20cb
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
25 additions
and
17 deletions
+25
-17
AdminController.java
...ec/browserbackend/account/controller/AdminController.java
+18
-9
TempController.java
...gec/browserbackend/browser/controller/TempController.java
+4
-8
TempServiceImpl.java
.../browserbackend/browser/service/Impl/TempServiceImpl.java
+3
-0
No files found.
src/main/java/com/edgec/browserbackend/account/controller/AdminController.java
View file @
e694e3cb
...
@@ -5,18 +5,13 @@ import com.edgec.browserbackend.account.domain.AccountDto;
...
@@ -5,18 +5,13 @@ import com.edgec.browserbackend.account.domain.AccountDto;
import
com.edgec.browserbackend.account.dto.ResultDto
;
import
com.edgec.browserbackend.account.dto.ResultDto
;
import
com.edgec.browserbackend.account.dto.SubUsersRequestDto
;
import
com.edgec.browserbackend.account.dto.SubUsersRequestDto
;
import
com.edgec.browserbackend.account.service.AccountService
;
import
com.edgec.browserbackend.account.service.AccountService
;
import
com.edgec.browserbackend.browser.ErrorCode.BrowserErrorCode
;
import
com.edgec.browserbackend.browser.dto.ShopRequestDto
;
import
com.edgec.browserbackend.browser.dto.ShopRequestDto
;
import
com.edgec.browserbackend.browser.service.TempService
;
import
com.edgec.browserbackend.common.commons.error.ClientRequestException
;
import
com.edgec.browserbackend.common.commons.error.ClientRequestException
;
import
org.springframework.beans.factory.annotation.Autowired
;
import
org.springframework.beans.factory.annotation.Autowired
;
import
org.springframework.web.bind.annotation.*
;
import
org.springframework.web.bind.annotation.*
;
import
javax.servlet.http.HttpServletResponse
;
import
javax.validation.Valid
;
import
javax.validation.Valid
;
import
java.io.File
;
import
java.io.FileInputStream
;
import
java.io.OutputStream
;
import
java.net.URLEncoder
;
import
java.security.Principal
;
import
java.security.Principal
;
import
java.util.HashMap
;
import
java.util.HashMap
;
import
java.util.Map
;
import
java.util.Map
;
...
@@ -28,6 +23,9 @@ public class AdminController {
...
@@ -28,6 +23,9 @@ public class AdminController {
@Autowired
@Autowired
AccountService
accountService
;
AccountService
accountService
;
@Autowired
private
TempService
tempService
;
@RequestMapping
(
path
=
"/subuser/addone"
,
method
=
RequestMethod
.
POST
)
@RequestMapping
(
path
=
"/subuser/addone"
,
method
=
RequestMethod
.
POST
)
public
ResultDto
createSubAccount
(
Principal
principal
,
@Valid
@RequestBody
AccountDto
user
)
{
public
ResultDto
createSubAccount
(
Principal
principal
,
@Valid
@RequestBody
AccountDto
user
)
{
ResultDto
resultDto
=
new
ResultDto
();
ResultDto
resultDto
=
new
ResultDto
();
...
@@ -68,7 +66,7 @@ public class AdminController {
...
@@ -68,7 +66,7 @@ public class AdminController {
ResultDto
resultDto
=
new
ResultDto
();
ResultDto
resultDto
=
new
ResultDto
();
try
{
try
{
LimitedUsers
.
filterIfLimitedUser
(
principal
);
LimitedUsers
.
filterIfLimitedUser
(
principal
);
Account
account1
=
accountService
.
saveSub
(
principal
.
getName
(),
user
);
Account
account1
=
accountService
.
saveSub
(
principal
.
getName
(),
user
);
resultDto
.
setStatus
(
0
);
resultDto
.
setStatus
(
0
);
resultDto
.
setData
(
account1
);
resultDto
.
setData
(
account1
);
}
catch
(
ClientRequestException
e
)
{
}
catch
(
ClientRequestException
e
)
{
...
@@ -105,7 +103,7 @@ public class AdminController {
...
@@ -105,7 +103,7 @@ public class AdminController {
LimitedUsers
.
filterIfLimitedUser
(
principal
);
LimitedUsers
.
filterIfLimitedUser
(
principal
);
accountService
.
deleteSub
(
principal
.
getName
(),
child
);
accountService
.
deleteSub
(
principal
.
getName
(),
child
);
resultDto
.
setStatus
(
0
);
resultDto
.
setStatus
(
0
);
}
catch
(
ClientRequestException
e
)
{
}
catch
(
ClientRequestException
e
)
{
resultDto
.
setStatus
(-
1
);
resultDto
.
setStatus
(-
1
);
Map
<
String
,
Object
>
statusInfo
=
new
HashMap
<>();
Map
<
String
,
Object
>
statusInfo
=
new
HashMap
<>();
statusInfo
.
put
(
"code"
,
e
.
getErrorCode
());
statusInfo
.
put
(
"code"
,
e
.
getErrorCode
());
...
@@ -123,7 +121,7 @@ public class AdminController {
...
@@ -123,7 +121,7 @@ public class AdminController {
LimitedUsers
.
filterIfLimitedUser
(
principal
);
LimitedUsers
.
filterIfLimitedUser
(
principal
);
resultDto
.
setData
(
accountService
.
getSubUserList
(
principal
.
getName
(),
shopRequestDto
.
getPage
(),
shopRequestDto
.
getAmount
()));
resultDto
.
setData
(
accountService
.
getSubUserList
(
principal
.
getName
(),
shopRequestDto
.
getPage
(),
shopRequestDto
.
getAmount
()));
resultDto
.
setStatus
(
0
);
resultDto
.
setStatus
(
0
);
}
catch
(
ClientRequestException
e
)
{
}
catch
(
ClientRequestException
e
)
{
resultDto
.
setStatus
(-
1
);
resultDto
.
setStatus
(-
1
);
Map
<
String
,
Object
>
statusInfo
=
new
HashMap
<>();
Map
<
String
,
Object
>
statusInfo
=
new
HashMap
<>();
statusInfo
.
put
(
"code"
,
e
.
getErrorCode
());
statusInfo
.
put
(
"code"
,
e
.
getErrorCode
());
...
@@ -134,4 +132,15 @@ public class AdminController {
...
@@ -134,4 +132,15 @@ public class AdminController {
return
resultDto
;
return
resultDto
;
}
}
/**
* 专线回落
*/
@PutMapping
(
value
=
"/updateip/{addr}/{flag}"
)
public
ResultDto
updateIp
(
@PathVariable
String
addr
,
@PathVariable
String
flag
)
{
tempService
.
saveIpResource
(
addr
,
flag
);
ResultDto
resultDto
=
new
ResultDto
();
resultDto
.
setStatus
(
0
);
return
resultDto
;
}
}
}
src/main/java/com/edgec/browserbackend/browser/controller/TempController.java
View file @
e694e3cb
...
@@ -3,7 +3,10 @@ package com.edgec.browserbackend.browser.controller;
...
@@ -3,7 +3,10 @@ package com.edgec.browserbackend.browser.controller;
import
com.edgec.browserbackend.browser.domain.UserCode
;
import
com.edgec.browserbackend.browser.domain.UserCode
;
import
com.edgec.browserbackend.browser.service.TempService
;
import
com.edgec.browserbackend.browser.service.TempService
;
import
org.springframework.beans.factory.annotation.Autowired
;
import
org.springframework.beans.factory.annotation.Autowired
;
import
org.springframework.web.bind.annotation.*
;
import
org.springframework.web.bind.annotation.PostMapping
;
import
org.springframework.web.bind.annotation.RequestBody
;
import
org.springframework.web.bind.annotation.RequestMapping
;
import
org.springframework.web.bind.annotation.RestController
;
/**
/**
* 一些临时执行的代码可以放在这里,方便删除
* 一些临时执行的代码可以放在这里,方便删除
...
@@ -23,11 +26,4 @@ public class TempController {
...
@@ -23,11 +26,4 @@ public class TempController {
tempService
.
save
(
userCode
);
tempService
.
save
(
userCode
);
}
}
/**
* 专线回落
*/
@PutMapping
(
value
=
"/updateip/{addr}/{flag}"
)
public
void
updateIp
(
@PathVariable
String
addr
,
@PathVariable
String
flag
)
{
tempService
.
saveIpResource
(
addr
,
flag
);
}
}
}
src/main/java/com/edgec/browserbackend/browser/service/Impl/TempServiceImpl.java
View file @
e694e3cb
...
@@ -5,12 +5,14 @@ import com.edgec.browserbackend.browser.domain.UserCode;
...
@@ -5,12 +5,14 @@ import com.edgec.browserbackend.browser.domain.UserCode;
import
com.edgec.browserbackend.browser.repository.IpResourceRepository
;
import
com.edgec.browserbackend.browser.repository.IpResourceRepository
;
import
com.edgec.browserbackend.browser.repository.UserCodeRepository
;
import
com.edgec.browserbackend.browser.repository.UserCodeRepository
;
import
com.edgec.browserbackend.browser.service.TempService
;
import
com.edgec.browserbackend.browser.service.TempService
;
import
lombok.extern.slf4j.Slf4j
;
import
org.springframework.beans.factory.annotation.Autowired
;
import
org.springframework.beans.factory.annotation.Autowired
;
import
org.springframework.stereotype.Service
;
import
org.springframework.stereotype.Service
;
/**
/**
*
*
*/
*/
@Slf4j
@Service
@Service
public
class
TempServiceImpl
implements
TempService
{
public
class
TempServiceImpl
implements
TempService
{
@Autowired
@Autowired
...
@@ -37,5 +39,6 @@ public class TempServiceImpl implements TempService {
...
@@ -37,5 +39,6 @@ public class TempServiceImpl implements TempService {
}
}
ipResourceRepository
.
save
(
ipResource
);
ipResourceRepository
.
save
(
ipResource
);
log
.
info
(
"ip地址为:"
+
addr
+
"专线状态更改为:"
+
flag
);
}
}
}
}
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