diff --git a/LICENSE b/LICENSE
index da37b86..bee99db 100644
--- a/LICENSE
+++ b/LICENSE
@@ -176,7 +176,7 @@ recommend that a file or class name and description of purpose be included on
the same "printed page" as the copyright notice for easier identification within
third-party archives.
- Copyright 2023 BladeX (https://bladex.vip)
+ Copyright 2023 BladeX (https://bladex.cn)
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
diff --git a/README.md b/README.md
index caf37f7..83bfaae 100644
--- a/README.md
+++ b/README.md
@@ -1,13 +1,13 @@
-
+
-
+
-
+
@@ -53,8 +53,8 @@ SpringBlade
```
## 官方信息
-* 官网地址:[https://bladex.vip](https://bladex.vip)
-* 问答社区:[https://sns.bladex.vip](https://sns.bladex.vip)
+* 官网地址:[https://bladex.cn](https://bladex.cn)
+* 问答社区:[https://sns.bladex.cn](https://sns.bladex.cn)
* 会员计划:[SpringBlade会员计划](https://gitee.com/smallc/SpringBlade/wikis/SpringBlade会员计划)
* 交流一群:`477853168`(满)
* 交流二群:`751253339`(满)
@@ -65,15 +65,15 @@ SpringBlade
* 交流七群:`298061704`
## 在线演示
-* Saber-基于Vue:[https://saber.bladex.vip](https://saber.bladex.vip)
-* Sword-基于React:[https://sword.bladex.vip](https://sword.bladex.vip)
+* Saber-基于Vue:[https://saber.bladex.cn](https://saber.bladex.cn)
+* Sword-基于React:[https://sword.bladex.cn](https://sword.bladex.cn)
## 数据大屏
-* 数据大屏展示系统:[https://data.bladex.vip](https://data.bladex.vip)
+* 数据大屏展示系统:[https://data.bladex.cn](https://data.bladex.cn)
## 技术文档
* [SpringBlade开发手册一览](https://gitee.com/smallc/SpringBlade/wikis/SpringBlade开发手册)
-* [SpringBlade常见问题集锦](https://sns.bladex.vip/article-14966.html)
+* [SpringBlade常见问题集锦](https://sns.bladex.cn/article-14966.html)
* [SpringBlade基于Kuboard部署K8S](https://kuboard.cn/learning/k8s-practice/spring-blade/)
* [SpringBlade基于Rainbond部署](https://www.rainbond.com/docs/micro-service/example/blade)
@@ -103,7 +103,7 @@ Apache Licence也是对商业应用友好的许可。使用者也可以在需要
# 界面
-## [BladeX](https://bladex.vip/#/vip) 工作流一览
+## [BladeX](https://bladex.cn/#/vip) 工作流一览
|
diff --git a/blade-auth/pom.xml b/blade-auth/pom.xml
index c1d5fbd..53926c1 100644
--- a/blade-auth/pom.xml
+++ b/blade-auth/pom.xml
@@ -8,7 +8,7 @@
SpringBlade
org.springblade
- 3.6.0
+ 3.7.0
blade-auth
diff --git a/blade-common/pom.xml b/blade-common/pom.xml
index 540aa5b..66c1763 100644
--- a/blade-common/pom.xml
+++ b/blade-common/pom.xml
@@ -5,7 +5,7 @@
SpringBlade
org.springblade
- 3.6.0
+ 3.7.0
4.0.0
diff --git a/blade-gateway/pom.xml b/blade-gateway/pom.xml
index 09cb063..b9840c0 100644
--- a/blade-gateway/pom.xml
+++ b/blade-gateway/pom.xml
@@ -5,7 +5,7 @@
SpringBlade
org.springblade
- 3.6.0
+ 3.7.0
4.0.0
diff --git a/blade-ops/blade-admin/pom.xml b/blade-ops/blade-admin/pom.xml
index 1de62c5..d8da285 100644
--- a/blade-ops/blade-admin/pom.xml
+++ b/blade-ops/blade-admin/pom.xml
@@ -5,7 +5,7 @@
blade-ops
org.springblade
- 3.6.0
+ 3.7.0
4.0.0
diff --git a/blade-ops/blade-develop/pom.xml b/blade-ops/blade-develop/pom.xml
index 0226d7f..fabc029 100644
--- a/blade-ops/blade-develop/pom.xml
+++ b/blade-ops/blade-develop/pom.xml
@@ -6,7 +6,7 @@
org.springblade
blade-ops
- 3.6.0
+ 3.7.0
4.0.0
diff --git a/blade-ops/blade-report/pom.xml b/blade-ops/blade-report/pom.xml
index 001bdba..e220e5d 100644
--- a/blade-ops/blade-report/pom.xml
+++ b/blade-ops/blade-report/pom.xml
@@ -5,7 +5,7 @@
org.springblade
blade-ops
- 3.6.0
+ 3.7.0
4.0.0
diff --git a/blade-ops/blade-resource/pom.xml b/blade-ops/blade-resource/pom.xml
index 29ce60d..20d1b54 100644
--- a/blade-ops/blade-resource/pom.xml
+++ b/blade-ops/blade-resource/pom.xml
@@ -5,7 +5,7 @@
blade-ops
org.springblade
- 3.6.0
+ 3.7.0
4.0.0
diff --git a/blade-ops/blade-seata-order/pom.xml b/blade-ops/blade-seata-order/pom.xml
index dcabeb9..dfe9179 100644
--- a/blade-ops/blade-seata-order/pom.xml
+++ b/blade-ops/blade-seata-order/pom.xml
@@ -5,7 +5,7 @@
blade-ops
org.springblade
- 3.6.0
+ 3.7.0
4.0.0
diff --git a/blade-ops/blade-seata-storage/pom.xml b/blade-ops/blade-seata-storage/pom.xml
index 765d870..229916c 100644
--- a/blade-ops/blade-seata-storage/pom.xml
+++ b/blade-ops/blade-seata-storage/pom.xml
@@ -5,7 +5,7 @@
blade-ops
org.springblade
- 3.6.0
+ 3.7.0
4.0.0
diff --git a/blade-ops/blade-swagger/pom.xml b/blade-ops/blade-swagger/pom.xml
index 1a64694..1e31e5b 100644
--- a/blade-ops/blade-swagger/pom.xml
+++ b/blade-ops/blade-swagger/pom.xml
@@ -5,7 +5,7 @@
blade-ops
org.springblade
- 3.6.0
+ 3.7.0
4.0.0
diff --git a/blade-ops/pom.xml b/blade-ops/pom.xml
index 639b568..ff80df2 100644
--- a/blade-ops/pom.xml
+++ b/blade-ops/pom.xml
@@ -5,13 +5,13 @@
SpringBlade
org.springblade
- 3.6.0
+ 3.7.0
4.0.0
blade-ops
${project.artifactId}
- 3.6.0
+ 3.7.0
pom
blade-admin
diff --git a/blade-service-api/blade-demo-api/pom.xml b/blade-service-api/blade-demo-api/pom.xml
index cfa2550..42ef3c1 100644
--- a/blade-service-api/blade-demo-api/pom.xml
+++ b/blade-service-api/blade-demo-api/pom.xml
@@ -5,7 +5,7 @@
blade-service-api
org.springblade
- 3.6.0
+ 3.7.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 1d47002..06be006 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
- 3.6.0
+ 3.7.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 1a78802..2fc01f4 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
- 3.6.0
+ 3.7.0
4.0.0
diff --git a/blade-service-api/blade-dict-api/src/main/java/org/springblade/system/vo/DictVO.java b/blade-service-api/blade-dict-api/src/main/java/org/springblade/system/vo/DictVO.java
index 739d87e..8b59f44 100644
--- a/blade-service-api/blade-dict-api/src/main/java/org/springblade/system/vo/DictVO.java
+++ b/blade-service-api/blade-dict-api/src/main/java/org/springblade/system/vo/DictVO.java
@@ -36,7 +36,7 @@ import java.util.List;
@Data
@EqualsAndHashCode(callSuper = true)
@ApiModel(value = "DictVO对象", description = "DictVO对象")
-public class DictVO extends Dict implements INode {
+public class DictVO extends Dict implements INode {
private static final long serialVersionUID = 1L;
/**
* 主键ID
@@ -54,10 +54,10 @@ public class DictVO extends Dict implements INode {
* 子孙节点
*/
@JsonInclude(JsonInclude.Include.NON_EMPTY)
- private List children;
+ private List children;
@Override
- public List getChildren() {
+ public List getChildren() {
if (this.children == null) {
this.children = new ArrayList<>();
}
diff --git a/blade-service-api/blade-scope-api/pom.xml b/blade-service-api/blade-scope-api/pom.xml
index 2f25e79..4a24e09 100644
--- a/blade-service-api/blade-scope-api/pom.xml
+++ b/blade-service-api/blade-scope-api/pom.xml
@@ -5,7 +5,7 @@
blade-service-api
org.springblade
- 3.6.0
+ 3.7.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 f7ab45a..af3b705 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
- 3.6.0
+ 3.7.0
4.0.0
diff --git a/blade-service-api/blade-system-api/src/main/java/org/springblade/system/vo/DeptVO.java b/blade-service-api/blade-system-api/src/main/java/org/springblade/system/vo/DeptVO.java
index 80bcb39..fc11148 100644
--- a/blade-service-api/blade-system-api/src/main/java/org/springblade/system/vo/DeptVO.java
+++ b/blade-service-api/blade-system-api/src/main/java/org/springblade/system/vo/DeptVO.java
@@ -35,7 +35,7 @@ import java.util.List;
@Data
@EqualsAndHashCode(callSuper = true)
@ApiModel(value = "DeptVO对象", description = "DeptVO对象")
-public class DeptVO extends Dept implements INode {
+public class DeptVO extends Dept implements INode {
private static final long serialVersionUID = 1L;
/**
@@ -54,10 +54,10 @@ public class DeptVO extends Dept implements INode {
* 子孙节点
*/
@JsonInclude(JsonInclude.Include.NON_EMPTY)
- private List children;
+ private List children;
@Override
- public List getChildren() {
+ public List getChildren() {
if (this.children == null) {
this.children = new ArrayList<>();
}
diff --git a/blade-service-api/blade-system-api/src/main/java/org/springblade/system/vo/MenuVO.java b/blade-service-api/blade-system-api/src/main/java/org/springblade/system/vo/MenuVO.java
index 60a76ae..17aaa20 100644
--- a/blade-service-api/blade-system-api/src/main/java/org/springblade/system/vo/MenuVO.java
+++ b/blade-service-api/blade-system-api/src/main/java/org/springblade/system/vo/MenuVO.java
@@ -35,7 +35,7 @@ import java.util.List;
@Data
@EqualsAndHashCode(callSuper = true)
@ApiModel(value = "MenuVO对象", description = "MenuVO对象")
-public class MenuVO extends Menu implements INode {
+public class MenuVO extends Menu implements INode {
private static final long serialVersionUID = 1L;
/**
@@ -54,7 +54,7 @@ public class MenuVO extends Menu implements INode {
* 子孙节点
*/
@JsonInclude(JsonInclude.Include.NON_EMPTY)
- private List children;
+ private List children;
/**
* 是否有子孙节点
@@ -63,7 +63,7 @@ public class MenuVO extends Menu implements INode {
private Boolean hasChildren;
@Override
- public List getChildren() {
+ public List getChildren() {
if (this.children == null) {
this.children = new ArrayList<>();
}
diff --git a/blade-service-api/blade-system-api/src/main/java/org/springblade/system/vo/RegionVO.java b/blade-service-api/blade-system-api/src/main/java/org/springblade/system/vo/RegionVO.java
index 9ff9259..a09754e 100644
--- a/blade-service-api/blade-system-api/src/main/java/org/springblade/system/vo/RegionVO.java
+++ b/blade-service-api/blade-system-api/src/main/java/org/springblade/system/vo/RegionVO.java
@@ -36,7 +36,7 @@ import java.util.List;
@Data
@EqualsAndHashCode(callSuper = true)
@ApiModel(value = "RegionVO对象", description = "行政区划表")
-public class RegionVO extends Region implements INode {
+public class RegionVO extends Region implements INode {
private static final long serialVersionUID = 1L;
/**
@@ -66,7 +66,7 @@ public class RegionVO extends Region implements INode {
* 子孙节点
*/
@JsonInclude(JsonInclude.Include.NON_EMPTY)
- private List children;
+ private List children;
@Override
public Long getId() {
@@ -79,7 +79,7 @@ public class RegionVO extends Region implements INode {
}
@Override
- public List getChildren() {
+ public List getChildren() {
if (this.children == null) {
this.children = new ArrayList<>();
}
diff --git a/blade-service-api/blade-system-api/src/main/java/org/springblade/system/vo/RoleVO.java b/blade-service-api/blade-system-api/src/main/java/org/springblade/system/vo/RoleVO.java
index 53f7bec..5561c4e 100644
--- a/blade-service-api/blade-system-api/src/main/java/org/springblade/system/vo/RoleVO.java
+++ b/blade-service-api/blade-system-api/src/main/java/org/springblade/system/vo/RoleVO.java
@@ -35,7 +35,7 @@ import java.util.List;
@Data
@EqualsAndHashCode(callSuper = true)
@ApiModel(value = "RoleVO对象", description = "RoleVO对象")
-public class RoleVO extends Role implements INode {
+public class RoleVO extends Role implements INode {
private static final long serialVersionUID = 1L;
/**
@@ -54,10 +54,10 @@ public class RoleVO extends Role implements INode {
* 子孙节点
*/
@JsonInclude(JsonInclude.Include.NON_EMPTY)
- private List children;
+ private List children;
@Override
- public List getChildren() {
+ public List getChildren() {
if (this.children == null) {
this.children = new ArrayList<>();
}
diff --git a/blade-service-api/blade-user-api/pom.xml b/blade-service-api/blade-user-api/pom.xml
index 24db917..1ba3e65 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
- 3.6.0
+ 3.7.0
4.0.0
diff --git a/blade-service-api/pom.xml b/blade-service-api/pom.xml
index 81e7a23..3c661cf 100644
--- a/blade-service-api/pom.xml
+++ b/blade-service-api/pom.xml
@@ -5,13 +5,13 @@
SpringBlade
org.springblade
- 3.6.0
+ 3.7.0
4.0.0
blade-service-api
${project.artifactId}
- 3.6.0
+ 3.7.0
pom
SpringBlade 微服务API集合
diff --git a/blade-service/blade-demo/pom.xml b/blade-service/blade-demo/pom.xml
index 8beefe0..55d4e5f 100644
--- a/blade-service/blade-demo/pom.xml
+++ b/blade-service/blade-demo/pom.xml
@@ -5,7 +5,7 @@
blade-service
org.springblade
- 3.6.0
+ 3.7.0
4.0.0
diff --git a/blade-service/blade-demo/src/main/java/com/example/demo/controller/DemoController.java b/blade-service/blade-demo/src/main/java/com/example/demo/controller/DemoController.java
index 62106fe..e9e9a2e 100644
--- a/blade-service/blade-demo/src/main/java/com/example/demo/controller/DemoController.java
+++ b/blade-service/blade-demo/src/main/java/com/example/demo/controller/DemoController.java
@@ -34,7 +34,7 @@ import org.springframework.web.bind.annotation.RestController;
@Api(value = "配置接口", tags = "即时刷新配置")
public class DemoController {
- @Value("${demo.name}")
+ @Value("${demo.name:1}")
private String name;
private final DemoProperties properties;
diff --git a/blade-service/blade-desk/pom.xml b/blade-service/blade-desk/pom.xml
index 738f29c..4210359 100644
--- a/blade-service/blade-desk/pom.xml
+++ b/blade-service/blade-desk/pom.xml
@@ -6,7 +6,7 @@
org.springblade
blade-service
- 3.6.0
+ 3.7.0
4.0.0
diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/controller/DashBoardController.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/controller/DashBoardController.java
index 6f5b4e4..1c4c6d3 100644
--- a/blade-service/blade-desk/src/main/java/org/springblade/desk/controller/DashBoardController.java
+++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/controller/DashBoardController.java
@@ -55,4 +55,124 @@ public class DashBoardController {
return R.data(list);
}
+
+ /**
+ * 获取消息
+ *
+ * @return
+ */
+ @GetMapping("/notices")
+ @ApiOperation(value = "消息", notes = "消息")
+ public R notices() {
+ List