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
e50e6d53
Commit
e50e6d53
authored
Mar 06, 2020
by
renjie
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
修改返回格式
parent
d20ee384
Show whitespace changes
Inline
Side-by-side
Showing
10 changed files
with
246 additions
and
51 deletions
+246
-51
AccountController.java
.../browserbackend/account/controller/AccountController.java
+114
-19
Account.java
...java/com/edgec/browserbackend/account/domain/Account.java
+17
-6
AccountDto.java
...a/com/edgec/browserbackend/account/domain/AccountDto.java
+17
-5
User.java
...in/java/com/edgec/browserbackend/account/domain/User.java
+16
-5
AccountResultDto.java
...om/edgec/browserbackend/account/dto/AccountResultDto.java
+33
-0
AccountService.java
.../edgec/browserbackend/account/service/AccountService.java
+2
-3
AccountServiceImpl.java
...owserbackend/account/service/impl/AccountServiceImpl.java
+27
-13
ShopController.java
...gec/browserbackend/browser/controller/ShopController.java
+8
-0
ShopServiceImpl.java
.../browserbackend/browser/service/Impl/ShopServiceImpl.java
+7
-0
ShopService.java
...com/edgec/browserbackend/browser/service/ShopService.java
+5
-0
No files found.
src/main/java/com/edgec/browserbackend/account/controller/AccountController.java
View file @
e50e6d53
package
com
.
edgec
.
browserbackend
.
account
.
controller
;
import
com.edgec.browserbackend.account.domain.*
;
import
com.edgec.browserbackend.account.dto.AccountResultDto
;
import
com.edgec.browserbackend.account.dto.BillQueryCriteriaDto
;
import
com.edgec.browserbackend.account.exception.AccountErrorCode
;
import
com.edgec.browserbackend.common.auth.Securitys
;
import
com.edgec.browserbackend.common.commons.error.ClientRequestException
;
import
com.edgec.browserbackend.common.commons.utils.DateConverter
;
import
com.edgec.browserbackend.account.service.AccountService
;
import
com.edgec.browserbackend.account.service.EmailService
;
...
...
@@ -25,9 +28,7 @@ import java.security.Principal;
import
java.time.ZoneOffset
;
import
java.time.ZonedDateTime
;
import
java.time.format.DateTimeFormatter
;
import
java.util.Date
;
import
java.util.Enumeration
;
import
java.util.List
;
import
java.util.*
;
@RestController
@RequestMapping
(
"account"
)
...
...
@@ -75,13 +76,25 @@ public class AccountController {
@RequestMapping
(
path
=
"/information"
,
method
=
RequestMethod
.
GET
)
public
Account
getAccount
(
Principal
principal
)
{
public
Account
ResultDto
getAccount
(
Principal
principal
)
{
return
accountService
.
findByName
(
principal
.
getName
());
}
@RequestMapping
(
path
=
"/{name}/children/{level}"
,
method
=
RequestMethod
.
GET
)
public
List
<
UserDto
>
getDesendentUsers
(
@PathVariable
String
name
,
@PathVariable
int
level
)
{
return
accountService
.
getAllDesendentUsers
(
name
,
level
);
public
AccountResultDto
getDesendentUsers
(
@PathVariable
String
name
,
@PathVariable
int
level
)
{
AccountResultDto
accountResultDto
=
new
AccountResultDto
();
try
{
List
<
UserDto
>
userDtos
=
accountService
.
getAllDesendentUsers
(
name
,
level
);
accountResultDto
.
setStatus
(
0
);
accountResultDto
.
setData
(
userDtos
);
}
catch
(
ClientRequestException
e
)
{
accountResultDto
.
setStatus
(-
1
);
Map
<
String
,
Object
>
statusInfo
=
new
HashMap
<>();
statusInfo
.
put
(
"code"
,
e
.
getErrorCode
());
statusInfo
.
put
(
"message"
,
e
.
getMessage
());
accountResultDto
.
setStatusInfo
(
statusInfo
);
}
return
accountResultDto
;
}
// @RequestMapping(path = "/current", method = RequestMethod.DELETE)
...
...
@@ -90,9 +103,20 @@ public class AccountController {
// }
@RequestMapping
(
path
=
"/current"
,
method
=
RequestMethod
.
PUT
)
public
Account
saveCurrentAccount
(
Principal
principal
,
@Valid
@RequestBody
Account
account
)
{
LimitedUsers
.
filterIfLimitedUser
(
principal
);
return
accountService
.
saveChanges
(
principal
.
getName
(),
account
);
public
AccountResultDto
saveCurrentAccount
(
Principal
principal
,
@Valid
@RequestBody
Account
account
)
{
AccountResultDto
accountResultDto
=
new
AccountResultDto
();
try
{
Account
account1
=
accountService
.
saveChanges
(
principal
.
getName
(),
account
);
accountResultDto
.
setStatus
(
0
);
accountResultDto
.
setData
(
account1
);
}
catch
(
ClientRequestException
e
)
{
accountResultDto
.
setStatus
(-
1
);
Map
<
String
,
Object
>
statusInfo
=
new
HashMap
<>();
statusInfo
.
put
(
"code"
,
e
.
getErrorCode
());
statusInfo
.
put
(
"message"
,
e
.
getMessage
());
accountResultDto
.
setStatusInfo
(
statusInfo
);
}
return
accountResultDto
;
}
@RequestMapping
(
path
=
"/authCode"
,
method
=
RequestMethod
.
GET
)
...
...
@@ -101,17 +125,42 @@ public class AccountController {
}
@RequestMapping
(
path
=
"/signup"
,
method
=
RequestMethod
.
POST
)
public
Account
createNewAccount
(
@Valid
@RequestBody
User
user
)
{
public
AccountResultDto
createNewAccount
(
@Valid
@RequestBody
User
user
)
{
AccountResultDto
accountResultDto
=
new
AccountResultDto
();
try
{
Account
account
=
new
Account
();
if
(!
StringUtils
.
isEmpty
(
user
.
getEmail
()))
return
accountService
.
create
(
user
);
account
=
accountService
.
create
(
user
);
else
return
accountService
.
createWithSms
(
user
);
account
=
accountService
.
createWithSms
(
user
);
accountResultDto
.
setStatus
(
0
);
accountResultDto
.
setData
(
account
);
}
catch
(
ClientRequestException
e
)
{
accountResultDto
.
setStatus
(-
1
);
Map
<
String
,
Object
>
statusInfo
=
new
HashMap
<>();
statusInfo
.
put
(
"code"
,
e
.
getErrorCode
());
statusInfo
.
put
(
"message"
,
e
.
getMessage
());
accountResultDto
.
setStatusInfo
(
statusInfo
);
}
return
accountResultDto
;
}
@RequestMapping
(
path
=
"/current"
,
method
=
RequestMethod
.
POST
)
public
Account
createSubAccount
(
Principal
principal
,
@Valid
@RequestBody
AccountDto
user
)
{
public
AccountResultDto
createSubAccount
(
Principal
principal
,
@Valid
@RequestBody
AccountDto
user
)
{
AccountResultDto
accountResultDto
=
new
AccountResultDto
();
try
{
LimitedUsers
.
filterIfLimitedUser
(
principal
);
return
accountService
.
createSub
(
principal
.
getName
(),
user
);
Account
account
=
accountService
.
createSub
(
principal
.
getName
(),
user
);
accountResultDto
.
setStatus
(
0
);
accountResultDto
.
setData
(
account
);
}
catch
(
ClientRequestException
e
)
{
accountResultDto
.
setStatus
(-
1
);
Map
<
String
,
Object
>
statusInfo
=
new
HashMap
<>();
statusInfo
.
put
(
"code"
,
e
.
getErrorCode
());
statusInfo
.
put
(
"message"
,
e
.
getMessage
());
accountResultDto
.
setStatusInfo
(
statusInfo
);
}
return
accountResultDto
;
}
@RequestMapping
(
path
=
"/contactus"
,
method
=
RequestMethod
.
POST
)
...
...
@@ -166,9 +215,21 @@ public class AccountController {
@RequestMapping
(
path
=
"/current/{child}"
,
method
=
RequestMethod
.
PUT
)
public
Account
saveSubAccount
(
Principal
principal
,
@PathVariable
String
child
,
@Valid
@RequestBody
AccountDto
user
)
{
public
AccountResultDto
saveSubAccount
(
Principal
principal
,
@PathVariable
String
child
,
@Valid
@RequestBody
AccountDto
user
)
{
AccountResultDto
accountResultDto
=
new
AccountResultDto
();
try
{
LimitedUsers
.
filterIfLimitedUser
(
principal
);
return
accountService
.
saveSub
(
principal
.
getName
(),
user
);
Account
account1
=
accountService
.
saveSub
(
principal
.
getName
(),
user
);
accountResultDto
.
setStatus
(
0
);
accountResultDto
.
setData
(
account1
);
}
catch
(
ClientRequestException
e
)
{
accountResultDto
.
setStatus
(-
1
);
Map
<
String
,
Object
>
statusInfo
=
new
HashMap
<>();
statusInfo
.
put
(
"code"
,
e
.
getErrorCode
());
statusInfo
.
put
(
"message"
,
e
.
getMessage
());
accountResultDto
.
setStatusInfo
(
statusInfo
);
}
return
accountResultDto
;
}
@RequestMapping
(
path
=
"/current/updatetoken"
,
method
=
RequestMethod
.
POST
)
...
...
@@ -177,14 +238,37 @@ public class AccountController {
}
@RequestMapping
(
path
=
"/current/{child}"
,
method
=
RequestMethod
.
DELETE
)
public
void
deleteSubAccount
(
Principal
principal
,
@PathVariable
String
child
)
{
public
AccountResultDto
deleteSubAccount
(
Principal
principal
,
@PathVariable
String
child
)
{
AccountResultDto
accountResultDto
=
new
AccountResultDto
();
try
{
LimitedUsers
.
filterIfLimitedUser
(
principal
);
accountService
.
deleteSub
(
principal
.
getName
(),
child
);
accountResultDto
.
setStatus
(
0
);
}
catch
(
ClientRequestException
e
)
{
accountResultDto
.
setStatus
(-
1
);
Map
<
String
,
Object
>
statusInfo
=
new
HashMap
<>();
statusInfo
.
put
(
"code"
,
e
.
getErrorCode
());
statusInfo
.
put
(
"message"
,
e
.
getMessage
());
accountResultDto
.
setStatusInfo
(
statusInfo
);
}
return
accountResultDto
;
}
@RequestMapping
(
path
=
"/reset"
,
method
=
RequestMethod
.
POST
)
public
void
forgetPassword
(
@Valid
@RequestBody
UserDto
user
)
{
public
AccountResultDto
forgetPassword
(
@Valid
@RequestBody
UserDto
user
)
{
AccountResultDto
accountResultDto
=
new
AccountResultDto
();
try
{
accountService
.
resetPassword
(
user
);
accountResultDto
.
setStatus
(
0
);
}
catch
(
ClientRequestException
e
)
{
accountResultDto
.
setStatus
(-
1
);
Map
<
String
,
Object
>
statusInfo
=
new
HashMap
<>();
statusInfo
.
put
(
"code"
,
e
.
getErrorCode
());
statusInfo
.
put
(
"message"
,
e
.
getMessage
());
accountResultDto
.
setStatusInfo
(
statusInfo
);
}
return
accountResultDto
;
}
@RequestMapping
(
path
=
"/deter/{text}"
,
method
=
RequestMethod
.
GET
)
...
...
@@ -193,8 +277,19 @@ public class AccountController {
}
@RequestMapping
(
path
=
"/resetwithotp"
,
method
=
RequestMethod
.
POST
)
public
void
resetWithOtp
(
@Valid
@RequestBody
UserDto
user
)
{
public
AccountResultDto
resetWithOtp
(
@Valid
@RequestBody
UserDto
user
)
{
AccountResultDto
accountResultDto
=
new
AccountResultDto
();
try
{
accountService
.
resetPasswordWithOtp
(
user
);
accountResultDto
.
setStatus
(
0
);
}
catch
(
ClientRequestException
e
)
{
accountResultDto
.
setStatus
(-
1
);
Map
<
String
,
Object
>
statusInfo
=
new
HashMap
<>();
statusInfo
.
put
(
"code"
,
e
.
getErrorCode
());
statusInfo
.
put
(
"message"
,
e
.
getMessage
());
accountResultDto
.
setStatusInfo
(
statusInfo
);
}
return
accountResultDto
;
}
@RequestMapping
(
path
=
"/0xwxpayputorder/{amount}"
,
method
=
RequestMethod
.
GET
)
...
...
src/main/java/com/edgec/browserbackend/account/domain/Account.java
View file @
e50e6d53
...
...
@@ -38,7 +38,9 @@ public class Account {
private
boolean
allowedToCreateSubUser
=
false
;
private
boolean
hasOperationRight
=
false
;
private
int
permission
=
00000000
;
private
List
<
String
>
whiteList
=
new
ArrayList
<>();
public
Date
getSignupDate
()
{
return
signupDate
;
...
...
@@ -66,7 +68,8 @@ public class Account {
this
.
setEmail
(
account
.
getEmail
());
this
.
setJobTitle
(
account
.
getJobTitle
());
this
.
setPhoneNumber
(
account
.
getPhoneNumber
());
this
.
setHasOperationRight
(
account
.
isHasOperationRight
());
this
.
setPermission
(
account
.
getPermission
());
this
.
setWhiteList
(
account
.
getWhiteList
());
}
public
String
getEmail
()
{
...
...
@@ -160,11 +163,19 @@ public class Account {
this
.
token
=
token
;
}
public
boolean
isHasOperationRight
()
{
return
hasOperationRight
;
public
int
getPermission
()
{
return
permission
;
}
public
void
setPermission
(
int
permission
)
{
this
.
permission
=
permission
;
}
public
List
<
String
>
getWhiteList
()
{
return
whiteList
;
}
public
void
set
HasOperationRight
(
boolean
hasOperationRigh
t
)
{
this
.
hasOperationRight
=
hasOperationRigh
t
;
public
void
set
WhiteList
(
List
<
String
>
whiteLis
t
)
{
this
.
whiteList
=
whiteLis
t
;
}
}
src/main/java/com/edgec/browserbackend/account/domain/AccountDto.java
View file @
e50e6d53
...
...
@@ -26,7 +26,7 @@ public class AccountDto {
private
boolean
allowedToCreateSubUser
;
private
boolean
hasOperationRight
=
false
;
private
int
permission
;
private
int
balance
;
...
...
@@ -36,6 +36,8 @@ public class AccountDto {
private
String
token
;
private
List
<
String
>
whiteList
=
new
ArrayList
<>();
public
AccountDto
(){
}
...
...
@@ -49,6 +51,8 @@ public class AccountDto {
this
.
setPhoneNumber
(
account
.
getPhoneNumber
());
this
.
setParent
(
account
.
getParent
());
this
.
setToken
(
account
.
getToken
());
this
.
setPermission
(
account
.
getPermission
());
this
.
setWhiteList
(
account
.
getWhiteList
());
}
public
boolean
isPrePaid
()
{
...
...
@@ -67,12 +71,20 @@ public class AccountDto {
this
.
balance
=
balance
;
}
public
boolean
isHasOperationRight
()
{
return
hasOperationRight
;
public
int
getPermission
()
{
return
permission
;
}
public
void
setPermission
(
int
permission
)
{
this
.
permission
=
permission
;
}
public
List
<
String
>
getWhiteList
()
{
return
whiteList
;
}
public
void
set
HasOperationRight
(
boolean
hasOperationRigh
t
)
{
this
.
hasOperationRight
=
hasOperationRigh
t
;
public
void
set
WhiteList
(
List
<
String
>
whiteLis
t
)
{
this
.
whiteList
=
whiteLis
t
;
}
public
String
getName
()
{
...
...
src/main/java/com/edgec/browserbackend/account/domain/User.java
View file @
e50e6d53
...
...
@@ -3,6 +3,8 @@ package com.edgec.browserbackend.account.domain;
import
org.hibernate.validator.constraints.Length
;
import
javax.validation.constraints.Email
;
import
java.util.ArrayList
;
import
java.util.List
;
import
java.util.UUID
;
public
class
User
{
...
...
@@ -42,8 +44,9 @@ public class User {
private
boolean
allowedToCreateSubUser
=
true
;
private
boolean
hasOperationRight
=
false
;
private
int
permission
;
private
List
<
String
>
whiteList
=
new
ArrayList
<>();
private
String
verificationCode
=
UUID
.
randomUUID
().
toString
();
...
...
@@ -96,12 +99,12 @@ public class User {
allowedToCreateSubUser
=
allowedToCreateSubUser
;
}
public
boolean
isHasOperationRight
()
{
return
hasOperationRight
;
public
int
getPermission
()
{
return
permission
;
}
public
void
set
HasOperationRight
(
boolean
hasOperationRight
)
{
this
.
hasOperationRight
=
hasOperationRight
;
public
void
set
Permission
(
int
permission
)
{
this
.
permission
=
permission
;
}
public
String
getLockReason
()
{
...
...
@@ -111,4 +114,12 @@ public class User {
public
void
setLockReason
(
String
lockReason
)
{
this
.
lockReason
=
lockReason
;
}
public
List
<
String
>
getWhiteList
()
{
return
whiteList
;
}
public
void
setWhiteList
(
List
<
String
>
whiteList
)
{
this
.
whiteList
=
whiteList
;
}
}
src/main/java/com/edgec/browserbackend/account/dto/AccountResultDto.java
0 → 100644
View file @
e50e6d53
package
com
.
edgec
.
browserbackend
.
account
.
dto
;
import
java.util.Map
;
public
class
AccountResultDto
{
private
int
status
;
private
Map
<
String
,
Object
>
statusInfo
;
private
Object
data
;
public
int
getStatus
()
{
return
status
;
}
public
void
setData
(
Object
data
)
{
this
.
data
=
data
;
}
public
Map
<
String
,
Object
>
getStatusInfo
()
{
return
statusInfo
;
}
public
void
setStatus
(
int
status
)
{
this
.
status
=
status
;
}
public
Object
getData
()
{
return
data
;
}
public
void
setStatusInfo
(
Map
<
String
,
Object
>
statusInfo
)
{
this
.
statusInfo
=
statusInfo
;
}
}
src/main/java/com/edgec/browserbackend/account/service/AccountService.java
View file @
e50e6d53
package
com
.
edgec
.
browserbackend
.
account
.
service
;
import
com.edgec.browserbackend.account.domain.*
;
import
com.edgec.browserbackend.account.dto.AccountResultDto
;
import
com.edgec.browserbackend.account.dto.BillQueryCriteriaDto
;
import
org.springframework.data.domain.Page
;
import
org.springframework.data.domain.Pageable
;
...
...
@@ -16,7 +17,7 @@ public interface AccountService {
* @param accountName
* @return found account
*/
Account
findByName
(
String
accountName
);
Account
ResultDto
findByName
(
String
accountName
);
/**
* Checks if account with the same name already exists
...
...
@@ -86,8 +87,6 @@ public interface AccountService {
Page
<
Account
>
listAccountBySingupDate
(
Pageable
pageable
,
Date
beginDate
,
Date
endDate
);
Account
findByName
(
String
accountName
,
boolean
isVpsUser
);
List
<
UserBillList
>
findOverviewByYearAndMonth
(
String
username
,
int
year
,
int
mont
,
String
zoneId
,
Services
service
);
IpChargeResultDto
preOrder
(
String
userName
,
IpChargeRequestDto
requestDto
);
...
...
src/main/java/com/edgec/browserbackend/account/service/impl/AccountServiceImpl.java
View file @
e50e6d53
package
com
.
edgec
.
browserbackend
.
account
.
service
.
impl
;
import
com.alibaba.fastjson.JSONObject
;
import
com.edgec.browserbackend.account.dto.AccountResultDto
;
import
com.edgec.browserbackend.account.dto.CvmChargeRegion
;
import
com.edgec.browserbackend.account.service.AccountService
;
import
com.edgec.browserbackend.account.service.PaymentService
;
...
...
@@ -486,16 +487,34 @@ public class AccountServiceImpl implements AccountService {
* {@inheritDoc}
*/
@Override
public
Account
findByName
(
String
accountName
)
{
public
Account
ResultDto
findByName
(
String
accountName
)
{
Assert
.
hasLength
(
accountName
);
AccountResultDto
accountResultDto
=
new
AccountResultDto
();
try
{
Account
account
=
repository
.
findByName
(
accountName
);
if
(
account
==
null
)
{
return
null
;
accountResultDto
.
setStatus
(-
1
);
Map
<
String
,
Object
>
statusInfo
=
new
HashMap
<>();
statusInfo
.
put
(
"code"
,
AccountErrorCode
.
NAMENOTEXIST
);
statusInfo
.
put
(
"message"
,
(
new
ClientRequestException
(
AccountErrorCode
.
NAMENOTEXIST
)).
getMessage
());
accountResultDto
.
setStatusInfo
(
statusInfo
);
}
if
(
StringUtils
.
isEmpty
(
account
.
getParent
()))
{
account
.
setAllowedToCreateSubUser
(
true
);
}
return
account
;
Optional
<
UserBalance
>
userBalance
=
userBalanceRepository
.
findById
(
accountName
);
AccountDto
accountDto
=
new
AccountDto
(
account
);
accountDto
.
setBalance
((
int
)
userBalance
.
get
().
getBalanced
());
accountResultDto
.
setStatus
(
0
);
accountResultDto
.
setData
(
accountDto
);
}
catch
(
Exception
e
)
{
accountResultDto
.
setStatus
(-
1
);
Map
<
String
,
Object
>
statusInfo
=
new
HashMap
<>();
statusInfo
.
put
(
"code"
,
AccountErrorCode
.
NAMENOTEXIST
);
statusInfo
.
put
(
"message"
,
(
new
ClientRequestException
(
AccountErrorCode
.
NAMENOTEXIST
)).
getMessage
());
accountResultDto
.
setStatusInfo
(
statusInfo
);
}
return
accountResultDto
;
}
...
...
@@ -600,10 +619,10 @@ public class AccountServiceImpl implements AccountService {
if
(
StringUtils
.
isEmpty
(
parentName
))
{
account
.
setAllowedToCreateSubUser
(
true
);
account
.
set
HasOperationRight
(
true
);
account
.
set
Permission
(
Integer
.
valueOf
(
"1111"
,
2
)
);
}
else
{
account
.
setAllowedToCreateSubUser
(
user
.
isAllowedToCreateSubUser
());
account
.
set
HasOperationRight
(
user
.
isHasOperationRight
());
account
.
set
Permission
(
user
.
getPermission
());
}
account
.
setParent
(
parentName
);
...
...
@@ -707,7 +726,7 @@ public class AccountServiceImpl implements AccountService {
authUser
.
setPhone
(
user
.
getPhoneNumber
());
authUser
.
setEmail
(
user
.
getEmail
());
authUser
.
setEnabled
(
true
);
authUser
.
set
HasOperationRight
(
user
.
isHasOperationRight
());
authUser
.
set
Permission
(
user
.
getPermission
());
userAuthService
.
create
(
new
com
.
edgec
.
browserbackend
.
auth
.
domain
.
User
(
authUser
));
Account
account
=
new
Account
(
user
);
...
...
@@ -731,7 +750,7 @@ public class AccountServiceImpl implements AccountService {
childAccount
.
setPhoneNumber
(
user
.
getPhoneNumber
());
childAccount
.
setJobTitle
(
user
.
getJobTitle
());
childAccount
.
setCompanyName
(
user
.
getCompanyName
());
childAccount
.
set
HasOperationRight
(
user
.
isHasOperationRight
());
childAccount
.
set
Permission
(
user
.
getPermission
());
repository
.
save
(
childAccount
);
return
childAccount
;
}
...
...
@@ -752,7 +771,7 @@ public class AccountServiceImpl implements AccountService {
account
.
setJobTitle
(
update
.
getJobTitle
());
// account.setPhoneNumber(update.getPhoneNumber());
account
.
setEmail
(
update
.
getEmail
());
account
.
set
HasOperationRight
(
update
.
isHasOperationRight
());
account
.
set
Permission
(
update
.
getPermission
());
log
.
debug
(
"account {} changes has been saved"
,
name
);
if
(!
org
.
apache
.
commons
.
lang3
.
StringUtils
.
equalsIgnoreCase
(
preEmail
,
update
.
getEmail
()))
{
Account
account1
=
repository
.
findByEmail
(
update
.
getEmail
());
...
...
@@ -928,11 +947,6 @@ public class AccountServiceImpl implements AccountService {
return
repository
.
findAllBySignupDateBetween
(
pageable
,
beginDate
,
endDate
);
}
@Override
public
Account
findByName
(
String
accountName
,
boolean
isVpsUser
)
{
return
repository
.
findByName
(
accountName
);
}
@Override
public
List
<
UserBillList
>
findOverviewByYearAndMonth
(
String
username
,
int
year
,
int
month
,
String
zoneId
,
Services
service
)
{
List
<
UserBillList
>
userBillLists
=
new
ArrayList
<>();
...
...
src/main/java/com/edgec/browserbackend/browser/controller/ShopController.java
0 → 100644
View file @
e50e6d53
package
com
.
edgec
.
browserbackend
.
browser
.
controller
;
import
org.springframework.web.bind.annotation.RestController
;
@RestController
public
class
ShopController
{
}
src/main/java/com/edgec/browserbackend/browser/service/Impl/ShopServiceImpl.java
0 → 100644
View file @
e50e6d53
package
com
.
edgec
.
browserbackend
.
browser
.
service
.
Impl
;
import
com.edgec.browserbackend.browser.service.ShopService
;
public
class
ShopServiceImpl
implements
ShopService
{
}
src/main/java/com/edgec/browserbackend/browser/service/ShopService.java
0 → 100644
View file @
e50e6d53
package
com
.
edgec
.
browserbackend
.
browser
.
service
;
public
interface
ShopService
{
}
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