From b8121b20a47e5b96275a11aa9d84716639c75db0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=86=B7=E5=86=B7?= Date: Mon, 1 Jul 2019 18:39:39 +0800 Subject: [PATCH] =?UTF-8?q?:heavy=5Fminus=5Fsign:=20=E7=A7=BB=E9=99=A4?= =?UTF-8?q?=E4=BE=9D=E8=B5=96=E3=80=82=20=E6=9B=B4=E6=96=B0spring=20securi?= =?UTF-8?q?ty=20=E4=BE=9D=E8=B5=96=E7=AE=A1=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pigx-auth/pom.xml | 5 -- .../data/cache/RedisTemplateConfig.java | 2 - pigx-common/pigx-common-security/pom.xml | 8 +- .../com/pig4cloud/pigx/admin/BitMapTest.java | 86 ------------------- pom.xml | 7 +- 5 files changed, 6 insertions(+), 102 deletions(-) delete mode 100644 pigx-upms/pigx-upms-biz/src/test/java/com/pig4cloud/pigx/admin/BitMapTest.java diff --git a/pigx-auth/pom.xml b/pigx-auth/pom.xml index 12d0d69d3..2c4a53f5b 100644 --- a/pigx-auth/pom.xml +++ b/pigx-auth/pom.xml @@ -78,11 +78,6 @@ org.springframework.boot spring-boot-starter-freemarker - - - org.springframework.cloud - spring-cloud-starter-security - org.springframework.boot diff --git a/pigx-common/pigx-common-data/src/main/java/com/pig4cloud/pigx/common/data/cache/RedisTemplateConfig.java b/pigx-common/pigx-common-data/src/main/java/com/pig4cloud/pigx/common/data/cache/RedisTemplateConfig.java index eb49aee9d..0f9e0b780 100644 --- a/pigx-common/pigx-common-data/src/main/java/com/pig4cloud/pigx/common/data/cache/RedisTemplateConfig.java +++ b/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; diff --git a/pigx-common/pigx-common-security/pom.xml b/pigx-common/pigx-common-security/pom.xml index c6fcf6e98..50cdde7b0 100644 --- a/pigx-common/pigx-common-security/pom.xml +++ b/pigx-common/pigx-common-security/pom.xml @@ -38,14 +38,10 @@ com.pig4cloud pigx-common-core - + org.springframework.cloud - spring-cloud-starter-security - - - org.springframework.security.oauth.boot - spring-security-oauth2-autoconfigure + spring-cloud-starter-oauth2 diff --git a/pigx-upms/pigx-upms-biz/src/test/java/com/pig4cloud/pigx/admin/BitMapTest.java b/pigx-upms/pigx-upms-biz/src/test/java/com/pig4cloud/pigx/admin/BitMapTest.java deleted file mode 100644 index f9344df9e..000000000 --- a/pigx-upms/pigx-upms-biz/src/test/java/com/pig4cloud/pigx/admin/BitMapTest.java +++ /dev/null @@ -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)); - } - } - -} diff --git a/pom.xml b/pom.xml index c79047352..253c15ddb 100644 --- a/pom.xml +++ b/pom.xml @@ -44,7 +44,8 @@ 2.1.6.RELEASE - Greenwich.SR1 + Greenwich.SR2 + 0.9.0.RELEASE Cairo-SR8 UTF-8 1.8 @@ -60,7 +61,7 @@ 4.1.0 2.1.1 2.10.2 - 6.0.7 + 6.0.8 2.1.5 2.3.6.RELEASE 5.22.0 @@ -157,7 +158,7 @@ org.springframework.cloud spring-cloud-alibaba-dependencies - 0.9.0.RELEASE + ${spring-cloud-alibaba.version} pom import