From 464ecc8cf58f15f5639597d7301f628ccf2d79da Mon Sep 17 00:00:00 2001
From: yiyun <yiyungent@gmail.com>
Date: Fri, 3 Jun 2022 12:59:45 +0800
Subject: [PATCH] =?UTF-8?q?fix(plugins/zhidaoplugin/):=20=E6=8F=92?=
 =?UTF-8?q?=E5=85=A5=20QABox=20=E5=A4=B1=E8=B4=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 plugins/ZhiDaoPlugin/DbContext.cs        |   4 ++--
 plugins/ZhiDaoPlugin/Models/QABox.cs     |   2 +-
 plugins/ZhiDaoPlugin/ZhiDaoPlugin.cs     |  10 +++++-----
 plugins/ZhiDaoPlugin/ZhiDaoPlugin.sqlite | Bin 24576 -> 24576 bytes
 plugins/ZhiDaoPlugin/info.json           |   2 +-
 5 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/plugins/ZhiDaoPlugin/DbContext.cs b/plugins/ZhiDaoPlugin/DbContext.cs
index e314a8a23..c10d3e2a3 100644
--- a/plugins/ZhiDaoPlugin/DbContext.cs
+++ b/plugins/ZhiDaoPlugin/DbContext.cs
@@ -39,7 +39,7 @@ public static int InsertIntoQABox(QABox model)
             {
                 con.Open();
 
-                string sql = "INSERT INTO QABox (Question,Answer,CreateTime,UpdateTime,Group) Values (@Question,@Answer,@CreateTime,@UpdateTime,@Group);";
+                string sql = "INSERT INTO QABox (Question,Answer,CreateTime,UpdateTime,QQGroup) Values (@Question,@Answer,@CreateTime,@UpdateTime,@QQGroup);";
 
                 return con.Execute(sql, model);
             }
@@ -51,7 +51,7 @@ public static int UpdateQABox(QABox model)
             {
                 con.Open();
 
-                string sql = "UPDATE QABox SET Question=@Question, Answer=@Answer, CreateTime=@CreateTime, UpdateTime=@UpdateTime, Group=@Group WHERE Id=@Id;";
+                string sql = "UPDATE QABox SET Question=@Question, Answer=@Answer, CreateTime=@CreateTime, UpdateTime=@UpdateTime, QQGroup=@QQGroup WHERE Id=@Id;";
 
                 return con.Execute(sql, model);
             }
diff --git a/plugins/ZhiDaoPlugin/Models/QABox.cs b/plugins/ZhiDaoPlugin/Models/QABox.cs
index a6efe7bd5..4b1cb3779 100644
--- a/plugins/ZhiDaoPlugin/Models/QABox.cs
+++ b/plugins/ZhiDaoPlugin/Models/QABox.cs
@@ -16,7 +16,7 @@ public class QABox
         /// <summary>
         /// 对应QQ群 群号
         /// </summary>
-        public string Group { get; set; }
+        public string QQGroup { get; set; }
 
         public string Question { get; set; }
 
diff --git a/plugins/ZhiDaoPlugin/ZhiDaoPlugin.cs b/plugins/ZhiDaoPlugin/ZhiDaoPlugin.cs
index 3e553f00c..f84d894be 100644
--- a/plugins/ZhiDaoPlugin/ZhiDaoPlugin.cs
+++ b/plugins/ZhiDaoPlugin/ZhiDaoPlugin.cs
@@ -55,7 +55,7 @@ public void OnGroupMessage((Bot s, GroupMessageEvent e) obj, string message, str
 
                     try
                     {
-                        var dbModel = DbContext.QueryAllQABox().FirstOrDefault(m => m.Group == groupUin.ToString()
+                        var dbModel = DbContext.QueryAllQABox().FirstOrDefault(m => m.QQGroup == groupUin.ToString()
                                                                                     && m.Question.Trim().ToLower() == questionStr.ToLower());
                         if (dbModel != null)
                         {
@@ -71,7 +71,7 @@ public void OnGroupMessage((Bot s, GroupMessageEvent e) obj, string message, str
                                 UpdateTime = DateTime.Now.ToTimeStamp13(),
                                 Question = questionStr,
                                 Answer = answerStr,
-                                Group = groupUin.ToString()
+                                QQGroup = groupUin.ToString()
                             };
                             DbContext.InsertIntoQABox(dbModel);
                         }
@@ -93,7 +93,7 @@ public void OnGroupMessage((Bot s, GroupMessageEvent e) obj, string message, str
 
                     #region 删除问答
                     text = text.Replace("#删除问答", "").Trim().ToLower();
-                    var dbModel = DbContext.QueryAllQABox().FirstOrDefault(m => m.Group == groupUin.ToString()
+                    var dbModel = DbContext.QueryAllQABox().FirstOrDefault(m => m.QQGroup == groupUin.ToString()
                                                                                 && m.Question.Trim().ToLower() == text);
                     if (dbModel != null)
                     {
@@ -114,7 +114,7 @@ public void OnGroupMessage((Bot s, GroupMessageEvent e) obj, string message, str
                     }
 
                     #region 已学习
-                    var dbModelList = DbContext.QueryAllQABox().Where(m => m.Group == groupUin.ToString()).ToList();
+                    var dbModelList = DbContext.QueryAllQABox().Where(m => m.QQGroup == groupUin.ToString()).ToList();
                     StringBuilder sb = new StringBuilder();
                     sb.AppendLine("已学习:");
                     foreach (var dbModel in dbModelList)
@@ -129,7 +129,7 @@ public void OnGroupMessage((Bot s, GroupMessageEvent e) obj, string message, str
                     #region 关键词回复
                     try
                     {
-                        var boxList = DbContext.QueryAllQABox().Where(m => m.Group == groupUin.ToString()).ToList();
+                        var boxList = DbContext.QueryAllQABox().Where(m => m.QQGroup == groupUin.ToString()).ToList();
                         foreach (var item in boxList)
                         {
                             if (text.Contains(item.Question.ToLower().Trim()))
diff --git a/plugins/ZhiDaoPlugin/ZhiDaoPlugin.sqlite b/plugins/ZhiDaoPlugin/ZhiDaoPlugin.sqlite
index b07bdc791db2bf11d1af62f40641783bc2b81fa6..a482a34b254a559364730e28df3ac79177d2ae9b 100644
GIT binary patch
delta 157
zcmZoTz}Rqrae}m<5Ca1P8xS)CF%uALPt-963hJpe@bWb=F!Sza;4kOhy|G{s4;Ozv
zV}ZE1IAc@#<g+}klW*}waW%Rqv7-oOO6n*C2D%sJmli05xJHC%^5-)g61TQyY!aRP
oi&tjyf8H($9WDh0C9o1Duo^B+O=UK5Tk*-~`6V_d@y`nY0Dpcd5C8xG

delta 125
zcmZoTz}Rqrae}m<AOiyf8xS)CF%uB0Pt-963hJpe@bcbdVCEHK;4kMD+E}oNhq=*3
ze)2xv?cz%AMfs%#N(v#a5h0rV`Hb1(*4B)TrIUO3mho@_1sHaUi;FWhc~3se<2sp(
XFOywUQ-Mv~R($e#eu>RV{PO|;obes?

diff --git a/plugins/ZhiDaoPlugin/info.json b/plugins/ZhiDaoPlugin/info.json
index 7687e0bba..71eb2aed1 100644
--- a/plugins/ZhiDaoPlugin/info.json
+++ b/plugins/ZhiDaoPlugin/info.json
@@ -3,6 +3,6 @@
 	"DisplayName": "QQ知道插件",
 	"Description": "自定义问答",
 	"Author": "yiyun",
-	"Version": "0.2.1",
+	"Version": "0.2.2",
 	"SupportedVersions": [ "0.0.1" ]
 }
\ No newline at end of file