From 652fca264c2468782a2d5a4fbe21a13df448b91a Mon Sep 17 00:00:00 2001
From: songhuangfeng123 <shf18767906695@163.com>
Date: 星期一, 22 八月 2022 15:50:39 +0800
Subject: [PATCH] Merge branches 'genchuang' and 'master' of https://sinanoaq.cn:8888/r/safePlatform-out into genchuang
---
safePlatfrom-out-web/src/main/java/com/gkhy/safePlatform/config/database/DruidConfig.java | 16 ++++++++--------
safePlatfrom-out-web/src/main/resources/config/application.yaml | 4 +++-
pom.xml | 23 +++++++++++++++++------
emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/service/impl/EmergencyCountServiceImpl.java | 7 +++++++
4 files changed, 35 insertions(+), 15 deletions(-)
diff --git a/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/service/impl/EmergencyCountServiceImpl.java b/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/service/impl/EmergencyCountServiceImpl.java
index b9ddad0..bff4bd6 100644
--- a/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/service/impl/EmergencyCountServiceImpl.java
+++ b/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/service/impl/EmergencyCountServiceImpl.java
@@ -19,6 +19,7 @@
import com.gkhy.safePlatform.emergency.service.baseService.EmergencySuppliesInfoService;
import com.gkhy.safePlatform.emergency.utils.TimeUtils;
import org.apache.dubbo.config.annotation.DubboReference;
+import org.redisson.api.RedissonClient;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.util.CollectionUtils;
@@ -38,6 +39,12 @@
@Autowired
private EmergencySuppliesInfoService emergencySuppliesInfoService;
+ /**
+ * redisson客户端
+ */
+ @Autowired
+ private RedissonClient redissonClient;
+
@Override
diff --git a/pom.xml b/pom.xml
index 44d62fc..5dd6e01 100644
--- a/pom.xml
+++ b/pom.xml
@@ -9,6 +9,12 @@
<packaging>pom</packaging>
<version>1.0-SNAPSHOT</version>
+ <parent>
+ <groupId>org.springframework.boot</groupId>
+ <artifactId>spring-boot-starter-parent</artifactId>
+ <version>2.7.1</version>
+ </parent>
+
<modules>
<module>goal-manage/goal-manage-service</module>
<module>goal-manage/goal-manage-rpc-provider</module>
@@ -39,13 +45,8 @@
<com.alibaba.cloud.version>2.2.8.RELEASE</com.alibaba.cloud.version>
<jta.starter.version>2.7.1</jta.starter.version>
<commons.utils.version>1.9.4</commons.utils.version>
+ <redission.version>3.17.4</redission.version>
</properties>
-
- <parent>
- <groupId>org.springframework.boot</groupId>
- <artifactId>spring-boot-starter-parent</artifactId>
- <version>2.6.7</version>
- </parent>
<dependencyManagement>
<dependencies>
@@ -139,6 +140,12 @@
<version>${commons.utils.version}</version>
</dependency>
+ <dependency>
+ <groupId>org.redisson</groupId>
+ <artifactId>redisson-spring-boot-starter</artifactId>
+ <version>${redission.version}</version>
+ </dependency>
+
</dependencies>
</dependencyManagement>
@@ -202,6 +209,10 @@
<artifactId>spring-boot-starter-data-redis</artifactId>
</dependency>
<dependency>
+ <groupId>org.redisson</groupId>
+ <artifactId>redisson-spring-boot-starter</artifactId>
+ </dependency>
+ <dependency>
<groupId>org.aspectj</groupId>
<artifactId>aspectjweaver</artifactId>
<version>1.9.9.1</version>
diff --git a/safePlatfrom-out-web/src/main/java/com/gkhy/safePlatform/config/database/DruidConfig.java b/safePlatfrom-out-web/src/main/java/com/gkhy/safePlatform/config/database/DruidConfig.java
index 56d026a..ddd6d43 100644
--- a/safePlatfrom-out-web/src/main/java/com/gkhy/safePlatform/config/database/DruidConfig.java
+++ b/safePlatfrom-out-web/src/main/java/com/gkhy/safePlatform/config/database/DruidConfig.java
@@ -46,8 +46,8 @@
ds.setUniqueResourceName("goalmanage");
ds.setPoolSize(2);
ds.setXaProperties(prop);
- ds.setMaxIdleTime(18000000);
- ds.setMaxLifetime(21600000);
+ ds.setMaxIdleTime(3600000);
+ ds.setMaxLifetime(3000000);
return ds;
}
@@ -64,8 +64,8 @@
ds.setUniqueResourceName("emergency");
ds.setPoolSize(2);
ds.setXaProperties(prop);
- ds.setMaxIdleTime(18000000);
- ds.setMaxLifetime(21600000);
+ ds.setMaxIdleTime(3600000);
+ ds.setMaxLifetime(3000000);
return ds;
}
@@ -80,8 +80,8 @@
ds.setUniqueResourceName("incidentmanage");
ds.setPoolSize(2);
ds.setXaProperties(prop);
- ds.setMaxIdleTime(18000000);
- ds.setMaxLifetime(21600000);
+ ds.setMaxIdleTime(3600000);
+ ds.setMaxLifetime(3000000);
return ds;
}
@@ -96,8 +96,8 @@
ds.setUniqueResourceName("equipment");
ds.setPoolSize(2);
ds.setXaProperties(prop);
- ds.setMaxIdleTime(18000000);
- ds.setMaxLifetime(21600000);
+ ds.setMaxIdleTime(3600000);
+ ds.setMaxLifetime(3000000);
return ds;
}
diff --git a/safePlatfrom-out-web/src/main/resources/config/application.yaml b/safePlatfrom-out-web/src/main/resources/config/application.yaml
index f2c9eba..932b998 100644
--- a/safePlatfrom-out-web/src/main/resources/config/application.yaml
+++ b/safePlatfrom-out-web/src/main/resources/config/application.yaml
@@ -2,7 +2,9 @@
application:
name: safeplatform-out
profiles:
- active: guotai-demo
+ active: uat
+# active: guotai-demo
+#### test uat guotai-demo
# active: test
# active: uat
--
Gitblit v1.9.2