This is an automated email from the ASF dual-hosted git repository.
liubao pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/servicecomb-fence.git
The following commit(s) were added to refs/heads/master by this push:
new ce92c7d refactor code structure
ce92c7d is described below
commit ce92c7dfa36a7b450d6d512165d5f3fb9b1ed767
Author: liubao <[email protected]>
AuthorDate: Tue Jun 4 16:42:33 2024 +0800
refactor code structure
---
admin-service/pom.xml | 2 +-
.../src/views/cloud/problems/components/main.vue | 9 +++++----
apis/authentication-server-api/pom.xml | 2 +-
apis/edge-service-api/pom.xml | 2 +-
authentication-server/pom.xml | 2 +-
common/{ => common-authentication-client}/pom.xml | 9 +++++++--
.../AccessDeniedExceptionExceptionConverter.java | 0
.../fence/resource/AccessDynamicProperties.java | 0
.../resource/AccessDynamicPropertiesManager.java | 0
.../servicecomb/fence/resource/AuthFilter.java | 0
.../fence/resource/AuthenticationAuthFilter.java | 2 --
.../resource/AuthenticationConfiguration.java | 13 ++++++++++++
.../resource/AuthenticationProviderFilter.java | 0
.../ConfigBasedAuthorizationAuthFilter.java | 5 -----
.../fence/resource/SimpleAuthentication.java | 0
...e.servicecomb.core.exception.ExceptionConverter | 18 +++++++++++++++++
...rk.boot.autoconfigure.AutoConfiguration.imports | 18 +++++++++++++++++
common/{ => common-authentication}/pom.xml | 4 ++--
.../apache/servicecomb/fence/jwt/JWTClaims.java | 0
.../servicecomb/fence/jwt/JWTClaimsCommon.java | 0
.../apache/servicecomb/fence/jwt/JWTHeader.java | 0
.../apache/servicecomb/fence/jwt/JsonParser.java | 0
.../fence/token/AbstractOpenIDTokenStore.java | 0
.../fence/token/InMemoryOpenIDTokenStore.java | 0
.../apache/servicecomb/fence/token/JWTToken.java | 0
.../servicecomb/fence/token/JWTTokenStore.java | 0
.../servicecomb/fence/token/JWTTokenStoreImpl.java | 0
.../servicecomb/fence/token/OpenIDToken.java | 0
.../servicecomb/fence/token/OpenIDTokenStore.java | 0
.../servicecomb/fence/token/SessionToken.java | 0
.../servicecomb/fence/token/SessionTokenStore.java | 0
.../org/apache/servicecomb/fence/token/Token.java | 0
.../fence/token/TokenDynamicProperties.java | 0
.../fence/token/TokenDynamicPropertiesManager.java | 0
.../apache/servicecomb/fence/token/TokenStore.java | 0
.../servicecomb/fence/util/CommonConstants.java | 0
common/pom.xml | 23 ++++++----------------
edge-service/pom.xml | 2 +-
integration-tests/pom.xml | 2 +-
pom.xml | 2 +-
resource-server/pom.xml | 2 +-
41 files changed, 77 insertions(+), 40 deletions(-)
diff --git a/admin-service/pom.xml b/admin-service/pom.xml
index e78ae71..e5a3a7f 100644
--- a/admin-service/pom.xml
+++ b/admin-service/pom.xml
@@ -32,7 +32,7 @@
<dependencies>
<dependency>
<groupId>org.apache.servicecomb.fence</groupId>
- <artifactId>fence-common</artifactId>
+ <artifactId>fence-common-authentication</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
diff --git
a/admin-website/src/main/web/src/views/cloud/problems/components/main.vue
b/admin-website/src/main/web/src/views/cloud/problems/components/main.vue
index 0f57a32..a8c52ed 100644
--- a/admin-website/src/main/web/src/views/cloud/problems/components/main.vue
+++ b/admin-website/src/main/web/src/views/cloud/problems/components/main.vue
@@ -47,14 +47,14 @@
<tiny-grid-column field="name" title="name"
show-overflow></tiny-grid-column>
<tiny-grid-column field="duration"
title="duration"></tiny-grid-column>
<tiny-grid-column field="traceId" title="http.status_code">
- <template>
+ <template #default="data">
<div>
{{ data.row.tags['http.status_code'] }}
</div>
</template>
</tiny-grid-column>
<tiny-grid-column field="timestamp" title="timestamp">
- <template>
+ <template #default="data">
<div>
{{ timesHandle(data.row.timestamp) }}
</div>
@@ -137,7 +137,7 @@
const state = reactive({
filterOptions: {},
- traceData: {},
+ traceData: [],
toolbarButtons: [
{
code: 'clearRowExpand',
@@ -154,7 +154,8 @@
timestamp: state.filterOptions.startTime,
traceId: state.filterOptions.traceId,
}).then(response => {
- state.traceData = response.data
+ state.traceData = response
+ console.log('', state.traceData);
}, error => {
console.log('错误', error.message)
});
diff --git a/apis/authentication-server-api/pom.xml
b/apis/authentication-server-api/pom.xml
index a2be48a..e17f71d 100644
--- a/apis/authentication-server-api/pom.xml
+++ b/apis/authentication-server-api/pom.xml
@@ -27,7 +27,7 @@
<dependencies>
<dependency>
<groupId>org.apache.servicecomb.fence</groupId>
- <artifactId>fence-common</artifactId>
+ <artifactId>fence-common-authentication</artifactId>
<version>${project.version}</version>
</dependency>
</dependencies>
diff --git a/apis/edge-service-api/pom.xml b/apis/edge-service-api/pom.xml
index b83b109..9979978 100644
--- a/apis/edge-service-api/pom.xml
+++ b/apis/edge-service-api/pom.xml
@@ -31,7 +31,7 @@
<dependencies>
<dependency>
<groupId>org.apache.servicecomb.fence</groupId>
- <artifactId>fence-common</artifactId>
+ <artifactId>fence-common-authentication</artifactId>
<version>${project.version}</version>
</dependency>
</dependencies>
diff --git a/authentication-server/pom.xml b/authentication-server/pom.xml
index 2147a9b..a6199a3 100644
--- a/authentication-server/pom.xml
+++ b/authentication-server/pom.xml
@@ -31,7 +31,7 @@
<dependencies>
<dependency>
<groupId>org.apache.servicecomb.fence</groupId>
- <artifactId>fence-common</artifactId>
+ <artifactId>fence-common-authentication</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
diff --git a/common/pom.xml b/common/common-authentication-client/pom.xml
similarity index 84%
copy from common/pom.xml
copy to common/common-authentication-client/pom.xml
index 44187ea..b1acc05 100644
--- a/common/pom.xml
+++ b/common/common-authentication-client/pom.xml
@@ -22,14 +22,19 @@
<parent>
<groupId>org.apache.servicecomb.fence</groupId>
- <artifactId>project-fence</artifactId>
+ <artifactId>fence-common</artifactId>
<version>0.0.1-SNAPSHOT</version>
</parent>
- <artifactId>fence-common</artifactId>
+ <artifactId>fence-common-authentication-client</artifactId>
<packaging>jar</packaging>
<dependencies>
+ <dependency>
+ <groupId>org.apache.servicecomb.fence</groupId>
+ <artifactId>fence-common-authentication</artifactId>
+ <version>${project.version}</version>
+ </dependency>
<dependency>
<groupId>org.springframework.security</groupId>
<artifactId>spring-security-core</artifactId>
diff --git
a/resource-server/src/main/java/org/apache/servicecomb/fence/resource/AccessDeniedExceptionExceptionConverter.java
b/common/common-authentication-client/src/main/java/org/apache/servicecomb/fence/resource/AccessDeniedExceptionExceptionConverter.java
similarity index 100%
rename from
resource-server/src/main/java/org/apache/servicecomb/fence/resource/AccessDeniedExceptionExceptionConverter.java
rename to
common/common-authentication-client/src/main/java/org/apache/servicecomb/fence/resource/AccessDeniedExceptionExceptionConverter.java
diff --git
a/resource-server/src/main/java/org/apache/servicecomb/fence/resource/AccessDynamicProperties.java
b/common/common-authentication-client/src/main/java/org/apache/servicecomb/fence/resource/AccessDynamicProperties.java
similarity index 100%
rename from
resource-server/src/main/java/org/apache/servicecomb/fence/resource/AccessDynamicProperties.java
rename to
common/common-authentication-client/src/main/java/org/apache/servicecomb/fence/resource/AccessDynamicProperties.java
diff --git
a/resource-server/src/main/java/org/apache/servicecomb/fence/resource/AccessDynamicPropertiesManager.java
b/common/common-authentication-client/src/main/java/org/apache/servicecomb/fence/resource/AccessDynamicPropertiesManager.java
similarity index 100%
rename from
resource-server/src/main/java/org/apache/servicecomb/fence/resource/AccessDynamicPropertiesManager.java
rename to
common/common-authentication-client/src/main/java/org/apache/servicecomb/fence/resource/AccessDynamicPropertiesManager.java
diff --git
a/resource-server/src/main/java/org/apache/servicecomb/fence/resource/AuthFilter.java
b/common/common-authentication-client/src/main/java/org/apache/servicecomb/fence/resource/AuthFilter.java
similarity index 100%
rename from
resource-server/src/main/java/org/apache/servicecomb/fence/resource/AuthFilter.java
rename to
common/common-authentication-client/src/main/java/org/apache/servicecomb/fence/resource/AuthFilter.java
diff --git
a/resource-server/src/main/java/org/apache/servicecomb/fence/resource/AuthenticationAuthFilter.java
b/common/common-authentication-client/src/main/java/org/apache/servicecomb/fence/resource/AuthenticationAuthFilter.java
similarity index 99%
rename from
resource-server/src/main/java/org/apache/servicecomb/fence/resource/AuthenticationAuthFilter.java
rename to
common/common-authentication-client/src/main/java/org/apache/servicecomb/fence/resource/AuthenticationAuthFilter.java
index dcba0db..3ee52ee 100644
---
a/resource-server/src/main/java/org/apache/servicecomb/fence/resource/AuthenticationAuthFilter.java
+++
b/common/common-authentication-client/src/main/java/org/apache/servicecomb/fence/resource/AuthenticationAuthFilter.java
@@ -35,8 +35,6 @@ import
org.springframework.security.core.context.SecurityContextHolder;
import org.springframework.security.core.context.SecurityContextImpl;
import org.springframework.stereotype.Component;
-@Component
-@Order(0)
public class AuthenticationAuthFilter implements AuthFilter {
@Override
diff --git
a/resource-server/src/main/java/org/apache/servicecomb/fence/resource/AuthenticationConfiguration.java
b/common/common-authentication-client/src/main/java/org/apache/servicecomb/fence/resource/AuthenticationConfiguration.java
similarity index 88%
rename from
resource-server/src/main/java/org/apache/servicecomb/fence/resource/AuthenticationConfiguration.java
rename to
common/common-authentication-client/src/main/java/org/apache/servicecomb/fence/resource/AuthenticationConfiguration.java
index e9a6a72..5d4c03a 100644
---
a/resource-server/src/main/java/org/apache/servicecomb/fence/resource/AuthenticationConfiguration.java
+++
b/common/common-authentication-client/src/main/java/org/apache/servicecomb/fence/resource/AuthenticationConfiguration.java
@@ -24,6 +24,7 @@ import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Qualifier;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
+import org.springframework.core.annotation.Order;
import
org.springframework.security.config.annotation.method.configuration.EnableMethodSecurity;
import org.springframework.security.config.core.GrantedAuthorityDefaults;
import org.springframework.security.jwt.crypto.sign.MacSigner;
@@ -55,4 +56,16 @@ public class AuthenticationConfiguration {
public GrantedAuthorityDefaults grantedAuthorityDefaults() {
return new GrantedAuthorityDefaults("");
}
+
+ @Bean
+ @Order(0)
+ public AuthenticationAuthFilter authenticationAuthFilter() {
+ return new AuthenticationAuthFilter();
+ }
+
+ @Bean
+ @Order(100)
+ public ConfigBasedAuthorizationAuthFilter
configBasedAuthorizationAuthFilter() {
+ return new ConfigBasedAuthorizationAuthFilter();
+ }
}
diff --git
a/resource-server/src/main/java/org/apache/servicecomb/fence/resource/AuthenticationProviderFilter.java
b/common/common-authentication-client/src/main/java/org/apache/servicecomb/fence/resource/AuthenticationProviderFilter.java
similarity index 100%
rename from
resource-server/src/main/java/org/apache/servicecomb/fence/resource/AuthenticationProviderFilter.java
rename to
common/common-authentication-client/src/main/java/org/apache/servicecomb/fence/resource/AuthenticationProviderFilter.java
diff --git
a/resource-server/src/main/java/org/apache/servicecomb/fence/resource/ConfigBasedAuthorizationAuthFilter.java
b/common/common-authentication-client/src/main/java/org/apache/servicecomb/fence/resource/ConfigBasedAuthorizationAuthFilter.java
similarity index 94%
rename from
resource-server/src/main/java/org/apache/servicecomb/fence/resource/ConfigBasedAuthorizationAuthFilter.java
rename to
common/common-authentication-client/src/main/java/org/apache/servicecomb/fence/resource/ConfigBasedAuthorizationAuthFilter.java
index ff09931..44b0dae 100644
---
a/resource-server/src/main/java/org/apache/servicecomb/fence/resource/ConfigBasedAuthorizationAuthFilter.java
+++
b/common/common-authentication-client/src/main/java/org/apache/servicecomb/fence/resource/ConfigBasedAuthorizationAuthFilter.java
@@ -23,14 +23,10 @@ import java.util.HashSet;
import org.apache.commons.lang3.StringUtils;
import org.apache.servicecomb.core.Invocation;
import org.apache.servicecomb.swagger.invocation.exception.InvocationException;
-import org.springframework.core.annotation.Order;
import org.springframework.security.core.Authentication;
import org.springframework.security.core.GrantedAuthority;
import org.springframework.security.core.context.SecurityContextHolder;
-import org.springframework.stereotype.Component;
-@Component
-@Order(100)
public class ConfigBasedAuthorizationAuthFilter implements AuthFilter {
@Override
@@ -57,5 +53,4 @@ public class ConfigBasedAuthorizationAuthFilter implements
AuthFilter {
}
}
}
-
}
diff --git
a/resource-server/src/main/java/org/apache/servicecomb/fence/resource/SimpleAuthentication.java
b/common/common-authentication-client/src/main/java/org/apache/servicecomb/fence/resource/SimpleAuthentication.java
similarity index 100%
rename from
resource-server/src/main/java/org/apache/servicecomb/fence/resource/SimpleAuthentication.java
rename to
common/common-authentication-client/src/main/java/org/apache/servicecomb/fence/resource/SimpleAuthentication.java
diff --git
a/common/common-authentication-client/src/main/resources/META-INF/services/org.apache.servicecomb.core.exception.ExceptionConverter
b/common/common-authentication-client/src/main/resources/META-INF/services/org.apache.servicecomb.core.exception.ExceptionConverter
new file mode 100644
index 0000000..cc5c8c9
--- /dev/null
+++
b/common/common-authentication-client/src/main/resources/META-INF/services/org.apache.servicecomb.core.exception.ExceptionConverter
@@ -0,0 +1,18 @@
+#
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You under the Apache License, Version 2.0
+# (the "License"); you may not use this file except in compliance with
+# the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+org.apache.servicecomb.fence.resource.AccessDeniedExceptionExceptionConverter
\ No newline at end of file
diff --git
a/common/common-authentication-client/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports
b/common/common-authentication-client/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports
new file mode 100644
index 0000000..afc8ed4
--- /dev/null
+++
b/common/common-authentication-client/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports
@@ -0,0 +1,18 @@
+## ---------------------------------------------------------------------------
+## Licensed to the Apache Software Foundation (ASF) under one or more
+## contributor license agreements. See the NOTICE file distributed with
+## this work for additional information regarding copyright ownership.
+## The ASF licenses this file to You under the Apache License, Version 2.0
+## (the "License"); you may not use this file except in compliance with
+## the License. You may obtain a copy of the License at
+##
+## http://www.apache.org/licenses/LICENSE-2.0
+##
+## Unless required by applicable law or agreed to in writing, software
+## distributed under the License is distributed on an "AS IS" BASIS,
+## WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+## See the License for the specific language governing permissions and
+## limitations under the License.
+## ---------------------------------------------------------------------------
+
+org.apache.servicecomb.fence.resource.AuthenticationConfiguration
diff --git a/common/pom.xml b/common/common-authentication/pom.xml
similarity index 94%
copy from common/pom.xml
copy to common/common-authentication/pom.xml
index 44187ea..94228bc 100644
--- a/common/pom.xml
+++ b/common/common-authentication/pom.xml
@@ -22,11 +22,11 @@
<parent>
<groupId>org.apache.servicecomb.fence</groupId>
- <artifactId>project-fence</artifactId>
+ <artifactId>fence-common</artifactId>
<version>0.0.1-SNAPSHOT</version>
</parent>
- <artifactId>fence-common</artifactId>
+ <artifactId>fence-common-authentication</artifactId>
<packaging>jar</packaging>
<dependencies>
diff --git
a/common/src/main/java/org/apache/servicecomb/fence/jwt/JWTClaims.java
b/common/common-authentication/src/main/java/org/apache/servicecomb/fence/jwt/JWTClaims.java
similarity index 100%
rename from common/src/main/java/org/apache/servicecomb/fence/jwt/JWTClaims.java
rename to
common/common-authentication/src/main/java/org/apache/servicecomb/fence/jwt/JWTClaims.java
diff --git
a/common/src/main/java/org/apache/servicecomb/fence/jwt/JWTClaimsCommon.java
b/common/common-authentication/src/main/java/org/apache/servicecomb/fence/jwt/JWTClaimsCommon.java
similarity index 100%
rename from
common/src/main/java/org/apache/servicecomb/fence/jwt/JWTClaimsCommon.java
rename to
common/common-authentication/src/main/java/org/apache/servicecomb/fence/jwt/JWTClaimsCommon.java
diff --git
a/common/src/main/java/org/apache/servicecomb/fence/jwt/JWTHeader.java
b/common/common-authentication/src/main/java/org/apache/servicecomb/fence/jwt/JWTHeader.java
similarity index 100%
rename from common/src/main/java/org/apache/servicecomb/fence/jwt/JWTHeader.java
rename to
common/common-authentication/src/main/java/org/apache/servicecomb/fence/jwt/JWTHeader.java
diff --git
a/common/src/main/java/org/apache/servicecomb/fence/jwt/JsonParser.java
b/common/common-authentication/src/main/java/org/apache/servicecomb/fence/jwt/JsonParser.java
similarity index 100%
rename from
common/src/main/java/org/apache/servicecomb/fence/jwt/JsonParser.java
rename to
common/common-authentication/src/main/java/org/apache/servicecomb/fence/jwt/JsonParser.java
diff --git
a/common/src/main/java/org/apache/servicecomb/fence/token/AbstractOpenIDTokenStore.java
b/common/common-authentication/src/main/java/org/apache/servicecomb/fence/token/AbstractOpenIDTokenStore.java
similarity index 100%
rename from
common/src/main/java/org/apache/servicecomb/fence/token/AbstractOpenIDTokenStore.java
rename to
common/common-authentication/src/main/java/org/apache/servicecomb/fence/token/AbstractOpenIDTokenStore.java
diff --git
a/common/src/main/java/org/apache/servicecomb/fence/token/InMemoryOpenIDTokenStore.java
b/common/common-authentication/src/main/java/org/apache/servicecomb/fence/token/InMemoryOpenIDTokenStore.java
similarity index 100%
rename from
common/src/main/java/org/apache/servicecomb/fence/token/InMemoryOpenIDTokenStore.java
rename to
common/common-authentication/src/main/java/org/apache/servicecomb/fence/token/InMemoryOpenIDTokenStore.java
diff --git
a/common/src/main/java/org/apache/servicecomb/fence/token/JWTToken.java
b/common/common-authentication/src/main/java/org/apache/servicecomb/fence/token/JWTToken.java
similarity index 100%
rename from
common/src/main/java/org/apache/servicecomb/fence/token/JWTToken.java
rename to
common/common-authentication/src/main/java/org/apache/servicecomb/fence/token/JWTToken.java
diff --git
a/common/src/main/java/org/apache/servicecomb/fence/token/JWTTokenStore.java
b/common/common-authentication/src/main/java/org/apache/servicecomb/fence/token/JWTTokenStore.java
similarity index 100%
rename from
common/src/main/java/org/apache/servicecomb/fence/token/JWTTokenStore.java
rename to
common/common-authentication/src/main/java/org/apache/servicecomb/fence/token/JWTTokenStore.java
diff --git
a/common/src/main/java/org/apache/servicecomb/fence/token/JWTTokenStoreImpl.java
b/common/common-authentication/src/main/java/org/apache/servicecomb/fence/token/JWTTokenStoreImpl.java
similarity index 100%
rename from
common/src/main/java/org/apache/servicecomb/fence/token/JWTTokenStoreImpl.java
rename to
common/common-authentication/src/main/java/org/apache/servicecomb/fence/token/JWTTokenStoreImpl.java
diff --git
a/common/src/main/java/org/apache/servicecomb/fence/token/OpenIDToken.java
b/common/common-authentication/src/main/java/org/apache/servicecomb/fence/token/OpenIDToken.java
similarity index 100%
rename from
common/src/main/java/org/apache/servicecomb/fence/token/OpenIDToken.java
rename to
common/common-authentication/src/main/java/org/apache/servicecomb/fence/token/OpenIDToken.java
diff --git
a/common/src/main/java/org/apache/servicecomb/fence/token/OpenIDTokenStore.java
b/common/common-authentication/src/main/java/org/apache/servicecomb/fence/token/OpenIDTokenStore.java
similarity index 100%
rename from
common/src/main/java/org/apache/servicecomb/fence/token/OpenIDTokenStore.java
rename to
common/common-authentication/src/main/java/org/apache/servicecomb/fence/token/OpenIDTokenStore.java
diff --git
a/common/src/main/java/org/apache/servicecomb/fence/token/SessionToken.java
b/common/common-authentication/src/main/java/org/apache/servicecomb/fence/token/SessionToken.java
similarity index 100%
rename from
common/src/main/java/org/apache/servicecomb/fence/token/SessionToken.java
rename to
common/common-authentication/src/main/java/org/apache/servicecomb/fence/token/SessionToken.java
diff --git
a/common/src/main/java/org/apache/servicecomb/fence/token/SessionTokenStore.java
b/common/common-authentication/src/main/java/org/apache/servicecomb/fence/token/SessionTokenStore.java
similarity index 100%
rename from
common/src/main/java/org/apache/servicecomb/fence/token/SessionTokenStore.java
rename to
common/common-authentication/src/main/java/org/apache/servicecomb/fence/token/SessionTokenStore.java
diff --git a/common/src/main/java/org/apache/servicecomb/fence/token/Token.java
b/common/common-authentication/src/main/java/org/apache/servicecomb/fence/token/Token.java
similarity index 100%
rename from common/src/main/java/org/apache/servicecomb/fence/token/Token.java
rename to
common/common-authentication/src/main/java/org/apache/servicecomb/fence/token/Token.java
diff --git
a/common/src/main/java/org/apache/servicecomb/fence/token/TokenDynamicProperties.java
b/common/common-authentication/src/main/java/org/apache/servicecomb/fence/token/TokenDynamicProperties.java
similarity index 100%
rename from
common/src/main/java/org/apache/servicecomb/fence/token/TokenDynamicProperties.java
rename to
common/common-authentication/src/main/java/org/apache/servicecomb/fence/token/TokenDynamicProperties.java
diff --git
a/common/src/main/java/org/apache/servicecomb/fence/token/TokenDynamicPropertiesManager.java
b/common/common-authentication/src/main/java/org/apache/servicecomb/fence/token/TokenDynamicPropertiesManager.java
similarity index 100%
rename from
common/src/main/java/org/apache/servicecomb/fence/token/TokenDynamicPropertiesManager.java
rename to
common/common-authentication/src/main/java/org/apache/servicecomb/fence/token/TokenDynamicPropertiesManager.java
diff --git
a/common/src/main/java/org/apache/servicecomb/fence/token/TokenStore.java
b/common/common-authentication/src/main/java/org/apache/servicecomb/fence/token/TokenStore.java
similarity index 100%
rename from
common/src/main/java/org/apache/servicecomb/fence/token/TokenStore.java
rename to
common/common-authentication/src/main/java/org/apache/servicecomb/fence/token/TokenStore.java
diff --git
a/common/src/main/java/org/apache/servicecomb/fence/util/CommonConstants.java
b/common/common-authentication/src/main/java/org/apache/servicecomb/fence/util/CommonConstants.java
similarity index 100%
rename from
common/src/main/java/org/apache/servicecomb/fence/util/CommonConstants.java
rename to
common/common-authentication/src/main/java/org/apache/servicecomb/fence/util/CommonConstants.java
diff --git a/common/pom.xml b/common/pom.xml
index 44187ea..1e617a6 100644
--- a/common/pom.xml
+++ b/common/pom.xml
@@ -27,21 +27,10 @@
</parent>
<artifactId>fence-common</artifactId>
- <packaging>jar</packaging>
+ <packaging>pom</packaging>
- <dependencies>
- <dependency>
- <groupId>org.springframework.security</groupId>
- <artifactId>spring-security-core</artifactId>
- </dependency>
- <dependency>
- <groupId>org.springframework.security</groupId>
- <artifactId>spring-security-config</artifactId>
- </dependency>
- <dependency>
- <groupId>org.springframework.security</groupId>
- <artifactId>spring-security-jwt</artifactId>
- </dependency>
- </dependencies>
-
-</project>
\ No newline at end of file
+ <modules>
+ <module>common-authentication</module>
+ <module>common-authentication-client</module>
+ </modules>
+</project>
diff --git a/edge-service/pom.xml b/edge-service/pom.xml
index d93be9c..6d85acc 100644
--- a/edge-service/pom.xml
+++ b/edge-service/pom.xml
@@ -31,7 +31,7 @@
<dependencies>
<dependency>
<groupId>org.apache.servicecomb.fence</groupId>
- <artifactId>fence-common</artifactId>
+ <artifactId>fence-common-authentication</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
diff --git a/integration-tests/pom.xml b/integration-tests/pom.xml
index 0ae9dc3..de014ba 100644
--- a/integration-tests/pom.xml
+++ b/integration-tests/pom.xml
@@ -31,7 +31,7 @@
<dependencies>
<dependency>
<groupId>org.apache.servicecomb.fence</groupId>
- <artifactId>fence-common</artifactId>
+ <artifactId>fence-common-authentication</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
diff --git a/pom.xml b/pom.xml
index da58940..dbd64bb 100644
--- a/pom.xml
+++ b/pom.xml
@@ -27,7 +27,7 @@
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
- <servicecomb.version>3.2.0-SNAPSHOT</servicecomb.version>
+ <servicecomb.version>3.1.2</servicecomb.version>
<spring-boot-maven-plugin.version>3.1.3</spring-boot-maven-plugin.version>
<maven-compiler-plugin.version>3.11.0</maven-compiler-plugin.version>
</properties>
diff --git a/resource-server/pom.xml b/resource-server/pom.xml
index 2b1ddf4..5584f53 100644
--- a/resource-server/pom.xml
+++ b/resource-server/pom.xml
@@ -32,7 +32,7 @@
<dependencies>
<dependency>
<groupId>org.apache.servicecomb.fence</groupId>
- <artifactId>fence-common</artifactId>
+ <artifactId>fence-common-authentication-client</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
