Skip to content

Commit

Permalink
Merge pull request #292 from rememberber/develop
Browse files Browse the repository at this point in the history
Develop
  • Loading branch information
rememberber authored Jan 29, 2024
2 parents 7eff628 + 4cbd112 commit 3187921
Show file tree
Hide file tree
Showing 5 changed files with 45 additions and 17 deletions.
6 changes: 3 additions & 3 deletions assets/files/download_links.json
Original file line number Diff line number Diff line change
@@ -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.4/WePush-5.0.4-windows.exe",
"mac": "https://gitee.com/zhoubochina/WePush/releases/download/v5.0.4/WePush_5.0.4.dmg",
"linux": "https://gitee.com/zhoubochina/WePush/releases/download/v5.0.4/WePush_5.0.4.deb"
}
14 changes: 7 additions & 7 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@

<groupId>com.fangxuele.tool</groupId>
<artifactId>WePush</artifactId>
<version>5.0.3</version>
<version>5.0.4</version>
<packaging>jar</packaging>

<name>WePush</name>
Expand All @@ -20,9 +20,9 @@

<java.version>21</java.version>
<logback.version>1.2.3</logback.version>
<weixin-java-mp.version>4.4.0</weixin-java-mp.version>
<weixin-java-cp.version>4.4.0</weixin-java-cp.version>
<weixin-java-miniapp.version>4.4.0</weixin-java-miniapp.version>
<weixin-java-mp.version>4.6.0</weixin-java-mp.version>
<weixin-java-cp.version>4.6.0</weixin-java-cp.version>
<weixin-java-miniapp.version>4.6.0</weixin-java-miniapp.version>
<emoji-java.version>5.1.1</emoji-java.version>
<hutool-all.version>5.6.4</hutool-all.version>
<opencsv.version>5.2</opencsv.version>
Expand All @@ -47,9 +47,9 @@
<aliyun-java-sdk-dysmsapi.version>1.1.0</aliyun-java-sdk-dysmsapi.version>
<bce-java-sdk.version>0.10.134</bce-java-sdk.version>
<qiniu-java-sdk.version>7.3.0</qiniu-java-sdk.version>
<flatlaf.version>3.2.1</flatlaf.version>
<flatlaf-extras.version>3.2.1</flatlaf-extras.version>
<flatlaf-intellij-themes.version>3.2.1</flatlaf-intellij-themes.version>
<flatlaf.version>3.3</flatlaf.version>
<flatlaf-extras.version>3.3</flatlaf-extras.version>
<flatlaf-intellij-themes.version>3.3</flatlaf-intellij-themes.version>
<json-path.version>2.6.0</json-path.version>
<tencentcloud-sdk-java.version>3.1.847</tencentcloud-sdk-java.version>
</properties>
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/com/fangxuele/tool/push/ui/UiConsts.java
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -286,7 +286,11 @@ public ImportByWxCp(Integer peopleId) {
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);
Expand Down Expand Up @@ -408,7 +412,13 @@ public void importWxCpAll() {
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);
Expand Down Expand Up @@ -595,7 +605,13 @@ public void reImport() {
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);
Expand Down Expand Up @@ -722,7 +738,13 @@ public void reImport() {
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);
Expand Down
10 changes: 8 additions & 2 deletions src/main/resources/version_summary.json
Original file line number Diff line number Diff line change
@@ -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": [
{
Expand All @@ -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"
}
]
}

0 comments on commit 3187921

Please sign in to comment.