修复权限管理bug

Dev-Umb · Jun 28, 2021 · 2e2e60a · 2e2e60a
1 parent 45dfb95
commit 2e2e60a
Show file tree

Hide file tree

Showing 14 changed files with 13 additions and 16 deletions.
diff --git a/.gradle/6.3/executionHistory/executionHistory.bin b/.gradle/6.3/executionHistory/executionHistory.bin
diff --git a/.gradle/6.3/executionHistory/executionHistory.lock b/.gradle/6.3/executionHistory/executionHistory.lock
diff --git a/.gradle/6.3/fileHashes/fileHashes.bin b/.gradle/6.3/fileHashes/fileHashes.bin
diff --git a/.gradle/6.3/fileHashes/fileHashes.lock b/.gradle/6.3/fileHashes/fileHashes.lock
diff --git a/.gradle/6.3/fileHashes/resourceHashesCache.bin b/.gradle/6.3/fileHashes/resourceHashesCache.bin
diff --git a/.gradle/6.3/javaCompile/classAnalysis.bin b/.gradle/6.3/javaCompile/classAnalysis.bin
diff --git a/.gradle/6.3/javaCompile/jarAnalysis.bin b/.gradle/6.3/javaCompile/jarAnalysis.bin
diff --git a/.gradle/6.3/javaCompile/javaCompile.lock b/.gradle/6.3/javaCompile/javaCompile.lock
diff --git a/.gradle/6.3/javaCompile/taskHistory.bin b/.gradle/6.3/javaCompile/taskHistory.bin
diff --git a/.gradle/buildOutputCleanup/buildOutputCleanup.lock b/.gradle/buildOutputCleanup/buildOutputCleanup.lock
diff --git a/config.yml b/config.yml
@@ -1,7 +1,7 @@
-dbUrl: "" # 你的数据库端口链接
+dbUrl: "jdbc:mysql://118.178.255.237:3306/umb?serverTimezone=UTC&characterEncoding=UTF-8" # 你的数据库端口链接
 
-dbUser: "" # 数据库用户名
-dbPwd: "" # 数据库密码
-botQQ: "" # 机器人的QQ
-botPwd: "" # 机器人的密码
-superUser: "" # 超级管理员QQ（可写可不写）
+dbUser: "umb" # 数据库用户名
+dbPwd: "0blp59XJnU8VAD4Y" # 数据库密码
+botQQ: "3394886607" # 机器人的QQ
+botPwd: "meimima123" # 机器人的密码
+superUser: "1149558764" # 超级管理员QQ（可写可不写）
diff --git a/src/main/kotlin/io/farewell12345/github/faqbot/BotManager/BotManager.kt b/src/main/kotlin/io/farewell12345/github/faqbot/BotManager/BotManager.kt
@@ -22,13 +22,11 @@ import kotlin.coroutines.CoroutineContext
 internal val appJob = Job()
 
 object CommandGroupList {
-    lateinit var welcomeGroupList:LinkedList<Long>
-    lateinit var managerGroupList:LinkedList<Long>
-    lateinit var forwardMessageGroup:HashMap<Long,Boolean>
+    lateinit var welcomeGroupList:ArrayList<Long>
+    lateinit var managerGroupList:ArrayList<Long>
     fun init(){
-        welcomeGroupList = LinkedList()
-        managerGroupList = LinkedList()
-        forwardMessageGroup = HashMap()
+        welcomeGroupList = ArrayList()
+        managerGroupList = ArrayList()
     }
 }
 

diff --git a/src/main/kotlin/io/farewell12345/github/faqbot/Listener/BotGroupCommandListener.kt b/src/main/kotlin/io/farewell12345/github/faqbot/Listener/BotGroupCommandListener.kt
@@ -30,14 +30,14 @@ class BotGroupCommandListener:BaseListeners() {
                 return@route
             }
             case("manage", "仅限管理员进行操作",false) {
-                if (event.group.id !in CommandGroupList.welcomeGroupList) {
+                if (event.group.id !in CommandGroupList.managerGroupList) {
                     CommandGroupList.managerGroupList.add(event.group.id)
                 }
                 subject.sendMessage("开启词条管理！")
                 return@route
             }
             case("dismanage", "关闭仅限管理员进行操作",false) {
-                if (event.group.id in CommandGroupList.welcomeGroupList) {
+                if (event.group.id in CommandGroupList.managerGroupList) {
                     CommandGroupList.managerGroupList.remove(event.group.id)
                 }
                 subject.sendMessage("关闭词条管理！")

diff --git a/src/main/kotlin/io/farewell12345/github/faqbot/Listener/BotGroupMsgListener.kt b/src/main/kotlin/io/farewell12345/github/faqbot/Listener/BotGroupMsgListener.kt
@@ -23,7 +23,6 @@ class BotGroupMsgListener : BaseListeners() {
         route(prefix = "", delimiter = " ") {
             if (SessionManager.hasSession(sender.id)) {
                 if (SessionManager.performSession(event)) {
-
                     subject.sendMessage("录入成功！任务正在处理，请稍等")
                     return@route
                 }
@@ -93,7 +92,7 @@ class BotGroupMsgListener : BaseListeners() {
                     subject.sendMessage("问题与模块名冲突！,模块名：${helpMap[question]}")
                     return@route
                 }
-                if (question!!.isEmpty())
+                if (question.isEmpty())
                     return@route
                 val furry = Regex("""#\d""")
                 if (furry.matches(question)) {