Skip to content

Commit b0af2c7

Browse files
binarywangbinarywang
committed
🔖 发布 4.7.6.B 测试版本
1 parent 320f05e commit b0af2c7

File tree

35 files changed

+75
-42
lines changed

35 files changed

+75
-42
lines changed

‎.github/workflows/maven-publish.yml

Lines changed: 41 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,9 @@ on:
44
branches:
55
- develop
66

7+
permissions:
8+
contents: write
9+
710
concurrency:
811
group: maven-publish-${{ github.ref }}
912
cancel-in-progress: true
@@ -13,13 +16,38 @@ jobs:
1316
runs-on: ubuntu-latest
1417

1518
steps:
16-
# 检出代码
1719
- name: Checkout Code
1820
uses: actions/checkout@v4
1921
with:
2022
fetch-depth: 0
2123

22-
# 设置所需的Java版本
24+
- name: Detect and tag release version from commit message
25+
id: version_detect
26+
run: |
27+
COMMIT_MSG=$(git log -1 --pretty=%B)
28+
VERSION=""
29+
TAG=""
30+
IS_RELEASE="false"
31+
if [[ "$COMMIT_MSG" =~ ^:bookmark:\ 发布\ ([0-9]+\.[0-9]+\.[0-9]+)\.B\ 测试版本 ]]; then
32+
BASE_VER="${BASH_REMATCH[1]}"
33+
VERSION="${BASE_VER}.B"
34+
TAG="v${BASE_VER}"
35+
IS_RELEASE="true"
36+
echo "Matched release commit: VERSION=$VERSION, TAG=$TAG"
37+
# 检查并打tag
38+
if git tag | grep -q "^$TAG$"; then
39+
echo "Tag $TAG already exists."
40+
else
41+
git config user.name "Binary Wang"
42+
git config user.email "[email protected]"
43+
git tag -a "$TAG" -m "Release $TAG"
44+
git push origin "$TAG"
45+
echo "Tag $TAG created and pushed."
46+
fi
47+
fi
48+
echo "is_release=$IS_RELEASE" >> $GITHUB_OUTPUT
49+
echo "version=$VERSION" >> $GITHUB_OUTPUT
50+
2351
- name: Set up Java
2452
uses: actions/setup-java@v4
2553
with:
@@ -37,14 +65,19 @@ jobs:
3765
echo "Available GPG Keys:"
3866
gpg --list-secret-keys --keyid-format LONG
3967
40-
- name: Generate version && Set version
68+
- name: Generate and set version
4169
id: set_version
4270
run: |
43-
git describe --tags 2>/dev/null || echo "no tag"
44-
TIMESTAMP=$(date +'%Y%m%d.%H%M%S')
45-
GIT_DESCRIBE=$(git describe --tags --abbrev=0 2>/dev/null | sed 's/^v//' || echo "0.0.1")
46-
VERSION="${GIT_DESCRIBE}-${TIMESTAMP}"
47-
echo "Generated version: $VERSION"
71+
if [[ "${{ steps.version_detect.outputs.is_release }}" == "true" ]]; then
72+
VERSION="${{ steps.version_detect.outputs.version }}"
73+
else
74+
git describe --tags 2>/dev/null || echo "no tag"
75+
TIMESTAMP=$(date +'%Y%m%d.%H%M%S')
76+
GIT_DESCRIBE=$(git describe --tags --abbrev=0 2>/dev/null | sed 's/^v//' || echo "0.0.1")
77+
VERSION="${GIT_DESCRIBE}-${TIMESTAMP}"
78+
fi
79+
echo "Final version: $VERSION"
80+
echo "VERSION=$VERSION" >> $GITHUB_ENV
4881
mvn versions:set -DnewVersion=$VERSION --no-transfer-progress
4982
env:
5083
TZ: Asia/Shanghai

‎pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<modelVersion>4.0.0</modelVersion>
44
<groupId>com.github.binarywang</groupId>
55
<artifactId>wx-java</artifactId>
6-
<version>4.7.5.B</version>
6+
<version>4.7.6.B</version>
77
<packaging>pom</packaging>
88
<name>WxJava - Weixin/Wechat Java SDK</name>
99
<description>微信开发Java SDK</description>

‎solon-plugins/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
<parent>
77
<groupId>com.github.binarywang</groupId>
88
<artifactId>wx-java</artifactId>
9-
<version>4.7.5.B</version>
9+
<version>4.7.6.B</version>
1010
</parent>
1111
<packaging>pom</packaging>
1212
<artifactId>wx-java-solon-plugins</artifactId>

‎solon-plugins/wx-java-channel-multi-solon-plugin/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<parent>
66
<artifactId>wx-java-solon-plugins</artifactId>
77
<groupId>com.github.binarywang</groupId>
8-
<version>4.7.5.B</version>
8+
<version>4.7.6.B</version>
99
</parent>
1010
<modelVersion>4.0.0</modelVersion>
1111

‎solon-plugins/wx-java-channel-solon-plugin/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<parent>
44
<artifactId>wx-java-solon-plugins</artifactId>
55
<groupId>com.github.binarywang</groupId>
6-
<version>4.7.5.B</version>
6+
<version>4.7.6.B</version>
77
</parent>
88
<modelVersion>4.0.0</modelVersion>
99

‎solon-plugins/wx-java-cp-multi-solon-plugin/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<parent>
55
<artifactId>wx-java-solon-plugins</artifactId>
66
<groupId>com.github.binarywang</groupId>
7-
<version>4.7.5.B</version>
7+
<version>4.7.6.B</version>
88
</parent>
99
<modelVersion>4.0.0</modelVersion>
1010

‎solon-plugins/wx-java-cp-solon-plugin/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<parent>
55
<artifactId>wx-java-solon-plugins</artifactId>
66
<groupId>com.github.binarywang</groupId>
7-
<version>4.7.5.B</version>
7+
<version>4.7.6.B</version>
88
</parent>
99
<modelVersion>4.0.0</modelVersion>
1010

‎solon-plugins/wx-java-miniapp-multi-solon-plugin/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<parent>
66
<artifactId>wx-java-solon-plugins</artifactId>
77
<groupId>com.github.binarywang</groupId>
8-
<version>4.7.5.B</version>
8+
<version>4.7.6.B</version>
99
</parent>
1010
<modelVersion>4.0.0</modelVersion>
1111

‎solon-plugins/wx-java-miniapp-solon-plugin/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<parent>
55
<artifactId>wx-java-solon-plugins</artifactId>
66
<groupId>com.github.binarywang</groupId>
7-
<version>4.7.5.B</version>
7+
<version>4.7.6.B</version>
88
</parent>
99
<modelVersion>4.0.0</modelVersion>
1010

‎solon-plugins/wx-java-mp-multi-solon-plugin/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<parent>
66
<artifactId>wx-java-solon-plugins</artifactId>
77
<groupId>com.github.binarywang</groupId>
8-
<version>4.7.5.B</version>
8+
<version>4.7.6.B</version>
99
</parent>
1010
<modelVersion>4.0.0</modelVersion>
1111

‎solon-plugins/wx-java-mp-solon-plugin/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<parent>
66
<artifactId>wx-java-solon-plugins</artifactId>
77
<groupId>com.github.binarywang</groupId>
8-
<version>4.7.5.B</version>
8+
<version>4.7.6.B</version>
99
</parent>
1010
<modelVersion>4.0.0</modelVersion>
1111

‎solon-plugins/wx-java-open-solon-plugin/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<parent>
66
<artifactId>wx-java-solon-plugins</artifactId>
77
<groupId>com.github.binarywang</groupId>
8-
<version>4.7.5.B</version>
8+
<version>4.7.6.B</version>
99
</parent>
1010
<modelVersion>4.0.0</modelVersion>
1111

‎solon-plugins/wx-java-pay-solon-plugin/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<parent>
66
<artifactId>wx-java-solon-plugins</artifactId>
77
<groupId>com.github.binarywang</groupId>
8-
<version>4.7.5.B</version>
8+
<version>4.7.6.B</version>
99
</parent>
1010
<modelVersion>4.0.0</modelVersion>
1111

‎solon-plugins/wx-java-qidian-solon-plugin/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<parent>
44
<artifactId>wx-java-solon-plugins</artifactId>
55
<groupId>com.github.binarywang</groupId>
6-
<version>4.7.5.B</version>
6+
<version>4.7.6.B</version>
77
</parent>
88
<modelVersion>4.0.0</modelVersion>
99

‎spring-boot-starters/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
<parent>
77
<groupId>com.github.binarywang</groupId>
88
<artifactId>wx-java</artifactId>
9-
<version>4.7.5.B</version>
9+
<version>4.7.6.B</version>
1010
</parent>
1111
<packaging>pom</packaging>
1212
<artifactId>wx-java-spring-boot-starters</artifactId>

‎spring-boot-starters/wx-java-channel-multi-spring-boot-starter/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<parent>
66
<artifactId>wx-java-spring-boot-starters</artifactId>
77
<groupId>com.github.binarywang</groupId>
8-
<version>4.7.5.B</version>
8+
<version>4.7.6.B</version>
99
</parent>
1010
<modelVersion>4.0.0</modelVersion>
1111

‎spring-boot-starters/wx-java-channel-spring-boot-starter/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<parent>
44
<artifactId>wx-java-spring-boot-starters</artifactId>
55
<groupId>com.github.binarywang</groupId>
6-
<version>4.7.5.B</version>
6+
<version>4.7.6.B</version>
77
</parent>
88
<modelVersion>4.0.0</modelVersion>
99

‎spring-boot-starters/wx-java-cp-multi-spring-boot-starter/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<parent>
55
<artifactId>wx-java-spring-boot-starters</artifactId>
66
<groupId>com.github.binarywang</groupId>
7-
<version>4.7.5.B</version>
7+
<version>4.7.6.B</version>
88
</parent>
99
<modelVersion>4.0.0</modelVersion>
1010

‎spring-boot-starters/wx-java-cp-spring-boot-starter/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<parent>
55
<artifactId>wx-java-spring-boot-starters</artifactId>
66
<groupId>com.github.binarywang</groupId>
7-
<version>4.7.5.B</version>
7+
<version>4.7.6.B</version>
88
</parent>
99
<modelVersion>4.0.0</modelVersion>
1010

‎spring-boot-starters/wx-java-miniapp-multi-spring-boot-starter/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<parent>
66
<artifactId>wx-java-spring-boot-starters</artifactId>
77
<groupId>com.github.binarywang</groupId>
8-
<version>4.7.5.B</version>
8+
<version>4.7.6.B</version>
99
</parent>
1010
<modelVersion>4.0.0</modelVersion>
1111

‎spring-boot-starters/wx-java-miniapp-spring-boot-starter/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<parent>
55
<artifactId>wx-java-spring-boot-starters</artifactId>
66
<groupId>com.github.binarywang</groupId>
7-
<version>4.7.5.B</version>
7+
<version>4.7.6.B</version>
88
</parent>
99
<modelVersion>4.0.0</modelVersion>
1010

‎spring-boot-starters/wx-java-mp-multi-spring-boot-starter/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<parent>
66
<artifactId>wx-java-spring-boot-starters</artifactId>
77
<groupId>com.github.binarywang</groupId>
8-
<version>4.7.5.B</version>
8+
<version>4.7.6.B</version>
99
</parent>
1010
<modelVersion>4.0.0</modelVersion>
1111

‎spring-boot-starters/wx-java-mp-spring-boot-starter/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<parent>
66
<artifactId>wx-java-spring-boot-starters</artifactId>
77
<groupId>com.github.binarywang</groupId>
8-
<version>4.7.5.B</version>
8+
<version>4.7.6.B</version>
99
</parent>
1010
<modelVersion>4.0.0</modelVersion>
1111

‎spring-boot-starters/wx-java-open-spring-boot-starter/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<parent>
66
<artifactId>wx-java-spring-boot-starters</artifactId>
77
<groupId>com.github.binarywang</groupId>
8-
<version>4.7.5.B</version>
8+
<version>4.7.6.B</version>
99
</parent>
1010
<modelVersion>4.0.0</modelVersion>
1111

‎spring-boot-starters/wx-java-pay-spring-boot-starter/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<parent>
66
<artifactId>wx-java-spring-boot-starters</artifactId>
77
<groupId>com.github.binarywang</groupId>
8-
<version>4.7.5.B</version>
8+
<version>4.7.6.B</version>
99
</parent>
1010
<modelVersion>4.0.0</modelVersion>
1111

‎spring-boot-starters/wx-java-qidian-spring-boot-starter/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<parent>
44
<artifactId>wx-java-spring-boot-starters</artifactId>
55
<groupId>com.github.binarywang</groupId>
6-
<version>4.7.5.B</version>
6+
<version>4.7.6.B</version>
77
</parent>
88
<modelVersion>4.0.0</modelVersion>
99

‎weixin-graal/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
<parent>
77
<groupId>com.github.binarywang</groupId>
88
<artifactId>wx-java</artifactId>
9-
<version>4.7.5.B</version>
9+
<version>4.7.6.B</version>
1010
</parent>
1111

1212
<artifactId>weixin-graal</artifactId>

‎weixin-java-channel/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
<parent>
77
<groupId>com.github.binarywang</groupId>
88
<artifactId>wx-java</artifactId>
9-
<version>4.7.5.B</version>
9+
<version>4.7.6.B</version>
1010
</parent>
1111

1212
<artifactId>weixin-java-channel</artifactId>

‎weixin-java-common/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
<parent>
77
<groupId>com.github.binarywang</groupId>
88
<artifactId>wx-java</artifactId>
9-
<version>4.7.5.B</version>
9+
<version>4.7.6.B</version>
1010
</parent>
1111

1212
<artifactId>weixin-java-common</artifactId>

‎weixin-java-cp/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
<parent>
88
<groupId>com.github.binarywang</groupId>
99
<artifactId>wx-java</artifactId>
10-
<version>4.7.5.B</version>
10+
<version>4.7.6.B</version>
1111
</parent>
1212

1313
<artifactId>weixin-java-cp</artifactId>

‎weixin-java-miniapp/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
<parent>
88
<groupId>com.github.binarywang</groupId>
99
<artifactId>wx-java</artifactId>
10-
<version>4.7.5.B</version>
10+
<version>4.7.6.B</version>
1111
</parent>
1212

1313
<artifactId>weixin-java-miniapp</artifactId>

‎weixin-java-mp/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
<parent>
88
<groupId>com.github.binarywang</groupId>
99
<artifactId>wx-java</artifactId>
10-
<version>4.7.5.B</version>
10+
<version>4.7.6.B</version>
1111
</parent>
1212

1313
<artifactId>weixin-java-mp</artifactId>

‎weixin-java-open/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
<parent>
88
<groupId>com.github.binarywang</groupId>
99
<artifactId>wx-java</artifactId>
10-
<version>4.7.5.B</version>
10+
<version>4.7.6.B</version>
1111
</parent>
1212

1313
<artifactId>weixin-java-open</artifactId>

‎weixin-java-pay/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<parent>
66
<groupId>com.github.binarywang</groupId>
77
<artifactId>wx-java</artifactId>
8-
<version>4.7.5.B</version>
8+
<version>4.7.6.B</version>
99
</parent>
1010
<modelVersion>4.0.0</modelVersion>
1111

‎weixin-java-qidian/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
<parent>
88
<groupId>com.github.binarywang</groupId>
99
<artifactId>wx-java</artifactId>
10-
<version>4.7.5.B</version>
10+
<version>4.7.6.B</version>
1111
</parent>
1212

1313
<artifactId>weixin-java-qidian</artifactId>

0 commit comments

Comments
 (0)