Skip to content

platform / finance_serv

Go to a project
Commit 4bbf1084 by 谢明辉
Options

Merge branch 'develop' of http://192.168.9.26/platform/finance_serv into develop

2 parents 02e5a422 96b175f3
Inline Side-by-side
Showing 3 changed files with 6 additions and 4 deletions
code/finance_serv/src/main/java/com/vion/financial/service/imp/AppendixServiceImpl.java
...@@ -112,11 +112,11 @@ public class AppendixServiceImpl implements AppendixService { ...@@ -112,11 +112,11 @@ public class AppendixServiceImpl implements AppendixService {
appendix.setBusiness_table(appendixVo.getBusiness_table()); appendix.setBusiness_table(appendixVo.getBusiness_table());
String suffix = appendix.getAppendix_name().substring(appendix.getAppendix_name().lastIndexOf(".") + 1); String suffix = appendix.getAppendix_name().substring(appendix.getAppendix_name().lastIndexOf(".") + 1);
appendix.setAppendix_type(suffix); appendix.setAppendix_type(suffix);
appendix.setAppendix_url(financeConfig.getAppendurl()+multipartFile.getOriginalFilename()); appendix.setAppendix_url(financeConfig.getAppendurl()+System.currentTimeMillis()+"."+suffix);
addAppendix(appendix); addAppendix(appendix);
list.add(appendix); list.add(appendix);
InputStream inputStream = multipartFile.getInputStream(); InputStream inputStream = multipartFile.getInputStream();
File file = new File(financeConfig.getAppendsavepath()+multipartFile.getOriginalFilename()); File file = new File(financeConfig.getAppendsavepath()+System.currentTimeMillis()+"."+suffix);
OutputStream os = new FileOutputStream(file); OutputStream os = new FileOutputStream(file);
byte[] read = new byte[2048]; byte[] read = new byte[2048];
int off=0; int off=0;
......
deploy/application.yml.in
...@@ -43,7 +43,7 @@ logging: ...@@ -43,7 +43,7 @@ logging:
finance: finance:
authurl: http://PH_AUTH_SERV_IP:20080/api/v1/auth/users authurl: http://PH_AUTH_SERV_IP:20080/api/v1/auth/users
appendsavepath: /data/face-web/www/static/pics/cache/finance appendsavepath: /data/finance/
appendurl: http://PH_AUTH_SERV_IP:20080/static/pics/cache/finance/ appendurl: http://PH_AUTH_SERV_IP:20080/static/pics/cache/finance/
#pagehelper: #pagehelper:
# helperDialect: postgresql # helperDialect: postgresql
......
deploy/deploy.sh
...@@ -6,6 +6,8 @@ prj_name="finance_serv" ...@@ -6,6 +6,8 @@ prj_name="finance_serv"
serv_port=19111 serv_port=19111
host_log_dir=/data/vion-data/$cont_name/logs host_log_dir=/data/vion-data/$cont_name/logs
cont_log_dir=/data/vion-data/$cont_name/logs cont_log_dir=/data/vion-data/$cont_name/logs
host_appendix_path=/data/face-web/www/static/pics/cache/finance/
cont_appendix_path=/data/finance/
#cont_log_dir=/usr/local/tomcat/logs #cont_log_dir=/usr/local/tomcat/logs
echo ============= env check =============== echo ============= env check ===============
...@@ -32,7 +34,7 @@ echo ========== env check end ============== ...@@ -32,7 +34,7 @@ echo ========== env check end ==============
echo "delete old $cont_name container." echo "delete old $cont_name container."
docker rm -f $cont_name docker rm -f $cont_name
echo "docker run --name $cont_name --restart=always -d -p $serv_port:8080 -v $host_log_dir:$cont_log_dir 192.168.9.26:5000/tomcat85_oraclejdk:latest" echo "docker run --name $cont_name --restart=always -d -p $serv_port:8080 -v $host_log_dir:$cont_log_dir 192.168.9.26:5000/tomcat85_oraclejdk:latest"
docker run --name $cont_name --restart=always -d -p $serv_port:8080 -v $host_log_dir:$cont_log_dir 192.168.9.26:5000/tomcat85_oraclejdk:latest docker run --name $cont_name --restart=always -d -p $serv_port:8080 -v $host_log_dir:$cont_log_dir -v $host_appendix_path:$cont_appendix_path 192.168.9.26:5000/tomcat85_oraclejdk:latest
echo "cd $script_dir" echo "cd $script_dir"
cd $script_dir cd $script_dir
......
Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!