Merge pull request #131 from xiaoyv404/develop

Revert "删除冗余文件"
xiaoyv404 · Dec 22, 2023 · 4b69d72 · 4b69d72
2 parents c2777a0 + 85f225e
commit 4b69d72
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 5 deletions.
diff --git a/src/main/kotlin/com/xiaoyv404/mirai/app/minecraftServer/ISU.kt b/src/main/kotlin/com/xiaoyv404/mirai/app/minecraftServer/ISU.kt
@@ -81,7 +81,7 @@ class ISU : NfApp(), IFshApp {
         if (more && (MinecraftServerPlayerQQMapping { qq = msg.uid() }.getPermissionByQQ()
                 ?: Permissions.Default) < Permissions.OP
         ) {
-            msg.reply("需要权限至少为${Permissions.OP}", true)
+            msg.reply("需要权限至少为${Permissions.OP.permissionName}", true)
             return false
         }
 

diff --git a/src/test/kotlin/com/xiaoyv404/mirai/app/minecraftServer/ISUTest.kt b/src/test/kotlin/com/xiaoyv404/mirai/app/minecraftServer/ISUTest.kt
@@ -65,7 +65,7 @@ internal class ISUTest : BaseTest() {
                         最后在线时间: 2006-04-16T06:58:39.810
                         服务器: Test
                         UUID: test
-                        身份: 妖怪
+                        身份: 妖怪贤者
                     """.trimIndent(),
                     msg.getOrNull(1)?.message?.contentToString()
                 )
@@ -76,7 +76,7 @@ internal class ISUTest : BaseTest() {
                         最后在线时间: 2006-04-16T06:58:39.810
                         服务器: Test
                         UUID: test
-                        身份: 妖怪
+                        身份: 妖怪贤者
                     """.trimIndent(),
                     msg.getOrNull(2)?.message?.contentToString()
                 )
@@ -109,7 +109,7 @@ internal class ISUTest : BaseTest() {
                     msg.getOrNull(4)?.message?.contentToString()
                 )
                 assertEquals(
-                    "需要权限至少为妖怪",
+                    "需要权限至少为妖怪贤者",
                     msg.getOrNull(5)?.message?.contentToString()
                 )
                 assertEquals(

diff --git a/src/test/resources/init-data.sql b/src/test/resources/init-data.sql
@@ -55,7 +55,7 @@ INSERT INTO "Users"("id", "admin", "bot", "warning_times")
 values (123, true, false, 0);
 
 INSERT INTO "MinecraftServerPlayers"("id", "name", "lastLoginTime", "lastLoginServer", "permissions")
-values ('test', 'Test', '2006-04-16 06:58:39.810', 'Test', 'Basic'),
+values ('test', 'Test', '2006-04-16 06:58:39.810', 'Test', 'OP'),
     ('test2', 'Test2', '2006-04-16 06:58:39.810', 'Test', 'Default'),
     ('404', '404', '2006-04-16 06:58:39.810', 'Test', 'Default'),
     ('2429334909', '2429334909', '2006-04-16 06:58:39.810', 'Test', 'Default');