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
16abe225
Commit
16abe225
authored
Jun 06, 2020
by
jim
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
log
parent
9a6088da
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
10 additions
and
14 deletions
+10
-14
AccountController.java
.../browserbackend/account/controller/AccountController.java
+10
-14
No files found.
src/main/java/com/edgec/browserbackend/account/controller/AccountController.java
View file @
16abe225
...
@@ -2,16 +2,15 @@ package com.edgec.browserbackend.account.controller;
...
@@ -2,16 +2,15 @@ package com.edgec.browserbackend.account.controller;
import
com.edgec.browserbackend.account.domain.*
;
import
com.edgec.browserbackend.account.domain.*
;
import
com.edgec.browserbackend.account.dto.*
;
import
com.edgec.browserbackend.account.dto.*
;
import
com.edgec.browserbackend.account.service.AccountService
;
import
com.edgec.browserbackend.account.service.EmailService
;
import
com.edgec.browserbackend.account.service.PaymentService
;
import
com.edgec.browserbackend.alipay.AlipayConfig
;
import
com.edgec.browserbackend.alipay.AlipayConfig
;
import
com.edgec.browserbackend.alipay.AlipaySubmit
;
import
com.edgec.browserbackend.alipay.VpsAlipayConfig
;
import
com.edgec.browserbackend.alipay.VpsAlipayConfig
;
import
com.edgec.browserbackend.browser.ErrorCode.BrowserErrorCode
;
import
com.edgec.browserbackend.browser.ErrorCode.BrowserErrorCode
;
import
com.edgec.browserbackend.common.auth.Securitys
;
import
com.edgec.browserbackend.common.auth.Securitys
;
import
com.edgec.browserbackend.common.commons.error.ClientRequestException
;
import
com.edgec.browserbackend.common.commons.error.ClientRequestException
;
import
com.edgec.browserbackend.common.commons.utils.DateConverter
;
import
com.edgec.browserbackend.common.commons.utils.DateConverter
;
import
com.edgec.browserbackend.account.service.AccountService
;
import
com.edgec.browserbackend.account.service.EmailService
;
import
com.edgec.browserbackend.account.service.PaymentService
;
import
org.apache.commons.lang3.StringUtils
;
import
org.apache.commons.lang3.StringUtils
;
import
org.apache.commons.lang3.time.DateUtils
;
import
org.apache.commons.lang3.time.DateUtils
;
import
org.slf4j.Logger
;
import
org.slf4j.Logger
;
...
@@ -27,10 +26,6 @@ import org.springframework.web.multipart.MultipartFile;
...
@@ -27,10 +26,6 @@ import org.springframework.web.multipart.MultipartFile;
import
javax.servlet.http.HttpServletRequest
;
import
javax.servlet.http.HttpServletRequest
;
import
javax.servlet.http.HttpServletResponse
;
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.time.ZoneOffset
;
import
java.time.ZoneOffset
;
import
java.time.ZonedDateTime
;
import
java.time.ZonedDateTime
;
...
@@ -123,6 +118,7 @@ public class AccountController {
...
@@ -123,6 +118,7 @@ public class AccountController {
accountService
.
sendSmsOtp
(
mobile
.
getMobile
());
accountService
.
sendSmsOtp
(
mobile
.
getMobile
());
resultDto
.
setStatus
(
0
);
resultDto
.
setStatus
(
0
);
}
catch
(
ClientRequestException
e
)
{
}
catch
(
ClientRequestException
e
)
{
logger
.
error
(
"fail to send sms"
,
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
());
...
@@ -225,7 +221,7 @@ public class AccountController {
...
@@ -225,7 +221,7 @@ public class AccountController {
try
{
try
{
accountService
.
resetPassword
(
principal
.
getName
(),
user
);
accountService
.
resetPassword
(
principal
.
getName
(),
user
);
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
());
...
@@ -246,7 +242,7 @@ public class AccountController {
...
@@ -246,7 +242,7 @@ public class AccountController {
try
{
try
{
accountService
.
resetPasswordWithOtp
(
user
);
accountService
.
resetPasswordWithOtp
(
user
);
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
());
...
@@ -399,7 +395,7 @@ public class AccountController {
...
@@ -399,7 +395,7 @@ public class AccountController {
}
}
@RequestMapping
(
path
=
"/preorder/delete/{username}"
,
method
=
RequestMethod
.
POST
)
@RequestMapping
(
path
=
"/preorder/delete/{username}"
,
method
=
RequestMethod
.
POST
)
public
String
deletePreOrder
(
@PathVariable
(
"username"
)
String
username
)
{
public
String
deletePreOrder
(
@PathVariable
(
"username"
)
String
username
)
{
return
accountService
.
deletePreOrder
(
username
);
return
accountService
.
deletePreOrder
(
username
);
}
}
...
@@ -439,7 +435,7 @@ public class AccountController {
...
@@ -439,7 +435,7 @@ public class AccountController {
}
}
accountService
.
authorizeCompany
(
principal
.
getName
(),
companyAuthorizeDto
);
accountService
.
authorizeCompany
(
principal
.
getName
(),
companyAuthorizeDto
);
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
());
...
@@ -450,14 +446,14 @@ public class AccountController {
...
@@ -450,14 +446,14 @@ public class AccountController {
}
}
@RequestMapping
(
path
=
"/ali/login"
,
method
=
RequestMethod
.
GET
)
@RequestMapping
(
path
=
"/ali/login"
,
method
=
RequestMethod
.
GET
)
public
String
save
(
HttpServletRequest
request
,
HttpServletResponse
response
)
{
public
String
save
(
HttpServletRequest
request
,
HttpServletResponse
response
)
{
//页面回调地址 必须与应用中的设置一样
//页面回调地址 必须与应用中的设置一样
String
return_url
=
"http://https://www.fangguanlian.cn/ali/withdraw"
;
String
return_url
=
"http://https://www.fangguanlian.cn/ali/withdraw"
;
//回调地址必须经encode
//回调地址必须经encode
return_url
=
java
.
net
.
URLEncoder
.
encode
(
return_url
);
return_url
=
java
.
net
.
URLEncoder
.
encode
(
return_url
);
//重定向到授权页面
//重定向到授权页面
AlipayConfig
alipayConfig
=
new
VpsAlipayConfig
();
AlipayConfig
alipayConfig
=
new
VpsAlipayConfig
();
return
"redirect:"
+
VpsAlipayConfig
.
ALIPAY_AUTH_URL
+
"?app_id="
+
alipayConfig
.
getAPPID
()
+
"&scope=auth_user&redirect_uri="
+
return_url
;
return
"redirect:"
+
VpsAlipayConfig
.
ALIPAY_AUTH_URL
+
"?app_id="
+
alipayConfig
.
getAPPID
()
+
"&scope=auth_user&redirect_uri="
+
return_url
;
}
}
@RequestMapping
(
path
=
"/ali/withdraw"
,
method
=
RequestMethod
.
PUT
)
@RequestMapping
(
path
=
"/ali/withdraw"
,
method
=
RequestMethod
.
PUT
)
...
...
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