配置文件与下载模板调整

cn.com.taiji.myapp/src/main/resources/application-dev.properties

@@ -0,0 +1,53 @@
+spring.datasource.url=jdbc:mysql://200.1.54.238:8801/tjcgwzyml?useUnicode=true&characterEncoding=utf-8&useSSL=false&allowPublicKeyRetrieval=true
+spring.datasource.username=cgw
+spring.datasource.password=Cgw!1@2#3$4
+#spring.datasource.url=jdbc:mysql://127.0.0.1:9088/tjcgwzyml?useUnicode=true&characterEncoding=utf-8&useSSL=false&allowPublicKeyRetrieval=true
+#spring.datasource.username=root
+#spring.datasource.password=umisoft.cn
+spring.datasource.driverClassName=com.mysql.cj.jdbc.Driver
+spring.datasource2.url=jdbc:mysql://200.1.54.238:8801/tjcgwzyml?useUnicode=true&characterEncoding=utf-8&useSSL=false&allowPublicKeyRetrieval=true
+spring.datasource2.username=cgw
+spring.datasource2.password=Cgw!1@2#3$4
+#spring.datasource2.url=jdbc:mysql://127.0.0.1:9088/tjcgwzyml?useUnicode=true&characterEncoding=utf-8&useSSL=false&allowPublicKeyRetrieval=true
+#spring.datasource2.username=root
+#spring.datasource2.password=umisoft.cn
+spring.datasource2.driverClassName=com.mysql.cj.jdbc.Driver
+spring.datasource.type=com.alibaba.druid.pool.DruidDataSource
+spring.datasource.minIdle=5
+spring.datasource.maxActive=50
+spring.datasource.maxWait=60000
+spring.datasource.timeBetweenEvictionRunsMillis=60000
+spring.datasource.minEvictableIdleTimeMillis=300000
+spring.datasource.validationQuery=SELECT 1 FROM DUAL
+spring.datasource.testWhileIdle=true
+spring.datasource.testOnBorrow=false
+spring.datasource.testOnReturn=false
+spring.datasource.poolPreparedStatements=true
+spring.datasource.maxOpenPreparedStatements=100
+spring.datasource.filters=stat,wall,log4j
+spring.datasource.connectionProperties=druid.stat.mergeSql=true;druid.stat.slowSqlMillis=5000
+spring.datasource.removeAbandoned=true
+spring.datasource.removeAbandonedTimeout=1000
+# database name
+spring.redis.database=0
+#spring.redis.host=200.1.54.238
+#spring.redis.password=Cgw!1#3%5
+#spring.redis.port=16379
+spring.redis.host=127.0.0.1
+spring.redis.password=umisoft.cn
+spring.redis.port=9004
+# pool settings ...
+spring.redis.pool.max-idle=8
+spring.redis.pool.min-idle=0
+spring.redis.pool.max-active=8
+spring.redis.pool.max-wait=-1
+spring.redis.timeout=120
+gxxy_file_path=/Users/hujie/Documents/dev/git-repo/taiji/tianjin-cgw/zyml/cn.com.taiji.myapp/target
+dcbcUploadfile=/Users/hujie/Documents/dev/git-repo/taiji/tianjin-cgw/zyml/cn.com.taiji.myapp/target
+baUploadfile=/Users/hujie/Documents/dev/git-repo/taiji/tianjin-cgw/zyml/cn.com.taiji.myapp/target
+ckeditor.storage.image.path=/Users/hujie/Documents/dev/git-repo/taiji/tianjin-cgw/zyml/cn.com.taiji.myapp/target
+ckeditor.access.image.url=http://localhost:8180/
+ckeditor.access.image.url2=http://localhost:8180/public/image/
+# uploadpath  baocunlujing
+save_path=/Users/hujie/Documents/dev/git-repo/taiji/tianjin-cgw/zyml/cn.com.taiji.myapp/target
+breakpoint.upload.dir=/Users/hujie/Documents/dev/git-repo/taiji/tianjin-cgw/zyml/cn.com.taiji.myapp/target

cn.com.taiji.myapp/src/main/resources/application-prod.properties

@@ -0,0 +1,44 @@
+spring.datasource.url=jdbc:mysql://200.1.54.238:8801/tjcgwzyml?useUnicode=true&characterEncoding=utf-8&useSSL=false&allowPublicKeyRetrieval=true
+spring.datasource.username=cgw
+spring.datasource.password=Cgw!1@2#3$4
+spring.datasource.driverClassName=com.mysql.cj.jdbc.Driver
+spring.datasource2.url=jdbc:mysql://200.1.54.238:8801/tjcgwzyml?useUnicode=true&characterEncoding=utf-8&useSSL=false&allowPublicKeyRetrieval=true
+spring.datasource2.username=cgw
+spring.datasource2.password=Cgw!1@2#3$4
+spring.datasource2.driverClassName=com.mysql.cj.jdbc.Driver
+spring.datasource.type=com.alibaba.druid.pool.DruidDataSource
+spring.datasource.minIdle=5
+spring.datasource.maxActive=50
+spring.datasource.maxWait=60000
+spring.datasource.timeBetweenEvictionRunsMillis=60000
+spring.datasource.minEvictableIdleTimeMillis=300000
+spring.datasource.validationQuery=SELECT 1 FROM DUAL
+spring.datasource.testWhileIdle=true
+spring.datasource.testOnBorrow=false
+spring.datasource.testOnReturn=false
+spring.datasource.poolPreparedStatements=true
+spring.datasource.maxOpenPreparedStatements=100
+spring.datasource.filters=stat,wall,log4j
+spring.datasource.connectionProperties=druid.stat.mergeSql=true;druid.stat.slowSqlMillis=5000
+spring.datasource.removeAbandoned=true
+spring.datasource.removeAbandonedTimeout=1000
+# database name
+spring.redis.database=0
+spring.redis.host=200.1.54.238
+spring.redis.password=Cgw!1#3%5
+spring.redis.port=16379
+# pool settings ...
+spring.redis.pool.max-idle=8
+spring.redis.pool.min-idle=0
+spring.redis.pool.max-active=8
+spring.redis.pool.max-wait=-1
+spring.redis.timeout=120
+gxxy_file_path=/data/cgwresdir/mlxtfile/gxxy
+dcbcUploadfile=/data/cgwresdir/dbdcFile/dcfile
+baUploadfile=/data/cgwresdir/dbdcFile/dcbafile
+ckeditor.storage.image.path=/data/cgwresdir/data/file/image/
+ckeditor.access.image.url=http://localhost:8180/
+ckeditor.access.image.url2=http://localhost:8180/public/image/
+# uploadpath  baocunlujing
+save_path=/data/cgwresdir/lyz/file
+breakpoint.upload.dir=/data/cgwresdir/loginfo/bigfile/uploads/

cn.com.taiji.myapp/src/main/resources/application.properties

@@ -1,20 +1,6 @@
+spring.profiles.active=dev
 database_type=mysql
 spring.thymeleaf.cache=false
-#spring.datasource.url=jdbc:mysql://200.1.54.238:8801/tjcgwzyml?useUnicode=true&characterEncoding=utf-8&useSSL=false&allowPublicKeyRetrieval=true
-#spring.datasource.username=cgw
-#spring.datasource.password=Cgw!1@2#3$4
-spring.datasource.url=jdbc:mysql://127.0.0.1:9088/tjcgwzyml?useUnicode=true&characterEncoding=utf-8&useSSL=false&allowPublicKeyRetrieval=true
-spring.datasource.username=root
-spring.datasource.password=umisoft.cn
-spring.datasource.driverClassName=com.mysql.cj.jdbc.Driver
-#spring.datasource2.url=jdbc:mysql://200.1.54.238:8801/tjcgwzyml?useUnicode=true&characterEncoding=utf-8&useSSL=false&allowPublicKeyRetrieval=true
-#spring.datasource2.username=cgw
-#spring.datasource2.password=Cgw!1@2#3$4
-spring.datasource2.url=jdbc:mysql://127.0.0.1:9088/tjcgwzyml?useUnicode=true&characterEncoding=utf-8&useSSL=false&allowPublicKeyRetrieval=true
-spring.datasource2.username=root
-spring.datasource2.password=umisoft.cn
-spring.datasource2.driverClassName=com.mysql.cj.jdbc.Driver
-spring.datasource.type=com.alibaba.druid.pool.DruidDataSource
 multipart.maxFileSize=10240404
 spring.jpa.show-sql=true
 management.security.role=ADMIN
@@ -39,59 +25,23 @@ spring.mail.properties.mail.smtp.auth=true
 spring.mail.properties.mail.smtp.starttls.enable=true
 spring.mail.properties.mail.smtp.starttls.required=true
 spring.freemarker.template-loader-path=classpath:/templates/
-# 下面为连接池的补充设置，应用到上面所有数据源中
-spring.datasource.minIdle=5
-spring.datasource.maxActive=50
-# 配置获取连接等待超时的时间
-spring.datasource.maxWait=60000
-# 配置间隔多久才进行一次检测，检测需要关闭的空闲连接，单位是毫秒 
-spring.datasource.timeBetweenEvictionRunsMillis=60000
-# 配置一个连接在池中最小生存的时间，单位是毫秒 
-spring.datasource.minEvictableIdleTimeMillis=300000
-spring.datasource.validationQuery=SELECT 1 FROM DUAL
-spring.datasource.testWhileIdle=true
-spring.datasource.testOnBorrow=false
-spring.datasource.testOnReturn=false
-# 打开PSCache，并且指定每个连接上PSCache的大小 
-spring.datasource.poolPreparedStatements=true
-spring.datasource.maxOpenPreparedStatements=100
-# 配置监控统计拦截的filters，去掉后监控界面sql无法统计，'wall'用于防火墙 
-spring.datasource.filters=stat,wall,log4j
-# 通过connectProperties属性来打开mergeSql功能；慢SQL记录
-spring.datasource.connectionProperties=druid.stat.mergeSql=true;druid.stat.slowSqlMillis=5000
-#spring.datasource.useGlobalDataSourceStat=true
-spring.datasource.removeAbandoned=true
-spring.datasource.removeAbandonedTimeout=1000
 # database name
 spring.redis.database=0
-# server host1
-#spring.redis.host=200.1.54.238
-spring.redis.host=127.0.0.1
-# server password
-#spring.redis.password=Cgw!1#3%5
-spring.redis.password=umisoft.cn
-#connection port
-#spring.redis.port=16379
-spring.redis.port=9004
+spring.redis.host=200.1.54.238
+spring.redis.password=Cgw!1#3%5
+spring.redis.port=16379
 # pool settings ...
 spring.redis.pool.max-idle=8
 spring.redis.pool.min-idle=0
 spring.redis.pool.max-active=8
 spring.redis.pool.max-wait=-1
 spring.redis.timeout=120
-gxxy_file_path=/data/cgwresdir/mlxtfile/gxxy
-dcbcUploadfile=/data/cgwresdir/dbdcFile/dcfile
-baUploadfile=/data/cgwresdir/dbdcFile/dcbafile
-ckeditor.storage.image.path=/data/cgwresdir/data/file/image/
-ckeditor.access.image.url=http://localhost:8180/
-ckeditor.access.image.url2=http://localhost:8180/public/image/
+
 server.port=8081
 server.session.cookie.http-only=true
 ywbmdm=ywbmdm
 sddm=shudidaima
-# uploadpath  baocunlujing
-save_path=/data/cgwresdir/lyz/file
-#maxfize  500M  shangchuanzuidazhi 
+#maxfize  500M  shangchuanzuidazhi
 maxfize=524288000
 #flash 10240404
 file_size_limit=500MB 
@@ -163,7 +113,4 @@ indicators.gjshValue=6
 #spring.jpa.hibernate.ddl-auto=update
 viewrole=
 aksk=gxwzgxwz
-#breakpoint.upload.dir=/data/cgwresdir/bigfile/uploads/
-breakpoint.upload.dir=/data/cgwresdir/loginfo/bigfile/uploads/
 breakpoint.upload.chunkSize=5242880
-office.template.path=/Users/hujie/Documents/dev/git-repo/taiji/tianjin-cgw/zyml/cn.com.taiji.myapp/src/main/webapp

cn.com.taiji.system/src/main/java/cn/com/taiji/zhongxiao/web/FileDown.java

@@ -9,8 +9,8 @@ import java.net.URLEncoder;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
-import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Controller;
+import org.springframework.util.ResourceUtils;
 import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.RequestMapping;
 
@@ -19,24 +19,19 @@ import org.springframework.web.bind.annotation.RequestMapping;
 @RequestMapping(value="/fileDown")
 public class FileDown {
 
-
-	@Value("${office.template.path}")
-	private String officePath;
-
 	    @RequestMapping("/download{name}")  
 	    public void fileDownload(@PathVariable("name") String name ,HttpServletRequest request, HttpServletResponse response){   //Model models,
 			FileInputStream ins = null;
 			OutputStream out = null ;
 			try {
-	    	String path = officePath + File.separator + name + ".xlsx";
-	    	File file = new File(path);
-	    	//设置响应头，控制浏览器下载该文件
+	    	File file = ResourceUtils.getFile("classpath:templates/download-excel-template/" + name + ".xlsx");
+				//设置响应头，控制浏览器下载该文件
 		  if(file.exists()){
 	    	response.setHeader("Content-disposition", String.format("attachment; filename=\"%s\"", name+".xlsx"));
 	    	response.setContentType("application/vnd.ms-excel;charset=utf-8");
 	    	response.setCharacterEncoding("UTF-8"); 
 	    	//读取要下载的文件，保存到文件输入流
-	    	    ins  = new FileInputStream(path);
+	    	    ins  = new FileInputStream(file);
 	    	//创建输出流
 	    	    out = response.getOutputStream();
 	    	//创建缓冲区
@@ -76,15 +71,15 @@ public class FileDown {
 			FileInputStream ins = null;
 			OutputStream out = null ;
 			try {
-	    	String path = officePath + File.separator + name + "." + type;
-	    	File file = new File(path);
-	    	//设置响应头，控制浏览器下载该文件
+				File file = ResourceUtils.getFile("classpath:templates/download-excel-template/" + name + "." + type);
+
+				//设置响应头，控制浏览器下载该文件
 		  if(file.exists()){
 	    	response.setHeader("Content-disposition", String.format("attachment; filename=\"%s\"", name+"."+type));
 	    	response.setContentType("application/octet-stream;charset=utf-8");
 	    	response.setCharacterEncoding("UTF-8"); 
 	    	//读取要下载的文件，保存到文件输入流
-	    	    ins  = new FileInputStream(path);
+	    	    ins  = new FileInputStream(file);
 	    	//创建输出流
 	    	    out = response.getOutputStream();
 	    	//创建缓冲区