Merge branch 'develop' of http://10.0.6.99/gwall/gwall.git into develop

This commit is contained in:
duandongmei
2018-08-23 09:36:09 +08:00
61 changed files with 2692 additions and 1551 deletions

View File

@@ -617,7 +617,7 @@ val_dst_ip=Server IP format is incorrect or inconsistent with IP type
val_dst_mask=Server IP mask format is incorrect or inconsistent with IP type
val_dst_port=Server port is empty or incorrectly formatting(0-65535)
val_dst_port_mask=Server port mask format is incorrect(0-65535)
val_protocol=Protocol Can't be empty,and should be 6(TCP),17(UDP),0(\u4efb\u610f)
val_protocol=Protocol Can't be empty,and should be 6(TCP),17(UDP),0(\u4EFB\u610F)
val_direction=Direction should be 0(bidirectional) or 1(unidirectional)
#===============protocol IP Import end=================
@@ -1089,3 +1089,4 @@ file_desc=File Desc
content_type=Content Type
content_length=Content Length
response_file=Response File
APP_SUBSCRIBE_ID=Certification Mark Configuration

File diff suppressed because it is too large Load Diff

View File

@@ -0,0 +1 @@
ALTER TABLE specific_service_cfg ADD COLUMN business_type VARCHAR(10) NULL COMMENT '业务分类';