白名单增加定时任务处理；

修复白名单热修改被覆盖jsp

Conflicts:
	src/main/java/com/nis/web/service/configuration/IpCfgService.java
	src/main/resources/sql/20190417/extends_ip_port_pattern.sql

src/main/java/com/nis/web/dao/SchedulerDao.java

@@ -22,12 +22,18 @@ public interface SchedulerDao extends CrudDao<ScheduleCfg> {
 	 */
 	List<ScheduleCfg>  findNewlyCfg(@Param("id")Long id,@Param("limit")Long limit,@Param("type")int type,@Param("delFlag")Integer delFlag);
 	
+	/**
+	 * 删除定时任务
+	 * @param cfg
+	 * @return
+	 */
+	int deleteByCompileIds(@Param("compileIds")String compileIds,@Param("type")Integer type);
 	/**
 	 * 更新 del_flag 字段为删除标识
 	 * @param cfg
 	 * @return
 	 */
-	int deleteByCompileIds(String compileIds);
+	int inValidByCompileIds(@Param("compileIds")String compileIds);
 
 	/**
 	 * 查找 配置 下发 最新记录