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://10.0.6.99/gwall/gwall.git into develop

Browse Source
This commit is contained in:
zhanghongqing
2018-07-24 09:17:23 +08:00
parent 3a11461acd cb650427e4
commit 95d780f1de
19 changed files with 262 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

46
src/main/java/com/nis/domain/configuration/AppPolicyCfg.java
View File

@@ -36,7 +36,11 @@ public class AppPolicyCfg extends BaseCfg<AppPolicyCfg> {
private Integer specServiceId;
private String appName;
private String cfgKeywords;
private String userRegion1;
private String userRegion2;
private String userRegion3;
private String userRegion4;
private String userRegion5;
@Expose
@ExcelField(title="expression_type")
@SerializedName("exprType")
@@ -155,5 +159,45 @@ public class AppPolicyCfg extends BaseCfg<AppPolicyCfg> {
public void setIpPort(IpPortCfg ipPort) {
this.ipPort = ipPort;
}
public String getUserRegion1() {
return userRegion1;
}
public void setUserRegion1(String userRegion1) {
this.userRegion1 = userRegion1;
}
public String getUserRegion2() {
return userRegion2;
}
public void setUserRegion2(String userRegion2) {
this.userRegion2 = userRegion2;
}
public String getUserRegion3() {
return userRegion3;
}
public void setUserRegion3(String userRegion3) {
this.userRegion3 = userRegion3;
}
public String getUserRegion4() {
return userRegion4;
}
public void setUserRegion4(String userRegion4) {
this.userRegion4 = userRegion4;
}
public String getUserRegion5() {
return userRegion5;
}
public void setUserRegion5(String userRegion5) {
this.userRegion5 = userRegion5;
}
}

8
src/main/java/com/nis/domain/specific/SpecificServiceCfg.java
View File

@@ -25,11 +25,17 @@ public class SpecificServiceCfg extends BaseEntity<SpecificServiceCfg>{
private SpecificServiceCfg parent; //parent_id 父节点id int N 0表示一级节点
private Integer isLeaf; //is_leaf 是否是叶子节点 int N 0否，1是，只有一级填0
private Integer groupId; //group_id maat端配置分组id int N 缺省0，表示未与maat分组同步
private Integer cfgType;//配置类型，1，app;2,加密隧道协议
private Date beginDate; // 开始日期
private Date endDate; // 结束日期
private String showSequence; //显示序号
public Integer getCfgType() {
return cfgType;
}
public void setCfgType(Integer cfgType) {
this.cfgType = cfgType;
}
public Integer getSpecServiceId() {
return specServiceId;
}

3
src/main/java/com/nis/web/controller/configuration/AppCfgController.java
View File

@@ -16,14 +16,11 @@ import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.servlet.mvc.support.RedirectAttributes;
import com.nis.domain.Page;
import com.nis.domain.ServiceConfigInfo;
import com.nis.domain.configuration.AppByteCfg;
import com.nis.domain.configuration.AppDomainCfg;
import com.nis.domain.configuration.AppHttpCfg;
import com.nis.domain.configuration.AppIpCfg;
import com.nis.domain.configuration.AppPolicyCfg;
import com.nis.domain.configuration.BaseStringCfg;
import com.nis.domain.configuration.CfgIndexInfo;
import com.nis.domain.configuration.IpPortCfg;
import com.nis.domain.specific.SpecificServiceCfg;
import com.nis.exceptions.MaatConvertException;

25
src/main/java/com/nis/web/controller/specific/SpecificServiceCfgController.java
View File

@@ -190,7 +190,7 @@ public class SpecificServiceCfgController extends BaseController {
@ResponseBody
@RequestMapping(value = "treeData")
public List<Map<String, Object>> treeData(@RequestParam(required=false) String extId,@RequestParam(required=false) String isShowHide,
@RequestParam(required=false)boolean isLeafShow,HttpServletResponse response){
@RequestParam(required=false)boolean isLeafShow,@RequestParam(required=true)Integer cfgType,HttpServletResponse response){
List<Map<String, Object>> mapList = Lists.newArrayList();
Map<String, Object> map2 = Maps.newHashMap();
map2.put("id", 0);
@@ -203,7 +203,7 @@ public class SpecificServiceCfgController extends BaseController {
SpecificServiceCfg specificServiceCfg = list.get(i);
if(StringUtils.isBlank(extId)||(extId!=null&&!extId.equals(specificServiceCfg.getSpecServiceId().toString()))){
if(specificServiceCfg.getIsValid().equals(0)||
(!isLeafShow && specificServiceCfg.getIsLeaf().equals(1))){
(!isLeafShow && specificServiceCfg.getIsLeaf().equals(1))||specificServiceCfg.getCfgType().intValue()!=cfgType){
continue;
}
Map<String, Object> map = Maps.newHashMap();
@@ -215,7 +215,26 @@ public class SpecificServiceCfgController extends BaseController {
}
return mapList;
}
/**
*
*/
@ResponseBody
@RequestMapping(value = "childrenList")
public List<Map<String, Object>> childrenList(@RequestParam(required=false)Integer parent,HttpServletResponse response){
List<Map<String, Object>> mapList = Lists.newArrayList();
List<SpecificServiceCfg> list = specificServiceCfgService.getChildrenById(parent);
for (int i=0; i<list.size(); i++){
Map<String, Object> map = Maps.newHashMap();
SpecificServiceCfg specificServiceCfg = list.get(i);
if(specificServiceCfg.getIsLeaf().equals(1)){
map.put("code", specificServiceCfg.getSpecServiceCode());
map.put("pId", specificServiceCfg.getParent().getSpecServiceId());
map.put("name",specificServiceCfg.getSpecServiceName());
mapList.add(map);
}
}
return mapList;
}
/**
* 校验协议id是否重复
* @param specServiceId

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

@@ -29,6 +29,11 @@
<result column="area_effective_ids" property="areaEffectiveIds" jdbcType="VARCHAR" />
<result column="ratelimit" property="ratelimit" jdbcType="INTEGER" />
<result column="function_id" property="functionId" jdbcType="INTEGER" />
<result column="user_region1" property="userRegion1" jdbcType="VARCHAR" />
<result column="user_region2" property="userRegion2" jdbcType="VARCHAR" />
<result column="user_region3" property="userRegion3" jdbcType="VARCHAR" />
<result column="user_region4" property="userRegion4" jdbcType="VARCHAR" />
<result column="user_region5" property="userRegion5" jdbcType="VARCHAR" />
</resultMap>
<resultMap id="AppIpCfgMap" type="com.nis.domain.configuration.AppIpCfg" >
@@ -229,7 +234,8 @@
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.COMPILE_ID,r.IS_AREA_EFFECTIVE,r.CLASSIFY,
r.ATTRIBUTE,r.LABLE,r.AREA_EFFECTIVE_IDS,r.RATELIMIT,r.FUNCTION_ID,
r.CFG_TYPE,r.CFG_REGION_CODE,r.EXPR_TYPE,r.MATCH_METHOD,r.IS_HEXBIN
r.CFG_TYPE,r.CFG_REGION_CODE,r.EXPR_TYPE,r.MATCH_METHOD,r.IS_HEXBIN,r.USER_REGION1,r.USER_REGION2,
r.USER_REGION3,r.USER_REGION4,r.USER_REGION5
</sql>
<sql id="AppIpCfg_Column" >
@@ -440,6 +446,21 @@
</if>
<if test="areaEffectiveIds != null and areaEffectiveIds != ''">
AND r.AREA_EFFECTIVE_IDS like concat(concat('%',#{areaEffectiveIds,jdbcType=VARCHAR}),'%')
</if>
<if test="userRegion1 != null and userRegion1 != ''">
AND r.user_region1 =#{userRegion1,jdbcType=VARCHAR}
</if>
<if test="userRegion2 != null and userRegion2 != ''">
AND r.user_region2 =#{userRegion2,jdbcType=VARCHAR}
</if>
<if test="userRegion3 != null and userRegion3 != ''">
AND r.user_region3 =#{userRegion3,jdbcType=VARCHAR}
</if>
<if test="userRegion4 != null and userRegion4 != ''">
AND r.user_region4 =#{userRegion4,jdbcType=VARCHAR}
</if>
<if test="userRegion5 != null and userRegion5 != ''">
AND r.user_region5 =#{userRegion5,jdbcType=VARCHAR}
</if>
<if test="ipPort!=null">
AND r.compile_id in (select t.compile_id from ip_port_cfg t
@@ -991,10 +1012,13 @@
CREATOR_ID,CREATE_TIME,EDITOR_ID,EDIT_TIME,AUDITOR_ID,AUDIT_TIME,
SERVICE_ID,REQUEST_ID,COMPILE_ID,IS_AREA_EFFECTIVE,CLASSIFY,
ATTRIBUTE,LABLE,AREA_EFFECTIVE_IDS,RATELIMIT,FUNCTION_ID,
CFG_TYPE,CFG_REGION_CODE,EXPR_TYPE,MATCH_METHOD,IS_HEXBIN
CFG_TYPE,CFG_REGION_CODE,EXPR_TYPE,MATCH_METHOD,IS_HEXBIN,USER_REGION1
,USER_REGION2,USER_REGION3,USER_REGION4,USER_REGION5
)values (
<include refid="AppCommonCfg_Value_List" />,
#{exprType,jdbcType=INTEGER},#{matchMethod,jdbcType=INTEGER},#{isHexbin,jdbcType=INTEGER}
,#{userRegion1,jdbcType=VARCHAR} ,#{userRegion2,jdbcType=VARCHAR} ,#{userRegion3,jdbcType=VARCHAR}
,#{userRegion4,jdbcType=VARCHAR} ,#{userRegion5,jdbcType=VARCHAR}
)
</insert>
<insert id="insertAppIpCfg" parameterType="com.nis.domain.configuration.AppIpCfg" >
@@ -1230,6 +1254,21 @@
</if>
<if test="cfgType != null and cfgType != ''">
CFG_TYPE =#{cfgType,jdbcType=VARCHAR},
</if>
<if test="userRegion1 != null and userRegion1 != ''">
USER_REGION1 =#{userRegion1,jdbcType=VARCHAR},
</if>
<if test="userRegion2 != null and userRegion2 != ''">
USER_REGION2 =#{userRegion2,jdbcType=VARCHAR},
</if>
<if test="userRegion3 != null and userRegion3 != ''">
USER_REGION1 =#{userRegion3,jdbcType=VARCHAR},
</if>
<if test="userRegion4 != null and userRegion4 != ''">
USER_REGION1 =#{userRegion4,jdbcType=VARCHAR},
</if>
<if test="userRegion5 != null and userRegion5 != ''">
USER_REGION1 =#{userRegion5,jdbcType=VARCHAR},
</if>
</trim>
</set>

17
src/main/java/com/nis/web/dao/specific/SpecificServiceCfgDao.xml
View File

@@ -11,6 +11,7 @@
<result column="op_time" property="opTime" jdbcType="TIMESTAMP" />
<result column="is_leaf" property="isLeaf" jdbcType="INTEGER" />
<result column="group_id" property="groupId" jdbcType="INTEGER" />
<result column="cfg_type" property="cfgType" jdbcType="INTEGER" />
<!-- 父id -->
<association property="parent" javaType="com.nis.domain.specific.SpecificServiceCfg">
<id column="parent_id" property="specServiceId" jdbcType="INTEGER" />
@@ -26,7 +27,8 @@
s.op_time AS opTime,
s.parent_id AS "parent.specServiceId",
s.is_leaf AS isLeaf,
s.group_id AS groupId
s.group_id AS groupId,
s.cfg_type AS cfgType
</sql>
@@ -53,6 +55,9 @@
<if test="groupId != null and groupId != '' ">
AND group_id like '%${groupId}%'
</if>
<if test="cfgType != null and cfgType != '' ">
AND cfg_type =#{cfgType,jdbcType=INTEGER}
</if>
<if test="beginDate != null" >
AND s.op_time &gt;= #{beginDate,jdbcType=TIMESTAMP}
</if>
@@ -112,6 +117,9 @@
<if test="specificServiceCfg.groupId != null and specificServiceCfg.groupId != '' ">
AND group_id like '%${specificServiceCfg.groupId}%'
</if>
<if test="specificServiceCfg.cfgType != null and specificServiceCfg.cfgType != '' ">
AND cfg_type = #{specificServiceCfg.cfgType}
</if>
<if test="specificServiceCfg.beginDate != null">
AND op_time &gt; #{specificServiceCfg.beginDate}
</if>
@@ -130,8 +138,8 @@
<!-- 新增 -->
<insert id="insert" parameterType="com.nis.domain.specific.SpecificServiceCfg" useGeneratedKeys="true">
insert into specific_service_cfg (spec_service_code,spec_service_name,spec_service_desc,is_valid, op_time, parent_id,is_leaf,group_id)
values(#{specServiceCode},#{specServiceName},#{specServiceDesc},#{isValid},#{opTime},#{parent.specServiceId},#{isLeaf},#{groupId})
insert into specific_service_cfg (spec_service_code,spec_service_name,spec_service_desc,is_valid, op_time, parent_id,is_leaf,group_id,cfg_type)
values(#{specServiceCode},#{specServiceName},#{specServiceDesc},#{isValid},#{opTime},#{parent.specServiceId},#{isLeaf},#{groupId},#{cfgType})
</insert>
<!-- 修改 -->
@@ -144,7 +152,8 @@
s.op_time = #{opTime},
s.parent_id = #{parent.specServiceId},
s.is_leaf = #{isLeaf},
s.group_id = #{groupId}
s.group_id = #{groupId},
s.cfg_type = #{cfgType}
WHERE s.spec_service_id = #{specServiceId}
</update>

13
src/main/java/com/nis/web/service/basics/ServiceDictInfoService.java
View File

@@ -86,6 +86,19 @@ public class ServiceDictInfoService extends BaseService{
}
return list;
}
/**
* 查询该类型所有的非叶子配置
*/
public List<ServiceDictInfo> findAllNoLeafDictList(String itType,Integer cfgType) {
List<ServiceDictInfo> list = Lists.newArrayList();
List<Integer> intArr = ConfigDictUtils.dealTypeCondition(Configurations.getStringProperty("SERVICE_DICT_ITM_TYPE", ""), itType);
for(Integer intType:intArr){
List<ServiceDictInfo> tempList = serviceDictInfoDao.findAllNoLeafDictList(intType);
list.addAll(tempList);
}
return list;
}
/**
* 根据主键查询字典详细信息
* @param serviceDictId

3
src/main/resources/messages/message_en.properties
View File

@@ -790,6 +790,9 @@ app_byte_config=APP Byte Feature
social_app=Applicaiton
app_policy_config=APP Policy
app_features_config=APP Feature
cfg_type=Cfg Type
encrypted_tunnel_protpcol=Encrypted Tunnel Protpcol
behaviour_type=Behaviour Type
#=============about app config===========
#=============about Maintenance=========
ip_Reuse_pool_config=IP Reuseing Pool

14
src/main/resources/messages/message_ru.properties
View File

@@ -702,6 +702,20 @@ ratelimit=ratelimit scale
ir_type=multiplex type
dns_strategy_id=dns strategy id
#=============about manipulation=========
#=============about app config===========
domain=Domain
app_ip_config=APP Protocol IP
bytes=byte
app_http_config=APP HTTP Feature
app_domain_config=APP Domain Feature
app_byte_config=APP Byte Feature
social_app=Applicaiton
app_policy_config=APP Policy
app_features_config=APP Feature
cfg_type=Cfg Type
encrypted_tunnel_protpcol=Encrypted Tunnel Protpcol
behaviour_type=Behaviour Type
#=============about app config===========
#=============about Maintenance=========
ip_multiplex_pool_config=ip multiplex pool config
dns_res_strategy=dns response strategy

3
src/main/resources/messages/message_zh_CN.properties
View File

@@ -792,6 +792,9 @@ app_byte_config=APP\u5B57\u8282\u7279\u5F81
social_app=\u793E\u4EA4\u5E94\u7528
app_policy_config=APP\u7B56\u7565
app_features_config=APP\u7279\u5F81
cfg_type=\u914D\u7F6E\u7C7B\u578B
encrypted_tunnel_protpcol=\u52A0\u5BC6\u96A7\u9053\u534F\u8BAE
behaviour_type=\u884C\u4E3A\u7C7B\u578B
#=============about app config===========
#=============about Maintenance=========
ip_multiplex_pool_config=IP\u590D\u7528\u5730\u5740\u6C60

2
src/main/webapp/WEB-INF/tags/sys/treeselect.tag
View File

@@ -107,10 +107,12 @@
break; // 如果为非复选框选择，则返回第一个选择 </c:if>
}
$("#${id}Id").val(ids.join(",").replace(/u_/ig,""));
$("#${id}Id").change();//手动触发change事件，使Id的值得变化可以被监听到
$("#${id}Name").val(names.join(","));
}//<c:if test="${allowClear}">
else if (v=="clear"){
$("#${id}Id").val("");
$("#${id}Id").change();//手动触发change事件，使Id的值得变化可以被监听到
$("#${id}Name").val("");
}//</c:if>
if(typeof ${id}TreeselectCallBack == 'function'){

5
src/main/webapp/WEB-INF/views/cfg/app/appByteCfgForm.jsp
View File

@@ -46,6 +46,9 @@ $(function(){
</head>
<body>
<div class="page-content">
<c:forEach items="${fns:getDictList('SPECIFIC_SERVICE_CFG_TYPE') }" var="dict">
<c:if test="${dict.itemValue eq 'social_app'}"><c:set var="app" value="${dict.itemCode}"/></c:if>
</c:forEach>
<span id="keywordError" style="display:none"><spring:message code="required"></spring:message></span>
<span id="tagsinputTip" style="display:none"><spring:message code="multiple_keywords_tip"></spring:message></span>
<h3 class="page-title">
@@ -88,7 +91,7 @@ $(function(){
<sys:treeselect id="specServiceId" name="specServiceId" value="${_cfg.specServiceId}"
labelName="parent.specServiceName"
labelValue="${empty _cfg.specServiceId?spec_service_id:fns:getBySpecServiceId(_cfg.specServiceId).specServiceName}"
title="${spec_service_id}" url="/specific/specificServiceCfg/treeData?isLeafShow=false" extId=""
title="${spec_service_id}" url="/specific/specificServiceCfg/treeData?isLeafShow=false&cfgType=${app}" extId=""
cssClass="form-control required"/>
</div>
<div for="parent.specServiceName"></div>

5
src/main/webapp/WEB-INF/views/cfg/app/appDomainCfgForm.jsp
View File

@@ -47,6 +47,9 @@ $(function(){
<body>
<div class="page-content">
<c:forEach items="${fns:getDictList('SPECIFIC_SERVICE_CFG_TYPE') }" var="dict">
<c:if test="${dict.itemValue eq 'social_app'}"><c:set var="app" value="${dict.itemCode}"/></c:if>
</c:forEach>
<span id="keywordError" style="display:none"><spring:message code="required"></spring:message></span>
<span id="tagsinputTip" style="display:none"><spring:message code="multiple_keywords_tip"></spring:message></span>
<h3 class="page-title">
@@ -88,7 +91,7 @@ $(function(){
<sys:treeselect id="specServiceId" name="specServiceId" value="${_cfg.specServiceId}"
labelName="parent.specServiceName"
labelValue="${empty _cfg.specServiceId?spec_service_id:fns:getBySpecServiceId(_cfg.specServiceId).specServiceName}"
title="${spec_service_id}" url="/specific/specificServiceCfg/treeData?isLeafShow=false" extId=""
title="${spec_service_id}" url="/specific/specificServiceCfg/treeData?isLeafShow=false&cfgType=${app}" extId=""
cssClass="form-control required"/>
</div>
<div for="parent.specServiceName"></div>

5
src/main/webapp/WEB-INF/views/cfg/app/appHttpCfgForm.jsp
View File

@@ -47,6 +47,9 @@ $(function(){
<body>
<div class="page-content">
<c:forEach items="${fns:getDictList('SPECIFIC_SERVICE_CFG_TYPE') }" var="dict">
<c:if test="${dict.itemValue eq 'social_app'}"><c:set var="app" value="${dict.itemCode}"/></c:if>
</c:forEach>
<span id="keywordError" style="display:none"><spring:message code="required"></spring:message></span>
<span id="tagsinputTip" style="display:none"><spring:message code="multiple_keywords_tip"></spring:message></span>
<h3 class="page-title">
@@ -88,7 +91,7 @@ $(function(){
<sys:treeselect id="specServiceId" name="specServiceId" value="${_cfg.specServiceId}"
labelName="parent.specServiceName"
labelValue="${empty _cfg.specServiceId?spec_service_id:fns:getBySpecServiceId(_cfg.specServiceId).specServiceName}"
title="${spec_service_id}" url="/specific/specificServiceCfg/treeData?isLeafShow=false" extId=""
title="${spec_service_id}" url="/specific/specificServiceCfg/treeData?isLeafShow=false&cfgType=${app}" extId=""
cssClass="form-control required"/>
</div>
<div for="parent.specServiceName"></div>

5
src/main/webapp/WEB-INF/views/cfg/app/appIpCfgForm.jsp
View File

@@ -29,6 +29,9 @@ $(function(){
<body>
<div class="page-content">
<c:forEach items="${fns:getDictList('SPECIFIC_SERVICE_CFG_TYPE') }" var="dict">
<c:if test="${dict.itemValue eq 'social_app'}"><c:set var="app" value="${dict.itemCode}"/></c:if>
</c:forEach>
<h3 class="page-title">
<spring:message code="app_ip_config"></spring:message>
</h3>
@@ -69,7 +72,7 @@ $(function(){
<sys:treeselect id="specServiceId" name="specServiceId" value="${_cfg.specServiceId}"
labelName="parent.specServiceName"
labelValue="${empty _cfg.specServiceId?spec_service_id:fns:getBySpecServiceId(_cfg.specServiceId).specServiceName}"
title="${spec_service_id}" url="/specific/specificServiceCfg/treeData?isLeafShow=false" extId=""
title="${spec_service_id}" url="/specific/specificServiceCfg/treeData?isLeafShow=false&cfgType=${app}" extId=""
cssClass="form-control required"/>
</div>
<div for="parent.specServiceName"></div>

75
src/main/webapp/WEB-INF/views/cfg/app/appPolicyCfgForm.jsp
View File

@@ -57,7 +57,57 @@ $(function(){
},
errorContainer: "#messageBox",
});
if('${_cfg.userRegion1}'){
ajaxBehaviour($("#specServiceIdId").val());
}
$("#specServiceIdId").on("change",function(){
ajaxBehaviour($(this).val());
});
});
var ajaxBehaviour=function(val){
var pathName=window.document.location.pathname.substring(0,window.document.location.pathname.indexOf("/nis")+4);
var request=$.ajax({
type:'post',
url:pathName+'/specific/specificServiceCfg/childrenList',
data:{"parent":val},
dataType:'json',
async:true,
success:function(data,textStatus){//处理返回结果
if(textStatus=="success"){
if(data.length>0){
var html='<select name="userRegion1" data-live-search="true" class="selectpicker form-control">'
+'<option value=""><spring:message code="select"/></option>';
for(i=0;i<data.length;i++){
html+='<option value="'+data[i].code+'"';
if('${_cfg.userRegion1}'==data[i].code){
html+=" selected";
}
html+='>'+data[i].name+'</option>';
}
html+='</select>';
$("#behaviour").prev("label").removeClass("hidden");
$("#behaviour").html(html);
$("[name='userRegion1']").selectpicker("refresh");
$("[name='userRegion1']").selectpicker("render");
}else{
if($("#behaviour").prev("label").is(":visible")){
$("#behaviour").prev("label").addClass("hidden");
$("#behaviour").html("");
}
}
}
},
complete:function(XMLHttpRequest,status){//超时设置
if(status=="timeout"){
if($("#behaviour").prev("label").is(":visible")){
$("#behaviour").prev("label").addClass("hidden");
$("#behaviour").html("");
}
}
}
});
}
//业务窗口打开
var addContent = function(obj, contentClassName) {
var showDiv = $(obj).parent().parent().next();
@@ -76,6 +126,9 @@ var delContent = function(contentClassName, addBtnClassName) {
<body>
<div class="page-content">
<c:forEach items="${fns:getDictList('SPECIFIC_SERVICE_CFG_TYPE') }" var="dict">
<c:if test="${dict.itemValue eq 'social_app'}"><c:set var="app" value="${dict.itemCode}"/></c:if>
</c:forEach>
<h3 class="page-title">
<spring:message code="app_policy_config"></spring:message>
</h3>
@@ -109,6 +162,16 @@ var delContent = function(contentClassName, addBtnClassName) {
<c:if test="${region.regionType eq 2 }">
<input type="hidden" name="cfgType" value="${region.configRegionValue}">
<input type="hidden" name="cfgRegionCode" value="${region.configRegionCode}">
<div class="row">
<div class="col-md-6">
<div class="form-group">
<label class="control-label col-md-3"><spring:message code="config_describe"/></label>
<div class="col-md-6">
<input class="form-control" type="text" name="cfgDesc" value="${_cfg.cfgDesc}">
</div>
</div>
</div>
</div>
<div class="row">
<div class="col-md-6">
<div class="form-group">
@@ -117,20 +180,16 @@ var delContent = function(contentClassName, addBtnClassName) {
<sys:treeselect id="specServiceId" name="specServiceId" value="${_cfg.specServiceId}"
labelName="parent.specServiceName"
labelValue="${empty _cfg.specServiceId?spec_service_id:fns:getBySpecServiceId(_cfg.specServiceId).specServiceName}"
title="${spec_service_id}" url="/specific/specificServiceCfg/treeData?isLeafShow=false" extId=""
title="${spec_service_id}" url="/specific/specificServiceCfg/treeData?isLeafShow=false&cfgType=${app}" extId=""
cssClass="form-control required"/>
</div>
<div for="parent.specServiceName"></div>
</div>
</div>
<div class="col-md-6">
<div class="form-group">
<label class="control-label col-md-3"><spring:message code="config_describe"/></label>
<div class="col-md-6">
<input class="form-control" type="text" name="cfgDesc" value="${_cfg.cfgDesc}">
</div>
</div>
<label class="control-label col-md-3 hidden"><spring:message code="behaviour_type"/></label>
<div class="col-md-6" id="behaviour">
</div>
</div>
</div>
<div class="row">

2
src/main/webapp/WEB-INF/views/cfg/app/appPolicyCfgList.jsp
View File

@@ -310,6 +310,7 @@
<th><input type="checkbox" class="i-checks" id="checkAll"></th>
<th class="cfgDesc"><spring:message code="config_describe"/></th>
<th><spring:message code="social_app"/></th>
<th><spring:message code="behaviour_type"/></th>
<th><spring:message code="ratelimit"/></th>
<th><spring:message code="block_type"/></th>
<th><spring:message code="whether_area_block"/></th>
@@ -337,6 +338,7 @@
</td>
<td>${cfg.cfgDesc }</td>
<td>${cfg.appName }</td>
<td>${cfg.userRegion1 }</td>
<td>${cfg.ratelimit }</td>
<td>
<c:forEach items="${fns:getDictList('SERVICE_ACTION') }" var="dict">

10
src/main/webapp/WEB-INF/views/specific/specificServiceCfgForm.jsp
View File

@@ -115,7 +115,7 @@
</div>
</div>
<div class="form-group">
<label class="col-md-3 control-label"><spring:message code="group_id"/>:</label>
<label class="col-md-3 control-label hidden"><spring:message code="group_id"/>:</label>
<div class="col-md-4">
<form:input path="groupId" htmlEscape="false" maxlength="50" range="[0,2147483647]" class="form-control digits hidden" placeholder="0"/>
</div>
@@ -130,6 +130,14 @@
</form:select>
</div>
</div> --%>
<div class="form-group">
<label class="col-md-3 control-label"><font color="red">*</font><spring:message code="cfg_type"/>:</label>
<div class="col-md-4">
<c:forEach items="${fns:getDictList('SPECIFIC_SERVICE_CFG_TYPE') }" var="dict">
<label class="radio-inline"><form:radiobutton path="cfgType" class="required" value="${dict.itemCode}"/><spring:message code="${dict.itemValue}"/></label>
</c:forEach>
</div>
</div>
<div class="form-group">
<label class="col-md-3 control-label"><spring:message code="protocol_desc"/>:</label>
<div class="col-md-4">

5
src/main/webapp/WEB-INF/views/specific/specificServiceCfgList.jsp
View File

@@ -255,6 +255,7 @@
<th><spring:message code="protocol_desc"/></th>
<th><spring:message code="group_id"/></th>
<th><spring:message code="is_leaf"/></th>
<th><spring:message code="cfg_type"/></th>
<th class="sort-column op_time"><spring:message code="operate_time"/></th>
</tr>
</thead>
@@ -268,6 +269,10 @@
<td title="${specificServiceCfg.specServiceDesc}">${fns:abbr(specificServiceCfg.specServiceDesc,15)}</td>
<td>${specificServiceCfg.groupId }</td>
<td><spring:message code="${fns:getDictLabel('INT_YES_NO',specificServiceCfg.isLeaf,'0')}"></spring:message></td>
<td><c:forEach items="${fns:getDictList('SPECIFIC_SERVICE_CFG_TYPE') }" var="dict">
<c:if test="${dict.itemCode==specificServiceCfg.cfgType}"><spring:message code="${dict.itemValue}"/></c:if>
</c:forEach>
</td>
<td><fmt:formatDate value="${specificServiceCfg.opTime}" pattern="yyyy-MM-dd HH:mm:ss"/></td>
<%-- <td>
<div class="btn-group btn-xs">