diff --git a/cloud-common-plugin-oauth/cloud-common-plugin-oauth.iml b/cloud-common-plugin-oauth/cloud-common-plugin-oauth.iml index 57c583f..05d776f 100644 --- a/cloud-common-plugin-oauth/cloud-common-plugin-oauth.iml +++ b/cloud-common-plugin-oauth/cloud-common-plugin-oauth.iml @@ -7,10 +7,6 @@ - - - - @@ -20,7 +16,6 @@ - @@ -37,9 +32,6 @@ - - - @@ -49,12 +41,21 @@ - - - - - - + + + + + + + + + + + + + + + @@ -81,7 +82,7 @@ - + @@ -90,7 +91,7 @@ - + @@ -121,7 +122,6 @@ - @@ -159,7 +159,6 @@ - diff --git a/cloud-common-plugin-oauth/pom.xml b/cloud-common-plugin-oauth/pom.xml index 5ac4907..d28b9d0 100644 --- a/cloud-common-plugin-oauth/pom.xml +++ b/cloud-common-plugin-oauth/pom.xml @@ -19,6 +19,17 @@ com.cm cloud-common-plugin 1.0.1-SNAPSHOT + + + org.springframework.security.oauth.boot + spring-security-oauth2-autoconfigure + + + + + org.springframework.security.oauth.boot + spring-security-oauth2-autoconfigure + ${spring-boot.version} diff --git a/cloud-common-plugin-oauth/src/main/java/com/cm/common/plugin/oauth/token/ClientTokenManager.java b/cloud-common-plugin-oauth/src/main/java/com/cm/common/plugin/oauth/token/ClientTokenManager.java index 2d4a245..28ff8bc 100644 --- a/cloud-common-plugin-oauth/src/main/java/com/cm/common/plugin/oauth/token/ClientTokenManager.java +++ b/cloud-common-plugin-oauth/src/main/java/com/cm/common/plugin/oauth/token/ClientTokenManager.java @@ -5,11 +5,9 @@ import com.cm.common.config.properties.OauthClientProperties; import com.cm.common.config.properties.OauthProperties; import com.cm.common.plugin.pojo.bos.ClientTokenBO; import com.cm.common.plugin.utils.RestTemplateUtil; -import com.hazelcast.core.Client; import org.apache.commons.lang3.StringUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import org.springframework.security.core.parameters.P; import java.util.HashMap; import java.util.Map; diff --git a/cloud-common-plugin/cloud-common-plugin.iml b/cloud-common-plugin/cloud-common-plugin.iml index acffd20..b0c36e6 100644 --- a/cloud-common-plugin/cloud-common-plugin.iml +++ b/cloud-common-plugin/cloud-common-plugin.iml @@ -7,10 +7,6 @@ - - - - @@ -20,7 +16,6 @@ - @@ -37,7 +32,6 @@ - @@ -48,18 +42,24 @@ - - - - - - - - - + + + + + + + + + + + + + + + @@ -81,7 +81,7 @@ - + @@ -90,7 +90,7 @@ - + @@ -121,7 +121,6 @@ - diff --git a/cloud-common-plugin/pom.xml b/cloud-common-plugin/pom.xml index 0000ee1..72c637a 100644 --- a/cloud-common-plugin/pom.xml +++ b/cloud-common-plugin/pom.xml @@ -17,6 +17,18 @@ com.cm cloud-common 1.0.1-SNAPSHOT + + + org.springframework.security.oauth.boot + spring-security-oauth2-autoconfigure + + + + + + org.springframework.security.oauth.boot + spring-security-oauth2-autoconfigure + ${spring-boot.version} diff --git a/cloud-common/cloud-common.iml b/cloud-common/cloud-common.iml index ba568e8..de9eba7 100644 --- a/cloud-common/cloud-common.iml +++ b/cloud-common/cloud-common.iml @@ -7,10 +7,6 @@ - - - - @@ -19,8 +15,6 @@ - - @@ -48,13 +42,17 @@ - + - - - - - + + + + + + + + + @@ -80,7 +78,7 @@ - + @@ -89,7 +87,7 @@ - + diff --git a/cloud-common/pom.xml b/cloud-common/pom.xml index ca5f8c5..47109f5 100644 --- a/cloud-common/pom.xml +++ b/cloud-common/pom.xml @@ -29,7 +29,7 @@ org.springframework.security.oauth.boot spring-security-oauth2-autoconfigure - 2.0.0.RELEASE + ${spring-boot.version} diff --git a/cloud-security/cloud-security.iml b/cloud-security/cloud-security.iml index 8421d9d..3098998 100644 --- a/cloud-security/cloud-security.iml +++ b/cloud-security/cloud-security.iml @@ -10,7 +10,6 @@ - @@ -43,7 +42,7 @@ - + @@ -52,7 +51,7 @@ - + diff --git a/cloud-security/src/test/java/com/cm/LicenseTest.java b/cloud-security/src/test/java/com/cm/LicenseTest.java index b43b487..a10f200 100644 --- a/cloud-security/src/test/java/com/cm/LicenseTest.java +++ b/cloud-security/src/test/java/com/cm/LicenseTest.java @@ -15,7 +15,6 @@ import org.junit.Test; **/ public class LicenseTest { - @Test public void licenseTest() throws Exception { // 3C-A0-67-4A-88-D2 // 巴盟三务公开:6C-92-BF-4F-07-0D @@ -28,12 +27,10 @@ public class LicenseTest { System.out.println(license); } - @Test public void licenseTimeTest() { System.out.println(License.checkLicense("CMXX0471", "OFZRQ2JDU2lCelgwcUozaUpWL3ROZWw2Y3VsbXhrOGhCMDNDYXN3am5RWHBlbkxwWnNaUElRZE53bXJNSTUwRldRbFdiQ3JnRFoxNlJlcXpkdUxwUHhSQm9RcVFlV2pLZ1lOU2tkemNUb3lsR1l4UTRvbnBmckVEWGdRUFJkWEc=")); } - @Test public void aesTest() throws Exception { String encode = AesUtil.aesEncoder("CMXX", "123"); //String decode = AesUtil.aesDecoder("ABCDEFGHIJKLMNRS", "vqZ8mVpLg2RqdPML+9tPxma3NrQDO/pECXWvUr/RIHE="); diff --git a/cloud-token-in/cloud-token-in.iml b/cloud-token-in/cloud-token-in.iml index 00403b5..25b0984 100644 --- a/cloud-token-in/cloud-token-in.iml +++ b/cloud-token-in/cloud-token-in.iml @@ -10,7 +10,6 @@ - @@ -18,7 +17,7 @@ - + @@ -43,7 +42,7 @@ - + @@ -52,7 +51,7 @@ - + diff --git a/cloud-token-in/pom.xml b/cloud-token-in/pom.xml index 94cc529..4c8a95b 100644 --- a/cloud-token-in/pom.xml +++ b/cloud-token-in/pom.xml @@ -23,7 +23,7 @@ com.cm cloud-security - 1.0.0.RELEASE + 1.0.1-SNAPSHOT diff --git a/cloud-token-out/cloud-token-out.iml b/cloud-token-out/cloud-token-out.iml index 8f19b15..58532d7 100644 --- a/cloud-token-out/cloud-token-out.iml +++ b/cloud-token-out/cloud-token-out.iml @@ -10,7 +10,6 @@ - @@ -39,7 +38,7 @@ - + @@ -48,7 +47,7 @@ - + diff --git a/cm-cloud.iml b/cm-cloud.iml index 00687a9..f9364e2 100644 --- a/cm-cloud.iml +++ b/cm-cloud.iml @@ -4,9 +4,6 @@ - - - @@ -32,7 +29,7 @@ - + @@ -41,7 +38,7 @@ - +