Merge pull request TencentBlueKing#105 from jsonwan/fix/dynamic_group…

…_permission fix: 动态分组无权限报错 TencentBlueKing#102
jsonwan · Jul 16, 2021 · a64c0b4 · a64c0b4
2 parents 5bac697 + 1d8d1e2
commit a64c0b4
Show file tree

Hide file tree

Showing 7 changed files with 52 additions and 12 deletions.
diff --git a/.../common-i18n/src/main/java/com/tencent/bk/job/common/i18n/config/MessageSourceConfig.java b/.../common-i18n/src/main/java/com/tencent/bk/job/common/i18n/config/MessageSourceConfig.java
@@ -39,7 +39,7 @@ public ReloadableResourceBundleMessageSource messageSource() {
         messageSource.addBasenames("classpath:i18n/message", "classpath*:i18n/exception/message",
             "classpath*:i18n/common/message");
         messageSource.setDefaultEncoding(StandardCharsets.UTF_8.name());
-        messageSource.setUseCodeAsDefaultMessage(false);
+        messageSource.setUseCodeAsDefaultMessage(true);
         return messageSource;
     }
 

diff --git a/src/backend/commons/common-i18n/src/main/resources/i18n/common/message.properties b/src/backend/commons/common-i18n/src/main/resources/i18n/common/message.properties
@@ -36,6 +36,10 @@ permission.resource.type.name.account=执行账号
 permission.resource.type.name.public_script=公共脚本
 permission.resource.type.name.tag=标签
 permission.resource.type.name.host=主机
+permission.resource.type.name.sys_cloud_area=云区域
+permission.resource.type.name.set=集群
+permission.resource.type.name.module=模块
+permission.resource.type.name.biz_custom_query=动态分组
 permission.resource.type.name.dashboard_view=运营视图
 permission.resource.type.name.file_source=文件源
 permission.resource.type.name.ticket=凭证

diff --git a/src/backend/commons/common-i18n/src/main/resources/i18n/common/message_en.properties b/src/backend/commons/common-i18n/src/main/resources/i18n/common/message_en.properties
@@ -36,6 +36,10 @@ permission.resource.type.name.account=Accounts
 permission.resource.type.name.public_script=Public Scripts
 permission.resource.type.name.tag=Tags
 permission.resource.type.name.host=Hosts
+permission.resource.type.name.sys_cloud_area=Cloud Areas
+permission.resource.type.name.set=Sets
+permission.resource.type.name.module=Modules
+permission.resource.type.name.biz_custom_query=Dynamic Groups
 permission.resource.type.name.dashboard_view=Dashboard Views
 permission.resource.type.name.file_source=File Sources
 permission.resource.type.name.ticket=Tickets

diff --git a/src/backend/commons/common-i18n/src/main/resources/i18n/common/message_en_US.properties b/src/backend/commons/common-i18n/src/main/resources/i18n/common/message_en_US.properties
@@ -36,6 +36,10 @@ permission.resource.type.name.account=Accounts
 permission.resource.type.name.public_script=Public Scripts
 permission.resource.type.name.tag=Tags
 permission.resource.type.name.host=Hosts
+permission.resource.type.name.sys_cloud_area=Cloud Areas
+permission.resource.type.name.set=Sets
+permission.resource.type.name.module=Modules
+permission.resource.type.name.biz_custom_query=Dynamic Groups
 permission.resource.type.name.dashboard_view=Dashboard Views
 permission.resource.type.name.file_source=File Sources
 permission.resource.type.name.ticket=Tickets

diff --git a/src/backend/commons/common-i18n/src/main/resources/i18n/common/message_zh.properties b/src/backend/commons/common-i18n/src/main/resources/i18n/common/message_zh.properties
@@ -36,6 +36,10 @@ permission.resource.type.name.account=执行账号
 permission.resource.type.name.public_script=公共脚本
 permission.resource.type.name.tag=标签
 permission.resource.type.name.host=主机
+permission.resource.type.name.sys_cloud_area=云区域
+permission.resource.type.name.set=集群
+permission.resource.type.name.module=模块
+permission.resource.type.name.biz_custom_query=动态分组
 permission.resource.type.name.dashboard_view=运营视图
 permission.resource.type.name.file_source=文件源
 permission.resource.type.name.ticket=凭证

diff --git a/src/backend/commons/common-i18n/src/main/resources/i18n/common/message_zh_CN.properties b/src/backend/commons/common-i18n/src/main/resources/i18n/common/message_zh_CN.properties
@@ -36,6 +36,10 @@ permission.resource.type.name.account=执行账号
 permission.resource.type.name.public_script=公共脚本
 permission.resource.type.name.tag=标签
 permission.resource.type.name.host=主机
+permission.resource.type.name.sys_cloud_area=云区域
+permission.resource.type.name.set=集群
+permission.resource.type.name.module=模块
+permission.resource.type.name.biz_custom_query=动态分组
 permission.resource.type.name.dashboard_view=运营视图
 permission.resource.type.name.file_source=文件源
 permission.resource.type.name.ticket=凭证

diff --git a/...d/commons/common-iam/src/main/java/com/tencent/bk/job/common/iam/constant/ResourceId.java b/...d/commons/common-iam/src/main/java/com/tencent/bk/job/common/iam/constant/ResourceId.java
@@ -28,38 +28,58 @@
  * @since 9/6/2020 15:38
  */
 public class ResourceId {
+    /**
+     * 业务
+     */
+    public static final String APP = "biz";
+    /**
+     * 脚本
+     */
     public static final String SCRIPT = "script";
+    /**
+     * 作业模板
+     */
     public static final String TEMPLATE = "job_template";
+    /**
+     * 作业执行方案
+     */
     public static final String PLAN = "job_plan";
+    /**
+     * 定时任务
+     */
     public static final String CRON = "cron";
+    /**
+     * 执行账号
+     */
     public static final String ACCOUNT = "account";
+    /**
+     * 公共脚本
+     */
     public static final String PUBLIC_SCRIPT = "public_script";
+    /**
+     * 标签
+     */
     public static final String TAG = "tag";
-
     /**
-     * 业务
+     * 主机
      */
-    public static final String APP = "biz";
+    public static final String HOST = "host";
     /**
-     * 模块
+     * 云区域
      */
-    public static final String MODULE = "module";
+    public static final String CLOUD_AREA = "sys_cloud_area";
     /**
      * 集群
      */
     public static final String SET = "set";
     /**
-     * 主机
+     * 模块
      */
-    public static final String HOST = "host";
+    public static final String MODULE = "module";
     /**
      * 动态分组
      */
     public static final String DYNAMIC_GROUP = "biz_custom_query";
-    /**
-     * 云区域
-     */
-    public static final String CLOUD_AREA = "sys_cloud_area";
     /**
      * 运营视图
      */