修改系统配置

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

@@ -77,7 +77,7 @@ public class FileServiceImpl implements FileService {
 			byte[] data = null;
 			String stantardJrxmlsUrl = String.format(sysConf.getStandardJrxmlsUrl(), sourceUserName);
 			// 如果本机提供标准模板下载，直接从本地获取数据
-			if (stantardJrxmlsUrl.contains(sysConf.getHost())) {
+			if (sysConf.hasStandardJrxmls()) {
 				data = getStandardJrxmls(sourceUserName);
 			}
 			// 本机没有标准模板，则先下载标准模板数据
@@ -216,6 +216,9 @@ public class FileServiceImpl implements FileService {
 		if (StringUtils.isEmpty(userName)) {
 			throw new ReportException("未传入当前账套名称！");
 		}
+		if (!sysConf.hasStandardJrxmls()) {
+			throw new ReportException("没有" + userName + "标准模板！");
+		}
 		byte[] data = ZipUtils.zipFolder(getMasterPath(sysConf.getStandardMaster()) + "/" + userName,
 				FileServiceImpl.fileFilter);
 		if (ArrayUtils.isEmpty(data)) {
@@ -229,6 +232,9 @@ public class FileServiceImpl implements FileService {
 		if (StringUtils.isEmpty(userName)) {
 			throw new ReportException("未传入当前账套名称！");
 		}
+		if (!sysConf.hasStandardJrxmls()) {
+			throw new ReportException("没有" + userName + "标准模板！");
+		}
 		downloadZip(sysConf.getStandardMaster() + "/" + userName, response);
 	}
 

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

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

src/main/resources/dev/sys.properties

@@ -1,7 +1,6 @@
-localBaseDir=C:/sunyj/reports/60
-#localBaseDir=C:/sunyj/reports/local
+localBaseDir=/data/reports
 localImagesDir=/Picture
 localJrxmlDir=/jrxml
-host=localhost
 standardMaster=STANDARD_MASTER
-standardJrxmlsUrl=http://192.168.253.60:8090/report/file/standardJrxmls?userName=%s&onlyData=1
+hasStandardJrxmls=false
+standardJrxmlsUrl=http://print.ubtob.com/report/file/standardJrxmls?userName=%s&onlyData=1

src/main/resources/prod/sys.properties

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

src/main/resources/test/sys.properties

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