From e021502051079ac2b2c2adcea60b9ec01556b7fe Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期一, 02 九月 2024 11:34:41 +0800
Subject: [PATCH] Merge branch 'master' of http://8.140.179.55:20000/r/pipIrr-SV
---
pipIrr-platform/pipIrr-web/pipIrr-web-sso/src/main/java/com/dy/sso/busi/SsoCtrl.java | 34 +++++++++++++++++++---------------
1 files changed, 19 insertions(+), 15 deletions(-)
diff --git a/pipIrr-platform/pipIrr-web/pipIrr-web-sso/src/main/java/com/dy/sso/busi/SsoCtrl.java b/pipIrr-platform/pipIrr-web/pipIrr-web-sso/src/main/java/com/dy/sso/busi/SsoCtrl.java
index 725177d..46fc4db 100644
--- a/pipIrr-platform/pipIrr-web/pipIrr-web-sso/src/main/java/com/dy/sso/busi/SsoCtrl.java
+++ b/pipIrr-platform/pipIrr-web/pipIrr-web-sso/src/main/java/com/dy/sso/busi/SsoCtrl.java
@@ -29,8 +29,6 @@
import java.util.Objects;
import java.util.UUID;
-//import org.springframework.cache.CacheManager;
-
/**
* 娉ㄨВTag 鍦ˋPI涓樉绀猴細 Tag 娉ㄨВ, 缁欐暣涓帴鍙ｈ捣浜嗕釜鍚嶅瓧涓庢弿杩�"
* 娉ㄨВApiResponses 鍜� 娉ㄨВApiResponse 鐢ㄦ潵閰嶇疆鍝嶅簲锛�
@@ -70,7 +68,7 @@
)
})
@GetMapping(path = "allOrg")
- public BaseResponse<List<Org>> allOrg(){
+ public BaseResponse<List<Org.OrgVo>> allOrg(){
//List<Org> list = Arrays.asList(Org.Ym, Org.Pj) ;
return BaseResponseUtils.buildSuccess(Org.OrgList);
}
@@ -102,18 +100,24 @@
@PostMapping(path = "loginJson", consumes = MediaType.APPLICATION_JSON_VALUE)
public BaseResponse<UserVo> loginJson(@RequestBody @Parameter(description = "鐧诲綍json鏁版嵁", required = true) @Valid LoginVo vo, @Parameter(hidden = true) BindingResult bindingResult) {
if(bindingResult != null && bindingResult.hasErrors()){
- return BaseResponseUtils.buildFail(Objects.requireNonNull(bindingResult.getFieldError()).getDefaultMessage());
+ return BaseResponseUtils.buildErrorMsg(Objects.requireNonNull(bindingResult.getFieldError()).getDefaultMessage());
}
if(!vo.phone.equals("admin")){
if(vo.phone.length() != 11){
- return BaseResponseUtils.buildFail("鎵嬫満鍙凤紙闀垮害涓嶆槸11浣嶏級涓嶆纭�");
+ return BaseResponseUtils.buildErrorMsg("鎵嬫満鍙凤紙闀垮害涓嶆槸11浣嶏級涓嶆纭�");
}
}
if(vo.orgTag == null || vo.orgTag.trim().length() == 0){
- return BaseResponseUtils.buildFail("鏈�夋嫨缁勭粐鍗曚綅");
+ return BaseResponseUtils.buildErrorMsg("鏈�夋嫨缁勭粐鍗曚綅");
}
//鎶婄粍缁囧崟浣嶆爣绛句綔涓烘暟鎹簮鍚嶇О
DataSourceContext.set(vo.orgTag);
+
+ //寰楀埌鎵�鏈夌敤鎴疯处鍙�
+ List<String> phones = sv.getPhones();
+ if(!phones.contains(vo.phone)){
+ return BaseResponseUtils.buildErrorMsg("璐﹀彿涓嶅瓨鍦�");
+ }
String uuid ;
BaUser userPo ;
@@ -138,7 +142,7 @@
uVo.token = uuid ;
return BaseResponseUtils.buildSuccess(uVo);
}else{
- return BaseResponseUtils.buildFail("鐧诲綍澶辫触");
+ return BaseResponseUtils.buildErrorMsg("瀵嗙爜閿欒");
}
}
@@ -159,10 +163,10 @@
@PostMapping(path = "loginForm", consumes = MediaType.MULTIPART_FORM_DATA_VALUE)
public BaseResponse<UserVo> loginForm(@Parameter(description = "form琛ㄥ崟鏁版嵁", required = true) @Valid LoginVo vo, @Parameter(hidden = true) BindingResult bindingResult){
if(bindingResult != null && bindingResult.hasErrors()){
- return BaseResponseUtils.buildFail(Objects.requireNonNull(bindingResult.getFieldError()).getDefaultMessage());
+ return BaseResponseUtils.buildErrorMsg(Objects.requireNonNull(bindingResult.getFieldError()).getDefaultMessage());
}
if(vo.orgTag == null || vo.orgTag.trim().length() == 0){
- return BaseResponseUtils.buildFail("鏈�夋嫨缁勭粐鍗曚綅");
+ return BaseResponseUtils.buildErrorMsg("鏈�夋嫨缁勭粐鍗曚綅");
}
//鎶婄粍缁囧崟浣嶆爣绛句綔涓烘暟鎹簮鍚嶇О
DataSourceContext.set(vo.orgTag);
@@ -190,7 +194,7 @@
uVo.token = uuid ;
return BaseResponseUtils.buildSuccess(uVo);
}else{
- return BaseResponseUtils.buildFail("鐧诲綍澶辫触");
+ return BaseResponseUtils.buildErrorMsg("鐧诲綍澶辫触");
}
}
@@ -215,7 +219,7 @@
this.sv.logout(token) ;
return BaseResponseUtils.buildSuccess(true);
}else{
- return BaseResponseUtils.buildFail("鏈粠header涓緱鍒皌oken");
+ return BaseResponseUtils.buildErrorMsg("鏈粠header涓緱鍒皌oken");
}
}
@@ -229,7 +233,7 @@
@GetMapping(path = "loginUserId")
public Long loginUserId(String token){
BaUser userPo = this.sv.getByUuid(token) ;
- return userPo == null ? null : userPo.userId ;
+ return userPo == null ? null : userPo.id ;
}
/**
* 姝ゆ柟娉曚緵瀛愭ā鍧楃郴缁熻皟鐢紝鎵�浠ヤ笉鍏紑鍦ˋPI鎺ュ彛涓�
@@ -245,10 +249,10 @@
if(userPo != null){
vo.dataSourceName = userPo.orgTag ;
vo.logined = true ;
- vo.hasPower = true ;//榛樿鏈夋潈闄�
+ vo.hasPower = true ;//榛樿鏈夋潈闄愩��2023-12-21 缁忓晢璁紝鐢卞墠绔壌鏉�
}else{
vo.logined = false ;
- vo.hasPower = true ;//榛樿鏈夋潈闄�
+ vo.hasPower = true ;//榛樿鏈夋潈闄愩��2023-12-21 缁忓晢璁紝鐢卞墠绔壌鏉�
}
return vo ;
}
@@ -306,7 +310,7 @@
BaUser userPo = this.sv.getByUuid(token) ;
CurUserVo vo = new CurUserVo();
if(userPo != null){
- vo.id = userPo.userId ;
+ vo.id = userPo.id ;
vo.name = userPo.userName;
}
return vo ;
--
Gitblit v1.8.0