From d1ac0e8f3e6b61f869c9f1cd4eea73056cf3f483 Mon Sep 17 00:00:00 2001
From: Junjie <fallin.jie@qq.com>
Date: 星期六, 11 四月 2026 14:28:58 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/main/resources/application.yml | 26 +++++++++++++++-----------
1 files changed, 15 insertions(+), 11 deletions(-)
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index 57112a9..9af49c4 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -16,17 +16,18 @@
hikari:
validation-timeout: 3000
connection-test-query: select 1
- driver-class-name: com.mysql.jdbc.Driver
+ driver-class-name: com.mysql.cj.jdbc.Driver
url: jdbc:mysql://127.0.0.1:3306/monitor?useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai
username: root
password: root
mvc:
static-path-pattern: /**
- redis:
- host: 127.0.0.1
- port: 6379
- database: 0
- # password: 123456
+ data:
+ redis:
+ host: 127.0.0.1
+ port: 6379
+ database: 0
+ # password: 123456
servlet:
multipart:
max-file-size: 100MB
@@ -55,7 +56,7 @@
logging:
file:
- path: /stock/out/@pom.build.finalName@/logs
+ path: ./stock/out/@pom.build.finalName@/logs
super:
pwd: xltys1995
@@ -66,17 +67,20 @@
# APK鎵撳寘鏈嶅姟閰嶇疆
apk-build:
# 鎵撳寘鍜屾煡璇㈢姸鎬佺殑鏈嶅姟鍣ㄥ湴鍧�
- build-server-url: http://127.0.0.1:8088
+ build-server-url: http://net.zoneyung.net:8088
# 涓嬭浇APK鐨勬湇鍔″櫒鍦板潃
- download-server-url: http://127.0.0.1:8088
+ download-server-url: http://net.zoneyung.net:8088
# API璁よ瘉Token
x-token: uzCHJUQSb7tl2ZTjB0wI3XViqMgxRhvYL9EP
# APK涓嬭浇淇濆瓨璺緞锛堝繀椤绘槸缁濆璺緞锛�
- apk-download-path: D:/apk_files/
+ apk-download-path: D:/zy_monitor_files/apk_files/
# ADB閰嶇疆
adb:
# ADB鍙墽琛屾枃浠惰矾寰勶紝濡傛灉鍦ㄧ郴缁烶ATH涓彲鐩存帴濉啓adb
path: D:\platform-tools\adb.exe
# 榛樿APK鍖呭悕锛堢敤浜庡惎鍔ㄥ簲鐢級
- default-package: com.zy
\ No newline at end of file
+ default-package: com.zy
+
+file:
+ upload-path: D:/zy_monitor_files/upload_files/
--
Gitblit v1.9.1