From 056a96fcdcefb6c48acd3147559713c8e93068d7 Mon Sep 17 00:00:00 2001
From: ludc
Date: 星期一, 11 九月 2023 22:46:53 +0800
Subject: [PATCH] 代码提交
---
Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeBasicSecServiceImpl.java | 9 ++++++---
Source/UBCS/ubcs-auth/src/main/java/com/vci/ubcs/auth/service/BladeUserDetailsServiceImpl.java | 10 ++++------
Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/PasswordFreeLoginServiceImpl.java | 39 ++++++++++++++++++++++++++++++++++++---
Source/UBCS/ubcs-auth/src/main/java/com/vci/ubcs/auth/granter/SocialTokenGranter.java | 2 +-
4 files changed, 47 insertions(+), 13 deletions(-)
diff --git a/Source/UBCS/ubcs-auth/src/main/java/com/vci/ubcs/auth/granter/SocialTokenGranter.java b/Source/UBCS/ubcs-auth/src/main/java/com/vci/ubcs/auth/granter/SocialTokenGranter.java
index c56eb43..316c81c 100644
--- a/Source/UBCS/ubcs-auth/src/main/java/com/vci/ubcs/auth/granter/SocialTokenGranter.java
+++ b/Source/UBCS/ubcs-auth/src/main/java/com/vci/ubcs/auth/granter/SocialTokenGranter.java
@@ -79,7 +79,7 @@
String source = socialProperties.getAlias().getOrDefault(sourceParameter, sourceParameter);
// 寮�鏀惧钩鍙版巿鏉冪爜
String code = parameters.get("code");
- // 寮�鏀惧钩鍙扮姸鎬佸悧
+ // 寮�鏀惧钩鍙扮姸鎬佺爜
String state = parameters.get("state");
// 鑾峰彇寮�鏀惧钩鍙版巿鏉冩暟鎹�
diff --git a/Source/UBCS/ubcs-auth/src/main/java/com/vci/ubcs/auth/service/BladeUserDetailsServiceImpl.java b/Source/UBCS/ubcs-auth/src/main/java/com/vci/ubcs/auth/service/BladeUserDetailsServiceImpl.java
index 1f537f0..8962a59 100644
--- a/Source/UBCS/ubcs-auth/src/main/java/com/vci/ubcs/auth/service/BladeUserDetailsServiceImpl.java
+++ b/Source/UBCS/ubcs-auth/src/main/java/com/vci/ubcs/auth/service/BladeUserDetailsServiceImpl.java
@@ -63,9 +63,9 @@
public class BladeUserDetailsServiceImpl implements UserDetailsService {
/**
- * 鍏佽閿欒娆℃暟
+ * 榛樿鍏佽閿欒娆℃暟
*/
- //public static final Integer FAIL_COUNT = 5;
+ public static final Integer FAIL_COUNT = 5;
public static final String FAIL_COUNT_VALUE = "account.failCount";
/**
@@ -78,7 +78,6 @@
private final BladeRedis bladeRedis;
private final JwtProperties jwtProperties;
-
/**
* 瓒呯骇绠＄悊鍛樹俊鎭�
@@ -126,14 +125,13 @@
// 鍒ゆ柇鐧诲綍鏄惁閿佸畾
int count = getFailCount(tenantId, username);
//涓洪槻姝㈠彇鍊间负绌烘姤閿欑殑鎯呭喌锛屽綋涓虹┖鐨勬椂鍊欑粰榛樿鍙负5娆′究閿佸畾鐢ㄦ埛鐧诲綍锛屼絾鏄竴鑸緢闅惧嚭鐜拌繖绉嶆儏鍐碉紝鍥犱负鎴慺eign閲岄潰鏄粰浜嗛粯璁ゅ瘑鐮佺瓥鐣ユ煡璇㈢殑
- int failCountValue = Func.isEmpty(strategy) ? 5:Func.toInt(strategy.getLockingNum());
-
+ int failCountValue = Func.isEmpty(strategy) ? FAIL_COUNT:Func.toInt(strategy.getLockingNum());
int failCount = Func.toInt(ParamCache.getValue(FAIL_COUNT_VALUE), failCountValue);
if (count >= failCount) {
throw new UserDeniedAuthorizationException(TokenUtil.USER_HAS_TOO_MANY_FAILS);
}
- // 灏嗚姹傚ご鏀捐繘绾跨▼涓�
+
//瓒呯骇绠＄悊鍛橀厤缃枃浠堕厤缃处鍙峰瘑鐮侊紝瀹炵幇鐧诲綍, 榛樿绉熸埛id涓�000000
if(tenantId.equals(this.tenantId)){
if (!this.userName.equals(username) && !password.equalsIgnoreCase(this.password)) {
diff --git a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeBasicSecServiceImpl.java b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeBasicSecServiceImpl.java
index 1123541..41bd42a 100644
--- a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeBasicSecServiceImpl.java
+++ b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeBasicSecServiceImpl.java
@@ -283,7 +283,7 @@
}
// 鍒ゆ柇鏄惁涓哄紩鐢ㄧ爜娈碉紝濡傛灉鏄簲鐢ㄧ爜娈电殑璇濓紝涓轰簡閫傞厤鍓嶇缁勪欢锛岃繖閲岃瀵硅〃杩涜澶勭悊涓�涓嬶紝鎸夌収浠ュ墠鐨勫弬鐓ф牸寮忚繘琛岃浆鎹�
codeBasicSecDO.setReferValueInfo(referConfigToUIUiTable(codeReferConfigVO));
- if(codeReferConfigVO.getIsPersistence()=="true"){
+ if(Func.toBoolean(codeReferConfigVO.getIsPersistence())){
codeReferConfigService.insert(codeReferConfigVO);
}
}
@@ -324,8 +324,11 @@
BeanUtil.copy(showField,tableColVO);
tableColVO.setSortField(showField.getAttrSortField());
uiTableFieldVOs.add(tableColVO);
- if(showField.getIsQuery().equals("true")){
- queryColumns.add(tableColVO);
+ if(Func.toBoolean(showField.getIsQuery())){
+ TableColVO tableQueryColumns = new TableColVO();
+ BeanUtil.copy(showField,tableQueryColumns);
+ tableColVO.setSortField(showField.getAttrSortField());
+ queryColumns.add(tableQueryColumns);
}
});
}
diff --git a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/PasswordFreeLoginServiceImpl.java b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/PasswordFreeLoginServiceImpl.java
index ef70cbe..692c097 100644
--- a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/PasswordFreeLoginServiceImpl.java
+++ b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/PasswordFreeLoginServiceImpl.java
@@ -1,9 +1,17 @@
package com.vci.ubcs.code.service.impl;
import com.vci.ubcs.code.service.IPasswordFreeLoginService;
+import org.apache.commons.collections4.MultiValuedMap;
+import org.apache.commons.collections4.multimap.ArrayListValuedHashMap;
+import org.springframework.http.HttpEntity;
+import org.springframework.http.HttpHeaders;
+import org.springframework.http.MediaType;
+import org.springframework.http.ResponseEntity;
import org.springframework.stereotype.Service;
-
-import javax.annotation.Resource;
+import org.springframework.util.LinkedMultiValueMap;
+import org.springframework.util.MultiValueMap;
+import org.springframework.http.HttpMethod;
+import org.springframework.web.client.RestTemplate;
/**
* 鍏嶅瘑鐧诲綍鏈嶅姟
@@ -13,16 +21,41 @@
@Service
public class PasswordFreeLoginServiceImpl implements IPasswordFreeLoginService {
+ private RestTemplate restTemplate;
+
/**
- * 鍏嶅瘑鐧诲綍鏂规硶
+ * 鍏嶅瘑鐧诲綍
* @param account 璐﹀彿
* @return
*/
@Override
public boolean passwordFreeLogin(String account) {
+ // 鍏嶅瘑鐧诲綍鎺ュ彛鍦板潃
+ String loginUrl = "http://ubcs-auth/auth/login";
+ // 璁剧疆璇锋眰澶�
+ HttpHeaders headers = new HttpHeaders();
+ headers.setContentType(MediaType.APPLICATION_FORM_URLENCODED);
+ //璁剧疆璇锋眰浣撳弬鏁�
+ MultiValueMap<String,String> bodyParams = new LinkedMultiValueMap<String,String>();
+ bodyParams.add("account",account);
+
+ // 鍒涘缓璇锋眰瀹炰綋
+ HttpEntity<MultiValueMap<String, String>> requestEntity = new HttpEntity<>(bodyParams, headers);
+
+ // 鍙戦�丳OST璇锋眰
+ ResponseEntity<String> responseEntity = restTemplate.exchange(loginUrl, HttpMethod.POST, requestEntity, String.class);
+ String responseBody = responseEntity.getBody();
+
+ //鎷垮埌鍝嶅簲浣撳皢token瀛樺叆鍒皉edis涓紝浠ccount浣滀负瀛樺偍鐨刱ey
+
+ // 瑙ｆ瀽鍝嶅簲浣撹幏鍙栦护鐗�
+ // 杩欓噷鍋囪鍝嶅簲浣撴槸JSON鏍煎紡锛屽寘鍚竴涓悕涓�"token"鐨勫瓧娈�
+ // 鏍规嵁瀹為檯鎯呭喌杩涜瑙ｆ瀽
+ // JSONObject json = new JSONObject(responseBody);
+ // String token = json.getString("token");
return false;
}
--
Gitblit v1.9.3