From 3481ad27d4cc8113730d1d064516213343f8eaac Mon Sep 17 00:00:00 2001
From: winsettg <819187349@qq.com>
Date: Thu, 27 Feb 2020 21:40:36 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=AD=A3=E5=BC=8F?=
 =?UTF-8?q?=E7=8E=AF=E5=A2=83=E9=85=8D=E7=BD=AE=E6=96=87=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/resources/config/application-pro.properties    | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

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 aa8c704..31de6ff 100644
--- a/wms-produce-manage/src/main/resources/config/application-pro.properties
+++ b/wms-produce-manage/src/main/resources/config/application-pro.properties
@@ -1,6 +1,6 @@
-server.context-path=/wms
-spring.application.name=pallet-api-service
-server.port=9060
+server.context-path=/pms
+spring.application.name=mt-wms-pms
+server.port=9062
 
 #控制台彩色输出
 spring.output.ansi.enabled=ALWAYS

From 33badce595a6a9f4bd9648dcc0f4ecbf6fc13184 Mon Sep 17 00:00:00 2001
From: winsettg <819187349@qq.com>
Date: Thu, 27 Feb 2020 23:38:07 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=AD=A3=E5=BC=8F?=
 =?UTF-8?q?=E7=8E=AF=E5=A2=83=E9=85=8D=E7=BD=AE=E6=96=87=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .gitignore                                                  | 6 ++++++
 .../src/main/resources/config/application-pro.properties    | 3 ++-
 2 files changed, 8 insertions(+), 1 deletion(-)

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/**