diff --git a/README.md b/README.md
index 2155f4c..75af866 100644
--- a/README.md
+++ b/README.md
@@ -1,10 +1,10 @@
- 
- 
+ 
+ 
-**SpringBlade微服务开发平台**
+## SpringBlade微服务开发平台
* 采用前后端分离的模式，前端开源两个框架：[Sword](https://gitee.com/smallc/Sword) (基于 React、Ant Design)、[Saber](https://gitee.com/smallc/Saber) (基于 Vue、Element-UI)
* 后端采用SpringCloud全家桶，并同时对其基础组件做了高度的封装，单独开源出一个框架：[BladeTool](https://github.com/chillzhuang/blade-tool)
* [BladeTool](https://github.com/chillzhuang/blade-tool)已推送至Maven中央库，直接引入即可，减少了工程的臃肿，也可更注重于业务开发
@@ -14,8 +14,7 @@
* 极简封装了多租户底层，用更少的代码换来拓展性更强的SaaS多租户系统。
* 借鉴OAuth2，实现了多终端认证系统，可控制子系统的token权限互相隔离。
* 借鉴Security，封装了Secure模块，采用JWT做Token认证，可拓展集成Redis等细颗粒度控制方案。
-* 踩了踩Kong的坑，有个基本的使用方案，但不深入，因为涉及到OpenResty。
-* 稳定生产了一年，经历了从Camden -> Finchley的技术架构，也经历了从fat jar -> docker -> k8s + jenkins的部署架构
+* 稳定生产了一年，经历了从Camden -> Greenwich的技术架构，也经历了从fat jar -> docker -> k8s + jenkins的部署架构
* 项目分包明确，规范微服务的开发模式，使包与包之间的分工清晰。
## 工程结构
@@ -41,7 +40,8 @@ SpringBlade
## 官网
* 官网地址：[https://bladex.vip](https://bladex.vip)
-* 会员计划：[https://gitee.com/smallc/SpringBlade/wikis/SpringBlade会员计划](https://gitee.com/smallc/SpringBlade/wikis/SpringBlade会员计划)
+* 问答社区：[https://sns.bladex.vip](https://sns.bladex.vip)
+* 会员计划：[SpringBlade会员计划](https://gitee.com/smallc/SpringBlade/wikis/SpringBlade会员计划)
* 交流群：`477853168`
## 在线演示
@@ -66,6 +66,63 @@ SpringBlade
* 非界面代码50%以上相似度的二次开源，二次开源需先联系作者。
# 界面
+
+## [BladeX](https://bladex.vip/#/vip) 工作流一览
+
+
+  |
+  |
+
+
+  |
+  |
+
+
+  |
+  |
+
+
+
+## [Sword](https://gitee.com/smallc/Sword) 界面一览
+
+
+  |
+  |
+
+
+  |
+  |
+
+
+  |
+  |
+
+
+  |
+  |
+
+
+  |
+  |
+
+
+
+## [Saber](https://gitee.com/smallc/Saber) 界面一览
+
+
+  |
+  |
+
+
+  |
+  |
+
+
+  |
+  |
+
+
+
## 监控界面一览
@@ -94,45 +151,5 @@ SpringBlade
-## Sword界面一览
-
-
- |
- |
-
-
- |
- |
-
-
- |
- |
-
-
- |
- |
-
-
- |
- |
-
-
-
-## Saber界面一览
-
-
- |
- |
-
-
- |
- |
-
-
- |
- |
-
-
-
## 关注我们
\ No newline at end of file
diff --git a/blade-auth/pom.xml b/blade-auth/pom.xml
index 8fa4d2f..1469a7a 100644
--- a/blade-auth/pom.xml
+++ b/blade-auth/pom.xml
@@ -8,7 +8,7 @@
SpringBlade
org.springblade
- 2.2.3
+ 2.3.0
blade-auth
@@ -78,6 +78,25 @@
true
+
+ org.apache.maven.plugins
+ maven-antrun-plugin
+
+
+ package
+
+ run
+
+
+
+
+
+
+
+
+
diff --git a/blade-auth/src/main/resources/application-dev.yml b/blade-auth/src/main/resources/application-dev.yml
index 883acb7..edb797b 100644
--- a/blade-auth/src/main/resources/application-dev.yml
+++ b/blade-auth/src/main/resources/application-dev.yml
@@ -5,7 +5,7 @@ server:
#数据源配置
spring:
datasource:
- driver-class-name: com.mysql.jdbc.Driver
+ driver-class-name: com.mysql.cj.jdbc.Driver
url: ${blade.datasource.dev.url}
username: ${blade.datasource.dev.username}
password: ${blade.datasource.dev.password}
diff --git a/blade-auth/src/main/resources/application-prod.yml b/blade-auth/src/main/resources/application-prod.yml
index 70bf2f4..6baea34 100644
--- a/blade-auth/src/main/resources/application-prod.yml
+++ b/blade-auth/src/main/resources/application-prod.yml
@@ -5,7 +5,7 @@ server:
#数据源配置
spring:
datasource:
- driver-class-name: com.mysql.jdbc.Driver
+ driver-class-name: com.mysql.cj.jdbc.Driver
url: ${blade.datasource.prod.url}
username: ${blade.datasource.prod.username}
password: ${blade.datasource.prod.password}
diff --git a/blade-auth/src/main/resources/application-test.yml b/blade-auth/src/main/resources/application-test.yml
index 2255872..dfa7af7 100644
--- a/blade-auth/src/main/resources/application-test.yml
+++ b/blade-auth/src/main/resources/application-test.yml
@@ -5,7 +5,7 @@ server:
#数据源配置
spring:
datasource:
- driver-class-name: com.mysql.jdbc.Driver
+ driver-class-name: com.mysql.cj.jdbc.Driver
url: ${blade.datasource.test.url}
username: ${blade.datasource.test.username}
password: ${blade.datasource.test.password}
diff --git a/blade-common/pom.xml b/blade-common/pom.xml
index 944c926..75e3fd4 100644
--- a/blade-common/pom.xml
+++ b/blade-common/pom.xml
@@ -5,7 +5,7 @@
SpringBlade
org.springblade
- 2.2.3
+ 2.3.0
4.0.0
diff --git a/blade-common/src/main/java/org/springblade/common/constant/CommonConstant.java b/blade-common/src/main/java/org/springblade/common/constant/CommonConstant.java
index ed5782d..ae0dd06 100644
--- a/blade-common/src/main/java/org/springblade/common/constant/CommonConstant.java
+++ b/blade-common/src/main/java/org/springblade/common/constant/CommonConstant.java
@@ -1,5 +1,7 @@
package org.springblade.common.constant;
+import org.springblade.core.launch.constant.AppConstant;
+
/**
* 通用常量
*
@@ -17,6 +19,11 @@ public interface CommonConstant {
*/
String NACOS_PROD_ADDR = "172.30.0.48:8848";
+ /**
+ * nacos test 地址
+ */
+ String NACOS_TEST_ADDR = "172.30.0.48:8848";
+
/**
* sentinel dev 地址
*/
@@ -27,6 +34,11 @@ public interface CommonConstant {
*/
String SENTINEL_PROD_ADDR = "172.30.0.58:8858";
+ /**
+ * sentinel test 地址
+ */
+ String SENTINEL_TEST_ADDR = "172.30.0.58:8858";
+
/**
* sword 系统名
*/
@@ -53,4 +65,40 @@ public interface CommonConstant {
*/
String DEFAULT_PASSWORD = "123456";
+
+
+ /**
+ * 动态获取nacos地址
+ *
+ * @param profile 环境变量
+ * @return addr
+ */
+ static String nacosAddr(String profile) {
+ switch (profile) {
+ case (AppConstant.PROD_CODE):
+ return NACOS_PROD_ADDR;
+ case (AppConstant.TEST_CODE):
+ return NACOS_TEST_ADDR;
+ default:
+ return NACOS_DEV_ADDR;
+ }
+ }
+
+ /**
+ * 动态获取sentinel地址
+ *
+ * @param profile 环境变量
+ * @return addr
+ */
+ static String sentinelAddr(String profile) {
+ switch (profile) {
+ case (AppConstant.PROD_CODE):
+ return SENTINEL_PROD_ADDR;
+ case (AppConstant.TEST_CODE):
+ return SENTINEL_TEST_ADDR;
+ default:
+ return SENTINEL_DEV_ADDR;
+ }
+ }
+
}
diff --git a/blade-common/src/main/java/org/springblade/common/launch/LauncherServiceImpl.java b/blade-common/src/main/java/org/springblade/common/launch/LauncherServiceImpl.java
index 349570e..f7f1a13 100644
--- a/blade-common/src/main/java/org/springblade/common/launch/LauncherServiceImpl.java
+++ b/blade-common/src/main/java/org/springblade/common/launch/LauncherServiceImpl.java
@@ -16,7 +16,6 @@
package org.springblade.common.launch;
import org.springblade.common.constant.CommonConstant;
-import org.springblade.core.launch.constant.AppConstant;
import org.springblade.core.launch.service.LauncherService;
import org.springframework.boot.builder.SpringApplicationBuilder;
@@ -32,9 +31,9 @@ public class LauncherServiceImpl implements LauncherService {
@Override
public void launcher(SpringApplicationBuilder builder, String appName, String profile) {
Properties props = System.getProperties();
- props.setProperty("spring.cloud.nacos.discovery.server-addr", profile.equals(AppConstant.DEV_CDOE) ? CommonConstant.NACOS_DEV_ADDR : CommonConstant.NACOS_PROD_ADDR);
- props.setProperty("spring.cloud.nacos.config.server-addr", profile.equals(AppConstant.DEV_CDOE) ? CommonConstant.NACOS_DEV_ADDR : CommonConstant.NACOS_PROD_ADDR);
- props.setProperty("spring.cloud.sentinel.transport.dashboard", profile.equals(AppConstant.DEV_CDOE) ? CommonConstant.SENTINEL_DEV_ADDR : CommonConstant.SENTINEL_PROD_ADDR);
+ props.setProperty("spring.cloud.nacos.discovery.server-addr", CommonConstant.nacosAddr(profile));
+ props.setProperty("spring.cloud.nacos.config.server-addr", CommonConstant.nacosAddr(profile));
+ props.setProperty("spring.cloud.sentinel.transport.dashboard", CommonConstant.sentinelAddr(profile));
}
}
diff --git a/blade-gateway/pom.xml b/blade-gateway/pom.xml
index 9febf9b..ab85461 100644
--- a/blade-gateway/pom.xml
+++ b/blade-gateway/pom.xml
@@ -5,7 +5,7 @@
SpringBlade
org.springblade
- 2.2.3
+ 2.3.0
4.0.0
@@ -127,6 +127,25 @@
true
+
+ org.apache.maven.plugins
+ maven-antrun-plugin
+
+
+ package
+
+ run
+
+
+
+
+
+
+
+
+
diff --git a/blade-ops/blade-admin/pom.xml b/blade-ops/blade-admin/pom.xml
index d52e790..fdb5551 100644
--- a/blade-ops/blade-admin/pom.xml
+++ b/blade-ops/blade-admin/pom.xml
@@ -5,7 +5,7 @@
blade-ops
org.springblade
- 2.2.3
+ 2.3.0
4.0.0
@@ -61,6 +61,25 @@
true
+
+ org.apache.maven.plugins
+ maven-antrun-plugin
+
+
+ package
+
+ run
+
+
+
+
+
+
+
+
+
diff --git a/blade-ops/blade-develop/pom.xml b/blade-ops/blade-develop/pom.xml
index 2f0c794..56cd304 100644
--- a/blade-ops/blade-develop/pom.xml
+++ b/blade-ops/blade-develop/pom.xml
@@ -6,7 +6,7 @@
org.springblade
blade-ops
- 2.2.3
+ 2.3.0
4.0.0
@@ -67,6 +67,25 @@
true
+
+ org.apache.maven.plugins
+ maven-antrun-plugin
+
+
+ package
+
+ run
+
+
+
+
+
+
+
+
+
diff --git a/blade-ops/blade-develop/src/main/resources/templates/code.properties b/blade-ops/blade-develop/src/main/resources/templates/code.properties
index 48fb198..229dc31 100644
--- a/blade-ops/blade-develop/src/main/resources/templates/code.properties
+++ b/blade-ops/blade-develop/src/main/resources/templates/code.properties
@@ -1,4 +1,4 @@
-spring.datasource.driver-class-name=com.mysql.jdbc.Driver
+spring.datasource.driver-class-name=com.mysql.cj.jdbc.Driver
spring.datasource.url=jdbc:mysql://localhost:3306/blade?useSSL=false&useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&transformedBitIsBoolean=true&tinyInt1isBit=false&serverTimezone=GMT%2B8
spring.datasource.username=root
spring.datasource.password=root
diff --git a/blade-ops/blade-develop/src/test/resources/templates/code.properties b/blade-ops/blade-develop/src/test/resources/templates/code.properties
index 48fb198..229dc31 100644
--- a/blade-ops/blade-develop/src/test/resources/templates/code.properties
+++ b/blade-ops/blade-develop/src/test/resources/templates/code.properties
@@ -1,4 +1,4 @@
-spring.datasource.driver-class-name=com.mysql.jdbc.Driver
+spring.datasource.driver-class-name=com.mysql.cj.jdbc.Driver
spring.datasource.url=jdbc:mysql://localhost:3306/blade?useSSL=false&useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&transformedBitIsBoolean=true&tinyInt1isBit=false&serverTimezone=GMT%2B8
spring.datasource.username=root
spring.datasource.password=root
diff --git a/blade-ops/pom.xml b/blade-ops/pom.xml
index 57c635f..b0ea399 100644
--- a/blade-ops/pom.xml
+++ b/blade-ops/pom.xml
@@ -5,7 +5,7 @@
SpringBlade
org.springblade
- 2.2.3
+ 2.3.0
4.0.0
diff --git a/blade-service-api/blade-desk-api/pom.xml b/blade-service-api/blade-desk-api/pom.xml
index e24dcd6..bbd1dda 100644
--- a/blade-service-api/blade-desk-api/pom.xml
+++ b/blade-service-api/blade-desk-api/pom.xml
@@ -5,7 +5,7 @@
blade-service-api
org.springblade
- 2.2.3
+ 2.3.0
4.0.0
diff --git a/blade-service-api/blade-dict-api/pom.xml b/blade-service-api/blade-dict-api/pom.xml
index 321a229..1e3edb2 100644
--- a/blade-service-api/blade-dict-api/pom.xml
+++ b/blade-service-api/blade-dict-api/pom.xml
@@ -5,7 +5,7 @@
blade-service-api
org.springblade
- 2.2.3
+ 2.3.0
4.0.0
diff --git a/blade-service-api/blade-system-api/pom.xml b/blade-service-api/blade-system-api/pom.xml
index ddc4fa2..07ca446 100644
--- a/blade-service-api/blade-system-api/pom.xml
+++ b/blade-service-api/blade-system-api/pom.xml
@@ -5,7 +5,7 @@
blade-service-api
org.springblade
- 2.2.3
+ 2.3.0
4.0.0
diff --git a/blade-service-api/blade-user-api/pom.xml b/blade-service-api/blade-user-api/pom.xml
index 86efbce..95799ea 100644
--- a/blade-service-api/blade-user-api/pom.xml
+++ b/blade-service-api/blade-user-api/pom.xml
@@ -5,7 +5,7 @@
blade-service-api
org.springblade
- 2.2.3
+ 2.3.0
4.0.0
diff --git a/blade-service-api/pom.xml b/blade-service-api/pom.xml
index ea5e53a..5aa2220 100644
--- a/blade-service-api/pom.xml
+++ b/blade-service-api/pom.xml
@@ -5,13 +5,13 @@
SpringBlade
org.springblade
- 2.2.3
+ 2.3.0
4.0.0
blade-service-api
${project.artifactId}
- 2.2.3
+ 2.3.0
pom
SpringBlade 微服务API集合
diff --git a/blade-service/blade-desk/pom.xml b/blade-service/blade-desk/pom.xml
index 56c9160..e885274 100644
--- a/blade-service/blade-desk/pom.xml
+++ b/blade-service/blade-desk/pom.xml
@@ -6,7 +6,7 @@
org.springblade
blade-service
- 2.2.3
+ 2.3.0
4.0.0
@@ -39,4 +39,28 @@
+
+
+
+ org.apache.maven.plugins
+ maven-antrun-plugin
+
+
+ package
+
+ run
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/blade-service/blade-log/pom.xml b/blade-service/blade-log/pom.xml
index 625feaf..04f0007 100644
--- a/blade-service/blade-log/pom.xml
+++ b/blade-service/blade-log/pom.xml
@@ -5,7 +5,7 @@
blade-service
org.springblade
- 2.2.3
+ 2.3.0
4.0.0
@@ -23,4 +23,28 @@
+
+
+
+ org.apache.maven.plugins
+ maven-antrun-plugin
+
+
+ package
+
+ run
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/blade-service/blade-system/pom.xml b/blade-service/blade-system/pom.xml
index 622c14a..8599277 100644
--- a/blade-service/blade-system/pom.xml
+++ b/blade-service/blade-system/pom.xml
@@ -5,7 +5,7 @@
blade-service
org.springblade
- 2.2.3
+ 2.3.0
4.0.0
@@ -32,4 +32,28 @@
+
+
+
+ org.apache.maven.plugins
+ maven-antrun-plugin
+
+
+ package
+
+ run
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/blade-service/blade-user/pom.xml b/blade-service/blade-user/pom.xml
index 0b26fd0..09039cd 100644
--- a/blade-service/blade-user/pom.xml
+++ b/blade-service/blade-user/pom.xml
@@ -5,7 +5,7 @@
blade-service
org.springblade
- 2.2.3
+ 2.3.0
4.0.0
@@ -33,4 +33,28 @@
+
+
+
+ org.apache.maven.plugins
+ maven-antrun-plugin
+
+
+ package
+
+ run
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/blade-service/pom.xml b/blade-service/pom.xml
index 5ee972a..20c051f 100644
--- a/blade-service/pom.xml
+++ b/blade-service/pom.xml
@@ -7,12 +7,12 @@
org.springblade
SpringBlade
- 2.2.3
+ 2.3.0
blade-service
${project.artifactId}
- 2.2.3
+ 2.3.0
pom
SpringBlade 微服务集合
diff --git a/pic/bladex-flow1.png b/pic/bladex-flow1.png
new file mode 100644
index 0000000..31f2655
Binary files /dev/null and b/pic/bladex-flow1.png differ
diff --git a/pic/bladex-flow2.png b/pic/bladex-flow2.png
new file mode 100644
index 0000000..d1e9604
Binary files /dev/null and b/pic/bladex-flow2.png differ
diff --git a/pic/bladex-flow3.png b/pic/bladex-flow3.png
new file mode 100644
index 0000000..027f732
Binary files /dev/null and b/pic/bladex-flow3.png differ
diff --git a/pic/bladex-flow4.png b/pic/bladex-flow4.png
new file mode 100644
index 0000000..98786ee
Binary files /dev/null and b/pic/bladex-flow4.png differ
diff --git a/pic/bladex-flow5.png b/pic/bladex-flow5.png
new file mode 100644
index 0000000..875ce00
Binary files /dev/null and b/pic/bladex-flow5.png differ
diff --git a/pic/bladex-flow6.png b/pic/bladex-flow6.png
new file mode 100644
index 0000000..ee11b52
Binary files /dev/null and b/pic/bladex-flow6.png differ
diff --git a/pom.xml b/pom.xml
index 019eea9..0eae3ee 100644
--- a/pom.xml
+++ b/pom.xml
@@ -5,26 +5,26 @@
org.springblade
SpringBlade
- 2.2.3
+ 2.3.0
pom
- 2.2.3
- 2.2.3
+ 2.3.0
+ 2.3.0
1.8
2.9.2
1.5.21
- 1.9.2
+ 1.9.3
3.1.0
4.0.1
1.6.0
1.0.1
- 0.2.1.RELEASE
- 2.0.2
+ 0.9.0.RELEASE
+ 2.1.4
- 2.0.8.RELEASE
- Finchley.SR2
+ 2.1.4.RELEASE
+ Greenwich.SR1
Cairo-SR7