1、协议中菜单dns增加公共组配置,同时修改审核,取消审核公共组部分,并且界面回显展示组号。

2、协议菜单中http url 增加公共组配置,同时修改审核,取消审核公共组部分,并且界面回显展示组号。

(cherry picked from commit d1f64348f4)
This commit is contained in:
zhanghongqing
2019-02-18 09:51:00 +00:00
committed by 董晓燕
parent 8194fb290c
commit 67f44a9b30
10 changed files with 95 additions and 7 deletions

View File

@@ -134,7 +134,7 @@
a.SERVICE_ID,a.REQUEST_ID,a.COMPILE_ID,a.IS_AREA_EFFECTIVE,a.CLASSIFY,
a.ATTRIBUTE,a.LABLE,a.AREA_EFFECTIVE_IDS,a.function_id,a.dns_strategy_id,a.user_region1,
a.user_region2,a.user_region3,a.user_region4,a.user_region5,a.do_log,a.source_compile_id,a.cancel_request_id,
a.do_blacklist
a.do_blacklist,a.common_group_ids
</sql>
<sql id="IpCfg_Column" >
a.cfg_id,a.cfg_desc,a.ip_type,a.src_ip_address,a.ip_pattern,a.port_pattern,a.src_port
@@ -490,7 +490,8 @@
user_region5,
do_log,
source_compile_id,
do_blacklist
do_blacklist,
common_group_ids
)values (
#{cfgDesc,jdbcType=VARCHAR},
#{action,jdbcType=INTEGER},
@@ -519,7 +520,8 @@
#{userRegion5,jdbcType=VARCHAR},
#{doLog,jdbcType=INTEGER},
#{sourceCompileId,jdbcType=INTEGER},
#{doBlackList,jdbcType=INTEGER}
#{doBlackList,jdbcType=INTEGER},
#{commonGroupIds,jdbcType=VARCHAR}
)
</insert>
<!-- insert ip_port_cfg表信息 -->
@@ -948,6 +950,9 @@
user_region4 = #{userRegion4,jdbcType=VARCHAR},
user_region5 = #{userRegion5,jdbcType=VARCHAR},
dns_strategy_id = #{dnsStrategyId,jdbcType=INTEGER},
<if test="commonGroupIds != null">
common_group_ids = #{commonGroupIds,jdbcType=VARCHAR}
</if>
</trim>
</set>
where cfg_id = #{cfgId,jdbcType=BIGINT}