Merge pull request #245 from trydofor/develop

3.2.130.Stage1
trydofor · May 29, 2024 · f9fe4f2 · f9fe4f2
2 parents aeb2021 + 6e50d1c
commit f9fe4f2
Show file tree

Hide file tree

Showing 109 changed files with 15,253 additions and 349 deletions.
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -184,6 +184,9 @@ jobs:
           -P 'deploy,deploy-oss,!module-example,!module-devs'
           ${{ steps.settings.outputs.MVN_REVISION }}
           -Dgpg.passphrase=${MVN_GPG_PASS}
+          -Dorg.slf4j.simpleLogger.log.lombok=WARN
+          -Dorg.slf4j.simpleLogger.log.org.jetbrains.dokka=WARN
+          -Dorg.slf4j.simpleLogger.log.pl.project13.maven.git=WARN
           deploy
         env:
           JAVA_HOME: ${{ steps.settings.outputs.JAVA_HOME }}
@@ -197,9 +200,12 @@ jobs:
         continue-on-error: ${{ inputs.deployAltrh != 'true' }}
         run: >
           mvn 
-          -P 'deploy,deploy-alt,!module-example,!module-devs'
+          -P 'deploy,deploy-alt,deploy-old,!module-example,!module-devs'
           ${{ steps.settings.outputs.MVN_REVISION }}
           -Dgpg.passphrase=${MVN_GPG_PASS}
+          -Dorg.slf4j.simpleLogger.log.lombok=WARN
+          -Dorg.slf4j.simpleLogger.log.org.jetbrains.dokka=WARN
+          -Dorg.slf4j.simpleLogger.log.pl.project13.maven.git=WARN
           deploy
         env:
           JAVA_HOME: ${{ steps.settings.outputs.JAVA_HOME }}

diff --git a/.tool-versions b/.tool-versions
@@ -1,2 +1,2 @@
-java temurin-21.0.1+12.0.LTS
+java temurin-21.0.3+9.0.LTS
 maven 3.9.6
diff --git a/WingsBoot.t.md b/WingsBoot.t.md
@@ -36,6 +36,8 @@ Use `t.md` as local [Test Management](https://www.jetbrains.com/help/idea/test-m
 * 11030 TtlMDCAdapterTest: ttl MDC in multiple thread
 * 11031 WingsReorderDefaultTest: default Order/Ordered
 * 11032 WingsReorderEnableTest: configed Order/Ordered
+* 11033 ThisLazyCglibTest: thisLazy with cglib
+* 11034 ThisLazyProxyTest: thisLazy with default jdk proxy
 
 ## 12 Faceless
 
@@ -188,6 +190,7 @@ Use `t.md` as local [Test Management](https://www.jetbrains.com/help/idea/test-m
 * 12147 WingsRevisionTest: module root and path
 * 12148 JdbcTemplateHelperTest: safe table
 * 12149 FormatSugarTest: format datetime and number
+* 12150 SetterSugarTest: one line setter sugar
 
 ## 13 Slardar
 
@@ -313,6 +316,7 @@ Use `t.md` as local [Test Management](https://www.jetbrains.com/help/idea/test-m
 * 13120 AsyncControllerTest: Future request mapping with async service
 * 13121 BootAdminServerTest: servlet mapping order
 * 13122 AsyncHelperTest: async ttl decorator
+* 13123 DoubleKillTest: bad SpEL, check null
 
 ## 14 Warlock
 
@@ -400,6 +404,7 @@ Use `t.md` as local [Test Management](https://www.jetbrains.com/help/idea/test-m
 * 14082 DatabaseFacelessTest: clean and init faceless schema
 * 14083 DatabaseShard0Test: clean and init shard_0 schema
 * 14084 DatabaseShard1Test: clean and init shard_1 schema
+* 14085 ExceptionStackTest: MessageException is stackless by default
 
 ## 15 Tiny
 

diff --git a/example/pom.xml b/example/pom.xml
@@ -22,7 +22,6 @@
         <module>winx-admin</module>
         <module>winx-api</module>
         <!-- <module>winx-batch</module> -->
-        <module>winx-codegen</module>
         <module>winx-common</module>
         <module>winx-devops</module>
         <module>winx-front</module>
@@ -49,11 +48,6 @@
                 <artifactId>winx-front</artifactId>
                 <version>${revision}</version>
             </dependency>
-            <dependency>
-                <groupId>com.moilioncircle.wings</groupId>
-                <artifactId>winx-codegen</artifactId>
-                <version>${revision}</version>
-            </dependency>
             <dependency>
                 <groupId>com.moilioncircle.wings</groupId>
                 <artifactId>winx-common</artifactId>

diff --git a/...le/winx-admin/src/main/java/com/moilioncircle/wings/admin/controller/AdminController.java b/...le/winx-admin/src/main/java/com/moilioncircle/wings/admin/controller/AdminController.java
@@ -25,6 +25,6 @@ public class AdminController {
     public R<Void> rootNeverLogin() {
         authnService.disable(DefaultUserId.Root, WarlockAuthType.USERNAME);
         log.debug("disable root");
-        return R.OK;
+        return R.OK();
     }
 }
diff --git a/example/winx-codegen/pom.xml b/example/winx-codegen/pom.xml
diff --git a/example/winx-common/pom.xml b/example/winx-common/pom.xml
@@ -25,10 +25,6 @@
             <groupId>com.h2database</groupId>
             <artifactId>h2</artifactId>
         </dependency>
-        <dependency>
-            <groupId>com.moilioncircle.wings</groupId>
-            <artifactId>winx-codegen</artifactId>
-        </dependency>
         <dependency>
             <groupId>pro.fessional.wings</groupId>
             <artifactId>warlock</artifactId>

diff --git a/...e/winx-devops/src/main/java/com/moilioncircle/wings/devops/init/WingsInitProjectUtil.java b/...e/winx-devops/src/main/java/com/moilioncircle/wings/devops/init/WingsInitProjectUtil.java
@@ -53,7 +53,6 @@ public static void initProject(Info info, Consumer<String> message) throws IOExc
                 "pom.xml",
                 "winx-admin/",
                 "winx-api/",
-                "winx-codegen/",
                 "winx-common/",
                 "winx-devops/",
                 "winx-front/",

diff --git a/...x-devops/src/test/java/com/moilioncircle/wings/devops/project/Devops0ProjectConstant.java b/...x-devops/src/test/java/com/moilioncircle/wings/devops/project/Devops0ProjectConstant.java
@@ -20,7 +20,7 @@ public interface Devops0ProjectConstant {
     String JDBC_PASS = "moilioncircle";
 
     // Need set Working Directory=$MODULE_WORKING_DIR$
-    String JAVA_MAIN = "../winx-codegen/src/main/java/";
+    String JAVA_MAIN = "../winx-common/src/main/java-gen/";
 
     String PKG_ENUM = "com.moilioncircle.wings.codegen.enums";
     String PKG_JOOQ = "com.moilioncircle.wings.codegen.database";

diff --git a/observe/docs b/observe/docs
diff --git a/observe/mirana b/observe/mirana
diff --git a/pom.xml b/pom.xml
@@ -10,18 +10,18 @@
         <relativePath/> <!-- lookup parent from repository -->
     </parent>
 
-    <groupId>pro.fessional.wings</groupId>
-    <artifactId>ancient</artifactId>
+    <groupId>pro.fessional</groupId>
+    <artifactId>wings-boot</artifactId>
     <version>${revision}</version>
     <packaging>pom</packaging>
 
-    <name>Ancient::</name>
+    <name>WingsBoot::</name>
     <description>万物生长靠日 ☀️ Growing Need the F^king Sun</description>
     <url>https://wings.fessional.pro</url>
 
     <properties>
         <!-- (#.#).(##)(#) (SPRING-MINOR).(MINOR)(PATCH) https://maven.apache.org/maven-ci-friendly.html -->
-        <revision>3.2.120-SNAPSHOT</revision>
+        <revision>3.2.130-SNAPSHOT</revision>
         <!-- https://docs.spring.io/spring-boot/docs/current/reference/html/dependency-versions.html -->
         <spring-boot.version>3.2.2</spring-boot.version>
         <!--  -->
@@ -39,13 +39,14 @@
         <annotations.version>24.1.0</annotations.version> <!-- https://github.com/JetBrains/java-annotations/releases -->
         <!-- common utils-->
         <mapstruct.version>1.5.5.Final</mapstruct.version> <!-- https://github.com/mapstruct/mapstruct/releases -->
+        <lombok-mapstruct-binding.version>0.2.0</lombok-mapstruct-binding.version> <!-- https://mapstruct.org/documentation/1.6/reference/html/#_set_up -->
         <guava.version>33.0.0-jre</guava.version> <!-- https://github.com/google/guava/releases/ -->
         <commons-io.version>2.15.1</commons-io.version> <!-- https://commons.apache.org/proper/commons-io/ -->
         <commons-collections4.version>4.4</commons-collections4.version> <!-- https://commons.apache.org/proper/commons-collections/ -->
         <commons-text.version>1.11.0</commons-text.version> <!-- https://commons.apache.org/proper/commons-text/ -->
         <joda-convert.version>2.2.3</joda-convert.version> <!-- https://github.com/JodaOrg/joda-convert/releases -->
         <!-- wings project -->
-        <mirana.version>2.7.2</mirana.version> <!-- https://github.com/trydofor/pro.fessional.mirana -->
+        <mirana.version>2.7.3-SNAPSHOT</mirana.version> <!-- https://github.com/trydofor/pro.fessional.mirana -->
         <meepo.version>1.5.1</meepo.version> <!-- https://github.com/trydofor/pro.fessional.meepo -->
         <kaptcha.version>2.3.3</kaptcha.version> <!-- https://github.com/trydofor/kaptcha -->
         <fastjson2.version>2.0.47</fastjson2.version> <!-- https://github.com/alibaba/fastjson2/releases -->
@@ -282,7 +283,7 @@
                 <artifactId>testing-batrider</artifactId>
                 <version>${wings.version}</version>
             </dependency>
-            <!-- pro.fessional.wings radiant -->
+            <!-- pro.fessional.wings:radiant -->
             <dependency>
                 <groupId>pro.fessional.wings</groupId>
                 <artifactId>tiny-task</artifactId>
@@ -590,15 +591,20 @@
                         <parameters>true</parameters>
                         <annotationProcessorPaths>
                             <!--  find annotationProcessors in the following paths -->
+                            <path>
+                                <groupId>org.mapstruct</groupId>
+                                <artifactId>mapstruct-processor</artifactId>
+                                <version>${mapstruct.version}</version>
+                            </path>
                             <path>
                                 <groupId>org.projectlombok</groupId>
                                 <artifactId>lombok</artifactId>
                                 <version>${lombok.version}</version>
                             </path>
                             <path>
-                                <groupId>org.mapstruct</groupId>
-                                <artifactId>mapstruct-processor</artifactId>
-                                <version>${mapstruct.version}</version>
+                                <groupId>org.projectlombok</groupId>
+                                <artifactId>lombok-mapstruct-binding</artifactId>
+                                <version>${lombok-mapstruct-binding.version}</version>
                             </path>
                             <path>
                                 <groupId>org.springframework.boot</groupId>
@@ -1119,7 +1125,9 @@
         <profile>
             <id>deploy</id>
             <properties>
+                <deployAtEnd>true</deployAtEnd>
                 <maven.test.skip>true</maven.test.skip>
+                <maven.install.skip>true</maven.install.skip>
             </properties>
             <build>
                 <plugins>
@@ -1175,6 +1183,54 @@
                 <altSnapshotDeploymentRepository>altrh::${MVN_ALT_SNAP}</altSnapshotDeploymentRepository>
             </properties>
         </profile>
+        <profile>
+            <id>deploy-old</id>
+            <properties>
+                <deploy.old.todir>${project.build.directory}/old-build</deploy.old.todir>
+                <deploy.old.files>${project.artifactId}-${project.version}*</deploy.old.files>
+            </properties>
+            <build>
+                <plugins>
+                    <plugin>
+                        <groupId>org.apache.maven.plugins</groupId>
+                        <artifactId>maven-antrun-plugin</artifactId>
+                        <executions>
+                            <!-- Backup before packaging -->
+                            <execution>
+                                <id>backup-artifacts</id>
+                                <phase>process-resources</phase>
+                                <goals>
+                                    <goal>run</goal>
+                                </goals>
+                                <configuration>
+                                    <target>
+                                        <delete dir="${deploy.old.todir}" failonerror="false"/>
+                                        <copy todir="${deploy.old.todir}" overwrite="true">
+                                            <fileset dir="${project.build.directory}" includes="${deploy.old.files}"/>
+                                        </copy>
+                                    </target>
+                                </configuration>
+                            </execution>
+                            <!-- Restore artifacts before deployment -->
+                            <execution>
+                                <id>restore-artifacts</id>
+                                <phase>install</phase>
+                                <goals>
+                                    <goal>run</goal>
+                                </goals>
+                                <configuration>
+                                    <target>
+                                        <copy todir="${project.build.directory}" overwrite="true">
+                                            <fileset dir="${deploy.old.todir}" includes="${deploy.old.files}" erroronmissingdir="false"/>
+                                        </copy>
+                                    </target>
+                                </configuration>
+                            </execution>
+                        </executions>
+                    </plugin>
+                </plugins>
+            </build>
+        </profile>
         <profile>
             <id>docker</id>
             <build>

diff --git a/...t/devs-codegen/src/test/java/pro/fessional/wings/devs/app/TestDevsCodegenApplication.java b/...t/devs-codegen/src/test/java/pro/fessional/wings/devs/app/TestDevsCodegenApplication.java
@@ -2,6 +2,7 @@
 
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
+import pro.fessional.wings.testing.silencer.TestingPropertyHelper;
 
 /**
  * @author trydofor
@@ -10,6 +11,7 @@
 @SpringBootApplication
 public class TestDevsCodegenApplication {
     public static void main(String[] args) {
+        TestingPropertyHelper.autoSetWingsRootDir();
         SpringApplication.run(TestDevsCodegenApplication.class, args);
     }
 }
diff --git a/radiant/devs-codegen/src/test/java/pro/fessional/wings/devs/init/AutogenCodeTest.java b/radiant/devs-codegen/src/test/java/pro/fessional/wings/devs/init/AutogenCodeTest.java
@@ -27,6 +27,7 @@
  * @since 2023-01-23
  */
 @SpringBootTest(properties = "testing.dbname=wings")
+// @SpringBootTest(properties = "testing.dbname=wings_faceless")
 @EnabledIfSystemProperty(named = "devs-autogen", matches = "true")
 @TestMethodOrder(MethodOrderer.MethodName.class)
 public class AutogenCodeTest {
@@ -43,12 +44,14 @@ public class AutogenCodeTest {
 
     @Test
     void autogen01AllTestJooq() {
+        // use wings_faceless database
         autogen11FacelessJooqTest();// faceless-jooq
         autogen11FacelessShardTest();// faceless-shard
     }
 
     @Test
     void autogen01AllMainCode() {
+        // use wings database
         autogen01AllMainJooq();
 
         autogen10FacelessAutogen();// faceless/enums

diff --git a/radiant/devs-codegen/src/test/java/pro/fessional/wings/devs/init/DatabaseExampleTest.java b/radiant/devs-codegen/src/test/java/pro/fessional/wings/devs/init/DatabaseExampleTest.java
@@ -21,6 +21,7 @@
 @SpringBootTest(properties = "testing.dbname=wings_example")
 @EnabledIfSystemProperty(named = "devs-initdb", matches = "true")
 public class DatabaseExampleTest extends TestingDatabase {
+
     @Test
     void resetSchemaWings() {
         reset(

diff --git a/radiant/devs-codegen/src/test/java/pro/fessional/wings/devs/init/DatabaseFacelessTest.java b/radiant/devs-codegen/src/test/java/pro/fessional/wings/devs/init/DatabaseFacelessTest.java
@@ -7,6 +7,8 @@
 
 import static pro.fessional.wings.faceless.flywave.WingsRevision.V00_19_0512_01_Schema;
 import static pro.fessional.wings.faceless.flywave.WingsRevision.V01_19_0520_01_IdLog;
+import static pro.fessional.wings.faceless.flywave.WingsRevision.V01_19_0521_01_EnumI18n;
+import static pro.fessional.wings.faceless.flywave.WingsRevision.V03_20_1023_01_AuthEnum;
 import static pro.fessional.wings.faceless.flywave.WingsRevision.V90_22_0601_01_TestSchema;
 import static pro.fessional.wings.faceless.flywave.WingsRevision.V90_22_0601_02_TestRecord;
 
@@ -27,6 +29,8 @@ void resetSchemaWingsFaceless() {
         reset(
                 V00_19_0512_01_Schema,
                 V01_19_0520_01_IdLog,
+                V01_19_0521_01_EnumI18n,
+                V03_20_1023_01_AuthEnum,
                 V90_22_0601_01_TestSchema,
                 V90_22_0601_02_TestRecord
         );

diff --git a/radiant/pom.xml b/radiant/pom.xml
@@ -4,11 +4,12 @@
     <modelVersion>4.0.0</modelVersion>
 
     <parent>
-        <groupId>pro.fessional.wings</groupId>
-        <artifactId>ancient</artifactId>
+        <groupId>pro.fessional</groupId>
+        <artifactId>wings-boot</artifactId>
         <version>${revision}</version>
     </parent>
 
+    <groupId>pro.fessional.wings</groupId>
     <artifactId>radiant</artifactId>
     <version>${revision}</version>
     <packaging>pom</packaging>