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({ 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> 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次便锁定用户登录，但是一般很难出现这种情况，因为我feign里面是给了默认密码策略查询的 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); 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 地址 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; } }
@@ -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} 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 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); } /**
