Merge remote-tracking branch 'origin/master'

# Conflicts:
#	blade-core-boot/pom.xml
#	blade-core-cloud/pom.xml
#	blade-core-crypto/pom.xml
#	blade-core-datascope/pom.xml
#	blade-core-develop/pom.xml
#	blade-core-launch/pom.xml
#	blade-core-loadbalancer/pom.xml
#	blade-core-log/pom.xml
#	blade-core-mybatis/pom.xml
#	blade-core-oss/pom.xml
#	blade-core-report/pom.xml
#	blade-core-secure/pom.xml
#	blade-core-social/pom.xml
#	blade-core-swagger/pom.xml
#	blade-core-test/pom.xml
#	blade-core-tool/pom.xml
#	blade-core-transaction/pom.xml
#	pom.xml

.github/ISSUE_TEMPLATE

@@ -0,0 +1,13 @@
+**注意：github 上的少，可能响应不够及时，建议 gitee 上发起**
+
+Please answer some questions before submitting your issue. Thanks!
+
+### Which version do you using（使用的哪个版本）?
+
+### Expected behavior（预期的效果）
+
+### Actual behavior（实际的效果）
+
+### Steps to reproduce the behavior（重现步骤）
+
+### Other information（其他信息）

.github/PULL_REQUEST_TEMPLATE

@@ -0,0 +1,16 @@
+**注意：github 上的少，可能响应不够及时，建议 gitee 上发起**
+
+**What kind of change does this PR introduce?** (check at least one)
+
+- [ ] Bugfix（bug修复）
+- [ ] Feature（新功能）
+- [ ] Code style update（代码格式调整）
+- [ ] Refactor（重构）
+- [ ] Build-related changes（与构建相关的更改）
+- [ ] Other, please describe（其他，请说明）:
+
+
+**The description of the PR（PR描述）:**
+
+
+**Other information（其他信息）:**

.github/workflows/test-and-build.yml

@@ -0,0 +1,17 @@
+name: Java CI
+on: [push, pull_request]
+
+jobs:
+  buildOnJava8:
+    name: build on java8
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v3
+      - name: Set up JDK 8
+        uses: actions/setup-java@v3
+        with:
+          distribution: 'zulu'
+          cache: 'maven'
+          java-version: 8
+      - name: Build with Maven
+        run: mvn package

.gitignore

@@ -25,3 +25,7 @@ Thumbs.db
 *.war
 *.ear
 /target
+
+# Flattened pom
+.flattened-pom.xml
+/**/.flattened-pom.xml

blade-core-bom/pom.xml

@@ -0,0 +1,38 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <parent>
+        <artifactId>blade-tool</artifactId>
+        <groupId>org.springblade</groupId>
+        <version>${revision}</version>
+    </parent>
+
+    <modelVersion>4.0.0</modelVersion>
+
+    <artifactId>blade-core-bom</artifactId>
+    <name>${project.artifactId}</name>
+    <packaging>pom</packaging>
+
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.codehaus.mojo</groupId>
+                <artifactId>flatten-maven-plugin</artifactId>
+                <version>${maven-flatten.version}</version>
+                <configuration>
+                    <updatePomFile>true</updatePomFile>
+                    <flattenMode>oss</flattenMode>
+                    <pomElements>
+                        <dependencyManagement>expand</dependencyManagement>
+                        <pluginManagement>remove</pluginManagement>
+                        <dependencies>remove</dependencies>
+                        <properties>remove</properties>
+                        <repositories>remove</repositories>
+                    </pomElements>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
+
+</project>

blade-core-boot/pom.xml

@@ -5,14 +5,13 @@
     <parent>
         <groupId>org.springblade</groupId>
         <artifactId>blade-tool</artifactId>
-        <version>3.7.2</version>
+        <version>${revision}</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
 
     <artifactId>blade-core-boot</artifactId>
     <name>${project.artifactId}</name>
-    <version>${blade.tool.version}</version>
     <packaging>jar</packaging>
 
     <dependencies>
@@ -35,38 +34,31 @@
         <dependency>
             <groupId>org.springblade</groupId>
             <artifactId>blade-core-launch</artifactId>
-            <version>${blade.tool.version}</version>
         </dependency>
         <dependency>
             <groupId>org.springblade</groupId>
             <artifactId>blade-core-cloud</artifactId>
-            <version>${blade.tool.version}</version>
         </dependency>
         <dependency>
             <groupId>org.springblade</groupId>
             <artifactId>blade-core-tool</artifactId>
-            <version>${blade.tool.version}</version>
         </dependency>
         <dependency>
             <groupId>org.springblade</groupId>
             <artifactId>blade-core-secure</artifactId>
-            <version>${blade.tool.version}</version>
         </dependency>
         <dependency>
             <groupId>org.springblade</groupId>
             <artifactId>blade-core-log</artifactId>
-            <version>${blade.tool.version}</version>
         </dependency>
         <dependency>
             <groupId>org.springblade</groupId>
             <artifactId>blade-core-swagger</artifactId>
-            <version>${blade.tool.version}</version>
         </dependency>
         <!--MyBatis-->
         <dependency>
             <groupId>org.springblade</groupId>
             <artifactId>blade-core-mybatis</artifactId>
-            <version>${blade.tool.version}</version>
         </dependency>
         <dependency>
             <groupId>com.baomidou</groupId>

blade-core-cloud/pom.xml

@@ -5,13 +5,12 @@
     <parent>
         <artifactId>blade-tool</artifactId>
         <groupId>org.springblade</groupId>
-        <version>3.7.2</version>
+        <version>${revision}</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
     <artifactId>blade-core-cloud</artifactId>
     <name>${project.artifactId}</name>
-    <version>${blade.tool.version}</version>
     <packaging>jar</packaging>
 
 
@@ -20,7 +19,6 @@
         <dependency>
             <groupId>org.springblade</groupId>
             <artifactId>blade-core-secure</artifactId>
-            <version>${blade.tool.version}</version>
         </dependency>
         <!--Feign-->
         <dependency>

blade-core-crypto/pom.xml

@@ -5,20 +5,18 @@
     <parent>
         <artifactId>blade-tool</artifactId>
         <groupId>org.springblade</groupId>
-        <version>3.7.2</version>
+        <version>${revision}</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
     <artifactId>blade-core-crypto</artifactId>
     <name>${project.artifactId}</name>
-    <version>${blade.tool.version}</version>
     <packaging>jar</packaging>
 
     <dependencies>
         <dependency>
             <groupId>org.springblade</groupId>
             <artifactId>blade-core-tool</artifactId>
-            <version>${blade.tool.version}</version>
         </dependency>
         <dependency>
             <groupId>org.springframework.cloud</groupId>

blade-core-datascope/pom.xml

@@ -5,13 +5,12 @@
     <parent>
         <artifactId>blade-tool</artifactId>
         <groupId>org.springblade</groupId>
-        <version>3.7.2</version>
+        <version>${revision}</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
     <artifactId>blade-core-datascope</artifactId>
     <name>${project.artifactId}</name>
-    <version>${blade.tool.version}</version>
     <packaging>jar</packaging>
 
     <dependencies>
@@ -19,7 +18,6 @@
         <dependency>
             <groupId>org.springblade</groupId>
             <artifactId>blade-core-mybatis</artifactId>
-            <version>${blade.tool.version}</version>
         </dependency>
         <!--Jdbc-->
         <dependency>

blade-core-develop/pom.xml

@@ -5,13 +5,12 @@
     <parent>
         <artifactId>blade-tool</artifactId>
         <groupId>org.springblade</groupId>
-        <version>3.7.2</version>
+        <version>${revision}</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
     <artifactId>blade-core-develop</artifactId>
     <name>${project.artifactId}</name>
-    <version>${blade.tool.version}</version>
     <packaging>jar</packaging>
 
     <dependencies>
@@ -19,7 +18,6 @@
         <dependency>
             <groupId>org.springblade</groupId>
             <artifactId>blade-core-tool</artifactId>
-            <version>${blade.tool.version}</version>
         </dependency>
         <!--Mybatis-Plus-->
         <dependency>

blade-core-launch/pom.xml

@@ -5,14 +5,13 @@
     <parent>
         <artifactId>blade-tool</artifactId>
         <groupId>org.springblade</groupId>
-        <version>3.7.2</version>
+        <version>${revision}</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
 
     <artifactId>blade-core-launch</artifactId>
     <name>${project.artifactId}</name>
-    <version>${blade.tool.version}</version>
     <packaging>jar</packaging>
 
     <dependencies>

blade-core-loadbalancer/pom.xml

@@ -5,14 +5,13 @@
     <parent>
         <artifactId>blade-tool</artifactId>
         <groupId>org.springblade</groupId>
-        <version>3.7.2</version>
+        <version>${revision}</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
 
     <artifactId>blade-core-loadbalancer</artifactId>
     <name>${project.artifactId}</name>
-    <version>${blade.tool.version}</version>
     <packaging>jar</packaging>
 
     <dependencies>

blade-core-log/pom.xml

@@ -5,14 +5,13 @@
     <parent>
         <artifactId>blade-tool</artifactId>
         <groupId>org.springblade</groupId>
-        <version>3.7.2</version>
+        <version>${revision}</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
 
     <artifactId>blade-core-log</artifactId>
     <name>${project.artifactId}</name>
-    <version>${blade.tool.version}</version>
     <packaging>jar</packaging>
 
     <dependencies>
@@ -20,17 +19,14 @@
         <dependency>
             <groupId>org.springblade</groupId>
             <artifactId>blade-core-tool</artifactId>
-            <version>${blade.tool.version}</version>
         </dependency>
         <dependency>
             <groupId>org.springblade</groupId>
             <artifactId>blade-core-secure</artifactId>
-            <version>${blade.tool.version}</version>
         </dependency>
         <dependency>
             <groupId>org.springblade</groupId>
             <artifactId>blade-core-cloud</artifactId>
-            <version>${blade.tool.version}</version>
         </dependency>
         <!--Mybatis-->
         <dependency>

blade-core-mybatis/pom.xml

@@ -5,14 +5,13 @@
     <parent>
         <artifactId>blade-tool</artifactId>
         <groupId>org.springblade</groupId>
-        <version>3.7.2</version>
+        <version>${revision}</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
 
     <artifactId>blade-core-mybatis</artifactId>
     <name>${project.artifactId}</name>
-    <version>${blade.tool.version}</version>
     <packaging>jar</packaging>
 
     <dependencies>
@@ -36,7 +35,6 @@
         <dependency>
             <groupId>org.springblade</groupId>
             <artifactId>blade-core-secure</artifactId>
-            <version>${blade.tool.version}</version>
         </dependency>
     </dependencies>
 

blade-core-oss/pom.xml

@@ -5,13 +5,12 @@
     <parent>
         <artifactId>blade-tool</artifactId>
         <groupId>org.springblade</groupId>
-        <version>3.7.2</version>
+        <version>${revision}</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
     <artifactId>blade-core-oss</artifactId>
     <name>${project.artifactId}</name>
-    <version>${blade.tool.version}</version>
     <packaging>jar</packaging>
 
     <dependencies>
@@ -19,7 +18,6 @@
         <dependency>
             <groupId>org.springblade</groupId>
             <artifactId>blade-core-tool</artifactId>
-            <version>${blade.tool.version}</version>
         </dependency>
         <!--Aliyun-->
         <dependency>

blade-core-report/pom.xml

@@ -5,20 +5,18 @@
     <parent>
         <artifactId>blade-tool</artifactId>
         <groupId>org.springblade</groupId>
-        <version>3.7.2</version>
+        <version>${revision}</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
     <artifactId>blade-core-report</artifactId>
     <name>${project.artifactId}</name>
-    <version>${blade.tool.version}</version>
     <packaging>jar</packaging>
 
     <dependencies>
         <dependency>
             <groupId>org.springblade</groupId>
             <artifactId>blade-core-mybatis</artifactId>
-            <version>${blade.tool.version}</version>
         </dependency>
         <dependency>
             <groupId>com.bstek.ureport</groupId>

blade-core-secure/pom.xml

@@ -5,14 +5,13 @@
     <parent>
         <artifactId>blade-tool</artifactId>
         <groupId>org.springblade</groupId>
-        <version>3.7.2</version>
+        <version>${revision}</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
 
     <artifactId>blade-core-secure</artifactId>
     <name>${project.artifactId}</name>
-    <version>${blade.tool.version}</version>
     <packaging>jar</packaging>
 
     <dependencies>
@@ -31,7 +30,6 @@
         <dependency>
             <groupId>org.springblade</groupId>
             <artifactId>blade-core-tool</artifactId>
-            <version>${blade.tool.version}</version>
         </dependency>
         <!--Jdbc-->
         <dependency>

blade-core-social/pom.xml

@@ -5,13 +5,12 @@
     <parent>
         <artifactId>blade-tool</artifactId>
         <groupId>org.springblade</groupId>
-        <version>3.7.2</version>
+        <version>${revision}</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
     <artifactId>blade-core-social</artifactId>
     <name>${project.artifactId}</name>
-    <version>${blade.tool.version}</version>
     <packaging>jar</packaging>
 
     <dependencies>
@@ -19,7 +18,6 @@
         <dependency>
             <groupId>org.springblade</groupId>
             <artifactId>blade-core-tool</artifactId>
-            <version>${blade.tool.version}</version>
         </dependency>
         <!-- 第三方登陆 -->
         <dependency>

blade-core-swagger/pom.xml

@@ -5,14 +5,13 @@
     <parent>
         <artifactId>blade-tool</artifactId>
         <groupId>org.springblade</groupId>
-        <version>3.7.2</version>
+        <version>${revision}</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
 
     <artifactId>blade-core-swagger</artifactId>
     <name>${project.artifactId}</name>
-    <version>${blade.tool.version}</version>
     <packaging>jar</packaging>
 
     <dependencies>
@@ -20,7 +19,6 @@
         <dependency>
             <groupId>org.springblade</groupId>
             <artifactId>blade-core-tool</artifactId>
-            <version>${blade.tool.version}</version>
         </dependency>
         <!--Swagger-->
         <dependency>

blade-core-test/pom.xml

@@ -5,13 +5,12 @@
     <parent>
         <groupId>org.springblade</groupId>
         <artifactId>blade-tool</artifactId>
-        <version>3.7.2</version>
+        <version>${revision}</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
     <artifactId>blade-core-test</artifactId>
     <name>${project.artifactId}</name>
-    <version>${blade.tool.version}</version>
     <packaging>jar</packaging>
 
     <dependencies>
@@ -19,7 +18,6 @@
         <dependency>
             <groupId>org.springblade</groupId>
             <artifactId>blade-core-launch</artifactId>
-            <version>${blade.tool.version}</version>
         </dependency>
         <!-- Test -->
         <dependency>

blade-core-tool/pom.xml

@@ -2,18 +2,16 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0"
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          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>
         <artifactId>blade-tool</artifactId>
-        <version>3.7.2</version>
+        <version>${revision}</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
 
     <artifactId>blade-core-tool</artifactId>
     <name>${project.artifactId}</name>
-    <version>${blade.tool.version}</version>
     <packaging>jar</packaging>
 
     <dependencies>
@@ -21,7 +19,6 @@
         <dependency>
             <groupId>org.springblade</groupId>
             <artifactId>blade-core-launch</artifactId>
-            <version>${blade.tool.version}</version>
         </dependency>
         <dependency>
             <groupId>com.fasterxml.jackson.datatype</groupId>

blade-core-transaction/pom.xml

@@ -5,13 +5,12 @@
     <parent>
         <artifactId>blade-tool</artifactId>
         <groupId>org.springblade</groupId>
-        <version>3.7.2</version>
+        <version>${revision}</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
     <artifactId>blade-core-transaction</artifactId>
     <name>${project.artifactId}</name>
-    <version>${blade.tool.version}</version>
     <packaging>jar</packaging>
 
     <dependencies>
@@ -19,12 +18,10 @@
         <dependency>
             <groupId>org.springblade</groupId>
             <artifactId>blade-core-mybatis</artifactId>
-            <version>${blade.tool.version}</version>
         </dependency>
         <dependency>
             <groupId>org.springblade</groupId>
             <artifactId>blade-core-cloud</artifactId>
-            <version>${blade.tool.version}</version>
         </dependency>
         <!-- Cloud-->
         <dependency>

pom.xml

@@ -2,10 +2,9 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          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>
     <artifactId>blade-tool</artifactId>
-    <version>3.7.2</version>
+    <version>${revision}</version>
     <packaging>pom</packaging>
     <name>blade-tool</name>
     <description>
@@ -36,11 +35,12 @@
     </scm>
 
     <properties>
-        <blade.tool.version>3.7.2</blade.tool.version>
+        <!-- Blade-Tool Version -->
-
+        <revision>3.7.1</revision>
+        <!-- jdk Version -->
         <java.version>1.8</java.version>
         <maven.plugin.version>3.8.1</maven.plugin.version>
-
+        <maven-flatten.version>1.3.0</maven-flatten.version>
         <knife4j.version>4.3.0</knife4j.version>
         <mybatis.version>3.5.13</mybatis.version>
         <mybatis.spring.version>2.1.1</mybatis.spring.version>
@@ -64,6 +64,7 @@
     </properties>
 
     <modules>
+        <module>blade-core-bom</module>
         <module>blade-core-boot</module>
         <module>blade-core-cloud</module>
         <module>blade-core-develop</module>
@@ -120,6 +121,98 @@
                 <type>pom</type>
                 <scope>import</scope>
             </dependency>
+            <dependency>
+                <groupId>net.dreamlu</groupId>
+                <artifactId>mica-auto</artifactId>
+                <version>${mica.auto.version}</version>
+                <scope>provided</scope>
+            </dependency>
+            <!-- blade tool -->
+            <dependency>
+                <groupId>org.springblade</groupId>
+                <artifactId>blade-core-launch</artifactId>
+                <version>${revision}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.springblade</groupId>
+                <artifactId>blade-core-boot</artifactId>
+                <version>${revision}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.springblade</groupId>
+                <artifactId>blade-core-cloud</artifactId>
+                <version>${revision}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.springblade</groupId>
+                <artifactId>blade-core-tool</artifactId>
+                <version>${revision}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.springblade</groupId>
+                <artifactId>blade-core-develop</artifactId>
+                <version>${revision}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.springblade</groupId>
+                <artifactId>blade-core-secure</artifactId>
+                <version>${revision}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.springblade</groupId>
+                <artifactId>blade-core-social</artifactId>
+                <version>${revision}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.springblade</groupId>
+                <artifactId>blade-core-log</artifactId>
+                <version>${revision}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.springblade</groupId>
+                <artifactId>blade-core-test</artifactId>
+                <version>${revision}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.springblade</groupId>
+                <artifactId>blade-core-swagger</artifactId>
+                <version>${revision}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.springblade</groupId>
+                <artifactId>blade-core-mybatis</artifactId>
+                <version>${revision}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.springblade</groupId>
+                <artifactId>blade-core-oss</artifactId>
+                <version>${revision}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.springblade</groupId>
+                <artifactId>blade-core-transaction</artifactId>
+                <version>${revision}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.springblade</groupId>
+                <artifactId>blade-core-loadbalancer</artifactId>
+                <version>${revision}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.springblade</groupId>
+                <artifactId>blade-core-report</artifactId>
+                <version>${revision}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.springblade</groupId>
+                <artifactId>blade-core-datascope</artifactId>
+                <version>${revision}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.springblade</groupId>
+                <artifactId>blade-core-crypto</artifactId>
+                <version>${revision}</version>
+            </dependency>
         </dependencies>
     </dependencyManagement>
 
@@ -159,7 +252,6 @@
         <dependency>
             <groupId>net.dreamlu</groupId>
             <artifactId>mica-auto</artifactId>
-            <version>${mica.auto.version}</version>
             <scope>provided</scope>
         </dependency>
     </dependencies>
@@ -191,6 +283,31 @@
                     </compilerArgs>
                 </configuration>
             </plugin>
+            <plugin>
+                <groupId>org.codehaus.mojo</groupId>
+                <artifactId>flatten-maven-plugin</artifactId>
+                <version>${maven-flatten.version}</version>
+                <configuration>
+                    <updatePomFile>true</updatePomFile>
+                    <flattenMode>oss</flattenMode>
+                </configuration>
+                <executions>
+                    <execution>
+                        <id>flatten</id>
+                        <phase>process-resources</phase>
+                        <goals>
+                            <goal>flatten</goal>
+                        </goals>
+                    </execution>
+                    <execution>
+                        <id>flatten.clean</id>
+                        <phase>clean</phase>
+                        <goals>
+                            <goal>clean</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-javadoc-plugin</artifactId>