From 2f8a0f2e231392d4b7b99c853acfea93f7bf9267 Mon Sep 17 00:00:00 2001
From: zhangyuheng <zhangyuheng@lunadeer.cn>
Date: Sun, 30 Jun 2024 00:40:45 +0800
Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E8=BE=93=E5=85=A5=E5=86=85?=
 =?UTF-8?q?=E5=AE=B9=E5=90=88=E6=B3=95=E6=80=A7=E6=A3=80=E6=9F=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../cn/lunadeer/dominion/controllers/GroupController.java | 8 ++++++++
 .../lunadeer/dominion/controllers/TemplateController.java | 8 ++++++--
 .../dominion/tuis/dominion/manage/group/GroupSetting.java | 2 +-
 3 files changed, 15 insertions(+), 3 deletions(-)

diff --git a/src/main/java/cn/lunadeer/dominion/controllers/GroupController.java b/src/main/java/cn/lunadeer/dominion/controllers/GroupController.java
index ecae31a..1e65e9f 100644
--- a/src/main/java/cn/lunadeer/dominion/controllers/GroupController.java
+++ b/src/main/java/cn/lunadeer/dominion/controllers/GroupController.java
@@ -12,6 +12,10 @@ public class GroupController {
     public static void createGroup(AbstractOperator operator, String domName, String groupName) {
         AbstractOperator.Result FAIL = new AbstractOperator.Result(AbstractOperator.Result.FAILURE, "创建权限组 %s 失败", groupName);
         AbstractOperator.Result SUCCESS = new AbstractOperator.Result(AbstractOperator.Result.SUCCESS, "创建权限组 %s 成功", groupName);
+        if (groupName.contains(" ")) {
+            operator.setResponse(FAIL.addMessage("权限组名称不能包含空格"));
+            return;
+        }
         DominionDTO dominion = DominionDTO.select(domName);
         if (dominion == null) {
             operator.setResponse(FAIL.addMessage("领地 %s 不存在", domName));
@@ -99,6 +103,10 @@ public class GroupController {
     public static void renameGroup(AbstractOperator operator, String domName, String oldName, String newName) {
         AbstractOperator.Result FAIL = new AbstractOperator.Result(AbstractOperator.Result.FAILURE, "重命名权限组 %s 为 %s 失败", oldName, newName);
         AbstractOperator.Result SUCCESS = new AbstractOperator.Result(AbstractOperator.Result.SUCCESS, "重命名权限组 %s 为 %s 成功", oldName, newName);
+        if (newName.contains(" ")) {
+            operator.setResponse(FAIL.addMessage("权限组名称不能包含空格"));
+            return;
+        }
         DominionDTO dominion = DominionDTO.select(domName);
         if (dominion == null) {
             operator.setResponse(FAIL.addMessage("领地 %s 不存在", domName));
diff --git a/src/main/java/cn/lunadeer/dominion/controllers/TemplateController.java b/src/main/java/cn/lunadeer/dominion/controllers/TemplateController.java
index 49a5b8b..306ed17 100644
--- a/src/main/java/cn/lunadeer/dominion/controllers/TemplateController.java
+++ b/src/main/java/cn/lunadeer/dominion/controllers/TemplateController.java
@@ -10,10 +10,14 @@ public class TemplateController {
     public static void createTemplate(AbstractOperator operator, String templateName) {
         AbstractOperator.Result SUCCESS = new AbstractOperator.Result(AbstractOperator.Result.SUCCESS, "创建成功");
         AbstractOperator.Result FAIL = new AbstractOperator.Result(AbstractOperator.Result.FAILURE, "创建失败");
+        if (templateName.contains(" ")) {
+            operator.setResponse(FAIL.addMessage("模板名称不能包含空格"));
+            return;
+        }
         List<PrivilegeTemplateDTO> templates = PrivilegeTemplateDTO.selectAll(operator.getUniqueId());
         for (PrivilegeTemplateDTO template : templates) {
             if (template.getName().equals(templateName)) {
-                operator.setResponse(FAIL.addMessage("已经存在名为" + templateName + "的权限模板"));
+                operator.setResponse(FAIL.addMessage("已经存在名为 %s 的权限模板", templateName));
                 return;
             }
         }
@@ -22,7 +26,7 @@ public class TemplateController {
             operator.setResponse(FAIL.addMessage("可能是数据库错误，请联系管理员"));
             return;
         }
-        operator.setResponse(SUCCESS.addMessage("成功创建名为" + templateName + "的权限模板"));
+        operator.setResponse(SUCCESS.addMessage("成功创建名为 %s 的权限模板", templateName));
     }
 
     public static void deleteTemplate(AbstractOperator operator, String templateName) {
diff --git a/src/main/java/cn/lunadeer/dominion/tuis/dominion/manage/group/GroupSetting.java b/src/main/java/cn/lunadeer/dominion/tuis/dominion/manage/group/GroupSetting.java
index 656a903..515d155 100644
--- a/src/main/java/cn/lunadeer/dominion/tuis/dominion/manage/group/GroupSetting.java
+++ b/src/main/java/cn/lunadeer/dominion/tuis/dominion/manage/group/GroupSetting.java
@@ -46,7 +46,7 @@ public class GroupSetting {
                         .append(Button.create("权限组列表").setExecuteCommand("/dominion group_list " + dominion.getName()).build())
                         .append("权限组管理")
         );
-        Button rename_btn = Button.create("重命名")
+        Button rename_btn = Button.create("重命名此权限组")
                 .setHoverText("重命名权限组 " + group.getName())
                 .setExecuteCommand("/dominion cui_rename_group " + dominion.getName() + " " + group.getName());
         view.add(Line.create().append(rename_btn.build()));