From aa53f93f29b03d5b7d1aa39785357b23d039b106 Mon Sep 17 00:00:00 2001
From: wenc000 <450292408@qq.com>
Date: Tue, 12 Nov 2019 17:28:07 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=BA=86=E4=BE=9D=E8=B5=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../cloud-common-plugin-oauth.iml | 174 ++++++++++++++++++
cloud-common-plugin-oauth/pom.xml | 11 ++
.../oauth/token/ClientTokenManager.java | 2 -
cloud-common-plugin/cloud-common-plugin.iml | 173 +++++++++++++++++
cloud-common-plugin/pom.xml | 12 ++
cloud-common/cloud-common.iml | 171 +++++++++++++++++
cloud-common/pom.xml | 2 +-
cloud-security/cloud-security.iml | 135 ++++++++++++++
.../src/test/java/com/cm/LicenseTest.java | 3 -
cloud-token-in/cloud-token-in.iml | 136 ++++++++++++++
cloud-token-in/pom.xml | 2 +-
cloud-token-out/cloud-token-out.iml | 132 +++++++++++++
cm-cloud.iml | 123 +++++++++++++
13 files changed, 1069 insertions(+), 7 deletions(-)
create mode 100644 cloud-common-plugin-oauth/cloud-common-plugin-oauth.iml
create mode 100644 cloud-common-plugin/cloud-common-plugin.iml
create mode 100644 cloud-common/cloud-common.iml
create mode 100644 cloud-security/cloud-security.iml
create mode 100644 cloud-token-in/cloud-token-in.iml
create mode 100644 cloud-token-out/cloud-token-out.iml
create mode 100644 cm-cloud.iml
diff --git a/cloud-common-plugin-oauth/cloud-common-plugin-oauth.iml b/cloud-common-plugin-oauth/cloud-common-plugin-oauth.iml
new file mode 100644
index 0000000..05d776f
--- /dev/null
+++ b/cloud-common-plugin-oauth/cloud-common-plugin-oauth.iml
@@ -0,0 +1,174 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
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
new file mode 100644
index 0000000..b0c36e6
--- /dev/null
+++ b/cloud-common-plugin/cloud-common-plugin.iml
@@ -0,0 +1,173 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
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
new file mode 100644
index 0000000..de9eba7
--- /dev/null
+++ b/cloud-common/cloud-common.iml
@@ -0,0 +1,171 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
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
new file mode 100644
index 0000000..3098998
--- /dev/null
+++ b/cloud-security/cloud-security.iml
@@ -0,0 +1,135 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
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
new file mode 100644
index 0000000..25b0984
--- /dev/null
+++ b/cloud-token-in/cloud-token-in.iml
@@ -0,0 +1,136 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
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
new file mode 100644
index 0000000..58532d7
--- /dev/null
+++ b/cloud-token-out/cloud-token-out.iml
@@ -0,0 +1,132 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/cm-cloud.iml b/cm-cloud.iml
new file mode 100644
index 0000000..f9364e2
--- /dev/null
+++ b/cm-cloud.iml
@@ -0,0 +1,123 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file