From 87bc44f9b55d9392389338b99e4049d0451092a4 Mon Sep 17 00:00:00 2001
From: liuxm <liuxm@fescotech.com>
Date: 星期三, 24 四月 2024 17:02:57 +0800
Subject: [PATCH] 日志注解修改;BindingResult顺序调整
---
pms-parent/pms-web-base/src/main/java/com/dy/pmsBase/log/LogCtrl.java | 6 +++---
pms-parent/pms-web-base/src/main/java/com/dy/pmsBase/user/UserCtrl.java | 3 +--
pms-parent/pms-web-base/src/main/java/com/dy/pmsBase/role/RoleCtrl.java | 9 ++++-----
pms-parent/pms-web-sso/src/main/java/com/dy/sso/busi/SsoCtrl.java | 13 ++++++-------
4 files changed, 14 insertions(+), 17 deletions(-)
diff --git a/pms-parent/pms-web-base/src/main/java/com/dy/pmsBase/log/LogCtrl.java b/pms-parent/pms-web-base/src/main/java/com/dy/pmsBase/log/LogCtrl.java
index 7a1fb2c..1fef093 100644
--- a/pms-parent/pms-web-base/src/main/java/com/dy/pmsBase/log/LogCtrl.java
+++ b/pms-parent/pms-web-base/src/main/java/com/dy/pmsBase/log/LogCtrl.java
@@ -41,18 +41,18 @@
}
/**
- * 鍒嗛〉鏌ヨ鏃ュ織
+ * 鏌ヨ鏃ュ織
* @return
*/
@PostMapping(path = "some", consumes = MediaType.APPLICATION_JSON_VALUE)
@SsoPowerAop(power = "10100010") //鐧诲綍涓庢潈闄愬悓鏃堕獙璇�
- @Log("鍒嗛〉鏌ヨ鏃ュ織")
+ @Log("鏌ヨ鏃ュ織")
public BaseResponse<QueryResultVo<List<BaLog>>> some(@RequestBody QueryVo vo){
try {
QueryResultVo<List<BaLog>> res = sv.selectSome(vo);
return BaseResponseUtils.buildSuccess(res);
} catch (Exception e) {
- log.error("鍒嗛〉鏌ヨ鏃ュ織寮傚父", e);
+ log.error("鏌ヨ鏃ュ織寮傚父", e);
return BaseResponseUtils.buildException(e.getMessage());
}
}
diff --git a/pms-parent/pms-web-base/src/main/java/com/dy/pmsBase/role/RoleCtrl.java b/pms-parent/pms-web-base/src/main/java/com/dy/pmsBase/role/RoleCtrl.java
index cb14cc5..5ead477 100644
--- a/pms-parent/pms-web-base/src/main/java/com/dy/pmsBase/role/RoleCtrl.java
+++ b/pms-parent/pms-web-base/src/main/java/com/dy/pmsBase/role/RoleCtrl.java
@@ -71,13 +71,12 @@
/**
* 鍒犻櫎瑙掕壊淇℃伅
* @param id
- * @param bindingResult
* @return
*/
@PostMapping(path="delete")
@SsoPowerAop(power = "10100011")
@Log("鍒犻櫎瑙掕壊淇℃伅")
- public BaseResponse<BaRole> delete(String id,BindingResult bindingResult){
+ public BaseResponse<BaRole> delete(String id){
try {
return BaseResponseUtils.buildSuccess(roleSv.delete(Long.parseLong(id)));
}catch (Exception e){
@@ -105,19 +104,19 @@
}
/**
- * 鍒嗛〉鏌ヨ瑙掕壊淇℃伅
+ * 鏌ヨ瑙掕壊淇℃伅
* @param vo
* @return
*/
@PostMapping(path="some")
@SsoPowerAop(power = "10100010")
- @Log("鍒嗛〉鏌ヨ瑙掕壊淇℃伅")
+ @Log("鏌ヨ瑙掕壊淇℃伅")
public BaseResponse<QueryResultVo<List<BaRole>>> some(@RequestBody QueryVo vo){
try {
QueryResultVo<List<BaRole>> list = roleSv.selectSome(vo) ;
return BaseResponseUtils.buildSuccess(list);
}catch (Exception e){
- log.error("鍒嗛〉鏌ヨ瑙掕壊寮傚父", e);
+ log.error("鏌ヨ瑙掕壊寮傚父", e);
return BaseResponseUtils.buildException(e.getMessage());
}
}
diff --git a/pms-parent/pms-web-base/src/main/java/com/dy/pmsBase/user/UserCtrl.java b/pms-parent/pms-web-base/src/main/java/com/dy/pmsBase/user/UserCtrl.java
index 5cc283c..0c8796c 100644
--- a/pms-parent/pms-web-base/src/main/java/com/dy/pmsBase/user/UserCtrl.java
+++ b/pms-parent/pms-web-base/src/main/java/com/dy/pmsBase/user/UserCtrl.java
@@ -45,7 +45,6 @@
* @return 榛樿瀵嗙爜
*/
@GetMapping(path = "defaultPassword")
- @Log("瀹㈡埛绔姹傚緱鍒伴粯璁ゅ瘑鐮�")
public BaseResponse<String> defaultPassword(){
if(defaultTrueRandomFalsePassword){
return BaseResponseUtils.buildSuccess(defaultPassword) ;
@@ -62,7 +61,7 @@
@PostMapping(path = "some", consumes = MediaType.APPLICATION_JSON_VALUE)
//@SsoAop() //鍙湁鐧诲綍楠岃瘉锛屾病鏈夋潈闄愰獙璇�
@SsoPowerAop(power = "10100010") //鐧诲綍涓庢潈闄愬悓鏃堕獙璇�
- @Log("鍒嗛〉鏌ヨ鐢ㄦ埛")
+ @Log("鏌ヨ鐢ㄦ埛")
public BaseResponse<QueryResultVo<List<BaUser>>> some(@RequestBody QueryVo vo) {
try {
QueryResultVo<List<BaUser>> res = this.sv.selectSome(vo);
diff --git a/pms-parent/pms-web-sso/src/main/java/com/dy/sso/busi/SsoCtrl.java b/pms-parent/pms-web-sso/src/main/java/com/dy/sso/busi/SsoCtrl.java
index 35026d1..8e93c9c 100644
--- a/pms-parent/pms-web-sso/src/main/java/com/dy/sso/busi/SsoCtrl.java
+++ b/pms-parent/pms-web-sso/src/main/java/com/dy/sso/busi/SsoCtrl.java
@@ -54,9 +54,8 @@
*/
@PostMapping(path = "login", consumes = MediaType.APPLICATION_JSON_VALUE)//鍓嶇鎻愪氦json鏁版嵁
@Log("鐢ㄦ埛鐧诲綍(json)")
- public BaseResponse<UserVo> login(@RequestBody @Valid LoginVo vo,
- HttpSession session,
- BindingResult bindingResult) {
+ public BaseResponse<UserVo> login(@RequestBody @Valid LoginVo vo,BindingResult bindingResult,
+ HttpSession session) {
try {
if(bindingResult != null && bindingResult.hasErrors()){
return BaseResponseUtils.buildFail(Objects.requireNonNull(bindingResult.getFieldError()).getDefaultMessage());
@@ -80,12 +79,12 @@
/**
* 瀹㈡埛绔姹傜敤鎴风櫥褰曪紝瀹㈡埛绔彁浜orm琛ㄥ崟
- * @param vo 鐧诲綍鐢ㄦ埛form琛ㄥ崟瀵硅薄
+ * @param loginVo 鐧诲綍鐢ㄦ埛form琛ㄥ崟瀵硅薄
* @return 鐧诲綍鐢ㄦ埛鍊煎璞�
*/
@PostMapping(path = "loginForm", consumes = MediaType.MULTIPART_FORM_DATA_VALUE)//鍓嶇鎻愪氦form琛ㄥ崟鏁版嵁
@Log("鐢ㄦ埛鐧诲綍(form)")
- public BaseResponse<UserVo> loginForm(@RequestBody @Valid LoginVo vo, HttpSession session,BindingResult bindingResult){
+ public BaseResponse<UserVo> loginForm(@Valid LoginVo loginVo, BindingResult bindingResult,HttpSession session){
try{
if(bindingResult != null && bindingResult.hasErrors()){
return BaseResponseUtils.buildFail(Objects.requireNonNull(bindingResult.getFieldError()).getDefaultMessage());
@@ -93,9 +92,9 @@
// 浠嶴ession涓幏鍙栦繚瀛樼殑楠岃瘉鐮�
String sessionCaptcha = (String) session.getAttribute("captcha");
// 棣栧厛楠岃瘉楠岃瘉鐮�
- if (vo.captcha != null && vo.captcha.equalsIgnoreCase(sessionCaptcha)) {
+ if (loginVo.captcha != null && loginVo.captcha.equalsIgnoreCase(sessionCaptcha)) {
session.removeAttribute("captcha");
- return this.doLogin(vo) ;
+ return this.doLogin(loginVo) ;
} else {
// 楠岃瘉鐮侀敊璇紝杩斿洖鐧诲綍椤甸潰骞舵樉绀洪敊璇俊鎭�
return BaseResponseUtils.buildFail("楠岃瘉鐮侀敊璇�");
--
Gitblit v1.8.0