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

修改关注网站配置导入 主题、网站大小写不敏感；修改App Ip配置导入模板

Browse Source 
Conflicts:
	src/main/java/com/nis/web/controller/BaseController.java
This commit is contained in:
zhangwenqing
2019-01-21 15:47:32 +08:00
committed by wangxin
parent 4ed438f8aa
commit e412d22569
5 changed files with 79 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
src/main/java/com/nis/domain/configuration/template/TopicWebsiteTemplate.java
View File

@@ -9,26 +9,10 @@ import com.nis.util.excel.ExcelField;
*/
public class TopicWebsiteTemplate extends StringAllNotDoLogTemplate{
private Long topicId; // 主题
private Long websiteServiceId; // 网站
private String topic; // 主题
private String websiteService; // 网站
private String cfgKeywords; // 域名
@ExcelField(title="topic",dictType="TOPIC",sort=2)
public Long getTopicId() {
return topicId;
}
public void setTopicId(Long topicId) {
this.topicId = topicId;
}
@ExcelField(title="website_server",dictType="WEBSITE_SERVER",sort=3)
public Long getWebsiteServiceId() {
return websiteServiceId;
}
public void setWebsiteServiceId(Long websiteServiceId) {
this.websiteServiceId = websiteServiceId;
}
@ExcelField(title="domain_name",sort=4)
public String getCfgKeywords() {
return cfgKeywords;
@@ -36,5 +20,21 @@ public class TopicWebsiteTemplate extends StringAllNotDoLogTemplate{
public void setCfgKeywords(String cfgKeywords) {
this.cfgKeywords = cfgKeywords;
}
@ExcelField(title="topic",sort=2)
public String getTopic() {
return topic;
}
public void setTopic(String topic) {
this.topic = topic;
}
@ExcelField(title="website_server",sort=3)
public String getWebsiteService() {
return websiteService;
}
public void setWebsiteService(String websiteService) {
this.websiteService = websiteService;
}
}