From 9dccc035980f0a770c2e492cc2987f75de868640 Mon Sep 17 00:00:00 2001
From: YYC <1833023622@qq.com>
Date: 星期二, 24 十月 2023 09:46:53 +0800
Subject: [PATCH] 西藏山南项目
---
igds-web/src/main/resources/application-pro.yml | 16 ++--
igds-web/src/main/resources/templates/index/index-5329.html | 17 +++--
igds-protocol-bhzn/src/main/java/com/ld/igds/protocol/bhzn/ServerRunner.java | 7 +-
igds-web/src/main/resources/application-pro5333.yml | 80 ++++++++++++++++++++++++++
igds-web/pom.xml | 20 +++---
igds-base/src/main/java/com/ld/igds/conf/MyBatisPlusConf.java | 2
6 files changed, 112 insertions(+), 30 deletions(-)
diff --git a/igds-base/src/main/java/com/ld/igds/conf/MyBatisPlusConf.java b/igds-base/src/main/java/com/ld/igds/conf/MyBatisPlusConf.java
index 8c699b8..38557aa 100644
--- a/igds-base/src/main/java/com/ld/igds/conf/MyBatisPlusConf.java
+++ b/igds-base/src/main/java/com/ld/igds/conf/MyBatisPlusConf.java
@@ -196,7 +196,7 @@
*/
public static void main(String[] args) {
try {
- String password = "";
+ String password = "Fzzy@#$%5432..K";
System.out.println("鏄庢枃瀵嗙爜: " + password);
//绉侀挜
String privateKey = DEFAULT_PRIVATE_KEY_STRING;
diff --git a/igds-protocol-bhzn/src/main/java/com/ld/igds/protocol/bhzn/ServerRunner.java b/igds-protocol-bhzn/src/main/java/com/ld/igds/protocol/bhzn/ServerRunner.java
index fb1ba89..2568c6d 100644
--- a/igds-protocol-bhzn/src/main/java/com/ld/igds/protocol/bhzn/ServerRunner.java
+++ b/igds-protocol-bhzn/src/main/java/com/ld/igds/protocol/bhzn/ServerRunner.java
@@ -26,6 +26,7 @@
private BhznGrainV1ServerEngine bhznGrainServerEngine1;
@Autowired
private BhznVerbServerEngine bhznVerbServerEngine;
+
@Override
public void run(String... strings) throws Exception {
@@ -36,12 +37,12 @@
if (configData.getActive().indexOf("pro") >= 0) {
//寰愰椈鏈嶅姟鍣ㄤ娇鐢�
- bhznGrainServerEngine1.start(BhznGrainV1ServerEngine.PORT);
+// bhznGrainServerEngine1.start(BhznGrainV1ServerEngine.PORT);
//姹熻タ璧ｅ窞銆佸箍涓滈珮宸炰娇鐢�
-// bhznGrainServerEngine2.start(BhznGrainV2ServerEngine.PORT);
+ bhznGrainServerEngine2.start(BhznGrainV2ServerEngine.PORT);
//骞夸笢楂樺窞浣跨敤
- // bhznVerbServerEngine.start(BhznVerbServerEngine.PORT);
+ bhznVerbServerEngine.start(BhznVerbServerEngine.PORT);
return;
}
if (configData.getActive().indexOf("dev") >= 0) {
diff --git a/igds-web/pom.xml b/igds-web/pom.xml
index 63ea611..4c92a4d 100644
--- a/igds-web/pom.xml
+++ b/igds-web/pom.xml
@@ -152,7 +152,7 @@
</dependency>-->
- <!-- 绉佹湁鍗忚-椋庢鑷磋繙-->
+ <!-- 绉佹湁鍗忚-椋庢鑷磋繙
<dependency>
<groupId>com.ld.igds</groupId>
<artifactId>igds-protocol-fzzy3</artifactId>
@@ -167,7 +167,7 @@
<groupId>log4j</groupId>
</exclusion>
</exclusions>
- </dependency>
+ </dependency>-->
<!-- MODBUS-TCP
<dependency>
@@ -187,7 +187,7 @@
</dependency>-->
- <!-- 绉佹湁鍗忚-椋庢鑷磋繙IOT銆佸埗姘満-->
+ <!-- 绉佹湁鍗忚-椋庢鑷磋繙IOT銆佸埗姘満
<dependency>
<groupId>com.ld.igds</groupId>
<artifactId>igds-protocol-iot</artifactId>
@@ -202,9 +202,9 @@
<groupId>log4j</groupId>
</exclusion>
</exclusions>
- </dependency>
+ </dependency>-->
- <!-- 绉佹湁鍗忚-璐濆崥绮儏-->
+ <!-- 绉佹湁鍗忚-璐濆崥绮儏
<dependency>
<groupId>com.ld.igds</groupId>
<artifactId>igds-protocol-beibo</artifactId>
@@ -219,9 +219,9 @@
<groupId>log4j</groupId>
</exclusion>
</exclusions>
- </dependency>
+ </dependency>-->
- <!-- 绉佹湁鍗忚-DLT645鐢佃〃鍗忚-->
+ <!-- 绉佹湁鍗忚-DLT645鐢佃〃鍗忚
<dependency>
<groupId>com.ld.igds</groupId>
<artifactId>igds-protocol-es</artifactId>
@@ -236,7 +236,7 @@
<groupId>log4j</groupId>
</exclusion>
</exclusions>
- </dependency>
+ </dependency>-->
<!-- 绉佹湁鍗忚-閭︽捣鏅鸿兘-->
<dependency>
@@ -255,7 +255,7 @@
</exclusions>
</dependency>
- <!-- 绉佹湁鍗忚-姝ｆ潵鐢靛瓙-->
+ <!-- 绉佹湁鍗忚-姝ｆ潵鐢靛瓙
<dependency>
<groupId>com.ld.igds</groupId>
<artifactId>igds-protocol-zldz</artifactId>
@@ -270,7 +270,7 @@
<groupId>log4j</groupId>
</exclusion>
</exclusions>
- </dependency>
+ </dependency>-->
<!-- 娴峰悍杞︾墝璇嗗埆-SDK-->
<dependency>
diff --git a/igds-web/src/main/resources/application-pro.yml b/igds-web/src/main/resources/application-pro.yml
index 1d4f61d..56c569c 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: /
@@ -15,12 +15,12 @@
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==
+ password: VoN6mGy94W/8BcVVpTsa+J2sjO4oBTDU25XkwdI2tJW4wj7ZOjuOHFonNaFcFoG3KfotN1M5p7mhxim8PkLcnw==
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
@@ -51,7 +51,7 @@
database: 0
host: 127.0.0.1
port: 6379
- password: Abc123..
+ password: Redispwd..
# 杩炴帴姹犳渶澶ц繛鎺ユ暟锛堜娇鐢ㄨ礋鍊艰〃绀烘病鏈夐檺鍒讹級
pool:
max-active: 200
@@ -71,10 +71,10 @@
## 绯荤粺鎺ュ彛璺敱閰嶇疆 娉ㄦ剰鏁板瓧濡傛灉浠�0寮�澶寸殑璇濓紝鍚庡彴浼氬嚭鐜拌浆涔夛紝璇锋坊鍔�""
igds:
default:
- companyId: 5322
+ companyId: 5333
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-pro5333.yml b/igds-web/src/main/resources/application-pro5333.yml
new file mode 100644
index 0000000..56c569c
--- /dev/null
+++ b/igds-web/src/main/resources/application-pro5333.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: VoN6mGy94W/8BcVVpTsa+J2sjO4oBTDU25XkwdI2tJW4wj7ZOjuOHFonNaFcFoG3KfotN1M5p7mhxim8PkLcnw==
+ 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: Redispwd..
+ # 杩炴帴姹犳渶澶ц繛鎺ユ暟锛堜娇鐢ㄨ礋鍊艰〃绀烘病鏈夐檺鍒讹級
+ 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: 5333
+ 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
diff --git a/igds-web/src/main/resources/templates/index/index-5329.html b/igds-web/src/main/resources/templates/index/index-5329.html
index 7dff021..3cec265 100644
--- a/igds-web/src/main/resources/templates/index/index-5329.html
+++ b/igds-web/src/main/resources/templates/index/index-5329.html
@@ -111,7 +111,7 @@
<P>鏅鸿兘棰勮</P>
</a>
</span> <span class="i-menu-item i-menu5 i-navBg5">
- <a href="javascript:;" onClick="open3d()">
+ <a href="javascript:;" onClick="openHelp()">
<i><img th:src="@{/static/images/i-icon-help1.png}"/></i>
<P>甯姪涓績</P>
</a>
@@ -207,14 +207,15 @@
};
//鎵撳紑璐ㄩ噺妫�娴�
- // function open3d() {
- // if ("#" == threePath) {
- // window.open("#", "_self");
- // } else {
- // window.open(threePath, "_blank");
- // }
- // };
function open3d() {
+ if ("#" == threePath) {
+ window.open("#", "_self");
+ } else {
+ window.open(threePath, "_blank");
+ }
+ };
+
+ function openHelp() {
window.open("./basic/common/help-center", "_blank");
};
</script>
--
Gitblit v1.9.3