diff --git a/src/main/java/com/nis/domain/configuration/AppBuiltInFeatureFile.java b/src/main/java/com/nis/domain/configuration/AppBuiltInFeatureFile.java new file mode 100644 index 000000000..7734fee2a --- /dev/null +++ b/src/main/java/com/nis/domain/configuration/AppBuiltInFeatureFile.java @@ -0,0 +1,23 @@ +package com.nis.domain.configuration; + +import java.util.Date; + +/** + * 内置文件上传 + * @author dell + * + */ +public class AppBuiltInFeatureFile extends BaseCfg { + + /** + * + */ + private static final long serialVersionUID = -2720862431960415564L; + private String filePath; + public String getFilePath() { + return filePath; + } + public void setFilePath(String filePath) { + this.filePath = filePath; + } +} diff --git a/src/main/java/com/nis/domain/configuration/AppByteCfg.java b/src/main/java/com/nis/domain/configuration/AppByteCfg.java index 1587b9f47..785586f3b 100644 --- a/src/main/java/com/nis/domain/configuration/AppByteCfg.java +++ b/src/main/java/com/nis/domain/configuration/AppByteCfg.java @@ -28,7 +28,7 @@ public class AppByteCfg extends BaseCfg { @Expose private Integer compileId; @Expose - private Integer ratelimit; + private String ratelimit; private Integer appCode;//specific_service_cfg表一级节点的spec_service_code private Integer behavCode;//specific_service_cfg表二级节点的spec_service_code private Integer specServiceId; @@ -93,11 +93,11 @@ public class AppByteCfg extends BaseCfg { return tableName; } - public Integer getRatelimit() { + public String getRatelimit() { return ratelimit; } - public void setRatelimit(Integer ratelimit) { + public void setRatelimit(String ratelimit) { this.ratelimit = ratelimit; } public Integer getAppCode() { diff --git a/src/main/java/com/nis/web/controller/BaseController.java b/src/main/java/com/nis/web/controller/BaseController.java index 900c541ce..c19fa4bc1 100644 --- a/src/main/java/com/nis/web/controller/BaseController.java +++ b/src/main/java/com/nis/web/controller/BaseController.java @@ -35,6 +35,7 @@ import com.nis.domain.SysDataDictionaryItem; import com.nis.domain.basics.PolicyGroupInfo; import com.nis.domain.basics.ServiceDictInfo; import com.nis.domain.basics.SysDictInfo; +import com.nis.domain.configuration.AppBuiltInFeatureFile; import com.nis.domain.configuration.AreaBean; import com.nis.domain.configuration.AreaIpCfg; import com.nis.domain.configuration.BaseCfg; @@ -66,6 +67,7 @@ import com.nis.web.service.UserService; import com.nis.web.service.basics.PolicyGroupInfoService; import com.nis.web.service.basics.ServiceDictInfoService; import com.nis.web.service.basics.SysDictInfoService; +import com.nis.web.service.configuration.AppBuiltInFeatureService; import com.nis.web.service.configuration.AppCfgService; import com.nis.web.service.configuration.AvCfgService; import com.nis.web.service.configuration.AvContentCfgService; @@ -191,6 +193,8 @@ public class BaseController { protected ProxyFileStrategyService proxyFileStrategyService;//代理文件策略service @Autowired protected PxyObjKeyringService pxyObjKeyringService;//拦截策略service + @Autowired + protected AppBuiltInFeatureService appBuiltInFeatureService;//拦截策略service /** * 管理基础路径 diff --git a/src/main/java/com/nis/web/controller/configuration/AppCfgController.java b/src/main/java/com/nis/web/controller/configuration/AppCfgController.java index 091e856e7..074c3f3c8 100644 --- a/src/main/java/com/nis/web/controller/configuration/AppCfgController.java +++ b/src/main/java/com/nis/web/controller/configuration/AppCfgController.java @@ -1,8 +1,11 @@ package com.nis.web.controller.configuration; +import java.io.File; +import java.security.cert.X509Certificate; import java.util.ArrayList; import java.util.Date; import java.util.List; +import java.util.Map; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; @@ -13,10 +16,14 @@ import org.springframework.stereotype.Controller; import org.springframework.ui.Model; import org.springframework.web.bind.annotation.ModelAttribute; import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.ResponseBody; +import org.springframework.web.multipart.MultipartFile; import org.springframework.web.servlet.mvc.support.RedirectAttributes; +import com.google.common.collect.Maps; import com.nis.domain.Page; import com.nis.domain.SysDataDictionaryItem; +import com.nis.domain.configuration.AppBuiltInFeatureFile; import com.nis.domain.configuration.AppByteCfg; import com.nis.domain.configuration.AppDomainCfg; import com.nis.domain.configuration.AppHeaderCfg; @@ -28,13 +35,21 @@ import com.nis.domain.configuration.AppTcpCfg; import com.nis.domain.configuration.AppTopicDomainCfg; import com.nis.domain.configuration.IpPortCfg; import com.nis.domain.configuration.NtcSubscribeIdCfg; +import com.nis.domain.configuration.AppBuiltInFeatureFile; +import com.nis.domain.maat.ToMaatResult; +import com.nis.domain.maat.ToMaatResult.ResponseData; import com.nis.domain.specific.SpecificServiceCfg; import com.nis.exceptions.CallExternalProceduresException; import com.nis.exceptions.MaatConvertException; import com.nis.util.CodeDicUtils; +import com.nis.util.ConfigServiceUtil; import com.nis.util.Constants; import com.nis.util.DictUtils; +import com.nis.util.FileUtils; +import com.nis.util.JsonMapper; +import com.nis.util.StringUtil; import com.nis.web.controller.BaseController; +import com.nis.web.dao.configuration.AppBuiltInFeatureDao; import com.nis.web.dao.dashboard.codedic.CodeResult; import com.nis.web.security.UserUtils; @@ -1135,4 +1150,126 @@ public class AppCfgController extends BaseController { } return "redirect:" + adminPath +"/app/topicDomainCfgList?functionId="+functionId; } + + + /**********************内置APP特征文件上传*******************************/ + @RequestMapping(value = {"/appBuiltinFeatureFileForm"}) + @RequiresPermissions(value={"app:built_in_file:config"}) + public String from(Model model, + HttpServletRequest request, + HttpServletResponse response, + String ids, + @ModelAttribute("cfg")AppBuiltInFeatureFile cfg + ,RedirectAttributes redirectAttributes){ + if(cfg == null){ + cfg=new AppBuiltInFeatureFile(); + } + if(!StringUtil.isEmpty(ids)){ + cfg = appBuiltInFeatureService.getAppBuiltInFeatureFile(Long.valueOf(ids),-1); + initFormCondition(model, cfg); + model.addAttribute("isAdd", false); + }else{ + initFormCondition(model, cfg); + model.addAttribute("isAdd", true); + } + + model.addAttribute("_cfg", cfg); + return "/cfg/app/appBuiltinFeatureFileForm"; + } + + @RequestMapping(value = {"/appBuiltinFeatureFileSaveOrUpdate"}) + @RequiresPermissions(value={"app:built_in_file:config"}) + public String saveOrUpdate(Model model,HttpServletRequest request,HttpServletResponse response, + @ModelAttribute("cfg")AppBuiltInFeatureFile cfg, + MultipartFile file, + RedirectAttributes redirectAttributes){ + File fileD=null; + try{ + + if(file != null) { + String filename = file.getOriginalFilename(); + String prefix = FileUtils.getPrefix(filename, false); + String suffix = FileUtils.getSuffix(filename, false); + fileD = File.createTempFile("file_"+ prefix, suffix); + file.transferTo(fileD);//复制文件 + String md5 = FileUtils.getFileMD5(fileD); + Map srcMap = Maps.newHashMap(); + srcMap.put("filetype", suffix); + srcMap.put("datatype", "dbSystem");//源文件存入数据中心 + srcMap.put("createTime",new Date()); + srcMap.put("key",prefix); + srcMap.put("fileName", filename); + srcMap.put("checksum", md5); + ToMaatResult result = ConfigServiceUtil.postFileCfg(null, fileD, JsonMapper.toJsonString(srcMap)); + logger.info("APP 内置特征 文件上传响应信息："+JsonMapper.toJsonString(result)); + String accessUrl = null; + if(!StringUtil.isEmpty(result)){ + ResponseData data = result.getData(); + accessUrl=data.getAccessUrl(); + cfg.setFilePath(accessUrl);; + } + } + appBuiltInFeatureService.saveOrUpdate(cfg); + + addMessage(redirectAttributes,"save_success"); + }catch(Exception e){ + e.printStackTrace(); + addMessage(redirectAttributes,"save_failed"); + } + + return "redirect:" + adminPath +"/app/appBuiltinFeatureFileList?functionId="+cfg.getFunctionId(); + } + + @RequestMapping(value = {"/appBuiltinFeatureFileList"}) + public String list(Model model,HttpServletRequest request,HttpServletResponse response + ,@ModelAttribute("cfg")AppBuiltInFeatureFile entity + ,RedirectAttributes redirectAttributes){ + Page page = appBuiltInFeatureService.findPage(new Page(request, response,"r"), entity); + model.addAttribute("page", page); + initPageCondition(model); + return "/cfg/app/appBuiltinFeatureFileList"; + } + + @RequestMapping(value = {"/appBuiltinFeatureFileDelete"}) + @RequiresPermissions(value={"app:built_in_file:config"}) + public String delete(Integer isAudit,Integer isValid,String ids,Integer functionId + ,Model model,HttpServletRequest request + ,HttpServletResponse response + ,RedirectAttributes redirectAttributes){ + if(!StringUtil.isEmpty(ids)){ + appBuiltInFeatureService.delete(isAudit,isValid,ids,functionId); + } + + return "redirect:" + adminPath +"/app/appBuiltinFeatureFileList?functionId="+functionId; + } + + @RequestMapping(value = {"/audit"}) + @RequiresPermissions(value={"app:built_in_file:confirm"}) + public String audit(Integer isAudit,Integer isValid,String ids,Integer functionId, + RedirectAttributes redirectAttributes) { + if(!StringUtil.isEmpty(ids)){ + String[] idArray = ids.split(","); + Date auditTime=new Date(); + for(String id :idArray){ + try { + appBuiltInFeatureService.audit(isAudit,isValid,functionId,id,auditTime); + } catch (MaatConvertException e) { + addMessage(redirectAttributes, e.getMessage()); + } + } + + } + return "redirect:" + adminPath +"/app/appBuiltinFeatureFileList?functionId="+functionId; + } + @ResponseBody + @RequestMapping(value = "/validCfgId") + public boolean validCfgId(Long cfgId) { + AppBuiltInFeatureFile dns=appBuiltInFeatureService.getAppBuiltInFeatureFile(cfgId,null); + if(dns == null ){ + return false; + }else{ + return true; + } + } + } diff --git a/src/main/java/com/nis/web/dao/configuration/AppBuiltInFeatureDao.java b/src/main/java/com/nis/web/dao/configuration/AppBuiltInFeatureDao.java new file mode 100644 index 000000000..951bc1409 --- /dev/null +++ b/src/main/java/com/nis/web/dao/configuration/AppBuiltInFeatureDao.java @@ -0,0 +1,20 @@ +package com.nis.web.dao.configuration; + +import java.util.List; + +import org.apache.ibatis.annotations.Param; + +import com.nis.domain.configuration.AppBuiltInFeatureFile; +import com.nis.domain.configuration.DnsResStrategy; +import com.nis.domain.configuration.PxyObjKeyring; +import com.nis.web.dao.CrudDao; +import com.nis.web.dao.MyBatisDao; + +@MyBatisDao +public interface AppBuiltInFeatureDao extends CrudDao< AppBuiltInFeatureFile> { + List findPage( AppBuiltInFeatureFile entity); + List findList(@Param("cfgId")Long cfgId + ,@Param("isAudit")Integer isAudit + ,@Param("isValid")Integer isValid); + +} \ No newline at end of file diff --git a/src/main/java/com/nis/web/dao/configuration/AppBuiltInFeatureDao.xml b/src/main/java/com/nis/web/dao/configuration/AppBuiltInFeatureDao.xml new file mode 100644 index 000000000..58f0b2ef0 --- /dev/null +++ b/src/main/java/com/nis/web/dao/configuration/AppBuiltInFeatureDao.xml @@ -0,0 +1,260 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + r.cfg_id,r.cfg_desc + , r.file_path + ,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 + ,r.is_area_effective,r.classify,r.attribute,r.lable + ,r.area_effective_ids,r.function_id,r.cfg_region_code,r.compile_id + + + + + + + + insert into app_builtin_feature_file ( + CFG_ID, + CFG_DESC, + ACTION, + IS_VALID, + IS_AUDIT, + CREATOR_ID, + CREATE_TIME, + EDITOR_ID, + EDIT_TIME, + AUDITOR_ID, + AUDIT_TIME, + SERVICE_ID, + REQUEST_ID, + IS_AREA_EFFECTIVE, + CLASSIFY, + ATTRIBUTE, + LABLE, + AREA_EFFECTIVE_IDS, + function_id, + file_path, + cfg_type, + compile_Id, + cfg_region_code + )values ( + #{cfgId,jdbcType=VARCHAR}, + #{cfgDesc,jdbcType=VARCHAR}, + #{action,jdbcType=INTEGER}, + 0, + 0, + #{creatorId,jdbcType=INTEGER}, + #{createTime,jdbcType=TIMESTAMP}, + #{editorId,jdbcType=INTEGER}, + #{editTime,jdbcType=TIMESTAMP}, + #{auditorId,jdbcType=INTEGER}, + #{auditTime,jdbcType=TIMESTAMP}, + #{serviceId,jdbcType=INTEGER}, + #{requestId,jdbcType=INTEGER}, + #{isAreaEffective,jdbcType=INTEGER}, + #{classify,jdbcType=VARCHAR}, + #{attribute,jdbcType=VARCHAR}, + #{lable,jdbcType=VARCHAR}, + #{areaEffectiveIds,jdbcType=VARCHAR}, + #{functionId,jdbcType=INTEGER}, + #{filePath, jdbcType=VARCHAR}, + #{cfgType,jdbcType=VARCHAR}, + #{compileId,jdbcType=INTEGER}, + #{cfgRegionCode,jdbcType=INTEGER} + ) + + + + update app_builtin_feature_file + + + + cfg_desc = #{cfgDesc,jdbcType=VARCHAR}, + + + compile_Id = #{compileId,jdbcType=VARCHAR}, + + + action = #{action,jdbcType=INTEGER}, + + + is_valid = #{isValid,jdbcType=INTEGER}, + + + is_audit = #{isAudit,jdbcType=INTEGER}, + + + editor_id = #{editorId,jdbcType=INTEGER}, + + + edit_time = #{editTime,jdbcType=TIMESTAMP}, + + + AUDITOR_ID = #{auditorId,jdbcType=INTEGER}, + + + AUDIT_TIME = #{auditTime,jdbcType=TIMESTAMP}, + + + is_area_effective = #{isAreaEffective,jdbcType=INTEGER}, + + + classify = #{classify,jdbcType=VARCHAR}, + + + attribute = #{attribute,jdbcType=VARCHAR}, + + + lable = #{lable,jdbcType=VARCHAR}, + + + area_effective_ids = #{areaEffectiveIds,jdbcType=VARCHAR}, + + + function_id = #{functionId,jdbcType=INTEGER}, + + + service_id = #{serviceId,jdbcType=INTEGER}, + + + file_path = #{filePath,jdbcType=VARCHAR}, + + + + + and cfg_id = #{cfgId,jdbcType=INTEGER} + + and function_id = #{functionId,jdbcType=INTEGER} + + + + + \ No newline at end of file diff --git a/src/main/java/com/nis/web/service/configuration/AppBuiltInFeatureService.java b/src/main/java/com/nis/web/service/configuration/AppBuiltInFeatureService.java new file mode 100644 index 000000000..45e900d74 --- /dev/null +++ b/src/main/java/com/nis/web/service/configuration/AppBuiltInFeatureService.java @@ -0,0 +1,171 @@ +package com.nis.web.service.configuration; + + +import java.util.ArrayList; +import java.util.Date; +import java.util.List; + +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +import com.nis.domain.Page; +import com.nis.domain.configuration.AppBuiltInFeatureFile; +import com.nis.exceptions.MaatConvertException; +import com.nis.util.ConfigServiceUtil; +import com.nis.util.StringUtil; +import com.nis.web.dao.configuration.AppBuiltInFeatureDao; +import com.nis.web.security.UserUtils; +import com.nis.web.service.BaseService; + + + +/** + * 内置文件 + * @author dell + * + */ +@Service +public class AppBuiltInFeatureService extends BaseService{ + @Autowired + protected AppBuiltInFeatureDao appBuiltInFeatureDao; + + + /** + * 查询分页数据 + * @param page 分页对象 + * @param entity + * @return + */ + public Page findPage(Page page, AppBuiltInFeatureFile entity) { + entity.getSqlMap().put("dsf", configScopeFilter(entity.getCurrentUser(),"r")); + entity.setPage(page); + List list=appBuiltInFeatureDao.findPage(entity); + page.setList(list); + return page; + } + public List findAppBuiltInFeatureFiles(Long cfgId,Integer isValid,Integer isAudit,String cfgType) { + List list=appBuiltInFeatureDao.findList(cfgId,isValid,isAudit); + return list; + } + + public AppBuiltInFeatureFile getAppBuiltInFeatureFile(Long id,Integer isValid) { + List list=appBuiltInFeatureDao.findList(id,isValid,null); + AppBuiltInFeatureFile dnsResStrategy=null; + if(list != null && list.size()>0){ + dnsResStrategy=list.get(0); + } + return dnsResStrategy; + } + @Transactional(readOnly=false,rollbackFor=RuntimeException.class) + public void saveOrUpdate(AppBuiltInFeatureFile entity){ + Date createTime=new Date(); + setAreaEffectiveIds(entity); + entity.setIsValid(1); + entity.setIsAudit(1); + //新增 + if(StringUtil.isEmpty(entity.getCfgId())){ + entity.initDefaultValue(); + entity.setCreatorId(UserUtils.getUser().getId()); + entity.setCreateTime(createTime); + /*//调用服务接口获取compileId + List compileIds = new ArrayList(); + try { + compileIds = ConfigServiceUtil.getId(1,1); + } catch (Exception e) { + e.printStackTrace(); + logger.info("获取编译ID出错"); + throw new MaatConvertException(":"+e.getMessage()); + } + if(compileIds != null && compileIds.size() >0 && compileIds.get(0) != 0){ + entity.setCompileId(compileIds.get(0)); + }*/ + appBuiltInFeatureDao.insert(entity); + //修改 + }else{ + Date editTime=new Date(); + entity.setEditorId(UserUtils.getUser().getId()); + entity.setEditTime(editTime); + + appBuiltInFeatureDao.update(entity); + } + } + + /** + * + * @param isAudit + * @param isValid + * @param ids compileIds + */ + @Transactional(readOnly=false,rollbackFor=RuntimeException.class) + public void delete(Integer isAudit,Integer isValid,String ids,Integer functionId){ + AppBuiltInFeatureFile entity = new AppBuiltInFeatureFile(); + String[] idArray = ids.split(","); + for(String id :idArray){ + entity.setCfgId(Long.valueOf(id)); + entity.setFunctionId(functionId); + entity.setIsAudit(isAudit); + entity.setIsValid(isValid); + entity.setEditorId(UserUtils.getUser().getId()); + entity.setEditTime(new Date()); + appBuiltInFeatureDao.update(entity); + } + } + /** + * + * @param isAudit + * @param isValid + * @param ids cfgId + * @param functionId + */ + @Transactional(readOnly=false,rollbackFor=RuntimeException.class) + public void audit(Integer isAudit,Integer isValid,Integer functionId,String id,Date auditTime){ + AppBuiltInFeatureFile cfg=new AppBuiltInFeatureFile(); + cfg.setCfgId(Long.valueOf(id)); + cfg.setIsValid(isValid); + cfg.setIsAudit(isAudit); + cfg.setEditTime(auditTime); + cfg.setEditorId(UserUtils.getUser().getId()); + cfg.setAuditorId(UserUtils.getUser().getId()); + cfg.setAuditTime(auditTime); + appBuiltInFeatureDao.update(cfg); + /*cfg=getAppBuiltInFeatureFile(cfg.getCfgId(), null); + String json=""; + if(cfg.getIsAudit()==1){ + List resStrategyList=new ArrayList(); + ProxyObjKeyring resStrategy=convertCallBackProxyObjKeyring(cfg); + resStrategyList.add(resStrategy); + //调用服务接口下发配置数据 + json=gsonToJson(resStrategyList); + logger.info("拦截策略配置下发配置参数："+json); + //调用服务接口下发配置 + try { + ToMaatResult result = ConfigServiceUtil.postCallbackCfg(json); + if(result!=null){ + logger.info("拦截策略配置下发响应信息："+result.getMsg()); + } + } catch (Exception e) { + logger.error("拦截策略配置配置下发失败",e); + throw e; + } + }else if(cfg.getIsAudit()==3){ + List resStrategyList=new ArrayList<>(); + ProxyObjKeyring ntcAppBuiltInFeatureFile=convertCallBackProxyObjKeyring(cfg); + resStrategyList.add(ntcAppBuiltInFeatureFile); + //调用服务接口取消配置 + json=gsonToJson(resStrategyList); + logger.info("拦截策略配置配置参数："+json); + //调用服务接口取消配置 + try { + ToMaatResult result = ConfigServiceUtil.put(json, 2); + logger.info("拦截策略配置响应信息："+result.getMsg()); + } catch (Exception e) { + e.printStackTrace(); + logger.info("拦截策略配置配置失败"); + throw e; + } + }*/ + } +} + + \ No newline at end of file diff --git a/src/main/resources/messages/message_zh_CN.properties b/src/main/resources/messages/message_zh_CN.properties index 27db5be58..a01a5c616 100644 --- a/src/main/resources/messages/message_zh_CN.properties +++ b/src/main/resources/messages/message_zh_CN.properties @@ -1108,8 +1108,8 @@ intermediate=\u4E2D\u95F4\u8BC1\u4E66 end_entity=\u5B9E\u4F53\u8BC1\u4E66 keyring_name=\u79D8\u94A5\u5BF9\u540D\u79F0 keyring_type=\u8BC1\u4E66\u7C7B\u578B -private_key_file=\u79C1\u94A5\u8DEF\u5F84 -public_key_file=\u516C\u94A5\u8DEF\u5F84 +private_key_file=\u79C1\u94A5\u6587\u4EF6 +public_key_file=\u516C\u94A5\u6587\u4EF6 header=\u5173\u952E\u5B57 layer=\u5339\u914D\u533A\u57DF expire_after=\u518D\u6B21\u9881\u53D1\u6709\u6548\u671F diff --git a/src/main/webapp/WEB-INF/views/cfg/app/appBuiltinFeatureFileForm.jsp b/src/main/webapp/WEB-INF/views/cfg/app/appBuiltinFeatureFileForm.jsp new file mode 100644 index 000000000..beef4be9f --- /dev/null +++ b/src/main/webapp/WEB-INF/views/cfg/app/appBuiltinFeatureFileForm.jsp @@ -0,0 +1,163 @@ +<%@ page contentType="text/html;charset=UTF-8"%> +<%@ include file="/WEB-INF/include/taglib.jsp"%> + + +<spring:message code="${cfgName}"></spring:message> + + + + +
+

+ +

+
+
+
+
+
+ + + +
+
+
+ +
+ + + + + + + + + + + + + + + + + +
+
+ +
+
+
+
+ +
+ +
+
+
+
+
+
+ +
+ +
+ " + class="required form-control" + style="background-color: transparent" aria-required="true" + type="text" value="${_cfg.filePath }"> + +
+ +
+ +
+
+
+
+
+ +
+
+
+
+
+
+
+ + +
+
+
+
+
+
+
+ +
+
+
+
+
+ + \ No newline at end of file diff --git a/src/main/webapp/WEB-INF/views/cfg/app/appBuiltinFeatureFileList.jsp b/src/main/webapp/WEB-INF/views/cfg/app/appBuiltinFeatureFileList.jsp new file mode 100644 index 000000000..bf191b487 --- /dev/null +++ b/src/main/webapp/WEB-INF/views/cfg/app/appBuiltinFeatureFileList.jsp @@ -0,0 +1,368 @@ +<%@ page contentType="text/html;charset=UTF-8"%> +<%@ include file="/WEB-INF/include/taglib.jsp"%> + + +<spring:message code="${cfgName}"></spring:message> + + + + +
+ + +

+ +

+
+
+
+
+
+
+ + + + + + + + + +
+ <%--
+ + + + + + + + +
--%> + +
+ +
+
+ + + + + +
+ + + +
+
+
+ + + +
+
+ <%-- + + + --%> + href="javascript:;"> + + +
+
+ + + +
+ <%--
+ +
+ +
+ + + + + + + + +
+ +
+ +
+ +
+ + + + + + + +
+ +
+ +
+ +
+ + + + + + + + +
+ +
+ +
+ +
+ + + + + + + +
+ +
+ +
+ --%> +
+
+
+ + +
+
+ +
+
+ + " onclick="WdatePicker({dateFmt:'yyyy-MM-dd HH:mm:ss',isShowClear:true});"/> + +
+
+ + <%--
+
+ + " onclick="WdatePicker({dateFmt:'yyyy-MM-dd HH:mm:ss',isShowClear:true});"/> + +
+
+ +
+
+ + " onclick="WdatePicker({dateFmt:'yyyy-MM-dd HH:mm:ss',isShowClear:true});"/> + +
+
+ +
+
+ + " onclick="WdatePicker({dateFmt:'yyyy-MM-dd HH:mm:ss',isShowClear:true});"/> + +
+
+ +
+
+ + " onclick="WdatePicker({dateFmt:'yyyy-MM-dd HH:mm:ss',isShowClear:true});"/> + +
+
--%> +
+ + +
+ + + +
+
+ + + + + + <%-- --%> + + + <%-- --%> + <%-- --%> + <%-- + + + --%> + + + + <%-- + --%> + <%-- + --%> + <%-- --%> + + + + + + + + + <%-- --%> + <%-- + + + --%> + <%-- --%> + + + + + <%-- + --%> + <%-- + --%> + + + + +
+ + ${cfg.cfgDesc } + + ${fn:substring(cfg.filePath,0,20) } + + + + + + + + + ${cfg.requestName } + + + + + + + + + + + + + + + ${fns:abbr(classify,20)} + + + + + + + + + + + + + + + + + ${fns:abbr(attribute,20)} + + + + + + + + + + + + + + + + + ${fns:abbr(lableInfo,20)} + + ${cfg.areaEffectiveIds } + + + + ${cfg.creatorName }${cfg.editorName }${cfg.auditorName }
+
${page}
+
+ +
+
+
+ + + \ No newline at end of file diff --git a/src/main/webapp/WEB-INF/views/cfg/intercept/interceptList.jsp b/src/main/webapp/WEB-INF/views/cfg/intercept/interceptList.jsp index 4d3701229..05066452b 100644 --- a/src/main/webapp/WEB-INF/views/cfg/intercept/interceptList.jsp +++ b/src/main/webapp/WEB-INF/views/cfg/intercept/interceptList.jsp @@ -315,7 +315,7 @@ - + diff --git a/src/main/webapp/WEB-INF/views/cfg/intercept/strateagy/form.jsp b/src/main/webapp/WEB-INF/views/cfg/intercept/strateagy/form.jsp index 8443ea3c1..770518ed7 100644 --- a/src/main/webapp/WEB-INF/views/cfg/intercept/strateagy/form.jsp +++ b/src/main/webapp/WEB-INF/views/cfg/intercept/strateagy/form.jsp @@ -184,7 +184,7 @@ var switchKeyringType=function(){
+ color="red">*
@@ -209,7 +209,7 @@ var switchKeyringType=function(){
+ color="red">*