From 37286cd9b177e9a1b8f28bfbc054c8cfedec6a5e Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@63.com>
Date: 星期四, 26 八月 2021 08:50:57 +0800
Subject: [PATCH] Merge branch 'xgmasrs' of https://gitee.com/luxiaotao1123/zy-asrs into xgmasrs

---
 src/main/resources/application.yml |   23 ++++++++++++++++-------
 1 files changed, 16 insertions(+), 7 deletions(-)

diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index 30e20ad..8016187 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -1,10 +1,13 @@
 server:
-  port: 80
+  port: 8081
+  servlet:
+    context-path: /@pom.build.finalName@
 
 spring:
   application:
-#    name: @pom.artifactId@
-    name:
+    name: @pom.build.finalName@
+  jmx:
+    enabled: false
   datasource:
     # mysql
 #    driver-class-name: com.mysql.jdbc.Driver
@@ -13,7 +16,7 @@
 #    password: xltys1995
     # sql-server
     driver-class-name: com.microsoft.sqlserver.jdbc.SQLServerDriver
-    url: jdbc:sqlserver://192.168.1.103:1433;databasename=cool
+    url: jdbc:sqlserver://192.168.4.208:1433;databasename=xgmasrs
     username: sa
     password: sa@123
   mvc:
@@ -23,14 +26,20 @@
     port: 6379
     database: 0
 #    password: xltys1995
+  servlet:
+    multipart:
+      maxFileSize: 100MB
+      maxRequestSize: 100MB
 
 mybatis-plus:
   mapper-locations: classpath:mapper/*.xml
-  global-config:
-    field-strategy: 0
+#  global-config:
+#    field-strategy: 0
+#  configuration:
+#    log-impl: org.apache.ibatis.logging.stdout.StdOutImpl
 
 logging:
-  path: /stock/out/logs
+  path: /stock/out/@pom.build.finalName@/logs
 
 super:
   pwd: xltys1995

--
Gitblit v1.9.1