From e5e63af73857f7eab3613c7f8e704500303c4c2c Mon Sep 17 00:00:00 2001 From: dongxiaoyan Date: Fri, 25 Jan 2019 14:27:40 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E9=BB=98=E8=AE=A4?= =?UTF-8?q?=E5=8A=A8=E6=80=81ip=E6=B1=A0=EF=BC=8C=E5=B9=B6=E4=BF=AE?= =?UTF-8?q?=E6=94=B9cfgid=E4=B8=BA0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/resources/sql/truncate_tables.sql | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/main/resources/sql/truncate_tables.sql b/src/main/resources/sql/truncate_tables.sql index 3e7935cdc..52c1a954d 100644 --- a/src/main/resources/sql/truncate_tables.sql +++ b/src/main/resources/sql/truncate_tables.sql @@ -70,4 +70,7 @@ DELETE FROM service_dict_info where item_type='5'; -- 由于DNS策略组的组号也需要大于100，所以策略分组的主键自增从101开始 ALTER TABLE policy_group_info auto_increment = 101; -- 清空asn号分组表 -DELETE FROM asn_group_info; \ No newline at end of file +DELETE FROM asn_group_info; +-- 默认动态IP地址池 +INSERT INTO `ip_reuse_addr_pool` (`cfg_id`, `addr_pool_name`, `ip_total`, `action`, `is_valid`, `is_audit`, `cfg_region_code`, `cfg_type`, `function_id`, `service_id`, `compile_id`, `is_area_effective`, `area_effective_ids`, `request_id`, `classify`, `attribute`, `lable`, `creator_id`, `create_time`, `editor_id`, `edit_time`, `auditor_id`, `audit_time`, `description`, `cancel_request_id`, `user_region1`, `user_region2`, `user_region3`, `user_region4`, `user_region5`) VALUES ('0', 'dynamic_pool', '1', '96', '1', '1', '1', 'IR_STATIC_NOMINEE_IP', '633', '834', '0', '0', '', '0', '0', '0', '0', '0', '0000-00-00 00:00:00', NULL, '0000-00-00 00:00:00', NULL, '0000-00-00 00:00:00', '', NULL, '', '', '', '', ''); +UPDATE ip_reuse_addr_pool set cfg_id=0 where add_pool_nam= 'dynamic_pool'; From 3daab5e49d7cd5d526c280d8811e69442fb1e9f0 Mon Sep 17 00:00:00 2001 From: dongxiaoyan Date: Fri, 25 Jan 2019 14:31:42 +0800 Subject: [PATCH 2/3] =?UTF-8?q?add=5Fpool=5Fnam=E8=A1=A5=E5=85=85=E5=AE=8C?= =?UTF-8?q?=E6=95=B4add=5Fpool=5Fname?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/resources/sql/truncate_tables.sql | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/resources/sql/truncate_tables.sql b/src/main/resources/sql/truncate_tables.sql index 52c1a954d..23ba1bf78 100644 --- a/src/main/resources/sql/truncate_tables.sql +++ b/src/main/resources/sql/truncate_tables.sql @@ -73,4 +73,4 @@ ALTER TABLE policy_group_info auto_increment = 101; DELETE FROM asn_group_info; -- 默认动态IP地址池 INSERT INTO `ip_reuse_addr_pool` (`cfg_id`, `addr_pool_name`, `ip_total`, `action`, `is_valid`, `is_audit`, `cfg_region_code`, `cfg_type`, `function_id`, `service_id`, `compile_id`, `is_area_effective`, `area_effective_ids`, `request_id`, `classify`, `attribute`, `lable`, `creator_id`, `create_time`, `editor_id`, `edit_time`, `auditor_id`, `audit_time`, `description`, `cancel_request_id`, `user_region1`, `user_region2`, `user_region3`, `user_region4`, `user_region5`) VALUES ('0', 'dynamic_pool', '1', '96', '1', '1', '1', 'IR_STATIC_NOMINEE_IP', '633', '834', '0', '0', '', '0', '0', '0', '0', '0', '0000-00-00 00:00:00', NULL, '0000-00-00 00:00:00', NULL, '0000-00-00 00:00:00', '', NULL, '', '', '', '', ''); -UPDATE ip_reuse_addr_pool set cfg_id=0 where add_pool_nam= 'dynamic_pool'; +UPDATE ip_reuse_addr_pool set cfg_id=0 where add_pool_name= 'dynamic_pool'; From e2e6ebfac18675f5f9aed2e7edb6892952da18b3 Mon Sep 17 00:00:00 2001 From: zhanghongqing Date: Fri, 25 Jan 2019 14:42:41 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=B5=81=E9=87=8F?= =?UTF-8?q?=E7=BB=9F=E8=AE=A1=E6=BB=9A=E5=8A=A8=E6=9D=A1=E6=96=87=E5=AD=97?= =?UTF-8?q?=E5=AF=B9=E9=BD=90bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/webapp/static/pages/css/data_text.css | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/main/webapp/static/pages/css/data_text.css b/src/main/webapp/static/pages/css/data_text.css index bd60caee7..a790046ba 100644 --- a/src/main/webapp/static/pages/css/data_text.css +++ b/src/main/webapp/static/pages/css/data_text.css @@ -257,7 +257,7 @@ p{ /*color:#288dce;*/ color:#ffffff; margin-top: 0.3px; - position: fixed; + position:absolute; } .data_content .data_info>div.info_1 .fl_fc .numberRun1 .mt-number-unit{ @@ -266,7 +266,7 @@ p{ /*color:#288dce;*/ color:#ffffff; margin-top: 0.3px; - position: fixed; + position:absolute; } .data_content .data_info>div.info_2 .fl_fc .mt-number-unit{ @@ -275,7 +275,7 @@ p{ /*color:#288dce;*/ color:#ffffff; margin-top: 0.3px; - position: fixed; + position:absolute; } .data_content .data_info>div.info_1 .fl_fc .csNum{