Merge pull request #179 from Tangjiafeng/branch-1.0.0

update ui source code
WeBankFinTech · Dec 25, 2023 · a49ed84 · a49ed84
2 parents 190b01d + adbbdac
commit a49ed84
Show file tree

Hide file tree

Showing 10 changed files with 24 additions and 52 deletions.
diff --git a/profile.gradle b/profile.gradle
@@ -277,7 +277,7 @@ project(':core/common') {
     compile('org.yaml:snakeyaml:2.0'){
       force = true
     }
-    compile('org.hibernate:hibernate-core:5.4.24.Final'){
+    compile('org.hibernate:hibernate-core:5.6.5.Final'){
       force = true
     }
     compile('com.fasterxml.jackson.core:jackson-databind:2.13.4.2'){

diff --git a/ui/.fes.js b/ui/.fes.js
@@ -15,7 +15,7 @@ export default {
     layout: false,
     define: {
         // 请求服务地址，没有明确ip采用相对地址
-        BASEURL: 'http://172.21.8.149:8090/qualitis',
+        BASEURL: '/qualitis',
     },
     alias: {
         '@': path.resolve(__dirname, 'src')

diff --git a/ui/README.md b/ui/README.md
@@ -61,11 +61,11 @@ http://backendip:8090/web/		http://localhost:8000/
 
 |规则类型|目录|表单项|数据项|
 |:---|:---|:---|:---|
-|单表校验|src/components/rules/singleTableCheck|![单表校验](/docs/dbjy.png)|![单表校验数据项](/docs/dbjysjx.png)|
-|多表比对|src/components/rules/crossTableCheck|![多表比对](/docs/dbbd.png)|![多表比对数据项](/docs/dbbdsjx.png)|
-|自定义SQL校验|src/components/rules/customCheck|![自定义SQL校验](/docs/zdysqljy.png)|![自定义SQL校验数据项](/docs/zdysqljysjx.png)|
-|表文件校验|src/components/rules/fileCheck|![表文件校验](/docs/bwjjy.png)|![表文件校验数据项](/docs/bwjjysjx.png)|
-|库一致性比对|src/components/rules/crossDbCheck|![库一致性对比](/docs/kyzxdb.png)|![库一致性对比数据项](/docs/kyzxdbsjx.png)|
+|单表校验|src/components/rules/singleTableCheck|![单表校验](./docs/dbjy.png)|![单表校验数据项](./docs/dbjysjx.png)|
+|多表比对|src/components/rules/crossTableCheck|![多表比对](./docs/dbbd.png)|![多表比对数据项](./docs/dbbdsjx.png)|
+|自定义SQL校验|src/components/rules/customCheck|![自定义SQL校验](./docs/zdysqljy.png)|![自定义SQL校验数据项](./docs/zdysqljysjx.png)|
+|表文件校验|src/components/rules/fileCheck|![表文件校验](./docs/bwjjy.png)|![表文件校验数据项](./docs/bwjjysjx.png)|
+|库一致性比对|src/components/rules/crossDbCheck|![库一致性对比](./docs/kyzxdb.png)|![库一致性对比数据项](./docs/kyzxdbsjx.png)|
 
 ## 表格数据为空的缺省页说明
 

diff --git a/ui/package.json b/ui/package.json
@@ -62,7 +62,6 @@
     "@fesjs/plugin-access": "2.0.3",
     "@fesjs/plugin-enums": "2.0.2",
     "@fesjs/plugin-icon": "2.0.6",
-    "@fesjs/plugin-layout": "3.0.0",
     "@fesjs/plugin-locale": "3.0.3",
     "@fesjs/plugin-model": "2.0.3",
     "@fesjs/plugin-monaco-editor": "2.0.0-beta.7",

diff --git a/ui/src/locales/en-US.js b/ui/src/locales/en-US.js
@@ -128,6 +128,7 @@ export default {
         cluster: 'Cluster',
         taskExecCluster: '任务执行集群',
         linkis: 'Linkis Address',
+        token: 'Linkis Token',
         sourceName: 'SourceName',
         targetName: 'TargetName',
         filterFields: 'Filter Fields',

diff --git a/ui/src/locales/zh-CN.js b/ui/src/locales/zh-CN.js
@@ -184,6 +184,7 @@ export default {
         sourceDatabase: '来源数据库',
         targetDatabase: '目标数据库',
         linkis: 'Linkis地址',
+        token: 'Linkis令牌',
         pleaseEnter: '请输入',
         view: '查看',
         executeTask: '执行任务',

diff --git a/ui/src/pages/dataSourceManagement/components/addOrEditManagement.vue b/ui/src/pages/dataSourceManagement/components/addOrEditManagement.vue
@@ -192,13 +192,6 @@
                             </FButton>
                         </div>
                     </div>
-                    <div v-if="addDataSourceForm.inputType === 2">
-                        <!-- {{ addDataSourceForm.dcn }} -->
-                        <FFormItem label="DCN" prop="dcn">
-                            <FSelectTree v-model="addDataSourceForm.dcn" :data="dcnTreeData" cascade checkStrictly="parent" multiple collapseTags :collapseTagsLimit="3">
-                            </FSelectTree>
-                        </FFormItem>
-                    </div>
                     <template v-if="!(addDataSourceForm.inputType === 1 && addDataSourceForm.verifyType === 2)">
                         <div class="title">{{$t('dataSourceManagement.loginAuth')}}</div>
                         <div>
@@ -269,7 +262,6 @@ import {
     fetchDataSourceType, fetchAddDataSource, fetchSubSystemInfo, fetchEditDataSource, fetchUpdateDataSourceVersion,
 } from '../api';
 import DetailManagement from './detailManagement.vue';
-import { useDcnData } from '../useDcnData';
 
 
 const { t: $t } = useI18n();
@@ -485,17 +477,6 @@ const {
     visSelectChange,
 } = useDepartment(devCurSubDepartData, opsCurSubDepartData, visCurSubDepartData, visDivisions);
 
-// DCN list相关处理
-const {
-    dcnTreeData,
-    dcnListData,
-    genDcnTreeData,
-} = useDcnData();
-const handleSubSystemChange = async () => {
-    const subSystem = props.subSystemList.find(item => item.value === addDataSourceForm.value.subSystem);
-    console.log('subSystem', subSystem);
-    await genDcnTreeData({ subSystemId: subSystem.id });
-};
 
 const curAuthTypeList = ref(commonAuthTypeList);
 const getDataSourceAddTypeList = async () => {
@@ -567,21 +548,7 @@ const handleRequestParams = () => {
     let connectParams = {};
     curDataSourceEnvs = [];
     params = pick(addDataSourceForm.value, Object.keys(initaddDataSourceForm()));
-    if (addDataSourceForm.value.inputType === 2) {
-        const dcns = getDataFormTreeSelect(addDataSourceForm.value.dcn, dcnListData.value);
-        console.log('addDataSourceForm.dcn', addDataSourceForm.value.dcn, dcns, envList.value);
-        const authData = computeAuthData(addDataSourceForm.value);
-        curDataSourceEnvs = dcns.map(dcn => ({
-            database: dcn.db_name,
-            envName: dcn.dcn_num,
-            connectParams: {
-                host: dcn.vip,
-                port: dcn.gwport,
-                ...authData,
-            },
-            id: envList.value.find(item => item.dcnId === dcn.value)?.id || '',
-        }));
-    } else if (addDataSourceForm.value.inputType === 1) {
+    if (addDataSourceForm.value.inputType === 1) {
         envList.value.forEach((item) => {
             const curEnv = pick(item, ['envName', 'envDesc']);
             connectParams = pick(item, ['port', 'host', 'connectParam']);
@@ -680,8 +647,6 @@ const editSource = async () => {
     addDataSourceForm.value.dataSourceDesc = props.curDataSourceDetail.dataSourceDescription;
     addDataSourceForm.value.dataSourceTypeId = String(props.curDataSourceDetail.dataSourceTypeId);
     addDataSourceForm.value.action_range = addDataSourceForm.value.visibility_department_list?.map(item => item.name.split('/')) || [];
-    // 初始化DCN Tree初始值
-    await handleSubSystemChange();
     // 初始化多DCN相关数据
     addDataSourceForm.value.dcn = props.curDataSourceDetail.dcnSequence;
     console.log(addDataSourceForm.value);

diff --git a/ui/src/pages/system/cluster/index.vue b/ui/src/pages/system/cluster/index.vue
@@ -27,7 +27,7 @@
                     <f-table-column :formatter="formatterEmptyValue" ellipsis prop="cluster_name" :label="$t('configureParameterPage.clusterName')" :minWidth="192" />
                     <f-table-column :formatter="formatterEmptyValue" ellipsis prop="cluster_type" :label="$t('configureParameterPage.clusterType')" :minWidth="102" />
                     <f-table-column :formatter="formatterEmptyValue" ellipsis prop="linkis_address" :label="$t('common.linkis')" :minWidth="200" />
-                    <f-table-column :formatter="formatterEmptyValue" ellipsis prop="linkis_token" label="Linkis Token" :minWidth="142" />
+                    <f-table-column :formatter="formatterEmptyValue" ellipsis prop="linkis_token" :label="`${$t('common.token')}`" :minWidth="142" />
                     <f-table-column prop="create_user" :label="$t('optionManagePage.create_user')" :minWidth="120" ellipsis />
                     <f-table-column prop="create_time" :label="$t('optionManagePage.create_time')" :minWidth="180" ellipsis />
                     <f-table-column prop="modify_user" :label="$t('optionManagePage.modify_user')" :minWidth="120" ellipsis />
@@ -71,7 +71,7 @@
             <FFormItem :label="`${$t('common.linkis')}`" prop="linkis_address">
                 <FInput v-model="form.linkis_address" :placeholder="$t('common.pleaseEnter')" />
             </FFormItem>
-            <FFormItem label="LinkisToken" prop="linkis_token">
+            <FFormItem :label="`${$t('common.token')}`" prop="linkis_token">
                 <FInput v-model="form.linkis_token" :placeholder="$t('common.pleaseEnter')" />
             </FFormItem>
             <FFormItem :label="`${$t('configureParameterPage.wtssConf')}`" prop="wtss_conf">

diff --git a/web/app/src/main/resources/application-dev.yml b/web/app/src/main/resources/application-dev.yml
@@ -15,7 +15,7 @@ spring:
       private_key: X
       url: jdbc:mysql://[DB_HOST_WORKER]:[DB_PORT]/[DB_NAME]?createDatabaseIfNotExist=true&useUnicode=true&characterEncoding=utf-8
       driver-class-name: com.mysql.jdbc.Driver
-      type: com.zaxxer.hikari.HikariDataSourc
+      type: com.zaxxer.hikari.HikariDataSource
     # 连接池配置
     hikari:
       minimum-idle: 20

diff --git a/web/app/src/main/resources/database/init.sql b/web/app/src/main/resources/database/init.sql
@@ -58,6 +58,7 @@ CREATE TABLE `qualitis_alert_config` (
   `work_flow_version` varchar(180) DEFAULT NULL,
   `work_flow_name` varchar(180) DEFAULT NULL,
   `node_name` varchar(180) DEFAULT NULL,
+  `work_flow_space` varchar(500) DEFAULT NULL,
   PRIMARY KEY (`id`)
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8;
 
@@ -187,6 +188,8 @@ CREATE TABLE `qualitis_auth_department` (
   `name` varchar(30) COLLATE utf8_bin DEFAULT NULL,
   `department_code` varchar(255) COLLATE utf8_bin DEFAULT NULL,
   `tenant_user_id` bigint(20) DEFAULT NULL,
+  `source_type` int(4) DEFAULT NULL COMMENT '',
+  `parent_id` bigint(20) DEFAULT NULL COMMENT '',
   `create_user` varchar(50) COLLATE utf8_bin DEFAULT NULL COMMENT '创建用户',
   `create_time` varchar(50) COLLATE utf8_bin DEFAULT NULL COMMENT '创建时间',
   `modify_user` varchar(50) COLLATE utf8_bin DEFAULT NULL COMMENT '修改用户',
@@ -802,6 +805,7 @@ CREATE TABLE `qualitis_auth_proxy_user` (
   `proxy_user_name` varchar(20) DEFAULT NULL,
   `department_id` bigint(20) DEFAULT NULL,
   `bdp_client_token` varchar(2000) DEFAULT NULL,
+  `user_config_json` mediumtext COMMENT '用户配置信息',
   `create_user` varchar(50) DEFAULT NULL COMMENT '创建用户',
   `create_time` varchar(50) DEFAULT NULL COMMENT '创建时间',
   `modify_user` varchar(50) DEFAULT NULL COMMENT '修改用户',
@@ -819,7 +823,7 @@ CREATE TABLE `qualitis_auth_proxy_user_department` (
   `id` bigint(20) NOT NULL AUTO_INCREMENT,
   `proxy_user_id` bigint(20) DEFAULT NULL,
   `department` varchar(50) DEFAULT NULL,
-  `department_sub_id` bigint(20) DEFAULT NULL,
+  `sub_department_code` bigint(20) DEFAULT NULL,
   PRIMARY KEY (`id`),
   KEY `FKpmln0snv5mkc203umzzgcjf05` (`proxy_user_id`),
   CONSTRAINT `FKpmln0snv5mkc203umzzgcjf05` FOREIGN KEY (`proxy_user_id`) REFERENCES `qualitis_auth_proxy_user` (`id`)
@@ -872,7 +876,8 @@ CREATE TABLE `qualitis_auth_user` (
   `password` varchar(64) DEFAULT NULL,
   `username` varchar(30) DEFAULT NULL,
   `department_id` bigint(20) DEFAULT NULL,
-  `department_sub_id` bigint(20) DEFAULT NULL,
+  `user_config_json` mediumtext COMMENT '用户配置',
+  `sub_department_code` bigint(20) DEFAULT NULL,
   `bdp_client_token` varchar(2000) DEFAULT NULL,
   `create_user` varchar(50) DEFAULT NULL COMMENT '创建用户',
   `create_time` varchar(50) DEFAULT NULL COMMENT '创建时间',
@@ -1479,6 +1484,8 @@ CREATE TABLE `qualitis_rule` (
   `enable` bit(1) DEFAULT b'1',
   `union_all` bit(1) DEFAULT b'0',
   `contrast_type` int(11) DEFAULT NULL,
+  `work_flow_space` varchar(500) DEFAULT NULL,
+  `node_name` varchar(180) DEFAULT NULL,
   PRIMARY KEY (`id`),
   KEY `FK7hv5yh1en46cfwxkqdmixyrn1` (`rule_group_id`),
   KEY `FKf769w3wjl2ywbue7hft6aq8c4` (`template_id`),
@@ -1666,7 +1673,7 @@ insert into qualitis_auth_role(id, role_type, name, zn_name) values(5, 2, "Test"
 
 
 -- 管理员账户
-insert into qualitis_auth_user(id, username, password, chinese_name, department) values(1, "admin", "8c6976e5b5410415bde908bd4dee15dfb167a9c873fc4bb8a81f6f2ab448a918", "管理员", "管理员");
+insert into qualitis_auth_user(id, username, password, chinese_name, department) values(1, "admin", "93956d0840b837284103670473a3dd2fca8c46c40c1c4313252d4a192df19474", "管理员", "管理员");
 
 -- 管理员角色
 insert into qualitis_auth_user_role(id, user_id, role_id) values("5932425efdfe49949587f51a54e8xffb", 1, 1);
@@ -2245,5 +2252,4 @@ insert into qualitis_template_default_input_meta(id, type, placeholder, placehol
 INSERT INTO qualitis_template_naming_conventions (id,major_categories,kind,create_user,create_time,modify_user,modify_time) VALUES (1,'{"en_name":"basics","zh_name":"IT基础","abbreviation":"A"}','[{"en_name":"Fluctuate","zh_name":"波动","abbreviation":"F"},{"en_name":"New","zh_name":"新值","abbreviation":"N"},{"en_name":"Balance","zh_name":"对账","abbreviation":"B"}]',NULL,NULL,NULL,NULL);
 INSERT INTO qualitis_template_naming_conventions (id,major_categories,kind,create_user,create_time,modify_user,modify_time) VALUES (2,'{"en_name":"general_knowledge","zh_name":"IT通识","abbreviation":"B"}','[{"en_name":"Common","zh_name":"常规","abbreviation":"C"},{"en_name":"Anti","zh_name":"反洗钱","abbreviation":"A"},{"en_name":"Regulate","zh_name":"监管报送","abbreviation":"R"}]',NULL,NULL,NULL,NULL);
 
-
--- dml end
+-- dml end