From ee8bddf4c6b92de75d5ed5c0fad5f0d2a6a110c7 Mon Sep 17 00:00:00 2001
From: xieb <vip_xiaobin810@163.com>
Date: Tue, 28 Mar 2023 19:35:07 +0800
Subject: [PATCH] 框架整理
---
skjcmanager/skjcmanager-ops/skjcmanager-xxljob-admin/pom.xml | 4
skjcmanager/skjcmanager-service-api/pom.xml | 2
skjcmanager/skjcmanager-auth/src/main/java/cn/gistack/auth/AuthApplication.java | 5
skjcmanager/skjcmanager-common/pom.xml | 2
skjcmanager/skjcmanager-plugin-api/pom.xml | 2
skjcmanager/skjcmanager-ops/skjcmanager-xxljob/pom.xml | 4
skjcmanager/skjcmanager-service/skjcmanager-system/pom.xml | 10 +-
skjcmanager/skjcmanager-ops/pom.xml | 2
skjcmanager/skjcmanager-service/skjcmanager-user/pom.xml | 10 +-
skjcmanager/skjcmanager-ops/skjcmanager-swagger/src/main/java/cn/gistack/swagger/SwaggerApplication.java | 2
skjcmanager/skjcmanager-gateway/pom.xml | 4
skjcmanager/skjcmanager-ops-api/skjcmanager-resource-api/pom.xml | 2
skjcmanager/skjcmanager-service-api/skjcmanager-dict-api/pom.xml | 2
skjcmanager/skjcmanager-ops-api/skjcmanager-flow-api/pom.xml | 2
skjcmanager/skjcmanager-ops/skjcmanager-swagger/pom.xml | 4
skjcmanager/skjcmanager-ops/skjcmanager-log/pom.xml | 4
skjcmanager/skjcmanager-plugin/pom.xml | 2
skjcmanager/skjcmanager-service-api/skjcmanager-desk-api/pom.xml | 2
skjcmanager/skjcmanager-ops/skjcmanager-admin/pom.xml | 4
skjcmanager/skjcmanager-ops/skjcmanager-develop/pom.xml | 8 +-
skjcmanager/skjcmanager-ops/skjcmanager-report/pom.xml | 4
skjcmanager/skjcmanager-gateway/src/main/java/cn/gistack/gateway/GateWayApplication.java | 3
skjcmanager/skjcmanager-service/skjcmanager-user/src/main/java/cn/gistack/system/user/UserApplication.java | 5
skjcmanager/skjcmanager-service-api/skjcmanager-scope-api/pom.xml | 2
skjcmanager/skjcmanager-service/skjcmanager-system/src/main/java/cn/gistack/system/SystemApplication.java | 5
skjcmanager/skjcmanager-service/pom.xml | 12 +-
skjcmanager/skjcmanager-auth/src/main/resources/application.yml | 2
skjcmanager/skjcmanager-ops-api/pom.xml | 2
skjcmanager/skjcmanager-service-api/skjcmanager-system-api/pom.xml | 2
skjcmanager/skjcmanager-auth/pom.xml | 12 +-
/dev/null | 30 -------
skjcmanager/skjcmanager-ops/skjcmanager-flow/pom.xml | 20 ++--
skjcmanager/skjcmanager-service-api/skjcmanager-user-api/pom.xml | 2
skjcmanager/skjcmanager-ops/skjcmanager-resource/pom.xml | 12 +-
skjcmanager/skjcmanager-service/skjcmanager-desk/pom.xml | 14 +-
skjcmanager/pom.xml | 6
36 files changed, 89 insertions(+), 121 deletions(-)
diff --git a/skjcmanager/pom.xml b/skjcmanager/pom.xml
index 5be0853..d335f5c 100644
--- a/skjcmanager/pom.xml
+++ b/skjcmanager/pom.xml
@@ -3,7 +3,7 @@
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
- <groupId>org.springblade</groupId>
+ <groupId>cn.gistack</groupId>
<artifactId>skjcmanager</artifactId>
<version>3.0.1.RELEASE</version>
<packaging>pom</packaging>
@@ -51,9 +51,9 @@
<scope>import</scope>
</dependency>
<dependency>
- <groupId>org.springblade</groupId>
+ <groupId>cn.gistack</groupId>
<artifactId>skjcmanager-common</artifactId>
- <version>${bladex.project.version}</version>
+ <version>3.0.1.RELEASE</version>
</dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
diff --git a/skjcmanager/skjcmanager-auth/pom.xml b/skjcmanager/skjcmanager-auth/pom.xml
index 91693a7..35c3856 100644
--- a/skjcmanager/skjcmanager-auth/pom.xml
+++ b/skjcmanager/skjcmanager-auth/pom.xml
@@ -7,7 +7,7 @@
<parent>
<artifactId>skjcmanager</artifactId>
- <groupId>org.springblade</groupId>
+ <groupId>cn.gistack</groupId>
<version>3.0.1.RELEASE</version>
</parent>
@@ -19,7 +19,7 @@
<dependencies>
<!--Blade-->
<dependency>
- <groupId>org.springblade</groupId>
+ <groupId>cn.gistack</groupId>
<artifactId>skjcmanager-common</artifactId>
<version>${bladex.project.version}</version>
<exclusions>
@@ -54,14 +54,14 @@
<artifactId>blade-starter-social</artifactId>
</dependency>
<dependency>
- <groupId>org.springblade</groupId>
+ <groupId>cn.gistack</groupId>
<artifactId>skjcmanager-user-api</artifactId>
- <version>${bladex.project.version}</version>
+ <version>3.0.1.RELEASE</version>
</dependency>
<dependency>
- <groupId>org.springblade</groupId>
+ <groupId>cn.gistack</groupId>
<artifactId>skjcmanager-system-api</artifactId>
- <version>${bladex.project.version}</version>
+ <version>3.0.1.RELEASE</version>
</dependency>
<!--安全模块-->
<dependency>
diff --git a/skjcmanager/skjcmanager-auth/src/main/java/cn/gistack/auth/AuthApplication.java b/skjcmanager/skjcmanager-auth/src/main/java/cn/gistack/auth/AuthApplication.java
index 250626b..fd50e45 100644
--- a/skjcmanager/skjcmanager-auth/src/main/java/cn/gistack/auth/AuthApplication.java
+++ b/skjcmanager/skjcmanager-auth/src/main/java/cn/gistack/auth/AuthApplication.java
@@ -17,7 +17,6 @@
package cn.gistack.auth;
-import cn.gistack.common.constant.AppsConstant;
import org.springblade.core.cloud.client.BladeCloudApplication;
import org.springblade.core.launch.BladeApplication;
import org.springblade.core.launch.constant.AppConstant;
@@ -29,11 +28,11 @@
* @author Chill
*/
@BladeCloudApplication
-@EnableFeignClients(basePackages = "cn.gistack.system.user.feign")
+@EnableFeignClients({"cn.gistack"})
public class AuthApplication {
public static void main(String[] args) {
- BladeApplication.run(AppsConstant.APPLICATION_AUTH_NAME, AuthApplication.class, args);
+ BladeApplication.run(AppConstant.APPLICATION_AUTH_NAME, AuthApplication.class, args);
}
}
diff --git a/skjcmanager/skjcmanager-auth/src/main/resources/application.yml b/skjcmanager/skjcmanager-auth/src/main/resources/application.yml
index 9e7573c..132cc61 100644
--- a/skjcmanager/skjcmanager-auth/src/main/resources/application.yml
+++ b/skjcmanager/skjcmanager-auth/src/main/resources/application.yml
@@ -37,7 +37,7 @@
#swagger文档
swagger:
base-packages:
- - org.springblade
+ - cn.gistack
- org.springframework.security.oauth2.provider.endpoint
#第三方登陆
diff --git a/skjcmanager/skjcmanager-common/pom.xml b/skjcmanager/skjcmanager-common/pom.xml
index 803a909..94f1b35 100644
--- a/skjcmanager/skjcmanager-common/pom.xml
+++ b/skjcmanager/skjcmanager-common/pom.xml
@@ -4,7 +4,7 @@
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<parent>
<artifactId>skjcmanager</artifactId>
- <groupId>org.springblade</groupId>
+ <groupId>cn.gistack</groupId>
<version>3.0.1.RELEASE</version>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/skjcmanager/skjcmanager-common/src/main/java/cn/gistack/common/constant/AppsConstant.java b/skjcmanager/skjcmanager-common/src/main/java/cn/gistack/common/constant/AppsConstant.java
deleted file mode 100644
index 9c006c1..0000000
--- a/skjcmanager/skjcmanager-common/src/main/java/cn/gistack/common/constant/AppsConstant.java
+++ /dev/null
@@ -1,30 +0,0 @@
-package cn.gistack.common.constant;
-
-public interface AppsConstant {
-
- String APPLICATION_VERSION = "3.0.1.RELEASE";
- String BASE_PACKAGES = "cn.skjcmanager";
- String APPLICATION_NAME_PREFIX = "skjcmanager-";
- String APPLICATION_GATEWAY_NAME = "skjcmanager-gateway";
- String APPLICATION_AUTH_NAME = "skjcmanager-auth";
- String APPLICATION_ADMIN_NAME = "skjcmanager-admin";
- String APPLICATION_REPORT_NAME = "skjcmanager-report";
- String APPLICATION_TURBINE_NAME = "skjcmanager-turbine";
- String APPLICATION_ZIPKIN_NAME = "skjcmanager-zipkin";
- String APPLICATION_WEBSOCKET_NAME = "skjcmanager-websocket";
- String APPLICATION_DESK_NAME = "skjcmanager-desk";
- String APPLICATION_SYSTEM_NAME = "skjcmanager-system";
- String APPLICATION_USER_NAME = "skjcmanager-user";
- String APPLICATION_LOG_NAME = "skjcmanager-log";
- String APPLICATION_DEVELOP_NAME = "skjcmanager-develop";
- String APPLICATION_FLOWDESIGN_NAME = "skjcmanager-flowdesign";
- String APPLICATION_FLOW_NAME = "skjcmanager-flow";
- String APPLICATION_RESOURCE_NAME = "skjcmanager-resource";
- String APPLICATION_SWAGGER_NAME = "skjcmanager-swagger";
- String APPLICATION_TEST_NAME = "skjcmanager-test";
- String APPLICATION_DEMO_NAME = "skjcmanager-demo";
- String DEV_CODE = "dev";
- String PROD_CODE = "prod";
- String TEST_CODE = "test";
- String OS_NAME_LINUX = "LINUX";
-}
diff --git a/skjcmanager/skjcmanager-gateway/pom.xml b/skjcmanager/skjcmanager-gateway/pom.xml
index b974c96..87f004d 100644
--- a/skjcmanager/skjcmanager-gateway/pom.xml
+++ b/skjcmanager/skjcmanager-gateway/pom.xml
@@ -4,7 +4,7 @@
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<parent>
<artifactId>skjcmanager</artifactId>
- <groupId>org.springblade</groupId>
+ <groupId>cn.gistack</groupId>
<version>3.0.1.RELEASE</version>
</parent>
<modelVersion>4.0.0</modelVersion>
@@ -31,7 +31,7 @@
</exclusions>
</dependency>
<dependency>
- <groupId>org.springblade</groupId>
+ <groupId>cn.gistack</groupId>
<artifactId>skjcmanager-common</artifactId>
<version>${bladex.project.version}</version>
<exclusions>
diff --git a/skjcmanager/skjcmanager-gateway/src/main/java/cn/gistack/gateway/GateWayApplication.java b/skjcmanager/skjcmanager-gateway/src/main/java/cn/gistack/gateway/GateWayApplication.java
index 822d002..1e80373 100644
--- a/skjcmanager/skjcmanager-gateway/src/main/java/cn/gistack/gateway/GateWayApplication.java
+++ b/skjcmanager/skjcmanager-gateway/src/main/java/cn/gistack/gateway/GateWayApplication.java
@@ -16,7 +16,6 @@
*/
package cn.gistack.gateway;
-import cn.gistack.common.constant.AppsConstant;
import org.springblade.core.launch.BladeApplication;
import org.springblade.core.launch.constant.AppConstant;
import org.springframework.boot.autoconfigure.SpringBootApplication;
@@ -34,7 +33,7 @@
public class GateWayApplication {
public static void main(String[] args) {
- BladeApplication.run(AppsConstant.APPLICATION_GATEWAY_NAME, GateWayApplication.class, args);
+ BladeApplication.run(AppConstant.APPLICATION_GATEWAY_NAME, GateWayApplication.class, args);
}
}
diff --git a/skjcmanager/skjcmanager-ops-api/pom.xml b/skjcmanager/skjcmanager-ops-api/pom.xml
index 8440eca..f89d6f0 100644
--- a/skjcmanager/skjcmanager-ops-api/pom.xml
+++ b/skjcmanager/skjcmanager-ops-api/pom.xml
@@ -4,7 +4,7 @@
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<parent>
<artifactId>skjcmanager</artifactId>
- <groupId>org.springblade</groupId>
+ <groupId>cn.gistack</groupId>
<version>3.0.1.RELEASE</version>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/skjcmanager/skjcmanager-ops-api/skjcmanager-flow-api/pom.xml b/skjcmanager/skjcmanager-ops-api/skjcmanager-flow-api/pom.xml
index da90e16..e9a2ed3 100644
--- a/skjcmanager/skjcmanager-ops-api/skjcmanager-flow-api/pom.xml
+++ b/skjcmanager/skjcmanager-ops-api/skjcmanager-flow-api/pom.xml
@@ -4,7 +4,7 @@
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<parent>
<artifactId>skjcmanager-ops-api</artifactId>
- <groupId>org.springblade</groupId>
+ <groupId>cn.gistack</groupId>
<version>3.0.1.RELEASE</version>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/skjcmanager/skjcmanager-ops-api/skjcmanager-resource-api/pom.xml b/skjcmanager/skjcmanager-ops-api/skjcmanager-resource-api/pom.xml
index c4af972..d21be9e 100644
--- a/skjcmanager/skjcmanager-ops-api/skjcmanager-resource-api/pom.xml
+++ b/skjcmanager/skjcmanager-ops-api/skjcmanager-resource-api/pom.xml
@@ -4,7 +4,7 @@
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<parent>
<artifactId>skjcmanager-ops-api</artifactId>
- <groupId>org.springblade</groupId>
+ <groupId>cn.gistack</groupId>
<version>3.0.1.RELEASE</version>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/skjcmanager/skjcmanager-ops/pom.xml b/skjcmanager/skjcmanager-ops/pom.xml
index 540d759..f457c37 100644
--- a/skjcmanager/skjcmanager-ops/pom.xml
+++ b/skjcmanager/skjcmanager-ops/pom.xml
@@ -4,7 +4,7 @@
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<parent>
<artifactId>skjcmanager</artifactId>
- <groupId>org.springblade</groupId>
+ <groupId>cn.gistack</groupId>
<version>3.0.1.RELEASE</version>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/skjcmanager/skjcmanager-ops/skjcmanager-admin/pom.xml b/skjcmanager/skjcmanager-ops/skjcmanager-admin/pom.xml
index b3ba324..ab0f629 100644
--- a/skjcmanager/skjcmanager-ops/skjcmanager-admin/pom.xml
+++ b/skjcmanager/skjcmanager-ops/skjcmanager-admin/pom.xml
@@ -4,7 +4,7 @@
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<parent>
<artifactId>skjcmanager-ops</artifactId>
- <groupId>org.springblade</groupId>
+ <groupId>cn.gistack</groupId>
<version>3.0.1.RELEASE</version>
</parent>
<modelVersion>4.0.0</modelVersion>
@@ -17,7 +17,7 @@
<dependencies>
<!--Blade-->
<dependency>
- <groupId>org.springblade</groupId>
+ <groupId>cn.gistack</groupId>
<artifactId>skjcmanager-common</artifactId>
<version>${bladex.project.version}</version>
<exclusions>
diff --git a/skjcmanager/skjcmanager-ops/skjcmanager-develop/pom.xml b/skjcmanager/skjcmanager-ops/skjcmanager-develop/pom.xml
index b33cdf4..9b6178e 100644
--- a/skjcmanager/skjcmanager-ops/skjcmanager-develop/pom.xml
+++ b/skjcmanager/skjcmanager-ops/skjcmanager-develop/pom.xml
@@ -4,7 +4,7 @@
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<parent>
- <groupId>org.springblade</groupId>
+ <groupId>cn.gistack</groupId>
<artifactId>skjcmanager-ops</artifactId>
<version>3.0.1.RELEASE</version>
</parent>
@@ -31,14 +31,14 @@
<artifactId>blade-starter-swagger</artifactId>
</dependency>
<dependency>
- <groupId>org.springblade</groupId>
+ <groupId>cn.gistack</groupId>
<artifactId>skjcmanager-common</artifactId>
<version>${bladex.project.version}</version>
</dependency>
<dependency>
- <groupId>org.springblade</groupId>
+ <groupId>cn.gistack</groupId>
<artifactId>skjcmanager-dict-api</artifactId>
- <version>${bladex.project.version}</version>
+ <version>3.0.1.RELEASE</version>
</dependency>
</dependencies>
diff --git a/skjcmanager/skjcmanager-ops/skjcmanager-flow/pom.xml b/skjcmanager/skjcmanager-ops/skjcmanager-flow/pom.xml
index f152c03..6015885 100644
--- a/skjcmanager/skjcmanager-ops/skjcmanager-flow/pom.xml
+++ b/skjcmanager/skjcmanager-ops/skjcmanager-flow/pom.xml
@@ -4,7 +4,7 @@
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<parent>
<artifactId>skjcmanager-ops</artifactId>
- <groupId>org.springblade</groupId>
+ <groupId>cn.gistack</groupId>
<version>3.0.1.RELEASE</version>
</parent>
<modelVersion>4.0.0</modelVersion>
@@ -17,7 +17,7 @@
<dependencies>
<!-- Blade -->
<dependency>
- <groupId>org.springblade</groupId>
+ <groupId>cn.gistack</groupId>
<artifactId>skjcmanager-common</artifactId>
<version>${bladex.project.version}</version>
</dependency>
@@ -34,14 +34,14 @@
<artifactId>blade-starter-transaction</artifactId>
</dependency>-->
<dependency>
- <groupId>org.springblade</groupId>
+ <groupId>cn.gistack</groupId>
<artifactId>skjcmanager-dict-api</artifactId>
- <version>${bladex.project.version}</version>
+ <version>3.0.1.RELEASE</version>
</dependency>
<dependency>
- <groupId>org.springblade</groupId>
+ <groupId>cn.gistack</groupId>
<artifactId>skjcmanager-scope-api</artifactId>
- <version>${bladex.project.version}</version>
+ <version>3.0.1.RELEASE</version>
</dependency>
<dependency>
<groupId>org.springblade</groupId>
@@ -49,14 +49,14 @@
<scope>provided</scope>
</dependency>
<dependency>
- <groupId>org.springblade</groupId>
+ <groupId>cn.gistack</groupId>
<artifactId>skjcmanager-user-api</artifactId>
- <version>${bladex.project.version}</version>
+ <version>3.0.1.RELEASE</version>
</dependency>
<dependency>
- <groupId>org.springblade</groupId>
+ <groupId>cn.gistack</groupId>
<artifactId>skjcmanager-flow-api</artifactId>
- <version>${bladex.project.version}</version>
+ <version>3.0.1.RELEASE</version>
</dependency>
<!-- 工作流 -->
<dependency>
diff --git a/skjcmanager/skjcmanager-ops/skjcmanager-log/pom.xml b/skjcmanager/skjcmanager-ops/skjcmanager-log/pom.xml
index f28b794..14df1e2 100644
--- a/skjcmanager/skjcmanager-ops/skjcmanager-log/pom.xml
+++ b/skjcmanager/skjcmanager-ops/skjcmanager-log/pom.xml
@@ -4,7 +4,7 @@
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<parent>
<artifactId>skjcmanager-ops</artifactId>
- <groupId>org.springblade</groupId>
+ <groupId>cn.gistack</groupId>
<version>3.0.1.RELEASE</version>
</parent>
<modelVersion>4.0.0</modelVersion>
@@ -17,7 +17,7 @@
<dependencies>
<!--Blade-->
<dependency>
- <groupId>org.springblade</groupId>
+ <groupId>cn.gistack</groupId>
<artifactId>skjcmanager-common</artifactId>
<version>${bladex.project.version}</version>
</dependency>
diff --git a/skjcmanager/skjcmanager-ops/skjcmanager-report/pom.xml b/skjcmanager/skjcmanager-ops/skjcmanager-report/pom.xml
index f1858cb..325339a 100644
--- a/skjcmanager/skjcmanager-ops/skjcmanager-report/pom.xml
+++ b/skjcmanager/skjcmanager-ops/skjcmanager-report/pom.xml
@@ -4,7 +4,7 @@
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<parent>
<artifactId>skjcmanager-ops</artifactId>
- <groupId>org.springblade</groupId>
+ <groupId>cn.gistack</groupId>
<version>3.0.1.RELEASE</version>
</parent>
<modelVersion>4.0.0</modelVersion>
@@ -17,7 +17,7 @@
<dependencies>
<!--Blade-->
<dependency>
- <groupId>org.springblade</groupId>
+ <groupId>cn.gistack</groupId>
<artifactId>skjcmanager-common</artifactId>
<version>${bladex.project.version}</version>
</dependency>
diff --git a/skjcmanager/skjcmanager-ops/skjcmanager-resource/pom.xml b/skjcmanager/skjcmanager-ops/skjcmanager-resource/pom.xml
index 3696d0d..096e2cc 100644
--- a/skjcmanager/skjcmanager-ops/skjcmanager-resource/pom.xml
+++ b/skjcmanager/skjcmanager-ops/skjcmanager-resource/pom.xml
@@ -4,7 +4,7 @@
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<parent>
<artifactId>skjcmanager-ops</artifactId>
- <groupId>org.springblade</groupId>
+ <groupId>cn.gistack</groupId>
<version>3.0.1.RELEASE</version>
</parent>
<modelVersion>4.0.0</modelVersion>
@@ -16,7 +16,7 @@
<dependencies>
<dependency>
- <groupId>org.springblade</groupId>
+ <groupId>cn.gistack</groupId>
<artifactId>skjcmanager-common</artifactId>
<version>${bladex.project.version}</version>
</dependency>
@@ -74,14 +74,14 @@
<artifactId>yunpian-java-sdk</artifactId>
</dependency>
<dependency>
- <groupId>org.springblade</groupId>
+ <groupId>cn.gistack</groupId>
<artifactId>skjcmanager-resource-api</artifactId>
- <version>${bladex.project.version}</version>
+ <version>3.0.1.RELEASE</version>
</dependency>
<dependency>
- <groupId>org.springblade</groupId>
+ <groupId>cn.gistack</groupId>
<artifactId>skjcmanager-dict-api</artifactId>
- <version>${bladex.project.version}</version>
+ <version>3.0.1.RELEASE</version>
</dependency>
</dependencies>
diff --git a/skjcmanager/skjcmanager-ops/skjcmanager-swagger/pom.xml b/skjcmanager/skjcmanager-ops/skjcmanager-swagger/pom.xml
index 05e6e19..6e622af 100644
--- a/skjcmanager/skjcmanager-ops/skjcmanager-swagger/pom.xml
+++ b/skjcmanager/skjcmanager-ops/skjcmanager-swagger/pom.xml
@@ -4,7 +4,7 @@
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<parent>
<artifactId>skjcmanager-ops</artifactId>
- <groupId>org.springblade</groupId>
+ <groupId>cn.gistack</groupId>
<version>3.0.1.RELEASE</version>
</parent>
<modelVersion>4.0.0</modelVersion>
@@ -16,7 +16,7 @@
<dependencies>
<dependency>
- <groupId>org.springblade</groupId>
+ <groupId>cn.gistack</groupId>
<artifactId>skjcmanager-common</artifactId>
<version>${bladex.project.version}</version>
</dependency>
diff --git a/skjcmanager/skjcmanager-ops/skjcmanager-swagger/src/main/java/cn/gistack/swagger/SwaggerApplication.java b/skjcmanager/skjcmanager-ops/skjcmanager-swagger/src/main/java/cn/gistack/swagger/SwaggerApplication.java
index 0d4139c..8ec9b69 100644
--- a/skjcmanager/skjcmanager-ops/skjcmanager-swagger/src/main/java/cn/gistack/swagger/SwaggerApplication.java
+++ b/skjcmanager/skjcmanager-ops/skjcmanager-swagger/src/main/java/cn/gistack/swagger/SwaggerApplication.java
@@ -20,6 +20,7 @@
import org.springblade.core.cloud.client.BladeCloudApplication;
import org.springblade.core.launch.BladeApplication;
import org.springblade.core.launch.constant.AppConstant;
+import org.springframework.cloud.openfeign.EnableFeignClients;
/**
* swagger聚合启动器
@@ -27,6 +28,7 @@
* @author Chill
*/
@BladeCloudApplication
+@EnableFeignClients({"cn.gistack"})
public class SwaggerApplication {
public static void main(String[] args) {
diff --git a/skjcmanager/skjcmanager-ops/skjcmanager-xxljob-admin/pom.xml b/skjcmanager/skjcmanager-ops/skjcmanager-xxljob-admin/pom.xml
index 04c2e56..2fc3f9f 100644
--- a/skjcmanager/skjcmanager-ops/skjcmanager-xxljob-admin/pom.xml
+++ b/skjcmanager/skjcmanager-ops/skjcmanager-xxljob-admin/pom.xml
@@ -2,7 +2,7 @@
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<parent>
<artifactId>skjcmanager-ops</artifactId>
- <groupId>org.springblade</groupId>
+ <groupId>cn.gistack</groupId>
<version>3.0.1.RELEASE</version>
</parent>
@@ -44,7 +44,7 @@
<dependencies>
<!--Blade-->
<dependency>
- <groupId>org.springblade</groupId>
+ <groupId>cn.gistack</groupId>
<artifactId>skjcmanager-common</artifactId>
<version>${bladex.project.version}</version>
</dependency>
diff --git a/skjcmanager/skjcmanager-ops/skjcmanager-xxljob/pom.xml b/skjcmanager/skjcmanager-ops/skjcmanager-xxljob/pom.xml
index 9a35ab3..9681e2c 100644
--- a/skjcmanager/skjcmanager-ops/skjcmanager-xxljob/pom.xml
+++ b/skjcmanager/skjcmanager-ops/skjcmanager-xxljob/pom.xml
@@ -4,7 +4,7 @@
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<parent>
<artifactId>skjcmanager-ops</artifactId>
- <groupId>org.springblade</groupId>
+ <groupId>cn.gistack</groupId>
<version>3.0.1.RELEASE</version>
</parent>
<modelVersion>4.0.0</modelVersion>
@@ -16,7 +16,7 @@
<dependencies>
<!--Blade-->
<dependency>
- <groupId>org.springblade</groupId>
+ <groupId>cn.gistack</groupId>
<artifactId>skjcmanager-common</artifactId>
<version>${bladex.project.version}</version>
</dependency>
diff --git a/skjcmanager/skjcmanager-plugin-api/pom.xml b/skjcmanager/skjcmanager-plugin-api/pom.xml
index 1a9d1af..c2ca31c 100644
--- a/skjcmanager/skjcmanager-plugin-api/pom.xml
+++ b/skjcmanager/skjcmanager-plugin-api/pom.xml
@@ -4,7 +4,7 @@
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<parent>
<artifactId>skjcmanager</artifactId>
- <groupId>org.springblade</groupId>
+ <groupId>cn.gistack</groupId>
<version>3.0.1.RELEASE</version>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/skjcmanager/skjcmanager-plugin/pom.xml b/skjcmanager/skjcmanager-plugin/pom.xml
index 446c569..08345f3 100644
--- a/skjcmanager/skjcmanager-plugin/pom.xml
+++ b/skjcmanager/skjcmanager-plugin/pom.xml
@@ -4,7 +4,7 @@
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<parent>
<artifactId>skjcmanager</artifactId>
- <groupId>org.springblade</groupId>
+ <groupId>cn.gistack</groupId>
<version>3.0.1.RELEASE</version>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/skjcmanager/skjcmanager-service-api/pom.xml b/skjcmanager/skjcmanager-service-api/pom.xml
index 813b31b..397de46 100644
--- a/skjcmanager/skjcmanager-service-api/pom.xml
+++ b/skjcmanager/skjcmanager-service-api/pom.xml
@@ -4,7 +4,7 @@
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<parent>
<artifactId>skjcmanager</artifactId>
- <groupId>org.springblade</groupId>
+ <groupId>cn.gistack</groupId>
<version>3.0.1.RELEASE</version>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/skjcmanager/skjcmanager-service-api/skjcmanager-desk-api/pom.xml b/skjcmanager/skjcmanager-service-api/skjcmanager-desk-api/pom.xml
index 6c0823e..b3c8c54 100644
--- a/skjcmanager/skjcmanager-service-api/skjcmanager-desk-api/pom.xml
+++ b/skjcmanager/skjcmanager-service-api/skjcmanager-desk-api/pom.xml
@@ -4,7 +4,7 @@
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<parent>
<artifactId>skjcmanager-service-api</artifactId>
- <groupId>org.springblade</groupId>
+ <groupId>cn.gistack</groupId>
<version>3.0.1.RELEASE</version>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/skjcmanager/skjcmanager-service-api/skjcmanager-dict-api/pom.xml b/skjcmanager/skjcmanager-service-api/skjcmanager-dict-api/pom.xml
index 6b352c8..ea75651 100644
--- a/skjcmanager/skjcmanager-service-api/skjcmanager-dict-api/pom.xml
+++ b/skjcmanager/skjcmanager-service-api/skjcmanager-dict-api/pom.xml
@@ -4,7 +4,7 @@
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<parent>
<artifactId>skjcmanager-service-api</artifactId>
- <groupId>org.springblade</groupId>
+ <groupId>cn.gistack</groupId>
<version>3.0.1.RELEASE</version>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/skjcmanager/skjcmanager-service-api/skjcmanager-scope-api/pom.xml b/skjcmanager/skjcmanager-service-api/skjcmanager-scope-api/pom.xml
index ec10363..9988e65 100644
--- a/skjcmanager/skjcmanager-service-api/skjcmanager-scope-api/pom.xml
+++ b/skjcmanager/skjcmanager-service-api/skjcmanager-scope-api/pom.xml
@@ -4,7 +4,7 @@
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<parent>
<artifactId>skjcmanager-service-api</artifactId>
- <groupId>org.springblade</groupId>
+ <groupId>cn.gistack</groupId>
<version>3.0.1.RELEASE</version>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/skjcmanager/skjcmanager-service-api/skjcmanager-system-api/pom.xml b/skjcmanager/skjcmanager-service-api/skjcmanager-system-api/pom.xml
index 4e3b1ea..8fedce8 100644
--- a/skjcmanager/skjcmanager-service-api/skjcmanager-system-api/pom.xml
+++ b/skjcmanager/skjcmanager-service-api/skjcmanager-system-api/pom.xml
@@ -4,7 +4,7 @@
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<parent>
<artifactId>skjcmanager-service-api</artifactId>
- <groupId>org.springblade</groupId>
+ <groupId>cn.gistack</groupId>
<version>3.0.1.RELEASE</version>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/skjcmanager/skjcmanager-service-api/skjcmanager-user-api/pom.xml b/skjcmanager/skjcmanager-service-api/skjcmanager-user-api/pom.xml
index 9c73bbb..384496b 100644
--- a/skjcmanager/skjcmanager-service-api/skjcmanager-user-api/pom.xml
+++ b/skjcmanager/skjcmanager-service-api/skjcmanager-user-api/pom.xml
@@ -4,7 +4,7 @@
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<parent>
<artifactId>skjcmanager-service-api</artifactId>
- <groupId>org.springblade</groupId>
+ <groupId>cn.gistack</groupId>
<version>3.0.1.RELEASE</version>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/skjcmanager/skjcmanager-service/pom.xml b/skjcmanager/skjcmanager-service/pom.xml
index fd4941a..ef36928 100644
--- a/skjcmanager/skjcmanager-service/pom.xml
+++ b/skjcmanager/skjcmanager-service/pom.xml
@@ -4,7 +4,7 @@
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<parent>
- <groupId>org.springblade</groupId>
+ <groupId>cn.gistack</groupId>
<artifactId>skjcmanager</artifactId>
<version>3.0.1.RELEASE</version>
</parent>
@@ -25,7 +25,7 @@
<dependencies>
<dependency>
- <groupId>org.springblade</groupId>
+ <groupId>cn.gistack</groupId>
<artifactId>skjcmanager-common</artifactId>
<version>${bladex.project.version}</version>
</dependency>
@@ -42,14 +42,14 @@
<artifactId>blade-starter-api-crypto</artifactId>
</dependency>
<dependency>
- <groupId>org.springblade</groupId>
+ <groupId>cn.gistack</groupId>
<artifactId>skjcmanager-dict-api</artifactId>
- <version>${bladex.project.version}</version>
+ <version>3.0.1.RELEASE</version>
</dependency>
<dependency>
- <groupId>org.springblade</groupId>
+ <groupId>cn.gistack</groupId>
<artifactId>skjcmanager-scope-api</artifactId>
- <version>${bladex.project.version}</version>
+ <version>3.0.1.RELEASE</version>
</dependency>
</dependencies>
diff --git a/skjcmanager/skjcmanager-service/skjcmanager-desk/pom.xml b/skjcmanager/skjcmanager-service/skjcmanager-desk/pom.xml
index 444af18..584b736 100644
--- a/skjcmanager/skjcmanager-service/skjcmanager-desk/pom.xml
+++ b/skjcmanager/skjcmanager-service/skjcmanager-desk/pom.xml
@@ -4,7 +4,7 @@
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<parent>
- <groupId>org.springblade</groupId>
+ <groupId>cn.gistack</groupId>
<artifactId>skjcmanager-service</artifactId>
<version>3.0.1.RELEASE</version>
</parent>
@@ -26,19 +26,19 @@
<artifactId>blade-starter-swagger</artifactId>
</dependency>
<dependency>
- <groupId>org.springblade</groupId>
+ <groupId>cn.gistack</groupId>
<artifactId>skjcmanager-desk-api</artifactId>
- <version>${bladex.project.version}</version>
+ <version>3.0.1.RELEASE</version>
</dependency>
<dependency>
- <groupId>org.springblade</groupId>
+ <groupId>cn.gistack</groupId>
<artifactId>skjcmanager-user-api</artifactId>
- <version>${bladex.project.version}</version>
+ <version>3.0.1.RELEASE</version>
</dependency>
<dependency>
- <groupId>org.springblade</groupId>
+ <groupId>cn.gistack</groupId>
<artifactId>skjcmanager-flow-api</artifactId>
- <version>${bladex.project.version}</version>
+ <version>3.0.1.RELEASE</version>
</dependency>
<!--Oss-->
<dependency>
diff --git a/skjcmanager/skjcmanager-service/skjcmanager-system/pom.xml b/skjcmanager/skjcmanager-service/skjcmanager-system/pom.xml
index c031c6e..4d7ea04 100644
--- a/skjcmanager/skjcmanager-service/skjcmanager-system/pom.xml
+++ b/skjcmanager/skjcmanager-service/skjcmanager-system/pom.xml
@@ -4,7 +4,7 @@
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<parent>
<artifactId>skjcmanager-service</artifactId>
- <groupId>org.springblade</groupId>
+ <groupId>cn.gistack</groupId>
<version>3.0.1.RELEASE</version>
</parent>
<modelVersion>4.0.0</modelVersion>
@@ -28,14 +28,14 @@
<artifactId>blade-starter-swagger</artifactId>
</dependency>
<dependency>
- <groupId>org.springblade</groupId>
+ <groupId>cn.gistack</groupId>
<artifactId>skjcmanager-system-api</artifactId>
- <version>${bladex.project.version}</version>
+ <version>3.0.1.RELEASE</version>
</dependency>
<dependency>
- <groupId>org.springblade</groupId>
+ <groupId>cn.gistack</groupId>
<artifactId>skjcmanager-user-api</artifactId>
- <version>${bladex.project.version}</version>
+ <version>3.0.1.RELEASE</version>
</dependency>
</dependencies>
diff --git a/skjcmanager/skjcmanager-service/skjcmanager-system/src/main/java/cn/gistack/system/SystemApplication.java b/skjcmanager/skjcmanager-service/skjcmanager-system/src/main/java/cn/gistack/system/SystemApplication.java
index e717bcc..2f4b2f3 100644
--- a/skjcmanager/skjcmanager-service/skjcmanager-system/src/main/java/cn/gistack/system/SystemApplication.java
+++ b/skjcmanager/skjcmanager-service/skjcmanager-system/src/main/java/cn/gistack/system/SystemApplication.java
@@ -16,7 +16,6 @@
*/
package cn.gistack.system;
-import cn.gistack.common.constant.AppsConstant;
import org.springblade.core.cloud.client.BladeCloudApplication;
import org.springblade.core.launch.BladeApplication;
import org.springblade.core.launch.constant.AppConstant;
@@ -27,11 +26,11 @@
* @author Chill
*/
@BladeCloudApplication
-@EnableFeignClients(basePackages = "cn.gistack.system.user.feign")
+@EnableFeignClients({"cn.gistack"})
public class SystemApplication {
public static void main(String[] args) {
- BladeApplication.run(AppsConstant.APPLICATION_SYSTEM_NAME, SystemApplication.class, args);
+ BladeApplication.run(AppConstant.APPLICATION_SYSTEM_NAME, SystemApplication.class, args);
}
}
diff --git a/skjcmanager/skjcmanager-service/skjcmanager-user/pom.xml b/skjcmanager/skjcmanager-service/skjcmanager-user/pom.xml
index 26cfdb2..5e16aea 100644
--- a/skjcmanager/skjcmanager-service/skjcmanager-user/pom.xml
+++ b/skjcmanager/skjcmanager-service/skjcmanager-user/pom.xml
@@ -4,7 +4,7 @@
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<parent>
<artifactId>skjcmanager-service</artifactId>
- <groupId>org.springblade</groupId>
+ <groupId>cn.gistack</groupId>
<version>3.0.1.RELEASE</version>
</parent>
@@ -29,14 +29,14 @@
<artifactId>blade-starter-swagger</artifactId>
</dependency>
<dependency>
- <groupId>org.springblade</groupId>
+ <groupId>cn.gistack</groupId>
<artifactId>skjcmanager-user-api</artifactId>
- <version>${bladex.project.version}</version>
+ <version>3.0.1.RELEASE</version>
</dependency>
<dependency>
- <groupId>org.springblade</groupId>
+ <groupId>cn.gistack</groupId>
<artifactId>skjcmanager-system-api</artifactId>
- <version>${bladex.project.version}</version>
+ <version>3.0.1.RELEASE</version>
</dependency>
</dependencies>
diff --git a/skjcmanager/skjcmanager-service/skjcmanager-user/src/main/java/cn/gistack/system/user/UserApplication.java b/skjcmanager/skjcmanager-service/skjcmanager-user/src/main/java/cn/gistack/system/user/UserApplication.java
index f5fe967..0f61340 100644
--- a/skjcmanager/skjcmanager-service/skjcmanager-user/src/main/java/cn/gistack/system/user/UserApplication.java
+++ b/skjcmanager/skjcmanager-service/skjcmanager-user/src/main/java/cn/gistack/system/user/UserApplication.java
@@ -16,7 +16,6 @@
*/
package cn.gistack.system.user;
-import cn.gistack.common.constant.AppsConstant;
import org.springblade.core.cloud.client.BladeCloudApplication;
import org.springblade.core.launch.BladeApplication;
import org.springblade.core.launch.constant.AppConstant;
@@ -28,11 +27,11 @@
* @author Chill
*/
@BladeCloudApplication
-@EnableFeignClients(basePackages = "cn.gistack.system.user.feign")
+@EnableFeignClients({"cn.gistack"})
public class UserApplication {
public static void main(String[] args) {
- BladeApplication.run(AppsConstant.APPLICATION_USER_NAME, UserApplication.class, args);
+ BladeApplication.run(AppConstant.APPLICATION_USER_NAME, UserApplication.class, args);
}
}
--
Gitblit v1.9.3