➖ 移除依赖。 更新spring security 依赖管理

pigx-auth/pom.xml

@@ -78,11 +78,6 @@
 			<groupId>org.springframework.boot</groupId>
 			<artifactId>spring-boot-starter-freemarker</artifactId>
 		</dependency>
-		<!--spring security 、oauth、jwt依赖-->
-		<dependency>
-			<groupId>org.springframework.cloud</groupId>
-			<artifactId>spring-cloud-starter-security</artifactId>
-		</dependency>
 		<!--web 模块-->
 		<dependency>
 			<groupId>org.springframework.boot</groupId>

pigx-common/pigx-common-data/src/main/java/com/pig4cloud/pigx/common/data/cache/RedisTemplateConfig.java

@@ -19,7 +19,6 @@ package com.pig4cloud.pigx.common.data.cache;
 
 import lombok.AllArgsConstructor;
 import org.springframework.boot.autoconfigure.AutoConfigureBefore;
-import org.springframework.boot.autoconfigure.condition.ConditionalOnBean;
 import org.springframework.boot.autoconfigure.data.redis.RedisAutoConfiguration;
 import org.springframework.cache.annotation.EnableCaching;
 import org.springframework.context.annotation.Bean;
@@ -38,7 +37,6 @@ import org.springframework.data.redis.serializer.StringRedisSerializer;
 @Configuration
 @AllArgsConstructor
 @AutoConfigureBefore(RedisAutoConfiguration.class)
-@ConditionalOnBean(RedisConnectionFactory.class)
 public class RedisTemplateConfig {
 	private final RedisConnectionFactory redisConnectionFactory;
 

pigx-common/pigx-common-security/pom.xml

@@ -38,14 +38,10 @@
 			<groupId>com.pig4cloud</groupId>
 			<artifactId>pigx-common-core</artifactId>
 		</dependency>
-		<!--安全模块-->
+		<!--安全模块 -->
 		<dependency>
 			<groupId>org.springframework.cloud</groupId>
-			<artifactId>spring-cloud-starter-security</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>org.springframework.security.oauth.boot</groupId>
-			<artifactId>spring-security-oauth2-autoconfigure</artifactId>
+			<artifactId>spring-cloud-starter-oauth2</artifactId>
 		</dependency>
 		<!--UPMS API-->
 		<dependency>

pigx-upms/pigx-upms-biz/src/test/java/com/pig4cloud/pigx/admin/BitMapTest.java

@@ -1,86 +0,0 @@
-package com.pig4cloud.pigx.admin;
-
-import java.util.BitSet;
-
-/**
- * @author lengleng
- * @date 2019-03-26
- */
-public class BitMapTest {
-	private int[] bigArray;
-
-	public BitMapTest(long size) {
-		bigArray = new int[(int) (size / 32 + 1)];
-	}
-
-	public void set1(int num) {
-		//确定数组 index
-		int arrayIndex = num >> 5;
-		//确定bit index
-		int bitIndex = num & 31;
-		//设置0
-		bigArray[arrayIndex] |= 1 << bitIndex;
-
-		System.out.println(bigArray[arrayIndex]);
-	}
-
-	public void set0(int num) {
-		//确定数组 index
-		int arrayIndex = num >> 5;
-		//确定bit index
-		int bitIndex = num & 31;
-		//设置0
-		bigArray[arrayIndex] &= ~(1 << bitIndex);
-		System.out.println(get32BitBinString(bigArray[arrayIndex]));
-	}
-
-	public boolean isExist(int num) {
-		//确定数组 index
-		int arrayIndex = num >> 5;
-		//确定bit index
-		int bitIndex = num & 31;
-
-		//判断是否存在
-		return (bigArray[arrayIndex] & ((1 << bitIndex))) != 0;
-	}
-
-	/**
-	 * 将整型数字转换为二进制字符串，一共32位，不舍弃前面的0
-	 *
-	 * @param number 整型数字
-	 * @return 二进制字符串
-	 */
-	private static String get32BitBinString(int number) {
-		StringBuilder sBuilder = new StringBuilder();
-		for (int i = 0; i < 32; i++) {
-			sBuilder.append(number & 1);
-			number = number >>> 1;
-		}
-		return sBuilder.reverse().toString();
-	}
-
-	public static void main(String[] args) {
-
-		int[] array = new int[]{1, 2, 3, 22, 0, 3, 63};
-		BitSet bitSet = new BitSet(1);
-		System.out.println(bitSet.size());   //64
-		bitSet = new BitSet(65);
-		System.out.println(bitSet.size());   //128
-		bitSet = new BitSet(23);
-		System.out.println(bitSet.size());   //64
-
-		//将数组内容组bitmap
-		for (int i = 0; i < array.length; i++) {
-			bitSet.set(array[i], true);
-		}
-
-		System.out.println(bitSet.get(22));
-		System.out.println(bitSet.get(60));
-
-		System.out.println("下面开始遍历BitSet：");
-		for (int i = 0; i < bitSet.size(); i++) {
-			System.out.println(bitSet.get(i));
-		}
-	}
-
-}

pom.xml

@@ -44,7 +44,8 @@
 
 	<properties>
 		<spring-boot.version>2.1.6.RELEASE</spring-boot.version>
-		<spring-cloud.version>Greenwich.SR1</spring-cloud.version>
+		<spring-cloud.version>Greenwich.SR2</spring-cloud.version>
+		<spring-cloud-alibaba.version>0.9.0.RELEASE</spring-cloud-alibaba.version>
 		<spring-platform.version>Cairo-SR8</spring-platform.version>
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 		<maven.compiler.source>1.8</maven.compiler.source>
@@ -60,7 +61,7 @@
 		<lcn.version>4.1.0</lcn.version>
 		<jasypt.version>2.1.1</jasypt.version>
 		<ttl.version>2.10.2</ttl.version>
-		<minio.version>6.0.7</minio.version>
+		<minio.version>6.0.8</minio.version>
 		<elastic-job-lite.version>2.1.5</elastic-job-lite.version>
 		<security.oauth.version>2.3.6.RELEASE</security.oauth.version>
 		<activiti.version>5.22.0</activiti.version>
@@ -157,7 +158,7 @@
 			<dependency>
 				<groupId>org.springframework.cloud</groupId>
 				<artifactId>spring-cloud-alibaba-dependencies</artifactId>
-				<version>0.9.0.RELEASE</version>
+				<version>${spring-cloud-alibaba.version}</version>
 				<type>pom</type>
 				<scope>import</scope>
 			</dependency>