From 20d5489c67cafe09cb862930fe67e05b631a1944 Mon Sep 17 00:00:00 2001
From: YYC <1833023622@qq.com>
Date: 星期二, 12 九月 2023 18:37:19 +0800
Subject: [PATCH] 福建永泰
---
igds-web/src/main/resources/application.yml | 10 +-
igds-core/src/main/java/com/ld/igds/common/impl/CommonDataServiceImpl.java | 1
igds-web/src/main/resources/application-pro5330.yml | 80 ++++++++++++++++++++++++++
igds-web/src/main/resources/application-linux.yml | 10 +-
igds-web/pom.xml | 8 +-
igds-web/src/main/resources/verb-conf.properties | 15 +---
6 files changed, 99 insertions(+), 25 deletions(-)
diff --git a/igds-core/src/main/java/com/ld/igds/common/impl/CommonDataServiceImpl.java b/igds-core/src/main/java/com/ld/igds/common/impl/CommonDataServiceImpl.java
index 3cc6230..77cad71 100644
--- a/igds-core/src/main/java/com/ld/igds/common/impl/CommonDataServiceImpl.java
+++ b/igds-core/src/main/java/com/ld/igds/common/impl/CommonDataServiceImpl.java
@@ -195,6 +195,7 @@
List<DepotSerData> listAll = (List<DepotSerData>) redisUtil.get(key);
if (null == listAll || listAll.isEmpty()) {
log.error("娌℃湁鑾峰彇鍒颁粨搴撲笌鍒嗘満鐨勫叧绯绘暟鎹紝璇疯仈绯荤鐞嗗憳锛�");
+ return null;
}
Map<String, DepotSerData> tempMap = new HashMap<>();
diff --git a/igds-web/pom.xml b/igds-web/pom.xml
index b75161a..cf599df 100644
--- a/igds-web/pom.xml
+++ b/igds-web/pom.xml
@@ -170,7 +170,7 @@
</exclusions>
</dependency>
- <!-- MODBUS-TCP -->
+ <!-- MODBUS-TCP
<dependency>
<groupId>com.ld.igds</groupId>
<artifactId>igds-protocol-modbus</artifactId>
@@ -186,7 +186,7 @@
</exclusion>
</exclusions>
</dependency>
-
+-->
<!-- 绉佹湁鍗忚-椋庢鑷磋繙IOT銆佸埗姘満
<dependency>
@@ -222,7 +222,7 @@
</exclusions>
</dependency>-->
- <!-- 绉佹湁鍗忚-閭︽捣鏅鸿兘-->
+ <!-- 绉佹湁鍗忚-閭︽捣鏅鸿兘
<dependency>
<groupId>com.ld.igds</groupId>
<artifactId>igds-protocol-bhzn</artifactId>
@@ -238,7 +238,7 @@
</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 3a22b99..9ff1541 100644
--- a/igds-web/src/main/resources/application-linux.yml
+++ b/igds-web/src/main/resources/application-linux.yml
@@ -1,4 +1,4 @@
-########################## 姝︽眽榛勯檪鍐涚伯 ##########################
+########################## 绂忓缓姘告嘲-Linux ##########################
server:
port: 8888
context-path: /
@@ -18,9 +18,9 @@
password: ukJp12Qf+elyBvGHkJ5MQMa95pfVm0oFBHefdEgDFKoFSjbgYa9PYfv5vlem5nvoXjQsP9tIIo53DvSbsl160Q==
public-key:
config-decrypt: true
- initial-size: 5
- min-idle: 5
- max-active: 50
+ initial-size: 5
+ min-idle: 5
+ max-active: 50
max-wait: 60000
time-between-eviction-runs-millis: 60000
min-evictable-idle-time-millis: 300000
@@ -71,7 +71,7 @@
## 绯荤粺鎺ュ彛璺敱閰嶇疆 娉ㄦ剰鏁板瓧濡傛灉浠�0寮�澶寸殑璇濓紝鍚庡彴浼氬嚭鐜拌浆涔夛紝璇锋坊鍔�""
igds:
default:
- companyId: 5327
+ companyId: 5330
sys-name: 鏅烘収绮簱绠＄悊绯荤粺
logo: logo-default.png
logo-title: logo-title-default.png
diff --git a/igds-web/src/main/resources/application-pro5330.yml b/igds-web/src/main/resources/application-pro5330.yml
new file mode 100644
index 0000000..215037d
--- /dev/null
+++ b/igds-web/src/main/resources/application-pro5330.yml
@@ -0,0 +1,80 @@
+########################## 绂忓缓姘告嘲-Linux ##########################
+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:
+ # 杩炴帴姹犳渶澶ц繛鎺ユ暟锛堜娇鐢ㄨ礋鍊艰〃绀烘病鏈夐檺鍒讹級
+ pool:
+ max-active: 200
+ max-wait: -1
+ max-idle: 10
+ min-idle: 0
+ timeout: 6000
+
+license:
+ subject: ld_license
+ publicAlias: publicCert
+ storePass: PUBLICFZZYXXJSGFYXGS888888
+ licensePath: /usr/local/igds/license/license.lic
+ publicKeysStorePath: /usr/local/igds/license/publicCerts.keystore
+
+########################## IGDS ##########################
+## 绯荤粺鎺ュ彛璺敱閰嶇疆 娉ㄦ剰鏁板瓧濡傛灉浠�0寮�澶寸殑璇濓紝鍚庡彴浼氬嚭鐜拌浆涔夛紝璇锋坊鍔�""
+igds:
+ default:
+ companyId: 5330
+ sys-name: 鏅烘収绮簱绠＄悊绯荤粺
+ logo: logo-default.png
+ logo-title: logo-title-default.png
+ support: 鏅烘収绮簱浜戠鐞嗗钩鍙�
+ grian-add-point: N
+ file-path: /usr/local/igds/file/
\ No newline at end of file
diff --git a/igds-web/src/main/resources/application.yml b/igds-web/src/main/resources/application.yml
index 6fb08da..8a08300 100644
--- a/igds-web/src/main/resources/application.yml
+++ b/igds-web/src/main/resources/application.yml
@@ -1,7 +1,7 @@
########################## Server ########################## 涓规１鍩庡叧鐪佺伯椋熷偍澶囧簱
spring:
profiles:
- active: dev
+ active: linux
application:
name: igds
main:
@@ -14,15 +14,15 @@
date-format: yyyy-MM-dd HH:mm:ss
joda-date-time-format: yyyy-MM-dd HH:mm:ss
time-zone: GMT+8
-
-########################## thymeleaf妯℃澘閰嶇疆 ##########################
+
+ ########################## thymeleaf妯℃澘閰嶇疆 ##########################
thymeleaf:
prefix: classpath:/templates/
suffix: .html
mode: LEGACYHTML5
encoding: UTF-8
- cache: false
-########################## 鎵嬫満APP鍊间粨鍥剧墖涓婁紶澶у皬 ##########################
+ cache: false
+ ########################## 鎵嬫満APP鍊间粨鍥剧墖涓婁紶澶у皬 ##########################
http:
multipart:
maxFileSize: 50Mb
diff --git a/igds-web/src/main/resources/verb-conf.properties b/igds-web/src/main/resources/verb-conf.properties
index ec28a0f..a00a976 100644
--- a/igds-web/src/main/resources/verb-conf.properties
+++ b/igds-web/src/main/resources/verb-conf.properties
@@ -2,12 +2,10 @@
## 5000_001
verb.mapImg.5000_001.a=default_pfc_a.png
verb.mapImg.5000_001.b=default_pfc_b.png
-
verb.mapImg.5000_0137.a=default_qyc_a.png
verb.mapImg.5000_0137.b=default_qyc_b.png
verb.mapImg.5000_0138.a=default_qyc_a.png
verb.mapImg.5000_0138.b=default_qyc_b.png
-
## 5013_001 \u5206\u5E93\u7F16\u7801
verb.mapImg.5013_001.a=default_pfc_a.png
verb.mapImg.5013_001.b=default_pfc_b.png
@@ -142,13 +140,9 @@
## 5307_001
verb.mapImg.5307_001.a=default_qyc_a.png
verb.mapImg.5307_001.b=default_qyc_b.png
-
-
## 5322_001 广东徐闻
verb.mapImg.5322_001.a=default_pfc_a.png
verb.mapImg.5322_001.b=default_pfc_b.png
-
-
## 5322_001 广东徐闻
verb.mapImg.5324_001.a=default_pfc_a.png
verb.mapImg.5324_001.b=default_pfc_b.png
@@ -174,8 +168,6 @@
verb.mapImg.5324_10.b=pfc_b.png
verb.mapImg.5324_11.a=pfc_a.png
verb.mapImg.5324_11.b=pfc_b.png
-
-
## 5325_001 江西赣州-大公
verb.mapImg.5325_001.a=default_pfc2_a.png
verb.mapImg.5325_001.b=default_pfc2_b.png
@@ -191,11 +183,12 @@
verb.mapImg.5325_Q010501.b=default_qyc_b.png
verb.mapImg.5325_Q010601.a=default_qyc_a.png
verb.mapImg.5325_Q010601.b=default_qyc_b.png
-
## 5328_001
verb.mapImg.5328_001.a=default_pfc_a.png
verb.mapImg.5328_001.b=default_pfc_b.png
-
## 5329_001
verb.mapImg.5329_001.a=default_qyc_a.png
-verb.mapImg.5329_001.b=default_qyc_b.png
\ No newline at end of file
+verb.mapImg.5329_001.b=default_qyc_b.png
+## 5330_001
+verb.mapImg.5330_001.a=default_pfc2_a.png
+verb.mapImg.5330_001.b=default_pfc2_b.png
\ No newline at end of file
--
Gitblit v1.9.3