From c8b52a0878fc2848a8ce362b0ab976983df43476 Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期四, 21 十二月 2023 14:34:40 +0800
Subject: [PATCH] 1、原SsoAop进行登录验证有鉴权，现改为只验证登录，不做鉴权，相应SsoCtrl中增加只鉴权的方法 2、优化通信中间件代码、common模块中协议代码、
---
pipIrr-platform/pipIrr-web/pipIrr-web-sso/src/main/java/com/dy/sso/busi/SsoCtrl.java | 47 ++++++++++++++++++++++++++++++++++++++++++++---
1 files changed, 44 insertions(+), 3 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 303ec97..dda4c8b 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
@@ -72,8 +72,8 @@
})
@GetMapping(path = "allOrg")
public BaseResponse<List<Org>> allOrg(){
- List<Org> list = Arrays.asList(Org.Ym, Org.Pj) ;
- return BaseResponseUtils.buildSuccess(list);
+ //List<Org> list = Arrays.asList(Org.Ym, Org.Pj) ;
+ return BaseResponseUtils.buildSuccess(Org.OrgList);
}
/**
@@ -104,6 +104,11 @@
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());
+ }
+ if(!vo.phone.equals("admin")){
+ if(vo.phone.length() != 11){
+ return BaseResponseUtils.buildFail("鎵嬫満鍙凤紙闀垮害涓嶆槸11浣嶏級涓嶆纭�");
+ }
}
if(vo.orgTag == null || vo.orgTag.trim().length() == 0){
return BaseResponseUtils.buildFail("鏈�夋嫨缁勭粐鍗曚綅");
@@ -227,7 +232,27 @@
BaUser userPo = this.sv.getByUuid(token) ;
return userPo == null ? null : userPo.id ;
}
-
+ /**
+ * 姝ゆ柟娉曚緵瀛愭ā鍧楃郴缁熻皟鐢紝鎵�浠ヤ笉鍏紑鍦ˋPI鎺ュ彛涓�
+ * 鏂规硶鍔熻兘锛氶獙璇佹槸鍚﹀凡缁忕櫥褰曪紝濡傛灉鐧诲綍浜嗭紝鍐嶉獙璇佹潈闄�
+ * @param token 鐧诲綍鐢ㄦ埛token
+ * @return SsoVo
+ */
+ @Hidden
+ @GetMapping(path = "ssoCheck")
+ public SsoVo ssoCheck(String token){
+ BaUser userPo = this.sv.getByUuid(token) ;
+ SsoVo vo = new SsoVo();
+ if(userPo != null){
+ vo.dataSourceName = userPo.orgTag ;
+ vo.logined = true ;
+ vo.hasPower = true ;//榛樿鏈夋潈闄�
+ }else{
+ vo.logined = false ;
+ vo.hasPower = true ;//榛樿鏈夋潈闄�
+ }
+ return vo ;
+ }
/**
* 姝ゆ柟娉曚緵瀛愭ā鍧楃郴缁熻皟鐢紝鎵�浠ヤ笉鍏紑鍦ˋPI鎺ュ彛涓�
* 鏂规硶鍔熻兘锛氶獙璇佹槸鍚﹀凡缁忕櫥褰曪紝濡傛灉鐧诲綍浜嗭紝鍐嶉獙璇佹潈闄�
@@ -271,6 +296,22 @@
return vo ;
}
+ /**
+ * 鑾峰緱褰撳墠鐧诲綍鐢ㄦ埛
+ * @param token 鐧诲綍鐢ㄦ埛token
+ * @return SsoVo
+ */
+ @Hidden
+ @GetMapping(path = "ssoCurUser")
+ public CurUserVo ssoCurUser(String token){
+ BaUser userPo = this.sv.getByUuid(token) ;
+ CurUserVo vo = new CurUserVo();
+ if(userPo != null){
+ vo.id = userPo.id ;
+ vo.name = userPo.name ;
+ }
+ return vo ;
+ }
/////////////////////////////////////////////////////////////////
//
// 浠ヤ笅绉佹湁鏂规硶
--
Gitblit v1.8.0