1、增加SubscribeId分组配置功能 2、增加公共分组相关国际化代码及相关sql文件修改

src/main/java/com/nis/domain/configuration/BaseCfg.java

@@ -80,19 +80,19 @@ public class BaseCfg<T> extends BaseEntity<T> implements Cloneable{
 	private String commonGroupIds; //公共组织id(考虑一个compile存在多个asn组织的情况)
 	protected Integer groupType; //url组以及dns组相关功能使用
 	protected Integer udFlag; //url组以及dns组相关功能使用 过滤数据库数据标记
+	
+	public String getCommonGroupIds() {
+		return commonGroupIds;
+	}
+	public void setCommonGroupIds(String commonGroupIds) {
+		this.commonGroupIds = commonGroupIds;
+	}
 	public Integer getGroupType() {
 		return groupType;
 	}
 	public void setGroupType(Integer groupType) {
 		this.groupType = groupType;
 	}
-	public String getCommonGroupIds() {
-		return commonGroupIds;
-	}
-	
-	public void setCommonGroupIds(String commonGroupIds) {
-		this.commonGroupIds = commonGroupIds;
-	}
 	public Integer getUdFlag() {
 		return udFlag;
 	}

src/main/java/com/nis/domain/configuration/CfgIndexInfo.java

@@ -14,8 +14,10 @@ import java.util.Map;
 import com.google.gson.annotations.Expose;
 import com.nis.domain.basics.AsnGroupInfo;
 import com.nis.domain.basics.AsnIpCfg;
+import com.nis.domain.basics.DomainCommCfg;
 import com.nis.domain.basics.IpCommCfg;
 import com.nis.domain.basics.IpReuseIpCfg;
+import com.nis.domain.basics.ScriberIdCommCfg;
 import com.nis.domain.basics.UrlCommCfg;
 import com.nis.util.Constants;
 import com.nis.util.excel.ExcelField;
@@ -92,6 +94,9 @@ public class CfgIndexInfo extends BaseCfg<CfgIndexInfo> {
 	private Long totalLogs;
 	private List<UrlCommCfg> urlCommGroupList;
 	private List<IpCommCfg> ipCommGroupCfgList;
+	private List<DomainCommCfg> domainCommGroupList;
+	private List<ScriberIdCommCfg> scriberIdCommGroupList;
+	
 	/*private CachePolicyUserRegion cachePolicyUserRegion;//缓存策略用户自定义域参数
 	
 	public static class CachePolicyUserRegion{
@@ -425,5 +430,20 @@ public class CfgIndexInfo extends BaseCfg<CfgIndexInfo> {
 	public void setUrlCommGroupList(List<UrlCommCfg> urlCommGroupList) {
 		this.urlCommGroupList = urlCommGroupList;
 	}
+	
+	public List<DomainCommCfg> getDomainCommGroupList() {
+		return domainCommGroupList;
+	}
+	public void setDomainCommGroupList(List<DomainCommCfg> domainCommGroupList) {
+		this.domainCommGroupList = domainCommGroupList;
+	}
+	
+	public List<ScriberIdCommCfg> getScriberIdCommGroupList() {
+		return scriberIdCommGroupList;
+	}
+	public void setScriberIdCommGroupList(List<ScriberIdCommCfg> scriberIdCommGroupList) {
+		this.scriberIdCommGroupList = scriberIdCommGroupList;
+	}
+	
 
 }

src/main/java/com/nis/domain/configuration/template/DomainCommCfgTemplate.java

@@ -0,0 +1,23 @@
+package com.nis.domain.configuration.template;
+
+import com.nis.util.excel.ExcelField;
+
+/**
+ * 域名公共组配置 导入模板
+ * @author dell
+ *
+ */
+public class DomainCommCfgTemplate extends StringAllNotDoLogTemplate{
+	
+	@ExcelField(title="group_name",align=2,sort=10)
+	private Integer groupId;
+
+	public Integer getGroupId() {
+		return groupId;
+	}
+
+	public void setGroupId(Integer groupId) {
+		this.groupId = groupId;
+	}
+	
+}

src/main/java/com/nis/domain/configuration/template/IpCommCfgTemplate.java

@@ -3,7 +3,7 @@ package com.nis.domain.configuration.template;
 import com.nis.util.excel.ExcelField;
 
 public class IpCommCfgTemplate extends IpAllNotDoLogTemplate{
-    @ExcelField(title="ip_group",align=2,sort=10)
+    @ExcelField(title="group_name",align=2,sort=10)
     private Integer groupId;
 
     public Integer getGroupId() {

src/main/java/com/nis/domain/configuration/template/ScriberIdCommCfgTemplate.java

@@ -0,0 +1,23 @@
+package com.nis.domain.configuration.template;
+
+import com.nis.util.excel.ExcelField;
+
+/**
+ * 域名公共组配置 导入模板
+ * @author dell
+ *
+ */
+public class ScriberIdCommCfgTemplate extends StringAllNotDoLogTemplate{
+	
+	@ExcelField(title="group_name",align=2,sort=10)
+	private Integer groupId;
+
+	public Integer getGroupId() {
+		return groupId;
+	}
+
+	public void setGroupId(Integer groupId) {
+		this.groupId = groupId;
+	}
+	
+}

src/main/java/com/nis/domain/configuration/template/UrlCommCfgTemplate.java

@@ -9,7 +9,7 @@ import com.nis.util.excel.ExcelField;
  */
 public class UrlCommCfgTemplate extends StringAllNotDoLogTemplate{
 	
-	@ExcelField(title="url_group",align=2,sort=10)
+	@ExcelField(title="group_name",align=2,sort=10)
 	private Integer groupId;
 
 	public Integer getGroupId() {