日志openvpn页面提交；公共类修改；日志公共字段，openvpn配置文件国际化

src/main/java/com/nis/domain/log/BaseLogEntity.java

@@ -32,7 +32,7 @@ public class BaseLogEntity<T> extends BaseEntity<T> {
 	//自定义字段
 	protected String seltype;//选中类型,页面搜索用
 	protected String searchFoundStartTime;//开始时间，格式为yyyy-mm-dd hh24:mi:ss
-	protected String searchFoundendTime;//结束时间，格式同上
+	protected String searchFoundEndTime;//结束时间，格式同上
 	
 	
 	public String getSearchFoundStartTime() {
@@ -41,11 +41,11 @@ public class BaseLogEntity<T> extends BaseEntity<T> {
 	public void setSearchFoundStartTime(String searchFoundStartTime) {
 		this.searchFoundStartTime = searchFoundStartTime;
 	}
-	public String getSearchFoundendTime() {
-		return searchFoundendTime;
+	public String getSearchFoundEndTime() {
+		return searchFoundEndTime;
 	}
-	public void setSearchFoundendTime(String searchFoundendTime) {
-		this.searchFoundendTime = searchFoundendTime;
+	public void setSearchFoundEndTime(String searchFoundEndTime) {
+		this.searchFoundEndTime = searchFoundEndTime;
 	}
 	public String getSeltype() {
 		return seltype;

src/main/java/com/nis/web/controller/log/ntc/OpenVpnController.java

@@ -0,0 +1,71 @@
+package com.nis.web.controller.log.ntc;
+
+import java.io.File;
+import java.io.IOException;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
+import org.apache.http.client.ClientProtocolException;
+import org.aspectj.util.FileUtil;
+import org.springframework.stereotype.Controller;
+import org.springframework.ui.Model;
+import org.springframework.web.bind.annotation.ModelAttribute;
+import org.springframework.web.bind.annotation.RequestMapping;
+
+import com.google.gson.Gson;
+import com.google.gson.GsonBuilder;
+import com.google.gson.reflect.TypeToken;
+import com.nis.domain.Page;
+import com.nis.domain.log.NtcOpenVpnLog;
+import com.nis.domain.maat.LogRecvData;
+import com.nis.util.httpclient.HttpClientUtil;
+import com.nis.web.controller.BaseController;
+
+@Controller
+@RequestMapping(value = "${adminPath}/log/ntc/ntcOpenvpnLogs")
+public class OpenVpnController extends BaseController{
+
+	@RequestMapping(value={"list",""})
+	public String list(Model model,@ModelAttribute("log")NtcOpenVpnLog testEntry,HttpServletRequest request, HttpServletResponse response) throws ClientProtocolException, IOException {
+		
+		Page<NtcOpenVpnLog> page = new Page<NtcOpenVpnLog>(request, response);
+		int pageSize = page.getPageSize();
+		int pageNo = page.getPageNo();
+		Map<String, Object> params=new HashMap<>();
+//		String jsonString = HttpClientUtil.getMsg("http://localhost:8080/gwall/view/logs/test",params);
+		
+		String readAsString = FileUtil.readAsString(new File("D:/FeigeDownload/logTest.txt"));
+		Gson gson = new GsonBuilder().create();
+		//gson泛型支持
+		LogRecvData<NtcOpenVpnLog> fromJson = gson.fromJson(readAsString, new TypeToken<LogRecvData<NtcOpenVpnLog>>(){}.getType());
+		
+		Page<NtcOpenVpnLog> data = fromJson.getData();
+		List<NtcOpenVpnLog> list = data.getList();
+		page.setList(list);
+		page.setCount(data.getCount());
+		model.addAttribute("page", page);
+		logger.info("查询OpenVpn日志成功");
+		return "/log/ntc/openVpnList";
+	}
+	public static void main(String[] args) {
+		String readAsString;
+		try {
+			readAsString = FileUtil.readAsString(new File("D:/FeigeDownload/logTest.txt"));
+		Gson gson = new GsonBuilder().create();
+		//gson泛型支持
+		LogRecvData<NtcOpenVpnLog> fromJson = gson.fromJson(readAsString, new TypeToken<LogRecvData<NtcOpenVpnLog>>(){}.getType());
+		
+		Page<NtcOpenVpnLog> page = fromJson.getData();
+		NtcOpenVpnLog object = page.getList().get(0);
+		System.err.println(object.getCfgId());
+		} catch (IOException e) {
+			
+			e.printStackTrace();
+		}
+	}
+	
+}