From e63ec8f0a493fd6d5eb2f791eef27a6b859ebc71 Mon Sep 17 00:00:00 2001
From: Leo <Leo@qi-cloud.com>
Date: Tue, 28 Nov 2023 16:59:54 +0800
Subject: [PATCH] =?UTF-8?q?jekins=20=E6=8E=A8=E9=80=81=E6=B5=8B=E8=AF=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../business/controller/WXController.java     | 24 ++++++++++++-------
 .../wxsend/{config => util}/TokenUtil.java    |  2 +-
 2 files changed, 17 insertions(+), 9 deletions(-)
 rename src/main/java/cn/van333/wxsend/{config => util}/TokenUtil.java (93%)

diff --git a/src/main/java/cn/van333/wxsend/business/controller/WXController.java b/src/main/java/cn/van333/wxsend/business/controller/WXController.java
index d17a798..3509de4 100644
--- a/src/main/java/cn/van333/wxsend/business/controller/WXController.java
+++ b/src/main/java/cn/van333/wxsend/business/controller/WXController.java
@@ -5,17 +5,17 @@ import cn.hutool.core.util.StrUtil;
 import cn.van333.wxsend.aop.annotation.RateLimiter;
 import cn.van333.wxsend.business.model.R;
 import cn.van333.wxsend.business.service.LogService;
-import cn.van333.wxsend.config.TokenUtil;
+import cn.van333.wxsend.util.TokenUtil;
 import cn.van333.wxsend.enums.WXMessageType;
 import cn.van333.wxsend.util.WxSendUtil;
 import cn.van333.wxsend.util.request.MessageRequest;
+import cn.van333.wxsend.util.SourceForQLUtil;
 import com.alibaba.fastjson2.JSON;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.web.bind.annotation.*;
 
 import javax.servlet.http.HttpServletRequest;
-import java.util.Enumeration;
 
 /**
  * @author Leo
@@ -71,14 +71,22 @@ public class WXController {
         if (!TokenUtil.checkToken(vanToken)) {
             return R.error("vanToken无效");
         }
+        String source = request.getHeader("source");
+        if (StrUtil.isEmpty(source)) {
+            return R.error("来源为空");
+        }
+        if (!StrUtil.isAllNotEmpty(message.getTitle(), message.getText())) {
+            return R.error("缺少标题和内容");
+        }
         logger.info("vanToken 打印---{}",vanToken);
-        //if (!StrUtil.isAllNotEmpty(message.getTitle(), message.getText())) {
-        //    return R.error("缺少标题和内容");
-        //}
-        //String result = WxSendUtil.sendNotify(message.getTitle(), message.getText(), message.getTouser(), WXMessageType.QL);
-        //return R.ok(result);
+        logger.info("source 打印---{}",source);
+        String sourceForQL = SourceForQLUtil.transferSource(source);
+        if (!StrUtil.isAllNotEmpty(message.getTitle(), message.getText())) {
+            return R.error("缺少标题和内容");
+        }
+        String result = WxSendUtil.sendNotify("("+sourceForQL+") "+message.getTitle(), message.getText(), message.getTouser(), WXMessageType.QL);
+        return R.ok(result);
 
-        return R.ok();
     }
 
     @RequestMapping(value = "/send/qh")
diff --git a/src/main/java/cn/van333/wxsend/config/TokenUtil.java b/src/main/java/cn/van333/wxsend/util/TokenUtil.java
similarity index 93%
rename from src/main/java/cn/van333/wxsend/config/TokenUtil.java
rename to src/main/java/cn/van333/wxsend/util/TokenUtil.java
index fdb37d9..ddbab0d 100644
--- a/src/main/java/cn/van333/wxsend/config/TokenUtil.java
+++ b/src/main/java/cn/van333/wxsend/util/TokenUtil.java
@@ -1,4 +1,4 @@
-package cn.van333.wxsend.config;
+package cn.van333.wxsend.util;
 
 import java.util.Objects;