自动部署新账套时，如果本机没有标准模板，则先下载标准模板数据，如果有，直接获取数据

src/main/java/com/uas/report/service/impl/FileServiceImpl.java

@@ -74,12 +74,19 @@ public class FileServiceImpl implements FileService {
 			throw new ReportException("参数不能为空：sourceUserName，destinationUserNames");
 		}
 		try {
+			byte[] data = null;
 			String stantardJrxmlsUrl = String.format(sysConf.getStandardJrxmlsUrl(), sourceUserName);
-			logger.info("get standardJrxmls from " + stantardJrxmlsUrl + "...");
-			// 获取标准模板数据
-			JSONObject jsonObject = JSONObject.parseObject(IOUtils.toString(HttpClients.createDefault()
-					.execute(new HttpGet(URI.create(stantardJrxmlsUrl))).getEntity().getContent()));
-			byte[] data = jsonObject.getBytes("data");
+			// 如果本机提供标准模板下载，直接从本地获取数据
+			if (stantardJrxmlsUrl.contains(sysConf.getHost())) {
+				data = getStandardJrxmls(sourceUserName);
+			}
+			// 本机没有标准模板，则先下载标准模板数据
+			else {
+				logger.info("get standardJrxmls from " + stantardJrxmlsUrl + "...");
+				JSONObject jsonObject = JSONObject.parseObject(IOUtils.toString(HttpClients.createDefault()
+						.execute(new HttpGet(URI.create(stantardJrxmlsUrl))).getEntity().getContent()));
+				data = jsonObject.getBytes("data");
+			}
 			if (ArrayUtils.isEmpty(data)) {
 				throw new ReportException("标准模板不存在");
 			}

src/main/java/com/uas/report/support/SysConf.java

@@ -29,6 +29,12 @@ public class SysConf {
 	@Value("#{sys.localJrxmlDir}")
 	private String localJrxmlDir;
 
+	/**
+	 * 本地主机名
+	 */
+	@Value("#{sys.host}")
+	private String host;
+
 	/**
 	 * 标准账套（存放标准模板）
 	 */
@@ -65,6 +71,14 @@ public class SysConf {
 		this.localJrxmlDir = localJrxmlDir;
 	}
 
+	public String getHost() {
+		return host;
+	}
+
+	public void setHost(String host) {
+		this.host = host;
+	}
+
 	public String getStandardMaster() {
 		return standardMaster;
 	}

src/main/resources/dev/sys.properties

@@ -2,5 +2,6 @@ localBaseDir=C:/sunyj/reports/60
 #localBaseDir=C:/sunyj/reports/local
 localImagesDir=/Picture
 localJrxmlDir=/jrxml
+host=localhost
 standardMaster=STANDARD_MASTER
-standardJrxmlsUrl=http://localhost:8090/report/file/standardJrxmls?userName=%s&onlyData=1
+standardJrxmlsUrl=http://192.168.253.60:8090/report/file/standardJrxmls?userName=%s&onlyData=1

src/main/resources/prod/sys.properties

@@ -1,5 +1,6 @@
 localBaseDir=/opt/report/data
 localImagesDir=/Picture
 localJrxmlDir=/jrxml
+host=print.ubtob.com
 standardMaster=STANDARD_MASTER
 standardJrxmlsUrl=http://print.ubtob.com/report/file/standardJrxmls?userName=%s&onlyData=1

src/main/resources/test/sys.properties

@@ -1,5 +1,6 @@
 localBaseDir=/data/reports
 localImagesDir=/Picture
 localJrxmlDir=/jrxml
+host=192.168.253.60
 standardMaster=STANDARD_MASTER
 standardJrxmlsUrl=http://192.168.253.60:8090/report/file/standardJrxmls?userName=%s&onlyData=1