Merge pull request #63 from rememberber/develop

编辑消息Tab bug修复
rememberber · Jul 21, 2018 · 0c7def3 · 0c7def3
2 parents 0d8ee2f + ab2dc6e
commit 0c7def3
Show file tree

Hide file tree

Showing 34 changed files with 118 additions and 114 deletions.
diff --git a/pom.xml b/pom.xml
@@ -180,7 +180,7 @@
                         <manifest>
                             <addClasspath>true</addClasspath>
                             <classpathPrefix>lib/</classpathPrefix>
-                            <mainClass>com.fangxuele.tool.wechat.push.ui.MainWindow</mainClass>
+                            <mainClass>com.fangxuele.tool.push.ui.MainWindow</mainClass>
                         </manifest>
                     </archive>
                 </configuration>

diff --git a/...xuele/tool/wechat/push/bean/UserCase.java → ...om/fangxuele/tool/push/bean/UserCase.java b/...xuele/tool/wechat/push/bean/UserCase.java → ...om/fangxuele/tool/push/bean/UserCase.java
@@ -1,4 +1,4 @@
-package com.fangxuele.tool.wechat.push.bean;
+package com.fangxuele.tool.push.bean;
 
 import java.io.Serializable;
 

diff --git a/...tool/wechat/push/bean/VersionSummary.java → ...gxuele/tool/push/bean/VersionSummary.java b/...tool/wechat/push/bean/VersionSummary.java → ...gxuele/tool/push/bean/VersionSummary.java
@@ -1,4 +1,4 @@
-package com.fangxuele.tool.wechat.push.bean;
+package com.fangxuele.tool.push.bean;
 
 import java.io.Serializable;
 import java.util.List;

diff --git a/...c/AliDayuTemplateSmsMsgServiceThread.java → ...c/AliDayuTemplateSmsMsgServiceThread.java b/...c/AliDayuTemplateSmsMsgServiceThread.java → ...c/AliDayuTemplateSmsMsgServiceThread.java
@@ -1,7 +1,7 @@
-package com.fangxuele.tool.wechat.push.logic;
+package com.fangxuele.tool.push.logic;
 
-import com.fangxuele.tool.wechat.push.ui.Init;
-import com.fangxuele.tool.wechat.push.ui.MainWindow;
+import com.fangxuele.tool.push.ui.Init;
+import com.fangxuele.tool.push.ui.MainWindow;
 import com.taobao.api.DefaultTaobaoClient;
 import com.taobao.api.TaobaoClient;
 import com.taobao.api.request.AlibabaAliqinFcSmsNumSendRequest;

diff --git a/...push/logic/AliYunSmsMsgServiceThread.java → ...push/logic/AliYunSmsMsgServiceThread.java b/...push/logic/AliYunSmsMsgServiceThread.java → ...push/logic/AliYunSmsMsgServiceThread.java
@@ -1,4 +1,4 @@
-package com.fangxuele.tool.wechat.push.logic;
+package com.fangxuele.tool.push.logic;
 
 import com.aliyuncs.DefaultAcsClient;
 import com.aliyuncs.IAcsClient;
@@ -7,8 +7,8 @@
 import com.aliyuncs.exceptions.ClientException;
 import com.aliyuncs.profile.DefaultProfile;
 import com.aliyuncs.profile.IClientProfile;
-import com.fangxuele.tool.wechat.push.ui.Init;
-import com.fangxuele.tool.wechat.push.ui.MainWindow;
+import com.fangxuele.tool.push.ui.Init;
+import com.fangxuele.tool.push.ui.MainWindow;
 import org.apache.commons.lang3.StringUtils;
 
 import javax.swing.*;

diff --git a/...chat/push/logic/BaseMsgServiceThread.java → ...tool/push/logic/BaseMsgServiceThread.java b/...chat/push/logic/BaseMsgServiceThread.java → ...tool/push/logic/BaseMsgServiceThread.java
@@ -1,8 +1,8 @@
-package com.fangxuele.tool.wechat.push.logic;
+package com.fangxuele.tool.push.logic;
 
 import cn.hutool.log.Log;
 import cn.hutool.log.LogFactory;
-import com.fangxuele.tool.wechat.push.ui.MainWindow;
+import com.fangxuele.tool.push.ui.MainWindow;
 import me.chanjar.weixin.mp.api.WxMpService;
 
 import javax.swing.table.DefaultTableModel;

diff --git a/...chat/push/logic/KeFuMsgServiceThread.java → ...tool/push/logic/KeFuMsgServiceThread.java b/...chat/push/logic/KeFuMsgServiceThread.java → ...tool/push/logic/KeFuMsgServiceThread.java
@@ -1,6 +1,6 @@
-package com.fangxuele.tool.wechat.push.logic;
+package com.fangxuele.tool.push.logic;
 
-import com.fangxuele.tool.wechat.push.ui.MainWindow;
+import com.fangxuele.tool.push.ui.MainWindow;
 import me.chanjar.weixin.mp.bean.kefu.WxMpKefuMessage;
 
 /**

diff --git a/...push/logic/KeFuPriorMsgServiceThread.java → ...push/logic/KeFuPriorMsgServiceThread.java b/...push/logic/KeFuPriorMsgServiceThread.java → ...push/logic/KeFuPriorMsgServiceThread.java
@@ -1,6 +1,6 @@
-package com.fangxuele.tool.wechat.push.logic;
+package com.fangxuele.tool.push.logic;
 
-import com.fangxuele.tool.wechat.push.ui.MainWindow;
+import com.fangxuele.tool.push.ui.MainWindow;
 import me.chanjar.weixin.mp.bean.kefu.WxMpKefuMessage;
 import me.chanjar.weixin.mp.bean.template.WxMpTemplateMessage;
 

diff --git a/.../tool/wechat/push/logic/MsgHisManage.java → ...ngxuele/tool/push/logic/MsgHisManage.java b/.../tool/wechat/push/logic/MsgHisManage.java → ...ngxuele/tool/push/logic/MsgHisManage.java
@@ -1,10 +1,10 @@
-package com.fangxuele.tool.wechat.push.logic;
+package com.fangxuele.tool.push.logic;
 
 import cn.hutool.log.Log;
 import cn.hutool.log.LogFactory;
-import com.fangxuele.tool.wechat.push.ui.Init;
-import com.fangxuele.tool.wechat.push.ui.MainWindow;
-import com.fangxuele.tool.wechat.push.util.SystemUtil;
+import com.fangxuele.tool.push.ui.Init;
+import com.fangxuele.tool.push.ui.MainWindow;
+import com.fangxuele.tool.push.util.SystemUtil;
 import com.opencsv.CSVReader;
 import com.opencsv.CSVWriter;
 

diff --git a/...uele/tool/wechat/push/logic/PushData.java → ...m/fangxuele/tool/push/logic/PushData.java b/...uele/tool/wechat/push/logic/PushData.java → ...m/fangxuele/tool/push/logic/PushData.java
@@ -1,4 +1,4 @@
-package com.fangxuele.tool.wechat.push.logic;
+package com.fangxuele.tool.push.logic;
 
 import java.util.List;
 

diff --git a/...le/tool/wechat/push/logic/PushManage.java → ...fangxuele/tool/push/logic/PushManage.java b/...le/tool/wechat/push/logic/PushManage.java → ...fangxuele/tool/push/logic/PushManage.java
@@ -1,4 +1,4 @@
-package com.fangxuele.tool.wechat.push.logic;
+package com.fangxuele.tool.push.logic;
 
 import cn.binarywang.wx.miniapp.api.WxMaService;
 import cn.binarywang.wx.miniapp.api.impl.WxMaServiceImpl;
@@ -16,9 +16,9 @@
 import com.aliyuncs.http.MethodType;
 import com.aliyuncs.profile.DefaultProfile;
 import com.aliyuncs.profile.IClientProfile;
-import com.fangxuele.tool.wechat.push.ui.Init;
-import com.fangxuele.tool.wechat.push.ui.MainWindow;
-import com.fangxuele.tool.wechat.push.util.SystemUtil;
+import com.fangxuele.tool.push.ui.Init;
+import com.fangxuele.tool.push.ui.MainWindow;
+import com.fangxuele.tool.push.util.SystemUtil;
 import com.github.qcloudsms.SmsSingleSender;
 import com.github.qcloudsms.SmsSingleSenderResult;
 import com.opencsv.CSVWriter;

diff --git a/...tool/wechat/push/logic/RunPushThread.java → ...gxuele/tool/push/logic/RunPushThread.java b/...tool/wechat/push/logic/RunPushThread.java → ...gxuele/tool/push/logic/RunPushThread.java
@@ -1,12 +1,12 @@
-package com.fangxuele.tool.wechat.push.logic;
+package com.fangxuele.tool.push.logic;
 
 import cn.binarywang.wx.miniapp.api.WxMaService;
 import cn.hutool.core.date.BetweenFormater;
 import cn.hutool.core.date.DateUtil;
 import cn.hutool.log.Log;
 import cn.hutool.log.LogFactory;
-import com.fangxuele.tool.wechat.push.ui.Init;
-import com.fangxuele.tool.wechat.push.ui.MainWindow;
+import com.fangxuele.tool.push.ui.Init;
+import com.fangxuele.tool.push.ui.MainWindow;
 import me.chanjar.weixin.mp.api.WxMpService;
 
 import javax.swing.*;

diff --git a/...ush/logic/TemplateMsgMaServiceThread.java → ...ush/logic/TemplateMsgMaServiceThread.java b/...ush/logic/TemplateMsgMaServiceThread.java → ...ush/logic/TemplateMsgMaServiceThread.java
@@ -1,8 +1,8 @@
-package com.fangxuele.tool.wechat.push.logic;
+package com.fangxuele.tool.push.logic;
 
 import cn.binarywang.wx.miniapp.api.WxMaService;
 import cn.binarywang.wx.miniapp.bean.WxMaTemplateMessage;
-import com.fangxuele.tool.wechat.push.ui.MainWindow;
+import com.fangxuele.tool.push.ui.MainWindow;
 
 /**
  * 模板消息-小程序发送服务线程

diff --git a/...ush/logic/TemplateMsgMpServiceThread.java → ...ush/logic/TemplateMsgMpServiceThread.java b/...ush/logic/TemplateMsgMpServiceThread.java → ...ush/logic/TemplateMsgMpServiceThread.java
@@ -1,6 +1,6 @@
-package com.fangxuele.tool.wechat.push.logic;
+package com.fangxuele.tool.push.logic;
 
-import com.fangxuele.tool.wechat.push.ui.MainWindow;
+import com.fangxuele.tool.push.ui.MainWindow;
 import me.chanjar.weixin.mp.bean.template.WxMpTemplateMessage;
 
 /**

diff --git a/.../push/logic/TxYunSmsMsgServiceThread.java → .../push/logic/TxYunSmsMsgServiceThread.java b/.../push/logic/TxYunSmsMsgServiceThread.java → .../push/logic/TxYunSmsMsgServiceThread.java
@@ -1,7 +1,7 @@
-package com.fangxuele.tool.wechat.push.logic;
+package com.fangxuele.tool.push.logic;
 
-import com.fangxuele.tool.wechat.push.ui.Init;
-import com.fangxuele.tool.wechat.push.ui.MainWindow;
+import com.fangxuele.tool.push.ui.Init;
+import com.fangxuele.tool.push.ui.MainWindow;
 import com.github.qcloudsms.SmsSingleSender;
 import com.github.qcloudsms.SmsSingleSenderResult;
 import org.apache.commons.lang3.StringUtils;

diff --git a/...ush/logic/YunpianSmsMsgServiceThread.java → ...ush/logic/YunpianSmsMsgServiceThread.java b/...ush/logic/YunpianSmsMsgServiceThread.java → ...ush/logic/YunpianSmsMsgServiceThread.java
@@ -1,9 +1,7 @@
-package com.fangxuele.tool.wechat.push.logic;
+package com.fangxuele.tool.push.logic;
 
-import com.fangxuele.tool.wechat.push.ui.Init;
-import com.fangxuele.tool.wechat.push.ui.MainWindow;
-import com.github.qcloudsms.SmsSingleSender;
-import com.github.qcloudsms.SmsSingleSenderResult;
+import com.fangxuele.tool.push.ui.Init;
+import com.fangxuele.tool.push.ui.MainWindow;
 import com.yunpian.sdk.YunpianClient;
 import com.yunpian.sdk.model.Result;
 import com.yunpian.sdk.model.SmsSingleSend;

diff --git a/...uele/tool/wechat/push/ui/ConstantsUI.java → ...m/fangxuele/tool/push/ui/ConstantsUI.java b/...uele/tool/wechat/push/ui/ConstantsUI.java → ...m/fangxuele/tool/push/ui/ConstantsUI.java
@@ -1,4 +1,4 @@
-package com.fangxuele.tool.wechat.push.ui;
+package com.fangxuele.tool.push.ui;
 
 import java.awt.Image;
 import java.awt.Toolkit;
@@ -14,7 +14,7 @@ public class ConstantsUI {
      * 软件名称,版本
      */
     public final static String APP_NAME = "WePush";
-    public final static String APP_VERSION = "v_2.3.0_180714";
+    public final static String APP_VERSION = "v_2.3.1_180721";
 
     /**
      * 主窗口图标

diff --git a/...m/fangxuele/tool/wechat/push/ui/Init.java → ...java/com/fangxuele/tool/push/ui/Init.java b/...m/fangxuele/tool/wechat/push/ui/Init.java → ...java/com/fangxuele/tool/push/ui/Init.java
@@ -1,15 +1,15 @@
-package com.fangxuele.tool.wechat.push.ui;
+package com.fangxuele.tool.push.ui;
 
 import cn.hutool.http.HttpUtil;
 import cn.hutool.json.JSONUtil;
 import cn.hutool.log.Log;
 import cn.hutool.log.LogFactory;
 import com.alee.laf.WebLookAndFeel;
-import com.fangxuele.tool.wechat.push.bean.UserCase;
-import com.fangxuele.tool.wechat.push.logic.MsgHisManage;
-import com.fangxuele.tool.wechat.push.ui.listener.AboutListener;
-import com.fangxuele.tool.wechat.push.util.Config;
-import com.fangxuele.tool.wechat.push.util.SystemUtil;
+import com.fangxuele.tool.push.bean.UserCase;
+import com.fangxuele.tool.push.ui.listener.AboutListener;
+import com.fangxuele.tool.push.logic.MsgHisManage;
+import com.fangxuele.tool.push.util.Config;
+import com.fangxuele.tool.push.util.SystemUtil;
 import com.intellij.uiDesigner.core.GridConstraints;
 import com.intellij.uiDesigner.core.GridLayoutManager;
 import com.intellij.uiDesigner.core.Spacer;
@@ -255,10 +255,10 @@ public static void initMsgTab(String selectedMsgName) {
                 MainWindow.mainWindow.setMsgKefuPicUrlTextField(msgDataArray[6]);
                 MainWindow.mainWindow.setMsgKefuDescTextField(msgDataArray[7]);
                 MainWindow.mainWindow.setMsgKefuUrlTextField(msgDataArray[8]);
-                if (msgDataArray.length > 11) {
+                if (msgDataArray.length > 12) {
                     MainWindow.mainWindow.setMsgYunpianMsgContentTextField(msgDataArray[12]);
                 }
-                if (msgDataArray.length > 10) {
+                if (msgDataArray.length > 11) {
                     MainWindow.mainWindow.setMsgTemplateKeyWordTextField(msgDataArray[11]);
                 }
                 if (msgDataArray.length > 9) {
@@ -592,10 +592,10 @@ public static void initTemplateDataTable() {
         MainWindow.mainWindow.getTemplateMsgDataTable().updateUI();
         MainWindow.mainWindow.getTemplateMsgDataTable().getColumnModel().
                 getColumn(headerNames.length - 1).
-                setCellRenderer(new Init.ButtonColumn(MainWindow.mainWindow.getTemplateMsgDataTable(), headerNames.length - 1));
+                setCellRenderer(new ButtonColumn(MainWindow.mainWindow.getTemplateMsgDataTable(), headerNames.length - 1));
         MainWindow.mainWindow.getTemplateMsgDataTable().getColumnModel().
                 getColumn(headerNames.length - 1).
-                setCellEditor(new Init.ButtonColumn(MainWindow.mainWindow.getTemplateMsgDataTable(), headerNames.length - 1));
+                setCellEditor(new ButtonColumn(MainWindow.mainWindow.getTemplateMsgDataTable(), headerNames.length - 1));
 
         // 设置列宽
         MainWindow.mainWindow.getTemplateMsgDataTable().getColumnModel().getColumn(0).setPreferredWidth(150);

diff --git a/...xuele/tool/wechat/push/ui/MainWindow.form → ...om/fangxuele/tool/push/ui/MainWindow.form b/...xuele/tool/wechat/push/ui/MainWindow.form → ...om/fangxuele/tool/push/ui/MainWindow.form
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<form xmlns="http://www.intellij.com/uidesigner/form/" version="1" bind-to-class="com.fangxuele.tool.wechat.push.ui.MainWindow">
+<form xmlns="http://www.intellij.com/uidesigner/form/" version="1" bind-to-class="com.fangxuele.tool.push.ui.MainWindow">
   <grid id="27dc6" binding="mainPanel" layout-manager="GridLayoutManager" row-count="1" column-count="1" same-size-horizontally="false" same-size-vertically="false" hgap="-1" vgap="-1">
     <margin top="8" left="0" bottom="0" right="0"/>
     <constraints>
@@ -2468,7 +2468,7 @@
                       <grid row="1" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="0" anchor="8" fill="0" indent="0" use-parent-layout="false"/>
                     </constraints>
                     <properties>
-                      <text value="也正因如此，我无法得知哪些优秀的企业或个人在使用她"/>
+                      <text value="也正因如此，我无法得知哪些优秀的企业或个人在使用WePush"/>
                     </properties>
                   </component>
                   <component id="c48bf" class="javax.swing.JLabel">

diff --git a/...xuele/tool/wechat/push/ui/MainWindow.java → ...om/fangxuele/tool/push/ui/MainWindow.java b/...xuele/tool/wechat/push/ui/MainWindow.java → ...om/fangxuele/tool/push/ui/MainWindow.java
@@ -1,19 +1,19 @@
-package com.fangxuele.tool.wechat.push.ui;
+package com.fangxuele.tool.push.ui;
 
 import cn.hutool.log.Log;
 import cn.hutool.log.LogFactory;
 import com.apple.eawt.Application;
-import com.fangxuele.tool.wechat.push.ui.listener.AboutListener;
-import com.fangxuele.tool.wechat.push.ui.listener.FramListener;
-import com.fangxuele.tool.wechat.push.ui.listener.HelpListener;
-import com.fangxuele.tool.wechat.push.ui.listener.MemberListener;
-import com.fangxuele.tool.wechat.push.ui.listener.MsgListener;
-import com.fangxuele.tool.wechat.push.ui.listener.PushHisListener;
-import com.fangxuele.tool.wechat.push.ui.listener.PushListener;
-import com.fangxuele.tool.wechat.push.ui.listener.ScheduleListener;
-import com.fangxuele.tool.wechat.push.ui.listener.SettingListener;
-import com.fangxuele.tool.wechat.push.ui.listener.TabListener;
-import com.fangxuele.tool.wechat.push.util.SystemUtil;
+import com.fangxuele.tool.push.ui.listener.AboutListener;
+import com.fangxuele.tool.push.ui.listener.FramListener;
+import com.fangxuele.tool.push.ui.listener.HelpListener;
+import com.fangxuele.tool.push.ui.listener.MemberListener;
+import com.fangxuele.tool.push.ui.listener.MsgListener;
+import com.fangxuele.tool.push.ui.listener.PushHisListener;
+import com.fangxuele.tool.push.ui.listener.PushListener;
+import com.fangxuele.tool.push.ui.listener.ScheduleListener;
+import com.fangxuele.tool.push.ui.listener.SettingListener;
+import com.fangxuele.tool.push.ui.listener.TabListener;
+import com.fangxuele.tool.push.util.SystemUtil;
 import com.intellij.uiDesigner.core.GridConstraints;
 import com.intellij.uiDesigner.core.GridLayoutManager;
 import com.intellij.uiDesigner.core.Spacer;
@@ -2480,7 +2480,7 @@ public void setMsgYunpianMsgContentTextField(String msgYunpianMsgContentTextFiel
         label45.setText("WePush不会收集用户的任何信息");
         panel32.add(label45, new GridConstraints(0, 0, 1, 1, GridConstraints.ANCHOR_WEST, GridConstraints.FILL_NONE, GridConstraints.SIZEPOLICY_FIXED, GridConstraints.SIZEPOLICY_FIXED, null, null, null, 0, false));
         final JLabel label46 = new JLabel();
-        label46.setText("也正因如此，我无法得知哪些优秀的企业或个人在使用她");
+        label46.setText("也正因如此，我无法得知哪些优秀的企业或个人在使用WePush");
         panel32.add(label46, new GridConstraints(1, 0, 1, 1, GridConstraints.ANCHOR_WEST, GridConstraints.FILL_NONE, GridConstraints.SIZEPOLICY_FIXED, GridConstraints.SIZEPOLICY_FIXED, null, null, null, 0, false));
         final JLabel label47 = new JLabel();
         label47.setText("如果WePush能给您带来一些便利");

diff --git a/...echat/push/ui/listener/AboutListener.java → .../tool/push/ui/listener/AboutListener.java b/...echat/push/ui/listener/AboutListener.java → .../tool/push/ui/listener/AboutListener.java
@@ -1,12 +1,12 @@
-package com.fangxuele.tool.wechat.push.ui.listener;
+package com.fangxuele.tool.push.ui.listener;
 
 import cn.hutool.http.HttpUtil;
 import cn.hutool.log.Log;
 import cn.hutool.log.LogFactory;
 import com.alibaba.fastjson.JSON;
-import com.fangxuele.tool.wechat.push.bean.VersionSummary;
-import com.fangxuele.tool.wechat.push.ui.ConstantsUI;
-import com.fangxuele.tool.wechat.push.ui.MainWindow;
+import com.fangxuele.tool.push.bean.VersionSummary;
+import com.fangxuele.tool.push.ui.ConstantsUI;
+import com.fangxuele.tool.push.ui.MainWindow;
 import org.apache.commons.lang3.StringUtils;
 
 import javax.swing.*;

diff --git a/...wechat/push/ui/listener/FramListener.java → ...e/tool/push/ui/listener/FramListener.java b/...wechat/push/ui/listener/FramListener.java → ...e/tool/push/ui/listener/FramListener.java
@@ -1,8 +1,8 @@
-package com.fangxuele.tool.wechat.push.ui.listener;
+package com.fangxuele.tool.push.ui.listener;
 
 import cn.hutool.log.Log;
 import cn.hutool.log.LogFactory;
-import com.fangxuele.tool.wechat.push.ui.MainWindow;
+import com.fangxuele.tool.push.ui.MainWindow;
 
 import javax.swing.*;
 import java.awt.event.WindowEvent;

diff --git a/...wechat/push/ui/listener/HelpListener.java → ...e/tool/push/ui/listener/HelpListener.java b/...wechat/push/ui/listener/HelpListener.java → ...e/tool/push/ui/listener/HelpListener.java
@@ -1,8 +1,8 @@
-package com.fangxuele.tool.wechat.push.ui.listener;
+package com.fangxuele.tool.push.ui.listener;
 
 import cn.hutool.log.Log;
 import cn.hutool.log.LogFactory;
-import com.fangxuele.tool.wechat.push.ui.MainWindow;
+import com.fangxuele.tool.push.ui.MainWindow;
 
 import java.awt.*;
 import java.awt.event.MouseAdapter;

diff --git a/...chat/push/ui/listener/MemberListener.java → ...tool/push/ui/listener/MemberListener.java b/...chat/push/ui/listener/MemberListener.java → ...tool/push/ui/listener/MemberListener.java
@@ -1,16 +1,16 @@
-package com.fangxuele.tool.wechat.push.ui.listener;
+package com.fangxuele.tool.push.ui.listener;
 
 import cn.hutool.core.io.file.FileReader;
 import cn.hutool.log.Log;
 import cn.hutool.log.LogFactory;
 import cn.hutool.poi.excel.ExcelReader;
 import cn.hutool.poi.excel.ExcelUtil;
-import com.fangxuele.tool.wechat.push.logic.PushData;
-import com.fangxuele.tool.wechat.push.logic.PushManage;
-import com.fangxuele.tool.wechat.push.ui.Init;
-import com.fangxuele.tool.wechat.push.ui.MainWindow;
-import com.fangxuele.tool.wechat.push.util.DbUtilMySQL;
-import com.fangxuele.tool.wechat.push.util.SystemUtil;
+import com.fangxuele.tool.push.util.DbUtilMySQL;
+import com.fangxuele.tool.push.logic.PushData;
+import com.fangxuele.tool.push.logic.PushManage;
+import com.fangxuele.tool.push.ui.Init;
+import com.fangxuele.tool.push.ui.MainWindow;
+import com.fangxuele.tool.push.util.SystemUtil;
 import com.opencsv.CSVReader;
 import me.chanjar.weixin.common.error.WxErrorException;
 import me.chanjar.weixin.mp.api.WxMpService;

diff --git a/.../wechat/push/ui/listener/MsgListener.java → ...le/tool/push/ui/listener/MsgListener.java b/.../wechat/push/ui/listener/MsgListener.java → ...le/tool/push/ui/listener/MsgListener.java
@@ -1,11 +1,11 @@
-package com.fangxuele.tool.wechat.push.ui.listener;
+package com.fangxuele.tool.push.ui.listener;
 
 import cn.hutool.log.Log;
 import cn.hutool.log.LogFactory;
-import com.fangxuele.tool.wechat.push.logic.MsgHisManage;
-import com.fangxuele.tool.wechat.push.logic.PushManage;
-import com.fangxuele.tool.wechat.push.ui.Init;
-import com.fangxuele.tool.wechat.push.ui.MainWindow;
+import com.fangxuele.tool.push.ui.Init;
+import com.fangxuele.tool.push.logic.MsgHisManage;
+import com.fangxuele.tool.push.logic.PushManage;
+import com.fangxuele.tool.push.ui.MainWindow;
 import org.apache.commons.lang3.StringUtils;
 
 import javax.swing.*;

diff --git a/...hat/push/ui/listener/PushHisListener.java → ...ool/push/ui/listener/PushHisListener.java b/...hat/push/ui/listener/PushHisListener.java → ...ool/push/ui/listener/PushHisListener.java
@@ -1,12 +1,12 @@
-package com.fangxuele.tool.wechat.push.ui.listener;
+package com.fangxuele.tool.push.ui.listener;
 
 import cn.hutool.core.io.FileUtil;
 import cn.hutool.core.util.ClipboardUtil;
 import cn.hutool.log.Log;
 import cn.hutool.log.LogFactory;
-import com.fangxuele.tool.wechat.push.ui.Init;
-import com.fangxuele.tool.wechat.push.ui.MainWindow;
-import com.fangxuele.tool.wechat.push.util.SystemUtil;
+import com.fangxuele.tool.push.ui.Init;
+import com.fangxuele.tool.push.ui.MainWindow;
+import com.fangxuele.tool.push.util.SystemUtil;
 import org.apache.commons.lang3.StringUtils;
 
 import javax.swing.*;