From 5b064122e01ab2341fec0bc1e52244ef01b80d10 Mon Sep 17 00:00:00 2001 From: rememberber Date: Sun, 24 Sep 2023 11:46:21 +0800 Subject: [PATCH 1/4] =?UTF-8?q?release=EF=BC=9A5.0.3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- assets/files/download_links.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/assets/files/download_links.json b/assets/files/download_links.json index 9c564233..19f3882a 100644 --- a/assets/files/download_links.json +++ b/assets/files/download_links.json @@ -1,5 +1,5 @@ { - "windows": "https://gitee.com/zhoubochina/WePush/releases/download/v5.0.2/WePush-5.0.2-windows.exe", - "mac": "https://gitee.com/zhoubochina/WePush/releases/download/v5.0.2/WePush_5.0.2.dmg", - "linux": "https://gitee.com/zhoubochina/WePush/releases/download/v5.0.2/WePush_5.0.2.deb" + "windows": "https://gitee.com/zhoubochina/WePush/releases/download/v5.0.3/WePush-5.0.3-windows.exe", + "mac": "https://gitee.com/zhoubochina/WePush/releases/download/v5.0.3/WePush_5.0.3.dmg", + "linux": "https://gitee.com/zhoubochina/WePush/releases/download/v5.0.3/WePush_5.0.3.deb" } \ No newline at end of file -- Gitee From d591355e2cb6c08928cdc56d8e5bf242d56557cb Mon Sep 17 00:00:00 2001 From: rememberber Date: Sun, 28 Jan 2024 11:56:50 +0800 Subject: [PATCH 2/4] =?UTF-8?q?=E5=8D=87=E7=BA=A7=E4=BE=9D=E8=B5=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pom.xml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/pom.xml b/pom.xml index 9b43d04a..120ea0e0 100644 --- a/pom.xml +++ b/pom.xml @@ -20,9 +20,9 @@ 21 1.2.3 - 4.4.0 - 4.4.0 - 4.4.0 + 4.6.0 + 4.6.0 + 4.6.0 5.1.1 5.6.4 5.2 @@ -47,9 +47,9 @@ 1.1.0 0.10.134 7.3.0 - 3.2.1 - 3.2.1 - 3.2.1 + 3.3 + 3.3 + 3.3 2.6.0 3.1.847 -- Gitee From 6bc86e55424852aa65e6a84b986b1b82e3764150 Mon Sep 17 00:00:00 2001 From: rememberber Date: Sun, 28 Jan 2024 16:21:48 +0800 Subject: [PATCH 3/4] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=BE=AE=E4=BF=A1?= =?UTF-8?q?=E4=BC=81=E4=B8=9A=E5=8F=B7/=E4=BC=81=E4=B8=9A=E5=BE=AE?= =?UTF-8?q?=E4=BF=A1=E5=AF=BC=E5=85=A5=E7=94=A8=E6=88=B7=E6=97=B6=E5=9B=A0?= =?UTF-8?q?=E6=80=A7=E5=88=AB=E5=8F=82=E6=95=B0=E4=B8=8D=E6=94=AF=E6=8C=81?= =?UTF-8?q?=E8=80=8C=E6=8A=A5=E9=94=99=E7=9A=84=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ui/dialog/importway/ImportByWxCp.java | 30 ++++++++++++++++--- 1 file changed, 26 insertions(+), 4 deletions(-) diff --git a/src/main/java/com/fangxuele/tool/push/ui/dialog/importway/ImportByWxCp.java b/src/main/java/com/fangxuele/tool/push/ui/dialog/importway/ImportByWxCp.java index 06a2a32c..8e01eb37 100644 --- a/src/main/java/com/fangxuele/tool/push/ui/dialog/importway/ImportByWxCp.java +++ b/src/main/java/com/fangxuele/tool/push/ui/dialog/importway/ImportByWxCp.java @@ -286,7 +286,11 @@ public class ImportByWxCp extends JDialog { deptNameList.add(wxCpIdToDeptNameMap.get(depId)); } } - String[] dataArray = new String[]{wxCpUser.getUserId(), wxCpUser.getName(), wxCpUser.getGender().getGenderName(), wxCpUser.getEmail(), String.join("/", deptNameList), wxCpUser.getPosition(), statusStr}; + String[] dataArray = new String[]{wxCpUser.getUserId(), + wxCpUser.getName(), + wxCpUser.getGender() == null ? "" : wxCpUser.getGender().getGenderName(), + wxCpUser.getEmail(), + String.join("/", deptNameList), wxCpUser.getPosition(), statusStr}; TPeopleData tPeopleData = new TPeopleData(); tPeopleData.setPeopleId(peopleId); @@ -408,7 +412,13 @@ public class ImportByWxCp extends JDialog { deptNameList.add(wxCpIdToDeptNameMap.get(depId)); } } - String[] dataArray = new String[]{wxCpUser.getUserId(), wxCpUser.getName(), wxCpUser.getGender().getGenderName(), wxCpUser.getEmail(), String.join("/", deptNameList), wxCpUser.getPosition(), statusStr}; + String[] dataArray = new String[]{wxCpUser.getUserId(), + wxCpUser.getName(), + wxCpUser.getGender() == null ? "" : wxCpUser.getGender().getGenderName(), + wxCpUser.getEmail(), + String.join("/", deptNameList), + wxCpUser.getPosition(), + statusStr}; TPeopleData tPeopleData = new TPeopleData(); tPeopleData.setPeopleId(peopleId); @@ -595,7 +605,13 @@ public class ImportByWxCp extends JDialog { deptNameList.add(wxCpIdToDeptNameMap.get(depId)); } } - String[] dataArray = new String[]{wxCpUser.getUserId(), wxCpUser.getName(), wxCpUser.getGender().getGenderName(), wxCpUser.getEmail(), String.join("/", deptNameList), wxCpUser.getPosition(), statusStr}; + String[] dataArray = new String[]{wxCpUser.getUserId(), + wxCpUser.getName(), + wxCpUser.getGender() == null ? "" : wxCpUser.getGender().getGenderName(), + wxCpUser.getEmail(), + String.join("/", deptNameList), + wxCpUser.getPosition(), + statusStr}; TPeopleData tPeopleData = new TPeopleData(); tPeopleData.setPeopleId(peopleId); @@ -722,7 +738,13 @@ public class ImportByWxCp extends JDialog { deptNameList.add(wxCpIdToDeptNameMap.get(depId)); } } - String[] dataArray = new String[]{wxCpUser.getUserId(), wxCpUser.getName(), wxCpUser.getGender().getGenderName(), wxCpUser.getEmail(), String.join("/", deptNameList), wxCpUser.getPosition(), statusStr}; + String[] dataArray = new String[]{wxCpUser.getUserId(), + wxCpUser.getName(), + wxCpUser.getGender() == null ? "" : wxCpUser.getGender().getGenderName(), + wxCpUser.getEmail(), + String.join("/", deptNameList), + wxCpUser.getPosition(), + statusStr}; TPeopleData tPeopleData = new TPeopleData(); tPeopleData.setPeopleId(peopleId); -- Gitee From f605c95ed8ced9a7e8cbd7d839b19c8072702fdf Mon Sep 17 00:00:00 2001 From: rememberber Date: Sun, 28 Jan 2024 16:29:57 +0800 Subject: [PATCH 4/4] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=BE=AE=E4=BF=A1?= =?UTF-8?q?=E4=BC=81=E4=B8=9A=E5=8F=B7/=E4=BC=81=E4=B8=9A=E5=BE=AE?= =?UTF-8?q?=E4=BF=A1=E5=AF=BC=E5=85=A5=E7=94=A8=E6=88=B7=E6=97=B6=E5=9B=A0?= =?UTF-8?q?=E6=80=A7=E5=88=AB=E5=8F=82=E6=95=B0=E4=B8=8D=E6=94=AF=E6=8C=81?= =?UTF-8?q?=E8=80=8C=E6=8A=A5=E9=94=99=E7=9A=84=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pom.xml | 2 +- src/main/java/com/fangxuele/tool/push/ui/UiConsts.java | 2 +- src/main/resources/version_summary.json | 10 ++++++++-- 3 files changed, 10 insertions(+), 4 deletions(-) diff --git a/pom.xml b/pom.xml index 120ea0e0..3aa53fe5 100644 --- a/pom.xml +++ b/pom.xml @@ -6,7 +6,7 @@ com.fangxuele.tool WePush - 5.0.3 + 5.0.4 jar WePush diff --git a/src/main/java/com/fangxuele/tool/push/ui/UiConsts.java b/src/main/java/com/fangxuele/tool/push/ui/UiConsts.java index 88b060ba..b42ce701 100644 --- a/src/main/java/com/fangxuele/tool/push/ui/UiConsts.java +++ b/src/main/java/com/fangxuele/tool/push/ui/UiConsts.java @@ -19,7 +19,7 @@ public class UiConsts { * 软件名称,版本 */ public final static String APP_NAME = "WePush"; - public final static String APP_VERSION = "v_5.0.3"; + public final static String APP_VERSION = "v_5.0.4"; public static final int TABLE_ROW_HEIGHT = 30; diff --git a/src/main/resources/version_summary.json b/src/main/resources/version_summary.json index 4327dda7..7e3694d2 100644 --- a/src/main/resources/version_summary.json +++ b/src/main/resources/version_summary.json @@ -1,11 +1,12 @@ { - "currentVersion": "v_5.0.3", + "currentVersion": "v_5.0.4", "versionIndex": { "v_0.0.0": "0", "v_5.0.0": "1", "v_5.0.1": "2", "v_5.0.2": "3", - "v_5.0.3": "4" + "v_5.0.3": "4", + "v_5.0.4": "5" }, "versionDetailList": [ { @@ -32,6 +33,11 @@ "version": "v_5.0.3", "title": "使用Java21虚拟线程", "log": "● 全局：升级Java版本至Java21\n● 推送：固定线程模式下使用虚拟线程，线程数可以放心随意增大\n● 推送：支持设置推送间隔，避免超过频率限制\n● 消息：邮件，修复消息编辑tab邮件正文回显不正确的问题\n● 消息：企业微信，修复消息编辑tab内容回显不正确的问题\n● 消息：企业微信，修复初始打开时 “图文消息编辑框不一致” 问题\n● 任务：去掉保存成功时的弹框提示\n● 账号：企业微信，修复初始打开时 “私有BaseApiUrl” 可见性问题\n" + }, + { + "version": "v_5.0.4", + "title": "修复微信企业号/企业微信导入用户时因性别参数不支持而报错的问题", + "log": "● 修复微信企业号/企业微信导入用户时因性别参数不支持而报错的问题\n● 升级部分依赖\n" } ] } \ No newline at end of file -- Gitee