From cb4a64f0300b69050114be1d01e20919ba7e4c66 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=85=88=E6=A3=AE=E5=90=B4?= <8402134@qq.com>
Date: Sun, 29 Jan 2023 18:07:38 +0800
Subject: [PATCH] =?UTF-8?q?1.=E4=BC=98=E5=8C=96=E4=BB=A3=E8=BF=90=E8=90=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 应用/ProductClient/Class1.cs             | 13 ++++++++++---
 应用/ProductClient/MainForm.cs           |  2 --
 应用/Weixin.CircleTools/MonitorThread.cs |  3 +--
 3 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/应用/ProductClient/Class1.cs b/应用/ProductClient/Class1.cs
index 9a35d3a..e20495d 100644
--- a/应用/ProductClient/Class1.cs
+++ b/应用/ProductClient/Class1.cs
@@ -54,9 +54,11 @@ namespace ProductClient
                 //var thread = TimerTask.NewTimer<MonitorThread>(60) as MonitorThread;
 
                 EventClient.DyyNoticeEvent += EventClient_DyyNoticeEvent;
+
                 //EventClient_DyyNoticeEvent(null, new DyyNoticeEvent()
                 //{
-                //    Data = "{\"Id\":\"122522636742819840\",\"TaskId\":\"122522636742819840\",\"IsGoods\":true}"
+                //    //Data = "{\"Id\":\"122522636742819840\",\"TaskId\":\"122522636742819840\",\"IsGoods\":true}"
+                //    Data = "{\"TaskId\":\"142515582485397504\",\"CollectionSourceId\":\"129505086429724672\",\"IsGoods\":true}"
                 //});
             }
             catch (Exception ex)
@@ -110,7 +112,7 @@ namespace ProductClient
                 var json = e.Data;
                 //{"Id":"122522636742819840","TaskId":"122522636742819840","IsGoods":true}
 
-                //var json = "{\"TaskId\":\"133038429393911808\",\"CollectionSourceId\":\"129505086429724672\",\"IsGoods\":true}";
+                //var json = "{\"TaskId\":\"142515582485397504\",\"CollectionSourceId\":\"129505086429724672\",\"IsGoods\":true}";
 
                 var jObj = JObject.Parse(json);
                 var taskId = jObj["TaskId"]?.Value<string>();
@@ -126,7 +128,12 @@ namespace ProductClient
 
                 //发送任务来源Id
                 var collectionSourceId = jObj["CollectionSourceId"]?.Value<string>();
-                
+
+                if (Config.sourceId == null)
+                {
+                    Config.sourceId = "129505086429724672";
+                }
+
                 if (Config.sourceId != collectionSourceId)
                 {
                     return;
diff --git a/应用/ProductClient/MainForm.cs b/应用/ProductClient/MainForm.cs
index cbe4fbc..6e1b026 100644
--- a/应用/ProductClient/MainForm.cs
+++ b/应用/ProductClient/MainForm.cs
@@ -74,9 +74,7 @@ namespace ProductClient
             {
                 Class1.Config.sourceId = "129505086429724672";
             }
-
             
-
             var collectionSources = GetCollectionSourceAll();
             if (collectionSources != null)
             {
diff --git a/应用/Weixin.CircleTools/MonitorThread.cs b/应用/Weixin.CircleTools/MonitorThread.cs
index 8b9284b..382bdf0 100644
--- a/应用/Weixin.CircleTools/MonitorThread.cs
+++ b/应用/Weixin.CircleTools/MonitorThread.cs
@@ -71,8 +71,7 @@ namespace CircleFriendsTools
                         {
                             var item = _item;
 
-                            if (Class1.Config.transpond_send_usernames.Count != 0 &&
-                                !Class1.Config.transpond_send_usernames.Contains(item.WeixinHao))
+                            if (Class1.Config.transpond_send_usernames.Count != 0 && !Class1.Config.transpond_send_usernames.Contains(item.WeixinHao))
                             {
                                 continue;
                             }