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

(1)app ip 界面IP属性使用function_region_dict控制

Browse Source 
(2)app ip IP复用策略提交
This commit is contained in:
wangxin
2018-09-07 20:18:59 +08:00
parent ecb139bd9a
commit f474a98e50
8 changed files with 314 additions and 61 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/main/java/com/nis/web/dao/configuration/AppCfgDao.java
View File

@@ -98,4 +98,5 @@ public interface AppCfgDao {
//域名关联表操作
public List<WebsiteDomainTopic> getDomainDict(WebsiteDomainTopic websiteDomainTopic);
public void saveDomainDict(WebsiteDomainTopic websiteDomainTopic);
public List<AppIpCfg> getAppIpCfgBySpecServiceId(Integer specServiceId);
}

13
src/main/java/com/nis/web/dao/configuration/AppCfgDao.xml
View File

@@ -394,7 +394,7 @@
r.SERVICE_ID,r.REQUEST_ID,r.COMPILE_ID,r.IS_AREA_EFFECTIVE,r.CLASSIFY,
r.ATTRIBUTE,r.LABLE,AREA_EFFECTIVE_IDS,r.RATELIMIT,r.FUNCTION_ID,r.CFG_TYPE,r.CFG_REGION_CODE,
r.IP_TYPE, r.IP_PATTERN, r.SRC_IP_ADDRESS,r.DEST_IP_ADDRESS, r.PORT_PATTERN,r.SRC_PORT,DEST_PORT,
r.DIRECTION,r.PROTOCOL,r.DO_LOG
r.DIRECTION,r.PROTOCOL,r.DO_LOG,r.USER_REGION1,r.USER_REGION2,r.USER_REGION3,r.USER_REGION4,r.USER_REGION5
</sql>
<sql id="AppHttpCfg_Column" >
@@ -526,6 +526,12 @@
FROM app_ip_cfg r
WHERE CFG_ID = #{cfgId,jdbcType=BIGINT}
</select>
<select id="getAppIpCfgBySpecServiceId" resultMap="AppIpCfgMap" parameterType="java.lang.Integer" >
SELECT
<include refid="AppIpCfg_Column" />
FROM app_ip_cfg r
WHERE r.spec_service_id = #{specServiceId,jdbcType=INTEGER} and r.is_valid !=-1 order by r.compile_id desc limit 1
</select>
<select id="getAppHttpCfg" resultMap="AppHttpCfgMap" parameterType="java.lang.Long" >
SELECT
<include refid="AppHttpCfg_Column" />
@@ -1694,12 +1700,13 @@
SERVICE_ID,REQUEST_ID,COMPILE_ID,IS_AREA_EFFECTIVE,CLASSIFY,
ATTRIBUTE,LABLE,AREA_EFFECTIVE_IDS,RATELIMIT,FUNCTION_ID,CFG_TYPE,CFG_REGION_CODE,
IP_TYPE, IP_PATTERN, SRC_IP_ADDRESS,DEST_IP_ADDRESS, PORT_PATTERN,SRC_PORT,DEST_PORT,
DIRECTION,PROTOCOL,DO_LOG
DIRECTION,PROTOCOL,DO_LOG,user_region1,user_region2,user_region3,user_region4,user_region5
)values (
<include refid="AppCommonCfg_Value_List" />,
#{ipType,jdbcType=INTEGER}, #{ipPattern,jdbcType=INTEGER},#{srcIpAddress,jdbcType=VARCHAR},#{destIpAddress,jdbcType=VARCHAR},
#{portPattern,jdbcType=INTEGER},#{srcPort,jdbcType=VARCHAR},#{destPort,jdbcType=VARCHAR},#{direction,jdbcType=INTEGER},
#{protocol,jdbcType=INTEGER},#{doLog,jdbcType=INTEGER}
#{protocol,jdbcType=INTEGER},#{doLog,jdbcType=INTEGER},#{userRegion1,jdbcType=VARCHAR},#{userRegion2,jdbcType=VARCHAR}
,#{userRegion3,jdbcType=VARCHAR},#{userRegion4,jdbcType=VARCHAR},#{userRegion5,jdbcType=VARCHAR}
)
</insert>
<insert id="insertAppHttpCfg" parameterType="com.nis.domain.configuration.AppHttpCfg" >