From 765e33b30a4ecd81a9634a12dc01d4cc5564168b Mon Sep 17 00:00:00 2001
From: zhubaomin <zhubaomin>
Date: 星期二, 06 五月 2025 17:23:39 +0800
Subject: [PATCH] 获取一个取水口接口返回值增加控制器地址和通讯协议字段
---
pipIrr-platform/pipIrr-web/pipIrr-web-sso/src/main/java/com/dy/sso/busi/SsoCtrl.java | 45 +++++++++++++++++++++++++++++++--------------
1 files changed, 31 insertions(+), 14 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 46fc4db..f475e27 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
@@ -25,9 +25,7 @@
import org.springframework.validation.BindingResult;
import org.springframework.web.bind.annotation.*;
-import java.util.List;
-import java.util.Objects;
-import java.util.UUID;
+import java.util.*;
/**
* 娉ㄨВTag 鍦ˋPI涓樉绀猴細 Tag 娉ㄨВ, 缁欐暣涓帴鍙ｈ捣浜嗕釜鍚嶅瓧涓庢弿杩�"
@@ -45,6 +43,7 @@
//鍦ㄥ睘鎬т笂娉ㄨВ@Autowired鏃讹紝浼氳鍛� Field injection is not recommended锛堜笉鍐嶆帹鑽愪娇鐢ㄥ瓧娈垫敞鍏ワ級
private SsoSv sv ;
+ //private KaptchaConfig kaptchaConfig;
//@Autowired
//private CacheManager cacheManager ;
@@ -53,6 +52,10 @@
this.sv = sv ;
}
+ //@Autowired
+ //public void setKaptchaConfig(KaptchaConfig kaptchaConfig) {
+ // this.kaptchaConfig = kaptchaConfig;
+ //}
/**
* 瀹㈡埛绔姹傚緱鍒版墍鏈夌粍缁囨満鏋�
@@ -98,7 +101,7 @@
)
})
@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) {
+ public BaseResponse<UserVo> loginJson(HttpServletRequest request, @RequestBody @Parameter(description = "鐧诲綍json鏁版嵁", required = true) @Valid LoginVo vo, @Parameter(hidden = true) BindingResult bindingResult) {
if(bindingResult != null && bindingResult.hasErrors()){
return BaseResponseUtils.buildErrorMsg(Objects.requireNonNull(bindingResult.getFieldError()).getDefaultMessage());
}
@@ -113,17 +116,31 @@
//鎶婄粍缁囧崟浣嶆爣绛句綔涓烘暟鎹簮鍚嶇О
DataSourceContext.set(vo.orgTag);
- //寰楀埌鎵�鏈夌敤鎴疯处鍙�
- List<String> phones = sv.getPhones();
- if(!phones.contains(vo.phone)){
+ if(vo.token != null && vo.token.trim().length() > 0) {
+ // 浠巗ession涓幏鍙栭獙璇佺爜
+ //HttpSession session = (HttpSession) request.getSession();
+ //String localCode = session.getAttribute(token).toString();
+ // 浠庢暟鎹簱鑾峰彇楠岃瘉鐮�
+ Map map = sv.getCodeByToken(vo.token);
+ Long expiration = Long.parseLong(map.get("expiration").toString());
+ Long currentTimestamp = System.currentTimeMillis();
+ if(currentTimestamp > expiration) {
+ return BaseResponseUtils.buildErrorMsg("楠岃瘉鐮佸凡瓒呮椂");
+ }
+ String localCode = map.get("code").toString();
+ if(!vo.code.equals(localCode)) {
+ return BaseResponseUtils.buildErrorMsg("楠岃瘉鐮侀敊璇�");
+ }
+ }
+
+ if(!sv.existPhone(vo.phone)){
return BaseResponseUtils.buildErrorMsg("璐﹀彿涓嶅瓨鍦�");
}
- String uuid ;
- BaUser userPo ;
+ String uuid4Token = null;
+ BaUser userPo = null ;
try {
- //Boolean flag = cacheManager.getCacheNames().isEmpty() ;
- uuid = UUID.randomUUID().toString();
+ uuid4Token = UUID.randomUUID().toString();
if(!StringUtils.isNullOrEmpty(vo.password)){
/*
濡傛灉鍓嶇杩涜浜哹ase64鍔犲瘑
@@ -131,7 +148,7 @@
*/
vo.password = MD5.encrypt(vo.password) ;
}
- userPo = this.sv.loginWithMapperXml(uuid, vo.phone, vo.password);
+ userPo = this.sv.loginWithMapperXml(uuid4Token, vo.phone, vo.password);
} catch (Exception e) {
log.error("鐢ㄦ埛鐧诲綍寮傚父", e);
return BaseResponseUtils.buildException(e.getMessage()) ;
@@ -139,10 +156,10 @@
if(userPo != null){
UserVo uVo = UserVoMapper.INSTANCT.po2vo(userPo);
- uVo.token = uuid ;
+ uVo.token = uuid4Token ;
return BaseResponseUtils.buildSuccess(uVo);
}else{
- return BaseResponseUtils.buildErrorMsg("瀵嗙爜閿欒");
+ return BaseResponseUtils.buildErrorMsg("鐧诲綍澶辫触");
}
}
--
Gitblit v1.8.0