Merge pull request #636 from WeBankPartners/627_merge_dev_to_master

#627 Resolve the conflict
WeBankPartners · Jan 16, 2020 · cceae84 · cceae84
2 parents 0d82e7d + 4b74113
commit cceae84
Show file tree

Hide file tree

Showing 14 changed files with 266 additions and 305 deletions.
diff --git a/README.md b/README.md
@@ -1,8 +1,20 @@
 # WeCMDB
-
-[![License](https://img.shields.io/badge/License-Apache%202.0-blue.svg)](https://opensource.org/licenses/Apache-2.0)
-![](https://img.shields.io/badge/language-java-orange.svg)
-![](https://img.shields.io/badge/language-vue-green.svg)
+<p align="left">
+    <a href="https://opensource.org/licenses/Apache-2.0" alt="License">
+        <img src="https://img.shields.io/badge/License-Apache%202.0-blue.svg" /></a>
+    <a href="https://github.com/WeBankPartners/we-cmdb/tree/v1.3.1" alt="release">
+        <img src="https://img.shields.io/github/v/release/WeBankPartners/we-cmdb.svg" /></a>
+    <a href="#" alt="Code Size">
+        <img src="https://img.shields.io/github/languages/code-size/WeBankPartners/we-cmdb.svg" /></a>
+    <a href="#" alt="Java">
+        <img src="https://img.shields.io/badge/language-java-orange.svg" /></a>
+    <a href="#" alt="Vue">
+        <img src="https://img.shields.io/badge/language-vue-green.svg" /></a>
+    <a href="https://github.com/WeBankPartners/we-cmdb/graphs/contributors" alt="Contributors">
+        <img src="https://img.shields.io/github/contributors/WeBankPartners/we-cmdb" /></a>
+    <a href="https://github.com/WeBankPartners/we-cmdb/pulse" alt="Activity">
+        <img src="https://img.shields.io/github/commit-activity/m/WeBankPartners/we-cmdb" /></a>
+</p>
 
 English / [中文](README_CN.md)
 

diff --git a/README_CN.md b/README_CN.md
@@ -1,8 +1,21 @@
 # WeCMDB
 
-[![License](https://img.shields.io/badge/License-Apache%202.0-blue.svg)](https://opensource.org/licenses/Apache-2.0)
-![](https://img.shields.io/badge/language-java-orange.svg)
-![](https://img.shields.io/badge/language-vue-green.svg)
+<p align="left">
+    <a href="https://opensource.org/licenses/Apache-2.0" alt="License">
+        <img src="https://img.shields.io/badge/License-Apache%202.0-blue.svg" /></a>
+    <a href="https://github.com/WeBankPartners/we-cmdb/tree/v1.3.1" alt="release">
+        <img src="https://img.shields.io/github/v/release/WeBankPartners/we-cmdb.svg" /></a>
+    <a href="#" alt="Code Size">
+        <img src="https://img.shields.io/github/languages/code-size/WeBankPartners/we-cmdb.svg" /></a>
+    <a href="#" alt="Java">
+        <img src="https://img.shields.io/badge/language-java-orange.svg" /></a>
+    <a href="#" alt="Vue">
+        <img src="https://img.shields.io/badge/language-vue-green.svg" /></a>
+    <a href="https://github.com/WeBankPartners/we-cmdb/graphs/contributors" alt="Contributors">
+        <img src="https://img.shields.io/github/contributors/WeBankPartners/we-cmdb" /></a>
+    <a href="https://github.com/WeBankPartners/we-cmdb/pulse" alt="Activity">
+        <img src="https://img.shields.io/github/commit-activity/m/WeBankPartners/we-cmdb" /></a>
+</p>
 
 中文 / [English](README.md)
 

diff --git a/cmdb-core/src/main/java/com/webank/cmdb/service/impl/LogServiceImpl.java b/cmdb-core/src/main/java/com/webank/cmdb/service/impl/LogServiceImpl.java
@@ -52,8 +52,8 @@ public List<QueryHeader> queryHeader() {
         headers.add(new QueryHeader("Guid", "guid", InputType.Text.getCode()));
         headers.add(new QueryHeader("Created Date", CREATED_DATE, InputType.Date.getCode()));
         headers.add(new QueryHeader("User", "user", InputType.Text.getCode()));
-        headers.add(new QueryHeader("Log Cat", "logCat", InputType.Droplist.getCode(), LogCategory.codes()));
-        headers.add(new QueryHeader("Log Content", "logContent", InputType.Text.getCode()));
+        headers.add(new QueryHeader("Category", "logCat", InputType.Droplist.getCode(), LogCategory.codes()));
+        headers.add(new QueryHeader("Content", "logContent", InputType.Text.getCode()));
         headers.add(new QueryHeader("Operation", "operation", InputType.Droplist.getCode(), LogOperation.codes()));
         headers.add(new QueryHeader("Remark", "remark", InputType.Text.getCode()));
         return headers;

diff --git a/cmdb-core/src/main/resources/database/en/02.cmdb.system.data_en.sql b/cmdb-core/src/main/resources/database/en/02.cmdb.system.data_en.sql
@@ -435,25 +435,25 @@ INSERT INTO `adm_role_user` (`id_adm_role_user`, `id_adm_role`, `id_adm_user`, `
     ('1', '1', 1, 1);
 
 INSERT INTO `adm_menu` (`id_adm_menu`, `name`, `other_name`, `seq_no`, `parent_id_adm_menu`) VALUES
-(1, 'DATA_QUERY', 'Data Enquiry', 1, NULL),
-(2, 'DATA_MANAGEMENT', 'Data Management', 2, NULL),
-(4, 'VIEW_MANAGEMENT', 'View Management', 4, NULL),
-(5, 'ADMIN', 'Administration', 5, NULL),
-(6, 'DESIGNING_CI_DATA_ENQUIRY', 'CI Data Enquiry', 6, 1),
-(7, 'DESIGNING_CI_INTEGRATED_QUERY_EXECUTION', 'CI Data Integrated Enquiry', 7, 1),
-(8, 'CMDB_DESIGNING_ENUM_ENQUIRY', 'Enum Enquiry', 8, 1),
-(9, 'DESIGNING_CI_DATA_MANAGEMENT', 'CI Data Management', 9, 2),
-(10, 'DESIGNING_CI_INTEGRATED_QUERY_MANAGEMENT', 'CI Data Integrated Enquiry Management', 10, 2),
-(11, 'CMDB_DESIGNING_ENUM_MANAGEMENT', 'Enum Management', 11, 2),
-(16, 'IDC_PLANNING_DESIGN', 'IDC Planning and Designing', 16, 4),
-(17, 'IDC_RESOURCE_PLANNING', 'IDC Resource Planning', 17, 4),
-(18, 'APPLICATION_ARCHITECTURE_DESIGN', 'App Arch Design', 18, 4),
-(19, 'APPLICATION_DEPLOYMENT_DESIGN', 'App Impl Design', 19, 4),
-(20, 'ADMIN_CMDB_MODEL_MANAGEMENT', 'CMDB Model Management', 20, 5),
-(21, 'ADMIN_PERMISSION_MANAGEMENT', 'Permission Management', 21, 5),
-(22, 'CMDB_ADMIN_BASE_DATA_MANAGEMENT', 'Basic Data Management', 22, 5),
-(23, 'ADMIN_QUERY_LOG', 'Log query', 23, 5),
-(24, 'ADMIN_USER_PASSWORD_MANAGEMENT', 'User Password Management', 24, 5);
+(1, 'DATA_QUERY', 'Enquiry', 1, NULL),
+(2, 'DATA_MANAGEMENT', 'Edit', 2, NULL),
+(4, 'VIEW_MANAGEMENT', 'View', 4, NULL),
+(5, 'ADMIN', 'Admin', 5, NULL),
+(6, 'DESIGNING_CI_DATA_ENQUIRY', 'Configuration Items', 6, 1),
+(7, 'DESIGNING_CI_INTEGRATED_QUERY_EXECUTION', 'Customization Report', 7, 1),
+(8, 'CMDB_DESIGNING_ENUM_ENQUIRY', 'Enumeration', 8, 1),
+(9, 'DESIGNING_CI_DATA_MANAGEMENT', 'Configuration Items', 9, 2),
+(10, 'DESIGNING_CI_INTEGRATED_QUERY_MANAGEMENT', 'Customization Report', 10, 2),
+(11, 'CMDB_DESIGNING_ENUM_MANAGEMENT', 'Enumeration', 11, 2),
+(16, 'IDC_PLANNING_DESIGN', 'IDC Design', 16, 4),
+(17, 'IDC_RESOURCE_PLANNING', 'IDC Resource', 17, 4),
+(18, 'APPLICATION_ARCHITECTURE_DESIGN', 'App Architecture', 18, 4),
+(19, 'APPLICATION_DEPLOYMENT_DESIGN', 'App Deployment', 19, 4),
+(20, 'ADMIN_CMDB_MODEL_MANAGEMENT', 'Modeling', 20, 5),
+(21, 'ADMIN_PERMISSION_MANAGEMENT', 'Permission', 21, 5),
+(22, 'CMDB_ADMIN_BASE_DATA_MANAGEMENT', 'System Variables', 22, 5),
+(23, 'ADMIN_QUERY_LOG', 'Logs', 23, 5),
+(24, 'ADMIN_USER_PASSWORD_MANAGEMENT', 'Password', 24, 5);
 
 INSERT INTO `adm_role_menu` (`id_adm_role_menu`, `id_adm_role`, `id_adm_menu`, `is_system`) VALUES
 (1, 1, 1, 0),

diff --git a/cmdb-core/src/main/resources/database/en/04.cmdb.experience.data_en.sql b/cmdb-core/src/main/resources/database/en/04.cmdb.experience.data_en.sql
@@ -1,9 +1,9 @@
 SET FOREIGN_KEY_CHECKS=0;
 
 INSERT INTO `adm_user` (`id_adm_user`, `name`, `code`, `encrypted_password`, `description`, `id_adm_tenement`, `action_flag`, `is_system`) VALUES
-	(2, 'Jordan Zhang', 'jordan', '$2a$10$N7CQen.5UtFbEIPBYWhfgOnAg73h0YbLQjr2ivVuEeDATghfuZea.', 'CMDB Admin', NULL, NULL, NULL),
-	(3, 'Monkey', 'monkey', '$2a$10$N7CQen.5UtFbEIPBYWhfgOnAg73h0YbLQjr2ivVuEeDATghfuZea.', 'CMDB Developer', NULL, NULL, NULL),
-	(4, 'Chaney Liu', 'chaneyliu', '$2a$10$N7CQen.5UtFbEIPBYWhfgOnAg73h0YbLQjr2ivVuEeDATghfuZea.', 'CMDB Architect', NULL, NULL, NULL);
+	(2, 'Jordan Zhang', 'jordan', '$2a$10$N7CQen.5UtFbEIPBYWhfgOnAg73h0YbLQjr2ivVuEeDATghfuZea.', 'Admin', NULL, NULL, NULL),
+	(3, 'Monkey', 'monkey', '$2a$10$N7CQen.5UtFbEIPBYWhfgOnAg73h0YbLQjr2ivVuEeDATghfuZea.', 'Developer', NULL, NULL, NULL),
+	(4, 'Chaney Liu', 'chaneyliu', '$2a$10$N7CQen.5UtFbEIPBYWhfgOnAg73h0YbLQjr2ivVuEeDATghfuZea.', 'Architect', NULL, NULL, NULL);
 
 INSERT INTO `adm_role_user` (`id_adm_role_user`, `id_adm_role`, `id_adm_user`, `is_system`) VALUES
 	(2, 2, 2, 0),

diff --git a/cmdb-ui/src/const/menus.js b/cmdb-ui/src/const/menus.js
@@ -2,58 +2,58 @@ export const MENUS = [
   {
     code: 'DATA_QUERY',
     cnName: '数据查询',
-    enName: 'Data Enquiry'
+    enName: 'Enquiry'
   },
   {
     code: 'DATA_MANAGEMENT',
     cnName: '数据管理',
-    enName: 'Data Management'
+    enName: 'Edit'
   },
   {
     code: 'ADMIN',
     cnName: '系统',
-    enName: 'Administration'
+    enName: 'Admin'
   },
   {
     code: 'DESIGNING_CI_DATA_MANAGEMENT',
     cnName: 'CI数据管理',
-    enName: 'CI Data Management',
+    enName: 'Configuration Items',
     link: '/wecmdb/designing/ci-data-management'
   },
   {
     code: 'DESIGNING_CI_DATA_ENQUIRY',
     cnName: 'CI数据查询',
-    enName: 'CI Data Enquiry',
+    enName: 'Configuration Items',
     link: '/wecmdb/designing/ci-data-enquiry'
   },
   {
     code: 'DESIGNING_CI_INTEGRATED_QUERY_MANAGEMENT',
     cnName: 'CI综合查询管理',
-    enName: 'CI Integrated Enquiry Management',
+    enName: 'Customization Report',
     link: '/wecmdb/designing/ci-integrated-query-management'
   },
   {
     code: 'DESIGNING_CI_INTEGRATED_QUERY_EXECUTION',
     cnName: 'CI数据综合查询',
-    enName: 'CI Integrated Enquiry',
+    enName: 'Customization Report',
     link: '/wecmdb/designing/ci-integrated-query-execution'
   },
   {
     code: 'CMDB_DESIGNING_ENUM_MANAGEMENT',
     cnName: '枚举数据管理',
-    enName: 'Enum Management',
+    enName: 'Enumeration',
     link: '/wecmdb/designing/enum-management'
   },
   {
     code: 'CMDB_DESIGNING_ENUM_ENQUIRY',
     cnName: '枚举数据查询',
-    enName: 'Enum Enquiry',
+    enName: 'Enumeration',
     link: '/wecmdb/designing/enum-enquiry'
   },
   {
     code: 'ADMIN_CMDB_MODEL_MANAGEMENT',
     cnName: 'CMDB模型管理',
-    enName: 'CMDB Modeling',
+    enName: 'Modeling',
     link: '/wecmdb/admin/cmdb-model-management'
   },
   {
@@ -65,19 +65,19 @@ export const MENUS = [
   {
     code: 'CMDB_ADMIN_BASE_DATA_MANAGEMENT',
     cnName: '基础数据管理',
-    enName: 'Base Data Management',
+    enName: 'System Variables',
     link: '/wecmdb/admin/base-data-management'
   },
   {
     code: 'ADMIN_QUERY_LOG',
     cnName: '日志查询',
-    enName: 'Logs Enquiry',
+    enName: 'Logs',
     link: '/wecmdb/admin/log-enquiry'
   },
   {
     code: 'ADMIN_USER_PASSWORD_MANAGEMENT',
     cnName: '用户密码管理',
-    enName: 'User Password Management',
+    enName: 'Password',
     link: '/wecmdb/admin/user-password-management'
   },
   // 视图查询
@@ -114,30 +114,30 @@ export const MENUS = [
   {
     code: 'VIEW_MANAGEMENT',
     cnName: '视图管理',
-    enName: 'Views Management'
+    enName: 'View'
   },
   {
     code: 'IDC_PLANNING_DESIGN',
     cnName: 'IDC规划设计',
-    enName: 'IDC Planning Design',
+    enName: 'IDC Design',
     link: '/wecmdb/view-management/idc-planning-design'
   },
   {
     code: 'IDC_RESOURCE_PLANNING',
     cnName: 'IDC资源规划',
-    enName: 'IDC Resource Planning',
+    enName: 'IDC Resource',
     link: '/wecmdb/view-management/idc-resource-planning'
   },
   {
     code: 'APPLICATION_ARCHITECTURE_DESIGN',
     cnName: '应用架构设计',
-    enName: 'App Architecture Design',
+    enName: 'App Architecture',
     link: '/wecmdb/view-management/application-architecture-design'
   },
   {
     code: 'APPLICATION_DEPLOYMENT_DESIGN',
     cnName: '应用部署设计',
-    enName: 'App Deployment Design',
+    enName: 'App Deployment',
     link: '/wecmdb/view-management/application-deployment-design'
   }
 ]