From 38d7ec7ea772a6f48a0409f2fcbbcde05364ec7b Mon Sep 17 00:00:00 2001
From: admin <841110950@qq.com>
Date: 星期五, 27 八月 2021 09:46:00 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/xgmasrs' into xgmasrs
---
src/main/resources/application.yml | 26 +++++++++++++++++++-------
1 files changed, 19 insertions(+), 7 deletions(-)
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index 30e20ad..ea1a31d 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,10 @@
# 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.3.99:1433;databasename=gdasrs
+ #username: sa
+ #password: eisoft
+ url: jdbc:sqlserver://192.168.4.208:1433;databasename=xgmasrs
username: sa
password: sa@123
mvc:
@@ -23,14 +29,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