From f823fa4a9283debfa7cb6d79fc1f3c7099f9b3ae Mon Sep 17 00:00:00 2001
From: liuxm <liuxm_a@163.com>
Date: 星期四, 13 六月 2024 14:22:55 +0800
Subject: [PATCH] 去掉原controller中的try catch 和BindingResult
---
pms-parent/pms-web-base/src/main/java/com/dy/pmsBase/log/LogCtrl.java | 16 -
pms-parent/pms-web-base/src/main/java/com/dy/pmsBase/privilege/PrivilegeCtrl.java | 14 -
pms-parent/pms-web-base/src/main/java/com/dy/pmsBase/user/UserSv.java | 16 ++
pms-parent/pms-web-base/src/main/java/com/dy/pmsBase/MarkQrCode/MarkQrCodeCtrl.java | 51 +++----
pms-parent/pms-web-base/src/main/java/com/dy/pmsBase/user/UserCtrl.java | 156 +++++++--------------
pms-parent/pms-web-base/src/main/java/com/dy/pmsBase/role/RoleCtrl.java | 79 ++--------
pms-parent/pms-web-sso/src/main/java/com/dy/sso/busi/SsoCtrl.java | 79 +++-------
7 files changed, 135 insertions(+), 276 deletions(-)
diff --git a/pms-parent/pms-web-base/src/main/java/com/dy/pmsBase/MarkQrCode/MarkQrCodeCtrl.java b/pms-parent/pms-web-base/src/main/java/com/dy/pmsBase/MarkQrCode/MarkQrCodeCtrl.java
index e9655a4..2998548 100644
--- a/pms-parent/pms-web-base/src/main/java/com/dy/pmsBase/MarkQrCode/MarkQrCodeCtrl.java
+++ b/pms-parent/pms-web-base/src/main/java/com/dy/pmsBase/MarkQrCode/MarkQrCodeCtrl.java
@@ -33,23 +33,18 @@
* @return
*/
@GetMapping(path = "show")
- public BaseResponse<List<ResultVo>> show() {
- try{
- List<ResultVo> list = new ArrayList<>() ;
- String[][] marks = QrCodeConstant.Marks() ;
- for(String[] mark : marks){
- ResultVo vo = new ResultVo() ;
- vo.code = mark[0] ;
- vo.name = mark[1] ;
- byte[] codes = QrCodeUtil.genQrCode(vo.code);
- vo.imgBase64 = "data:image/jpeg;base64," + Base64.encode(codes);
- list.add(vo) ;
- }
- return BaseResponseUtils.buildSuccess(list);
- }catch (Exception e){
- log.error("鐢熸垚鏍囪瘑绫讳簩缁寸爜鏃跺紓甯�", e);
- return BaseResponseUtils.buildException(e.getMessage());
+ public BaseResponse<List<ResultVo>> show() throws Exception{
+ List<ResultVo> list = new ArrayList<>() ;
+ String[][] marks = QrCodeConstant.Marks() ;
+ for(String[] mark : marks){
+ ResultVo vo = new ResultVo() ;
+ vo.code = mark[0] ;
+ vo.name = mark[1] ;
+ byte[] codes = QrCodeUtil.genQrCode(vo.code);
+ vo.imgBase64 = "data:image/jpeg;base64," + Base64.encode(codes);
+ list.add(vo) ;
}
+ return BaseResponseUtils.buildSuccess(list);
}
/**
@@ -57,20 +52,16 @@
* @return
*/
@GetMapping(path = "download")
- public void download(HttpServletResponse response){
- try{
- List<Converter> list = new ArrayList<>() ;
- String[][] marks = QrCodeConstant.Marks() ;
- for(String[] mark : marks){
- ExcelVo vo = new ExcelVo() ;
- vo.code = mark[0] ;
- vo.name = mark[1] ;
- vo.image = QrCodeUtil.genQrCode(vo.code);
- list.add(vo) ;
- }
- QrCodeUtil.downloadExcel(response, fileName, sheetName, list);
- }catch (Exception e){
- log.error("涓嬭浇鏍囪瘑绫讳簩缁寸爜鏃跺紓甯�", e);
+ public void download(HttpServletResponse response) throws Exception{
+ List<Converter> list = new ArrayList<>() ;
+ String[][] marks = QrCodeConstant.Marks() ;
+ for(String[] mark : marks){
+ ExcelVo vo = new ExcelVo() ;
+ vo.code = mark[0] ;
+ vo.name = mark[1] ;
+ vo.image = QrCodeUtil.genQrCode(vo.code);
+ list.add(vo) ;
}
+ QrCodeUtil.downloadExcel(response, fileName, sheetName, list);
}
}
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 5ce0987..7a7aea9 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
@@ -33,12 +33,7 @@
@SsoPowerAop(power = "10100006") //鐧诲綍涓庢潈闄愬悓鏃堕獙璇�
@Log("鏌ヨ鍗曟潯鏃ュ織")
public BaseResponse<BaLog> one(String id){
- try {
- return BaseResponseUtils.buildSuccess(sv.selectById(Long.parseLong(id)));
- } catch (Exception e) {
- log.error("鏌ヨ鍗曟潯鏃ュ織鏁版嵁寮傚父", e);
- return BaseResponseUtils.buildException(e.getMessage());
- }
+ return BaseResponseUtils.buildSuccess(sv.selectById(Long.parseLong(id)));
}
/**
@@ -49,13 +44,8 @@
@SsoPowerAop(power = "10100006") //鐧诲綍涓庢潈闄愬悓鏃堕獙璇�
@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);
- return BaseResponseUtils.buildException(e.getMessage());
- }
+ QueryResultVo<List<BaLog>> res = sv.selectSome(vo);
+ return BaseResponseUtils.buildSuccess(res);
}
}
diff --git a/pms-parent/pms-web-base/src/main/java/com/dy/pmsBase/privilege/PrivilegeCtrl.java b/pms-parent/pms-web-base/src/main/java/com/dy/pmsBase/privilege/PrivilegeCtrl.java
index e07e8c7..21523b2 100644
--- a/pms-parent/pms-web-base/src/main/java/com/dy/pmsBase/privilege/PrivilegeCtrl.java
+++ b/pms-parent/pms-web-base/src/main/java/com/dy/pmsBase/privilege/PrivilegeCtrl.java
@@ -38,12 +38,7 @@
@GetMapping(path="getByType")
@SsoPowerAop(power = "10100004")
public BaseResponse<List<Map<String, Object>>> getByType(){
- try {
- return BaseResponseUtils.buildSuccess(sv.selectByType());
- }catch (Exception e){
- log.error("鍒嗙被鍨嬭幏鍙栨潈闄�",e);
- return BaseResponseUtils.buildException(e.getMessage());
- }
+ return BaseResponseUtils.buildSuccess(sv.selectByType());
}
/**
@@ -55,12 +50,7 @@
@SsoPowerAop(power = "10100004")
@Log("鏌ヨ鏉冮檺淇℃伅")
public BaseResponse<QueryResultVo<List<BaPrivilege>>> some(@RequestBody QueryVo vo){
- try {
- return BaseResponseUtils.buildSuccess(sv.selectSome(vo));
- }catch (Exception e){
- log.error("鍒嗛〉鑾峰彇鏉冮檺",e);
- return BaseResponseUtils.buildException(e.getMessage());
- }
+ return BaseResponseUtils.buildSuccess(sv.selectSome(vo));
}
}
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 409f9d5..3eb8dd5 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
@@ -10,11 +10,9 @@
import jakarta.validation.Valid;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.validation.BindingResult;
import org.springframework.web.bind.annotation.*;
import java.util.List;
-import java.util.Objects;
/**
* 瑙掕壊绠＄悊
@@ -33,25 +31,16 @@
/**
* 淇濆瓨瑙掕壊淇℃伅
* @param role
- * @param bindingResult
* @return
*/
@PostMapping(path="save")
@SsoPowerAop(power = "10100003")
@Log("淇濆瓨瑙掕壊淇℃伅")
- public BaseResponse<Boolean> save(@RequestBody @Valid BaRole role,BindingResult bindingResult){
+ public BaseResponse<Boolean> save(@RequestBody @Valid BaRole role){
int count;
- try {
- if (bindingResult != null && bindingResult.hasErrors()) {
- return BaseResponseUtils.buildFail(Objects.requireNonNull(bindingResult.getFieldError()).getDefaultMessage());
- }
- role.setDeleted(false);
- role.setDisabled(false);
- count = roleSv.save(role);
- }catch (Exception e){
- log.error("淇濆瓨瑙掕壊寮傚父", e);
- return BaseResponseUtils.buildException(e.getMessage());
- }
+ role.setDeleted(false);
+ role.setDisabled(false);
+ count = roleSv.save(role);
if (count <= 0) {
return BaseResponseUtils.buildFail("鏁版嵁搴撳瓨鍌ㄥけ璐�");
} else {
@@ -63,23 +52,14 @@
/**
* 鏇存柊瑙掕壊淇℃伅
* @param role
- * @param bindingResult
* @return
*/
@PostMapping(path="update")
@SsoPowerAop(power = "10100003")
@Log("鏇存柊瑙掕壊淇℃伅")
- public BaseResponse<BaRole> update(@RequestBody @Valid BaRole role,BindingResult bindingResult){
- int count;
- try {
- if (bindingResult != null && bindingResult.hasErrors()) {
- return BaseResponseUtils.buildFail(Objects.requireNonNull(bindingResult.getFieldError()).getDefaultMessage());
- }
- count = roleSv.update(role);
- }catch (Exception e){
- log.error("鏇存柊瑙掕壊寮傚父", e);
- return BaseResponseUtils.buildException(e.getMessage());
- }
+ public BaseResponse<BaRole> update(@RequestBody @Valid BaRole role){
+ int count = roleSv.update(role);
+
if (count <= 0) {
return BaseResponseUtils.buildFail("鏁版嵁搴撳瓨鍌ㄥけ璐�");
} else {
@@ -96,13 +76,8 @@
@SsoPowerAop(power = "10100003")
@Log("鍒犻櫎瑙掕壊淇℃伅")
public BaseResponse<Boolean> delete(String id){
- int count;
- try {
- count = roleSv.delete(Long.parseLong(id));
- }catch (Exception e){
- log.error("鍒犻櫎瑙掕壊寮傚父", e);
- return BaseResponseUtils.buildException(e.getMessage());
- }
+ int count = roleSv.delete(Long.parseLong(id));
+
if (count <= 0) {
return BaseResponseUtils.buildFail("鏁版嵁搴撳瓨鍌ㄥけ璐�");
} else {
@@ -119,13 +94,8 @@
@SsoPowerAop(power = "10100003")
@Log("绂佺敤鎴栧惎鐢ㄨ鑹蹭俊鎭�")
public BaseResponse<Boolean> disabled(@RequestBody BaRole role){
- int count;
- try {
- count = roleSv.disabled(role.id,role.disabled);
- }catch (Exception e){
- log.error("绂佺敤瑙掕壊寮傚父", e);
- return BaseResponseUtils.buildException(e.getMessage());
- }
+ int count = roleSv.disabled(role.id,role.disabled);
+
if (count <= 0) {
return BaseResponseUtils.buildFail("鏁版嵁搴撳瓨鍌ㄥけ璐�");
} else {
@@ -142,13 +112,8 @@
@SsoPowerAop(power = "10100004") //鐧诲綍涓庢潈闄愬悓鏃堕獙璇�
@Log("鏍规嵁ID鏌ヨ瑙掕壊淇℃伅")
public BaseResponse<BaRole> one(String id){
- try{
- BaRole role=roleSv.selectById(id);
- return BaseResponseUtils.buildSuccess(JSON.toJSON(role));
- }catch (Exception e){
- log.error("鏌ヨ瑙掕壊寮傚父", e);
- return BaseResponseUtils.buildException(e.getMessage());
- }
+ BaRole role=roleSv.selectById(id);
+ return BaseResponseUtils.buildSuccess(JSON.toJSON(role));
}
/**
@@ -159,13 +124,8 @@
@SsoPowerAop(power = "10100004") //鐧诲綍涓庢潈闄愬悓鏃堕獙璇�
@Log("鏌ヨ鎵�鏈夎鑹�")
public BaseResponse<List<BaRole>> all(String id){
- try{
- List<BaRole> roles=roleSv.selectAll();
- return BaseResponseUtils.buildSuccess(roles);
- }catch (Exception e){
- log.error("鏌ヨ鎵�鏈夎鑹插紓甯�", e);
- return BaseResponseUtils.buildException(e.getMessage());
- }
+ List<BaRole> roles=roleSv.selectAll();
+ return BaseResponseUtils.buildSuccess(roles);
}
/**
@@ -177,13 +137,8 @@
@SsoPowerAop(power = "10100004")
@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);
- return BaseResponseUtils.buildException(e.getMessage());
- }
+ QueryResultVo<List<BaRole>> list = roleSv.selectSome(vo) ;
+ return BaseResponseUtils.buildSuccess(list);
}
}
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 eae9aeb..cdd944b 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
@@ -16,7 +16,6 @@
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.http.MediaType;
-import org.springframework.validation.BindingResult;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
@@ -64,13 +63,8 @@
@SsoPowerAop(power = "10100000") //鐧诲綍涓庢潈闄愬悓鏃堕獙璇�
@Log("鏌ヨ鐢ㄦ埛")
public BaseResponse<QueryResultVo<List<BaUser>>> some(@RequestBody QueryVo vo) {
- try {
- QueryResultVo<List<BaUser>> res = this.sv.selectSome(vo);
- return BaseResponseUtils.buildSuccess(res);
- } catch (Exception e) {
- log.error("鏌ヨ鐢ㄦ埛寮傚父", e);
- return BaseResponseUtils.buildException(e.getMessage());
- }
+ QueryResultVo<List<BaUser>> res = this.sv.selectSome(vo);
+ return BaseResponseUtils.buildSuccess(res);
}
/**
@@ -83,48 +77,34 @@
@SsoPowerAop(power = "10100000") //鐧诲綍涓庢潈闄愬悓鏃堕獙璇�
@Log("鏌ヨ鍗曚釜鐢ㄦ埛")
public BaseResponse<BaUser> one(String id) {
- try {
- return BaseResponseUtils.buildSuccess(this.sv.selectById(Long.parseLong(id)));
- } catch (Exception e) {
- log.error("鏌ヨ涓�涓敤鎴锋暟鎹紓甯�", e);
- return BaseResponseUtils.buildException(e.getMessage());
- }
+ return BaseResponseUtils.buildSuccess(this.sv.selectById(Long.parseLong(id)));
}
/**
* 淇濆瓨鐢ㄦ埛淇℃伅
* @param po
- * @param bindingResult
* @return
*/
@PostMapping(path = "save", consumes = MediaType.APPLICATION_JSON_VALUE)
//@SsoAop() //鍙湁鐧诲綍楠岃瘉锛屾病鏈夋潈闄愰獙璇�
@SsoPowerAop(power = "10100001") //鐧诲綍涓庢潈闄愬悓鏃堕獙璇�
@Log("淇濆瓨鐢ㄦ埛淇℃伅")
- public BaseResponse<Boolean> save(@RequestBody @Valid BaUser po, BindingResult bindingResult) {
- if (bindingResult != null && bindingResult.hasErrors()) {
- return BaseResponseUtils.buildFail(Objects.requireNonNull(bindingResult.getFieldError()).getDefaultMessage());
- }
+ public BaseResponse<Boolean> save(@RequestBody @Valid BaUser po) throws Exception{
po.id = null;
Long id;
- try {
- po.supperAdmin = Constant.no.byteValue() ;
+ po.supperAdmin = Constant.no.byteValue() ;
// po.disabled = false ;//榛樿涓嶇鐢�
- po.deleted = false;//榛樿涓嶅垹闄�
- if (!StringUtils.isNullOrEmpty(po.password)) {
+ po.deleted = false;//榛樿涓嶅垹闄�
+ if (!StringUtils.isNullOrEmpty(po.password)) {
/*
濡傛灉鍓嶇杩涜浜哹ase64鍔犲瘑
po.password = new String(Base64.getDecoder().decode(po.password)) ;
*/
- po.password = MD5.encrypt(po.password);//杩涜鍔犲瘑鐮�
- } else {
- po.password = MD5.encrypt(defaultPassword);
- }
- id = this.sv.save(po);
- } catch (Exception e) {
- log.error("淇濆瓨鐢ㄦ埛寮傚父", e);
- return BaseResponseUtils.buildException(e.getMessage());
+ po.password = MD5.encrypt(po.password);//杩涜鍔犲瘑鐮�
+ } else {
+ po.password = MD5.encrypt(defaultPassword);
}
+ id = this.sv.save(po);
if (id <= 0) {
return BaseResponseUtils.buildFail("鏁版嵁搴撳瓨鍌ㄥけ璐�");
} else {
@@ -135,30 +115,17 @@
/**
* 鏇存柊鐢ㄦ埛淇℃伅
* @param po
- * @param bindingResult
* @return
*/
@PostMapping(path = "update", consumes = MediaType.APPLICATION_JSON_VALUE)
//@SsoAop() //鍙湁鐧诲綍楠岃瘉锛屾病鏈夋潈闄愰獙璇�
@SsoPowerAop(power = "10100001") //鐧诲綍涓庢潈闄愬悓鏃堕獙璇�
@Log("鏇存柊鐢ㄦ埛淇℃伅")
- public BaseResponse<Boolean> update(@RequestBody @Validated BaUser po, BindingResult bindingResult) {
- int count;
- try {
- if (bindingResult != null && bindingResult.hasErrors()) {
- return BaseResponseUtils.buildFail(Objects.requireNonNull(bindingResult.getFieldError()).getDefaultMessage());
- }
- if (po.id == null) {
- return BaseResponseUtils.buildFail("鏃犳暟鎹疄浣揑D");
- }
- po.password = null;//璁剧疆涓簄ull锛屼笉鍋氭洿鏂�
- po.supperAdmin = null;//璁剧疆涓簄ull锛屼笉鍋氭洿鏂�
- po.deleted = null;//璁剧疆涓簄ull锛屼笉鍋氭洿鏂�
- count = this.sv.update(po);
- } catch (Exception e) {
- log.error("淇敼鐢ㄦ埛寮傚父", e);
- return BaseResponseUtils.buildException(e.getMessage());
- }
+ public BaseResponse<Boolean> update(@RequestBody @Validated BaUser po) {
+ po.password = null;//璁剧疆涓簄ull锛屼笉鍋氭洿鏂�
+ po.supperAdmin = null;//璁剧疆涓簄ull锛屼笉鍋氭洿鏂�
+ po.deleted = null;//璁剧疆涓簄ull锛屼笉鍋氭洿鏂�
+ int count = this.sv.update(po);
if (count <= 0) {
return BaseResponseUtils.buildFail("鏁版嵁搴撳瓨鍌ㄥけ璐�");
} else {
@@ -175,11 +142,11 @@
@SsoPowerAop(power = "10100001")
@Log("绂佺敤鎴栧惎鐢ㄧ敤鎴蜂俊鎭�")
public BaseResponse<BaRole> disabled(@RequestBody BaUser po){
- try {
- return BaseResponseUtils.buildSuccess(sv.disabled(po.id,po.disabled));
- }catch (Exception e){
- log.error("绂佺敤鎴栧惎鐢ㄧ敤鎴蜂俊鎭紓甯�", e);
- return BaseResponseUtils.buildException(e.getMessage());
+ int count = sv.disabled(po.id,po.disabled);
+ if (count <= 0) {
+ return BaseResponseUtils.buildFail("鏁版嵁搴撳瓨鍌ㄥけ璐�");
+ } else {
+ return BaseResponseUtils.buildSuccess(true);
}
}
@@ -192,16 +159,10 @@
@SsoPowerAop(power = "10100001") //鐧诲綍涓庢潈闄愬悓鏃堕獙璇�
@Log("鍒犻櫎鐢ㄦ埛")
public BaseResponse<Boolean> delete(Long id) {
- int count;
- try {
- BaUser po = new BaUser();
- po.id = id;
- po.deleted = true;
- count = this.sv.update(po);
- } catch (Exception e) {
- log.error("鍒犻櫎鐢ㄦ埛寮傚父", e);
- return BaseResponseUtils.buildException(e.getMessage());
- }
+ BaUser po = new BaUser();
+ po.id = id;
+ po.deleted = true;
+ int count = this.sv.update(po);
if (count <= 0) {
return BaseResponseUtils.buildFail("鏁版嵁搴撳瓨鍌ㄥけ璐�");
} else {
@@ -218,41 +179,36 @@
@GetMapping(path = "changePassword")
@SsoAop()
@Log("淇敼瀵嗙爜")
- public BaseResponse<Boolean> changePassword(String id, String oldPassword, String newPassword) {
+ public BaseResponse<Boolean> changePassword(String id, String oldPassword, String newPassword) throws Exception{
int count;
- try {
- if (id == null) {
+ if (id == null) {
return BaseResponseUtils.buildFail("id涓嶈兘涓虹┖");
- }
- if (StringUtils.isNullOrEmpty(oldPassword)) {
- return BaseResponseUtils.buildFail("鏃у瘑鐮佷笉鑳戒负绌�");
- }
- if (StringUtils.isNullOrEmpty(newPassword)) {
- return BaseResponseUtils.buildFail("鏂板瘑鐮佷笉鑳戒负绌�");
- }
+ }
+ if (StringUtils.isNullOrEmpty(oldPassword)) {
+ return BaseResponseUtils.buildFail("鏃у瘑鐮佷笉鑳戒负绌�");
+ }
+ if (StringUtils.isNullOrEmpty(newPassword)) {
+ return BaseResponseUtils.buildFail("鏂板瘑鐮佷笉鑳戒负绌�");
+ }
/*
濡傛灉鍓嶇杩涜浜哹ase64鍔犲瘑
oldPassword = new String(Base64.getDecoder().decode(oldPassword)) ;
newPassword = new String(Base64.getDecoder().decode(newPassword)) ;
*/
- oldPassword = MD5.encrypt(oldPassword);//杩涜鍔犲瘑鐮�
- newPassword = MD5.encrypt(newPassword);//杩涜鍔犲瘑鐮�
+ oldPassword = MD5.encrypt(oldPassword);//杩涜鍔犲瘑鐮�
+ newPassword = MD5.encrypt(newPassword);//杩涜鍔犲瘑鐮�
- Long idLg = Long.parseLong(id) ;
+ Long idLg = Long.parseLong(id) ;
- BaUser po = this.sv.selectById(idLg);
- if (Objects.isNull(po)) {
- return BaseResponseUtils.buildFail("鏈緱鍒扮敤鎴凤紝璇锋眰澶辫触");
+ BaUser po = this.sv.selectById(idLg);
+ if (Objects.isNull(po)) {
+ return BaseResponseUtils.buildFail("鏈緱鍒扮敤鎴凤紝璇锋眰澶辫触");
+ } else {
+ if (!po.password.equalsIgnoreCase(oldPassword)) {
+ return BaseResponseUtils.buildFail("鏃у瘑鐮佷笉姝ｇ‘锛岃姹傚け璐�");
} else {
- if (!po.password.equalsIgnoreCase(oldPassword)) {
- return BaseResponseUtils.buildFail("鏃у瘑鐮佷笉姝ｇ‘锛岃姹傚け璐�");
- } else {
- count = this.sv.changePassword(idLg, newPassword);
- }
+ count = this.sv.changePassword(idLg, newPassword);
}
- } catch (Exception e) {
- log.error("淇敼瀵嗙爜寮傚父", e);
- return BaseResponseUtils.buildException(e.getMessage());
}
if (count <= 0) {
return BaseResponseUtils.buildFail("鏁版嵁搴撳瓨鍌ㄥけ璐�");
@@ -271,23 +227,15 @@
//@SsoAop() //鍙湁鐧诲綍楠岃瘉锛屾病鏈夋潈闄愰獙璇�
@SsoPowerAop(power = "10100001") //鐧诲綍涓庢潈闄愬悓鏃堕獙璇�
@Log("閲嶇疆瀵嗙爜")
- public BaseResponse<Boolean> resetPassword(@RequestBody @Validated ResetPasswordVo vo, BindingResult bindingResult) {
+ public BaseResponse<Boolean> resetPassword(@RequestBody @Validated ResetPasswordVo vo) throws Exception {
int count;
- try {
- if (bindingResult != null && bindingResult.hasErrors()) {
- return BaseResponseUtils.buildFail(Objects.requireNonNull(bindingResult.getFieldError()).getDefaultMessage());
- }
- String password = MD5.encrypt(vo.password);//杩涜鍔犲瘑鐮�
- Long idLg = Long.parseLong(vo.id);
- BaUser po = this.sv.selectById(idLg);
- if (Objects.isNull(po)) {
- return BaseResponseUtils.buildFail("鏈緱鍒扮敤鎴凤紝璇锋眰澶辫触");
- } else {
- count = this.sv.changePassword(idLg, password);
- }
- } catch (Exception e) {
- log.error("淇濆瓨鐢ㄦ埛寮傚父", e);
- return BaseResponseUtils.buildException(e.getMessage());
+ String password = MD5.encrypt(vo.password);//杩涜鍔犲瘑鐮�
+ Long idLg = Long.parseLong(vo.id);
+ BaUser po = this.sv.selectById(idLg);
+ if (Objects.isNull(po)) {
+ return BaseResponseUtils.buildFail("鏈緱鍒扮敤鎴凤紝璇锋眰澶辫触");
+ } else {
+ count = this.sv.changePassword(idLg, password);
}
if (count <= 0) {
return BaseResponseUtils.buildFail("鏁版嵁搴撳瓨鍌ㄥけ璐�");
diff --git a/pms-parent/pms-web-base/src/main/java/com/dy/pmsBase/user/UserSv.java b/pms-parent/pms-web-base/src/main/java/com/dy/pmsBase/user/UserSv.java
index 4b034da..3c041a8 100644
--- a/pms-parent/pms-web-base/src/main/java/com/dy/pmsBase/user/UserSv.java
+++ b/pms-parent/pms-web-base/src/main/java/com/dy/pmsBase/user/UserSv.java
@@ -11,6 +11,7 @@
import lombok.extern.slf4j.Slf4j;
import org.apache.dubbo.common.utils.PojoUtils;
import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.dao.DuplicateKeyException;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
@@ -96,7 +97,12 @@
*/
@Transactional
public Long save(BaUser po){
- this.dao.insertSelective(po) ;
+ try{
+ dao.insertSelective(po) ;
+ }catch(DuplicateKeyException e){
+ log.error(e.getMessage());
+ throw new RuntimeException("鎵嬫満鍙风爜閲嶅");
+ }
Long id = po.getId();
this.saveUserRoles(id, po.roleIds) ;
return id ;
@@ -109,7 +115,13 @@
*/
@Transactional
public int update(BaUser po) {
- int count = this.dao.updateByPrimaryKeySelective(po);
+ int count=0;
+ try{
+ count = this.dao.updateByPrimaryKeySelective(po);
+ }catch(DuplicateKeyException e){
+ log.error(e.getMessage());
+ throw new RuntimeException("鎵嬫満鍙风爜閲嶅");
+ }
this.saveUserRoles(po.id, po.roleIds) ;
return count ;
}
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 c0a64eb..87b1084 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
@@ -14,15 +14,12 @@
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.http.MediaType;
-import org.springframework.validation.BindingResult;
import org.springframework.web.bind.annotation.*;
import javax.imageio.ImageIO;
import java.awt.*;
import java.awt.image.BufferedImage;
import java.io.IOException;
-import java.util.Objects;
-import java.util.Random;
import java.util.UUID;
/**
@@ -49,31 +46,20 @@
/**
* 瀹㈡埛绔姹傜敤鎴风櫥褰曪紝瀹㈡埛绔彁浜son鏁版嵁
* @param vo 鐢ㄦ埛鐧诲綍鍊煎璞�
- * @param bindingResult 杈撳叆楠岃瘉
* @return 鐧诲綍鐢ㄦ埛鍊煎璞�
*/
@PostMapping(path = "login", consumes = MediaType.APPLICATION_JSON_VALUE)//鍓嶇鎻愪氦json鏁版嵁
@Log("鐢ㄦ埛鐧诲綍")
- 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());
- }
-
- // 浠嶴ession涓幏鍙栦繚瀛樼殑楠岃瘉鐮�
- String sessionCaptcha = (String) session.getAttribute("captcha");
- // 棣栧厛楠岃瘉楠岃瘉鐮�
- if (vo.captcha != null && vo.captcha.equalsIgnoreCase(sessionCaptcha)) {
- session.removeAttribute("captcha");
- return this.doLogin(vo) ;
- } else {
- // 楠岃瘉鐮侀敊璇紝杩斿洖鐧诲綍椤甸潰骞舵樉绀洪敊璇俊鎭�
- return BaseResponseUtils.buildFail("楠岃瘉鐮侀敊璇�");
- }
- } catch (Exception e) {
- log.error("鐢ㄦ埛鐧诲綍寮傚父", e);
- return BaseResponseUtils.buildException(e.getMessage());
+ public BaseResponse<UserVo> login(@RequestBody @Valid LoginVo vo,HttpSession session) {
+ // 浠嶴ession涓幏鍙栦繚瀛樼殑楠岃瘉鐮�
+ String sessionCaptcha = (String) session.getAttribute("captcha");
+ // 棣栧厛楠岃瘉楠岃瘉鐮�
+ if (vo.captcha != null && vo.captcha.equalsIgnoreCase(sessionCaptcha)) {
+ session.removeAttribute("captcha");
+ return this.doLogin(vo) ;
+ } else {
+ // 楠岃瘉鐮侀敊璇紝杩斿洖鐧诲綍椤甸潰骞舵樉绀洪敊璇俊鎭�
+ return BaseResponseUtils.buildFail("楠岃瘉鐮侀敊璇�");
}
}
@@ -83,24 +69,16 @@
* @return 鐧诲綍鐢ㄦ埛鍊煎璞�
*/
@PostMapping(path = "loginForm", consumes = MediaType.MULTIPART_FORM_DATA_VALUE)//鍓嶇鎻愪氦form琛ㄥ崟鏁版嵁
- 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());
- }
- // 浠嶴ession涓幏鍙栦繚瀛樼殑楠岃瘉鐮�
- String sessionCaptcha = (String) session.getAttribute("captcha");
- // 棣栧厛楠岃瘉楠岃瘉鐮�
- if (loginVo.captcha != null && loginVo.captcha.equalsIgnoreCase(sessionCaptcha)) {
- session.removeAttribute("captcha");
- return this.doLogin(loginVo) ;
- } else {
- // 楠岃瘉鐮侀敊璇紝杩斿洖鐧诲綍椤甸潰骞舵樉绀洪敊璇俊鎭�
- return BaseResponseUtils.buildFail("楠岃瘉鐮侀敊璇�");
- }
- } catch (Exception e) {
- log.error("鐢ㄦ埛鐧诲綍寮傚父", e);
- return BaseResponseUtils.buildException(e.getMessage());
+ public BaseResponse<UserVo> loginForm(@Valid LoginVo loginVo,HttpSession session){
+ // 浠嶴ession涓幏鍙栦繚瀛樼殑楠岃瘉鐮�
+ String sessionCaptcha = (String) session.getAttribute("captcha");
+ // 棣栧厛楠岃瘉楠岃瘉鐮�
+ if (loginVo.captcha != null && loginVo.captcha.equalsIgnoreCase(sessionCaptcha)) {
+ session.removeAttribute("captcha");
+ return this.doLogin(loginVo) ;
+ } else {
+ // 楠岃瘉鐮侀敊璇紝杩斿洖鐧诲綍椤甸潰骞舵樉绀洪敊璇俊鎭�
+ return BaseResponseUtils.buildFail("楠岃瘉鐮侀敊璇�");
}
}
@@ -113,17 +91,12 @@
@GetMapping(path = "logout")
@Log("閫�鍑虹櫥褰�")
public BaseResponse<Boolean> logout(HttpServletRequest hr){
- try{
- String token = hr.getHeader("token") ;
- if(token != null){
- this.sv.logout(token) ;
- return BaseResponseUtils.buildSuccess(true);
- }else{
- return BaseResponseUtils.buildFail("鏈粠header涓緱鍒皌oken");
- }
- } catch (Exception e) {
- log.error("鏌ヨ涓�涓敤鎴锋暟鎹紓甯�", e);
- return BaseResponseUtils.buildException(e.getMessage());
+ String token = hr.getHeader("token") ;
+ if(token != null){
+ this.sv.logout(token) ;
+ return BaseResponseUtils.buildSuccess(true);
+ }else{
+ return BaseResponseUtils.buildFail("鏈粠header涓緱鍒皌oken");
}
}
--
Gitblit v1.8.0