From 43d8da7e3b60cb7deb7d31ae0a6c06bff1ae9390 Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期一, 11 八月 2025 22:24:04 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
.idea/QYTDriving.iml | 9 ++
driver/.idea/compiler.xml | 22 +++++
driver/.idea/workspace.xml | 152 +++++++++++++++++++------------------
driver/.idea/jarRepositories.xml | 20 +++++
user/guns-admin/src/main/java/com/supersavedriving/user/modular/system/service/impl/DriverServiceImpl.java | 2
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 +
user/guns-admin/src/main/java/com/supersavedriving/user/modular/system/util/AppUserUtil.java | 2
driver/.idea/encodings.xml | 9 ++
user/guns-admin/src/main/java/com/supersavedriving/user/modular/system/service/impl/OrderServiceImpl.java | 8 +-
11 files changed, 148 insertions(+), 83 deletions(-)
diff --git a/.idea/QYTDriving.iml b/.idea/QYTDriving.iml
new file mode 100644
index 0000000..d6ebd48
--- /dev/null
+++ b/.idea/QYTDriving.iml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<module type="JAVA_MODULE" version="4">
+ <component name="NewModuleRootManager" inherit-compiler-output="true">
+ <exclude-output />
+ <content url="file://$MODULE_DIR$" />
+ <orderEntry type="inheritedJdk" />
+ <orderEntry type="sourceFolder" forTests="false" />
+ </component>
+</module>
\ No newline at end of file
diff --git a/driver/.idea/compiler.xml b/driver/.idea/compiler.xml
new file mode 100644
index 0000000..42e0078
--- /dev/null
+++ b/driver/.idea/compiler.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+ <component name="CompilerConfiguration">
+ <annotationProcessing>
+ <profile name="Maven default annotation processors profile" enabled="true">
+ <sourceOutputDir name="target/generated-sources/annotations" />
+ <sourceTestOutputDir name="target/generated-test-sources/test-annotations" />
+ <outputRelativeToContentRoot value="true" />
+ <module name="driver" />
+ <module name="guns-core" />
+ <module name="guns-generator" />
+ </profile>
+ </annotationProcessing>
+ </component>
+ <component name="JavacSettings">
+ <option name="ADDITIONAL_OPTIONS_OVERRIDE">
+ <module name="driver" options="-parameters" />
+ <module name="guns-core" options="-parameters" />
+ <module name="guns-generator" options="-parameters" />
+ </option>
+ </component>
+</project>
\ No newline at end of file
diff --git a/driver/.idea/encodings.xml b/driver/.idea/encodings.xml
new file mode 100644
index 0000000..a3eafdb
--- /dev/null
+++ b/driver/.idea/encodings.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+ <component name="Encoding">
+ <file url="file://$PROJECT_DIR$/guns-admin/src/main/java" charset="UTF-8" />
+ <file url="file://$PROJECT_DIR$/guns-core/src/main/java" charset="UTF-8" />
+ <file url="file://$PROJECT_DIR$/guns-generator/src/main/java" charset="UTF-8" />
+ <file url="file://$PROJECT_DIR$/src/main/java" charset="UTF-8" />
+ </component>
+</project>
\ No newline at end of file
diff --git a/driver/.idea/jarRepositories.xml b/driver/.idea/jarRepositories.xml
new file mode 100644
index 0000000..712ab9d
--- /dev/null
+++ b/driver/.idea/jarRepositories.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+ <component name="RemoteRepositoriesConfiguration">
+ <remote-repository>
+ <option name="id" value="central" />
+ <option name="name" value="Central Repository" />
+ <option name="url" value="https://repo.maven.apache.org/maven2" />
+ </remote-repository>
+ <remote-repository>
+ <option name="id" value="central" />
+ <option name="name" value="Maven Central repository" />
+ <option name="url" value="https://repo1.maven.org/maven2" />
+ </remote-repository>
+ <remote-repository>
+ <option name="id" value="jboss.community" />
+ <option name="name" value="JBoss Community repository" />
+ <option name="url" value="https://repository.jboss.org/nexus/content/repositories/public/" />
+ </remote-repository>
+ </component>
+</project>
\ No newline at end of file
diff --git a/driver/.idea/workspace.xml b/driver/.idea/workspace.xml
index 96c425c..e6ce341 100644
--- a/driver/.idea/workspace.xml
+++ b/driver/.idea/workspace.xml
@@ -5,61 +5,31 @@
</component>
<component name="ChangeListManager">
<list default="true" id="506548b6-c147-4883-9af0-e22c50455488" name="更改" comment="">
- <change beforePath="$PROJECT_DIR$/../.idea/misc.xml" beforeDir="false" />
- <change beforePath="$PROJECT_DIR$/../.idea/modules.xml" beforeDir="false" />
- <change beforePath="$PROJECT_DIR$/../.idea/vcs.xml" beforeDir="false" />
- <change beforePath="$PROJECT_DIR$/.idea/compiler.xml" beforeDir="false" />
- <change beforePath="$PROJECT_DIR$/.idea/driver.iml" beforeDir="false" />
- <change beforePath="$PROJECT_DIR$/.idea/encodings.xml" beforeDir="false" />
- <change beforePath="$PROJECT_DIR$/.idea/inspectionProfiles/Project_Default.xml" beforeDir="false" />
- <change beforePath="$PROJECT_DIR$/.idea/jarRepositories.xml" beforeDir="false" />
- <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__com_huaweicloud_esdk_obs_java_bundle_3_23_5.xml" beforeDir="false" />
- <change beforePath="$PROJECT_DIR$/.idea/libraries/lib.xml" beforeDir="false" />
- <change beforePath="$PROJECT_DIR$/.idea/misc.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/misc.xml" afterDir="false" />
- <change beforePath="$PROJECT_DIR$/.idea/modules.xml" beforeDir="false" />
- <change beforePath="$PROJECT_DIR$/.idea/uiDesigner.xml" beforeDir="false" />
+ <change afterPath="$PROJECT_DIR$/../.idea/QYTDriving.iml" afterDir="false" />
+ <change afterPath="$PROJECT_DIR$/.idea/compiler.xml" afterDir="false" />
+ <change afterPath="$PROJECT_DIR$/.idea/encodings.xml" afterDir="false" />
+ <change afterPath="$PROJECT_DIR$/.idea/jarRepositories.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
- <change beforePath="$PROJECT_DIR$/guns-core/guns-core.iml" beforeDir="false" />
- <change beforePath="$PROJECT_DIR$/guns-generator/guns-generator.iml" beforeDir="false" />
- <change beforePath="$PROJECT_DIR$/../eureka/.idea/compiler.xml" beforeDir="false" />
- <change beforePath="$PROJECT_DIR$/../eureka/.idea/encodings.xml" beforeDir="false" />
- <change beforePath="$PROJECT_DIR$/../eureka/.idea/jarRepositories.xml" beforeDir="false" />
- <change beforePath="$PROJECT_DIR$/../eureka/.idea/misc.xml" beforeDir="false" />
- <change beforePath="$PROJECT_DIR$/../eureka/.idea/vcs.xml" beforeDir="false" />
- <change beforePath="$PROJECT_DIR$/../eureka/.idea/workspace.xml" beforeDir="false" />
- <change beforePath="$PROJECT_DIR$/../eureka/demo.iml" beforeDir="false" />
- <change beforePath="$PROJECT_DIR$/../management/.idea/.name" beforeDir="false" />
- <change beforePath="$PROJECT_DIR$/../management/.idea/compiler.xml" beforeDir="false" afterPath="$PROJECT_DIR$/../management/.idea/compiler.xml" afterDir="false" />
- <change beforePath="$PROJECT_DIR$/../management/.idea/encodings.xml" beforeDir="false" afterPath="$PROJECT_DIR$/../management/.idea/encodings.xml" afterDir="false" />
+ <change beforePath="$PROJECT_DIR$/guns-admin/pom.xml" beforeDir="false" afterPath="$PROJECT_DIR$/guns-admin/pom.xml" afterDir="false" />
+ <change beforePath="$PROJECT_DIR$/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/service/impl/DriverServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/service/impl/DriverServiceImpl.java" afterDir="false" />
+ <change beforePath="$PROJECT_DIR$/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/util/RedisUtil.java" beforeDir="false" afterPath="$PROJECT_DIR$/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/util/RedisUtil.java" afterDir="false" />
+ <change beforePath="$PROJECT_DIR$/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/util/TaskUtil.java" beforeDir="false" afterPath="$PROJECT_DIR$/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/util/TaskUtil.java" afterDir="false" />
+ <change beforePath="$PROJECT_DIR$/guns-admin/src/main/resources/application.yml" beforeDir="false" afterPath="$PROJECT_DIR$/guns-admin/src/main/resources/application.yml" afterDir="false" />
+ <change beforePath="$PROJECT_DIR$/guns-admin/src/main/resources/redis.properties" beforeDir="false" afterPath="$PROJECT_DIR$/guns-admin/src/main/resources/redis.properties" afterDir="false" />
<change beforePath="$PROJECT_DIR$/../management/.idea/jarRepositories.xml" beforeDir="false" afterPath="$PROJECT_DIR$/../management/.idea/jarRepositories.xml" afterDir="false" />
- <change beforePath="$PROJECT_DIR$/../management/.idea/libraries/lib.xml" beforeDir="false" />
- <change beforePath="$PROJECT_DIR$/../management/.idea/management.iml" beforeDir="false" />
- <change beforePath="$PROJECT_DIR$/../management/.idea/misc.xml" beforeDir="false" afterPath="$PROJECT_DIR$/../management/.idea/misc.xml" afterDir="false" />
- <change beforePath="$PROJECT_DIR$/../management/.idea/modules.xml" beforeDir="false" />
- <change beforePath="$PROJECT_DIR$/../management/guns-admin/guns-admin.iml" beforeDir="false" />
- <change beforePath="$PROJECT_DIR$/../management/guns-core/guns-core.iml" beforeDir="false" />
- <change beforePath="$PROJECT_DIR$/../management/guns-generator/guns-generator.iml" beforeDir="false" />
- <change beforePath="$PROJECT_DIR$/../management/guns-parent (1).iml" beforeDir="false" />
- <change beforePath="$PROJECT_DIR$/../user/.idea/.name" beforeDir="false" />
- <change beforePath="$PROJECT_DIR$/../user/.idea/compiler.xml" beforeDir="false" />
- <change beforePath="$PROJECT_DIR$/../user/.idea/encodings.xml" beforeDir="false" />
- <change beforePath="$PROJECT_DIR$/../user/.idea/inspectionProfiles/Project_Default.xml" beforeDir="false" />
- <change beforePath="$PROJECT_DIR$/../user/.idea/jarRepositories.xml" beforeDir="false" />
- <change beforePath="$PROJECT_DIR$/../user/.idea/libraries/Maven__com_huaweicloud_esdk_obs_java_bundle_3_23_3.xml" beforeDir="false" />
- <change beforePath="$PROJECT_DIR$/../user/.idea/libraries/lib.xml" beforeDir="false" />
- <change beforePath="$PROJECT_DIR$/../user/.idea/misc.xml" beforeDir="false" afterPath="$PROJECT_DIR$/../user/.idea/misc.xml" afterDir="false" />
- <change beforePath="$PROJECT_DIR$/../user/.idea/modules.xml" beforeDir="false" />
- <change beforePath="$PROJECT_DIR$/../user/.idea/uiDesigner.xml" beforeDir="false" />
- <change beforePath="$PROJECT_DIR$/../user/guns-core/guns-core.iml" beforeDir="false" />
- <change beforePath="$PROJECT_DIR$/../user/guns-generator/guns-generator.iml" beforeDir="false" />
- <change beforePath="$PROJECT_DIR$/../zuul/.idea/compiler.xml" beforeDir="false" />
- <change beforePath="$PROJECT_DIR$/../zuul/.idea/encodings.xml" beforeDir="false" />
- <change beforePath="$PROJECT_DIR$/../zuul/.idea/inspectionProfiles/Project_Default.xml" beforeDir="false" />
- <change beforePath="$PROJECT_DIR$/../zuul/.idea/jarRepositories.xml" beforeDir="false" />
- <change beforePath="$PROJECT_DIR$/../zuul/.idea/misc.xml" beforeDir="false" />
- <change beforePath="$PROJECT_DIR$/../zuul/.idea/modules.xml" beforeDir="false" />
- <change beforePath="$PROJECT_DIR$/../zuul/.idea/vcs.xml" beforeDir="false" />
- <change beforePath="$PROJECT_DIR$/../zuul/.idea/workspace.xml" beforeDir="false" />
+ <change beforePath="$PROJECT_DIR$/../management/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/../management/.idea/workspace.xml" afterDir="false" />
+ <change beforePath="$PROJECT_DIR$/../management/guns-admin/src/main/resources/application.yml" beforeDir="false" afterPath="$PROJECT_DIR$/../management/guns-admin/src/main/resources/application.yml" afterDir="false" />
+ <change beforePath="$PROJECT_DIR$/../management/guns-admin/src/main/webapp/WEB-INF/view/common/_right.html" beforeDir="false" afterPath="$PROJECT_DIR$/../management/guns-admin/src/main/webapp/WEB-INF/view/common/_right.html" afterDir="false" />
+ <change beforePath="$PROJECT_DIR$/../management/guns-admin/src/main/webapp/WEB-INF/view/index.html" beforeDir="false" afterPath="$PROJECT_DIR$/../management/guns-admin/src/main/webapp/WEB-INF/view/index.html" afterDir="false" />
+ <change beforePath="$PROJECT_DIR$/../management/guns-admin/src/main/webapp/WEB-INF/view/login.html" beforeDir="false" afterPath="$PROJECT_DIR$/../management/guns-admin/src/main/webapp/WEB-INF/view/login.html" afterDir="false" />
+ <change beforePath="$PROJECT_DIR$/../user/.idea/compiler.xml" beforeDir="false" afterPath="$PROJECT_DIR$/../user/.idea/compiler.xml" afterDir="false" />
+ <change beforePath="$PROJECT_DIR$/../user/.idea/jarRepositories.xml" beforeDir="false" afterPath="$PROJECT_DIR$/../user/.idea/jarRepositories.xml" afterDir="false" />
+ <change beforePath="$PROJECT_DIR$/../user/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/../user/.idea/workspace.xml" afterDir="false" />
+ <change beforePath="$PROJECT_DIR$/../user/guns-admin/src/main/java/com/supersavedriving/user/modular/api/AppUserController.java" beforeDir="false" afterPath="$PROJECT_DIR$/../user/guns-admin/src/main/java/com/supersavedriving/user/modular/api/AppUserController.java" afterDir="false" />
+ <change beforePath="$PROJECT_DIR$/../user/guns-admin/src/main/java/com/supersavedriving/user/modular/system/service/impl/DriverServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/../user/guns-admin/src/main/java/com/supersavedriving/user/modular/system/service/impl/DriverServiceImpl.java" afterDir="false" />
+ <change beforePath="$PROJECT_DIR$/../user/guns-admin/src/main/java/com/supersavedriving/user/modular/system/service/impl/OrderServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/../user/guns-admin/src/main/java/com/supersavedriving/user/modular/system/service/impl/OrderServiceImpl.java" afterDir="false" />
+ <change beforePath="$PROJECT_DIR$/../user/guns-admin/src/main/java/com/supersavedriving/user/modular/system/util/AppUserUtil.java" beforeDir="false" afterPath="$PROJECT_DIR$/../user/guns-admin/src/main/java/com/supersavedriving/user/modular/system/util/AppUserUtil.java" afterDir="false" />
+ <change beforePath="$PROJECT_DIR$/../user/guns-admin/src/main/resources/application.yml" beforeDir="false" afterPath="$PROJECT_DIR$/../user/guns-admin/src/main/resources/application.yml" afterDir="false" />
</list>
<option name="SHOW_DIALOG" value="false" />
<option name="HIGHLIGHT_CONFLICTS" value="true" />
@@ -72,15 +42,9 @@
<component name="MarkdownSettingsMigration">
<option name="stateVersion" value="1" />
</component>
- <component name="MavenImportPreferences">
- <option name="generalSettings">
- <MavenGeneralSettings>
- <option name="mavenHome" value="D:/Program Files/apache-maven-3.6.1" />
- <option name="useMavenConfig" value="true" />
- <option name="userSettingsFile" value="D:\Program Files\apache-maven-3.6.1\conf\settings.xml" />
- </MavenGeneralSettings>
- </option>
- </component>
+ <component name="ProjectColorInfo">{
+ "associatedIndex": 0
+}</component>
<component name="ProjectId" id="2ya10OJhowlKjAmXiEZ3h9kc7v5" />
<component name="ProjectLevelVcsManager" settingsEditedManually="true" />
<component name="ProjectViewState">
@@ -88,20 +52,54 @@
<option name="showLibraryContents" value="true" />
<option name="showVisibilityIcons" value="true" />
</component>
- <component name="PropertiesComponent"><![CDATA[{
- "keyToString": {
- "ASKED_ADD_EXTERNAL_FILES": "true",
- "RunOnceActivity.OpenProjectViewOnStart": "true",
- "RunOnceActivity.ShowReadmeOnStart": "true",
- "WebServerToolWindowFactoryState": "false",
- "last_opened_file_path": "E:/IDEA Workspace/OKDriving/user",
- "nodejs_package_manager_path": "npm",
- "project.structure.last.edited": "项目",
- "project.structure.proportion": "0.0",
- "project.structure.side.proportion": "0.0",
- "settings.editor.selected.configurable": "MavenSettings"
+ <component name="PropertiesComponent">{
+ "keyToString": {
+ "ASKED_ADD_EXTERNAL_FILES": "true",
+ "Maven.guns-parent [package].executor": "Run",
+ "RequestMappingsPanelOrder0": "0",
+ "RequestMappingsPanelOrder1": "1",
+ "RequestMappingsPanelWidth0": "75",
+ "RequestMappingsPanelWidth1": "75",
+ "RunOnceActivity.OpenProjectViewOnStart": "true",
+ "RunOnceActivity.ShowReadmeOnStart": "true",
+ "SHARE_PROJECT_CONFIGURATION_FILES": "true",
+ "Spring Boot.GunsApplication.executor": "Debug",
+ "WebServerToolWindowFactoryState": "false",
+ "git-widget-placeholder": "master",
+ "kotlin-language-version-configured": "true",
+ "last_opened_file_path": "F:/code/QYTDriving/driver",
+ "node.js.detected.package.eslint": "true",
+ "node.js.detected.package.tslint": "true",
+ "node.js.selected.package.eslint": "(autodetect)",
+ "node.js.selected.package.tslint": "(autodetect)",
+ "nodejs_package_manager_path": "npm",
+ "project.structure.last.edited": "项目",
+ "project.structure.proportion": "0.0",
+ "project.structure.side.proportion": "0.0",
+ "settings.editor.selected.configurable": "MavenSettings",
+ "vue.rearranger.settings.migration": "true"
}
-}]]></component>
+}</component>
+ <component name="ReactorSettings">
+ <option name="notificationShown" value="true" />
+ </component>
+ <component name="RunManager">
+ <configuration name="GunsApplication" type="SpringBootApplicationConfigurationType" factoryName="Spring Boot" nameIsGenerated="true">
+ <module name="driver" />
+ <option name="SPRING_BOOT_MAIN_CLASS" value="com.supersavedriving.driver.GunsApplication" />
+ <method v="2">
+ <option name="Make" enabled="true" />
+ </method>
+ </configuration>
+ </component>
+ <component name="SharedIndexes">
+ <attachedChunks>
+ <set>
+ <option value="bundled-jdk-9823dce3aa75-28b599e66164-intellij.indexing.shared.core-IU-242.23339.11" />
+ <option value="bundled-js-predefined-d6986cc7102b-5c90d61e3bab-JavaScript-IU-242.23339.11" />
+ </set>
+ </attachedChunks>
+ </component>
<component name="SpellCheckerSettings" RuntimeDictionaries="0" Folders="0" CustomDictionaries="0" DefaultDictionary="应用程序级" UseSingleDictionary="true" transferred="true" />
<component name="TaskManager">
<task active="true" id="Default" summary="默认任务">
@@ -111,6 +109,10 @@
<option name="presentableId" value="Default" />
<updated>1750057650671</updated>
<workItem from="1750057651793" duration="474000" />
+ <workItem from="1754877414171" duration="4492000" />
+ <workItem from="1754892516667" duration="3542000" />
+ <workItem from="1754899010485" duration="5383000" />
+ <workItem from="1754919867199" duration="1906000" />
</task>
<servers />
</component>
diff --git a/driver/guns-admin/pom.xml b/driver/guns-admin/pom.xml
index 29932fc..8198f20 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 2ba2ea2..b668aac 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
@@ -629,7 +629,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/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/user/guns-admin/src/main/java/com/supersavedriving/user/modular/system/service/impl/DriverServiceImpl.java b/user/guns-admin/src/main/java/com/supersavedriving/user/modular/system/service/impl/DriverServiceImpl.java
index 645c6b5..f3f2706 100644
--- a/user/guns-admin/src/main/java/com/supersavedriving/user/modular/system/service/impl/DriverServiceImpl.java
+++ b/user/guns-admin/src/main/java/com/supersavedriving/user/modular/system/service/impl/DriverServiceImpl.java
@@ -106,7 +106,7 @@
}
List<DriverWork> driverWorks = driverWorkService.selectList(new EntityWrapper<DriverWork>().in("driverId", collect).eq("status", 1));
for (DriverWork driverWork : driverWorks) {
- String value = redisUtil.getValue("DRIVER" + driverWork.getDriverId());
+ String value = redisUtil.getValue("daijia:DRIVER" + driverWork.getDriverId());
if(ToolUtil.isEmpty(value)){
continue;
}
diff --git a/user/guns-admin/src/main/java/com/supersavedriving/user/modular/system/service/impl/OrderServiceImpl.java b/user/guns-admin/src/main/java/com/supersavedriving/user/modular/system/service/impl/OrderServiceImpl.java
index 56f597a..010f109 100644
--- a/user/guns-admin/src/main/java/com/supersavedriving/user/modular/system/service/impl/OrderServiceImpl.java
+++ b/user/guns-admin/src/main/java/com/supersavedriving/user/modular/system/service/impl/OrderServiceImpl.java
@@ -605,7 +605,7 @@
.eq("state", 2).last(" and surplusQuantity > 0 and now() < failureTime"));
Double d = null;
for (YouTuiDriver youTuiDriver : youTuiDrivers) {
- String value = redisUtil.getValue("DRIVER" + youTuiDriver.getDriverId());
+ String value = redisUtil.getValue("daijia:DRIVER" + youTuiDriver.getDriverId());
if(ToolUtil.isEmpty(value)){
continue;
}
@@ -667,7 +667,7 @@
Double score = null;//评分
Double d = null;
for (Driver driver1 : drivers) {
- String value = redisUtil.getValue("DRIVER" + driver1.getId());
+ String value = redisUtil.getValue("daijia:DRIVER" + driver1.getId());
if(ToolUtil.isEmpty(value)){
continue;
}
@@ -801,7 +801,7 @@
return;
}
for (Driver driver1 : drivers) {
- String value = redisUtil.getValue("DRIVER" + driver1.getId());
+ String value = redisUtil.getValue("daijia:DRIVER" + driver1.getId());
if (ToolUtil.isEmpty(value)) {
continue;
}
@@ -876,7 +876,7 @@
JSONObject jsonObject = JSON.parseObject(systemConfig.getContent());
orderInfoWarpper.setServiceCell(jsonObject.getString("num1"));
}
- String value = redisUtil.getValue("DRIVER" + orderInfoWarpper.getDriverId());
+ String value = redisUtil.getValue("daijia:DRIVER" + orderInfoWarpper.getDriverId());
if(ToolUtil.isNotEmpty(value)){
String[] split = value.split(",");
orderInfoWarpper.setDriverLon(split[0]);
diff --git a/user/guns-admin/src/main/java/com/supersavedriving/user/modular/system/util/AppUserUtil.java b/user/guns-admin/src/main/java/com/supersavedriving/user/modular/system/util/AppUserUtil.java
index 1ff9a43..8520ae6 100644
--- a/user/guns-admin/src/main/java/com/supersavedriving/user/modular/system/util/AppUserUtil.java
+++ b/user/guns-admin/src/main/java/com/supersavedriving/user/modular/system/util/AppUserUtil.java
@@ -13,7 +13,7 @@
@Slf4j
public class AppUserUtil {
- private static String url = "http://221.182.45.100:5000/user-server";
+ private static String url = "http://192.168.110.85:5000/user-server";
/**
--
Gitblit v1.7.1