diff --git a/.idea/dataSources.xml b/.idea/dataSources.xml index d156338..35a6b79 100644 --- a/.idea/dataSources.xml +++ b/.idea/dataSources.xml @@ -1,21 +1,20 @@ - + mysql.8 true true com.mysql.cj.jdbc.Driver - jdbc:mysql://192.168.8.88:3306/?characterEncoding=utf-8&useSSL=true&serverTimezone=GMT + jdbc:mysql://192.168.8.88:3306/jd?characterEncoding=utf-8&useSSL=true&serverTimezone=GMT - $ProjectFileDir$ - + redis true jdbc.RedisDriver diff --git a/src/main/java/cn/van/business/util/JDUtils.java b/src/main/java/cn/van/business/util/JDUtils.java index bbd446c..5ed0c38 100644 --- a/src/main/java/cn/van/business/util/JDUtils.java +++ b/src/main/java/cn/van/business/util/JDUtils.java @@ -784,7 +784,7 @@ public class JDUtils { sendOrderToWxByOrderJDAdvanced(order,fromWxid); } if (content.length() > 0) { - wxUtil.sendTextMessage(WXUtil.super_admin_wxid, content.toString(), 1,fromWxid); + wxUtil.sendTextMessage(WXUtil.default_super_admin_wxid, content.toString(), 1,fromWxid); } } @@ -855,13 +855,13 @@ public class JDUtils { for (String s : split) { content.append("https://item.jd.com/").append(s).append(".html").append("\r\n"); } - wxUtil.sendTextMessage(WXUtil.super_admin_wxid, content.toString(), 1, fromWxid); + wxUtil.sendTextMessage(WXUtil.default_super_admin_wxid, content.toString(), 1, fromWxid); content = new StringBuilder(); content.append("手机端").append("\r\n"); for (String s : split) { content.append("https://item.m.jd.com/product/").append(s).append(".html").append("\r\n"); } - wxUtil.sendTextMessage(WXUtil.super_admin_wxid, content.toString(), 1, fromWxid); + wxUtil.sendTextMessage(WXUtil.default_super_admin_wxid, content.toString(), 1, fromWxid); content = new StringBuilder(); @@ -882,7 +882,7 @@ public class JDUtils { } } if (content.length() > 0) { - wxUtil.sendTextMessage(WXUtil.super_admin_wxid, content.toString(), 1, fromWxid); + wxUtil.sendTextMessage(WXUtil.default_super_admin_wxid, content.toString(), 1, fromWxid); } } //public UnionOpenGoodsBigfieldQueryResponse getUnionOpenGoodsBigfieldQueryResponse(){ diff --git a/src/main/java/cn/van/business/util/WXUtil.java b/src/main/java/cn/van/business/util/WXUtil.java index d6e8c35..0e4704b 100644 --- a/src/main/java/cn/van/business/util/WXUtil.java +++ b/src/main/java/cn/van/business/util/WXUtil.java @@ -27,7 +27,7 @@ import java.util.*; public class WXUtil { private static final Logger logger = LoggerFactory.getLogger(WXUtil.class); - public static final String super_admin_wxid = "wxid_ytpc72mdoskt22"; + public static final String default_super_admin_wxid = "wxid_ytpc72mdoskt22"; public static Map super_admins = new HashMap<>(); public static Map jdidToWxidMap = new HashMap<>(); @@ -44,7 +44,7 @@ public class WXUtil { } // 初始化超级管理员 - public void initSuperAdmins() { + public void initSuperAdmins() { SuperAdmin admin1 = new SuperAdmin("wxid_ytpc72mdoskt22", "凡", "2014264913","98e21c89ae5610240ec3f5f575f86a59","3dcb6b23a1104639ac433fd07adb6dfb"); super_admins.put(admin1.getWxid(), admin1); jdidToWxidMap.put(admin1.getUnionId(), admin1.getWxid()); @@ -100,6 +100,7 @@ public class WXUtil { this.env = env; WX_BASE_URL = env.getProperty("config.WX_BASE_URL"); System.out.println("WX_BASE_URL:" + WX_BASE_URL); + initSuperAdmins(); } // 获取微信列表 diff --git a/src/main/java/cn/van/business/util/WxMessageConsumer.java b/src/main/java/cn/van/business/util/WxMessageConsumer.java index 0da967f..aaae463 100644 --- a/src/main/java/cn/van/business/util/WxMessageConsumer.java +++ b/src/main/java/cn/van/business/util/WxMessageConsumer.java @@ -20,7 +20,6 @@ import java.util.Objects; import java.util.regex.Matcher; import java.util.regex.Pattern; -import static cn.van.business.util.WXUtil.super_admin_wxid; import static cn.van.business.util.WXUtil.super_admins; @@ -288,10 +287,12 @@ public class WxMessageConsumer { } // 只处理超管的消息 String fromWxid = innerData.getFromWxid(); - if (!Objects.equals(fromWxid, super_admins.get(super_admin_wxid).getWxid())) { - logger.info("不是超管消息,不处理"); - return; - } + WXUtil.SuperAdmin superAdmin = super_admins.get(fromWxid); + if (Util.isEmpty(superAdmin)){ + logger.info("不是超管消息,不处理"); + return; + } + String msg = innerData.getMsg(); //美团 20-7 + https://i.meituan.com/mttouch/page/account?userId=3822095266&token=AgHdIkm2tAGHc9SQSiG7M8xCx1LbTue9D2HPOAun2eYl3ou7BeEw1uGrGZH-DxmEiUgsbA1v9SM4DQAAAAC6HAAAz0rTXmkB_CIHin08hCu68mFv5k6nUc2q6_CfZqEdBcngRK_xD8Sx5fE4rfdq-yAJ, msgbase64=576O5ZuiIDIwLTcgKyBodHRwczovL2kubWVpdHVhbi5jb20vbXR0b3VjaC9wYWdlL2FjY291bnQ/dXNlcklkPTM4MjIwOTUyNjYmdG9rZW49QWdIZElrbTJ0QUdIYzlTUVNpRzdNOHhDeDFMYlR1ZTlEMkhQT0F1bjJlWWwzb3U3QmVFdzF1R3JHWkgtRHhtRWlVZ3NiQTF2OVNNNERRQUFBQUM2SEFBQXowclRYbWtCX0NJSGluMDhoQ3U2OG1GdjVrNm5VYzJxNl9DZlpxRWRCY25nUktfeEQ4U3g1ZkU0cmZkcS15QUo=