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

1.修改配置列表查询缺省排序根据是否审核与有效标识字段，生效的配置排在前面；

Browse Source 
2.修改黑名单选项只有在block动作时显示，其他动作不显示该属性
This commit is contained in:
zhangwei
2018-12-23 15:44:45 +06:00
parent a0e944b2ed
commit 2564a258f2
40 changed files with 132 additions and 127 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/main/java/com/nis/web/controller/log/ntc/CollectVoipLogController.java
View File

@@ -142,7 +142,7 @@ public class CollectVoipLogController extends BaseController {
url = Constants.LOG_BASE_URL + Constants.NTC_COLLECT_VOIP_LOG;
String jsonString = HttpClientUtil.getMsg(url, params, request);
// GsonBuilder builder = new GsonBuilder();
GsonBuilder builder = new GsonBuilder();
// builder.registerTypeAdapter(Date.class, new JsonDeserializer<Date>() {
//
// public Date deserialize(JsonElement json, java.lang.reflect.Type typeOfT,
@@ -150,8 +150,8 @@ public class CollectVoipLogController extends BaseController {
// return new Date(json.getAsJsonPrimitive().getAsLong());
// }
// });
// Gson gson = builder.setDateFormat("yyyy-MM-dd HH:mm:ss").create();
Gson gson = new GsonBuilder().create();
Gson gson = builder.setDateFormat("yyyy-MM-dd HH:mm:ss").create();
// Gson gson = new GsonBuilder().create();
// gson泛型支持
LogRecvData<NtcCollectVoipLog> fromJson = gson.fromJson(jsonString,
new TypeToken<LogRecvData<NtcCollectVoipLog>>() {

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

@@ -682,10 +682,10 @@
</trim>
<choose>
<when test="page !=null and page.orderBy != null and page.orderBy != ''">
ORDER BY ${page.orderBy}
ORDER BY ${page.orderBy},r.is_valid desc, r.is_audit,r.CFG_ID desc
</when>
<otherwise>
ORDER BY CFG_ID desc
ORDER BY r.is_valid desc, r.is_audit,r.CFG_ID desc
</otherwise>
</choose>
</select>
@@ -826,10 +826,10 @@
</trim>
<choose>
<when test="page !=null and page.orderBy != null and page.orderBy != ''">
ORDER BY ${page.orderBy}
ORDER BY ${page.orderBy},r.is_valid desc, r.is_audit,r.CFG_ID desc
</when>
<otherwise>
ORDER BY CFG_ID desc
ORDER BY r.is_valid desc, r.is_audit,r.CFG_ID desc
</otherwise>
</choose>
</select>
@@ -956,10 +956,10 @@
</trim>
<choose>
<when test="page !=null and page.orderBy != null and page.orderBy != ''">
ORDER BY ${page.orderBy}
ORDER BY ${page.orderBy},r.is_valid desc, r.is_audit,r.CFG_ID desc
</when>
<otherwise>
ORDER BY CFG_ID desc
ORDER BY r.is_valid desc, r.is_audit,r.CFG_ID desc
</otherwise>
</choose>
</select>
@@ -1059,10 +1059,10 @@
</trim>
<choose>
<when test="page !=null and page.orderBy != null and page.orderBy != ''">
ORDER BY ${page.orderBy}
ORDER BY ${page.orderBy},r.is_valid desc, r.is_audit,r.CFG_ID desc
</when>
<otherwise>
ORDER BY CFG_ID desc
ORDER BY r.is_valid desc, r.is_audit,r.CFG_ID desc
</otherwise>
</choose>
</select>
@@ -1159,10 +1159,10 @@
</trim>
<choose>
<when test="page !=null and page.orderBy != null and page.orderBy != ''">
ORDER BY ${page.orderBy}
ORDER BY ${page.orderBy},r.is_valid desc, r.is_audit,r.CFG_ID desc
</when>
<otherwise>
ORDER BY CFG_ID desc
ORDER BY r.is_valid desc, r.is_audit,r.CFG_ID desc
</otherwise>
</choose>
</select>
@@ -1260,10 +1260,10 @@
</trim>
<choose>
<when test="page !=null and page.orderBy != null and page.orderBy != ''">
ORDER BY ${page.orderBy}
ORDER BY ${page.orderBy},r.is_valid desc, r.is_audit,r.CFG_ID desc
</when>
<otherwise>
ORDER BY CFG_ID desc
ORDER BY r.is_valid desc, r.is_audit,r.CFG_ID desc
</otherwise>
</choose>
</select>
@@ -1360,10 +1360,10 @@
</trim>
<choose>
<when test="page !=null and page.orderBy != null and page.orderBy != ''">
ORDER BY ${page.orderBy}
ORDER BY ${page.orderBy},r.is_valid desc, r.is_audit,r.CFG_ID desc
</when>
<otherwise>
ORDER BY CFG_ID desc
ORDER BY r.is_valid desc, r.is_audit,r.CFG_ID desc
</otherwise>
</choose>
</select>
@@ -1455,10 +1455,10 @@
</trim>
<choose>
<when test="page !=null and page.orderBy != null and page.orderBy != ''">
ORDER BY ${page.orderBy}
ORDER BY ${page.orderBy},r.is_valid desc, r.is_audit,r.CFG_ID desc
</when>
<otherwise>
ORDER BY CFG_ID desc
ORDER BY r.is_valid desc, r.is_audit,r.CFG_ID desc
</otherwise>
</choose>
</select>
@@ -1558,10 +1558,10 @@
</trim>
<choose>
<when test="page !=null and page.orderBy != null and page.orderBy != ''">
ORDER BY ${page.orderBy}
ORDER BY ${page.orderBy},r.is_valid desc, r.is_audit,r.CFG_ID desc
</when>
<otherwise>
ORDER BY CFG_ID desc
ORDER BY r.is_valid desc, r.is_audit,r.CFG_ID desc
</otherwise>
</choose>
</select>
@@ -1661,10 +1661,10 @@
</trim>
<choose>
<when test="page !=null and page.orderBy != null and page.orderBy != ''">
ORDER BY ${page.orderBy}
ORDER BY ${page.orderBy},r.is_valid desc, r.is_audit,r.CFG_ID desc
</when>
<otherwise>
ORDER BY CFG_ID desc
ORDER BY r.is_valid desc, r.is_audit,r.CFG_ID desc
</otherwise>
</choose>
</select>

4
src/main/java/com/nis/web/dao/configuration/AppMultiFeatureCfgDao.xml
View File

@@ -352,10 +352,10 @@
</trim>
<choose>
<when test="page !=null and page.orderBy != null and page.orderBy != ''">
ORDER BY ${page.orderBy}
ORDER BY ${page.orderBy}，r.is_valid desc, r.is_audit,r.CFG_ID desc
</when>
<otherwise>
ORDER BY CFG_ID desc
ORDER BY r.is_valid desc, r.is_audit,r.CFG_ID desc
</otherwise>
</choose>
</select>

4
src/main/java/com/nis/web/dao/configuration/AsnPolicyCfgDao.xml
View File

@@ -130,10 +130,10 @@
</trim>
<choose>
<when test="page !=null and page.orderBy != null and page.orderBy != ''">
ORDER BY ${page.orderBy}
ORDER BY ${page.orderBy},r.is_valid desc, r.is_audit,r.CFG_ID desc
</when>
<otherwise>
ORDER BY r.CFG_ID desc
ORDER BY r.is_valid desc, r.is_audit,r.CFG_ID desc
</otherwise>
</choose>
</select>

8
src/main/java/com/nis/web/dao/configuration/AvCfgDao.xml
View File

@@ -190,10 +190,10 @@
</trim>
<choose>
<when test="page !=null and page.orderBy != null and page.orderBy != ''">
ORDER BY ${page.orderBy}
ORDER BY ${page.orderBy},a.is_valid desc, a.is_audit,a.CFG_ID desc
</when>
<otherwise>
ORDER BY CFG_ID desc
ORDER BY a.is_valid desc, a.is_audit,a.CFG_ID desc
</otherwise>
</choose>
</select>
@@ -289,10 +289,10 @@
</trim>
<choose>
<when test="page !=null and page.orderBy != null and page.orderBy != ''">
ORDER BY ${page.orderBy}
ORDER BY ${page.orderBy},a.is_valid desc, a.is_audit,a.CFG_ID desc
</when>
<otherwise>
ORDER BY CFG_ID desc
ORDER BY a.is_valid desc, a.is_audit,a.CFG_ID desc
</otherwise>
</choose>
</select>

16
src/main/java/com/nis/web/dao/configuration/AvContentCfgDao.xml
View File

@@ -411,10 +411,10 @@
</trim>
<choose>
<when test="page !=null and page.orderBy != null and page.orderBy != ''">
ORDER BY ${page.orderBy}
ORDER BY ${page.orderBy},r.is_valid desc, r.is_audit,r.CFG_ID desc
</when>
<otherwise>
ORDER BY r.CFG_ID desc
ORDER BY r.is_valid desc, r.is_audit,r.CFG_ID desc
</otherwise>
</choose>
</select>
@@ -538,10 +538,10 @@
</trim>
<choose>
<when test="page !=null and page.orderBy != null and page.orderBy != ''">
ORDER BY ${page.orderBy}
ORDER BY ${page.orderBy},r.is_valid desc, r.is_audit,r.CFG_ID desc
</when>
<otherwise>
ORDER BY r.CFG_ID desc
ORDER BY r.is_valid desc, r.is_audit,r.CFG_ID desc
</otherwise>
</choose>
</select>
@@ -1577,10 +1577,10 @@
</trim>
<choose>
<when test="page !=null and page.orderBy != null and page.orderBy != ''">
ORDER BY ${page.orderBy}
ORDER BY ${page.orderBy},r.is_valid desc, r.is_audit,r.CFG_ID desc
</when>
<otherwise>
ORDER BY r.CFG_ID desc
ORDER BY r.is_valid desc, r.is_audit,r.CFG_ID desc
</otherwise>
</choose>
</select>
@@ -1886,10 +1886,10 @@
</trim>
<choose>
<when test="page !=null and page.orderBy != null and page.orderBy != ''">
ORDER BY ${page.orderBy}
ORDER BY ${page.orderBy},r.is_valid desc, r.is_audit,r.CFG_ID desc
</when>
<otherwise>
ORDER BY r.CFG_ID desc
ORDER BY r.is_valid desc, r.is_audit,r.CFG_ID desc
</otherwise>
</choose>
</select>

4
src/main/java/com/nis/web/dao/configuration/BgpCfgDao.xml
View File

@@ -285,10 +285,10 @@
</trim>
<choose>
<when test="page !=null and page.orderBy != null and page.orderBy != ''">
ORDER BY ${page.orderBy}
ORDER BY ${page.orderBy},a.is_valid desc, a.is_audit,a.CFG_ID desc
</when>
<otherwise>
ORDER BY a.CFG_ID desc
ORDER BY a.is_valid desc, a.is_audit,a.CFG_ID desc
</otherwise>
</choose>
</select>

4
src/main/java/com/nis/web/dao/configuration/CommonPolicyDao.xml
View File

@@ -274,10 +274,10 @@
</trim>
<choose>
<when test="page !=null and page.orderBy != null and page.orderBy != ''">
ORDER BY ${page.orderBy}
ORDER BY ${page.orderBy},a.is_valid desc, a.is_audit,a.CFG_ID desc
</when>
<otherwise>
ORDER BY a.CFG_ID desc
ORDER BY a.is_valid desc, a.is_audit,a.CFG_ID desc
</otherwise>
</choose>
</select>

10
src/main/java/com/nis/web/dao/configuration/ComplexStringCfgDao.xml
View File

@@ -286,10 +286,10 @@
</trim>
<choose>
<when test="page !=null and page.orderBy != null and page.orderBy != ''">
ORDER BY ${page.orderBy}
ORDER BY ${page.orderBy},r.is_valid desc, r.is_audit,r.CFG_ID desc
</when>
<otherwise>
ORDER BY CFG_ID desc
ORDER BY r.is_valid desc, r.is_audit,r.CFG_ID desc
</otherwise>
</choose>
</select>
@@ -303,7 +303,7 @@
<include refid="ComplexkeywordCfg_Column_List_with_id"/>
</otherwise>
</choose>
from ${tableName}
from ${tableName} a
<trim prefix="WHERE" prefixOverrides="AND |OR ">
<if test="page !=null and page.where != null and page.where != ''">
AND ${page.where}
@@ -311,10 +311,10 @@
</trim>
<choose>
<when test="page !=null and page.orderBy != null and page.orderBy != ''">
ORDER BY ${page.orderBy}
ORDER BY ${page.orderBy},a.is_valid desc, a.is_audit,a.CFG_ID desc
</when>
<otherwise>
ORDER BY CFG_ID desc
ORDER BY a.is_valid desc, a.is_audit,a.CFG_ID desc
</otherwise>
</choose>
</select>

4
src/main/java/com/nis/web/dao/configuration/ControlPolicyDao.xml
View File

@@ -122,10 +122,10 @@
</trim>
<choose>
<when test="page !=null and page.orderBy != null and page.orderBy != ''">
ORDER BY ${page.orderBy}
ORDER BY ${page.orderBy},r.is_valid desc, r.is_audit,r.CFG_ID desc
</when>
<otherwise>
ORDER BY r.CFG_ID desc
ORDER BY r.is_valid desc, r.is_audit,r.CFG_ID desc
</otherwise>
</choose>
</select>

4
src/main/java/com/nis/web/dao/configuration/DdosCfgDao.xml
View File

@@ -170,10 +170,10 @@
</trim>
<choose>
<when test="page !=null and page.orderBy != null and page.orderBy != ''">
ORDER BY ${page.orderBy}
ORDER BY ${page.orderBy},r.is_valid desc, r.is_audit,r.CFG_ID desc
</when>
<otherwise>
ORDER BY r.CFG_ID desc
ORDER BY r.is_valid desc, r.is_audit,r.CFG_ID desc
</otherwise>
</choose>
</select>

4
src/main/java/com/nis/web/dao/configuration/DnsIpCfgDao.xml
View File

@@ -172,10 +172,10 @@
</trim>
<choose>
<when test="page !=null and page.orderBy != null and page.orderBy != ''">
ORDER BY ${page.orderBy}
ORDER BY ${page.orderBy},r.is_valid desc, r.is_audit,r.CFG_ID desc
</when>
<otherwise>
ORDER BY r.CFG_ID desc
ORDER BY r.is_valid desc, r.is_audit,r.CFG_ID desc
</otherwise>
</choose>
</select>

4
src/main/java/com/nis/web/dao/configuration/DnsResStrategyDao.xml
View File

@@ -129,10 +129,10 @@
</trim>
<choose>
<when test="page !=null and page.orderBy != null and page.orderBy != ''">
ORDER BY ${page.orderBy}
ORDER BY ${page.orderBy},r.is_valid desc, r.is_audit,r.CFG_ID desc
</when>
<otherwise>
ORDER BY r.CFG_ID desc
ORDER BY r.is_valid desc, r.is_audit,r.CFG_ID desc
</otherwise>
</choose>
</select>

4
src/main/java/com/nis/web/dao/configuration/DomainDao.xml
View File

@@ -305,10 +305,10 @@
</trim>
<choose>
<when test="page !=null and page.orderBy != null and page.orderBy != ''">
ORDER BY ${page.orderBy}
ORDER BY ${page.orderBy},r.is_valid desc, r.is_audit,r.CFG_ID desc
</when>
<otherwise>
ORDER BY CFG_ID desc
ORDER BY r.is_valid desc, r.is_audit,r.CFG_ID desc
</otherwise>
</choose>
</select>

12
src/main/java/com/nis/web/dao/configuration/FileTransferCfgDao.xml
View File

@@ -311,10 +311,10 @@
</trim>
<choose>
<when test="page !=null and page.orderBy != null and page.orderBy != ''">
ORDER BY ${page.orderBy}
ORDER BY ${page.orderBy},a.is_valid desc, a.is_audit,a.CFG_ID desc
</when>
<otherwise>
ORDER BY a.CFG_ID desc
ORDER BY a.is_valid desc, a.is_audit,a.CFG_ID desc
</otherwise>
</choose>
</select>
@@ -765,10 +765,10 @@
</trim>
<choose>
<when test="page !=null and page.orderBy != null and page.orderBy != ''">
ORDER BY ${page.orderBy}
ORDER BY ${page.orderBy},a.is_valid desc, a.is_audit,a.CFG_ID desc
</when>
<otherwise>
ORDER BY a.CFG_ID desc
ORDER BY a.is_valid desc, a.is_audit,a.CFG_ID desc
</otherwise>
</choose>
</select>
@@ -1153,10 +1153,10 @@
</trim>
<choose>
<when test="page !=null and page.orderBy != null and page.orderBy != ''">
ORDER BY ${page.orderBy}
ORDER BY ${page.orderBy},a.is_valid desc, a.is_audit,a.CFG_ID desc
</when>
<otherwise>
ORDER BY a.CFG_ID desc
ORDER BY a.is_valid desc, a.is_audit,a.CFG_ID desc
</otherwise>
</choose>
</select>

6
src/main/java/com/nis/web/dao/configuration/IpAddrPoolCfgDao.xml
View File

@@ -135,10 +135,10 @@
</trim>
<choose>
<when test="page !=null and page.orderBy != null and page.orderBy != ''">
ORDER BY ${page.orderBy}
ORDER BY ${page.orderBy},r.is_valid desc, r.is_audit,r.CFG_ID desc
</when>
<otherwise>
ORDER BY r.cfg_id DESC
ORDER BY r.is_valid desc, r.is_audit,r.CFG_ID desc
</otherwise>
</choose>
</select>
@@ -163,7 +163,7 @@
AND r.is_audit = #{isAudit,jdbcType=INTEGER}
</if>
</where>
ORDER BY r.cfg_id
ORDER BY r.is_valid desc, r.is_audit,r.CFG_ID desc
</select>
<!-- 保存地址池IP信息 -->

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

@@ -531,10 +531,10 @@
</trim>
<choose>
<when test="page !=null and page.orderBy != null and page.orderBy != ''">
ORDER BY ${page.orderBy}
ORDER BY ${page.orderBy},r.is_valid desc, r.is_audit,r.CFG_ID desc
</when>
<otherwise>
ORDER BY r.CFG_ID desc
ORDER BY r.is_valid desc, r.is_audit,r.CFG_ID desc
</otherwise>
</choose>
</select>
@@ -548,7 +548,7 @@
<include refid="BaseIpCfg_Column_List_with_id"/>
</otherwise>
</choose>
from ${tableName}
from ${tableName} r
<trim prefix="WHERE" prefixOverrides="AND |OR ">
<if test="page !=null and page.where != null and page.where != ''">
AND ${page.where}
@@ -556,10 +556,10 @@
</trim>
<choose>
<when test="page !=null and page.orderBy != null and page.orderBy != ''">
ORDER BY ${page.orderBy}
ORDER BY ${page.orderBy},r.is_valid desc, r.is_audit,r.CFG_ID desc
</when>
<otherwise>
ORDER BY CFG_ID desc
ORDER BY r.is_valid desc, r.is_audit,r.CFG_ID desc
</otherwise>
</choose>
</select>
@@ -1141,10 +1141,10 @@
</trim>
<choose>
<when test="page !=null and page.orderBy != null and page.orderBy != ''">
ORDER BY ${page.orderBy}
ORDER BY ${page.orderBy},a.is_valid desc, a.is_audit,a.CFG_ID desc
</when>
<otherwise>
ORDER BY a.CFG_ID desc
ORDER BY a.is_valid desc, a.is_audit,a.CFG_ID desc
</otherwise>
</choose>
</select>

12
src/main/java/com/nis/web/dao/configuration/IpMultiplexDao.xml
View File

@@ -188,10 +188,10 @@
</trim>
<choose>
<when test="page !=null and page.orderBy != null and page.orderBy != ''">
ORDER BY ${page.orderBy}
ORDER BY ${page.orderBy},r.is_valid desc, r.is_audit,r.CFG_ID desc
</when>
<otherwise>
ORDER BY r.cfg_id DESC
ORDER BY r.is_valid desc, r.is_audit,r.CFG_ID desc
</otherwise>
</choose>
</select>
@@ -213,7 +213,7 @@
AND r.is_valid != -1
</if>
</where>
ORDER BY r.cfg_id
ORDER BY r.is_valid desc, r.is_audit,r.CFG_ID desc
</select>
<insert id="savePolicyCfg" parameterType="com.nis.domain.configuration.IpReusePolicyCfg">
@@ -684,10 +684,10 @@
</trim>
<choose>
<when test="page !=null and page.orderBy != null and page.orderBy != ''">
ORDER BY ${page.orderBy}
ORDER BY ${page.orderBy},a.is_valid desc, a.is_audit,a.CFG_ID desc
</when>
<otherwise>
ORDER BY a.cfg_id DESC
ORDER BY a.is_valid desc, a.is_audit,a.CFG_ID desc
</otherwise>
</choose>
</select>
@@ -709,7 +709,7 @@
AND a.is_valid != -1
</if>
</where>
ORDER BY a.cfg_id
ORDER BY a.is_valid desc, a.is_audit,a.CFG_ID desc
</select>
<select id="getSnatCfg" resultMap="policyMap">

4
src/main/java/com/nis/web/dao/configuration/IpMultiplexPoolCfgDao.xml
View File

@@ -168,10 +168,10 @@
</trim>
<choose>
<when test="page !=null and page.orderBy != null and page.orderBy != ''">
ORDER BY ${page.orderBy}
ORDER BY ${page.orderBy},r.is_valid desc, r.is_audit,r.CFG_ID desc
</when>
<otherwise>
ORDER BY r.CFG_ID desc
ORDER BY r.is_valid desc, r.is_audit,r.CFG_ID desc
</otherwise>
</choose>
</select>

4
src/main/java/com/nis/web/dao/configuration/MailCfgDao.xml
View File

@@ -243,10 +243,10 @@
</trim>
<choose>
<when test="page !=null and page.orderBy != null and page.orderBy != ''">
ORDER BY ${page.orderBy}
ORDER BY ${page.orderBy},a.is_valid desc, a.is_audit,a.CFG_ID desc
</when>
<otherwise>
ORDER BY a.CFG_ID desc
ORDER BY a.is_valid desc, a.is_audit,a.CFG_ID desc
</otherwise>
</choose>
</select>

4
src/main/java/com/nis/web/dao/configuration/ProxyFileStrategyDao.xml
View File

@@ -127,10 +127,10 @@
</trim>
<choose>
<when test="page !=null and page.orderBy != null and page.orderBy != ''">
ORDER BY ${page.orderBy}
ORDER BY ${page.orderBy},a.is_valid desc, a.is_audit,a.CFG_ID desc
</when>
<otherwise>
ORDER BY a.CFG_ID desc
ORDER BY a.is_valid desc, a.is_audit,a.CFG_ID desc
</otherwise>
</choose>
</select>

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

@@ -213,10 +213,10 @@
</trim>
<choose>
<when test="page !=null and page.orderBy != null and page.orderBy != ''">
ORDER BY ${page.orderBy}
ORDER BY ${page.orderBy},r.is_valid desc, r.is_audit,r.CFG_ID desc
</when>
<otherwise>
ORDER BY r.CFG_ID desc
ORDER BY r.is_valid desc, r.is_audit,r.CFG_ID desc
</otherwise>
</choose>
</select>
@@ -296,10 +296,10 @@
</trim>
<choose>
<when test="page !=null and page.orderBy != null and page.orderBy != ''">
ORDER BY ${page.orderBy}
ORDER BY ${page.orderBy},r.is_valid desc, r.is_audit,r.CFG_ID desc
</when>
<otherwise>
ORDER BY r.CFG_ID desc
ORDER BY r.is_valid desc, r.is_audit,r.CFG_ID desc
</otherwise>
</choose>
</select>

4
src/main/java/com/nis/web/dao/configuration/PxyObjSpoofingIpPoolDao.xml
View File

@@ -121,10 +121,10 @@
</trim>
<choose>
<when test="page !=null and page.orderBy != null and page.orderBy != ''">
ORDER BY ${page.orderBy}
ORDER BY ${page.orderBy},r.is_valid desc, r.is_audit,r.CFG_ID desc
</when>
<otherwise>
ORDER BY r.CFG_ID desc
ORDER BY r.is_valid desc, r.is_audit,r.CFG_ID desc
</otherwise>
</choose>
</select>

4
src/main/java/com/nis/web/dao/configuration/RequestInfoDao.xml
View File

@@ -86,10 +86,10 @@
</trim>
<choose>
<when test="page !=null and page.orderBy != null and page.orderBy != ''">
ORDER BY ${page.orderBy}
ORDER BY ${page.orderBy},r.is_valid desc, r.is_audit,r.create_time desc
</when>
<otherwise>
ORDER BY r.create_time desc
ORDER BY r.is_valid desc, r.is_audit,r.create_time desc
</otherwise>
</choose>

10
src/main/java/com/nis/web/dao/configuration/StringCfgDao.xml
View File

@@ -346,10 +346,10 @@
</trim>
<choose>
<when test="page !=null and page.orderBy != null and page.orderBy != ''">
ORDER BY ${page.orderBy}
ORDER BY ${page.orderBy},r.is_valid desc, r.is_audit,r.cfg_id desc
</when>
<otherwise>
ORDER BY CFG_ID desc
ORDER BY r.is_valid desc, r.is_audit,r.cfg_id desc
</otherwise>
</choose>
</select>
@@ -363,7 +363,7 @@
<include refid="BaseStringCfg_Column_List_with_id"/>
</otherwise>
</choose>
from ${tableName}
from ${tableName} r
<trim prefix="WHERE" prefixOverrides="AND |OR ">
<if test="page !=null and page.where != null and page.where != ''">
AND ${page.where}
@@ -371,10 +371,10 @@
</trim>
<choose>
<when test="page !=null and page.orderBy != null and page.orderBy != ''">
ORDER BY ${page.orderBy}
ORDER BY ${page.orderBy},r.is_valid desc, r.is_audit,r.cfg_id desc
</when>
<otherwise>
ORDER BY CFG_ID desc
ORDER BY r.is_valid desc, r.is_audit,r.cfg_id desc
</otherwise>
</choose>
</select>

4
src/main/java/com/nis/web/dao/configuration/TaskInfoDao.xml
View File

@@ -84,10 +84,10 @@
<choose>
<when test="page !=null and page.orderBy != null and page.orderBy != ''">
ORDER BY ${page.orderBy}
ORDER BY ${page.orderBy},r.is_valid desc, r.is_audit,r.create_time desc
</when>
<otherwise>
ORDER BY r.create_time desc
ORDER BY r.is_valid desc, r.is_audit,r.create_time desc
</otherwise>
</choose>
</select>

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

@@ -333,10 +333,10 @@
</trim>
<choose>
<when test="page !=null and page.orderBy != null and page.orderBy != ''">
ORDER BY ${page.orderBy}
ORDER BY ${page.orderBy},a.is_valid desc, a.is_audit,a.CFG_ID desc
</when>
<otherwise>
ORDER BY a.CFG_ID desc
ORDER BY a.is_valid desc, a.is_audit,a.CFG_ID desc
</otherwise>
</choose>
</select>

4
src/main/webapp/WEB-INF/views/cfg/av/contUrl/contUrlForm.jsp
View File

@@ -237,12 +237,12 @@
</c:forEach>
</div>
</div>
<div class="col-md-6">
<div class="col-md-6 doBalckList">
<div class="form-group">
<label class="control-label col-md-3"><spring:message code="do_blacklist" /></label>
<c:forEach items="${fns:getDictList('DO_BLACKLIST') }" var="dict">
<c:choose>
<c:when test="${dict.itemCode eq _cfg.doBlackList}">
<c:when test="${dict.itemCode eq _cfg.doBlackList or not empty_cfg.doBalckList}">
<label class="radio-inline">
<input type="radio" name="doBlackList" checked value="${dict.itemCode}" ><spring:message code="${dict.itemValue}"/>
</label>

4
src/main/webapp/WEB-INF/views/cfg/av/voip/voipForm.jsp
View File

@@ -237,12 +237,12 @@
</c:forEach>
</div>
</div>
<div class="col-md-6">
<div class="col-md-6 doBalckList">
<div class="form-group">
<label class="control-label col-md-3"><spring:message code="do_blacklist" /></label>
<c:forEach items="${fns:getDictList('DO_BLACKLIST') }" var="dict">
<c:choose>
<c:when test="${dict.itemCode eq _cfg.doBlackList}">
<c:when test="${dict.itemCode eq _cfg.doBlackList or not empty_cfg.doBalckList}">
<label class="radio-inline">
<input type="radio" name="doBlackList" checked value="${dict.itemCode}" ><spring:message code="${dict.itemValue}"/>
</label>

4
src/main/webapp/WEB-INF/views/cfg/fileTransfer/ftpForm.jsp
View File

@@ -239,12 +239,12 @@
</c:forEach>
</div>
</div>
<div class="col-md-6">
<div class="col-md-6 doBalckList">
<div class="form-group">
<label class="control-label col-md-3"><spring:message code="do_blacklist" /></label>
<c:forEach items="${fns:getDictList('DO_BLACKLIST') }" var="dict">
<c:choose>
<c:when test="${dict.itemCode eq _cfg.doBlackList}">
<c:when test="${dict.itemCode eq _cfg.doBlackList or not empty_cfg.doBalckList}">
<label class="radio-inline">
<input type="radio" name="doBlackList" checked value="${dict.itemCode}" ><spring:message code="${dict.itemValue}"/>
</label>

4
src/main/webapp/WEB-INF/views/cfg/fileTransfer/p2pForm.jsp
View File

@@ -212,12 +212,12 @@
</c:forEach>
</div>
</div>
<div class="col-md-6">
<div class="col-md-6 doBalckList">
<div class="form-group">
<label class="control-label col-md-3"><spring:message code="do_blacklist" /></label>
<c:forEach items="${fns:getDictList('DO_BLACKLIST') }" var="dict">
<c:choose>
<c:when test="${dict.itemCode eq _cfg.doBlackList}">
<c:when test="${dict.itemCode eq _cfg.doBlackList or not empty_cfg.doBalckList}">
<label class="radio-inline">
<input type="radio" name="doBlackList" checked value="${dict.itemCode}" ><spring:message code="${dict.itemValue}"/>
</label>

4
src/main/webapp/WEB-INF/views/cfg/ipaddr/ipForm.jsp
View File

@@ -535,12 +535,12 @@ var showHideIPSECProtocol=function(obj){
</c:forEach>
</div>
</div>
<div class="col-md-6">
<div class="col-md-6 doBalckList">
<div class="form-group">
<label class="control-label col-md-3"><spring:message code="do_blacklist" /></label>
<c:forEach items="${fns:getDictList('DO_BLACKLIST') }" var="dict">
<c:choose>
<c:when test="${dict.itemCode eq _cfg.doBlackList}">
<c:when test="${dict.itemCode eq _cfg.doBlackList or not empty_cfg.doBalckList}">
<label class="radio-inline">
<input type="radio" name="doBlackList" checked value="${dict.itemCode}" ><spring:message code="${dict.itemValue}"/>
</label>

4
src/main/webapp/WEB-INF/views/cfg/mail/mailForm.jsp
View File

@@ -243,12 +243,12 @@
</c:forEach>
</div>
</div>
<div class="col-md-6">
<div class="col-md-6 doBalckList">
<div class="form-group">
<label class="control-label col-md-3"><spring:message code="do_blacklist" /></label>
<c:forEach items="${fns:getDictList('DO_BLACKLIST') }" var="dict">
<c:choose>
<c:when test="${dict.itemCode eq _cfg.doBlackList}">
<c:when test="${dict.itemCode eq _cfg.doBlackList or not empty_cfg.doBalckList}">
<label class="radio-inline">
<input type="radio" name="doBlackList" checked value="${dict.itemCode}" ><spring:message code="${dict.itemValue}"/>
</label>

4
src/main/webapp/WEB-INF/views/cfg/other/bgpForm.jsp
View File

@@ -207,12 +207,12 @@
</c:forEach>
</div>
</div>
<div class="col-md-6">
<div class="col-md-6 doBalckList">
<div class="form-group">
<label class="control-label col-md-3"><spring:message code="do_blacklist" /></label>
<c:forEach items="${fns:getDictList('DO_BLACKLIST') }" var="dict">
<c:choose>
<c:when test="${dict.itemCode eq _cfg.doBlackList}">
<c:when test="${dict.itemCode eq _cfg.doBlackList or not empty_cfg.doBalckList}">
<label class="radio-inline">
<input type="radio" name="doBlackList" checked value="${dict.itemCode}" ><spring:message code="${dict.itemValue}"/>
</label>

4
src/main/webapp/WEB-INF/views/cfg/website/dnsForm.jsp
View File

@@ -219,12 +219,12 @@
</c:forEach>
</div>
</div>
<div class="col-md-6">
<div class="col-md-6 doBalckList">
<div class="form-group">
<label class="control-label col-md-3"><spring:message code="do_blacklist" /></label>
<c:forEach items="${fns:getDictList('DO_BLACKLIST') }" var="dict">
<c:choose>
<c:when test="${dict.itemCode eq _cfg.doBlackList}">
<c:when test="${dict.itemCode eq _cfg.doBlackList or not empty_cfg.doBalckList}">
<label class="radio-inline">
<input type="radio" name="doBlackList" checked value="${dict.itemCode}" ><spring:message code="${dict.itemValue}"/>
</label>

4
src/main/webapp/WEB-INF/views/cfg/website/httpForm.jsp
View File

@@ -281,12 +281,12 @@
</c:forEach>
</div>
</div>
<div class="col-md-6">
<div class="col-md-6 doBalckList">
<div class="form-group">
<label class="control-label col-md-3"><spring:message code="do_blacklist" /></label>
<c:forEach items="${fns:getDictList('DO_BLACKLIST') }" var="dict">
<c:choose>
<c:when test="${dict.itemCode eq _cfg.doBlackList}">
<c:when test="${dict.itemCode eq _cfg.doBlackList or not empty_cfg.doBalckList}">
<label class="radio-inline">
<input type="radio" name="doBlackList" checked value="${dict.itemCode}" ><spring:message code="${dict.itemValue}"/>
</label>

4
src/main/webapp/WEB-INF/views/cfg/website/sslForm.jsp
View File

@@ -225,12 +225,12 @@
</c:forEach>
</div>
</div>
<div class="col-md-6">
<div class="col-md-6 doBalckList">
<div class="form-group">
<label class="control-label col-md-3"><spring:message code="do_blacklist" /></label>
<c:forEach items="${fns:getDictList('DO_BLACKLIST') }" var="dict">
<c:choose>
<c:when test="${dict.itemCode eq _cfg.doBlackList}">
<c:when test="${dict.itemCode eq _cfg.doBlackList or not empty_cfg.doBalckList}">
<label class="radio-inline">
<input type="radio" name="doBlackList" checked value="${dict.itemCode}" ><spring:message code="${dict.itemValue}"/>
</label>

4
src/main/webapp/WEB-INF/views/cfg/whitelist/domainForm.jsp
View File

@@ -210,12 +210,12 @@
</c:forEach>
</div>
</div>
<div class="col-md-6">
<div class="col-md-6 doBalckList">
<div class="form-group">
<label class="control-label col-md-3"><spring:message code="do_blacklist" /></label>
<c:forEach items="${fns:getDictList('DO_BLACKLIST') }" var="dict">
<c:choose>
<c:when test="${dict.itemCode eq _cfg.doBlackList}">
<c:when test="${dict.itemCode eq _cfg.doBlackList or not empty_cfg.doBalckList}">
<label class="radio-inline">
<input type="radio" name="doBlackList" checked value="${dict.itemCode}" ><spring:message code="${dict.itemValue}"/>
</label>

3
src/main/webapp/WEB-INF/views/sys/dictForm.jsp
View File

@@ -91,6 +91,7 @@
$(obj).find(".itemCode").attr("name","dictItemList["+index+"].itemCode");
$(obj).find(".itemValue").attr("name","dictItemList["+index+"].itemValue");
$(obj).find(".itemDesc").attr("name","dictItemList["+index+"].itemDesc");
$(obj).find(".itemSort").attr("name","dictItemList["+index+"].itemSort");
$(obj).find(".itemStatus").attr("name","dictItemList["+index+"].status");
$(obj).find(".itemType").attr("name","dictItemList["+index+"].type");
@@ -180,6 +181,7 @@
<spring:message code="mark"/> <input type="text" class="itemCode" autocomplete="off"/>
<spring:message code="value"/> <input type="text" class="itemValue" autocomplete="off"/>
<spring:message code="describe"/> <input type="text" class="itemDesc" autocomplete="off"/>
<spring:message code="sort"/> <input type="text" class="itemSort" autocomplete="off"/>
<spring:message code="useable"/>
<select class="itemStatus noSelect2">
<option value="1"><spring:message code="yes"/></option>
@@ -198,6 +200,7 @@
<spring:message code="mark"/> <input type="text" class="itemCode" value="${dictItem.itemCode}" autocomplete="off" <c:if test="${dictItem.type==0}">readonly="readonly"</c:if>/>
<spring:message code="value"/> <input type="text" class="itemValue" value="${dictItem.itemValue}" autocomplete="off" <c:if test="${dictItem.type==0}">readonly="readonly"</c:if>/>
<spring:message code="describe"/> <input type="text" class="itemDesc" value="${dictItem.itemDesc}" autocomplete="off" <c:if test="${dictItem.type==0}">readonly="readonly"</c:if>/>
<spring:message code="sort"/> <input type="text" class="itemSort" value="${dictItem.itemSort}" autocomplete="off" <c:if test="${dictItem.type==0}">readonly="readonly"</c:if>/>
<spring:message code="useable"/>
<select class="itemStatus noSelect2" <c:if test="${dictItem.type==0}">readonly="readonly"</c:if>>
<option value="1" <c:if test="${dictItem.status==1}">selected</c:if>><spring:message code="yes"/></option>

6
src/main/webapp/static/global/scripts/common.js
View File

@@ -884,12 +884,14 @@ var switchAction=function(action){
$(this).removeAttr("disabled");
$(this).removeClass("hidden");
$(this).removeClass("disabled");
})
});
$(".doBalckList").removeClass("hidden");
}else{
$(".policy").find("input,select,div,button").each(function(){
$(this).attr("disabled","disabled");
$(this).addClass("hidden");
})
});
$(".doBalckList").addClass("hidden");
}
/*************************action切换时，隐藏白名单和drop的是否记录日志*****************************/