-
+
diff --git a/src/main/java/com/fangxuele/tool/push/ui/form/SettingForm.java b/src/main/java/com/fangxuele/tool/push/ui/form/SettingForm.java
index 95a423d6c..5a5d0aaf9 100644
--- a/src/main/java/com/fangxuele/tool/push/ui/form/SettingForm.java
+++ b/src/main/java/com/fangxuele/tool/push/ui/form/SettingForm.java
@@ -130,6 +130,7 @@ public class SettingForm {
private JTextField maxThreadsTextField;
private JButton maxThreadsSaveButton;
private JCheckBox defaultMaxWindowCheckBox;
+ private JCheckBox closeToTrayCheckBox;
private static SettingForm settingForm;
private static TWxAccountMapper wxAccountMapper = MybatisUtil.getSqlSession().getMapper(TWxAccountMapper.class);
@@ -157,6 +158,7 @@ public static void init() {
// 常规
settingForm.getAutoCheckUpdateCheckBox().setSelected(App.config.isAutoCheckUpdate());
settingForm.getUseTrayCheckBox().setSelected(App.config.isUseTray());
+ settingForm.getCloseToTrayCheckBox().setSelected(App.config.isCloseToTray());
settingForm.getDefaultMaxWindowCheckBox().setSelected(App.config.isDefaultMaxWindow());
settingForm.getMaxThreadsTextField().setText(String.valueOf(App.config.getMaxThreads()));
@@ -391,7 +393,7 @@ public static void toggleMpOutSideAccessTokenPanel() {
panel3.setLayout(new GridLayoutManager(17, 1, new Insets(40, 60, 0, 330), -1, -1));
panel2.add(panel3, new GridConstraints(0, 0, 1, 1, GridConstraints.ANCHOR_CENTER, GridConstraints.FILL_BOTH, GridConstraints.SIZEPOLICY_CAN_SHRINK | GridConstraints.SIZEPOLICY_CAN_GROW, GridConstraints.SIZEPOLICY_CAN_SHRINK | GridConstraints.SIZEPOLICY_CAN_GROW, null, new Dimension(600, -1), null, 0, false));
final JPanel panel4 = new JPanel();
- panel4.setLayout(new GridLayoutManager(4, 1, new Insets(15, 15, 10, 0), -1, -1));
+ panel4.setLayout(new GridLayoutManager(5, 1, new Insets(15, 15, 10, 0), -1, -1));
panel3.add(panel4, new GridConstraints(0, 0, 1, 1, GridConstraints.ANCHOR_CENTER, GridConstraints.FILL_BOTH, GridConstraints.SIZEPOLICY_CAN_SHRINK | GridConstraints.SIZEPOLICY_CAN_GROW, GridConstraints.SIZEPOLICY_CAN_SHRINK | GridConstraints.SIZEPOLICY_CAN_GROW, null, null, null, 0, false));
panel4.setBorder(BorderFactory.createTitledBorder(BorderFactory.createEmptyBorder(), "常规", TitledBorder.DEFAULT_JUSTIFICATION, TitledBorder.DEFAULT_POSITION, this.$$$getFont$$$(null, Font.BOLD, -1, panel4.getFont()), null));
autoCheckUpdateCheckBox = new JCheckBox();
@@ -400,12 +402,15 @@ public static void toggleMpOutSideAccessTokenPanel() {
useTrayCheckBox = new JCheckBox();
useTrayCheckBox.setText("显示系统托盘图标");
panel4.add(useTrayCheckBox, new GridConstraints(1, 0, 1, 1, GridConstraints.ANCHOR_WEST, GridConstraints.FILL_NONE, GridConstraints.SIZEPOLICY_CAN_SHRINK | GridConstraints.SIZEPOLICY_CAN_GROW, GridConstraints.SIZEPOLICY_FIXED, null, null, null, 0, false));
+ closeToTrayCheckBox = new JCheckBox();
+ closeToTrayCheckBox.setText("关闭窗口时最小化到系统托盘");
+ panel4.add(closeToTrayCheckBox, new GridConstraints(2, 0, 1, 1, GridConstraints.ANCHOR_WEST, GridConstraints.FILL_NONE, GridConstraints.SIZEPOLICY_CAN_SHRINK | GridConstraints.SIZEPOLICY_CAN_GROW, GridConstraints.SIZEPOLICY_FIXED, null, null, null, 0, false));
defaultMaxWindowCheckBox = new JCheckBox();
defaultMaxWindowCheckBox.setText("默认最大化窗口");
- panel4.add(defaultMaxWindowCheckBox, new GridConstraints(2, 0, 1, 1, GridConstraints.ANCHOR_WEST, GridConstraints.FILL_NONE, GridConstraints.SIZEPOLICY_CAN_SHRINK | GridConstraints.SIZEPOLICY_CAN_GROW, GridConstraints.SIZEPOLICY_FIXED, null, null, null, 0, false));
+ panel4.add(defaultMaxWindowCheckBox, new GridConstraints(3, 0, 1, 1, GridConstraints.ANCHOR_WEST, GridConstraints.FILL_NONE, GridConstraints.SIZEPOLICY_CAN_SHRINK | GridConstraints.SIZEPOLICY_CAN_GROW, GridConstraints.SIZEPOLICY_FIXED, null, null, null, 0, false));
final JPanel panel5 = new JPanel();
panel5.setLayout(new GridLayoutManager(1, 4, new Insets(0, 0, 0, 0), -1, -1));
- panel4.add(panel5, new GridConstraints(3, 0, 1, 1, GridConstraints.ANCHOR_CENTER, GridConstraints.FILL_BOTH, GridConstraints.SIZEPOLICY_CAN_SHRINK | GridConstraints.SIZEPOLICY_CAN_GROW, GridConstraints.SIZEPOLICY_CAN_SHRINK | GridConstraints.SIZEPOLICY_CAN_GROW, null, null, null, 0, false));
+ panel4.add(panel5, new GridConstraints(4, 0, 1, 1, GridConstraints.ANCHOR_CENTER, GridConstraints.FILL_BOTH, GridConstraints.SIZEPOLICY_CAN_SHRINK | GridConstraints.SIZEPOLICY_CAN_GROW, GridConstraints.SIZEPOLICY_CAN_SHRINK | GridConstraints.SIZEPOLICY_CAN_GROW, null, null, null, 0, false));
final JLabel label1 = new JLabel();
label1.setText("最大线程数");
panel5.add(label1, new GridConstraints(0, 0, 1, 1, GridConstraints.ANCHOR_WEST, GridConstraints.FILL_NONE, GridConstraints.SIZEPOLICY_FIXED, GridConstraints.SIZEPOLICY_FIXED, null, null, null, 0, false));
diff --git a/src/main/java/com/fangxuele/tool/push/ui/form/msg/MpSubscribeMsgForm.form b/src/main/java/com/fangxuele/tool/push/ui/form/msg/MpSubscribeMsgForm.form
new file mode 100644
index 000000000..7a885ead0
--- /dev/null
+++ b/src/main/java/com/fangxuele/tool/push/ui/form/msg/MpSubscribeMsgForm.form
@@ -0,0 +1,235 @@
+
+
diff --git a/src/main/java/com/fangxuele/tool/push/ui/form/msg/MpSubscribeMsgForm.java b/src/main/java/com/fangxuele/tool/push/ui/form/msg/MpSubscribeMsgForm.java
new file mode 100644
index 000000000..e62f2f699
--- /dev/null
+++ b/src/main/java/com/fangxuele/tool/push/ui/form/msg/MpSubscribeMsgForm.java
@@ -0,0 +1,578 @@
+package com.fangxuele.tool.push.ui.form.msg;
+
+import com.fangxuele.tool.push.App;
+import com.fangxuele.tool.push.dao.TMsgMpSubscribeMapper;
+import com.fangxuele.tool.push.dao.TTemplateDataMapper;
+import com.fangxuele.tool.push.domain.TMsgMpSubscribe;
+import com.fangxuele.tool.push.domain.TTemplateData;
+import com.fangxuele.tool.push.logic.MessageTypeEnum;
+import com.fangxuele.tool.push.logic.msgsender.WxMpTemplateMsgSender;
+import com.fangxuele.tool.push.ui.component.TableInCellButtonColumn;
+import com.fangxuele.tool.push.ui.form.MainWindow;
+import com.fangxuele.tool.push.ui.form.MessageEditForm;
+import com.fangxuele.tool.push.util.MybatisUtil;
+import com.fangxuele.tool.push.util.SqliteUtil;
+import com.fangxuele.tool.push.util.UIUtil;
+import com.google.common.collect.Maps;
+import com.intellij.uiDesigner.core.GridConstraints;
+import com.intellij.uiDesigner.core.GridLayoutManager;
+import lombok.Getter;
+import lombok.extern.slf4j.Slf4j;
+import me.chanjar.weixin.common.bean.subscribemsg.TemplateInfo;
+import org.apache.commons.compress.utils.Lists;
+import org.apache.commons.lang3.StringUtils;
+
+import javax.swing.*;
+import javax.swing.border.TitledBorder;
+import javax.swing.plaf.FontUIResource;
+import javax.swing.table.DefaultTableCellRenderer;
+import javax.swing.table.DefaultTableModel;
+import javax.swing.table.TableColumnModel;
+import javax.swing.text.StyleContext;
+import java.awt.*;
+import java.awt.event.ItemEvent;
+import java.util.List;
+import java.util.*;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+
+/**
+ *
+ * MpSubscribeMsgForm
+ *
+ *
+ * @author Zhou Bo
+ * @since 2021/3/23.
+ */
+@Getter
+@Slf4j
+public class MpSubscribeMsgForm implements IMsgForm {
+ private JPanel templateMsgPanel;
+ private JLabel templateIdLabel;
+ private JTextField msgTemplateIdTextField;
+ private JLabel templateUrlLabel;
+ private JTextField msgTemplateUrlTextField;
+ private JPanel templateMsgDataPanel;
+ private JLabel templateMiniProgramAppidLabel;
+ private JTextField msgTemplateMiniAppidTextField;
+ private JLabel templateMiniProgramPagePathLabel;
+ private JTextField msgTemplateMiniPagePathTextField;
+ private JLabel templateMsgNameLabel;
+ private JTextField templateDataNameTextField;
+ private JLabel templateMsgValueLabel;
+ private JTextField templateDataValueTextField;
+ private JLabel templateMsgColorLabel;
+ private JTextField templateDataColorTextField;
+ private JButton templateMsgDataAddButton;
+ private JTable templateMsgDataTable;
+ private JComboBox templateListComboBox;
+ private JButton refreshTemplateListButton;
+ private JButton autoFillButton;
+ private JTextArea templateContentTextArea;
+
+ private static MpSubscribeMsgForm mpSubscribeMsgForm;
+
+ private static TMsgMpSubscribeMapper tMsgMpSubscribeMapper = MybatisUtil.getSqlSession().getMapper(TMsgMpSubscribeMapper.class);
+
+ private static TTemplateDataMapper templateDataMapper = MybatisUtil.getSqlSession().getMapper(TTemplateDataMapper.class);
+
+ /**
+ * 账号模板列表
+ */
+ public static List templateList;
+
+ /**
+ * 模板账号map，key:templateId
+ */
+ public static Map templateMap;
+
+ /**
+ * （左侧列表中）所选消息对应的模板ID
+ */
+ public static String selectedMsgTemplateId;
+
+ /**
+ * 是否需要监听模板列表ComboBox
+ */
+ public static boolean needListenTemplateListComboBox = false;
+
+ private static final Pattern BRACE_PATTERN = Pattern.compile("\\{([^{}]+)\\}");
+
+ public MpSubscribeMsgForm() {
+ // 模板数据-添加 按钮事件
+ templateMsgDataAddButton.addActionListener(e -> {
+ String[] data = new String[3];
+ data[0] = getInstance().getTemplateDataNameTextField().getText();
+ data[1] = getInstance().getTemplateDataValueTextField().getText();
+ data[2] = getInstance().getTemplateDataColorTextField().getText();
+
+ if (getInstance().getTemplateMsgDataTable().getModel().getRowCount() == 0) {
+ initTemplateDataTable();
+ }
+
+ DefaultTableModel tableModel = (DefaultTableModel) getInstance().getTemplateMsgDataTable()
+ .getModel();
+ int rowCount = tableModel.getRowCount();
+
+ Set keySet = new HashSet<>();
+ String keyData;
+ for (int i = 0; i < rowCount; i++) {
+ keyData = (String) tableModel.getValueAt(i, 0);
+ keySet.add(keyData);
+ }
+
+ if (StringUtils.isEmpty(data[0]) || StringUtils.isEmpty(data[1])) {
+ JOptionPane.showMessageDialog(MessageEditForm.getInstance().getMsgEditorPanel(), "Name或value不能为空！", "提示",
+ JOptionPane.INFORMATION_MESSAGE);
+ } else if (keySet.contains(data[0])) {
+ JOptionPane.showMessageDialog(MessageEditForm.getInstance().getMsgEditorPanel(), "Name不能重复！", "提示",
+ JOptionPane.INFORMATION_MESSAGE);
+ } else {
+ if (StringUtils.isEmpty(data[2])) {
+ data[2] = "#000000";
+ } else if (!data[2].startsWith("#")) {
+ data[2] = "#" + data[2];
+ }
+ tableModel.addRow(data);
+ }
+ });
+ templateListComboBox.addItemListener(e -> {
+ if (needListenTemplateListComboBox && e.getStateChange() == ItemEvent.SELECTED) {
+ clearAllFieldExceptTemplateListAndContent();
+ fillWxTemplateContentToField();
+ }
+ });
+ autoFillButton.addActionListener(e -> autoFillTemplateDataTable());
+ refreshTemplateListButton.addActionListener(e -> {
+ initTemplateList();
+ initTemplateDataTable();
+ });
+ }
+
+ @Override
+ public void init(String msgName) {
+ MpSubscribeMsgForm mpTemplateMsgForm = getInstance();
+ if (UIUtil.isDarkLaf()) {
+ Color bgColor = new Color(43, 43, 43);
+ mpTemplateMsgForm.getTemplateContentTextArea().setBackground(bgColor);
+ Color foreColor = new Color(187, 187, 187);
+ mpTemplateMsgForm.getTemplateContentTextArea().setForeground(foreColor);
+ }
+
+ clearAllField();
+
+ Integer msgId = 0;
+ List tMsgMpSubscribeList = tMsgMpSubscribeMapper.selectByMsgTypeAndMsgName(MessageTypeEnum.MP_SUBSCRIBE_CODE, msgName);
+ if (tMsgMpSubscribeList.size() > 0) {
+ TMsgMpSubscribe tMsgMpSubscribe = tMsgMpSubscribeList.get(0);
+ msgId = tMsgMpSubscribe.getId();
+ selectedMsgTemplateId = tMsgMpSubscribe.getTemplateId();
+ initTemplateList();
+
+ mpTemplateMsgForm.getMsgTemplateIdTextField().setText(tMsgMpSubscribe.getTemplateId());
+ mpTemplateMsgForm.getMsgTemplateUrlTextField().setText(tMsgMpSubscribe.getUrl());
+ mpTemplateMsgForm.getMsgTemplateMiniAppidTextField().setText(tMsgMpSubscribe.getMaAppid());
+ mpTemplateMsgForm.getMsgTemplateMiniPagePathTextField().setText(tMsgMpSubscribe.getMaPagePath());
+
+ MessageEditForm messageEditForm = MessageEditForm.getInstance();
+ messageEditForm.getMsgNameField().setText(tMsgMpSubscribe.getMsgName());
+ messageEditForm.getPreviewUserField().setText(tMsgMpSubscribe.getPreviewUser());
+ } else {
+ initTemplateList();
+ }
+
+ initTemplateDataTable();
+ fillTemplateDataTable(msgId);
+ }
+
+ @Override
+ public void save(String msgName) {
+ int msgId = 0;
+ boolean existSameMsg = false;
+
+ List tMsgMpSubscribeList = tMsgMpSubscribeMapper.selectByMsgTypeAndMsgName(MessageTypeEnum.MP_SUBSCRIBE_CODE, msgName);
+ if (tMsgMpSubscribeList.size() > 0) {
+ existSameMsg = true;
+ msgId = tMsgMpSubscribeList.get(0).getId();
+ }
+
+ int isCover = JOptionPane.NO_OPTION;
+ if (existSameMsg) {
+ // 如果存在，是否覆盖
+ isCover = JOptionPane.showConfirmDialog(MainWindow.getInstance().getMessagePanel(), "已经存在同名的历史消息，\n是否覆盖？", "确认",
+ JOptionPane.YES_NO_OPTION);
+ }
+
+ if (!existSameMsg || isCover == JOptionPane.YES_OPTION) {
+ String templateId = getInstance().getMsgTemplateIdTextField().getText();
+ String templateUrl = getInstance().getMsgTemplateUrlTextField().getText();
+ String templateMiniAppid = getInstance().getMsgTemplateMiniAppidTextField().getText();
+ String templateMiniPagePath = getInstance().getMsgTemplateMiniPagePathTextField().getText();
+
+ String now = SqliteUtil.nowDateForSqlite();
+
+ TMsgMpSubscribe tMsgMpSubscribe = new TMsgMpSubscribe();
+ tMsgMpSubscribe.setMsgType(MessageTypeEnum.MP_SUBSCRIBE_CODE);
+ tMsgMpSubscribe.setMsgName(msgName);
+ tMsgMpSubscribe.setTemplateId(templateId);
+ tMsgMpSubscribe.setUrl(templateUrl);
+ tMsgMpSubscribe.setMaAppid(templateMiniAppid);
+ tMsgMpSubscribe.setMaPagePath(templateMiniPagePath);
+ tMsgMpSubscribe.setCreateTime(now);
+ tMsgMpSubscribe.setModifiedTime(now);
+
+ MessageEditForm messageEditForm = MessageEditForm.getInstance();
+ tMsgMpSubscribe.setPreviewUser(messageEditForm.getPreviewUserField().getText());
+ tMsgMpSubscribe.setWxAccountId(App.config.getWxAccountId());
+
+ if (existSameMsg) {
+ tMsgMpSubscribeMapper.updateByMsgTypeAndMsgName(tMsgMpSubscribe);
+ } else {
+ tMsgMpSubscribeMapper.insertSelective(tMsgMpSubscribe);
+ msgId = tMsgMpSubscribe.getId();
+ }
+
+ // 保存模板数据
+
+ // 如果是覆盖保存，则先清空之前的模板数据
+ if (existSameMsg) {
+ templateDataMapper.deleteByMsgTypeAndMsgId(MessageTypeEnum.MP_SUBSCRIBE_CODE, msgId);
+ }
+
+ // 如果table为空，则初始化
+ if (getInstance().getTemplateMsgDataTable().getModel().getRowCount() == 0) {
+ initTemplateDataTable();
+ }
+
+ // 逐行读取
+ DefaultTableModel tableModel = (DefaultTableModel) getInstance().getTemplateMsgDataTable()
+ .getModel();
+ int rowCount = tableModel.getRowCount();
+ for (int i = 0; i < rowCount; i++) {
+ String name = (String) tableModel.getValueAt(i, 0);
+ String value = (String) tableModel.getValueAt(i, 1);
+ String color = ((String) tableModel.getValueAt(i, 2)).trim();
+
+ TTemplateData tTemplateData = new TTemplateData();
+ tTemplateData.setMsgType(MessageTypeEnum.MP_SUBSCRIBE_CODE);
+ tTemplateData.setMsgId(msgId);
+ tTemplateData.setName(name);
+ tTemplateData.setValue(value);
+ tTemplateData.setColor(color);
+ tTemplateData.setCreateTime(now);
+ tTemplateData.setModifiedTime(now);
+
+ templateDataMapper.insert(tTemplateData);
+ }
+
+ JOptionPane.showMessageDialog(MainWindow.getInstance().getMessagePanel(), "保存成功！", "成功",
+ JOptionPane.INFORMATION_MESSAGE);
+ }
+ }
+
+ public static MpSubscribeMsgForm getInstance() {
+ if (mpSubscribeMsgForm == null) {
+ mpSubscribeMsgForm = new MpSubscribeMsgForm();
+ }
+ return mpSubscribeMsgForm;
+ }
+
+ /**
+ * 填充模板参数表Table(从数据库读取)
+ *
+ * @param msgId
+ */
+ public static void fillTemplateDataTable(Integer msgId) {
+ // 模板消息Data表
+ List templateDataList = templateDataMapper.selectByMsgTypeAndMsgId(MessageTypeEnum.MP_SUBSCRIBE_CODE, msgId);
+ String[] headerNames = {"Name", "Value", "Color", "操作"};
+ Object[][] cellData = new String[templateDataList.size()][headerNames.length];
+ for (int i = 0; i < templateDataList.size(); i++) {
+ TTemplateData tTemplateData = templateDataList.get(i);
+ cellData[i][0] = tTemplateData.getName();
+ cellData[i][1] = tTemplateData.getValue();
+ cellData[i][2] = tTemplateData.getColor();
+ }
+ DefaultTableModel model = new DefaultTableModel(cellData, headerNames);
+ getInstance().getTemplateMsgDataTable().setModel(model);
+ TableColumnModel tableColumnModel = getInstance().getTemplateMsgDataTable().getColumnModel();
+ tableColumnModel.getColumn(headerNames.length - 1).
+ setCellRenderer(new TableInCellButtonColumn(getInstance().getTemplateMsgDataTable(), headerNames.length - 1));
+ tableColumnModel.getColumn(headerNames.length - 1).
+ setCellEditor(new TableInCellButtonColumn(getInstance().getTemplateMsgDataTable(), headerNames.length - 1));
+
+ // 设置列宽
+ tableColumnModel.getColumn(3).setPreferredWidth(getInstance().getTemplateMsgDataAddButton().getWidth());
+ tableColumnModel.getColumn(3).setMaxWidth(getInstance().getTemplateMsgDataAddButton().getWidth());
+ }
+
+ /**
+ * 初始化模板列表ComboBox
+ */
+ public static void initTemplateList() {
+ needListenTemplateListComboBox = false;
+ try {
+ templateMap = Maps.newHashMap();
+ templateList = WxMpTemplateMsgSender.getWxMpService().getSubscribeMsgService().getTemplateList();
+ getInstance().getTemplateListComboBox().removeAllItems();
+ int selectedIndex = 0;
+ for (int i = 0; i < templateList.size(); i++) {
+ TemplateInfo templateInfo = templateList.get(i);
+ getInstance().getTemplateListComboBox().addItem(templateInfo.getTitle());
+ templateMap.put(templateInfo.getPriTmplId(), templateInfo);
+ if (templateInfo.getPriTmplId().equals(selectedMsgTemplateId)) {
+ selectedIndex = i;
+ }
+ }
+
+ if (getInstance().getTemplateListComboBox().getItemCount() > 0) {
+ getInstance().getTemplateListComboBox().setSelectedIndex(selectedIndex);
+ fillWxTemplateContentToField();
+ }
+
+ } catch (Exception e) {
+ log.error(e.toString());
+ }
+ needListenTemplateListComboBox = true;
+ }
+
+ /**
+ * 根据模板内容获取模板中的参数list
+ *
+ * @param templateContent 模板内容
+ * @return params 模板中的参数
+ */
+ public static List getTemplateParams(String templateContent) {
+ List params = Lists.newArrayList();
+ Matcher matcher = BRACE_PATTERN.matcher(templateContent);
+ while (matcher.find()) {
+ params.add(matcher.group(1).replace(".DATA", ""));
+ }
+ return params;
+ }
+
+ /**
+ * 根据模板id填充模板列表中对应的WxTemplate内容到表单
+ */
+ public static void fillWxTemplateContentToField() {
+ TemplateInfo templateInfo = templateList.get(getInstance().getTemplateListComboBox().getSelectedIndex());
+ if (templateInfo != null) {
+ StringBuilder stringBuilder = new StringBuilder();
+ stringBuilder.append("-----------模板ID-----------\n").append(templateInfo.getPriTmplId()).append("\n");
+ stringBuilder.append("\n----------模板标题----------\n").append(templateInfo.getTitle()).append("\n");
+ int type = templateInfo.getType();
+ String templateType = "未知";
+ if (type == 2) {
+ templateType = "一次性订阅";
+ } else if (type == 3) {
+ templateType = "长期订阅";
+ }
+ stringBuilder.append("\n----------模板类型----------\n").append(templateType).append("\n");
+ stringBuilder.append("\n----------模板内容----------\n").append(templateInfo.getContent()).append("\n");
+ stringBuilder.append("\n----------模板示例----------\n").append(templateInfo.getExample());
+ getInstance().getTemplateContentTextArea().setText(stringBuilder.toString());
+ getInstance().getMsgTemplateIdTextField().setText(templateInfo.getPriTmplId());
+ }
+ }
+
+ /**
+ * 自动填充模板数据Table
+ */
+ private static void autoFillTemplateDataTable() {
+ if (templateList != null) {
+ TemplateInfo templateInfo = templateList.get(getInstance().getTemplateListComboBox().getSelectedIndex());
+ if (templateInfo != null) {
+ initTemplateDataTable();
+ DefaultTableModel tableModel = (DefaultTableModel) getInstance().getTemplateMsgDataTable()
+ .getModel();
+ List params = getTemplateParams(templateInfo.getContent());
+ for (int i = 0; i < params.size(); i++) {
+ String param = params.get(i);
+ String[] data = new String[3];
+ data[0] = param;
+ data[1] = "示例值" + (i + 1);
+ data[2] = "#000000";
+ tableModel.addRow(data);
+ }
+ }
+ }
+ }
+
+ /**
+ * 初始化模板消息数据table
+ */
+ public static void initTemplateDataTable() {
+ JTable msgDataTable = getInstance().getTemplateMsgDataTable();
+ String[] headerNames = {"Name", "Value", "Color", "操作"};
+ DefaultTableModel model = new DefaultTableModel(null, headerNames);
+ msgDataTable.setModel(model);
+ msgDataTable.updateUI();
+ DefaultTableCellRenderer hr = (DefaultTableCellRenderer) msgDataTable.getTableHeader().getDefaultRenderer();
+ // 表头列名居左
+ hr.setHorizontalAlignment(DefaultTableCellRenderer.LEFT);
+
+ TableColumnModel tableColumnModel = msgDataTable.getColumnModel();
+ tableColumnModel.getColumn(headerNames.length - 1).
+ setCellRenderer(new TableInCellButtonColumn(msgDataTable, headerNames.length - 1));
+ tableColumnModel.getColumn(headerNames.length - 1).
+ setCellEditor(new TableInCellButtonColumn(msgDataTable, headerNames.length - 1));
+
+ // 设置列宽
+ tableColumnModel.getColumn(3).setPreferredWidth(getInstance().getTemplateMsgDataAddButton().getWidth());
+ tableColumnModel.getColumn(3).setMaxWidth(getInstance().getTemplateMsgDataAddButton().getWidth());
+ }
+
+ /**
+ * 清空所有界面字段
+ */
+ public static void clearAllField() {
+ clearAllFieldExceptTemplateListAndContent();
+ getInstance().getTemplateListComboBox().removeAllItems();
+ getInstance().getTemplateContentTextArea().setText("");
+ }
+
+ /**
+ * 清空所有界面字段
+ */
+ public static void clearAllFieldExceptTemplateListAndContent() {
+ getInstance().getMsgTemplateIdTextField().setText("");
+ getInstance().getMsgTemplateUrlTextField().setText("");
+ getInstance().getMsgTemplateMiniAppidTextField().setText("");
+ getInstance().getMsgTemplateMiniPagePathTextField().setText("");
+ getInstance().getTemplateDataNameTextField().setText("");
+ getInstance().getTemplateDataValueTextField().setText("");
+ getInstance().getTemplateDataColorTextField().setText("");
+ selectedMsgTemplateId = null;
+ initTemplateDataTable();
+ }
+
+ {
+// GUI initializer generated by IntelliJ IDEA GUI Designer
+// >>> IMPORTANT!! <<<
+// DO NOT EDIT OR ADD ANY CODE HERE!
+ $$$setupUI$$$();
+ }
+
+ /**
+ * Method generated by IntelliJ IDEA GUI Designer
+ * >>> IMPORTANT!! <<<
+ * DO NOT edit this method OR call it in your code!
+ *
+ * @noinspection ALL
+ */
+ private void $$$setupUI$$$() {
+ final JPanel panel1 = new JPanel();
+ panel1.setLayout(new GridLayoutManager(1, 1, new Insets(0, 0, 0, 0), -1, -1));
+ templateMsgPanel = new JPanel();
+ templateMsgPanel.setLayout(new GridLayoutManager(2, 1, new Insets(10, 15, 0, 0), -1, -1));
+ panel1.add(templateMsgPanel, new GridConstraints(0, 0, 1, 1, GridConstraints.ANCHOR_CENTER, GridConstraints.FILL_BOTH, GridConstraints.SIZEPOLICY_CAN_SHRINK | GridConstraints.SIZEPOLICY_WANT_GROW, GridConstraints.SIZEPOLICY_CAN_SHRINK | GridConstraints.SIZEPOLICY_WANT_GROW, null, null, null, 0, false));
+ templateMsgPanel.setBorder(BorderFactory.createTitledBorder(BorderFactory.createEmptyBorder(), "公众号-订阅通知编辑", TitledBorder.DEFAULT_JUSTIFICATION, TitledBorder.DEFAULT_POSITION, this.$$$getFont$$$(null, Font.BOLD, -1, templateMsgPanel.getFont()), null));
+ templateMsgDataPanel = new JPanel();
+ templateMsgDataPanel.setLayout(new GridLayoutManager(3, 4, new Insets(10, 0, 0, 0), -1, -1));
+ templateMsgPanel.add(templateMsgDataPanel, new GridConstraints(1, 0, 1, 1, GridConstraints.ANCHOR_CENTER, GridConstraints.FILL_BOTH, GridConstraints.SIZEPOLICY_CAN_SHRINK | GridConstraints.SIZEPOLICY_CAN_GROW, GridConstraints.SIZEPOLICY_CAN_SHRINK | GridConstraints.SIZEPOLICY_WANT_GROW, null, null, null, 0, false));
+ templateMsgDataPanel.setBorder(BorderFactory.createTitledBorder(BorderFactory.createEtchedBorder(), "模板变量（可使用\"${ENTER}\"作为换行符）", TitledBorder.DEFAULT_JUSTIFICATION, TitledBorder.DEFAULT_POSITION, this.$$$getFont$$$(null, Font.BOLD, -1, templateMsgDataPanel.getFont()), null));
+ templateDataNameTextField = new JTextField();
+ templateDataNameTextField.setToolTipText("当消息类型是模板消息时的示例：first或者keyword1或者remark之类的");
+ templateMsgDataPanel.add(templateDataNameTextField, new GridConstraints(1, 0, 1, 1, GridConstraints.ANCHOR_WEST, GridConstraints.FILL_HORIZONTAL, GridConstraints.SIZEPOLICY_CAN_SHRINK | GridConstraints.SIZEPOLICY_WANT_GROW, GridConstraints.SIZEPOLICY_FIXED, null, null, null, 0, false));
+ templateDataValueTextField = new JTextField();
+ templateMsgDataPanel.add(templateDataValueTextField, new GridConstraints(1, 1, 1, 1, GridConstraints.ANCHOR_WEST, GridConstraints.FILL_HORIZONTAL, GridConstraints.SIZEPOLICY_CAN_SHRINK | GridConstraints.SIZEPOLICY_WANT_GROW, GridConstraints.SIZEPOLICY_FIXED, null, null, null, 0, false));
+ templateDataColorTextField = new JTextField();
+ templateDataColorTextField.setToolTipText("示例值：FF0000");
+ templateMsgDataPanel.add(templateDataColorTextField, new GridConstraints(1, 2, 1, 1, GridConstraints.ANCHOR_WEST, GridConstraints.FILL_HORIZONTAL, GridConstraints.SIZEPOLICY_CAN_SHRINK | GridConstraints.SIZEPOLICY_WANT_GROW, GridConstraints.SIZEPOLICY_FIXED, null, null, null, 0, false));
+ templateMsgDataAddButton = new JButton();
+ templateMsgDataAddButton.setIcon(new ImageIcon(getClass().getResource("/icon/add.png")));
+ templateMsgDataAddButton.setText("");
+ templateMsgDataPanel.add(templateMsgDataAddButton, new GridConstraints(1, 3, 1, 1, GridConstraints.ANCHOR_CENTER, GridConstraints.FILL_HORIZONTAL, GridConstraints.SIZEPOLICY_CAN_SHRINK | GridConstraints.SIZEPOLICY_CAN_GROW, GridConstraints.SIZEPOLICY_FIXED, null, null, null, 0, false));
+ templateMsgDataTable = new JTable();
+ templateMsgDataTable.setAutoCreateColumnsFromModel(true);
+ templateMsgDataTable.setAutoCreateRowSorter(true);
+ templateMsgDataTable.setGridColor(new Color(-12236470));
+ templateMsgDataTable.setRowHeight(36);
+ templateMsgDataPanel.add(templateMsgDataTable, new GridConstraints(2, 0, 1, 4, GridConstraints.ANCHOR_CENTER, GridConstraints.FILL_BOTH, GridConstraints.SIZEPOLICY_CAN_SHRINK | GridConstraints.SIZEPOLICY_WANT_GROW, GridConstraints.SIZEPOLICY_CAN_SHRINK | GridConstraints.SIZEPOLICY_WANT_GROW, null, null, null, 0, false));
+ templateMsgNameLabel = new JLabel();
+ templateMsgNameLabel.setText("name");
+ templateMsgNameLabel.setToolTipText("当消息类型是模板消息时的示例：first或者keyword1或者remark之类的");
+ templateMsgDataPanel.add(templateMsgNameLabel, new GridConstraints(0, 0, 1, 1, GridConstraints.ANCHOR_WEST, GridConstraints.FILL_NONE, GridConstraints.SIZEPOLICY_FIXED, GridConstraints.SIZEPOLICY_FIXED, null, null, null, 0, false));
+ templateMsgValueLabel = new JLabel();
+ templateMsgValueLabel.setText("value");
+ templateMsgDataPanel.add(templateMsgValueLabel, new GridConstraints(0, 1, 1, 1, GridConstraints.ANCHOR_WEST, GridConstraints.FILL_NONE, GridConstraints.SIZEPOLICY_FIXED, GridConstraints.SIZEPOLICY_FIXED, null, null, null, 0, false));
+ templateMsgColorLabel = new JLabel();
+ templateMsgColorLabel.setText("color");
+ templateMsgColorLabel.setToolTipText("示例值：FF0000");
+ templateMsgDataPanel.add(templateMsgColorLabel, new GridConstraints(0, 2, 1, 1, GridConstraints.ANCHOR_WEST, GridConstraints.FILL_NONE, GridConstraints.SIZEPOLICY_FIXED, GridConstraints.SIZEPOLICY_FIXED, null, null, null, 0, false));
+ autoFillButton = new JButton();
+ autoFillButton.setText("自动填充");
+ templateMsgDataPanel.add(autoFillButton, new GridConstraints(0, 3, 1, 1, GridConstraints.ANCHOR_CENTER, GridConstraints.FILL_HORIZONTAL, GridConstraints.SIZEPOLICY_CAN_SHRINK | GridConstraints.SIZEPOLICY_CAN_GROW, GridConstraints.SIZEPOLICY_FIXED, null, null, null, 0, false));
+ final JPanel panel2 = new JPanel();
+ panel2.setLayout(new GridLayoutManager(6, 3, new Insets(0, 0, 5, 0), -1, -1));
+ templateMsgPanel.add(panel2, new GridConstraints(0, 0, 1, 1, GridConstraints.ANCHOR_CENTER, GridConstraints.FILL_BOTH, GridConstraints.SIZEPOLICY_CAN_SHRINK | GridConstraints.SIZEPOLICY_CAN_GROW, GridConstraints.SIZEPOLICY_CAN_SHRINK | GridConstraints.SIZEPOLICY_CAN_GROW, null, null, null, 0, false));
+ templateIdLabel = new JLabel();
+ templateIdLabel.setText("模板ID *");
+ panel2.add(templateIdLabel, new GridConstraints(2, 0, 1, 1, GridConstraints.ANCHOR_WEST, GridConstraints.FILL_NONE, GridConstraints.SIZEPOLICY_FIXED, GridConstraints.SIZEPOLICY_FIXED, null, null, null, 0, false));
+ msgTemplateIdTextField = new JTextField();
+ panel2.add(msgTemplateIdTextField, new GridConstraints(2, 1, 1, 2, GridConstraints.ANCHOR_WEST, GridConstraints.FILL_HORIZONTAL, GridConstraints.SIZEPOLICY_CAN_SHRINK | GridConstraints.SIZEPOLICY_WANT_GROW, GridConstraints.SIZEPOLICY_FIXED, null, new Dimension(150, -1), null, 0, false));
+ templateUrlLabel = new JLabel();
+ templateUrlLabel.setText("跳转URL");
+ panel2.add(templateUrlLabel, new GridConstraints(3, 0, 1, 1, GridConstraints.ANCHOR_WEST, GridConstraints.FILL_NONE, GridConstraints.SIZEPOLICY_FIXED, GridConstraints.SIZEPOLICY_FIXED, null, null, null, 0, false));
+ msgTemplateUrlTextField = new JTextField();
+ panel2.add(msgTemplateUrlTextField, new GridConstraints(3, 1, 1, 2, GridConstraints.ANCHOR_WEST, GridConstraints.FILL_HORIZONTAL, GridConstraints.SIZEPOLICY_CAN_SHRINK | GridConstraints.SIZEPOLICY_WANT_GROW, GridConstraints.SIZEPOLICY_FIXED, null, new Dimension(150, -1), null, 0, false));
+ templateMiniProgramAppidLabel = new JLabel();
+ templateMiniProgramAppidLabel.setText("小程序appid");
+ templateMiniProgramAppidLabel.setToolTipText("非必填");
+ panel2.add(templateMiniProgramAppidLabel, new GridConstraints(4, 0, 1, 1, GridConstraints.ANCHOR_WEST, GridConstraints.FILL_NONE, GridConstraints.SIZEPOLICY_FIXED, GridConstraints.SIZEPOLICY_FIXED, null, null, null, 0, false));
+ msgTemplateMiniAppidTextField = new JTextField();
+ msgTemplateMiniAppidTextField.setText("");
+ msgTemplateMiniAppidTextField.setToolTipText("非必填");
+ panel2.add(msgTemplateMiniAppidTextField, new GridConstraints(4, 1, 1, 2, GridConstraints.ANCHOR_WEST, GridConstraints.FILL_HORIZONTAL, GridConstraints.SIZEPOLICY_CAN_SHRINK | GridConstraints.SIZEPOLICY_WANT_GROW, GridConstraints.SIZEPOLICY_FIXED, null, new Dimension(150, -1), null, 0, false));
+ templateMiniProgramPagePathLabel = new JLabel();
+ templateMiniProgramPagePathLabel.setText("小程序页面路径");
+ templateMiniProgramPagePathLabel.setToolTipText("非必填");
+ panel2.add(templateMiniProgramPagePathLabel, new GridConstraints(5, 0, 1, 1, GridConstraints.ANCHOR_WEST, GridConstraints.FILL_NONE, GridConstraints.SIZEPOLICY_FIXED, GridConstraints.SIZEPOLICY_FIXED, null, null, null, 0, false));
+ msgTemplateMiniPagePathTextField = new JTextField();
+ msgTemplateMiniPagePathTextField.setText("");
+ msgTemplateMiniPagePathTextField.setToolTipText("非必填");
+ panel2.add(msgTemplateMiniPagePathTextField, new GridConstraints(5, 1, 1, 2, GridConstraints.ANCHOR_WEST, GridConstraints.FILL_HORIZONTAL, GridConstraints.SIZEPOLICY_CAN_SHRINK | GridConstraints.SIZEPOLICY_WANT_GROW, GridConstraints.SIZEPOLICY_FIXED, null, new Dimension(150, -1), null, 0, false));
+ final JLabel label1 = new JLabel();
+ label1.setText("选择模板");
+ panel2.add(label1, new GridConstraints(0, 0, 1, 1, GridConstraints.ANCHOR_WEST, GridConstraints.FILL_NONE, GridConstraints.SIZEPOLICY_FIXED, GridConstraints.SIZEPOLICY_FIXED, null, null, null, 0, false));
+ templateListComboBox = new JComboBox();
+ panel2.add(templateListComboBox, new GridConstraints(0, 1, 1, 1, GridConstraints.ANCHOR_WEST, GridConstraints.FILL_HORIZONTAL, GridConstraints.SIZEPOLICY_CAN_SHRINK | GridConstraints.SIZEPOLICY_WANT_GROW, GridConstraints.SIZEPOLICY_FIXED, null, null, null, 0, false));
+ refreshTemplateListButton = new JButton();
+ refreshTemplateListButton.setIcon(new ImageIcon(getClass().getResource("/icon/refresh.png")));
+ refreshTemplateListButton.setText("刷新");
+ panel2.add(refreshTemplateListButton, new GridConstraints(0, 2, 1, 1, GridConstraints.ANCHOR_CENTER, GridConstraints.FILL_HORIZONTAL, 1, GridConstraints.SIZEPOLICY_FIXED, null, null, null, 0, false));
+ templateContentTextArea = new JTextArea();
+ templateContentTextArea.setEditable(false);
+ panel2.add(templateContentTextArea, new GridConstraints(1, 0, 1, 3, GridConstraints.ANCHOR_CENTER, GridConstraints.FILL_BOTH, GridConstraints.SIZEPOLICY_CAN_SHRINK | GridConstraints.SIZEPOLICY_WANT_GROW, GridConstraints.SIZEPOLICY_WANT_GROW, null, new Dimension(150, 50), null, 0, false));
+ templateMsgNameLabel.setLabelFor(templateDataNameTextField);
+ templateMsgValueLabel.setLabelFor(templateDataValueTextField);
+ templateMsgColorLabel.setLabelFor(templateDataColorTextField);
+ templateIdLabel.setLabelFor(msgTemplateIdTextField);
+ templateUrlLabel.setLabelFor(msgTemplateUrlTextField);
+ templateMiniProgramAppidLabel.setLabelFor(msgTemplateMiniAppidTextField);
+ templateMiniProgramPagePathLabel.setLabelFor(msgTemplateMiniPagePathTextField);
+ }
+
+ /**
+ * @noinspection ALL
+ */
+ private Font $$$getFont$$$(String fontName, int style, int size, Font currentFont) {
+ if (currentFont == null) return null;
+ String resultName;
+ if (fontName == null) {
+ resultName = currentFont.getName();
+ } else {
+ Font testFont = new Font(fontName, Font.PLAIN, 10);
+ if (testFont.canDisplay('a') && testFont.canDisplay('1')) {
+ resultName = fontName;
+ } else {
+ resultName = currentFont.getName();
+ }
+ }
+ Font font = new Font(resultName, style >= 0 ? style : currentFont.getStyle(), size >= 0 ? size : currentFont.getSize());
+ boolean isMac = System.getProperty("os.name", "").toLowerCase(Locale.ENGLISH).startsWith("mac");
+ Font fontWithFallback = isMac ? new Font(font.getFamily(), font.getStyle(), font.getSize()) : new StyleContext().getFont(font.getFamily(), font.getStyle(), font.getSize());
+ return fontWithFallback instanceof FontUIResource ? fontWithFallback : new FontUIResource(fontWithFallback);
+ }
+
+}
diff --git a/src/main/java/com/fangxuele/tool/push/ui/form/msg/MsgFormFactory.java b/src/main/java/com/fangxuele/tool/push/ui/form/msg/MsgFormFactory.java
index d84ad8e36..80044d76b 100644
--- a/src/main/java/com/fangxuele/tool/push/ui/form/msg/MsgFormFactory.java
+++ b/src/main/java/com/fangxuele/tool/push/ui/form/msg/MsgFormFactory.java
@@ -71,6 +71,9 @@ public static IMsgForm getMsgForm() {
case MessageTypeEnum.BD_YUN_CODE:
iMsgForm = BdYunMsgForm.getInstance();
break;
+ case MessageTypeEnum.MP_SUBSCRIBE_CODE:
+ iMsgForm = MpSubscribeMsgForm.getInstance();
+ break;
case MessageTypeEnum.HTTP_CODE:
default:
iMsgForm = HttpMsgForm.getInstance();
diff --git a/src/main/java/com/fangxuele/tool/push/ui/frame/MainFrame.java b/src/main/java/com/fangxuele/tool/push/ui/frame/MainFrame.java
index 47043fca3..ec9ae5dce 100644
--- a/src/main/java/com/fangxuele/tool/push/ui/frame/MainFrame.java
+++ b/src/main/java/com/fangxuele/tool/push/ui/frame/MainFrame.java
@@ -1,24 +1,9 @@
package com.fangxuele.tool.push.ui.frame;
import cn.hutool.core.thread.ThreadUtil;
-import com.apple.eawt.Application;
import com.fangxuele.tool.push.ui.UiConsts;
-import com.fangxuele.tool.push.ui.listener.AboutListener;
-import com.fangxuele.tool.push.ui.listener.BoostListener;
-import com.fangxuele.tool.push.ui.listener.FrameListener;
-import com.fangxuele.tool.push.ui.listener.HelpListener;
-import com.fangxuele.tool.push.ui.listener.InfinityListener;
-import com.fangxuele.tool.push.ui.listener.MemberListener;
-import com.fangxuele.tool.push.ui.listener.MessageEditListener;
-import com.fangxuele.tool.push.ui.listener.MessageManageListener;
-import com.fangxuele.tool.push.ui.listener.MessageTypeListener;
-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.ui.listener.*;
import com.fangxuele.tool.push.util.ComponentUtil;
-import com.fangxuele.tool.push.util.SystemUtil;
import org.apache.commons.compress.utils.Lists;
import javax.swing.*;
@@ -52,14 +37,14 @@ public void init() {
images.add(UiConsts.IMAGE_LOGO_16);
this.setIconImages(images);
// Mac系统Dock图标
- if (SystemUtil.isMacOs()) {
- Application application = Application.getApplication();
- application.setDockIconImage(UiConsts.IMAGE_LOGO_1024);
- if (!SystemUtil.isMacM1()) {
- application.setEnabledAboutMenu(false);
- application.setEnabledPreferencesMenu(false);
- }
- }
+// if (SystemUtil.isMacOs()) {
+// Application application = Application.getApplication();
+// application.setDockIconImage(UiConsts.IMAGE_LOGO_1024);
+// if (!SystemUtil.isMacM1()) {
+// application.setEnabledAboutMenu(false);
+// application.setEnabledPreferencesMenu(false);
+// }
+// }
ComponentUtil.setPreferSizeAndLocateToCenter(this, 0.8, 0.88);
}
diff --git a/src/main/java/com/fangxuele/tool/push/ui/listener/FrameListener.java b/src/main/java/com/fangxuele/tool/push/ui/listener/FrameListener.java
index 6e203e1dc..b82ffc6a3 100644
--- a/src/main/java/com/fangxuele/tool/push/ui/listener/FrameListener.java
+++ b/src/main/java/com/fangxuele/tool/push/ui/listener/FrameListener.java
@@ -52,9 +52,11 @@ public void windowClosing(WindowEvent e) {
"有推送任务正在进行！\n\n为避免数据丢失，请先停止!\n\n", "Sorry~",
JOptionPane.WARNING_MESSAGE);
} else {
- App.sqlSession.close();
mainFrame.dispose();
- mainFrame.setDefaultCloseOperation(JFrame.EXIT_ON_CLOSE);
+ if (!App.config.isCloseToTray()) {
+ App.sqlSession.close();
+ mainFrame.setDefaultCloseOperation(JFrame.EXIT_ON_CLOSE);
+ }
}
}
diff --git a/src/main/java/com/fangxuele/tool/push/ui/listener/MemberListener.java b/src/main/java/com/fangxuele/tool/push/ui/listener/MemberListener.java
index 8320acce1..c7dc83aa8 100644
--- a/src/main/java/com/fangxuele/tool/push/ui/listener/MemberListener.java
+++ b/src/main/java/com/fangxuele/tool/push/ui/listener/MemberListener.java
@@ -35,11 +35,7 @@
import com.fangxuele.tool.push.ui.form.MemberForm;
import com.fangxuele.tool.push.ui.form.msg.DingMsgForm;
import com.fangxuele.tool.push.ui.form.msg.WxCpMsgForm;
-import com.fangxuele.tool.push.util.ConsoleUtil;
-import com.fangxuele.tool.push.util.FileCharSetUtil;
-import com.fangxuele.tool.push.util.HikariUtil;
-import com.fangxuele.tool.push.util.JTableUtil;
-import com.fangxuele.tool.push.util.MybatisUtil;
+import com.fangxuele.tool.push.util.*;
import com.google.common.collect.Maps;
import com.opencsv.CSVReader;
import com.opencsv.CSVWriter;
@@ -65,21 +61,10 @@
import java.awt.event.KeyAdapter;
import java.awt.event.KeyEvent;
import java.awt.event.KeyListener;
-import java.io.BufferedReader;
-import java.io.DataInputStream;
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.FileWriter;
-import java.io.IOException;
-import java.io.InputStreamReader;
+import java.io.*;
import java.sql.Connection;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.HashSet;
import java.util.List;
-import java.util.Map;
-import java.util.Set;
+import java.util.*;
import java.util.stream.Collectors;
/**
@@ -247,6 +232,33 @@ public void keyReleased(KeyEvent evt) {
}
}));
+ // 公众号-排除选择的标签分组用户按钮事件
+ memberForm.getMemberImportTagExceptButton().addActionListener(e -> ThreadUtil.execute(() -> {
+ try {
+ if (memberForm.getMemberImportTagComboBox().getSelectedItem() != null
+ && StringUtils.isNotEmpty(memberForm.getMemberImportTagComboBox().getSelectedItem().toString())) {
+
+ long selectedTagId = userTagMap.get(memberForm.getMemberImportTagComboBox().getSelectedItem());
+ removeMpUserListByTag(selectedTagId);
+ renderMemberListTable();
+ JOptionPane.showMessageDialog(memberPanel, "导入完成！", "完成",
+ JOptionPane.INFORMATION_MESSAGE);
+ } else {
+ JOptionPane.showMessageDialog(memberPanel, "请先选择需要导入的标签！", "提示",
+ JOptionPane.INFORMATION_MESSAGE);
+ }
+ } catch (WxErrorException e1) {
+ JOptionPane.showMessageDialog(memberPanel, "导入失败！\n\n" + e1.getMessage(), "失败",
+ JOptionPane.ERROR_MESSAGE);
+ logger.error(e1);
+ e1.printStackTrace();
+ } finally {
+ progressBar.setIndeterminate(false);
+ progressBar.setValue(progressBar.getMaximum());
+ progressBar.setVisible(false);
+ }
+ }));
+
// 公众号-清空本地缓存按钮事件
memberForm.getClearDbCacheButton().addActionListener(e -> {
int count = tWxMpUserMapper.deleteAll();
@@ -863,7 +875,6 @@ public static void getMpUserList() throws WxErrorException {
* 按标签拉取公众平台用户列表
*
* @param tagId
- * @param retain 是否取交集
* @throws WxErrorException
*/
public static void getMpUserListByTag(Long tagId) throws WxErrorException {
@@ -989,6 +1000,61 @@ public static void getMpUserListByTag(Long tagId, boolean retain) throws WxError
}
+ /**
+ * 排除所选标签
+ *
+ * @param tagId
+ * @throws WxErrorException
+ */
+ private static void removeMpUserListByTag(long tagId) throws WxErrorException {
+ JProgressBar progressBar = MemberForm.getInstance().getMemberTabImportProgressBar();
+ JLabel memberCountLabel = MemberForm.getInstance().getMemberTabCountLabel();
+
+ progressBar.setVisible(true);
+ progressBar.setIndeterminate(true);
+
+ WxMpService wxMpService = WxMpTemplateMsgSender.getWxMpService();
+ if (wxMpService.getWxMpConfigStorage() == null) {
+ return;
+ }
+
+ WxTagListUser wxTagListUser = wxMpService.getUserTagService().tagListUser(tagId, "");
+
+ ConsoleUtil.consoleWithLog("拉取的OPENID个数：" + wxTagListUser.getCount());
+
+ if (wxTagListUser.getCount() == 0) {
+ return;
+ }
+
+ List openIds = wxTagListUser.getData().getOpenidList();
+
+ tagUserSet = PushData.allUser.stream().map(e -> e[0]).collect(Collectors.toSet());
+ openIds.forEach(tagUserSet::remove);
+
+ while (StringUtils.isNotEmpty(wxTagListUser.getNextOpenid())) {
+ wxTagListUser = wxMpService.getUserTagService().tagListUser(tagId, wxTagListUser.getNextOpenid());
+
+ ConsoleUtil.consoleWithLog("拉取的OPENID个数：" + wxTagListUser.getCount());
+
+ if (wxTagListUser.getCount() == 0) {
+ break;
+ }
+ openIds = wxTagListUser.getData().getOpenidList();
+
+ openIds.forEach(tagUserSet::remove);
+ }
+
+ PushData.allUser = Collections.synchronizedList(new ArrayList<>());
+ for (String openId : tagUserSet) {
+ PushData.allUser.add(new String[]{openId});
+ }
+
+ memberCountLabel.setText(String.valueOf(PushData.allUser.size()));
+ progressBar.setIndeterminate(false);
+ progressBar.setValue(progressBar.getMaximum());
+
+ }
+
/**
* 获取导入数据信息列表
*/
@@ -1005,17 +1071,10 @@ public static void renderMemberListTable() {
int msgType = App.config.getMsgType();
- // 是否是微信平台类消息
- boolean isWeixinTypeMsg = false;
- if (msgType == MessageTypeEnum.MP_TEMPLATE_CODE || msgType == MessageTypeEnum.MA_TEMPLATE_CODE
- || msgType == MessageTypeEnum.KEFU_CODE || msgType == MessageTypeEnum.KEFU_PRIORITY_CODE
- || msgType == MessageTypeEnum.WX_UNIFORM_MESSAGE_CODE || msgType == MessageTypeEnum.MA_SUBSCRIBE_CODE) {
- isWeixinTypeMsg = true;
- }
// 导入列表
List headerNameList = Lists.newArrayList();
headerNameList.add("Data");
- if (isWeixinTypeMsg) {
+ if (MessageTypeEnum.isWxMaOrMpType(msgType)) {
if (memberForm.getImportOptionAvatarCheckBox().isSelected()) {
headerNameList.add("头像");
}
@@ -1034,7 +1093,7 @@ public static void renderMemberListTable() {
headerNameList.toArray(headerNames);
DefaultTableModel model = new DefaultTableModel(null, headerNames);
memberListTable.setModel(model);
- if (isWeixinTypeMsg && memberForm.getImportOptionAvatarCheckBox().isSelected()) {
+ if (MessageTypeEnum.isWxMaOrMpType(msgType) && memberForm.getImportOptionAvatarCheckBox().isSelected()) {
memberListTable.getColumn("头像").setCellRenderer(new TableInCellImageLabelRenderer());
}
@@ -1047,7 +1106,7 @@ public static void renderMemberListTable() {
JTableUtil.hideColumn(memberListTable, 0);
// 设置行高
- if (isWeixinTypeMsg && memberForm.getImportOptionAvatarCheckBox().isSelected()) {
+ if (MessageTypeEnum.isWxMaOrMpType(msgType) && memberForm.getImportOptionAvatarCheckBox().isSelected()) {
memberListTable.setRowHeight(66);
} else {
memberListTable.setRowHeight(36);
@@ -1056,7 +1115,7 @@ public static void renderMemberListTable() {
List