From 8e76fba031022a2bb99795a2678c62db33a5ebfd Mon Sep 17 00:00:00 2001
From: linzhijie <19970921lzj>
Date: 星期三, 24 三月 2021 19:27:35 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/tai-ots-master-20210316' into Dev
---
src/main/resources/application-dev.yml | 28 ++++++++++++++--------------
1 files changed, 14 insertions(+), 14 deletions(-)
diff --git a/src/main/resources/application-dev.yml b/src/main/resources/application-dev.yml
index 227737f..56beefc 100644
--- a/src/main/resources/application-dev.yml
+++ b/src/main/resources/application-dev.yml
@@ -9,15 +9,15 @@
# 瀹炰緥婕旂ず寮�鍏�
demoEnabled: false
# 鏂囦欢璺緞 绀轰緥锛� Windows閰嶇疆D:/ots/uploadPath锛孡inux閰嶇疆 /home/data/ots/uploadPath锛�
- profile: D:/娴嬭瘎绯荤粺/home/uploadPath
+ profile: /home/data/ots/uploadPath
# 鍥剧墖鐨剈rl锛屽:vue绔http://139.199.11.114/images鍦板潃
- imagePath: http://127.0.0.1:8090/profile/images
+ imagePath: http://47.114.179.216:8090/profile/images
# 鑾峰彇ip鍦板潃寮�鍏�
addressEnabled: true
# 鎶ュ憡妯＄増鍦板潃
- reportTemplates: D:/娴嬭瘎绯荤粺/home/reportTemplates/
+ reportTemplates: /home/data/ots/reportTemplates/
# http profile
- httpProfilePath: http://127.0.0.1:8090/profile
+ httpProfilePath: http://47.114.179.216:8090/profile
# 鏁版嵁婧愰厤缃�
spring:
datasource:
@@ -26,16 +26,16 @@
druid:
# 涓诲簱鏁版嵁婧�
master:
- url: jdbc:mysql://192.168.21.252:3306/ots-sand?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
+ url: jdbc:mysql://47.114.179.216:3306/ots-sand?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
username: root
- password: Cc19970921
+ password: TAI@2019#Zjun
# 浠庡簱鏁版嵁婧�
slave:
# 浠庢暟鎹簮寮�鍏�/榛樿鍏抽棴
enabled: false
- url:
- username:
- password:
+ url:
+ username:
+ password:
# 鍒濆杩炴帴鏁�
initialSize: 5
# 鏈�灏忚繛鎺ユ睜鏁伴噺
@@ -55,7 +55,7 @@
testWhileIdle: true
testOnBorrow: false
testOnReturn: false
- webStatFilter:
+ webStatFilter:
enabled: true
statViewServlet:
enabled: true
@@ -63,8 +63,8 @@
allow:
url-pattern: /druid/*
# 鎺у埗鍙扮鐞嗙敤鎴峰悕鍜屽瘑鐮�
- login-username:
- login-password:
+ login-username:
+ login-password:
filter:
stat:
enabled: true
@@ -80,11 +80,11 @@
# VUE绔闂湴鍧�
vue:
- url: http://192.168.21.252:8080/exam-stu/#/ots/{0}/login
+ url: http://47.114.179.216/exam-stu/#/ots/{0}/login
# 杩滅▼娉板浗璁＄畻鏈嶅姟
ATSTai:
- host: 192.168.21.252
+ host: 127.0.0.1
port: 9123
jasypt:
encryptor:
--
Gitblit v1.9.1