From db108cf325fd88e6dcecc168eb5120f60d47be31 Mon Sep 17 00:00:00 2001 From: Jordan Zhang Date: Mon, 21 Oct 2019 09:46:18 +0800 Subject: [PATCH] #346 Update readme and pom version --- README.md | 6 +-- cmdb-core/pom.xml | 2 +- .../database/04.cmdb.experience.data.sql | 47 +++++++++++++++++++ cmdb-ui/package.json | 2 +- cmdb-ui/pom.xml | 2 +- pom.xml | 2 +- 6 files changed, 54 insertions(+), 7 deletions(-) diff --git a/README.md b/README.md index d452162f5..d582e19d7 100644 --- a/README.md +++ b/README.md @@ -87,15 +87,15 @@ WeCMDB常规容器化部署。 [WeCMDB用户手册](cmdb-wiki/docs/manual/wecmdb_user_guide.md) ## 开发者文档 -**WeCMDB快速本地启动** +**WeCMDB快速本地启动** 如何本地快速体验，请查看文档[WeCMDB快速本地启动环境配置](cmdb-wiki/docs/developer/wecmdb_local_standalone_guide.md) -**WeCMDB常规环境搭建** +**WeCMDB常规环境搭建** WeCMDB使用Java和Vue进行开发，数据存储于MySQL，并依赖Tomcat Web容器运行。 请参考文档进行开发环境配置[WeCMDB开发环境配置](cmdb-wiki/docs/developer/wecmdb_developer_guide.md) -**WeCMDB代码贡献指引** +**WeCMDB代码贡献指引** 关于WeCMDB代码贡献， 请查看文档 [WeCMDB代码贡献指引](cmdb-wiki/docs/developer/code_contributors_submit_guide.md) diff --git a/cmdb-core/pom.xml b/cmdb-core/pom.xml index ed5347b4f..561b409ee 100755 --- a/cmdb-core/pom.xml +++ b/cmdb-core/pom.xml @@ -6,7 +6,7 @@ cmdb com.webank.cmdb - 0.0.1-SNAPSHOT + 1.2.0-SNAPSHOT com.webank cmdb-core diff --git a/cmdb-core/src/main/resources/database/04.cmdb.experience.data.sql b/cmdb-core/src/main/resources/database/04.cmdb.experience.data.sql index 92fd53d90..da02bc887 100644 --- a/cmdb-core/src/main/resources/database/04.cmdb.experience.data.sql +++ b/cmdb-core/src/main/resources/database/04.cmdb.experience.data.sql @@ -1,4 +1,51 @@ 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); + +INSERT INTO `adm_role_user` (`id_adm_role_user`, `id_adm_role`, `id_adm_user`, `is_system`) VALUES + (2, 2, 2, 0), + (3, 9, 3, 0), + (4, 6, 4, 0); + +INSERT INTO `adm_role_menu` (`id_adm_role_menu`, `id_adm_role`, `id_adm_menu`, `is_system`) VALUES + (25, 2, 20, 0), + (26, 2, 21, 0), + (27, 2, 22, 0), + (28, 2, 23, 0), + (29, 2, 24, 0), + (30, 2, 9, 0), + (31, 2, 10, 0), + (32, 2, 11, 0), + (33, 2, 16, 0), + (34, 2, 17, 0), + (35, 2, 18, 0), + (36, 2, 19, 0), + (37, 2, 6, 0), + (38, 2, 7, 0), + (39, 2, 8, 0), + (44, 9, 6, 0), + (45, 9, 7, 0), + (46, 9, 8, 0), + (47, 9, 9, 0), + (48, 9, 10, 0), + (49, 9, 11, 0), + (50, 6, 16, 0), + (51, 6, 17, 0), + (52, 6, 18, 0), + (53, 6, 19, 0), + (54, 6, 6, 0), + (55, 6, 7, 0), + (56, 6, 8, 0), + (57, 6, 9, 0), + (58, 6, 10, 0), + (59, 6, 11, 0), + (61, 6, 22, 0), + (62, 6, 20, 0), + (63, 6, 23, 0); + INSERT INTO `adm_sequence` (`id_adm_sequence`, `seq_name`, `current_val`, `increment_val`, `length_limitation`, `left_zero_padding`) VALUES (25, 'system_design', 14, 1, 8, 'N'), (26, 'subsys_design', 15, 1, 8, 'N'), diff --git a/cmdb-ui/package.json b/cmdb-ui/package.json index 8ce8a2ebb..55746d614 100644 --- a/cmdb-ui/package.json +++ b/cmdb-ui/package.json @@ -20,7 +20,7 @@ "dependencies": { "axios": "^0.18.0", "bpmn-js": "^2.5.1", - "core-js": "^2.6.9", + "core-js": "^2.6.10", "d3-graphviz": "^2.6.1", "highlight.js": "^9.15.8", "husky": "^1.3.1", diff --git a/cmdb-ui/pom.xml b/cmdb-ui/pom.xml index 68dda5380..32eb54951 100755 --- a/cmdb-ui/pom.xml +++ b/cmdb-ui/pom.xml @@ -6,7 +6,7 @@ com.webank.cmdb cmdb - 0.0.1-SNAPSHOT + 1.2.0-SNAPSHOT 4.0.0 cmdb-ui diff --git a/pom.xml b/pom.xml index b707ef79e..00802c566 100755 --- a/pom.xml +++ b/pom.xml @@ -10,7 +10,7 @@ com.webank.cmdb cmdb - 0.0.1-SNAPSHOT + 1.2.0-SNAPSHOT pom cmdb cmdb