From 7777cfac74efcbf5d1709d43c1aa1ff9cc7d6819 Mon Sep 17 00:00:00 2001
From: YYC <1833023622@qq.com>
Date: 星期四, 10 八月 2023 18:36:24 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
igds-web/src/main/resources/application-pro.yml | 6 +-
igds-protocol-iot/pom.xml | 7 ---
igds-web/src/main/resources/application-linux.yml | 2
igds-web/pom.xml | 18 +++++++++
igds-web/src/main/resources/application-pro5328.yml | 80 ++++++++++++++++++++++++++++++++++++++++
igds-web/src/main/resources/application-pro5326.yml | 2
6 files changed, 103 insertions(+), 12 deletions(-)
diff --git a/igds-protocol-iot/pom.xml b/igds-protocol-iot/pom.xml
index 9f280d4..b83c274 100644
--- a/igds-protocol-iot/pom.xml
+++ b/igds-protocol-iot/pom.xml
@@ -14,13 +14,6 @@
<dependencies>
- <!-- 寮曞叆涔夊姟鏍稿績鍖� -->
-<!-- <dependency>-->
-<!-- <groupId>com.ld.igds</groupId>-->
-<!-- <artifactId>igds-core</artifactId>-->
-<!-- <version>${igds.version}</version>-->
-<!-- </dependency>-->
-
<!-- 寮曞叆IO鍖� -->
<dependency>
<groupId>com.ld.base.io</groupId>
diff --git a/igds-web/pom.xml b/igds-web/pom.xml
index 613beb3..3c2d2d5 100644
--- a/igds-web/pom.xml
+++ b/igds-web/pom.xml
@@ -168,6 +168,24 @@
</exclusions>
</dependency>
+
+ <!-- 绉佹湁鍗忚-椋庢鑷磋繙IOT銆佸埗姘満-->
+ <dependency>
+ <groupId>com.ld.igds</groupId>
+ <artifactId>igds-protocol-iot</artifactId>
+ <version>${igds.version}</version>
+ <exclusions>
+ <exclusion>
+ <artifactId>slf4j-log4j12</artifactId>
+ <groupId>org.slf4j</groupId>
+ </exclusion>
+ <exclusion>
+ <artifactId>log4j</artifactId>
+ <groupId>log4j</groupId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+
<!-- 绉佹湁鍗忚-璐濆崥绮儏
<dependency>
<groupId>com.ld.igds</groupId>
diff --git a/igds-web/src/main/resources/application-linux.yml b/igds-web/src/main/resources/application-linux.yml
index 6ef340f..3a22b99 100644
--- a/igds-web/src/main/resources/application-linux.yml
+++ b/igds-web/src/main/resources/application-linux.yml
@@ -51,7 +51,7 @@
database: 2
host: 127.0.0.1
port: 6379
- password:
+ password: Abc123..
# 杩炴帴姹犳渶澶ц繛鎺ユ暟锛堜娇鐢ㄨ礋鍊艰〃绀烘病鏈夐檺鍒讹級
pool:
max-active: 200
diff --git a/igds-web/src/main/resources/application-pro.yml b/igds-web/src/main/resources/application-pro.yml
index 8fd7582..27476c9 100644
--- a/igds-web/src/main/resources/application-pro.yml
+++ b/igds-web/src/main/resources/application-pro.yml
@@ -1,4 +1,4 @@
-########################## 骞夸笢鎯犲窞鎯犳柊绮簱椤圭洰 ##########################
+########################## 骞胯タ鏉ュ绮簱椤圭洰 ##########################
server:
port: 8888
context-path: /
@@ -71,10 +71,10 @@
## 绯荤粺鎺ュ彛璺敱閰嶇疆 娉ㄦ剰鏁板瓧濡傛灉浠�0寮�澶寸殑璇濓紝鍚庡彴浼氬嚭鐜拌浆涔夛紝璇锋坊鍔�""
igds:
default:
- companyId: 5326
+ companyId: 5328
sys-name: 鏅烘収绮簱绠＄悊绯荤粺
logo: logo-default.png
logo-title: logo-title-default.png
- support: 鏅烘収绮儏绮儏浜戠鐞嗗钩鍙�
+ support: 椋庢鑷磋繙淇℃伅鎶�鏈偂浠芥湁闄愬叕鍙�
grian-add-point: N
file-path: D:/IGDS/FILE/
\ No newline at end of file
diff --git a/igds-web/src/main/resources/application-pro5326.yml b/igds-web/src/main/resources/application-pro5326.yml
index 8fd7582..5cc0298 100644
--- a/igds-web/src/main/resources/application-pro5326.yml
+++ b/igds-web/src/main/resources/application-pro5326.yml
@@ -75,6 +75,6 @@
sys-name: 鏅烘収绮簱绠＄悊绯荤粺
logo: logo-default.png
logo-title: logo-title-default.png
- support: 鏅烘収绮儏绮儏浜戠鐞嗗钩鍙�
+ support: 椋庢鑷磋繙淇℃伅鎶�鏈偂浠芥湁闄愬叕鍙�
grian-add-point: N
file-path: D:/IGDS/FILE/
\ No newline at end of file
diff --git a/igds-web/src/main/resources/application-pro5328.yml b/igds-web/src/main/resources/application-pro5328.yml
new file mode 100644
index 0000000..27476c9
--- /dev/null
+++ b/igds-web/src/main/resources/application-pro5328.yml
@@ -0,0 +1,80 @@
+########################## 骞胯タ鏉ュ绮簱椤圭洰 ##########################
+server:
+ port: 8888
+ context-path: /
+ connection-timeout: 5000
+ tomcat:
+ uri-encoding: UTF-8
+
+########################## datasourcec ##########################
+spring:
+ datasource:
+ db-base:
+ name: db-base
+ type: com.alibaba.druid.pool.DruidDataSource
+ url: jdbc:mysql://127.0.0.1:3306/igds_master?useUnicode=true&characterEncoding=utf-8
+ driver-class-name: com.mysql.jdbc.Driver
+ username: root
+ password: ukJp12Qf+elyBvGHkJ5MQMa95pfVm0oFBHefdEgDFKoFSjbgYa9PYfv5vlem5nvoXjQsP9tIIo53DvSbsl160Q==
+ public-key:
+ 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
+ validation-query: select 1 from dual
+ test-whileIdle: true
+ test-on-borrow: false
+ test-on-return: false
+ pool-prepared-statements: true
+ max-pool-prepared-statement-per-connection-size: 20
+ filters: stat
+ connection-properties: druid.stat.mergeSql=true;druid.stat.slowSqlMillis=5000
+ use-global-data-source-stat: true
+ removeAbandoned: true
+ removeAbandonedTimeout: 90
+ logAbandoned: true
+ poolPreparedStatements: true
+ maxPoolPreparedStatementPerConnectionSize: 20
+ db-sqlite:
+ name: db-sqlite
+ url: jdbc:sqlite:D:/app/igds/db/iot_cfg.db
+ driver-class-name: org.sqlite.JDBC
+ type: com.alibaba.druid.pool.DruidDataSource
+ username:
+ password:
+
+ # Redis鐩稿叧閰嶇疆
+ redis:
+ database: 0
+ host: 127.0.0.1
+ port: 6379
+ password: Abc123..
+ # 杩炴帴姹犳渶澶ц繛鎺ユ暟锛堜娇鐢ㄨ礋鍊艰〃绀烘病鏈夐檺鍒讹級
+ pool:
+ max-active: 200
+ max-wait: -1
+ max-idle: 10
+ min-idle: 0
+ timeout: 6000
+
+license:
+ subject: ld_license
+ publicAlias: publicCert
+ storePass: PUBLICFZZYXXJSGFYXGS888888
+ licensePath: D:/IGDS/license/license.lic
+ publicKeysStorePath: D:/IGDS/license/publicCerts.keystore
+
+########################## IGDS ##########################
+## 绯荤粺鎺ュ彛璺敱閰嶇疆 娉ㄦ剰鏁板瓧濡傛灉浠�0寮�澶寸殑璇濓紝鍚庡彴浼氬嚭鐜拌浆涔夛紝璇锋坊鍔�""
+igds:
+ default:
+ companyId: 5328
+ sys-name: 鏅烘収绮簱绠＄悊绯荤粺
+ logo: logo-default.png
+ logo-title: logo-title-default.png
+ support: 椋庢鑷磋繙淇℃伅鎶�鏈偂浠芥湁闄愬叕鍙�
+ grian-add-point: N
+ file-path: D:/IGDS/FILE/
\ No newline at end of file
--
Gitblit v1.9.3