From 3450525681e6e290d80ee5d27d0aaca395b62c8f Mon Sep 17 00:00:00 2001
From: zf <1603559716@qq.com>
Date: 星期四, 01 二月 2024 14:42:14 +0800
Subject: [PATCH] Merge branch 'master' of https://sinanoaq.cn:8888/r/swspkmas into zf1
---
ruoyi-admin/src/main/resources/application-dev.yml | 17 +++++++++++------
1 files changed, 11 insertions(+), 6 deletions(-)
diff --git a/ruoyi-admin/src/main/resources/application-dev.yml b/ruoyi-admin/src/main/resources/application-dev.yml
index cdbcaa0..bddbfcd 100644
--- a/ruoyi-admin/src/main/resources/application-dev.yml
+++ b/ruoyi-admin/src/main/resources/application-dev.yml
@@ -4,7 +4,7 @@
port: 8085
servlet:
# 应用的访问路径
- context-path: /
+ context-path: /api
tomcat:
# tomcat的URI编码
uri-encoding: UTF-8
@@ -24,9 +24,9 @@
druid:
# 主库数据源
master:
- url: jdbc:mysql://192.168.0.52:3306/swspkmas?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
- username: root
- password: gkhymysql
+ url: jdbc:mysql://121.239.169.30:33306/swspkmas?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
+ username: gkhynew
+ password: 123456
# 从库数据源
slave:
# 从数据源开关/默认关闭
@@ -100,13 +100,18 @@
max-active: 8
# #连接池最大阻塞等待时间（使用负值表示没有限制）
max-wait: -1ms
+tripartite:
+ restSever: https://inspurtestcx.saws.org.cn/sjjh
+ appKey: hj92qe
+ appPwd: dxep6j
#windous测试
file:
path:
#基础路径
- dcPath: E:\file\gkhy\test\
+ dcPath: upload
urlRootPath: /uploadfile/
module:
#用户模块
- accountPath: /account/
\ No newline at end of file
+ accountPath: /account/
+
--
Gitblit v1.9.2