增加报告信息

Author: LinuxSuRen

src/main/java/org/suren/autotest/web/framework/report/record/ProjectRecord.java

@@ -26,21 +26,82 @@
  */
 public class ProjectRecord
 {
-    private String osInfo;
+	private String name;
+	private String description;
+    private String osName;
+    private String osArch;
+    private String osVersion;
+    private String country;
+    private String language;
+    private String timezone;
     private String browserInfo;
     private String addressInfo;
     private Map<String, String> userInfo;
 
 	private List<SuiteRecord> suiteRecordList;
 
-	public String getOsInfo()
-	{
-		return osInfo;
+	public String getName() {
+		return name;
 	}
 
-	public void setOsInfo(String osInfo)
-	{
-		this.osInfo = osInfo;
+	public void setName(String name) {
+		this.name = name;
+	}
+
+	public String getDescription() {
+		return description;
+	}
+
+	public void setDescription(String description) {
+		this.description = description;
+	}
+
+	public String getOsName() {
+		return osName;
+	}
+
+	public void setOsName(String osName) {
+		this.osName = osName;
+	}
+
+	public String getOsArch() {
+		return osArch;
+	}
+
+	public void setOsArch(String osArch) {
+		this.osArch = osArch;
+	}
+
+	public String getOsVersion() {
+		return osVersion;
+	}
+
+	public void setOsVersion(String osVersion) {
+		this.osVersion = osVersion;
+	}
+
+	public String getCountry() {
+		return country;
+	}
+
+	public void setCountry(String country) {
+		this.country = country;
+	}
+
+	public String getLanguage() {
+		return language;
+	}
+
+	public void setLanguage(String language) {
+		this.language = language;
+	}
+
+	public String getTimezone() {
+		return timezone;
+	}
+
+	public void setTimezone(String timezone) {
+		this.timezone = timezone;
 	}
 
 	public String getBrowserInfo()

src/main/java/org/suren/autotest/web/framework/settings/SettingUtil.java

@@ -18,6 +18,7 @@
 
 package org.suren.autotest.web.framework.settings;
 
+import net.sf.json.util.JSONUtils;
 import org.dom4j.*;
 import org.dom4j.io.SAXReader;
 import org.dom4j.xpath.DefaultXPath;
@@ -30,6 +31,7 @@
 import org.springframework.context.annotation.AnnotationConfigApplicationContext;
 import org.springframework.context.support.AbstractApplicationContext;
 import org.suren.autotest.web.framework.AutoApplicationConfig;
+import org.suren.autotest.web.framework.annotation.AutoApplication;
 import org.suren.autotest.web.framework.annotation.AutoDataSource;
 import org.suren.autotest.web.framework.annotation.AutoLocator;
 import org.suren.autotest.web.framework.annotation.AutoPage;
@@ -40,10 +42,12 @@
 import org.suren.autotest.web.framework.hook.ShutdownHook;
 import org.suren.autotest.web.framework.page.Page;
 import org.suren.autotest.web.framework.report.RecordReportWriter;
+import org.suren.autotest.web.framework.report.record.ProjectRecord;
 import org.suren.autotest.web.framework.selenium.SeleniumEngine;
 import org.suren.autotest.web.framework.spring.AutoModuleScope;
 import org.suren.autotest.web.framework.spring.AutotestScope;
 import org.suren.autotest.web.framework.util.BeanUtil;
+import org.suren.autotest.web.framework.util.NetUtil;
 import org.suren.autotest.web.framework.util.StringUtils;
 import org.suren.autotest.web.framework.validation.Validation;
 import org.xml.sax.SAXException;
@@ -136,6 +140,45 @@ public SettingUtil(Class<?> ... annotatedClasses)
 
 		shutdownHook = new ShutdownHook(this);
 		Runtime.getRuntime().addShutdownHook(shutdownHook);
+
+		Map<String, Object> autoApp = context.getBeansWithAnnotation(AutoApplication.class);
+		final String projectName;
+		final String projectDesc;
+		if(autoApp != null && autoApp.size() > 0)
+		{
+			Object appObj = autoApp.values().iterator().next();
+			AutoApplication autoApplication = appObj.getClass().getAnnotation(AutoApplication.class);
+			if(autoApplication == null)
+			{
+				autoApplication = appObj.getClass().getSuperclass().getAnnotation(AutoApplication.class);
+			}
+			projectName = autoApplication.name();
+			projectDesc = autoApplication.description();
+		}
+		else
+		{
+			projectName = "none";
+			projectDesc = "none";
+		}
+
+		Map<String, RecordReportWriter> writers = context.getBeansOfType(RecordReportWriter.class);
+		if(writers != null)
+		{
+		    writers.forEach((name, writer) -> {
+				ProjectRecord projectRecord = new ProjectRecord();
+				projectRecord.setName(projectName);
+				projectRecord.setDescription(projectDesc);
+				projectRecord.setBrowserInfo("browserInfo");
+				projectRecord.setOsName(System.getProperty("os.name"));
+				projectRecord.setOsArch(System.getProperty("os.arch"));
+				projectRecord.setOsVersion(System.getProperty("os.version"));
+				projectRecord.setCountry(System.getProperty("user.country"));
+				projectRecord.setLanguage(System.getProperty("user.language"));
+				projectRecord.setTimezone(System.getProperty("user.timezone"));
+				projectRecord.setAddressInfo(JSONUtils.valueToString(NetUtil.allIP()));
+		    	writer.write(projectRecord);
+			});
+		}
 
 		logger.info("init process done.");
 	}