Visitar URL original
Merge branch 'binarywang:develop' into develop · binarywang/WxJava@c28281b · GitHub
Skip to content

Commit c28281b

Browse files
MsThinkMsThink
authored
Merge branch 'binarywang:develop' into develop
2 parents 1c6f44d + 4d66dd0 commit c28281b

819 files changed

Lines changed: 24079 additions & 2777 deletions

File tree

Some content is hidden

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

‎.gitee/ISSUE_TEMPLATE.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
强烈建议大家到 `github` 相关页面提交问题，方便统一查询管理，具体页面地址：https://github.com/Wechat-Group/WxJava/issues
1+
强烈建议大家到 `github` 相关页面提交问题，方便统一查询管理，具体页面地址：https://github.com/binarywang/WxJava/issues
22

33
当然如果必须在这里提问，请务必按以下格式填写，谢谢配合~
44

‎.github/workflows‎

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

‎.github/workflows/maven-publish.yml‎

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

‎CONTRIBUTING.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ $ git push
2828
* 定期使用项目仓库内容更新自己仓库内容。
2929

3030
```bash
31-
$ git remote add upstream https://github.com/Wechat-Group/WxJava
31+
$ git remote add upstream https://github.com/binarywang/WxJava
3232
$ git fetch upstream
3333
$ git checkout develop
3434
$ git rebase upstream/develop

‎README.md‎

Lines changed: 53 additions & 50 deletions
Large diffs are not rendered by default.

‎images/api-signature/api-signature-1.png‎

165 KB
Loading

‎images/api-signature/api-signature-2.png‎

297 KB
Loading

‎others/weixin-java-osgi/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828
<dependency>
2929
<groupId>com.thoughtworks.xstream</groupId>
3030
<artifactId>xstream</artifactId>
31-
<version>1.4.19</version>
31+
<version>1.4.21</version>
3232
<scope>provided</scope>
3333
<exclusions>
3434
<exclusion>

‎pom.xml‎

Lines changed: 17 additions & 28 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.6.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.51.v20230217</jetty.version>
140-
<!-- 这个不能用10以上的版本，不支持jdk8-->
139+
<jetty.version>9.4.57.v20241219</jetty.version> <!-- 这个不能用10以上的版本，不支持jdk8-->
141140
</properties>
142-
143141
<dependencyManagement>
144142
<dependencies>
145143
<dependency>
@@ -178,7 +176,7 @@
178176
<dependency>
179177
<groupId>commons-io</groupId>
180178
<artifactId>commons-io</artifactId>
181-
<version>2.7</version>
179+
<version>2.14.0</version>
182180
</dependency>
183181
<dependency>
184182
<groupId>org.apache.commons</groupId>
@@ -193,22 +191,24 @@
193191
<dependency>
194192
<groupId>com.thoughtworks.xstream</groupId>
195193
<artifactId>xstream</artifactId>
196-
<version>1.4.20</version>
194+
<version>1.4.21</version>
197195
</dependency>
198196
<dependency>
199197
<groupId>com.google.guava</groupId>
200198
<artifactId>guava</artifactId>
201-
<version>32.1.2-jre</version>
199+
<version>33.3.1-jre</version>
202200
</dependency>
203201
<dependency>
204202
<groupId>com.google.code.gson</groupId>
205203
<artifactId>gson</artifactId>
206-
<version>2.10.1</version>
204+
<version>2.13.1</version>
207205
</dependency>
208206
<dependency>
209-
<groupId>com.fasterxml.jackson.dataformat</groupId>
210-
<artifactId>jackson-dataformat-xml</artifactId>
211-
<version>2.15.2</version>
207+
<groupId>com.fasterxml.jackson</groupId>
208+
<artifactId>jackson-bom</artifactId>
209+
<version>2.18.1</version>
210+
<type>pom</type>
211+
<scope>import</scope>
212212
</dependency>
213213

214214
<!-- 测试所用依赖 -->
@@ -332,17 +332,6 @@
332332
</dependencies>
333333
</dependencyManagement>
334334

335-
<distributionManagement>
336-
<snapshotRepository>
337-
<id>ossrh</id>
338-
<url>https://oss.sonatype.org/content/repositories/snapshots</url>
339-
</snapshotRepository>
340-
<repository>
341-
<id>ossrh</id>
342-
<url>https://oss.sonatype.org/service/local/staging/deploy/maven2/</url>
343-
</repository>
344-
</distributionManagement>
345-
346335
<profiles>
347336
<profile>
348337
<id>doclint-java8-disable</id>
@@ -432,14 +421,14 @@
432421

433422
<plugins>
434423
<plugin>
435-
<groupId>org.sonatype.plugins</groupId>
436-
<artifactId>nexus-staging-maven-plugin</artifactId>
437-
<version>1.6.3</version>
424+
<groupId>org.sonatype.central</groupId>
425+
<artifactId>central-publishing-maven-plugin</artifactId>
426+
<version>0.7.0</version>
438427
<extensions>true</extensions>
439428
<configuration>
440-
<serverId>ossrh</serverId>
441-
<nexusUrl>https://oss.sonatype.org/</nexusUrl>
442-
<autoReleaseAfterClose>true</autoReleaseAfterClose>
429+
<deploymentName>Release WxJava:${project.version}</deploymentName>
430+
<publishingServerId>central</publishingServerId>
431+
<autoPublish>true</autoPublish>
443432
</configuration>
444433
</plugin>
445434
<plugin>

‎solon-plugins/pom.xml‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,18 +6,19 @@
66
<parent>
77
<groupId>com.github.binarywang</groupId>
88
<artifactId>wx-java</artifactId>
9-
<version>4.6.4.B</version>
9+
<version>4.7.5.B</version>
1010
</parent>
1111
<packaging>pom</packaging>
1212
<artifactId>wx-java-solon-plugins</artifactId>
1313
<name>WxJava - Solon Plugins</name>
1414
<description>WxJava 各个模块的 Solon Plugin</description>
1515

1616
<properties>
17-
<solon.version>2.9.2</solon.version>
17+
<solon.version>3.2.0</solon.version>
1818
</properties>
1919

2020
<modules>
21+
<module>wx-java-miniapp-multi-solon-plugin</module>
2122
<module>wx-java-miniapp-solon-plugin</module>
2223
<module>wx-java-mp-multi-solon-plugin</module>
2324
<module>wx-java-mp-solon-plugin</module>
@@ -27,6 +28,7 @@
2728
<module>wx-java-cp-multi-solon-plugin</module>
2829
<module>wx-java-cp-solon-plugin</module>
2930
<module>wx-java-channel-solon-plugin</module>
31+
<module>wx-java-channel-multi-solon-plugin</module>
3032
</modules>
3133

3234
<dependencies>

0 commit comments

Comments
 (0)