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

Merge branch 'develop' of http://192.168.10.125/k18_web/NFS.git into

Browse Source 
develop

Conflicts:
	src/main/java/com/nis/web/controller/configuration/proxy/PxyObjKeyringController.java
	证书增加CN和SAN列，修改时间类型
	common.js去掉无用字符
	国际化增加cert_not_match_domain
This commit is contained in:
duandongmei
2018-11-06 11:36:31 +08:00
parent 295c45f3b7 554fd2a01e
commit e579e0d617
119 changed files with 2944 additions and 1579 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/main/java/com/nis/web/dao/basics/AsnIpCfgDao.java
View File

@@ -19,7 +19,7 @@ public interface AsnIpCfgDao extends CrudDao<AsnIpCfg>{
// public List<ConfigGroupInfo> findPolicyGroupInfosByType(@Param("groupId")Integer groupId);
public List<Integer> findOtherIps(@Param("groupId")Integer groupId,@Param("cfgId")Integer cfgId);
public List<Integer> countValidIPs(@Param("groups")String groups,@Param("ids")String ids);
public ConfigGroupInfo getInfoByAsnNo(@Param("asnId")Integer asnNo);
public List<AsnIpCfg> getByAsnGroup(@Param("groupId")Integer groupId,@Param("asnId")Integer asnNo);
public void deleteByAsnGroup(@Param("groupId")Integer groupId,@Param("asnId")Integer asnNo);
public ConfigGroupInfo getInfoByAsnNo(@Param("asnId")Long asnNo);
public List<AsnIpCfg> getByAsnGroup(@Param("groupId")long groupId,@Param("asnId")long asnNo);
public void deleteByAsnGroup(@Param("groupId")long groupId,@Param("asnId")long asnNo);
}

6
src/main/java/com/nis/web/dao/basics/AsnIpCfgDao.xml
View File

@@ -206,7 +206,7 @@
from asn_ip_cfg r
where r.cfg_id in (${ids}) and is_valid !=-1
</select>
<select id="getByAsnGroup" resultMap="asnIpCfgMap" parameterType="java.lang.Integer" >
<select id="getByAsnGroup" resultMap="asnIpCfgMap" parameterType="java.lang.Long" >
select
<include refid="columns"></include>
from asn_ip_cfg r where r.is_valid!=-1 and r.asn_ip_group=#{groupId} and r.user_region1=#{asnId}
@@ -399,7 +399,7 @@
<!-- <update id="deleteByAsnGroup" parameterType="java.lang.Integer" >
update asn_ip_cfg set is_valid=-1 where asn_ip_group=#{groupId} and user_region1=#{asnId}
</update> -->
<delete id="deleteByAsnGroup" parameterType="java.lang.Integer" >
<delete id="deleteByAsnGroup" parameterType="java.lang.Long" >
delete from asn_ip_cfg where asn_ip_group=#{groupId} and user_region1=#{asnId}
</delete>
<select id="findOtherIps" resultType="java.lang.Integer" parameterType="java.lang.Integer">
@@ -411,7 +411,7 @@
<select id="countValidIPs" resultType="java.lang.Integer" parameterType="java.lang.String">
select count(1) from asn_ip_cfg where is_valid !=-1 and asn_ip_group in(${groups}) and cfg_id not in(${ids}) GROUP BY asn_ip_group;
</select>
<select id="getInfoByAsnNo" resultType="com.nis.domain.specific.ConfigGroupInfo" parameterType="java.lang.Integer">
<select id="getInfoByAsnNo" resultType="com.nis.domain.specific.ConfigGroupInfo" parameterType="java.lang.Long">
select id,group_id,group_name,is_issued,insert_time,update_time,group_type,compile_id,asn_id
from config_group_info c where c.asn_id= #{asnId} and c.group_type=4
</select>

2
src/main/java/com/nis/web/dao/basics/PolicyGroupInfoDao.xml
View File

@@ -12,7 +12,7 @@
<result column="creator_id" property="creatorId" jdbcType="INTEGER" />
<result column="editor_id" property="editorId" jdbcType="INTEGER" />
<result column="service_group_id" property="serviceGroupId" jdbcType="INTEGER" />
<result column="asn_no" property="asnNo" jdbcType="INTEGER" />
<result column="asn_no" property="asnNo" jdbcType="BIGINT" />
<result column="description" property="description" jdbcType="VARCHAR" />
</resultMap>
<sql id="PolicyGroupInfoColumns">

40
src/main/java/com/nis/web/dao/configuration/PxyObjKeyringDao.xml
View File

@@ -13,8 +13,10 @@
<result column="crl" property="crl" jdbcType="VARCHAR" />
<result column="issuer" property="issuer" jdbcType="VARCHAR" />
<result column="subject" property="subject" jdbcType="VARCHAR" />
<result column="not_before_time" property="notBeforeTime" jdbcType="TIMESTAMP" />
<result column="not_after_time" property="notAfterTime" jdbcType="TIMESTAMP" />
<result column="not_before_time" property="notBeforeTime" jdbcType="VARCHAR" />
<result column="not_after_time" property="notAfterTime" jdbcType="VARCHAR" />
<result column="cn" property="cn" jdbcType="VARCHAR" />
<result column="alt_name" property="altName" jdbcType="VARCHAR" />
<result column="action" property="action" jdbcType="INTEGER" />
<result column="is_valid" property="isValid" jdbcType="INTEGER" />
<result column="is_audit" property="isAudit" jdbcType="INTEGER" />
@@ -48,6 +50,8 @@
,r.subject
,r.not_before_time
,r.not_after_time
,r.cn
,r.alt_name
,r.cfg_type,r.action
,r.is_valid,r.is_audit,r.creator_id,r.create_time,r.editor_id
,r.edit_time,r.auditor_id,r.audit_time,r.service_id,r.request_id
@@ -201,6 +205,8 @@
subject,
not_before_time,
not_after_time,
cn,
alt_name,
cfg_type,
compile_Id,
cfg_region_code
@@ -232,8 +238,10 @@
#{crl, jdbcType=VARCHAR},
#{issuer, jdbcType=VARCHAR},
#{subject, jdbcType=VARCHAR},
#{notBeforeTime,jdbcType=TIMESTAMP},
#{notAfterTime,jdbcType=TIMESTAMP},
#{notBeforeTime,jdbcType=VARCHAR},
#{notAfterTime,jdbcType=VARCHAR},
#{cn,jdbcType=VARCHAR},
#{altName,jdbcType=VARCHAR},
#{cfgType,jdbcType=VARCHAR},
#{compileId,jdbcType=INTEGER},
#{cfgRegionCode,jdbcType=INTEGER}
@@ -301,10 +309,10 @@
<if test="keyringType != null" >
keyring_type = #{keyringType,jdbcType=VARCHAR},
</if>
<if test="privateKeyFile != null" >
<if test="privateKeyFile != null and privateKeyFile !=''" >
private_key_file = #{privateKeyFile,jdbcType=VARCHAR},
</if>
<if test="publicKeyFile != null" >
<if test="publicKeyFile != null and publicKeyFile !=''" >
public_key_file = #{publicKeyFile,jdbcType=VARCHAR},
</if>
<if test="expireAfter != null" >
@@ -313,8 +321,26 @@
<if test="publicKeyAlgo != null" >
public_key_algo = #{publicKeyAlgo,jdbcType=VARCHAR},
</if>
<if test="crl != null" >
<if test="crl != null and crl !=''" >
crl = #{crl,jdbcType=VARCHAR},
</if>
<if test="issuer != null and issuer !=''" >
issuer = #{issuer,jdbcType=VARCHAR},
</if>
<if test="subject != null and subject !=''" >
subject = #{subject,jdbcType=VARCHAR},
</if>
<if test="notBeforeTime != null and notBeforeTime !=''" >
not_before_time = #{notBeforeTime,jdbcType=VARCHAR},
</if>
<if test="notAfterTime != null and notAfterTime !=''" >
not_after_time = #{notAfterTime,jdbcType=VARCHAR},
</if>
<if test="cn != null and cn !=''" >
cn = #{cn,jdbcType=VARCHAR},
</if>
<if test="altName != null and altName !=''" >
alt_name = #{altName,jdbcType=VARCHAR},
</if>
</trim>
</set>

14
src/main/java/com/nis/web/dao/configuration/WebsiteCfgDao.xml
View File

@@ -282,9 +282,9 @@
<if test="httpReqBody!=null">
AND a.compile_id in (select f.compile_id from http_body_cfg f
<where>
and cfg_type='NTC_HTTP_REQ_BODY'
AND f.cfg_type = #{httpReqBody.cfgType}
<if test="httpReqBody.cfgKeywords != null and httpReqBody.cfgKeywords != ''">
and REPLACE(f.cfg_keywords,'***and***','|') like concat(concat('%',#{httpReqBody.cfgKeywords,jdbcType=VARCHAR}),'%')
AND REPLACE(f.cfg_keywords,'***and***','|') like concat(concat('%',#{httpReqBody.cfgKeywords,jdbcType=VARCHAR}),'%')
</if>
</where>
@@ -293,9 +293,9 @@
<if test="httpResBody!=null">
AND a.compile_id in (select f.compile_id from http_body_cfg f
<where>
and cfg_type='NTC_HTTP_RES_BODY'
AND f.cfg_type = #{httpResBody.cfgType}
<if test="httpResBody.cfgKeywords != null and httpResBody.cfgKeywords != ''">
and REPLACE(f.cfg_keywords,'***and***','|') like concat(concat('%',#{httpResBody.cfgKeywords,jdbcType=VARCHAR}),'%')
AND REPLACE(f.cfg_keywords,'***and***','|') like concat(concat('%',#{httpResBody.cfgKeywords,jdbcType=VARCHAR}),'%')
</if>
</where>
@@ -304,8 +304,9 @@
<if test="httpReqHdr!=null">
AND a.compile_id in (select f.compile_id from http_req_head_cfg f
<where>
AND f.cfg_type = #{httpReqHdr.cfgType}
<if test="httpReqHdr.cfgKeywords != null and httpReqHdr.cfgKeywords != ''">
REPLACE(f.cfg_keywords,'***and***','|') like concat(concat('%',#{httpReqHdr.cfgKeywords,jdbcType=VARCHAR}),'%')
AND REPLACE(f.cfg_keywords,'***and***','|') like concat(concat('%',#{httpReqHdr.cfgKeywords,jdbcType=VARCHAR}),'%')
</if>
</where>
)
@@ -313,8 +314,9 @@
<if test="httpResHdr!=null">
AND a.compile_id in (select f.compile_id from http_res_head_cfg f
<where>
AND f.cfg_type = #{httpResHdr.cfgType}
<if test="httpResHdr.cfgKeywords != null and httpResHdr.cfgKeywords != ''">
REPLACE(f.cfg_keywords,'***and***','|') like concat(concat('%',#{httpResHdr.cfgKeywords,jdbcType=VARCHAR}),'%')
AND REPLACE(f.cfg_keywords,'***and***','|') like concat(concat('%',#{httpResHdr.cfgKeywords,jdbcType=VARCHAR}),'%')
</if>
</where>
)