Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
E
extend
Overview
Overview
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
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
park
extend
Commits
60865501
Commit
60865501
authored
Jul 23, 2020
by
lixian7
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'feature-20200720' into 'dev'
Feature 20200720 See merge request
!32
parents
84f06468
40e3697f
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
15 additions
and
17 deletions
+15
-17
api/src/main/java/com/hikcreate/edl/pub/web/mobile/api/controller/BindInfoControlller.java
+11
-13
api/src/main/java/com/hikcreate/edl/pub/web/mobile/api/controller/H5Controller.java
+3
-3
api/src/main/java/com/hikcreate/edl/pub/web/mobile/api/exception/GlobalExceptionHandler.java
+1
-1
No files found.
api/src/main/java/com/hikcreate/edl/pub/web/mobile/api/controller/BindInfoControlller.java
View file @
60865501
...
@@ -57,10 +57,11 @@ public class BindInfoControlller extends BaseController {
...
@@ -57,10 +57,11 @@ public class BindInfoControlller extends BaseController {
}
catch
(
DistributedLockException
e
)
{
}
catch
(
DistributedLockException
e
)
{
log
.
error
(
"分布式锁超时"
);
log
.
error
(
"分布式锁超时"
);
return
ResultGenerator
.
fail
(
StatusCode
.
REPEAT_SUBMIT
);
return
ResultGenerator
.
fail
(
StatusCode
.
REPEAT_SUBMIT
);
}
catch
(
Exception
e
)
{
log
.
error
(
"系统异常:{}"
,
e
);
return
ResultGenerator
.
fail
(
StatusCode
.
SYSTEM_ERROR
);
}
}
// catch ( Exception e ) {
// log.error("系统异常:{}", e);
// return ResultGenerator.fail(StatusCode.SYSTEM_ERROR);
// }
return
response
;
return
response
;
}
}
...
@@ -73,7 +74,13 @@ public class BindInfoControlller extends BaseController {
...
@@ -73,7 +74,13 @@ public class BindInfoControlller extends BaseController {
@BodyDecryptAnnotation
@BodyDecryptAnnotation
@ResponseEncryptAnnotation
@ResponseEncryptAnnotation
public
Result
<
BindInfoRes
>
bindSmsValid
(
@RequestBody
@Validated
BindSmsValidReq
req
)
{
public
Result
<
BindInfoRes
>
bindSmsValid
(
@RequestBody
@Validated
BindSmsValidReq
req
)
{
return
service
.
bindSmsValid
(
req
);
Result
result
=
null
;
try
{
result
=
service
.
bindSmsValid
(
req
);
}
catch
(
DistributedLockException
e
)
{
return
ResultGenerator
.
fail
(
StatusCode
.
REPEAT_SUBMIT
);
}
return
result
;
}
}
...
@@ -94,9 +101,6 @@ public class BindInfoControlller extends BaseController {
...
@@ -94,9 +101,6 @@ public class BindInfoControlller extends BaseController {
result
=
service
.
unbindInfo
(
req
);
result
=
service
.
unbindInfo
(
req
);
}
catch
(
DistributedLockException
e
)
{
}
catch
(
DistributedLockException
e
)
{
return
ResultGenerator
.
fail
(
StatusCode
.
REPEAT_SUBMIT
);
return
ResultGenerator
.
fail
(
StatusCode
.
REPEAT_SUBMIT
);
}
catch
(
Exception
e
)
{
log
.
error
(
"系统异常:{}"
,
e
);
return
ResultGenerator
.
fail
(
StatusCode
.
SYSTEM_ERROR
);
}
}
return
result
;
return
result
;
}
}
...
@@ -115,9 +119,6 @@ public class BindInfoControlller extends BaseController {
...
@@ -115,9 +119,6 @@ public class BindInfoControlller extends BaseController {
result
=
service
.
adminUnbind
(
req
);
result
=
service
.
adminUnbind
(
req
);
}
catch
(
DistributedLockException
e
)
{
}
catch
(
DistributedLockException
e
)
{
return
ResultGenerator
.
fail
(
StatusCode
.
REPEAT_SUBMIT
);
return
ResultGenerator
.
fail
(
StatusCode
.
REPEAT_SUBMIT
);
}
catch
(
Exception
e
)
{
log
.
error
(
"系统异常:{}"
,
e
);
return
ResultGenerator
.
fail
(
StatusCode
.
SYSTEM_ERROR
);
}
}
return
result
;
return
result
;
}
}
...
@@ -136,9 +137,6 @@ public class BindInfoControlller extends BaseController {
...
@@ -136,9 +137,6 @@ public class BindInfoControlller extends BaseController {
result
=
service
.
adminUnbindSmsValid
(
req
);
result
=
service
.
adminUnbindSmsValid
(
req
);
}
catch
(
DistributedLockException
e
)
{
}
catch
(
DistributedLockException
e
)
{
return
ResultGenerator
.
fail
(
StatusCode
.
REPEAT_SUBMIT
);
return
ResultGenerator
.
fail
(
StatusCode
.
REPEAT_SUBMIT
);
}
catch
(
Exception
e
)
{
log
.
error
(
"系统异常:{}"
,
e
);
return
ResultGenerator
.
fail
(
StatusCode
.
SYSTEM_ERROR
);
}
}
return
result
;
return
result
;
}
}
...
...
api/src/main/java/com/hikcreate/edl/pub/web/mobile/api/controller/H5Controller.java
View file @
60865501
...
@@ -120,7 +120,7 @@ public class H5Controller {
...
@@ -120,7 +120,7 @@ public class H5Controller {
}
}
/**
/**
* 验证当前手机号是否在1天内,已通过验证
*
【驾照信息查询】
验证当前手机号是否在1天内,已通过验证
*
*
* @param query
* @param query
* @return
* @return
...
@@ -143,7 +143,7 @@ public class H5Controller {
...
@@ -143,7 +143,7 @@ public class H5Controller {
}
}
/***
/***
* 发送短信验证码
*
【驾照信息查询】
发送短信验证码
*
*
* @param req
* @param req
* @return Result
* @return Result
...
@@ -161,7 +161,7 @@ public class H5Controller {
...
@@ -161,7 +161,7 @@ public class H5Controller {
}
}
/**
/**
* 校验短信验证码
*
【驾照信息查询】
校验短信验证码
*
*
* @param req
* @param req
* @return Result
* @return Result
...
...
api/src/main/java/com/hikcreate/edl/pub/web/mobile/api/exception/GlobalExceptionHandler.java
View file @
60865501
...
@@ -90,7 +90,7 @@ public class GlobalExceptionHandler {
...
@@ -90,7 +90,7 @@ public class GlobalExceptionHandler {
@ExceptionHandler
({
BusinessException
.
class
})
@ExceptionHandler
({
BusinessException
.
class
})
@ResponseBody
@ResponseBody
public
Response
<
Object
>
handle
(
BusinessException
e
)
{
public
Response
<
Object
>
handle
(
BusinessException
e
)
{
log
.
warn
(
e
.
toString
(),
e
);
log
.
error
(
e
.
toString
(),
e
);
return
ResponseGenerator
.
fail
(
e
.
getCode
(),
e
.
getMsg
(),
e
.
getErrorMsg
(),
e
.
getParam
());
return
ResponseGenerator
.
fail
(
e
.
getCode
(),
e
.
getMsg
(),
e
.
getErrorMsg
(),
e
.
getParam
());
}
}
...
...
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