Source/UBCS/pom.xml
@@ -100,6 +100,7 @@ <url>http://dev.yunkeruida.top:9000/repository/maven-snapshots/</url> </snapshotRepository> </distributionManagement> <build> <finalName>${project.name}</finalName> <resources> 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
@@ -41,7 +41,7 @@ * nacos dev 地址 */ //String NACOS_DEV_ADDR = "dev.vci-tech.com:38848"; String NACOS_DEV_ADDR = "192.168.93.201:38848"; String NACOS_DEV_ADDR = "192.168.93.202:38848"; /** * nacos prod 地址 Source/UBCS/ubcs-service/ubcs-code/pom.xml
@@ -28,12 +28,6 @@ <artifactId>ubcs-ddl</artifactId> <version>3.0.1.RELEASE</version> </dependency> <!-- <dependency>--> <!-- <groupId>com.vci.ubcs</groupId>--> <!-- <artifactId>ubcs-omd-api</artifactId>--> <!-- <version>3.0.1.RELEASE</version>--> <!-- <scope>compile</scope>--> <!-- </dependency>--> <dependency> <groupId>com.oracle.database.jdbc</groupId> <artifactId>ojdbc8</artifactId> Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/controller/CodeKeyAttrRepeatController.java
@@ -51,7 +51,6 @@ private final ICodeKeyAttrRepeatService plCodeKeyattrrepeatService; CodeKeyAttrRepeatMapper codeKeyattrrepeatMapper; /** Source/UBCS/ubcs-service/ubcs-ddl/pom.xml
@@ -2,11 +2,13 @@ <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> <parent> <artifactId>ubcs-service</artifactId> <groupId>com.vci.ubcs</groupId> <version>3.0.1.RELEASE</version> </parent> <modelVersion>4.0.0</modelVersion> <artifactId>ubcs-ddl</artifactId> Source/UBCS/ubcs-service/ubcs-system/src/main/java/com/vci/ubcs/system/service/impl/DeptServiceImpl.java
@@ -80,7 +80,8 @@ @Override public List<DeptVO> tree(String tenantId) { return ForestNodeMerger.merge(baseMapper.tree(tenantId)); List<DeptVO> tree = baseMapper.tree(tenantId); return ForestNodeMerger.merge(tree); } @Override 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); } /**
