From 7d2abb005f5dde19542a2d21c142680098236901 Mon Sep 17 00:00:00 2001
From: fujunling <2984387807@qq.com>
Date: 星期五, 16 六月 2023 16:56:09 +0800
Subject: [PATCH] 解决冲突
---
Source/UBCS/ubcs-service/ubcs-code/src/main/resources/application-dev.yml | 14 +++++++++++++-
1 files changed, 13 insertions(+), 1 deletions(-)
diff --git a/Source/UBCS/ubcs-service/ubcs-code/src/main/resources/application-dev.yml b/Source/UBCS/ubcs-service/ubcs-code/src/main/resources/application-dev.yml
index 7ea9a51..0c94ec2 100644
--- a/Source/UBCS/ubcs-service/ubcs-code/src/main/resources/application-dev.yml
+++ b/Source/UBCS/ubcs-service/ubcs-code/src/main/resources/application-dev.yml
@@ -1,19 +1,31 @@
#鏈嶅姟鍣ㄧ鍙�
server:
port: 36014
-
+ tomcat:
+ uri-encoding: UTF-8
+ servlet:
+ encoding:
+ enabled: true
+ charset: UTF-8
+ force: true
#鏁版嵁婧愰厤缃�
spring:
datasource:
url: ${ubcs.datasource.mdm.dev.url}
username: ${ubcs.datasource.mdm.dev.username}
password: ${ubcs.datasource.mdm.dev.password}
+ messages:
+ encoding: utf-8
+ basename: i18n/messages
#鍏抽棴椹煎嘲鍛藉悕鏄犲皠
mybatis-plus:
configuration:
map-underscore-to-camel-case: false
+#mybatis-plus-join:
+# table-alias: t
+
######搴旂敤鍩烘湰閰嶇疆
#app:
# name: web
--
Gitblit v1.9.3