From baab7ff48901687c054c5910bd7637cf2b195987 Mon Sep 17 00:00:00 2001
From: liujie <1793218484@qq.com>
Date: 星期一, 11 八月 2025 22:17:25 +0800
Subject: [PATCH] 更改
---
driver/guns-admin/src/main/resources/redis.properties | 3 ++-
driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/util/RedisUtil.java | 13 +++++++------
driver/guns-admin/src/main/resources/application.yml | 18 ++++++++++++------
driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/service/impl/DriverServiceImpl.java | 2 +-
driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/util/TaskUtil.java | 1 -
driver/guns-admin/pom.xml | 4 ++++
6 files changed, 26 insertions(+), 15 deletions(-)
diff --git a/driver/guns-admin/pom.xml b/driver/guns-admin/pom.xml
index aaeb2fd..3f427be 100644
--- a/driver/guns-admin/pom.xml
+++ b/driver/guns-admin/pom.xml
@@ -17,6 +17,10 @@
<dependencies>
<dependency>
+ <groupId>org.springframework.boot</groupId>
+ <artifactId>spring-boot-starter-data-redis</artifactId>
+ </dependency>
+ <dependency>
<groupId>com.aliyun.oss</groupId>
<artifactId>aliyun-sdk-oss</artifactId>
<version>2.5.0</version>
diff --git a/driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/service/impl/DriverServiceImpl.java b/driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/service/impl/DriverServiceImpl.java
index dec6d88..9d929bf 100644
--- a/driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/service/impl/DriverServiceImpl.java
+++ b/driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/service/impl/DriverServiceImpl.java
@@ -576,7 +576,7 @@
Double lat = driverPositionWarpper.getLat();
Integer driverId = driverPositionWarpper.getDriverId();
Integer orderId = driverPositionWarpper.getOrderId();
- redisUtil.setStrValue("DRIVER" + driverId, lon + "," + lat, 30);
+ redisUtil.setStrValue("daijia:DRIVER" + driverId, lon + "," + lat, 30);
Query query = Query.query(Criteria.where("driverId").is(driverId));
Location old = this.mongoTemplate.findOne(query, Location.class);
if (Objects.isNull(old)) {
diff --git a/driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/util/RedisUtil.java b/driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/util/RedisUtil.java
index fd3d1f1..7537cc9 100644
--- a/driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/util/RedisUtil.java
+++ b/driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/util/RedisUtil.java
@@ -2,14 +2,17 @@
import com.supersavedriving.driver.core.util.ToolUtil;
import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.data.redis.core.RedisTemplate;
import org.springframework.stereotype.Component;
import org.springframework.util.StringUtils;
import redis.clients.jedis.Jedis;
import redis.clients.jedis.JedisPool;
import redis.clients.jedis.Pipeline;
+import javax.annotation.Resource;
import java.io.IOException;
import java.util.*;
+import java.util.concurrent.TimeUnit;
/**
@@ -23,6 +26,8 @@
private Timer timer;
+ @Resource
+ private RedisTemplate<String, Object> redisTemplate;
/**
* 向redis中存储字符串没有过期时间
@@ -44,12 +49,8 @@
* @param value
* @param time 秒
*/
- public void setStrValue(String key, String value, int time){
- if(ToolUtil.isNotEmpty(key) && ToolUtil.isNotEmpty(value)){
- Jedis resource = jedisPool.getResource();
- String setex = resource.setex(key, time, value);
- closeJedis(resource);
- }
+ public void setStrValue(String key, String value, long time){
+ redisTemplate.opsForValue().set(key, value, time, TimeUnit.SECONDS);
}
diff --git a/driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/util/TaskUtil.java b/driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/util/TaskUtil.java
index 5ce40b2..81806ec 100644
--- a/driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/util/TaskUtil.java
+++ b/driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/util/TaskUtil.java
@@ -79,7 +79,6 @@
}
- @Scheduled(fixedRate = 1000 * 5)
public void task5SecondsCheck(){
try {
Set<String> orderServices = redisUtil.getSetAllValue("orderService_check");
diff --git a/driver/guns-admin/src/main/resources/application.yml b/driver/guns-admin/src/main/resources/application.yml
index 1c093db..346a912 100644
--- a/driver/guns-admin/src/main/resources/application.yml
+++ b/driver/guns-admin/src/main/resources/application.yml
@@ -1,5 +1,5 @@
server:
- port: 8007
+ port: 8008
guns:
swagger-open: true #是否开启swagger (true/false)
@@ -39,7 +39,7 @@
eureka:
client:
service-url: #注册中心地址
- defaultZone: http://sinata:sinata@127.0.0.1:8000/eureka #启用身份验证的方式连接
+ defaultZone: http://sinata:sinata@192.168.110.106:8000/eureka #启用身份验证的方式连接
register-with-eureka: true #在注册中心进行注册
fetch-registry: true #从Eureka中获取注册信息。
@@ -53,12 +53,18 @@
spring:
datasource:
- url: jdbc:mysql://121.31.232.206:3306/ok_driving?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=CONVERT_TO_NULL&useSSL=false&serverTimezone=Asia/Shanghai
+ url: jdbc:mysql://192.168.110.80:3306/qyt_driving?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=CONVERT_TO_NULL&useSSL=false&serverTimezone=Asia/Shanghai
username: root
# password: f4OfRjqoN3jSiNGiUoiNsQdOBtCOKYRj
- password: Xiwang2024!
+ password: 123456
db-name: guns #用来搜集数据库的所有表
filters: wall,mergeStat
+ redis:
+ host: 192.168.110.80
+ port: 6379
+ password: 123456
+
+
# datasource:
# url: jdbc:mysql://192.168.110.80:3306/super_save_driving?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=CONVERT_TO_NULL&useSSL=false&serverTimezone=Asia/Shanghai
@@ -128,8 +134,8 @@
spring:
data:
mongodb:
-# uri: mongodb://192.168.110.188:27017/admin
- uri: mongodb://121.31.232.206:27017/test
+ uri: mongodb://192.168.110.80:27017/test
+# uri: mongodb://121.31.232.206:27017/test
---
diff --git a/driver/guns-admin/src/main/resources/redis.properties b/driver/guns-admin/src/main/resources/redis.properties
index 1e2b857..0170234 100644
--- a/driver/guns-admin/src/main/resources/redis.properties
+++ b/driver/guns-admin/src/main/resources/redis.properties
@@ -3,12 +3,13 @@
spring.redis.database=0
# Redis��������ַ
-spring.redis.host=127.0.0.1
+spring.redis.host=192.168.110.80
# Redis���������Ӷ˿�
spring.redis.port=6379
# Redis�������������루Ĭ��Ϊ�գ�
spring.redis.password=123456
+
## Redis��������ַ
#spring.redis.host=127.0.0.1
## Redis���������Ӷ˿�
--
Gitblit v1.7.1