diff --git a/assets/files/download_links.json b/assets/files/download_links.json
index 9c564233b9c0954e218db054903276477c2e90dc..19f3882a14c599874fcff7ae2e9213b6cea6e017 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
diff --git a/pom.xml b/pom.xml
index 9b43d04aefdbe21ebc9afc18b84ce056cbbb6778..3aa53fe594d2c921fc80056bee6e391e88263e01 100644
--- a/pom.xml
+++ b/pom.xml
@@ -6,7 +6,7 @@
com.fangxuele.tool
WePush
- 5.0.3
+ 5.0.4
jar
WePush
@@ -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
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 88b060ba8b3a624ad86a4e29ab02976088dc7525..b42ce701d4326889f74cd43dc2868784066efccc 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/java/com/fangxuele/tool/push/ui/dialog/importway/ImportByWxCp.java b/src/main/java/com/fangxuele/tool/push/ui/dialog/importway/ImportByWxCp.java
index 06a2a32c0442bbf357cbcffdf5a1ce8f97e1290e..8e01eb3769b4c7d96bc74fbdc2de90ccac8500d3 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);
diff --git a/src/main/resources/version_summary.json b/src/main/resources/version_summary.json
index 4327dda7826df13d1612b86bd9bde4762d2cfab9..7e3694d2b6c9df01f8dc1692c381b571720c19f4 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