Jelajahi Sumber

shoulder framework 0.8
compile shoulder-platform-common

lym 4 minggu lalu
induk
melakukan
b86fa9d28b

+ 0 - 1
shoulder-auth-center/pom.xml

@@ -12,7 +12,6 @@
         <relativePath>../shoulder-platform-common/shoulder-platform-parent/pom.xml</relativePath>
     </parent>
 
-    <groupId>cn.itlym.platform</groupId>
     <artifactId>shoulder-auth-center</artifactId>
     <packaging>pom</packaging>
 

+ 2 - 2
shoulder-backstage/pom.xml

@@ -16,8 +16,8 @@
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-compiler-plugin</artifactId>
                 <configuration>
-                    <source>11</source>
-                    <target>11</target>
+                    <source>${java.version}</source>
+                    <target>${java.version}</target>
                 </configuration>
             </plugin>
         </plugins>

+ 4 - 5
shoulder-gateway/pom.xml

@@ -12,7 +12,6 @@
     </parent>
 
     <artifactId>shoulder-gateway</artifactId>
-    <version>1.0-SNAPSHOT</version><!-- shoulder-platform-version -->
 
     <modules>
         <module>shoulder-api-gateway</module>
@@ -21,10 +20,10 @@
 
 
     <properties>
-        <shoulder.version>0.7-SNAPSHOT</shoulder.version><!-- shoulder-version -->
-        <spring-boot.version>2.3.6.RELEASE</spring-boot.version>
-        <spring-cloud.version>Hoxton.SR9</spring-cloud.version>
-        <spring-cloud-alibaba.version>2.2.3.RELEASE</spring-cloud-alibaba.version>
+        <shoulder.version>0.8-SNAPSHOT</shoulder.version><!-- shoulder-version -->
+        <spring-boot.version>3.0.2</spring-boot.version>
+        <spring-cloud.version>2022.0.0</spring-cloud.version>
+        <spring-cloud-alibaba.version>2022.0.0.0</spring-cloud-alibaba.version>
     </properties>
 
 </project>

+ 4 - 4
shoulder-gateway/shoulder-api-gateway/pom.xml

@@ -15,10 +15,10 @@
     <name>${project.artifactId}</name>
 
     <properties>
-        <shoulder.version>0.7-SNAPSHOT</shoulder.version><!-- shoulder-version -->
-        <spring-boot.version>2.3.6.RELEASE</spring-boot.version>
-        <spring-cloud.version>Hoxton.SR9</spring-cloud.version>
-        <spring-cloud-alibaba.version>2.2.3.RELEASE</spring-cloud-alibaba.version>
+        <shoulder.version>0.8-SNAPSHOT</shoulder.version><!-- shoulder-version -->
+        <spring-boot.version>3.0.2</spring-boot.version>
+        <spring-cloud.version>2022.0.0</spring-cloud.version>
+        <spring-cloud-alibaba.version>2022.0.0.0</spring-cloud-alibaba.version>
     </properties>
 
     <dependencies>

+ 18 - 6
shoulder-generator/pom.xml

@@ -3,9 +3,9 @@
          xmlns="http://maven.apache.org/POM/4.0.0"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <parent>
-        <groupId>cn.itlym</groupId>
-        <artifactId>shoulder-parent</artifactId>
-        <version>0.7-SNAPSHOT</version><!-- shoulder-version -->
+        <groupId>cn.itlym.platform</groupId>
+        <artifactId>shoulder-platform</artifactId>
+        <version>1.0-SNAPSHOT</version><!-- shoulder-platform-version -->
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
@@ -13,6 +13,17 @@
     <name>代码生成器</name>
     <description>代码生成器</description>
 
+    <dependencyManagement>
+        <dependencies>
+            <dependency>
+                <groupId>cn.itlym</groupId>
+                <artifactId>shoulder-parent</artifactId>
+                <version>0.8-SNAPSHOT</version><!-- shoulder-version -->
+                <type>pom</type>
+                <scope>import</scope>
+            </dependency>
+        </dependencies>
+    </dependencyManagement>
     <dependencies>
 
         <dependency>
@@ -46,8 +57,8 @@
         </dependency>
         <!-- 默认使用 mysql -->
         <dependency>
-            <groupId>mysql</groupId>
-            <artifactId>mysql-connector-java</artifactId>
+            <groupId>com.mysql</groupId>
+            <artifactId>mysql-connector-j</artifactId>
         </dependency>
 
         <!-- 彩色日志等,比 spring-boot-starter-web 更简便 -->
@@ -71,5 +82,6 @@
                     <include>**/*.*</include>
                 </includes>
             </resource>
-        </resources></build>
+        </resources>
+    </build>
 </project>

+ 4 - 4
shoulder-notify-center/shoulder-sms/sms-center/pom.xml

@@ -15,7 +15,7 @@
     <description>Shoulder平台-短信推送服务</description>
 
     <properties>
-        <javax.mail.version>1.6.2</javax.mail.version>
+        <jakarta.mail.version>2.0.3</jakarta.mail.version>
     </properties>
 
     <dependencies>
@@ -50,9 +50,9 @@
         </dependency>
 
         <dependency>
-            <groupId>com.sun.mail</groupId>
-            <artifactId>javax.mail</artifactId>
-            <version>${javax.mail.version}</version>
+            <groupId>org.eclipse.angus</groupId>
+            <artifactId>jakarta.mail</artifactId>
+            <version>${jakarta.mail.version}</version>
         </dependency>
 
         <!-- freemarker 模版 -->

+ 3 - 3
shoulder-platform-common/pom.xml

@@ -3,8 +3,8 @@
          xmlns="http://maven.apache.org/POM/4.0.0"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <parent>
-        <artifactId>shoulder-platform</artifactId>
         <groupId>cn.itlym.platform</groupId>
+        <artifactId>shoulder-platform</artifactId>
         <version>1.0-SNAPSHOT</version><!-- shoulder-platform-version -->
     </parent>
     <modelVersion>4.0.0</modelVersion>
@@ -30,7 +30,7 @@
     </modules>
 
     <properties>
-        <shoulder.version>0.7-SNAPSHOT</shoulder.version><!-- shoulder-version -->
+        <shoulder.version>0.8-SNAPSHOT</shoulder.version><!-- shoulder-version -->
         <shoulder-platform.version>1.0-SNAPSHOT</shoulder-platform.version>
     </properties>
 
@@ -39,7 +39,7 @@
             <dependency>
                 <groupId>cn.itlym</groupId>
                 <artifactId>shoulder-dependencies</artifactId>
-                <version>${shoulder.version}</version>
+                <version>0.8-SNAPSHOT</version><!-- shoulder-version -->
                 <type>pom</type>
                 <scope>import</scope>
             </dependency>

+ 4 - 4
shoulder-platform-common/shoulder-platform-archetype/src/main/resources/archetype-resources/__rootArtifactId__-api/pom.xml

@@ -17,12 +17,12 @@
             <scope>provided</scope>
         </dependency>
         <dependency>
-            <groupId>javax.ws.rs</groupId>
-            <artifactId>javax.ws.rs-api</artifactId>
+            <groupId>jakarta.ws.rs</groupId>
+            <artifactId>jakarta.ws.rs-api</artifactId>
         </dependency>
         <dependency>
-            <groupId>javax.validation</groupId>
-            <artifactId>validation-api</artifactId>
+            <groupId>jakarta.validation</groupId>
+            <artifactId>jakarta.validation-api</artifactId>
         </dependency>
 
         <dependency>

+ 41 - 8
shoulder-platform-common/shoulder-platform-parent/pom.xml

@@ -3,22 +3,28 @@
          xmlns="http://maven.apache.org/POM/4.0.0"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <parent>
-        <groupId>cn.itlym</groupId>
-        <artifactId>shoulder-parent</artifactId>
-        <version>0.7-SNAPSHOT</version><!-- shoulder-version -->
+        <groupId>cn.itlym.platform</groupId>
+        <artifactId>shoulder-platform-common</artifactId>
+        <version>1.0-SNAPSHOT</version><!-- shoulder-platform-version -->
+        <relativePath>../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
-    <groupId>cn.itlym.platform</groupId>
     <artifactId>shoulder-platform-parent</artifactId>
-    <version>1.0-SNAPSHOT</version><!-- shoulder-platform-version -->
     <packaging>pom</packaging>
 
     <url>https://github.com/ChinaLym/shoulder-platform</url>
     <properties>
+        <java.version>17</java.version>
+        <maven.compiler.source>${java.version}</maven.compiler.source>
+        <maven.compiler.target>${java.version}</maven.compiler.target>
+        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+        <maven.javadoc.charset>${project.build.sourceEncoding}</maven.javadoc.charset>
+        <maven.build.timestamp.format>yyyy-MM-dd HH:mm:ss</maven.build.timestamp.format>
+
         <!-- =============== Shoulder 版本 =============== -->
 
-        <shoulder.version>0.7-SNAPSHOT</shoulder.version><!-- shoulder-version -->
+        <shoulder.version>0.8-SNAPSHOT</shoulder.version><!-- shoulder-version -->
         <shoulder-platform.version>1.0-SNAPSHOT</shoulder-platform.version><!-- shoulder-platform-version -->
 
         <shoulder-sms-aliyun.version>1.0-SNAPSHOT</shoulder-sms-aliyun.version><!-- shoulder-sms-aliyun.version -->
@@ -28,7 +34,7 @@
 
         <!--spring-cloud-alibaba-dependencies 太久没更新,与最新版nacos存在版本不兼容 bug(无线循环同步,且不能指定 nacos 版本使用如 1.3 等,这里统一手动管理 -->
         <!--其中 1.3.1 支持了优雅下线方式-->
-        <spring-cloud-alibaba.version>2.2.3.RELEASE</spring-cloud-alibaba.version>
+        <spring-cloud-alibaba.version>2022.0.0.0</spring-cloud-alibaba.version>
         <nacos.client.version>1.3.2</nacos.client.version>
 
         <!--spring-cloud-alibaba引入了 fastJson,而低版本的 fastJson 太多安全漏洞,故这里统一设置为高版本-->
@@ -46,7 +52,27 @@
         <maven-resources-plugin.version>3.2.0</maven-resources-plugin.version>
         <dockerfile-maven-plugin.version>1.4.19</dockerfile-maven-plugin.version>
         <docker.image.prefix>shoulder</docker.image.prefix>
-        <spring-boot-maven-plugin.version>2.3.6.RELEASE</spring-boot-maven-plugin.version><!-- spring-boot.version -->
+        <spring-boot-maven-plugin.version>3.0.2</spring-boot-maven-plugin.version><!-- spring-boot.version -->
+
+        <maven-compiler-plugin.version>3.11.0</maven-compiler-plugin.version>
+        <maven-source-plugin.version>3.3.0</maven-source-plugin.version>
+        <maven-javadoc-plugin.version>3.6.0</maven-javadoc-plugin.version>
+        <maven-jar-plugin.version>3.3.0</maven-jar-plugin.version>
+        <maven-gpg-plugin.version>3.1.0</maven-gpg-plugin.version>
+
+        <maven-surefire-plugin.version>3.1.2</maven-surefire-plugin.version>
+        <findbugs-maven-plugin.version>3.0.5</findbugs-maven-plugin.version>
+        <cobertura-maven-plugin.version>2.7</cobertura-maven-plugin.version>
+        <versions-maven-plugin.version>2.7</versions-maven-plugin.version>
+        <license-maven-plugin.version>2.2.0</license-maven-plugin.version>
+        <git-commit-id-plugin.version>6.0.0</git-commit-id-plugin.version>
+        <sonar-maven-plugin.version>3.10.0.2594</sonar-maven-plugin.version>
+
+        <shoulder-maven-plugin.version>1.1</shoulder-maven-plugin.version>
+        <shoulder-framework.errcode-prefix>0x0000</shoulder-framework.errcode-prefix>
+
+        <springdoc-openapi-maven-plugin.version>0.3</springdoc-openapi-maven-plugin.version>
+
     </properties>
 
     <name>${project.artifactId}</name>
@@ -76,6 +102,13 @@
                 <type>pom</type>
                 <scope>import</scope>
             </dependency>
+            <dependency>
+                <groupId>cn.itlym</groupId>
+                <artifactId>shoulder-parent</artifactId>
+                <version>${shoulder.version}</version>
+                <type>pom</type>
+                <scope>import</scope>
+            </dependency>
 
             <!-- 平台提供的选型 -->
             <dependency>

+ 3 - 3
shoulder-platform-common/shoulder-platform-starter-db/pom.xml

@@ -27,7 +27,7 @@
         <!-- 默认使用 mybatis -->
         <dependency>
             <groupId>com.baomidou</groupId>
-            <artifactId>mybatis-plus-boot-starter</artifactId>
+            <artifactId>mybatis-plus-spring-boot3-starter</artifactId>
         </dependency>
 
         <dependency>
@@ -37,8 +37,8 @@
 
         <!-- 默认使用 mysql -->
         <dependency>
-            <groupId>mysql</groupId>
-            <artifactId>mysql-connector-java</artifactId>
+            <groupId>com.mysql</groupId>
+                <artifactId>mysql-connector-j</artifactId>
         </dependency>
 
         <!-- 数据库 连接池 默认使用高性能的 beecp (性能是 spring-boot 默认 hikairCP 两倍,功能较少)-->

+ 3 - 1
shoulder-platform-common/shoulder-platform-starter-trace/pom.xml

@@ -18,7 +18,9 @@
 
         <dependency>
             <groupId>org.springframework.cloud</groupId>
-            <artifactId>spring-cloud-starter-zipkin</artifactId>
+            <artifactId>spring-cloud-sleuth-zipkin</artifactId>
+            <version>3.1.9</version>
+            <!-- 2.2.8 后 starter name changed -->
         </dependency>
 
         <dependency>

+ 4 - 3
shoulder-platform-common/shoulder-sms-aliyun-spring-boot-starter/pom.xml

@@ -3,9 +3,10 @@
          xmlns="http://maven.apache.org/POM/4.0.0"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <parent>
-        <groupId>cn.itlym</groupId>
-        <artifactId>shoulder-parent</artifactId>
-        <version>0.7-SNAPSHOT</version><!-- shoulder-version -->
+        <groupId>cn.itlym.platform</groupId>
+        <artifactId>shoulder-platform-parent</artifactId>
+        <version>1.0-SNAPSHOT</version><!-- shoulder-platform-version -->
+        <relativePath>../shoulder-platform-parent/pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

+ 4 - 4
shoulder-system-center/system-api/pom.xml

@@ -18,12 +18,12 @@
             <scope>provided</scope>
         </dependency>
         <dependency>
-            <groupId>javax.ws.rs</groupId>
-            <artifactId>javax.ws.rs-api</artifactId>
+            <groupId>jakarta.ws.rs</groupId>
+            <artifactId>jakarta.ws.rs-api</artifactId>
         </dependency>
         <dependency>
-            <groupId>javax.validation</groupId>
-            <artifactId>validation-api</artifactId>
+            <groupId>jakarta.validation</groupId>
+            <artifactId>jakarta.validation-api</artifactId>
         </dependency>
 
         <dependency>

+ 0 - 2
shoulder-system-center/system-common/pom.xml

@@ -29,8 +29,6 @@
         <dependency>
             <groupId>com.baomidou</groupId>
             <artifactId>mybatis-plus-annotation</artifactId>
-            <version>3.4.0</version>
-            <scope>compile</scope>
         </dependency>
         <dependency>
             <groupId>com.github.pagehelper</groupId>

+ 1 - 0
shoulder-universal/pom.xml

@@ -5,6 +5,7 @@
         <groupId>cn.itlym.platform</groupId>
         <artifactId>shoulder-platform</artifactId>
         <version>1.0-SNAPSHOT</version><!-- shoulder-platform-version -->
+        <relativePath>../pom.xml</relativePath>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>

+ 1 - 1
shoulder-user-center/pom.xml

@@ -4,6 +4,7 @@
         <groupId>cn.itlym.platform</groupId>
         <artifactId>shoulder-platform-parent</artifactId>
         <version>1.0-SNAPSHOT</version><!-- shoulder-platform-version -->
+        <relativePath>../shoulder-platform-common/shoulder-platform-parent/pom.xml</relativePath>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
@@ -12,7 +13,6 @@
     <artifactId>shoulder-user-center</artifactId>
     <description>用户认证授权中心</description>
 
-    <groupId>cn.itlym.platform</groupId>
     <packaging>pom</packaging>
     <version>1.0-SNAPSHOT</version><!-- uaa.version -->
 

+ 4 - 4
shoulder-user-center/uaa-api/pom.xml

@@ -16,12 +16,12 @@
             <scope>provided</scope>
         </dependency>
         <dependency>
-            <groupId>javax.ws.rs</groupId>
-            <artifactId>javax.ws.rs-api</artifactId>
+            <groupId>jakarta.ws.rs</groupId>
+            <artifactId>jakarta.ws.rs-api</artifactId>
         </dependency>
         <dependency>
-            <groupId>javax.validation</groupId>
-            <artifactId>validation-api</artifactId>
+            <groupId>jakarta.validation</groupId>
+            <artifactId>jakarta.validation-api</artifactId>
         </dependency>
 
         <dependency>

+ 1 - 2
shoulder-user-center/uaa-infrastructure/uaa-storage/pom.xml

@@ -22,8 +22,7 @@
         <dependency>
             <groupId>com.baomidou</groupId>
             <artifactId>mybatis-plus-annotation</artifactId>
-            <version>3.4.0</version>
-            <scope>provided</scope>
+            <version>${mybatis-plus.version}</version>
         </dependency>
 
         <!-- JPA -->