From 125514d414a72f139155613076b397d0468a605f Mon Sep 17 00:00:00 2001
From: YYC <1833023622@qq.com>
Date: 星期二, 12 九月 2023 18:43:42 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
igds-web/src/main/resources/application-linux.yml | 32 +++++++++++++++-----------------
1 files changed, 15 insertions(+), 17 deletions(-)
diff --git a/igds-web/src/main/resources/application-linux.yml b/igds-web/src/main/resources/application-linux.yml
index dc62384..9ff1541 100644
--- a/igds-web/src/main/resources/application-linux.yml
+++ b/igds-web/src/main/resources/application-linux.yml
@@ -1,6 +1,6 @@
-########################## 涓伯鍚夋灄鏂拌壇搴� ##########################
+########################## 绂忓缓姘告嘲-Linux ##########################
server:
- port: 80
+ port: 8888
context-path: /
connection-timeout: 5000
tomcat:
@@ -12,15 +12,15 @@
db-base:
name: db-base
type: com.alibaba.druid.pool.DruidDataSource
- url: jdbc:mysql://127.0.0.1:23306/igds_master?useUnicode=true&characterEncoding=utf-8
+ url: jdbc:mysql://127.0.0.1:3306/igds_master?useUnicode=true&characterEncoding=utf-8
driver-class-name: com.mysql.jdbc.Driver
- username: fzzy
- password: Zzlky&fzzy2022
+ username: root
+ password: ukJp12Qf+elyBvGHkJ5MQMa95pfVm0oFBHefdEgDFKoFSjbgYa9PYfv5vlem5nvoXjQsP9tIIo53DvSbsl160Q==
public-key:
- config-decrypt: false
- initial-size: 5
- min-idle: 5
- max-active: 50
+ config-decrypt: true
+ initial-size: 5
+ min-idle: 5
+ max-active: 50
max-wait: 60000
time-between-eviction-runs-millis: 60000
min-evictable-idle-time-millis: 300000
@@ -48,10 +48,10 @@
# Redis鐩稿叧閰嶇疆
redis:
- database: 0
+ database: 2
host: 127.0.0.1
port: 6379
- password:
+ password: Abc123..
# 杩炴帴姹犳渶澶ц繛鎺ユ暟锛堜娇鐢ㄨ礋鍊艰〃绀烘病鏈夐檺鍒讹級
pool:
max-active: 200
@@ -64,19 +64,17 @@
subject: ld_license
publicAlias: publicCert
storePass: PUBLICFZZYXXJSGFYXGS888888
- licensePath: /usr/igds/license/license.lic
- publicKeysStorePath: /usr/igds/license/publicCerts.keystore
+ licensePath: /usr/local/igds/license/license.lic
+ publicKeysStorePath: /usr/local/igds/license/publicCerts.keystore
########################## IGDS ##########################
## 绯荤粺鎺ュ彛璺敱閰嶇疆 娉ㄦ剰鏁板瓧濡傛灉浠�0寮�澶寸殑璇濓紝鍚庡彴浼氬嚭鐜拌浆涔夛紝璇锋坊鍔�""
igds:
default:
- companyId: 5305
+ companyId: 5330
sys-name: 鏅烘収绮簱绠＄悊绯荤粺
logo: logo-default.png
logo-title: logo-title-default.png
support: 鏅烘収绮簱浜戠鐞嗗钩鍙�
grian-add-point: N
- file-path: /usr/igds/file/
- ## 鎺ㄩ�佸井淇″钩鍙扮殑鍦板潃
- warn-path: http://124.71.162.207:8299/igds-wx/gateway
\ No newline at end of file
+ file-path: /usr/local/igds/file/
\ No newline at end of file
--
Gitblit v1.9.3