From 6d2f14a3197c106cf735fac489e22d6d180b52cf Mon Sep 17 00:00:00 2001
From: ludc
Date: 星期三, 10 五月 2023 13:08:16 +0800
Subject: [PATCH] 代码整合
---
Source/UBCS-WEB/src/page/login/userlogin.vue | 2 +-
Source/UBCS/ubcs-service/ubcs-system/src/main/resources/mapper/CombinationMapper.xml | 2 +-
Source/UBCS/ubcs-service/ubcs-system/src/main/resources/mapper/StrategyMapper.xml | 8 ++++----
Source/UBCS/ubcs-common/src/main/java/com/vci/ubcs/common/constant/LauncherConstant.java | 4 ++--
Source/UBCS/ubcs-service/ubcs-user/src/main/java/com/vci/ubcs/system/user/controller/UserController.java | 13 ++++++++++++-
Source/UBCS/ubcs-service/ubcs-system/src/main/java/com/vci/ubcs/system/service/impl/StrategyServiceImpl.java | 2 +-
Source/UBCS/ubcs-auth/src/main/java/com/vci/ubcs/auth/service/BladeUserDetailsServiceImpl.java | 5 ++++-
Source/UBCS-WEB/src/views/modeling/Business.vue | 4 ++--
8 files changed, 27 insertions(+), 13 deletions(-)
diff --git a/Source/UBCS-WEB/src/page/login/userlogin.vue b/Source/UBCS-WEB/src/page/login/userlogin.vue
index af14bc8..2bbf23b 100644
--- a/Source/UBCS-WEB/src/page/login/userlogin.vue
+++ b/Source/UBCS-WEB/src/page/login/userlogin.vue
@@ -229,7 +229,7 @@
},
handleLogin: function () {
this.userInfo = this.$store.state.upadatastatus
- console.log(this.userInfo)
+ //console.log(this.userInfo)
this.$refs.loginForm.validate(valid => {
if (valid) {
const loading = this.$loading({
diff --git a/Source/UBCS-WEB/src/views/modeling/Business.vue b/Source/UBCS-WEB/src/views/modeling/Business.vue
index 3b4b64d..ce72565 100644
--- a/Source/UBCS-WEB/src/views/modeling/Business.vue
+++ b/Source/UBCS-WEB/src/views/modeling/Business.vue
@@ -357,6 +357,6 @@
}
.businessCrud > .el-card > .el-card__body > .avue-crud_menu{
- display: none!important;
- }
+ display: none!important;
+}
</style>
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 088979d..4bd2fd2 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
@@ -124,7 +124,10 @@
// 鍒ゆ柇鐧诲綍鏄惁閿佸畾
int count = getFailCount(tenantId, username);
- int failCount = Func.toInt(ParamCache.getValue(FAIL_COUNT_VALUE), Func.toInt(strategy.getLockingNum()));
+ //涓洪槻姝㈠彇鍊间负绌烘姤閿欑殑鎯呭喌锛屽綋涓虹┖鐨勬椂鍊欑粰榛樿鍙负5娆′究閿佸畾鐢ㄦ埛鐧诲綍锛屼絾鏄竴鑸緢闅惧嚭鐜拌繖绉嶆儏鍐碉紝鍥犱负鎴慺eign閲岄潰鏄粰浜嗛粯璁ゅ瘑鐮佺瓥鐣ユ煡璇㈢殑
+ int failCountValue = Func.isEmpty(strategy) ? 5: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);
diff --git a/Source/UBCS/ubcs-common/src/main/java/com/vci/ubcs/common/constant/LauncherConstant.java b/Source/UBCS/ubcs-common/src/main/java/com/vci/ubcs/common/constant/LauncherConstant.java
index cbb2ec6..27ee11f 100644
--- a/Source/UBCS/ubcs-common/src/main/java/com/vci/ubcs/common/constant/LauncherConstant.java
+++ b/Source/UBCS/ubcs-common/src/main/java/com/vci/ubcs/common/constant/LauncherConstant.java
@@ -40,8 +40,8 @@
/**
* nacos dev 鍦板潃
*/
- //String NACOS_DEV_ADDR = "dev.vci-tech.com:38848";
- String NACOS_DEV_ADDR = "192.168.93.190:38848";
+ String NACOS_DEV_ADDR = "dev.vci-tech.com:38848";
+ //String NACOS_DEV_ADDR = "192.168.93.190:38848";
/**
* nacos prod 鍦板潃
diff --git a/Source/UBCS/ubcs-service/ubcs-system/src/main/java/com/vci/ubcs/system/service/impl/StrategyServiceImpl.java b/Source/UBCS/ubcs-service/ubcs-system/src/main/java/com/vci/ubcs/system/service/impl/StrategyServiceImpl.java
index 45fd332..f08e550 100644
--- a/Source/UBCS/ubcs-service/ubcs-system/src/main/java/com/vci/ubcs/system/service/impl/StrategyServiceImpl.java
+++ b/Source/UBCS/ubcs-service/ubcs-system/src/main/java/com/vci/ubcs/system/service/impl/StrategyServiceImpl.java
@@ -131,7 +131,7 @@
if(Func.isNotEmpty(oldIsDefaultStrategy)){
temp2 = updateUserStrategyDefault(temp1, oldIsDefaultStrategy);
}
- return temp1 && temp2;
+ return temp1 || temp2;
}
}
diff --git a/Source/UBCS/ubcs-service/ubcs-system/src/main/resources/mapper/CombinationMapper.xml b/Source/UBCS/ubcs-service/ubcs-system/src/main/resources/mapper/CombinationMapper.xml
index 71feaf0..720127e 100644
--- a/Source/UBCS/ubcs-service/ubcs-system/src/main/resources/mapper/CombinationMapper.xml
+++ b/Source/UBCS/ubcs-service/ubcs-system/src/main/resources/mapper/CombinationMapper.xml
@@ -88,7 +88,7 @@
</select>
<select id="queryRegex" resultType="java.lang.String">
- SELECT CONCAT(REPLACE(WM_CONCAT(psc.REGEX),',[',''),']') FROM PL_SYS_COMBINATION psc
+ SELECT listagg(psc.REGEX,'],') within group ( order by psc.REGEX) || ']' FROM PL_SYS_COMBINATION psc
WHERE psc.ID IN (
<foreach collection="combinationIds" item="id" separator=",">
#{id}
diff --git a/Source/UBCS/ubcs-service/ubcs-system/src/main/resources/mapper/StrategyMapper.xml b/Source/UBCS/ubcs-service/ubcs-system/src/main/resources/mapper/StrategyMapper.xml
index 83969fb..f1f3c9f 100644
--- a/Source/UBCS/ubcs-service/ubcs-system/src/main/resources/mapper/StrategyMapper.xml
+++ b/Source/UBCS/ubcs-service/ubcs-system/src/main/resources/mapper/StrategyMapper.xml
@@ -25,7 +25,7 @@
<!--鏌ヨ鎸囧畾琛屾暟鎹�-->
<select id="queryAllByPage" resultMap="StrategyMap">
select pss.*,
- (select WM_CONCAT(psc.NAME)
+ (SELECT listagg(psc.NAME,',') within GROUP(ORDER BY psc.NAME asc)
from PL_SYS_COMBINATION psc
where instr(pss.COMBINATION_IDS,psc.ID) > 0) COMBINATIONNAMES
from PL_SYS_PWDSTRATEGY pss
@@ -89,7 +89,7 @@
<select id="queryByNameAndTenantId" resultMap="StrategyMap">
- SELECT PSS.*,(select WM_CONCAT(psc.NAME)
+ SELECT PSS.*,(SELECT listagg(psc.NAME,',') within GROUP(ORDER BY psc.NAME asc)
from PL_SYS_COMBINATION psc
where instr(pss.COMBINATION_IDS,psc.ID) > 0) COMBINATIONNAMES
FROM PL_SYS_PWDSTRATEGY PSS
@@ -99,7 +99,7 @@
</select>
<select id="queryByUserId" resultMap="StrategyMap">
- SELECT PSS.*,(select WM_CONCAT(psc.NAME)
+ SELECT PSS.*,(SELECT listagg(psc.NAME,',') within GROUP(ORDER BY psc.NAME asc)
from PL_SYS_COMBINATION psc
where instr(pss.COMBINATION_IDS,psc.ID) > 0) COMBINATIONNAMES
FROM PL_SYS_PWDSTRATEGY PSS LEFT JOIN PL_SYS_USER_PWDSTRATEGY PSUP ON PSS.ID=psup.PWDSTRATEGY_ID
@@ -107,7 +107,7 @@
</select>
<select id="queryByIsDefault" resultType="com.vci.ubcs.system.entity.Strategy">
- SELECT PSS.*,(SELECT WM_CONCAT(psc.NAME)
+ SELECT PSS.*,(SELECT listagg(psc.NAME,',') within GROUP(ORDER BY psc.NAME asc)
FROM PL_SYS_COMBINATION psc
WHERE instr(pss.COMBINATION_IDS, psc.ID) > 0) COMBINATIONNAMES
FROM PL_SYS_PWDSTRATEGY PSS
diff --git a/Source/UBCS/ubcs-service/ubcs-user/src/main/java/com/vci/ubcs/system/user/controller/UserController.java b/Source/UBCS/ubcs-service/ubcs-user/src/main/java/com/vci/ubcs/system/user/controller/UserController.java
index 7d66724..b4686b9 100644
--- a/Source/UBCS/ubcs-service/ubcs-user/src/main/java/com/vci/ubcs/system/user/controller/UserController.java
+++ b/Source/UBCS/ubcs-service/ubcs-user/src/main/java/com/vci/ubcs/system/user/controller/UserController.java
@@ -93,7 +93,18 @@
@GetMapping("/info")
public R<UserVO> info(BladeUser user) {
User detail = userService.getById(user.getUserId());
- return R.data(UserWrapper.build().entityVO(detail));
+ UserVO userVO = null;
+ if(detail != null){
+ userVO = UserWrapper.build().entityVO(detail);
+ }else {
+ userVO = new UserVO();
+ userVO.setId(user.getUserId());
+ userVO.setTenantId(user.getTenantId());
+ userVO.setAccount(user.getAccount());
+ userVO.setName(user.getUserName());
+ userVO.setRealName(user.getUserName());
+ }
+ return R.data(userVO);
}
/**
--
Gitblit v1.9.3