Merge branch 'guotuanting' of mengtong/mt-pms-api into master

.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

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