gfwleak/k18-ntcs-web-argus-service
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'Release-1.3' into develop

Browse Source 
# Conflicts:
#	src/main/java/com/nis/web/dao/dashboard/NtcTotalReportDao.xml
#	src/main/java/com/nis/web/dao/dashboard/TrafficUaStatisticDao.xml
This commit is contained in:
doufenghu
2018-11-16 09:50:55 +08:00
parent 996a780c3c 2084bcb305
commit 4e0629d7ae
9 changed files with 91 additions and 53 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
db/init/galaxy_stru_ui_mysql.sql
View File

@@ -80,16 +80,19 @@ CREATE TABLE `ui_sys_dict_info` (
) ENGINE=FEDERATED AUTO_INCREMENT=448 DEFAULT CHARSET=utf8 CONNECTION='mysql://root:111111@192.168.10.204:3306/gwall/sys_dict_info';
CREATE TABLE `ui_code_app_dic` (
`id` int(11) NOT NULL AUTO_INCREMENT,
`app_name` varchar(255) DEFAULT '',
`app_name_zh` varchar(255) DEFAULT NULL,
`view_code` varchar(255) DEFAULT '' COMMENT '应用编码',
`icon` varchar(255) DEFAULT '',
`behavior` varchar(255) DEFAULT '' COMMENT '行为细分',
`core_app` int(11) DEFAULT NULL COMMENT '是否是核心应用（1：是，0：否）',
PRIMARY KEY (`id`)
) ENGINE=FEDERATED AUTO_INCREMENT=399 DEFAULT CHARSET=utf8 CONNECTION='mysql://root:111111@192.168.10.204:3306/gwall/code_app_dic';
CREATE TABLE `ui_code_app_dic` (
`id` int(11) NOT NULL AUTO_INCREMENT,
`app_name` varchar(255) CHARACTER SET utf8mb4 DEFAULT '',
`app_name_zh` varchar(255) CHARACTER SET utf8mb4 DEFAULT '',
`view_code` varchar(255) CHARACTER SET utf8mb4 DEFAULT '' COMMENT '应用编码',
`icon` varchar(255) DEFAULT '',
`behavior` varchar(255) CHARACTER SET utf8mb4 DEFAULT '' COMMENT '行为细分',
`core_app` int(11) DEFAULT NULL COMMENT '是否是核心应用（1：是，0：否）',
`app_service_id` int(10) unsigned zerofill DEFAULT NULL COMMENT '业务类型编号',
`app_service` varchar(255) CHARACTER SET utf8mb4 DEFAULT '',
`lib` varchar(255) CHARACTER SET utf8mb4 DEFAULT NULL COMMENT 'lib类别',
PRIMARY KEY (`id`)
) ENGINE=FEDERATED AUTO_INCREMENT=1 DEFAULT CHARSET=utf8 CONNECTION='mysql://root:111111@192.168.10.204:3306/gwall/code_app_dic';