清空配置功能增加调用相应服务接口步骤

src/main/java/com/nis/util/Constants.java

@@ -363,6 +363,7 @@ public final class Constants {
 	public static final String FILE_UPLOAD_CFG = Configurations.getStringProperty("fileUploadCfg","fileUploadSources"); 
 	public static final String FILE_DIGEST_CFG=Configurations.getStringProperty("fileDigestCfg","fileDigestSources");
 	public static final String CONFIG_ID_SOURCES=Configurations.getStringProperty("configIdSources","configPzIdSources");
+	public static final String DEL_ALL_CFG=Configurations.getStringProperty("delAllCfg","delAllConfig");
 	//日志查询接口URL
 	public static final String LOG_BASE_URL = Configurations.getStringProperty("logBaseUrl","");
 	public static final String NTC_SERVICE_REPORT=Configurations.getStringProperty("ntcServiceReport","ntcServiceReport");

src/main/java/com/nis/web/controller/SystemController.java

@@ -209,8 +209,6 @@ public class SystemController  extends BaseController{
 	public boolean clearPolicies(HttpServletRequest request, HttpServletResponse response) {
 		try {
 			systemService.clearPolicies();
-			/*ArrayList<Object> list = Lists.newArrayList();
-			System.out.println(list.get(6));*/
 			return true;
 		} catch (Exception e) {
 			logger.error("Clear Policies Error",e);

src/main/java/com/nis/web/service/SystemService.java

@@ -7,6 +7,11 @@ import java.util.Date;
 import java.util.List;
 import java.util.Set;
 
+import javax.ws.rs.client.Invocation.Builder;
+import javax.ws.rs.client.WebTarget;
+import javax.ws.rs.core.MediaType;
+import javax.ws.rs.core.Response;
+
 import org.apache.axiom.om.OMAbstractFactory;
 import org.apache.axiom.om.OMElement;
 import org.apache.axiom.om.OMFactory;
@@ -24,10 +29,12 @@ import com.nis.domain.SrcIp;
 import com.nis.domain.SysRole;
 import com.nis.domain.SysUser;
 import com.nis.util.Configurations;
+import com.nis.util.Constants;
 import com.nis.util.DateUtils;
 import com.nis.util.IpUtil;
 import com.nis.util.ServiceConfigTemplateUtil;
 import com.nis.util.TimeConstants;
+import com.nis.util.httpclient.ClientUtil;
 import com.nis.web.dao.SrcIpDao;
 import com.nis.web.dao.SysOfficeDao;
 import com.nis.web.dao.UserDao;
@@ -173,16 +180,25 @@ public class SystemService extends BaseService{
 	}
 
 	public void clearPolicies() throws Exception {
-		// TODO 调用服务接口 告知flushAll
+		// 调用服务接口 告知flushAll
-		/*String destUrl = Constants.SERVICE_URL;
+		String url = Constants.SERVICE_URL + Constants.DEL_ALL_CFG;
-		HttpClientUtil.get(destUrl);*/
+		// 创建连接
-		Set<String> tableNameSet = ServiceConfigTemplateUtil.getAllTableName();
+		WebTarget wt = ClientUtil.getWebTarger(url);
-		tableNameSet.add("pxy_obj_spoofing_ip_pool");
+		// 获取响应结果
-		for (String tableName : tableNameSet) {
+		Builder header = wt.request(MediaType.APPLICATION_JSON).header("Content-Type", MediaType.APPLICATION_JSON);
-			commonPolicyDao.clearPolicies(tableName);
+		Response response = header.delete(); 
+		if(response.getStatus() == 200){
+			//String result= response.readEntity(String.class);
+			Set<String> tableNameSet = ServiceConfigTemplateUtil.getAllTableName();
+			tableNameSet.add("pxy_obj_spoofing_ip_pool");
+			for (String tableName : tableNameSet) {
+				commonPolicyDao.clearPolicies(tableName);
+			}
+			// 初始化分组
+			asnGroupInfoService.reLoadGroupInfo();
+		}else {
+			throw new RuntimeException();
 		}
-		// 初始化分组
-		asnGroupInfoService.reLoadGroupInfo();
 		
 	}
 }

src/main/resources/nis.properties

@@ -520,3 +520,4 @@ trafficAppBpsTrend=v1/trafficAppBpsTrend
 cgiError=cannot connect to vpnserver,Connection to the server has failed,Specified object can not be found,Too many users,User already exists,Too many created users,The destination server is not a VPN server,The connection has been interrupted,
 #\u83b7\u53d6\u670d\u52a1\u914d\u7f6e\u603b\u91cf\u63a5\u53e3
 getConfigByService=v1/getConfigByService
+delAllCfg=v1/delAllConfig