Merge pull request #214 from trydofor/develop

prepare 3.2.110
trydofor · Mar 3, 2024 · dd0bbc8 · dd0bbc8
2 parents 908474c + 4c99bdd
commit dd0bbc8
Show file tree

Hide file tree

Showing 54 changed files with 1,687 additions and 481 deletions.
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -14,7 +14,7 @@ on:
         default: false
         type: boolean
         required: false
-      testVerifyDryRun:
+      testCoverageDryRun:
         description: 'dryrun coverage report?'
         default: false
         type: boolean
@@ -34,7 +34,12 @@ on:
         type: boolean
         required: false
       deployOssrh:
-        description: 'deploy to ossrh?'
+        description: 'deploy to oss-repo?'
+        default: true
+        type: boolean
+        required: false
+      deployAltrh:
+        description: 'deploy to alt-repo?'
         default: true
         type: boolean
         required: false
@@ -106,8 +111,12 @@ jobs:
           echo "MVN_COVERAGE=$_cov" >> "$GITHUB_OUTPUT"
           
           _drh=${{ inputs.deployOssrh || github.event_name == 'release' }}
-          echo "- MVN_DEPLOYRH=$_drh" >> "$GITHUB_STEP_SUMMARY"
-          echo "MVN_DEPLOYRH=$_drh" >> "$GITHUB_OUTPUT"
+          echo "- MVN_DEPLOY_OSSRH=$_drh" >> "$GITHUB_STEP_SUMMARY"
+          echo "MVN_DEPLOY_OSSRH=$_drh" >> "$GITHUB_OUTPUT"
+          
+          _drp=${{ ( inputs.deployAltrh || github.event_name == 'release' ) && secrets.MVN_ALT_USER != '' }}
+          echo "- MVN_DEPLOY_ALTRH=$_drp" >> "$GITHUB_STEP_SUMMARY"
+          echo "MVN_DEPLOY_ALTRH=$_drp" >> "$GITHUB_OUTPUT"
           
           _qod=${{ inputs.applyQodanaScan || 'false' }}
           echo "- QODANA_SCAN=$_qod" >> "$GITHUB_STEP_SUMMARY"
@@ -130,6 +139,11 @@ jobs:
                 <username>${MVN_OSS_USER}</username>
                 <password>${MVN_OSS_PASS}</password>
               </server>
+              <server>
+                <id>altrh</id>
+                <username>${MVN_ALT_USER}</username>
+                <password>${MVN_ALT_PASS}</password>
+              </server>
             </servers>
           </settings>
           EOF
@@ -142,37 +156,55 @@ jobs:
       - name: Test Coverage ${{ steps.settings.outputs.WINGS_VERSION }} ${{ steps.settings.outputs.GIT_BRANCH }}
         if: steps.settings.outputs.MVN_COVERAGE == 'true'
         run: |
-          mvn -P '!example,!devs' -Dmaven.test.skip=true clean install
+          mvn -P '!module-example,!module-devs' -Dmaven.test.skip=true clean install
           mvn -pl ':devs-codegen' -Ddevs-initdb=true clean test
-          mvn -P 'coverage,!example,!devs' -Dmaven.test.failure.ignore=$TESTFAILS_IGNORE test
-          mvn -P 'coverage' -pl ':devs-coverage' -am jacoco:report-aggregate
+          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
           mvn -pl ':devs-coverage' -DrepoToken=$COVERALLS_WINGS -DdryRun=$COVERALLS_DRYRUN -Dwings.rootdir=../.. coveralls:report
         env:
           TZ: Asia/Shanghai
           JAVA_HOME: ${{ steps.settings.outputs.JAVA_HOME }}
           COVERALLS_WINGS: ${{ secrets.COVERALLS_REPO_TOKEN }}
-          COVERALLS_DRYRUN: ${{ inputs.testVerifyDryRun || 'false' }}
+          COVERALLS_DRYRUN: ${{ inputs.testCoverageDryRun || 'false' }}
           TESTFAILS_IGNORE: ${{ inputs.testFailureIgnore || 'false' }}
 
       ## import gpp private key
       - name: Import GPG key
-        if: steps.settings.outputs.MVN_DEPLOYRH == 'true'
+        if: steps.settings.outputs.MVN_DEPLOY_OSSRH == 'true' || steps.settings.outputs.MVN_DEPLOY_ALTRH == 'true'
         uses: crazy-max/ghaction-import-gpg@v6
         with:
           gpg_private_key: ${{ secrets.MVN_GPG_SKEY }}
           passphrase: ${{ secrets.MVN_GPG_PASS }}
 
-      ## maven deploy
-      - name: Deploy ${{ steps.settings.outputs.WINGS_VERSION }} ${{ steps.settings.outputs.GIT_BRANCH }}
-        if: steps.settings.outputs.MVN_DEPLOYRH == 'true'
+      ## maven deploy ossrh
+      - name: Deploy OSS ${{ steps.settings.outputs.WINGS_VERSION }} ${{ steps.settings.outputs.GIT_BRANCH }}
+        if: steps.settings.outputs.MVN_DEPLOY_OSSRH == 'true'
         run: >
           mvn 
-          -P 'ossrh,doc,!example,!devs'
+          -P 'deploy,deploy-oss,!module-example,!module-devs'
           ${{ steps.settings.outputs.MVN_REVISION }}
           -Dgpg.passphrase=${MVN_GPG_PASS}
-          clean deploy
+          deploy
         env:
           JAVA_HOME: ${{ steps.settings.outputs.JAVA_HOME }}
+          MVN_GPG_PASS: ${{ secrets.MVN_GPG_PASS }}
           MVN_OSS_USER: ${{ secrets.MVN_OSS_USER }}
           MVN_OSS_PASS: ${{ secrets.MVN_OSS_PASS }}
+
+      ## maven deploy altrh
+      - name: Deploy ALT ${{ steps.settings.outputs.WINGS_VERSION }} ${{ steps.settings.outputs.GIT_BRANCH }}
+        if: steps.settings.outputs.MVN_DEPLOY_ALTRH == 'true'
+        run: >
+          mvn 
+          -P 'deploy,deploy-alt,!module-example,!module-devs'
+          ${{ steps.settings.outputs.MVN_REVISION }}
+          -Dgpg.passphrase=${MVN_GPG_PASS}
+          deploy
+        env:
+          JAVA_HOME: ${{ steps.settings.outputs.JAVA_HOME }}
           MVN_GPG_PASS: ${{ secrets.MVN_GPG_PASS }}
+          ## export MVN_ALT_REPO=https://packages.trydofor.com/maven/repository/devops/
+          MVN_ALT_USER: ${{ secrets.MVN_ALT_USER }}
+          MVN_ALT_PASS: ${{ secrets.MVN_ALT_PASS }}
+          MVN_ALT_REPO: ${{ secrets.MVN_ALT_REPO }}
+          MVN_ALT_SNAP: ${{ secrets.MVN_ALT_SNAP }}
diff --git a/WingsBoot.t.md b/WingsBoot.t.md
@@ -306,6 +306,7 @@ Use `t.md` as local [Test Management](https://www.jetbrains.com/help/idea/test-m
 * 13116 WingsCookieTest: encrypt cookie by forward
 * 13117 AttributeHolderTest: Attribute expiry
 * 13118 EventPublishHelperTest: async global AttributeRidEvent
+* 13119 WingsCacheInterceptorTest: evict mulitple cache keys
 
 ## 14 Warlock
 

diff --git a/example/winx-common/src/main/resources/wings-conf/spring-datasource.properties b/example/winx-common/src/main/resources/wings-conf/spring-datasource.properties
@@ -1,4 +1,7 @@
-spring.datasource.url=jdbc:mysql://localhost:51487/wings_example\
+winx.database.host=localhost:51487
+winx.database.name=wings_example
+
+spring.datasource.url=jdbc:mysql://${winx.database.host}/${winx.database.name}\
 ?connectionTimeZone=%2B08:00&forceConnectionTimeZoneToSession=true\
 &autoReconnect=true&useSSL=false&allowPublicKeyRetrieval=true\
 &characterEncoding=UTF-8&useUnicode=true

diff --git a/wings/lombok.config → lombok.config b/wings/lombok.config → lombok.config
diff --git a/observe/docs b/observe/docs
diff --git a/observe/meepo b/observe/meepo
diff --git a/observe/mirana b/observe/mirana