8000 Merge remote-tracking branch 'origin/develop' into develop · SynchPj/WxJava@cee794b · GitHub
[go: up one dir, main page]
Skip to content

Commit cee794b

Browse files
author
SynchPj
committed
Merge remote-tracking branch 'origin/develop' into develop
# Conflicts: # weixin-java-pay/src/main/java/com/github/binarywang/wxpay/service/impl/WxPayServiceApacheHttpImpl.java
2 parents a22c1b0 + 245cf72 commit cee794b

File tree

50 files changed

+434
-156
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

50 files changed

+434
-156
lines changed

‎.github/workflows

Lines changed: 0 additions & 4 deletions
This file was deleted.

‎.github/workflows/maven-publish.yml

Lines changed: 57 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,57 @@
1+
name: Publish to Maven Central
2+
on:
3+
push:
4+
branches:
5+
- develop
6+
7+
jobs:
8+
build-and-publish:
9+
runs-on: ubuntu-latest
10+
11+
steps:
12+
# 检出代码
13+
- name: Checkout Code
14+
uses: actions/checkout@v4
15+
with:
16+
fetch-depth: 0
17+
18+
# 设置所需的Java版本
19+
- name: Set up Java
20+
uses: actions/setup-java@v4
21+
with:
22+
java-version: '8'
23+
distribution: 'temurin'
24+
server-id: ossrh
25+
server-username: MAVEN_USERNAME
26+
server-password: MAVEN_PASSWORD
27+
gpg-private-key: ${{ secrets.GPG_PRIVATE_KEY }}
28+
gpg-passphrase: MAVEN_GPG_PASSPHRASE
29+
cache: maven
30+
31+
- name: Verify GPG keys
32+
run: |
33+
echo "Available GPG Keys:"
34+
gpg --list-secret-keys --keyid-format LONG
35+
36+
- name: Generate version && Set version
37+
id: set_version
38+
run: |
39+
git describe --tags 2>/dev/null || echo "no tag"
40+
TIMESTAMP=$(date +'%Y%m%d.%H%M%S')
41+
GIT_DESCRIBE=$(git describe --tags --abbrev=0 2>/dev/null | sed 's/^v//' || echo "0.0.1")
42+
VERSION="${GIT_DESCRIBE}-${TIMESTAMP}"
43+
echo "Generated version: $VERSION"
44+
mvn versions:set -DnewVersion=$VERSION --no-transfer-progress
45+
env:
46+
TZ: Asia/Shanghai
47+
48+
- name: Publish to Maven Central
49+
run: |
50+
mvn clean deploy -P release \
51+
-Dmaven.test.skip=true \
52+
-Dgpg.args="--batch --yes --pinentry-mode loopback" \
53+
--no-transfer-progress
54+
env:
55+
MAVEN_USERNAME: ${{ secrets.OSSRH_USERNAME }}
56+
MAVEN_PASSWORD: ${{ secrets.OSSRH_TOKEN }}
57+
MAVEN_GPG_PASSPHRASE: ${{ secrets.GPG_PASSPHRASE }}

‎pom.xml

Lines changed: 3 additions & 4 deletions
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.4.B</version>
6+
<version>4.7.5.B</version>
77
<packaging>pom</packaging>
88
<name>WxJava - Weixin/Wechat Java SDK</name>
99
<description>微信开发Java SDK</description>
@@ -136,10 +136,8 @@
136136

137137
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
138138
<httpclient.version>4.5.13</httpclient.version>
139-
<jetty.version>9.4.56.v20240826</jetty.version>
140-
<!-- 这个不能用10以上的版本，不支持jdk8-->
139+
<jetty.version>9.4.56.v20240826</jetty.version> <!-- 这个不能用10以上的版本，不支持jdk8-->
141140
</properties>
142-
143141
<dependencyManagement>
144142
<dependencies>
145143
<dependency>
@@ -339,6 +337,7 @@
339337
</snapshotRepository>
340338
<repository>
341339
<id>ossrh</id>
340+
<name>OSSRH Repository</name>
342341
<url>https://oss.sonatype.org/service/local/staging/deploy/maven2/</url>
343342
</repository>
344343
</distributionManagement>

‎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.4.B</version>
9+
<version>4.7.5.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.4.B</version>
8+
<version>4.7.5.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.4.B</version>
6+
<version>4.7.5.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.4.B</version>
7+
<version>4.7.5.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.4.B</version>
7+
<version>4.7.5.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.4.B</version>
8+
<version>4.7.5.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.4.B</version>
7+
<version>4.7.5.B</version>
88
</parent>
99
<modelVersion>4.0.0</modelVersion>
1010

0 commit comments

Comments
 (0)
0