From a43fd8f15c7da7f4a14ba4ebb79970dad4ce1fae Mon Sep 17 00:00:00 2001
From: xyc <jc_xiong@hotmail.com>
Date: 星期五, 02 八月 2024 15:18:25 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
starter/src/main/resources/application.yml | 14 ++++++++------
1 files changed, 8 insertions(+), 6 deletions(-)
diff --git a/starter/src/main/resources/application.yml b/starter/src/main/resources/application.yml
index c7c08a4..e529845 100644
--- a/starter/src/main/resources/application.yml
+++ b/starter/src/main/resources/application.yml
@@ -4,7 +4,7 @@
uri-encoding: UTF-8
max-threads: 1000
min-spare-threads: 30
- port: 8050
+ port: 8066
servlet:
context-path: /test-project
session:
@@ -17,10 +17,8 @@
datasource:
druid:
driver-class-name: com.mysql.cj.jdbc.Driver
- #url: jdbc:mysql://127.0.0.1:3306/csiczb?allowMultiQueries=true&hive.exec.orc.split.strategy=ETL&serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=utf8
- #url: jdbc:mysql://127.0.0.1:3306/test_project?allowMultiQueries=true&hive.exec.orc.split.strategy=ETL&serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=utf8
- url: jdbc:mysql://192.168.31.26:3306/reliability_simulat?allowMultiQueries=true&hive.exec.orc.split.strategy=ETL&serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=utf8
- #url: jdbc:mysql://127.0.0.1:3306/zhpt_djxl?serverTimezone=GMT&allowMultiQueries=true&hive.exec.orc.split.strategy=ETL&serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=utf8
+ url: jdbc:mysql://192.168.31.26:3366/reliability_simulat?allowMultiQueries=true&hive.exec.orc.split.strategy=ETL&serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=utf8
+# url: jdbc:mysql://127.0.0.1:3305/reliability_simulat?allowMultiQueries=true&hive.exec.orc.split.strategy=ETL&serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=utf8
username: root
password: root
#password: 123456
@@ -147,4 +145,8 @@
tokenTimeout: 60
# 鍗曚綅鍒嗛挓
-
+ reliaSimLib:
+ # 绠楁硶搴撳惎鍔ㄨ剼鏈紙鍏ㄨ矾寰勶級
+ mainPy: D:/relia_sim/main.py
+ # 绠楁硶搴撲豢鐪熺粨鏋滃瓨鏀炬牴鐩綍
+ resultHome: d:/relia_sim/sim_result
--
Gitblit v1.9.1