Merge pull request #290 from trydofor/develop

3.2.130

.github/workflows/release-notes.yml

@@ -62,6 +62,8 @@ jobs:
                 labels: [ "feature" ]
               - title: "🐞 Bug Fixes"
                 labels: [ "bug" ]
+              - title: "💥 Breaking Change"
+                labels: [ "break" ]
               - title: "💎 Enhancements"
                 labels: [ "better", "devops", "quality" ]
               - title: "📝 Documentation"

.github/workflows/release.yml

@@ -148,15 +148,15 @@ jobs:
           </settings>
           EOF
       - name: Qodana Scan
-        uses: JetBrains/qodana-action@v2023.3
+        uses: JetBrains/qodana-action@v2024.1
         if: steps.settings.outputs.QODANA_SCAN == 'true'
         env:
           QODANA_TOKEN: ${{ secrets.QODANA_TOKEN }}
       ## report if not release
       - name: Test Coverage ${{ steps.settings.outputs.WINGS_VERSION }} ${{ steps.settings.outputs.GIT_BRANCH }}
         if: steps.settings.outputs.MVN_COVERAGE == 'true'
         run: |
-          mvn -P '!module-example,!module-devs' -Dmaven.test.skip=true clean install
+          mvn -P 'repo-snapshot,!module-example,!module-devs' -Dmaven.test.skip=true clean install
           mvn -pl ':devs-codegen' -Ddevs-initdb=true clean test
           mvn -P 'report-coverage,!module-example,!module-devs' -Dmaven.test.failure.ignore=$TESTFAILS_IGNORE test
           mvn -P 'report-coverage' -pl ':devs-coverage' -am jacoco:report-aggregate
@@ -181,7 +181,7 @@ jobs:
         if: steps.settings.outputs.MVN_DEPLOY_OSSRH == 'true'
         run: >
           mvn 
-          -P 'deploy,deploy-oss,!module-example,!module-devs'
+          -P 'repo-snapshot,deploy,deploy-oss,!module-example,!module-devs'
           ${{ steps.settings.outputs.MVN_REVISION }}
           -Dgpg.passphrase=${MVN_GPG_PASS}
           -Dorg.slf4j.simpleLogger.log.lombok=WARN
@@ -200,7 +200,7 @@ jobs:
         continue-on-error: ${{ inputs.deployAltrh != 'true' }}
         run: >
           mvn 
-          -P 'deploy,deploy-alt,deploy-old,!module-example,!module-devs'
+          -P 'repo-snapshot,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

WingsBoot.t.md

@@ -39,6 +39,8 @@ Use `t.md` as local [Test Management](https://www.jetbrains.com/help/idea/test-m
 * 11033 ThisLazyCglibTest: thisLazy with cglib
 * 11034 ThisLazyProxyTest: thisLazy with default jdk proxy
 * 11035 TypedClassTest: ResolvableType sugar
+* 11036 CommonPropHelperTest: comma delimited string
+* 11037 CommonPropHelperTest: resource string
 
 ## 12 Faceless
 
@@ -323,6 +325,7 @@ Use `t.md` as local [Test Management](https://www.jetbrains.com/help/idea/test-m
 * 13125 JsonHelperCompatibleTest: jackson basic type compatible
 * 13126 FastJsonTest: fastjson helper json path
 * 13127 TypeReferenceTest: TypeReference, TypeDescriptor, ResolvableType
+* 13128 LogViewerTest: only match header line
 
 ## 14 Warlock
 
@@ -411,6 +414,7 @@ Use `t.md` as local [Test Management](https://www.jetbrains.com/help/idea/test-m
 * 14083 DatabaseShard0Test: clean and init shard_0 schema
 * 14084 DatabaseShard1Test: clean and init shard_1 schema
 * 14085 ExceptionStackTest: MessageException is stackless by default
+* 14086 JournalControllerTest: ttl/plain context check
 
 ## 15 Tiny
 
@@ -430,3 +434,9 @@ Use `t.md` as local [Test Management](https://www.jetbrains.com/help/idea/test-m
 * 15014 TinyTaskExecServiceTest: sleep 70s and check task
 * 15015 MailNoticeTest: title dryrun mailNotice
 * 15016 MailSenderManagerTest: title dryrun batch mail
+* 15017 TinyMailServiceDbTest: mock fail and check database
+* 15018 TinyTrackServiceTest: tiny track AOP service
+* 15019 TinyTrackServiceTest: tiny track Mvc controller
+* 15020 TinyTaskBeatServiceImplTest: beat mills cron/rate/idle
+* 15021 TinyTaskExecServiceImplTest: calculate next schedule
+

changelog.md

@@ -8,7 +8,7 @@ Help Yourself [Commits] and [History]
 
 Notable [Changes] in [WingsDoc]
 
-[History]: https://github.com/trydofor/pro.fessional.wings/tags
-[Commits]: https://github.com/trydofor/pro.fessional.wings/commits/develop
+[History]: https://github.com/trydofor/professional-wings/tags
+[Commits]: https://github.com/trydofor/professional-wings/commits/develop
 [Changes]: https://wings.fessional.pro/9-example/9a.wings-change/
 [WingsDoc]: https://wings.fessional.pro/

example/winx-common/src/main/resources/wings-flywave/master/00-init/2022-0222u01-demo-init.sql

@@ -1 +1,3 @@
 DROP TABLE IF EXISTS `winx_user_detail`; -- 210/User Detail;
+
+-- CALL FLYWAVE('2022-0222u01-demo-init.sql');

example/winx-common/src/main/resources/wings-flywave/master/00-init/2022-0222v01-demo-init.sql

@@ -2,13 +2,13 @@
 -- CREATE DATABASE `wings_example` /*!40100 DEFAULT CHARACTER SET utf8mb4 */;
 
 CREATE TABLE `winx_user_detail` (
-    `id`        BIGINT(20)   NOT NULL COMMENT 'primary key',
+    `id`        BIGINT       NOT NULL COMMENT 'primary key',
     `create_dt` DATETIME(3)  NOT NULL DEFAULT NOW(3) COMMENT 'created datetime(sys)',
     `modify_dt` DATETIME(3)  NOT NULL DEFAULT '1000-01-01' ON UPDATE NOW(3) COMMENT 'modified datetime(sys)',
     `delete_dt` DATETIME(3)  NOT NULL DEFAULT '1000-01-01' COMMENT 'logic deleted datetime',
-    `commit_id` BIGINT(20)   NOT NULL COMMENT 'commit id',
-    `user_id`   BIGINT(20)   NOT NULL COMMENT 'win_user_basis.id',
-    `user_type` INT(11)      NOT NULL DEFAULT '0' COMMENT 'user type/21001##:customer|operator|helpdesk',
+    `commit_id` BIGINT       NOT NULL COMMENT 'commit id',
+    `user_id`   BIGINT       NOT NULL COMMENT 'win_user_basis.id',
+    `user_type` INT          NOT NULL DEFAULT '0' COMMENT 'user type/21001##:customer|operator|helpdesk',
     `email`     VARCHAR(100) NOT NULL DEFAULT '' COMMENT 'user email',
     PRIMARY KEY (`id`),
     UNIQUE INDEX uq_user_id (`user_id`),
@@ -26,3 +26,5 @@ VALUES (2100100, 'user_type', 'user_type', 'User Type', 'classpath:/wings-tmpl/C
        (2100101, 'user_type', 'customer', 'customer', 'customer'),
        (2100102, 'user_type', 'operator', 'operator', 'operator'),
        (2100103, 'user_type', 'helpdesk', 'helpdesk', 'helpdesk');
+
+-- CALL FLYWAVE('2022-0222v01-demo-init.sql');

example/winx-devops/src/test/java/com/moilioncircle/wings/devops/project/Devops1SchemaManagerTest.java

@@ -21,6 +21,12 @@
         "spring.datasource.url=" + Devops0ProjectConstant.JDBC_URL,
         "spring.datasource.username=" + Devops0ProjectConstant.JDBC_USER,
         "spring.datasource.password=" + Devops0ProjectConstant.JDBC_PASS,
+//        "wings.silencer.i18n.zoneid=UTC",
+        "wings.enabled.faceless.flywave=true",
+        "wings.faceless.flywave.auto-init=true",
+        "wings.faceless.flywave.checker=true",
+        "java.awt.headless=false",
+        "debug=true"
 })
 class Devops1SchemaManagerTest {
 
@@ -37,6 +43,15 @@ void initSchema() {
         );
     }
 
+    @Test
+    void bumpSchema() {
+        final Warlock1SchemaManager manager = new Warlock1SchemaManager(schemaRevisionManager);
+        manager.mergeBumping(2022_0222_01L,
+            includeWarlockPath(),
+            Helper::master
+        );
+    }
+
     @Test
     void resetSchema() {
         long revi = 2022_0222_01L;

example/winx-devops/src/test/java/com/moilioncircle/wings/devops/project/Devops7EnumsDumperTest.java

@@ -8,7 +8,7 @@
 import org.springframework.boot.test.context.SpringBootTest;
 import org.springframework.core.io.ResourceLoader;
 import pro.fessional.mirana.data.CodeEnum;
-import pro.fessional.wings.silencer.spring.help.SubclassSpringLoader;
+import pro.fessional.wings.silencer.support.SubclassGather;
 
 import java.util.Map;
 
@@ -27,7 +27,7 @@ public class Devops7EnumsDumperTest {
 
     @Test
     public void dumpCodeEnum() {
-        SubclassSpringLoader loader = new SubclassSpringLoader(resourceLoader);
+        SubclassGather loader = new SubclassGather(resourceLoader);
         Class<CodeEnum> superEnum = CodeEnum.class;
 
         Map<Class<?>, Enum<?>[]> enums = loader.loadSubEnums("pro.fessional", superEnum);

observe/scripts/wings-docker.sh

@@ -37,14 +37,14 @@ $IMAGE_ENV_JAVA_ADD \
 
 #######
 function show_help() {
-    echo -e '\033[32m clean <dep|app|all> <boot-jar> \033[m clean docker-<dep|app|all> build dir of boot-jar'
-    echo -e '\033[32m print <dep|app|all> <boot-jar> \033[m print docker-<dep|app|all> Dockerfile of boot-jar'
-    echo -e '\033[32m unzip <dep|app|all> <boot-jar> \033[m unzip docker-<dep|app|all> files of boot-jar'
-    echo -e '\033[32m build <dep|app|all> <boot-jar> \033[m build docker-<dep|app|all> image of boot-jar'
-    echo -e '\033[32m help \033[m show this'
-    echo -e '\033[32m <dep> \033[m only dependencies + spring-boot-loader'
-    echo -e '\033[32m <app> \033[m <dep> + napshot-dependencies + application'
-    echo -e '\033[32m <all> \033[m <dep> + <app>'
+    echo -e '\033[32m clean <dep|app|all> <boot-jar> \033[0m clean docker-<dep|app|all> build dir of boot-jar'
+    echo -e '\033[32m print <dep|app|all> <boot-jar> \033[0m print docker-<dep|app|all> Dockerfile of boot-jar'
+    echo -e '\033[32m unzip <dep|app|all> <boot-jar> \033[0m unzip docker-<dep|app|all> files of boot-jar'
+    echo -e '\033[32m build <dep|app|all> <boot-jar> \033[0m build docker-<dep|app|all> image of boot-jar'
+    echo -e '\033[32m help \033[0m show this'
+    echo -e '\033[32m <dep> \033[0m only dependencies + spring-boot-loader'
+    echo -e '\033[32m <app> \033[0m <dep> + napshot-dependencies + application'
+    echo -e '\033[32m <all> \033[0m <dep> + <app>'
 }
 
 function docker_file() {

observe/scripts/wings-mysql-dump.sh

@@ -26,10 +26,10 @@ dumpopts=${*:3}
 logxopts="--no-data"
 confopts=--defaults-extra-file=$extracnf
 if [[ -f "$extracnf" ]]; then
-    echo -e "\033[0;33mNOTE: defaults-extra-file \033[m"
+    echo -e "\033[0;33mNOTE: defaults-extra-file \033[0m"
     grep -E "^(host|port|user)" "$extracnf"
 else
-    echo -e "\033[0;31mERROR: should specific mysql config(at param-1), eg. ~/my.cnf\033[m"
+    echo -e "\033[0;31mERROR: should specific mysql config(at param-1), eg. ~/my.cnf\033[0m"
 cat << 'EOF'
 [client]
 protocol=tcp
@@ -52,9 +52,9 @@ unalias mysql >/dev/null 2>&1
 unalias mysqldump >/dev/null 2>&1
 
 if [[ "$database" == "" ]]; then
-    echo -e "\033[0;31mWARN: need database(at param-2) to dump, eg.\033[m"
+    echo -e "\033[0;31mWARN: need database(at param-2) to dump, eg.\033[0m"
     echo "./wings-mysql-dump.sh wings-mysql-client.cnf database  --no-data"
-    echo -e "\033[0;33mNOTE:current databases \033[m"
+    echo -e "\033[0;33mNOTE:current databases \033[0m"
     # shellcheck disable=SC2086
     mysql $confopts -N -e "show databases;"
     exit
@@ -81,7 +81,7 @@ if [[ $logs_cnt == 0 ]]; then
     echo "no logs tables to dump"
     echo "-- no logs tables to dump" > "$dump_logs_file"
 else
-    echo -e "\033[0;33mNOTE: dump logs tables without data, count=$logs_cnt\033[m"
+    echo -e "\033[0;33mNOTE: dump logs tables without data, count=$logs_cnt\033[0m"
 
     # shellcheck disable=SC2046,SC2086
     if mysqldump $confopts $dumpopts $logxopts \
@@ -98,7 +98,7 @@ if [[ $main_cnt == 0 ]]; then
     echo "no main tables to dump"
     echo "-- no main tables to dump" > "$dump_main_file"
 else
-    echo -e "\033[0;33mNOTE: dump main tables with data, count=$main_cnt\033[m"
+    echo -e "\033[0;33mNOTE: dump main tables with data, count=$main_cnt\033[0m"
     # shellcheck disable=SC2046,SC2086
     if mysqldump $confopts $dumpopts \
     "$database" $(grep -vE '\$|__' "$dump_tbl_file") > "$dump_main_file"; then
@@ -109,13 +109,13 @@ else
     fi
 fi
 
-echo -e "\033[0;33mNOTE: dump file $dump_head\033[m"
+echo -e "\033[0;33mNOTE: dump file $dump_head\033[0m"
 echo >> "$dump_tbl_file"
 
 # shellcheck disable=SC2010
 ls -lsh |grep "$dump_head" | tee -a "$dump_tbl_file"
 
-echo -e "\033[0;33mNOTE: tips for zip, scp, restore \033[m"
+echo -e "\033[0;33mNOTE: tips for zip, scp, restore \033[0m"
 tee -a "$dump_tip_file" << EOF
 ## checksum
 md5sum -c $dump_md5_file # checksum
@@ -153,7 +153,7 @@ cat $dump_logs_file $dump_main_file \\
 ./reset-password.sh \$mycnf \$newdb;
 EOF
 
-echo -e "\033[0;33mNOTE: tar files into $dump_tar_file \033[m"
+echo -e "\033[0;33mNOTE: tar files into $dump_tar_file \033[0m"
 tar -czf "$dump_tar_file" "$dump_tip_file" "$dump_tbl_file" "$dump_logs_file" "$dump_main_file" \
 && md5sum "$dump_tar_file" | tee "$dump_md5_file" \
 && rm -f "$dump_tbl_file" "$dump_logs_file" "$dump_main_file"

observe/scripts/wings-mysql-user.sh

@@ -33,7 +33,7 @@ command="$2"
 option="$3"
 
 if [[ "$command" == "" || "$command" == "help" || ! -f "$userenv" ]]; then
-    echo -e '\033[37;42;1mNOTE: users env file\033[m'
+    echo -e '\033[37;42;1mNOTE: users env file\033[0m'
     # https://dev.mysql.com/doc/refman/8.0/en/account-management-statements.html
     cat <<'EOF'
 execute=false
@@ -54,7 +54,7 @@ host_app=10.11.%
 host_dev=%
 host_dba=%
 EOF
-    echo -e '\033[37;42;1mNOTE: user manage\033[m'
+    echo -e '\033[37;42;1mNOTE: user manage\033[0m'
     cat <<'EOF'
 RENAME USER 'trydofor'@'%' TO 'trydofor'@'127.0.%';
 DROP USER IF EXISTS 'trydofor'@'%';
@@ -91,7 +91,7 @@ fi
 [[ "$host_dev" == "" ]] && host_dev=%
 [[ "$host_dba" == "" ]] && host_dba=%
 
-echo -e '\033[37;42;1mNOTE: users and passwd\033[m'
+echo -e '\033[37;42;1mNOTE: users and passwd\033[0m'
 grep -v '^#' <<EOF
 ${user_raw}${user_pre}${name_pre}raw  $pass_raw
 ${user_app}${user_pre}${name_pre}app  $pass_app
@@ -100,7 +100,7 @@ ${user_dba}${user_pre}${name_pre}dba  $pass_dba
 EOF
 
 temp_sql="$userenv.sql"
-echo -e "\033[37;42;1mNOTE: sql script $temp_sql\033[m"
+echo -e "\033[37;42;1mNOTE: sql script $temp_sql\033[0m"
 rm "$temp_sql" >/dev/null 2>&1
 
 if [[ "$command" == "create" ]]; then
@@ -148,7 +148,7 @@ if [[ "$execute" == "true" ]]; then
     unalias mysql >/dev/null 2>&1
 
     if [[ -f "$option" ]]; then
-        echo -e "\033[0;33mNOTE: current option file \033[m"
+        echo -e "\033[0;33mNOTE: current option file \033[0m"
         cat "$option"
         mysql --defaults-extra-file="$option" -vvv --force < "$temp_sql"
     else