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:
leijun
2018-08-31 16:32:50 +08:00
parent c531619177 781d236859
commit 3a16c894ab
25 changed files with 77 additions and 62 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/main/java/com/nis/web/service/configuration/AppCfgService.java
View File

@@ -1431,9 +1431,9 @@ public class AppCfgService extends BaseService {
}
public void updateAppPolicyCfgValid(Integer isValid, String ids, Integer functionId) {
AppPolicyCfg entity = new AppPolicyCfg();
String[] idArray = ids.split(",");
for (String id : idArray) {
AppPolicyCfg entity = new AppPolicyCfg();
entity.setCfgId(Long.parseLong(id));
entity.setIsValid(isValid);
entity.setEditorId(UserUtils.getUser().getId());
@@ -1469,9 +1469,9 @@ public class AppCfgService extends BaseService {
}
public void updateAppIpCfgValid(Integer isValid, String ids, Integer functionId) {
AppIpCfg entity = new AppIpCfg();
String[] idArray = ids.split(",");
for (String id : idArray) {
AppIpCfg entity = new AppIpCfg();
entity.setCfgId(Long.parseLong(id));
entity.setIsValid(isValid);
entity.setEditorId(UserUtils.getUser().getId());
@@ -1492,9 +1492,9 @@ public class AppCfgService extends BaseService {
}
public void updateAppTcpCfgValid(Integer isValid, String ids, Integer functionId) {
AppTcpCfg entity = new AppTcpCfg();
String[] idArray = ids.split(",");
for (String id : idArray) {
AppTcpCfg entity = new AppTcpCfg();
entity.setCfgId(Long.parseLong(id));
entity.setIsValid(isValid);
entity.setEditorId(UserUtils.getUser().getId());
@@ -1515,9 +1515,9 @@ public class AppCfgService extends BaseService {
}
public void updateAppHttpCfgValid(Integer isValid, String ids, Integer functionId) {
AppHttpCfg entity = new AppHttpCfg();
String[] idArray = ids.split(",");
for (String id : idArray) {
AppHttpCfg entity = new AppHttpCfg();
entity.setCfgId(Long.parseLong(id));
entity.setIsValid(isValid);
entity.setEditorId(UserUtils.getUser().getId());
@@ -1538,9 +1538,9 @@ public class AppCfgService extends BaseService {
}
public void updateAppDomainCfgValid(Integer isValid, String ids, Integer functionId) {
AppDomainCfg entity = new AppDomainCfg();
String[] idArray = ids.split(",");
for (String id : idArray) {
AppDomainCfg entity = new AppDomainCfg();
entity.setCfgId(Long.parseLong(id));
entity.setIsValid(isValid);
entity.setEditorId(UserUtils.getUser().getId());
@@ -1562,9 +1562,9 @@ public class AppCfgService extends BaseService {
// 主题网站配置删除
public void updateAppTopicDomainCfgValid(Integer isValid, String ids, Integer functionId) {
AppTopicDomainCfg entity = new AppTopicDomainCfg();
String[] idArray = ids.split(",");
for (String id : idArray) {
AppTopicDomainCfg entity = new AppTopicDomainCfg();
entity.setCfgId(Long.parseLong(id));
entity.setIsValid(isValid);
entity.setEditorId(UserUtils.getUser().getId());
@@ -1585,9 +1585,9 @@ public class AppCfgService extends BaseService {
}
public void updateAppByteCfgValid(Integer isValid, String ids, Integer functionId) {
AppByteCfg entity = new AppByteCfg();
String[] idArray = ids.split(",");
for (String id : idArray) {
AppByteCfg entity = new AppByteCfg();
entity.setCfgId(Long.parseLong(id));
entity.setIsValid(isValid);
entity.setEditorId(UserUtils.getUser().getId());
@@ -1608,9 +1608,9 @@ public class AppCfgService extends BaseService {
}
public void updateAppSslCfgValid(Integer isValid, String ids, Integer functionId) {
AppSslCertCfg entity = new AppSslCertCfg();
String[] idArray = ids.split(",");
for (String id : idArray) {
AppSslCertCfg entity = new AppSslCertCfg();
entity.setCfgId(Long.parseLong(id));
entity.setIsValid(isValid);
entity.setEditorId(UserUtils.getUser().getId());
@@ -1631,9 +1631,9 @@ public class AppCfgService extends BaseService {
}
public void updateAppHeaderCfgValid(Integer isValid, String ids, Integer functionId) {
AppHeaderCfg entity = new AppHeaderCfg();
String[] idArray = ids.split(",");
for (String id : idArray) {
AppHeaderCfg entity = new AppHeaderCfg();
entity.setCfgId(Long.parseLong(id));
entity.setIsValid(isValid);
entity.setEditorId(UserUtils.getUser().getId());

4
src/main/java/com/nis/web/service/configuration/AvCfgService.java
View File

@@ -290,9 +290,9 @@ public class AvCfgService extends BaseService{
audioAuditAvSignSample(entity,1);
}
public void updateAvFileSampleValid(Integer isAudit,Integer isValid,String ids){
AvFileSampleCfg entity = new AvFileSampleCfg();
String[] idArray = ids.split(",");
for(String id :idArray){
AvFileSampleCfg entity = new AvFileSampleCfg();
entity.setCfgId(Long.parseLong(id));
entity.setIsAudit(isAudit);
entity.setIsValid(isValid);
@@ -332,9 +332,9 @@ public class AvCfgService extends BaseService{
}
}
public void updateAvSignSampleValid(Integer isAudit,Integer isValid,String ids){
AvSignSampleCfg entity = new AvSignSampleCfg();
String[] idArray = ids.split(",");
for(String id :idArray){
AvSignSampleCfg entity = new AvSignSampleCfg();
entity.setCfgId(Long.parseLong(id));
entity.setIsAudit(isAudit);
entity.setIsValid(isValid);

20
src/main/java/com/nis/web/service/configuration/AvContentCfgService.java
View File

@@ -322,9 +322,9 @@ public class AvContentCfgService extends BaseService{
*/
@Transactional(readOnly=false,rollbackFor=RuntimeException.class)
public void updateAvVoipValid(Integer isAudit,Integer isValid,String compileIds,Integer functionId){
CfgIndexInfo entity = new CfgIndexInfo();
String[] idArray = compileIds.split(",");
for(String id :idArray){
CfgIndexInfo entity = new CfgIndexInfo();
entity.setCompileId(Integer.parseInt(id));
entity.setFunctionId(functionId);
entity.setIsAudit(isAudit);
@@ -347,9 +347,9 @@ public class AvContentCfgService extends BaseService{
*/
@Transactional(readOnly=false,rollbackFor=RuntimeException.class)
public void updateAvVoipAccountValid(Integer isAudit,Integer isValid,String compileIds,Integer functionId){
CfgIndexInfo entity = new CfgIndexInfo();
String[] idArray = compileIds.split(",");
for(String id :idArray){
CfgIndexInfo entity = new CfgIndexInfo();
entity.setCompileId(Integer.parseInt(id));
entity.setFunctionId(functionId);
entity.setIsAudit(isAudit);
@@ -744,10 +744,10 @@ public class AvContentCfgService extends BaseService{
*/
@Transactional(readOnly=false,rollbackFor=RuntimeException.class)
public void updateContIpValid(Integer isAudit,Integer isValid,String ids,Integer functionId){
BaseIpCfg entity = new BaseIpCfg();
entity.setTableName("av_cont_ip_cfg");
String[] idArray = ids.split(",");
for(String id :idArray){
BaseIpCfg entity = new BaseIpCfg();
entity.setTableName("av_cont_ip_cfg");
entity.setCompileId(Integer.parseInt(id));
entity.setFunctionId(functionId);
entity.setIsAudit(isAudit);
@@ -1024,10 +1024,10 @@ public class AvContentCfgService extends BaseService{
*/
@Transactional(readOnly=false,rollbackFor=RuntimeException.class)
public void updatePicIpValid(Integer isAudit,Integer isValid,String ids,Integer functionId){
BaseIpCfg entity = new BaseIpCfg();
entity.setTableName("av_pic_ip_cfg");
String[] idArray = ids.split(",");
for(String id :idArray){
BaseIpCfg entity = new BaseIpCfg();
entity.setTableName("av_pic_ip_cfg");
entity.setCompileId(Integer.parseInt(id));
entity.setFunctionId(functionId);
entity.setIsAudit(isAudit);
@@ -1280,10 +1280,10 @@ public class AvContentCfgService extends BaseService{
*/
@Transactional(readOnly=false,rollbackFor=RuntimeException.class)
public void updateContUrlValid(Integer isAudit,Integer isValid,String ids,Integer functionId){
BaseStringCfg entity = new BaseStringCfg();
entity.setTableName("av_cont_url_cfg");
String[] idArray = ids.split(",");
for(String id :idArray){
BaseStringCfg entity = new BaseStringCfg();
entity.setTableName("av_cont_url_cfg");
entity.setCompileId(Integer.parseInt(id));
entity.setFunctionId(functionId);
entity.setIsAudit(isAudit);
@@ -1525,10 +1525,10 @@ public class AvContentCfgService extends BaseService{
*/
@Transactional(readOnly=false,rollbackFor=RuntimeException.class)
public void updatePicUrlValid(Integer isAudit,Integer isValid,String ids,Integer functionId){
BaseStringCfg entity = new BaseStringCfg();
entity.setTableName("av_pic_url_cfg");
String[] idArray = ids.split(",");
for(String id :idArray){
BaseStringCfg entity = new BaseStringCfg();
entity.setTableName("av_pic_url_cfg");
entity.setCompileId(Integer.parseInt(id));
entity.setFunctionId(functionId);
entity.setIsAudit(isAudit);

2
src/main/java/com/nis/web/service/configuration/BgpCfgService.java
View File

@@ -213,9 +213,9 @@ public class BgpCfgService extends CrudService<BgpCfgDao,CfgIndexInfo> {
* @param functionId
*/
public void updateBgpCfgValid(Integer isValid,String ids,Integer functionId){
CfgIndexInfo entity = new CfgIndexInfo();
String[] idArray = ids.split(",");
for(String id :idArray){
CfgIndexInfo entity = new CfgIndexInfo();
entity.setCfgId(Long.parseLong(id));
entity.setIsValid(isValid);
entity.setEditorId(UserUtils.getUser().getId());

2
src/main/java/com/nis/web/service/configuration/DdosCfgService.java
View File

@@ -89,9 +89,9 @@ public class DdosCfgService extends BaseService{
*/
@Transactional(readOnly=false,rollbackFor=RuntimeException.class)
public void delete(Integer isAudit,Integer isValid,String ids,Integer functionId){
DdosIpCfg entity = new DdosIpCfg();
String[] idArray = ids.split(",");
for(String id :idArray){
DdosIpCfg entity = new DdosIpCfg();
entity.setCfgId(Long.valueOf(id));
entity.setFunctionId(functionId);
entity.setIsAudit(isAudit);

2
src/main/java/com/nis/web/service/configuration/DnsIpCfgService.java
View File

@@ -89,9 +89,9 @@ public class DnsIpCfgService extends BaseService{
*/
@Transactional(readOnly=false,rollbackFor=RuntimeException.class)
public void delete(Integer isAudit,Integer isValid,String ids,Integer functionId){
DnsIpCfg entity = new DnsIpCfg();
String[] idArray = ids.split(",");
for(String id :idArray){
DnsIpCfg entity = new DnsIpCfg();
entity.setCfgId(Long.valueOf(id));
entity.setFunctionId(functionId);
entity.setIsAudit(isAudit);

2
src/main/java/com/nis/web/service/configuration/DnsResStrategyService.java
View File

@@ -103,9 +103,9 @@ public class DnsResStrategyService extends BaseService{
*/
@Transactional(readOnly=false,rollbackFor=RuntimeException.class)
public void delete(Integer isAudit,Integer isValid,String ids,Integer functionId){
DnsResStrategy entity = new DnsResStrategy();
String[] idArray = ids.split(",");
for(String id :idArray){
DnsResStrategy entity = new DnsResStrategy();
entity.setCfgId(Long.valueOf(id));
entity.setFunctionId(functionId);
entity.setIsAudit(isAudit);

2
src/main/java/com/nis/web/service/configuration/DomainService.java
View File

@@ -511,9 +511,9 @@ public class DomainService extends CrudService<DomainDao,HttpUrlCfg> {
}
}
public void updateDomainCfgValid(Integer isValid,String ids,Integer functionId){
CfgIndexInfo entity = new CfgIndexInfo();
String[] idArray = ids.split(",");
for(String id :idArray){
CfgIndexInfo entity = new CfgIndexInfo();
entity.setCfgId(Long.parseLong(id));
entity.setIsValid(isValid);
entity.setEditorId(UserUtils.getUser().getId());

41
src/main/java/com/nis/web/service/configuration/FileTransferCfgService.java
View File

@@ -197,9 +197,9 @@ public class FileTransferCfgService extends CrudService<FileTransferCfgDao,CfgIn
}
}
public void updateFtpCfgValid(Integer isValid,String ids,Integer functionId){
CfgIndexInfo entity = new CfgIndexInfo();
String[] idArray = ids.split(",");
for(String id :idArray){
CfgIndexInfo entity = new CfgIndexInfo();
entity.setCfgId(Long.parseLong(id));
entity.setIsValid(isValid);
entity.setEditorId(UserUtils.getUser().getId());
@@ -491,9 +491,9 @@ public class FileTransferCfgService extends CrudService<FileTransferCfgDao,CfgIn
}
public void updateFileDigestCfgValid(Integer isValid,String ids,Integer functionId){
FileDigestCfg entity = new FileDigestCfg();
String[] idArray = ids.split(",");
for(String id :idArray){
FileDigestCfg entity = new FileDigestCfg();
entity.setCfgId(Long.parseLong(id));
entity.setIsValid(isValid);
entity.setEditorId(UserUtils.getUser().getId());
@@ -794,9 +794,9 @@ public class FileTransferCfgService extends CrudService<FileTransferCfgDao,CfgIn
}
public void updateP2pCfgValid(Integer isValid, String ids, Integer functionId) {
CfgIndexInfo entity = new CfgIndexInfo();
String[] idArray = ids.split(",");
for(String id :idArray){
CfgIndexInfo entity = new CfgIndexInfo();
entity.setCfgId(Long.parseLong(id));
entity.setIsValid(isValid);
entity.setEditorId(UserUtils.getUser().getId());
@@ -939,22 +939,27 @@ public class FileTransferCfgService extends CrudService<FileTransferCfgDao,CfgIn
maatCfg.setAreaIpRegionList(areaIpRegionList);
maatCfg.setIsValid(entity.getIsValid());
//设置自定义域参数
String userRegion = "";
for (IpPortCfg ipPortCfg : entity.getIpPortList()) {
if(!ipPortCfg.getUserRegion1().equals("")) {
userRegion += Constants.P2P_IP_TYPE_USER_REGION_KEY+"="+ipPortCfg.getUserRegion1();
}
for (BaseStringCfg p2pHashCfg : entity.getP2pHashList()) {
if(!p2pHashCfg.getUserRegion1().equals("")) {
userRegion += Constants.USER_REGION_SPLIT+Constants.P2P_HASH_TYPE_USER_REGION_KEY+"="+p2pHashCfg.getUserRegion1();
}else {
userRegion += Constants.USER_REGION_SPLIT+Constants.P2P_HASH_TYPE_USER_REGION_KEY+"=";
}
}
}
maatCfg.setUserRegion(userRegion);
String userRegion = "";
//存在IP域
if(entity != null && entity.getIpPortList() != null && entity.getIpPortList().size() >0){
IpPortCfg ipport=entity.getIpPortList().get(0);
ipport.setUserRegion1(StringUtil.isEmpty(ipport.getUserRegion1()) ? "":ipport.getUserRegion1());
userRegion += Constants.P2P_IP_TYPE_USER_REGION_KEY+"="+ipport.getUserRegion1();
}
//存在hash域
if(entity != null && entity.getP2pHashList() != null && entity.getP2pHashList().size() >0){
BaseStringCfg hashCfg=entity.getP2pHashList().get(0);
hashCfg.setUserRegion1(StringUtil.isEmpty(hashCfg.getUserRegion1()) ? "":hashCfg.getUserRegion1());
if(!StringUtil.isEmpty(userRegion)){
userRegion =userRegion+Constants.USER_REGION_SPLIT+Constants.P2P_HASH_TYPE_USER_REGION_KEY+"="+hashCfg.getUserRegion1();
}else{
userRegion += Constants.P2P_HASH_TYPE_USER_REGION_KEY+"="+hashCfg.getUserRegion1();
}
}
if(!StringUtil.isEmpty(userRegion)){
maatCfg.setUserRegion(userRegion);
}
configCompileList.add(maatCfg);
maatBean.setConfigCompileList(configCompileList);
maatBean.setAuditTime(entity.getAuditTime());

2
src/main/java/com/nis/web/service/configuration/HttpRedirectCfgService.java
View File

@@ -234,9 +234,9 @@ public class HttpRedirectCfgService extends CrudService<WebsiteCfgDao,CfgIndexIn
}
}
public void updateHttpCfgValid(Integer isValid,String ids,Integer functionId){
CfgIndexInfo entity = new CfgIndexInfo();
String[] idArray = ids.split(",");
for(String id :idArray){
CfgIndexInfo entity = new CfgIndexInfo();
entity.setCfgId(Long.parseLong(id));
entity.setIsValid(isValid);
entity.setEditorId(UserUtils.getUser().getId());

2
src/main/java/com/nis/web/service/configuration/InterceptCfgService.java
View File

@@ -187,9 +187,9 @@ public class InterceptCfgService extends CrudService<WebsiteCfgDao,CfgIndexInfo>
* @param functionId
*/
public void updatInterceptValid(Integer isValid,String ids,Integer functionId){
CfgIndexInfo entity = new CfgIndexInfo();
String[] idArray = ids.split(",");
for(String id :idArray){
CfgIndexInfo entity = new CfgIndexInfo();
entity.setCfgId(Long.parseLong(id));
entity.setIsValid(isValid);
entity.setEditorId(UserUtils.getUser().getId());

2
src/main/java/com/nis/web/service/configuration/IpCfgService.java
View File

@@ -181,9 +181,9 @@ public class IpCfgService extends CrudService<IpCfgDao,BaseIpCfg> {
}
}
public void updateIpCfgValid(Integer isValid,String ids,Integer functionId){
CfgIndexInfo entity = new CfgIndexInfo();
String[] idArray = ids.split(",");
for(String id :idArray){
CfgIndexInfo entity = new CfgIndexInfo();
entity.setCfgId(Long.parseLong(id));
entity.setIsValid(isValid);
entity.setEditorId(UserUtils.getUser().getId());

2
src/main/java/com/nis/web/service/configuration/IpMultiplexPoolCfgService.java
View File

@@ -103,9 +103,9 @@ public class IpMultiplexPoolCfgService extends BaseService{
*/
@Transactional(readOnly=false,rollbackFor=RuntimeException.class)
public void delete(Integer isAudit,Integer isValid,String ids,Integer functionId){
IpMultiplexPoolCfg entity = new IpMultiplexPoolCfg();
String[] idArray = ids.split(",");
for(String id :idArray){
IpMultiplexPoolCfg entity = new IpMultiplexPoolCfg();
entity.setCfgId(Long.valueOf(id));
entity.setFunctionId(functionId);
entity.setIsAudit(isAudit);

2
src/main/java/com/nis/web/service/configuration/MailCfgService.java
View File

@@ -212,9 +212,9 @@ public class MailCfgService extends CrudService<MailCfgDao,CfgIndexInfo> {
}
}
public void updateMailCfgValid(Integer isValid,String ids,Integer functionId){
CfgIndexInfo entity = new CfgIndexInfo();
String[] idArray = ids.split(",");
for(String id :idArray){
CfgIndexInfo entity = new CfgIndexInfo();
entity.setCfgId(Long.parseLong(id));
entity.setIsValid(isValid);
entity.setEditorId(UserUtils.getUser().getId());

2
src/main/java/com/nis/web/service/configuration/PxyObjKeyringService.java
View File

@@ -101,9 +101,9 @@ public class PxyObjKeyringService extends BaseService{
*/
@Transactional(readOnly=false,rollbackFor=RuntimeException.class)
public void delete(Integer isAudit,Integer isValid,String ids,Integer functionId){
PxyObjKeyring entity = new PxyObjKeyring();
String[] idArray = ids.split(",");
for(String id :idArray){
PxyObjKeyring entity = new PxyObjKeyring();
entity.setCfgId(Long.valueOf(id));
entity.setFunctionId(functionId);
entity.setIsAudit(isAudit);

6
src/main/java/com/nis/web/service/configuration/WebsiteCfgService.java
View File

@@ -257,9 +257,9 @@ public class WebsiteCfgService extends CrudService<WebsiteCfgDao,CfgIndexInfo> {
}
}
public void updateHttpCfgValid(Integer isValid,String ids,Integer functionId){
CfgIndexInfo entity = new CfgIndexInfo();
String[] idArray = ids.split(",");
for(String id :idArray){
CfgIndexInfo entity = new CfgIndexInfo();
entity.setCfgId(Long.parseLong(id));
entity.setIsValid(isValid);
entity.setEditorId(UserUtils.getUser().getId());
@@ -604,9 +604,9 @@ public class WebsiteCfgService extends CrudService<WebsiteCfgDao,CfgIndexInfo> {
}
}
public void updateSslCfgValid(Integer isValid,String ids,Integer functionId){
CfgIndexInfo entity = new CfgIndexInfo();
String[] idArray = ids.split(",");
for(String id :idArray){
CfgIndexInfo entity = new CfgIndexInfo();
entity.setCfgId(Long.parseLong(id));
entity.setIsValid(isValid);
entity.setEditorId(UserUtils.getUser().getId());
@@ -875,9 +875,9 @@ public class WebsiteCfgService extends CrudService<WebsiteCfgDao,CfgIndexInfo> {
* @param functionId
*/
public void updateDnsCfgValid(Integer isValid,String ids,Integer functionId){
CfgIndexInfo entity = new CfgIndexInfo();
String[] idArray = ids.split(",");
for(String id :idArray){
CfgIndexInfo entity = new CfgIndexInfo();
entity.setCfgId(Long.parseLong(id));
entity.setIsValid(isValid);
entity.setEditorId(UserUtils.getUser().getId());

2
src/main/java/com/nis/web/service/configuration/XmppCfgService.java
View File

@@ -151,9 +151,9 @@ public class XmppCfgService extends CrudService<XmppCfgDao,CfgIndexInfo> {
}
}
public void updateXmppCfgValid(Integer isValid,String ids,Integer functionId){
CfgIndexInfo entity = new CfgIndexInfo();
String[] idArray = ids.split(",");
for(String id :idArray){
CfgIndexInfo entity = new CfgIndexInfo();
entity.setCfgId(Long.parseLong(id));
entity.setIsValid(isValid);
entity.setEditorId(UserUtils.getUser().getId());

2
src/main/resources/sql/add_app_topic_domain_cfg_add_column20180831.sql Normal file
View File

@@ -0,0 +1,2 @@
alter table app_topic_domain_cfg change topic topic_id bigint(11) not null;
alter table app_topic_domain_cfg change behav_code website_service_id bigint(11);

2
src/main/resources/sql/updata_request_info_20180231.sql Normal file
View File

@@ -0,0 +1,2 @@
alter table request_info modify column request_title VARCHAR(512) not NULL COMMENT 'request_number字段与request_title互换使用，request_title当来函函号使用';
alter table request_info modify column request_number VARCHAR(512) COMMENT 'request_number字段与request_title互换使用，request_number当来函标题使用';

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

@@ -25,7 +25,7 @@
<div class="form-group">
<label class="col-md-3 control-label"><font color="red">*</font><spring:message code="request_number"></spring:message>:</label>
<div class="col-md-4">
<input type="text" class="form-control required" maxlength="64" name="requestNumber" value="${requestInfo.requestNumber}">
<input type="text" class="form-control required" maxlength="512" name="requestTitle" value="${requestInfo.requestTitle}"><!--requestTitle当成来函函号使用 -->
</div>
</div>
<div class="form-group">
@@ -44,7 +44,7 @@
<div class="form-group">
<label class="col-md-3 control-label"><font color="red">*</font><spring:message code="title"></spring:message>:</label>
<div class="col-md-4">
<input type="text" class="form-control required" name="requestTitle" maxlength="512" value="${requestInfo.requestTitle}">
<input type="text" class="form-control required" name="requestNumber" maxlength="512" value="${requestInfo.requestNumber}"><!--requestTitle当成来函标题使用 -->
</div>
</div>
<div class="form-group">

8
src/main/webapp/WEB-INF/views/cfg/requestList.jsp
View File

@@ -74,8 +74,8 @@
<div class="input-group">
<div class="input-group-btn">
<form:select path="seltype" class="selectpicker select2 input-small" >
<form:option value="requestTitle"><spring:message code="title"></spring:message></form:option>
<form:option value="requestNumber"><spring:message code="request_number"></spring:message></form:option>
<form:option value="requestNumber"><spring:message code="title"></spring:message></form:option>
<form:option value="requestTitle"><spring:message code="request_number"></spring:message></form:option>
<form:option value="requestContent"><spring:message code="content"></spring:message></form:option>
</form:select>
</div>
@@ -221,7 +221,7 @@
<tr>
<td><input type="checkbox" class="i-checks" id="${requestInfo.id}" value="${requestInfo.isAudit}"></td>
<td>${requestInfo.id }</td>
<td>${requestInfo.requestNumber }</td>
<td>${requestInfo.requestTitle }</td><!--requestTitle当成来函函号使用 -->
<td>${requestInfo.requestOrg }</td>
<td><fmt:formatDate value="${requestInfo.requestTime }" pattern="yyyy-MM-dd"/></td>
<td>
@@ -232,7 +232,7 @@
<c:when test="${requestInfo.isAudit eq '3'}"><span class="label label-warning"><spring:message code="cancel_approved"></spring:message></span></c:when>
</c:choose>
</td>
<td>${requestInfo.requestTitle }</td>
<td>${requestInfo.requestNumber }</td><!--requestTitle当成来函标题使用 -->
<td>${requestInfo.requestContent }</td>
<td>${requestInfo.taskName }</td>
<td>${requestInfo.creatorName }</td>

3
src/main/webapp/static/global/plugins/jquery-validation/1.11.0/localization/messages_en.js
View File

@@ -66,6 +66,7 @@
hasInvisibleChar:"The tag {0} has invisible character",
haveInvisibleChar:"The tags {0} have invisible character",
httpCheck:"Please enter a correct url(http[s]://xxx.xx)",
failed:"Failed"
failed:"Failed",
go_back:"Go Back Policies"
});
}(jQuery));

4
src/main/webapp/static/global/plugins/jquery-validation/1.11.0/localization/messages_zh.js
View File

@@ -66,7 +66,7 @@
hasInvisibleChar:"标签{0}包含不可见字符",
haveInvisibleChar:"标签{0}包含不可见字符",
httpCheck:"请输入正确的url(http[s]://xxx.xx)",
failed:"获取失败"
failed:"获取失败",
go_back:"返回配置界面"
});
}(jQuery));

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

@@ -433,6 +433,11 @@ $(function(){
return false;
});
initCommIpVal();
//去掉首尾空格
$("input,textarea").on("blur",function(){
var val=$(this).val();
$(this).val(val.trim());
});
});
window.onload=function(){
// 配置id的搜索下拉框选择切换

2
src/main/webapp/static/pages/scripts/pageLogs.js
View File

@@ -52,7 +52,7 @@ $(document).ready(function() {
// 添加由配置界面跳转到日志查询界面后的返回按钮
var cfgId = $("#cfgId").val();
if(cfgId != undefined && cfgId != ''){
$(".theme-panel").html("<button type='button' onclick='back()' class='btn btn-primary'>cancel</button>");
$(".theme-panel").html("<button type='button' onclick='back()' class='btn btn-primary'>"+$.validator.messages.go_back+"</button>");
}
});