diff --git a/.gitignore b/.gitignore index c06bc38..fc6dc2f 100644 --- a/.gitignore +++ b/.gitignore @@ -62,3 +62,9 @@ local.properties /.idea/libraries/Maven__com_deer_wms_intercept_1_0_0_SNAPSHOT.xml /.idea/libraries/Maven__com_deer_wms_project_seed_1_0_0_SNAPSHOT.xml /.idea/workspace.xml + +/.idea/compiler.xml +/.idea/dataSources.local.xml +/.idea/encodings.xml +/.idea/workspace.xml +/wms-parent.iml diff --git a/wms-produce-manage/src/main/resources/config/application-pro.properties b/wms-produce-manage/src/main/resources/config/application-pro.properties index 31de6ff..a378de1 100644 --- a/wms-produce-manage/src/main/resources/config/application-pro.properties +++ b/wms-produce-manage/src/main/resources/config/application-pro.properties @@ -53,11 +53,12 @@ spring.rabbitmq.publisherConfirms=true logging.level.com.deer.wms=DEBUG logging.path=./logs +logging.ipdb.path=/home/mengtong/ipdb/ip2region.db #文件上传的目录位置 file.uploadFileDir=/home/mengtong/files/upload #文件上传的临时保存目录 -file.uploadTempDir=/home/mengtong/files/temp +file.uploadTempDir=/home/mengtong/files/bak #文件上传根目录 file.uploadContent=/wms spring.mvc.static-path-pattern=/file/view/**