java/QYTDriving.git

parent: 6598b474 | 补丁 | 提交 | show whitespace

Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/QYTDriving

puzhibing

2 天以前 ba6b508a44cb1f0730c6a27a5d73b8d2ae8f1d4b

Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/QYTDriving

# Conflicts:
#	user/guns-admin/src/main/java/com/supersavedriving/user/modular/system/service/impl/OrderServiceImpl.java
#	user/guns-admin/src/main/java/com/supersavedriving/user/modular/system/util/RedisUtil.java

1个文件已删除

16个文件已修改

1个文件已添加

	driver/.idea/compiler.xml	8 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	driver/.idea/encodings.xml	8 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	driver/.idea/jarRepositories.xml	20 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	driver/.idea/misc.xml	4 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	driver/.idea/workspace.xml	623 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/service/impl/DriverServiceImpl.java	2 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/service/impl/OrderServiceImpl.java	11 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/warpper/DriverInfoWarpper.java	4 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	driver/guns-admin/src/main/resources/application-dev.yml	2 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	user/.idea/compiler.xml	8 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	user/.idea/encodings.xml	5 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	user/.idea/misc.xml	2 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	user/.idea/workspace.xml	484 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	user/guns-admin/pom.xml	14 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	user/guns-admin/src/main/java/com/supersavedriving/user/config/RedissonConfig.java	28 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	user/guns-admin/src/main/java/com/supersavedriving/user/modular/system/service/impl/OrderServiceImpl.java	47 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	user/guns-admin/src/main/java/com/supersavedriving/user/modular/system/util/RedisUtil.java	3 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	user/guns-admin/src/main/resources/application-dev.yml	4 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史

 driver/.idea/compiler.xml

@@ -2,6 +2,7 @@
<project version="4">
  <component name="CompilerConfiguration">
    <annotationProcessing>
      <profile default="true" name="Default" enabled="true" />
      <profile name="Maven default annotation processors profile" enabled="true">
        <sourceOutputDir name="target/generated-sources/annotations" />
        <sourceTestOutputDir name="target/generated-test-sources/test-annotations" />
@@ -11,12 +12,5 @@
        <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>

 driver/.idea/encodings.xml

@@ -1,9 +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" />
    <file url="file://$PROJECT_DIR$" charset="UTF-8" />
    <file url="file://$PROJECT_DIR$/guns-admin" charset="UTF-8" />
    <file url="file://$PROJECT_DIR$/guns-core" charset="UTF-8" />
    <file url="file://$PROJECT_DIR$/guns-generator" charset="UTF-8" />
  </component>
</project>

 driver/.idea/jarRepositories.xml

File was deleted

 driver/.idea/misc.xml

@@ -8,5 +8,7 @@
      </list>
    </option>
  </component>
  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" default="true" project-jdk-name="1.8" project-jdk-type="JavaSDK" />
  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" project-jdk-name="1.8" project-jdk-type="JavaSDK">
    <output url="file://$PROJECT_DIR$/out" />
  </component>
</project>

 driver/.idea/workspace.xml

@@ -1,90 +1,247 @@
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
  <component name="AutoImportSettings">
    <option name="autoReloadType" value="SELECTIVE" />
  </component>
  <component name="ChangeListManager">
    <list default="true" id="506548b6-c147-4883-9af0-e22c50455488" name="更改" comment="">
      <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" />
    <list default="true" id="f79ed7d7-f686-4837-bcbf-6cc02bfa366f" name="Default Changelist" comment="Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/QYTDriving&#10;&#10;# Conflicts:&#10;#&#9;user/guns-admin/src/main/java/com/supersavedriving/user/modular/system/service/impl/OrderServiceImpl.java&#10;#&#9;user/guns-admin/src/main/java/com/supersavedriving/user/modular/system/util/RedisUtil.java">
      <change afterPath="$PROJECT_DIR$/../user/guns-admin/src/main/java/com/supersavedriving/user/config/RedissonConfig.java" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/.idea/compiler.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/compiler.xml" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/.idea/encodings.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/encodings.xml" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/.idea/jarRepositories.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/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.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/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$/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/service/impl/OrderServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/service/impl/OrderServiceImpl.java" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/warpper/DriverInfoWarpper.java" beforeDir="false" afterPath="$PROJECT_DIR$/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/warpper/DriverInfoWarpper.java" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/guns-admin/src/main/resources/application-dev.yml" beforeDir="false" afterPath="$PROJECT_DIR$/guns-admin/src/main/resources/application-dev.yml" 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/encodings.xml" beforeDir="false" afterPath="$PROJECT_DIR$/../user/.idea/encodings.xml" afterDir="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/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/pom.xml" beforeDir="false" afterPath="$PROJECT_DIR$/../user/guns-admin/pom.xml" 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" />
      <change beforePath="$PROJECT_DIR$/../user/guns-admin/src/main/java/com/supersavedriving/user/modular/system/util/RedisUtil.java" beforeDir="false" afterPath="$PROJECT_DIR$/../user/guns-admin/src/main/java/com/supersavedriving/user/modular/system/util/RedisUtil.java" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/../user/guns-admin/src/main/resources/application-dev.yml" beforeDir="false" afterPath="$PROJECT_DIR$/../user/guns-admin/src/main/resources/application-dev.yml" afterDir="false" />
    </list>
    <ignored path="$PROJECT_DIR$/target/" />
    <ignored path="$PROJECT_DIR$/guns-core/target/" />
    <ignored path="$PROJECT_DIR$/guns-admin/target/" />
    <ignored path="$PROJECT_DIR$/guns-generator/target/" />
    <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
    <option name="SHOW_DIALOG" value="false" />
    <option name="HIGHLIGHT_CONFLICTS" value="true" />
    <option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" />
    <option name="LAST_RESOLUTION" value="IGNORE" />
  </component>
  <component name="FUSProjectUsageTrigger">
    <session id="524099957">
      <usages-collector id="statistics.lifecycle.project">
        <counts>
          <entry key="project.open.time.3" value="1" />
          <entry key="project.opened" value="1" />
        </counts>
      </usages-collector>
      <usages-collector id="statistics.file.extensions.open">
        <counts>
          <entry key="java" value="28" />
          <entry key="yml" value="2" />
        </counts>
      </usages-collector>
      <usages-collector id="statistics.file.types.open">
        <counts>
          <entry key="JAVA" value="28" />
          <entry key="YAML" value="2" />
        </counts>
      </usages-collector>
      <usages-collector id="statistics.file.extensions.edit">
        <counts>
          <entry key="java" value="172" />
          <entry key="txt" value="7" />
          <entry key="yml" value="32" />
        </counts>
      </usages-collector>
      <usages-collector id="statistics.file.types.edit">
        <counts>
          <entry key="JAVA" value="172" />
          <entry key="PLAIN_TEXT" value="7" />
          <entry key="YAML" value="32" />
        </counts>
      </usages-collector>
    </session>
  </component>
  <component name="FileEditorManager">
    <leaf>
      <file pinned="false" current-in-tab="false">
        <entry file="file://$PROJECT_DIR$/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/api/DriverController.java">
          <provider selected="true" editor-type-id="text-editor">
            <state relative-caret-position="398">
              <caret line="490" column="64" selection-start-line="490" selection-start-column="64" selection-end-line="490" selection-end-column="64" />
            </state>
          </provider>
        </entry>
      </file>
      <file pinned="false" current-in-tab="false">
        <entry file="file://$PROJECT_DIR$/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/service/IDriverService.java">
          <provider selected="true" editor-type-id="text-editor">
            <state relative-caret-position="215">
              <caret line="105" column="22" selection-start-line="105" selection-start-column="22" selection-end-line="105" selection-end-column="22" />
            </state>
          </provider>
        </entry>
      </file>
      <file pinned="false" current-in-tab="true">
        <entry file="file://$PROJECT_DIR$/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/service/impl/DriverServiceImpl.java">
          <provider selected="true" editor-type-id="text-editor">
            <state relative-caret-position="390">
              <caret line="800" column="42" selection-start-line="800" selection-start-column="42" selection-end-line="800" selection-end-column="42" />
            </state>
          </provider>
        </entry>
      </file>
      <file pinned="false" current-in-tab="false">
        <entry file="file://$PROJECT_DIR$/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/warpper/DriverInfoWarpper.java">
          <provider selected="true" editor-type-id="text-editor">
            <state relative-caret-position="162">
              <caret line="23" column="29" selection-start-line="23" selection-start-column="29" selection-end-line="23" selection-end-column="29" />
            </state>
          </provider>
        </entry>
      </file>
    </leaf>
  </component>
  <component name="FindInProjectRecents">
    <findStrings>
      <find>位置</find>
      <find>daijia_DRIVER</find>
      <find>大厅</find>
      <find>优推</find>
      <find>详情</find>
    </findStrings>
    <replaceStrings>
      <replace>daijia:DRIVER</replace>
    </replaceStrings>
    <dirStrings>
      <dir>E:\IDEA Workspaces\QYTDriving\driver</dir>
      <dir>E:\IDEA Workspaces\QYTDriving\driver\guns-admin\src\main\java\com\supersavedriving\driver\modular\system\api</dir>
      <dir>E:\IDEA Workspaces\QYTDriving\driver\guns-admin\src\main\java\com\supersavedriving\driver</dir>
    </dirStrings>
  </component>
  <component name="Git.Settings">
    <option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$/.." />
  </component>
  <component name="MarkdownSettingsMigration">
    <option name="stateVersion" value="1" />
  <component name="IdeDocumentHistory">
    <option name="CHANGED_PATHS">
      <list>
        <option value="$PROJECT_DIR$/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/util/PushUtil.java" />
        <option value="$PROJECT_DIR$/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/util/TaskUtil.java" />
        <option value="$PROJECT_DIR$/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/service/impl/AgentServiceImpl.java" />
        <option value="$PROJECT_DIR$/guns-admin/src/main/resources/application-dev.yml" />
        <option value="$PROJECT_DIR$/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/service/impl/OrderServiceImpl.java" />
        <option value="$PROJECT_DIR$/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/warpper/DriverInfoWarpper.java" />
        <option value="$PROJECT_DIR$/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/service/impl/DriverServiceImpl.java" />
      </list>
    </option>
  </component>
  <component name="ProjectColorInfo">{
  &quot;associatedIndex&quot;: 0
}</component>
  <component name="ProjectId" id="2ya10OJhowlKjAmXiEZ3h9kc7v5" />
  <component name="JsBuildToolGruntFileManager" detection-done="true" sorting="DEFINITION_ORDER" />
  <component name="JsBuildToolPackageJson" detection-done="true" sorting="DEFINITION_ORDER" />
  <component name="JsGulpfileManager">
    <detection-done>true</detection-done>
    <sorting>DEFINITION_ORDER</sorting>
  </component>
  <component name="MavenImportPreferences">
    <option name="generalSettings">
      <MavenGeneralSettings>
        <option name="localRepository" value="E:\apache-maven\repository" />
        <option name="mavenHome" value="$APPLICATION_HOME_DIR$/plugins/maven/lib/maven3" />
        <option name="userSettingsFile" value="E:\apache-maven\apache-maven-3.6.1\conf\settings.xml" />
      </MavenGeneralSettings>
    </option>
  </component>
  <component name="MavenProjectNavigator">
    <treeState>
      <expand>
        <path>
          <item name="" type="16c1761:MavenProjectsStructure$RootNode" />
          <item name="Profiles" type="6783ec58:MavenProjectsStructure$ProfilesNode" />
        </path>
      </expand>
      <select />
    </treeState>
  </component>
  <component name="ProjectFrameBounds">
    <option name="x" value="-7" />
    <option name="y" value="1" />
    <option name="width" value="1932" />
    <option name="height" value="1046" />
  </component>
  <component name="ProjectLevelVcsManager" settingsEditedManually="true" />
  <component name="ProjectViewState">
    <option name="hideEmptyMiddlePackages" value="true" />
    <option name="showLibraryContents" value="true" />
    <option name="showVisibilityIcons" value="true" />
  <component name="ProjectView">
    <navigator proportions="" version="1">
      <foldersAlwaysOnTop value="true" />
    </navigator>
    <panes>
      <pane id="ProjectPane">
        <subPane>
          <expand>
            <path>
              <item name="driver" type="b2602c69:ProjectViewProjectNode" />
              <item name="driver" type="462c0819:PsiDirectoryNode" />
            </path>
            <path>
              <item name="driver" type="b2602c69:ProjectViewProjectNode" />
              <item name="driver" type="462c0819:PsiDirectoryNode" />
              <item name="guns-admin" type="462c0819:PsiDirectoryNode" />
            </path>
            <path>
              <item name="driver" type="b2602c69:ProjectViewProjectNode" />
              <item name="driver" type="462c0819:PsiDirectoryNode" />
              <item name="guns-admin" type="462c0819:PsiDirectoryNode" />
              <item name="src" type="462c0819:PsiDirectoryNode" />
            </path>
            <path>
              <item name="driver" type="b2602c69:ProjectViewProjectNode" />
              <item name="driver" type="462c0819:PsiDirectoryNode" />
              <item name="guns-admin" type="462c0819:PsiDirectoryNode" />
              <item name="src" type="462c0819:PsiDirectoryNode" />
              <item name="main" type="462c0819:PsiDirectoryNode" />
            </path>
          </expand>
          <select />
        </subPane>
      </pane>
      <pane id="Scope" />
      <pane id="AndroidView" />
      <pane id="PackagesPane" />
    </panes>
  </component>
  <component name="PropertiesComponent">{
  &quot;keyToString&quot;: {
    &quot;ASKED_ADD_EXTERNAL_FILES&quot;: &quot;true&quot;,
    &quot;Maven.guns-parent [package].executor&quot;: &quot;Run&quot;,
    &quot;RequestMappingsPanelOrder0&quot;: &quot;0&quot;,
    &quot;RequestMappingsPanelOrder1&quot;: &quot;1&quot;,
    &quot;RequestMappingsPanelWidth0&quot;: &quot;75&quot;,
    &quot;RequestMappingsPanelWidth1&quot;: &quot;75&quot;,
    &quot;RunOnceActivity.OpenProjectViewOnStart&quot;: &quot;true&quot;,
    &quot;RunOnceActivity.ShowReadmeOnStart&quot;: &quot;true&quot;,
    &quot;SHARE_PROJECT_CONFIGURATION_FILES&quot;: &quot;true&quot;,
    &quot;Spring Boot.GunsApplication.executor&quot;: &quot;Debug&quot;,
    &quot;WebServerToolWindowFactoryState&quot;: &quot;false&quot;,
    &quot;git-widget-placeholder&quot;: &quot;master&quot;,
    &quot;kotlin-language-version-configured&quot;: &quot;true&quot;,
    &quot;last_opened_file_path&quot;: &quot;F:/code/QYTDriving/driver&quot;,
    &quot;node.js.detected.package.eslint&quot;: &quot;true&quot;,
    &quot;node.js.detected.package.tslint&quot;: &quot;true&quot;,
    &quot;node.js.selected.package.eslint&quot;: &quot;(autodetect)&quot;,
    &quot;node.js.selected.package.tslint&quot;: &quot;(autodetect)&quot;,
    &quot;nodejs_package_manager_path&quot;: &quot;npm&quot;,
    &quot;project.structure.last.edited&quot;: &quot;项目&quot;,
    &quot;project.structure.proportion&quot;: &quot;0.0&quot;,
    &quot;project.structure.side.proportion&quot;: &quot;0.0&quot;,
    &quot;settings.editor.selected.configurable&quot;: &quot;MavenSettings&quot;,
    &quot;vue.rearranger.settings.migration&quot;: &quot;true&quot;
  }
}</component>
  <component name="ReactorSettings">
    <option name="notificationShown" value="true" />
  <component name="PropertiesComponent">
    <property name="RequestMappingsPanelOrder0" value="0" />
    <property name="RequestMappingsPanelOrder1" value="1" />
    <property name="RequestMappingsPanelWidth0" value="75" />
    <property name="RequestMappingsPanelWidth1" value="75" />
    <property name="WebServerToolWindowFactoryState" value="false" />
    <property name="aspect.path.notification.shown" value="true" />
    <property name="com.android.tools.idea.instantapp.provision.ProvisionBeforeRunTaskProvider.myTimeStamp" value="1755599403253" />
    <property name="last_opened_file_path" value="$PROJECT_DIR$/../../QianYunTong/UserQYTTravel" />
    <property name="nodejs_interpreter_path.stuck_in_default_project" value="undefined stuck path" />
    <property name="nodejs_npm_path_reset_for_default_project" value="true" />
    <property name="project.structure.last.edited" value="Project" />
    <property name="project.structure.proportion" value="0.0" />
    <property name="project.structure.side.proportion" value="0.0" />
    <property name="settings.editor.selected.configurable" value="MavenSettings" />
  </component>
  <component name="RunDashboard">
    <option name="ruleStates">
      <list>
        <RuleState>
          <option name="name" value="ConfigurationTypeDashboardGroupingRule" />
        </RuleState>
        <RuleState>
          <option name="name" value="StatusDashboardGroupingRule" />
        </RuleState>
      </list>
    </option>
  </component>
  <component name="RunManager">
    <configuration name="GunsApplication" type="SpringBootApplicationConfigurationType" factoryName="Spring Boot" nameIsGenerated="true">
    <configuration name="GunsApplication" type="SpringBootApplicationConfigurationType" factoryName="Spring Boot">
      <module name="driver" />
      <option name="SPRING_BOOT_MAIN_CLASS" value="com.supersavedriving.driver.GunsApplication" />
      <method v="2">
@@ -92,42 +249,324 @@
      </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 name="SvnConfiguration">
    <configuration />
  </component>
  <component name="SpellCheckerSettings" RuntimeDictionaries="0" Folders="0" CustomDictionaries="0" DefaultDictionary="应用程序级" UseSingleDictionary="true" transferred="true" />
  <component name="TaskManager">
    <task active="true" id="Default" summary="默认任务">
      <changelist id="506548b6-c147-4883-9af0-e22c50455488" name="更改" comment="" />
      <created>1750057650671</created>
    <task active="true" id="Default" summary="Default task">
      <changelist id="f79ed7d7-f686-4837-bcbf-6cc02bfa366f" name="Default Changelist" comment="" />
      <created>1755484104324</created>
      <option name="number" value="Default" />
      <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" />
      <updated>1755484104324</updated>
      <workItem from="1755484107026" duration="12785000" />
    </task>
    <task id="LOCAL-00001" summary="合并代码">
      <created>1755574064887</created>
      <option name="number" value="00001" />
      <option name="presentableId" value="LOCAL-00001" />
      <option name="project" value="LOCAL" />
      <updated>1755574064887</updated>
    </task>
    <task id="LOCAL-00002" summary="合并代码">
      <created>1755594108574</created>
      <option name="number" value="00002" />
      <option name="presentableId" value="LOCAL-00002" />
      <option name="project" value="LOCAL" />
      <updated>1755594108574</updated>
    </task>
    <option name="localTasksCounter" value="3" />
    <servers />
  </component>
  <component name="TypeScriptGeneratedFilesManager">
    <option name="version" value="3" />
  <component name="TimeTrackingManager">
    <option name="totallyTimeSpent" value="12785000" />
  </component>
  <component name="Vcs.Log.Tabs.Properties">
    <option name="TAB_STATES">
      <map>
        <entry key="MAIN">
          <value>
            <State />
          </value>
  <component name="ToolWindowManager">
    <frame x="-7" y="1" width="1932" height="1046" extended-state="0" />
    <layout>
      <window_info id="Designer" />
      <window_info id="Image Layers" />
      <window_info id="UI Designer" />
      <window_info id="Favorites" side_tool="true" />
      <window_info id="Capture Tool" />
      <window_info id="Web" side_tool="true" />
      <window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.25" />
      <window_info id="Structure" order="1" side_tool="true" weight="0.25" />
      <window_info anchor="bottom" id="Spring" />
      <window_info anchor="bottom" id="Terminal" />
      <window_info anchor="bottom" id="Event Log" sideWeight="0.5005342" side_tool="true" weight="0.1679473" />
      <window_info anchor="bottom" id="Statistic" />
      <window_info anchor="bottom" id="Java Enterprise" />
      <window_info anchor="bottom" id="Database Changes" show_stripe_button="false" />
      <window_info anchor="bottom" id="Version Control" weight="0.118551046" />
      <window_info anchor="bottom" id="Messages" visible="true" weight="0.32930845" />
      <window_info anchor="bottom" id="Message" order="0" />
      <window_info anchor="bottom" id="Find" order="1" />
      <window_info anchor="bottom" id="Run" order="2" />
      <window_info anchor="bottom" id="Debug" order="3" sideWeight="0.49946582" weight="0.2107574" />
      <window_info anchor="bottom" id="Cvs" order="4" weight="0.25" />
      <window_info anchor="bottom" id="Inspection" order="5" weight="0.4" />
      <window_info anchor="bottom" id="TODO" order="6" />
      <window_info anchor="right" id="Palette" />
      <window_info anchor="right" id="Capture Analysis" />
      <window_info anchor="right" id="Maven Projects" weight="0.32959402" />
      <window_info anchor="right" id="Database" />
      <window_info anchor="right" id="Palette&#9;" />
      <window_info anchor="right" id="Theme Preview" />
      <window_info anchor="right" id="Bean Validation" />
      <window_info anchor="right" id="Commander" internal_type="SLIDING" order="0" type="SLIDING" weight="0.4" />
      <window_info anchor="right" id="Ant Build" order="1" weight="0.25" />
      <window_info anchor="right" content_ui="combo" id="Hierarchy" order="2" weight="0.25" />
    </layout>
  </component>
  <component name="TypeScriptGeneratedFilesManager">
    <option name="version" value="1" />
  </component>
  <component name="VcsContentAnnotationSettings">
    <option name="myLimit" value="2678400000" />
  </component>
  <component name="VcsManagerConfiguration">
    <MESSAGE value="合并代码" />
    <MESSAGE value="Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/QYTDriving&#10;&#10;# Conflicts:&#10;#&#9;user/guns-admin/src/main/java/com/supersavedriving/user/modular/system/service/impl/OrderServiceImpl.java&#10;#&#9;user/guns-admin/src/main/java/com/supersavedriving/user/modular/system/util/RedisUtil.java" />
    <option name="LAST_COMMIT_MESSAGE" value="Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/QYTDriving&#10;&#10;# Conflicts:&#10;#&#9;user/guns-admin/src/main/java/com/supersavedriving/user/modular/system/service/impl/OrderServiceImpl.java&#10;#&#9;user/guns-admin/src/main/java/com/supersavedriving/user/modular/system/util/RedisUtil.java" />
  </component>
  <component name="editorHistoryManager">
    <entry file="file://$PROJECT_DIR$/guns-admin/src/main/resources/application.yml">
      <provider selected="true" editor-type-id="text-editor" />
        </entry>
      </map>
    <entry file="file://$PROJECT_DIR$/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/util/PushUtil.java">
      <provider selected="true" editor-type-id="text-editor">
        <state relative-caret-position="150">
          <caret line="42" column="34" lean-forward="true" selection-start-line="42" selection-start-column="34" selection-end-line="42" selection-end-column="34" />
        </state>
      </provider>
    </entry>
    <entry file="file://$PROJECT_DIR$/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/service/impl/DriverWorkServiceImpl.java">
      <provider selected="true" editor-type-id="text-editor">
        <state relative-caret-position="60">
          <caret line="135" selection-start-line="135" selection-end-line="135" />
        </state>
      </provider>
    </entry>
    <entry file="file://$PROJECT_DIR$/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/util/TaskUtil.java">
      <provider selected="true" editor-type-id="text-editor">
        <state relative-caret-position="395">
          <caret line="57" column="9" lean-forward="true" selection-start-line="52" selection-start-column="22" selection-end-line="52" selection-end-column="32" />
        </state>
      </provider>
    </entry>
    <entry file="file://$PROJECT_DIR$/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/service/IAgentService.java">
      <provider selected="true" editor-type-id="text-editor">
        <state relative-caret-position="375">
          <caret line="19" column="26" selection-start-line="19" selection-start-column="26" selection-end-line="19" selection-end-column="26" />
        </state>
      </provider>
    </entry>
    <entry file="file://$PROJECT_DIR$/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/model/TBranchOfficeArea.java">
      <provider selected="true" editor-type-id="text-editor">
        <state relative-caret-position="550">
          <caret line="32" column="34" selection-start-line="32" selection-start-column="20" selection-end-line="32" selection-end-column="34" />
        </state>
      </provider>
    </entry>
    <entry file="file://$PROJECT_DIR$/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/service/IBranchOfficeService.java">
      <provider selected="true" editor-type-id="text-editor">
        <state relative-caret-position="225">
          <caret line="13" column="37" selection-start-line="13" selection-start-column="17" selection-end-line="13" selection-end-column="37" />
        </state>
      </provider>
    </entry>
    <entry file="file://$PROJECT_DIR$/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/service/impl/AgentServiceImpl.java">
      <provider selected="true" editor-type-id="text-editor">
        <state relative-caret-position="250">
          <caret line="89" column="16" lean-forward="true" selection-start-line="89" selection-start-column="16" selection-end-line="89" selection-end-column="16" />
        </state>
      </provider>
    </entry>
    <entry file="file://$PROJECT_DIR$/guns-admin/src/main/resources/application-dev.yml">
      <provider selected="true" editor-type-id="text-editor">
        <state relative-caret-position="200">
          <caret line="44" column="60" selection-start-line="44" selection-start-column="60" selection-end-line="44" selection-end-column="60" />
        </state>
      </provider>
    </entry>
    <entry file="file://$PROJECT_DIR$/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/api/YouTuiController.java">
      <provider selected="true" editor-type-id="text-editor">
        <state relative-caret-position="217">
          <caret line="50" column="31" selection-start-line="50" selection-start-column="31" selection-end-line="50" selection-end-column="31" />
        </state>
      </provider>
    </entry>
    <entry file="file://$PROJECT_DIR$/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/warpper/DriverYouTuiWarpper.java">
      <provider selected="true" editor-type-id="text-editor">
        <state relative-caret-position="109">
          <caret line="8" column="24" lean-forward="true" selection-start-line="8" selection-start-column="24" selection-end-line="8" selection-end-column="24" />
        </state>
      </provider>
    </entry>
    <entry file="file://$PROJECT_DIR$/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/api/OrderController.java">
      <provider selected="true" editor-type-id="text-editor">
        <state relative-caret-position="362">
          <caret line="250" column="71" selection-start-line="250" selection-start-column="71" selection-end-line="250" selection-end-column="71" />
        </state>
      </provider>
    </entry>
    <entry file="file://$PROJECT_DIR$/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/service/IOrderService.java">
      <provider selected="true" editor-type-id="text-editor">
        <state relative-caret-position="223">
          <caret line="95" column="21" selection-start-line="95" selection-start-column="21" selection-end-line="95" selection-end-column="21" />
        </state>
      </provider>
    </entry>
    <entry file="file://$PROJECT_DIR$/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/warpper/OrderInfoWarpper.java">
      <provider selected="true" editor-type-id="text-editor">
        <state relative-caret-position="223">
          <caret line="30" column="20" selection-start-line="30" selection-start-column="20" selection-end-line="30" selection-end-column="20" />
        </state>
      </provider>
    </entry>
    <entry file="file://$PROJECT_DIR$/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/util/GeodesyUtil.java">
      <provider selected="true" editor-type-id="text-editor">
        <state relative-caret-position="231">
          <caret line="23" column="38" selection-start-line="23" selection-start-column="38" selection-end-line="23" selection-end-column="38" />
        </state>
      </provider>
    </entry>
    <entry file="file://$PROJECT_DIR$/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/util/GaoDe/MapUtil.java">
      <provider selected="true" editor-type-id="text-editor">
        <state relative-caret-position="425">
          <caret line="35" column="43" selection-start-line="35" selection-start-column="43" selection-end-line="35" selection-end-column="43" />
        </state>
      </provider>
    </entry>
    <entry file="file://$PROJECT_DIR$/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/model/Order.java">
      <provider selected="true" editor-type-id="text-editor">
        <state relative-caret-position="223">
          <caret line="214" column="20" selection-start-line="214" selection-start-column="20" selection-end-line="214" selection-end-column="20" />
        </state>
      </provider>
    </entry>
    <entry file="file://$PROJECT_DIR$/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/service/impl/OrderServiceImpl.java">
      <provider selected="true" editor-type-id="text-editor">
        <state relative-caret-position="369">
          <caret line="1011" lean-forward="true" selection-start-line="1011" selection-end-line="1011" />
        </state>
      </provider>
    </entry>
    <entry file="file://$PROJECT_DIR$/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/api/DriverController.java">
      <provider selected="true" editor-type-id="text-editor">
        <state relative-caret-position="398">
          <caret line="490" column="64" selection-start-line="490" selection-start-column="64" selection-end-line="490" selection-end-column="64" />
        </state>
      </provider>
    </entry>
    <entry file="file://$PROJECT_DIR$/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/service/IDriverService.java">
      <provider selected="true" editor-type-id="text-editor">
        <state relative-caret-position="215">
          <caret line="105" column="22" selection-start-line="105" selection-start-column="22" selection-end-line="105" selection-end-column="22" />
        </state>
      </provider>
    </entry>
    <entry file="file://$PROJECT_DIR$/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/warpper/DriverInfoWarpper.java">
      <provider selected="true" editor-type-id="text-editor">
        <state relative-caret-position="162">
          <caret line="23" column="29" selection-start-line="23" selection-start-column="29" selection-end-line="23" selection-end-column="29" />
        </state>
      </provider>
    </entry>
    <entry file="file://$PROJECT_DIR$/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/service/impl/DriverServiceImpl.java">
      <provider selected="true" editor-type-id="text-editor">
        <state relative-caret-position="390">
          <caret line="800" column="42" selection-start-line="800" selection-start-column="42" selection-end-line="800" selection-end-column="42" />
        </state>
      </provider>
    </entry>
  </component>
  <component name="masterDetails">
    <states>
      <state key="ArtifactsStructureConfigurable.UI">
        <settings>
          <artifact-editor />
          <splitter-proportions>
            <option name="proportions">
              <list>
                <option value="0.2" />
              </list>
    </option>
          </splitter-proportions>
        </settings>
      </state>
      <state key="FacetStructureConfigurable.UI">
        <settings>
          <last-edited>No facets are configured</last-edited>
          <splitter-proportions>
            <option name="proportions">
              <list>
                <option value="0.2" />
              </list>
            </option>
          </splitter-proportions>
        </settings>
      </state>
      <state key="GlobalLibrariesConfigurable.UI">
        <settings>
          <splitter-proportions>
            <option name="proportions">
              <list>
                <option value="0.2" />
              </list>
            </option>
          </splitter-proportions>
        </settings>
      </state>
      <state key="JdkListConfigurable.UI">
        <settings>
          <last-edited>1.8</last-edited>
          <splitter-proportions>
            <option name="proportions">
              <list>
                <option value="0.2" />
              </list>
            </option>
          </splitter-proportions>
        </settings>
      </state>
      <state key="ModuleStructureConfigurable.UI">
        <settings>
          <last-edited>driver</last-edited>
          <splitter-proportions>
            <option name="proportions">
              <list>
                <option value="0.2" />
                <option value="0.6" />
              </list>
            </option>
          </splitter-proportions>
        </settings>
      </state>
      <state key="ProjectJDKs.UI">
        <settings>
          <last-edited>1.8</last-edited>
          <splitter-proportions>
            <option name="proportions">
              <list>
                <option value="0.2" />
              </list>
            </option>
          </splitter-proportions>
        </settings>
      </state>
      <state key="ProjectLibrariesConfigurable.UI">
        <settings>
          <splitter-proportions>
            <option name="proportions">
              <list>
                <option value="0.2" />
              </list>
            </option>
          </splitter-proportions>
        </settings>
      </state>
    </states>
  </component>
</project>

 driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/service/impl/DriverServiceImpl.java

@@ -797,6 +797,8 @@
                .eq("state", 2).last(" and failureTime > now() order by failureTime limit 0, 1"));
        if(null != youTuiDriver){
            driverInfo.setYouTuiEnd(youTuiDriver.getType() == 1 ? youTuiDriver.getFailureTime().getTime() : youTuiDriver.getEndTime().getTime());
            driverInfo.setType(youTuiDriver.getType());
            driverInfo.setSurplusQuantity(youTuiDriver.getSurplusQuantity());
        }
        List<Integer> state = Arrays.asList(107, 108, 109);
        int count = orderService.selectCount(new EntityWrapper<Order>().eq("driverId", uid).eq("status", 1).in("state", state).last(" and DATE_FORMAT(createTime, '%Y-%m-%d') = DATE_FORMAT(now(), '%Y-%m-%d')"));

 driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/service/impl/OrderServiceImpl.java

@@ -999,6 +999,17 @@
            Map<String, String> distance1 = MapUtil.getDistance(orderInfoWarpper.getStartLng() + "," + orderInfoWarpper.getStartLat(), value, 0);
            orderInfoWarpper.setPickUpTime(Integer.valueOf(distance1.get("duration")) / 60);
        }

        Map<String, String> distance = MapUtil.getDistance(order.getStartLng() + "," + order.getStartLat(), order.getEndLng() + "," + order.getEndLat(), 1);
        if(null != distance){
            Double d = Double.valueOf(distance.get("distance")) / 1000;
            orderInfoWarpper.setEstimatedMileage(d);
            orderInfoWarpper.setEstimatedTime(Double.valueOf(Integer.valueOf(distance.get("duration")) / 60));
            Driver driver = driverService.selectById(uid);
            Order orderPrice = getOrderPrice(1, d, 0, order, "", driver.getBranchOfficeId());
            orderInfoWarpper.setEstimatedPrice(orderPrice.getEstimatedPrice());
        }

        orderInfoWarpper.setDriverId(order.getDriverId());
        return orderInfoWarpper;
    }

 driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/warpper/DriverInfoWarpper.java

@@ -19,6 +19,10 @@
    private String name;
    @ApiModelProperty("电话")
    private String phone;
    @ApiModelProperty("优推类型（1=次数，2=小时）")
    private Integer type;
    @ApiModelProperty("优推剩余数量")
    private Integer surplusQuantity;
    @ApiModelProperty("优推结束时间")
    private Long youTuiEnd;
    @ApiModelProperty("账户余额")

 driver/guns-admin/src/main/resources/application-dev.yml

@@ -42,7 +42,7 @@
eureka:
  client:
    service-url: #注册中心地址
      defaultZone: http://sinata:sinata@127.0.0.1:8000/eureka #启用身份验证的方式连接
      defaultZone: http://sinata:sinata@192.168.110.106:8001/eureka #启用身份验证的方式连接
    register-with-eureka: true #在注册中心进行注册
    fetch-registry: true #从Eureka中获取注册信息。


 user/.idea/compiler.xml

@@ -2,20 +2,22 @@
<project version="4">
  <component name="CompilerConfiguration">
    <annotationProcessing>
      <profile default="true" name="Default" enabled="true" />
      <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="guns-core" />
        <module name="user (1)" />
        <module name="guns-generator" />
        <module name="user" />
        <module name="user (1)" />
      </profile>
    </annotationProcessing>
  </component>
  <component name="JavacSettings">
    <option name="ADDITIONAL_OPTIONS_OVERRIDE">
      <module name="guns-core" options="-parameters" />
      <module name="guns-generator" options="-parameters" />
      <module name="guns-core" options="" />
      <module name="guns-generator" options="" />
      <module name="user (1)" options="-parameters" />
    </option>
  </component>

 user/.idea/encodings.xml

@@ -1,9 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
  <component name="Encoding">
    <file url="file://$PROJECT_DIR$" charset="UTF-8" />
    <file url="file://$PROJECT_DIR$/guns-admin" charset="UTF-8" />
    <file url="file://$PROJECT_DIR$/guns-admin/src/main/java" charset="UTF-8" />
    <file url="file://$PROJECT_DIR$/guns-core" charset="UTF-8" />
    <file url="file://$PROJECT_DIR$/guns-core/src/main/java" charset="UTF-8" />
    <file url="file://$PROJECT_DIR$/guns-generator" 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>

 user/.idea/misc.xml

@@ -8,5 +8,5 @@
      </list>
    </option>
  </component>
  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" default="true" project-jdk-name="1.8" project-jdk-type="JavaSDK" />
  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" default="false" project-jdk-name="1.8" project-jdk-type="JavaSDK" />
</project>

 user/.idea/workspace.xml

@@ -5,10 +5,78 @@
  </component>
  <component name="ChangeListManager">
    <list default="true" id="f6083dcb-4b64-4a81-a257-1a03840052c4" name="更改" comment="" />
    <ignored path="$PROJECT_DIR$/guns-admin/target/" />
    <ignored path="$PROJECT_DIR$/guns-core/target/" />
    <ignored path="$PROJECT_DIR$/target/" />
    <ignored path="$PROJECT_DIR$/guns-generator/target/" />
    <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
    <option name="SHOW_DIALOG" value="false" />
    <option name="HIGHLIGHT_CONFLICTS" value="true" />
    <option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" />
    <option name="LAST_RESOLUTION" value="IGNORE" />
  </component>
  <component name="FUSProjectUsageTrigger">
    <session id="107517654">
      <usages-collector id="statistics.lifecycle.project">
        <counts>
          <entry key="project.open.time.0" value="1" />
          <entry key="project.opened" value="1" />
        </counts>
      </usages-collector>
      <usages-collector id="statistics.file.extensions.open">
        <counts>
          <entry key="java" value="22" />
          <entry key="xml" value="1" />
          <entry key="yml" value="3" />
        </counts>
      </usages-collector>
      <usages-collector id="statistics.file.types.open">
        <counts>
          <entry key="JAVA" value="22" />
          <entry key="XML" value="1" />
          <entry key="YAML" value="3" />
        </counts>
      </usages-collector>
      <usages-collector id="statistics.file.extensions.edit">
        <counts>
          <entry key="java" value="61" />
          <entry key="yml" value="2" />
        </counts>
      </usages-collector>
      <usages-collector id="statistics.file.types.edit">
        <counts>
          <entry key="JAVA" value="61" />
          <entry key="YAML" value="2" />
        </counts>
      </usages-collector>
    </session>
  </component>
  <component name="FileEditorManager">
    <leaf>
      <file pinned="false" current-in-tab="true">
        <entry file="file://$PROJECT_DIR$/guns-admin/src/main/java/com/supersavedriving/user/modular/system/service/impl/OrderServiceImpl.java">
          <provider selected="true" editor-type-id="text-editor">
            <state relative-caret-position="328">
              <caret line="580" column="37" lean-forward="true" selection-start-line="580" selection-start-column="37" selection-end-line="580" selection-end-column="37" />
              <folding>
                <element signature="imports" expanded="true" />
                <element signature="e#33785#35562#0" expanded="true" />
                <element signature="e#35561#35562#0" expanded="true" />
              </folding>
            </state>
          </provider>
        </entry>
      </file>
      <file pinned="false" current-in-tab="false">
        <entry file="file://$PROJECT_DIR$/guns-admin/src/main/java/com/supersavedriving/user/modular/system/util/PushUtil.java">
          <provider selected="true" editor-type-id="text-editor">
            <state relative-caret-position="324">
              <caret line="36" column="13" lean-forward="true" selection-start-line="36" selection-start-column="13" selection-end-line="36" selection-end-column="13" />
            </state>
          </provider>
        </entry>
      </file>
    </leaf>
  </component>
  <component name="FileTemplateManagerImpl">
    <option name="RECENT_TEMPLATES">
@@ -17,8 +85,43 @@
      </list>
    </option>
  </component>
  <component name="FindInProjectRecents">
    <findStrings>
      <find>附</find>
      <find>附近</find>
      <find>daijia_DRIVER</find>
      <find>redis</find>
      <find>travelOrder</find>
    </findStrings>
    <replaceStrings>
      <replace />
    </replaceStrings>
    <dirStrings>
      <dir>E:\IDEA Workspaces\QYTDriving\user\guns-admin\src\main\java\com\supersavedriving\user\modular\api</dir>
      <dir>E:\IDEA Workspaces\QYTDriving\user</dir>
    </dirStrings>
  </component>
  <component name="Git.Settings">
    <option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$/.." />
  </component>
  <component name="IdeDocumentHistory">
    <option name="CHANGED_PATHS">
      <list>
        <option value="$PROJECT_DIR$/guns-admin/src/main/java/com/supersavedriving/user/modular/system/util/AppUserUtil.java" />
        <option value="$PROJECT_DIR$/guns-admin/src/main/resources/application-dev.yml" />
        <option value="$PROJECT_DIR$/guns-admin/src/main/java/com/supersavedriving/user/modular/api/AppUserController.java" />
        <option value="$PROJECT_DIR$/guns-admin/src/main/java/com/supersavedriving/user/modular/system/util/PushUtil.java" />
        <option value="$PROJECT_DIR$/guns-admin/src/main/java/com/supersavedriving/user/modular/system/util/RedisUtil.java" />
        <option value="$PROJECT_DIR$/guns-admin/pom.xml" />
        <option value="$PROJECT_DIR$/guns-admin/src/main/java/com/supersavedriving/user/modular/system/service/impl/OrderServiceImpl.java" />
      </list>
    </option>
  </component>
  <component name="JsBuildToolGruntFileManager" detection-done="true" sorting="DEFINITION_ORDER" />
  <component name="JsBuildToolPackageJson" detection-done="true" sorting="DEFINITION_ORDER" />
  <component name="JsGulpfileManager">
    <detection-done>true</detection-done>
    <sorting>DEFINITION_ORDER</sorting>
  </component>
  <component name="MarkdownSettingsMigration">
    <option name="stateVersion" value="1" />
@@ -26,34 +129,96 @@
  <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" />
        <option name="mavenHome" value="$APPLICATION_HOME_DIR$/plugins/maven/lib/maven3" />
        <option name="userSettingsFile" value="E:\apache-maven\apache-maven-3.6.1\conf\settings.xml" />
      </MavenGeneralSettings>
    </option>
  </component>
  <component name="MavenProjectNavigator">
    <treeState>
      <expand />
      <select />
    </treeState>
  </component>
  <component name="ProjectFrameBounds" extendedState="6">
    <option name="x" value="-7" />
    <option name="y" value="1" />
    <option name="width" value="1932" />
    <option name="height" value="1046" />
  </component>
  <component name="ProjectId" id="2ya1H5qbfvGdO7YkI4EgWWaphWc" />
  <component name="ProjectLevelVcsManager" settingsEditedManually="true" />
  <component name="ProjectView">
    <navigator proportions="" version="1">
      <foldersAlwaysOnTop value="true" />
    </navigator>
    <panes>
      <pane id="Scope" />
      <pane id="ProjectPane">
        <subPane>
          <expand>
            <path>
              <item name="user" type="b2602c69:ProjectViewProjectNode" />
              <item name="user" type="462c0819:PsiDirectoryNode" />
            </path>
            <path>
              <item name="user" type="b2602c69:ProjectViewProjectNode" />
              <item name="user" type="462c0819:PsiDirectoryNode" />
              <item name="guns-admin" type="462c0819:PsiDirectoryNode" />
            </path>
          </expand>
          <select />
        </subPane>
      </pane>
      <pane id="AndroidView" />
      <pane id="PackagesPane" />
    </panes>
  </component>
  <component name="ProjectViewState">
    <option name="hideEmptyMiddlePackages" value="true" />
    <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",
    "codeReviewSummary": "[]",
    "last_opened_file_path": "E:/IDEA Workspace/QYTDriving/user",
    "project.structure.last.edited": "项目",
    "project.structure.proportion": "0.0",
    "project.structure.side.proportion": "0.0",
    "settings.editor.selected.configurable": "project.propVCSSupport.DirectoryMappings"
  }
}]]></component>
  <component name="RunManager">
  <component name="PropertiesComponent">
    <property name="RequestMappingsPanelOrder0" value="0" />
    <property name="RequestMappingsPanelOrder1" value="1" />
    <property name="RequestMappingsPanelWidth0" value="75" />
    <property name="RequestMappingsPanelWidth1" value="75" />
    <property name="WebServerToolWindowFactoryState" value="false" />
    <property name="aspect.path.notification.shown" value="true" />
    <property name="com.android.tools.idea.instantapp.provision.ProvisionBeforeRunTaskProvider.myTimeStamp" value="1755599403301" />
    <property name="last_opened_file_path" value="$PROJECT_DIR$" />
    <property name="project.structure.last.edited" value="Project" />
    <property name="project.structure.proportion" value="0.0" />
    <property name="project.structure.side.proportion" value="0.0" />
    <property name="settings.editor.selected.configurable" value="MavenSettings" />
  </component>
  <component name="RunDashboard">
    <option name="ruleStates">
      <list>
        <RuleState>
          <option name="name" value="ConfigurationTypeDashboardGroupingRule" />
        </RuleState>
        <RuleState>
          <option name="name" value="StatusDashboardGroupingRule" />
        </RuleState>
      </list>
    </option>
  </component>
  <component name="RunManager" selected="Spring Boot.GunsApplication (1)">
    <configuration name="GunsApplication (1)" type="SpringBootApplicationConfigurationType" factoryName="Spring Boot" temporary="true" nameIsGenerated="true">
      <module name="user" />
      <extension name="coverage">
        <pattern>
          <option name="PATTERN" value="com.supersavedriving.user.*" />
          <option name="ENABLED" value="true" />
        </pattern>
      </extension>
      <option name="SPRING_BOOT_MAIN_CLASS" value="com.supersavedriving.user.GunsApplication" />
      <method v="2">
        <option name="Make" enabled="true" />
      </method>
    </configuration>
    <configuration name="GunsApplication" type="SpringBootApplicationConfigurationType" factoryName="Spring Boot">
      <module name="user (1)" />
      <option name="SPRING_BOOT_MAIN_CLASS" value="com.supersavedriving.user.GunsApplication" />
@@ -61,8 +226,20 @@
        <option name="Make" enabled="true" />
      </method>
    </configuration>
    <list>
      <item itemvalue="Spring Boot.GunsApplication" />
      <item itemvalue="Spring Boot.GunsApplication (1)" />
    </list>
    <recent_temporary>
      <list>
        <item itemvalue="Spring Boot.GunsApplication (1)" />
      </list>
    </recent_temporary>
  </component>
  <component name="SpellCheckerSettings" RuntimeDictionaries="0" Folders="0" CustomDictionaries="0" DefaultDictionary="应用程序级" UseSingleDictionary="true" transferred="true" />
  <component name="SpellCheckerSettings" BundledDictionaries="0" Folders="0" CustomDictionaries="0" Dictionaries="0" CorrectionsLimit="5" DefaultDictionary="应用程序级" UseSingleDictionary="true" />
  <component name="SvnConfiguration">
    <configuration />
  </component>
  <component name="TaskManager">
    <task active="true" id="Default" summary="默认任务">
      <changelist id="f6083dcb-4b64-4a81-a257-1a03840052c4" name="更改" comment="" />
@@ -73,26 +250,291 @@
      <workItem from="1750057789326" duration="340000" />
      <workItem from="1754292612225" duration="33000" />
      <workItem from="1754293087204" duration="5061000" />
      <workItem from="1755484267109" duration="18349000" />
    </task>
    <servers />
  </component>
  <component name="TimeTrackingManager">
    <option name="totallyTimeSpent" value="18349000" />
  </component>
  <component name="ToolWindowManager">
    <frame x="-8" y="-8" width="1936" height="1056" extended-state="6" />
    <layout>
      <window_info id="Designer" />
      <window_info id="Image Layers" />
      <window_info id="UI Designer" />
      <window_info id="Favorites" side_tool="true" />
      <window_info id="Capture Tool" />
      <window_info id="Web" side_tool="true" />
      <window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.24946696" />
      <window_info id="Structure" order="1" side_tool="true" weight="0.25" />
      <window_info anchor="bottom" id="Spring" />
      <window_info anchor="bottom" id="Terminal" />
      <window_info anchor="bottom" id="Event Log" side_tool="true" />
      <window_info anchor="bottom" id="Statistic" />
      <window_info anchor="bottom" id="Java Enterprise" />
      <window_info anchor="bottom" id="Database Changes" show_stripe_button="false" />
      <window_info anchor="bottom" id="Version Control" show_stripe_button="false" />
      <window_info anchor="bottom" id="Messages" weight="0.3286334" />
      <window_info anchor="bottom" id="Message" order="0" />
      <window_info anchor="bottom" id="Find" order="1" />
      <window_info anchor="bottom" id="Run" order="2" />
      <window_info anchor="bottom" id="Debug" order="3" visible="true" weight="0.18980478" />
      <window_info anchor="bottom" id="Cvs" order="4" weight="0.25" />
      <window_info anchor="bottom" id="Inspection" order="5" weight="0.4" />
      <window_info anchor="bottom" id="TODO" order="6" />
      <window_info anchor="right" id="Palette" />
      <window_info anchor="right" id="Capture Analysis" />
      <window_info anchor="right" id="Maven Projects" weight="0.32995737" />
      <window_info anchor="right" id="Database" />
      <window_info anchor="right" id="Palette&#9;" />
      <window_info anchor="right" id="Theme Preview" />
      <window_info anchor="right" id="Bean Validation" />
      <window_info anchor="right" id="Commander" internal_type="SLIDING" order="0" type="SLIDING" weight="0.4" />
      <window_info anchor="right" id="Ant Build" order="1" weight="0.25" />
      <window_info anchor="right" content_ui="combo" id="Hierarchy" order="2" weight="0.25" />
    </layout>
  </component>
  <component name="TypeScriptGeneratedFilesManager">
    <option name="version" value="3" />
    <option name="version" value="1" />
  </component>
  <component name="Vcs.Log.Tabs.Properties">
    <option name="TAB_STATES">
      <map>
        <entry key="MAIN">
          <value>
            <State />
            <State>
              <option name="RECENTLY_FILTERED_USER_GROUPS">
                <collection />
              </option>
              <option name="RECENTLY_FILTERED_BRANCH_GROUPS">
                <collection />
              </option>
            </State>
          </value>
        </entry>
      </map>
    </option>
  </component>
  <component name="VcsContentAnnotationSettings">
    <option name="myLimit" value="2678400000" />
  </component>
  <component name="VcsManagerConfiguration">
    <ignored-roots>
      <path value="$PROJECT_DIR$/.." />
    </ignored-roots>
  </component>
  <component name="editorHistoryManager">
    <entry file="file://$PROJECT_DIR$/guns-admin/src/main/java/com/supersavedriving/user/GunsApplication.java">
      <provider selected="true" editor-type-id="text-editor">
        <state relative-caret-position="295">
          <caret line="33" column="13" selection-start-line="33" selection-start-column="13" selection-end-line="33" selection-end-column="13" />
        </state>
      </provider>
    </entry>
    <entry file="file://$PROJECT_DIR$/guns-admin/src/main/java/com/supersavedriving/user/modular/system/util/AppUserUtil.java">
      <provider selected="true" editor-type-id="text-editor">
        <state relative-caret-position="304">
          <caret line="52" selection-start-line="52" selection-end-line="52" />
        </state>
      </provider>
    </entry>
    <entry file="file://$PROJECT_DIR$/guns-admin/src/main/java/com/supersavedriving/user/modular/system/warpper/VerificationCodeLogin.java">
      <provider selected="true" editor-type-id="text-editor">
        <state relative-caret-position="187">
          <caret line="10" column="13" selection-start-line="10" selection-start-column="13" selection-end-line="10" selection-end-column="13" />
        </state>
      </provider>
    </entry>
    <entry file="file://$PROJECT_DIR$/guns-admin/src/main/java/com/supersavedriving/user/modular/system/service/IAppUserService.java">
      <provider selected="true" editor-type-id="text-editor">
        <state relative-caret-position="138">
          <caret line="37" column="40" selection-start-line="37" selection-start-column="40" selection-end-line="37" selection-end-column="40" />
        </state>
      </provider>
    </entry>
    <entry file="file://$PROJECT_DIR$/guns-admin/src/main/java/com/supersavedriving/user/modular/system/service/impl/AppUserServiceImpl.java">
      <provider selected="true" editor-type-id="text-editor">
        <state relative-caret-position="213">
          <caret line="264" column="58" lean-forward="true" selection-start-line="264" selection-start-column="58" selection-end-line="264" selection-end-column="58" />
        </state>
      </provider>
    </entry>
    <entry file="file://$PROJECT_DIR$/guns-admin/src/main/java/com/supersavedriving/user/modular/system/warpper/NearbyDriverWarpper.java">
      <provider selected="true" editor-type-id="text-editor">
        <state relative-caret-position="125">
          <caret line="7" column="6" lean-forward="true" selection-start-line="7" selection-start-column="6" selection-end-line="7" selection-end-column="6" />
        </state>
      </provider>
    </entry>
    <entry file="file://$PROJECT_DIR$/guns-admin/src/main/java/com/supersavedriving/user/modular/system/service/IDriverService.java">
      <provider selected="true" editor-type-id="text-editor">
        <state relative-caret-position="262">
          <caret line="23" column="30" selection-start-line="23" selection-start-column="30" selection-end-line="23" selection-end-column="30" />
        </state>
      </provider>
    </entry>
    <entry file="file://$PROJECT_DIR$/guns-admin/src/main/java/com/supersavedriving/user/modular/api/AppUserController.java">
      <provider selected="true" editor-type-id="text-editor">
        <state relative-caret-position="544">
          <caret line="193" column="69" lean-forward="true" selection-start-line="193" selection-start-column="69" selection-end-line="193" selection-end-column="69" />
        </state>
      </provider>
    </entry>
    <entry file="file://$PROJECT_DIR$/guns-admin/src/main/java/com/supersavedriving/user/modular/system/service/impl/DriverServiceImpl.java">
      <provider selected="true" editor-type-id="text-editor">
        <state relative-caret-position="229">
          <caret line="107" selection-start-line="107" selection-end-line="107" />
        </state>
      </provider>
    </entry>
    <entry file="file://$PROJECT_DIR$/guns-admin/src/main/java/com/supersavedriving/user/modular/api/OrderController.java">
      <provider selected="true" editor-type-id="text-editor">
        <state relative-caret-position="334">
          <caret line="223" column="55" selection-start-line="223" selection-start-column="55" selection-end-line="223" selection-end-column="55" />
        </state>
      </provider>
    </entry>
    <entry file="file://$PROJECT_DIR$/guns-admin/src/main/java/com/supersavedriving/user/modular/system/service/IOrderService.java">
      <provider selected="true" editor-type-id="text-editor">
        <state relative-caret-position="232">
          <caret line="35" column="15" selection-start-line="35" selection-start-column="15" selection-end-line="35" selection-end-column="15" />
        </state>
      </provider>
    </entry>
    <entry file="file://$PROJECT_DIR$/guns-admin/src/main/java/com/supersavedriving/user/modular/system/util/RedisUtil.java">
      <provider selected="true" editor-type-id="text-editor">
        <state relative-caret-position="-75">
          <caret line="17" column="56" selection-start-line="17" selection-start-column="56" selection-end-line="17" selection-end-column="56" />
        </state>
      </provider>
    </entry>
    <entry file="file://$PROJECT_DIR$/guns-admin/src/main/java/com/supersavedriving/user/modular/system/util/weChat/WeChatUtil.java">
      <provider selected="true" editor-type-id="text-editor">
        <state relative-caret-position="428">
          <caret line="92" column="7" selection-start-line="92" selection-start-column="7" selection-end-line="92" selection-end-column="7" />
        </state>
      </provider>
    </entry>
    <entry file="file://$PROJECT_DIR$/guns-admin/src/main/java/com/supersavedriving/user/config/RedissonConfig.java">
      <provider selected="true" editor-type-id="text-editor">
        <state relative-caret-position="275">
          <caret line="16" column="34" lean-forward="true" selection-start-line="16" selection-start-column="34" selection-end-line="16" selection-end-column="34" />
        </state>
      </provider>
    </entry>
    <entry file="file://$PROJECT_DIR$/guns-admin/src/main/resources/application-dev.yml">
      <provider selected="true" editor-type-id="text-editor">
        <state relative-caret-position="-109">
          <caret line="32" column="14" selection-start-line="32" selection-start-column="14" selection-end-line="32" selection-end-column="14" />
        </state>
      </provider>
    </entry>
    <entry file="file://$PROJECT_DIR$/guns-admin/src/main/java/com/supersavedriving/user/modular/system/util/TaskUtil.java">
      <provider selected="true" editor-type-id="text-editor">
        <state relative-caret-position="-783">
          <caret line="24" column="13" selection-start-line="24" selection-start-column="13" selection-end-line="24" selection-end-column="13" />
        </state>
      </provider>
    </entry>
    <entry file="file://$PROJECT_DIR$/guns-admin/pom.xml">
      <provider selected="true" editor-type-id="text-editor">
        <state relative-caret-position="425">
          <caret line="67" column="20" selection-start-line="67" selection-start-column="20" selection-end-line="67" selection-end-column="20" />
        </state>
      </provider>
    </entry>
    <entry file="file://$PROJECT_DIR$/guns-admin/src/main/java/com/supersavedriving/user/modular/system/util/PushUtil.java">
      <provider selected="true" editor-type-id="text-editor">
        <state relative-caret-position="324">
          <caret line="36" column="13" lean-forward="true" selection-start-line="36" selection-start-column="13" selection-end-line="36" selection-end-column="13" />
        </state>
      </provider>
    </entry>
    <entry file="file://$PROJECT_DIR$/guns-admin/src/main/java/com/supersavedriving/user/modular/system/service/impl/OrderServiceImpl.java">
      <provider selected="true" editor-type-id="text-editor">
        <state relative-caret-position="328">
          <caret line="580" column="37" lean-forward="true" selection-start-line="580" selection-start-column="37" selection-end-line="580" selection-end-column="37" />
          <folding>
            <element signature="imports" expanded="true" />
            <element signature="e#33785#35562#0" expanded="true" />
            <element signature="e#35561#35562#0" expanded="true" />
          </folding>
        </state>
      </provider>
    </entry>
  </component>
  <component name="masterDetails">
    <states>
      <state key="ArtifactsStructureConfigurable.UI">
        <settings>
          <artifact-editor />
          <splitter-proportions>
            <option name="proportions">
              <list>
                <option value="0.2" />
              </list>
            </option>
          </splitter-proportions>
        </settings>
      </state>
      <state key="FacetStructureConfigurable.UI">
        <settings>
          <last-edited>No facets are configured</last-edited>
          <splitter-proportions>
            <option name="proportions">
              <list>
                <option value="0.2" />
              </list>
            </option>
          </splitter-proportions>
        </settings>
      </state>
      <state key="GlobalLibrariesConfigurable.UI">
        <settings>
          <splitter-proportions>
            <option name="proportions">
              <list>
                <option value="0.2" />
              </list>
            </option>
          </splitter-proportions>
        </settings>
      </state>
      <state key="JdkListConfigurable.UI">
        <settings>
          <last-edited>1.8</last-edited>
          <splitter-proportions>
            <option name="proportions">
              <list>
                <option value="0.2" />
              </list>
            </option>
          </splitter-proportions>
        </settings>
      </state>
      <state key="ModuleStructureConfigurable.UI">
        <settings>
          <splitter-proportions>
            <option name="proportions">
              <list>
                <option value="0.2" />
              </list>
            </option>
          </splitter-proportions>
        </settings>
      </state>
      <state key="ProjectLibrariesConfigurable.UI">
        <settings>
          <splitter-proportions>
            <option name="proportions">
              <list>
                <option value="0.2" />
              </list>
            </option>
          </splitter-proportions>
        </settings>
      </state>
    </states>
  </component>
</project>

 user/guns-admin/pom.xml

@@ -67,10 +67,9 @@
        </dependency>
        <dependency>
            <groupId>org.redisson</groupId>
            <artifactId>redisson-spring-boot-starter</artifactId>
            <version>3.16.8</version>
            <artifactId>redisson</artifactId>
            <version>3.14.0</version>
        </dependency>
		
        <dependency>
            <groupId>com.fasterxml.jackson.core</groupId>
            <artifactId>jackson-core</artifactId>
@@ -143,15 +142,6 @@
        <dependency>
            <groupId>io.jsonwebtoken</groupId>
            <artifactId>jjwt</artifactId>
        </dependency>
        <dependency>
            <groupId>redis.clients</groupId>
            <artifactId>jedis</artifactId>
            <version>2.9.0</version>
        </dependency>
        <dependency>
            <groupId>org.springframework.boot</groupId>
            <artifactId>spring-boot-starter-data-redis</artifactId>
        </dependency>
        <dependency>
            <groupId>cn.jpush.api</groupId>

 user/guns-admin/src/main/java/com/supersavedriving/user/config/RedissonConfig.java

New file
@@ -0,0 +1,28 @@
package com.supersavedriving.user.config;

import org.redisson.Redisson;
import org.redisson.api.RedissonClient;
import org.redisson.config.Config;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;

@Configuration
public class RedissonConfig {

    @Value("${spring.redis.host}")
    private String host;
    @Value("${spring.redis.password}")
    private String password;
    @Value("${spring.redis.port}")
    private Integer port;


    @Bean
    public RedissonClient redissonClient() {
        Config config = new Config();
        config.useSingleServer().setAddress("redis://" + host + ":" + port);
        config.useSingleServer().setPassword(password);
        return Redisson.create(config);
    }
}

 user/guns-admin/src/main/java/com/supersavedriving/user/modular/system/service/impl/OrderServiceImpl.java

@@ -17,6 +17,8 @@
import com.supersavedriving.user.modular.system.util.MallBook.util.TrhRequest;
import com.supersavedriving.user.modular.system.util.mongodb.model.Location;
import com.supersavedriving.user.modular.system.warpper.*;
import org.redisson.api.RLock;
import org.redisson.api.RedissonClient;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.BeanUtils;
@@ -37,6 +39,7 @@
import java.text.SimpleDateFormat;
import java.time.LocalDateTime;
import java.util.*;
import java.util.concurrent.TimeUnit;
import java.util.stream.Collectors;


@@ -74,8 +77,8 @@
    @Autowired
    private RedisUtil redisUtil;

//    @Autowired
//    private RedissonClient redissonClient;
    @Autowired
    private RedissonClient redissonClient;

    @Autowired
    private MongoTemplate mongoTemplate;
@@ -432,11 +435,11 @@
     */
    @Override
    public ResultUtil travelOrder(Integer uid, TravelOrder travelOrder) throws Exception {
//        RLock lock1 = redissonClient.getLock("travelOrder:" + uid);
//        boolean lock2 = lock1.tryLock(5, 10, TimeUnit.SECONDS);
//        if(!lock2){
//            return ResultUtil.error("系统繁忙，请稍后重试");
//        }
        RLock lock1 = redissonClient.getLock("travelOrder:" + uid);
        boolean lock2 = lock1.tryLock(5, 10, TimeUnit.SECONDS);
        if(!lock2){
            return ResultUtil.error("系统繁忙，请稍后重试");
        }
        try {
            List<Integer> state = Arrays.asList(101, 102, 103, 104, 105, 106, 107, 201, 401);
            Order order = this.selectOne(new EntityWrapper<Order>().eq("userId", uid).eq("status", 1).in("state", state));
@@ -537,10 +540,7 @@
                        pushUtil.pushOrderInfo(order.getDriverId(), 2, pushOrderInfoWarpper);
                    }else{
                        //推单
                        Order finalOrder = order;
                        new Thread(()->{
                            pushOrder(finalOrder.getId());
                        }).start();
                        pushOrder(order.getId());
                    }
                }
            }
@@ -549,7 +549,7 @@
        }catch (Exception e){
            e.printStackTrace();
        }finally {
//            lock1.unlock();
            lock1.unlock();
        }
        return ResultUtil.error("系统异常");
    }
@@ -561,6 +561,7 @@
     * 订单推送逻辑
     */
    public void pushOrder(Long orderId){
        RLock lock1 = redissonClient.getLock("pushOrder:" + orderId);
        try {
            Order order = this.selectById(orderId);
            /**
@@ -570,28 +571,14 @@
             *        合适司：积分 > 评分 > 距离
             *      3.司机没有接单直接将订单置入大厅
             */
            boolean lock = redisUtil.lock(5);
            if(!lock){
                int num1 = 1;
                while (num1 <= 10){
                    Thread.sleep(3000);//等待3秒
                    lock = redisUtil.lock(5);
                    if(lock){
                        break;
                    }else{
                        num1++;
                    }
                }
            }
            if(!lock){
            boolean lock2 = lock1.tryLock(5, 10, TimeUnit.SECONDS);
            if(!lock2){
                order.setHallOrder(1);
                this.updateById(order);
                ExtraPushOrder(order);
                redisUtil.unlock();
            }
            SystemConfig systemConfig = systemConfigService.selectOne(new EntityWrapper<SystemConfig>().eq("type", 1));
            if(null == systemConfig){
                redisUtil.unlock();
                return;
            }
            JSONObject jsonObject = JSON.parseObject(systemConfig.getContent());
@@ -779,10 +766,10 @@
                ExtraPushOrder(order);
                redisUtil.setStrValue("lobbyOrder", "true");
            }
            redisUtil.unlock();
        }catch (Exception e){
            e.printStackTrace();
            redisUtil.unlock();
        }finally {
            lock1.unlock();
        }

    }

 user/guns-admin/src/main/java/com/supersavedriving/user/modular/system/util/RedisUtil.java

@@ -96,7 +96,7 @@
                int num1 = 1;
                while (num1 <= 10){
                    try {
                        Thread.sleep(1000);//等待3秒
                        Thread.sleep(1000);
                    } catch (InterruptedException e) {
                        e.printStackTrace();
                    }
@@ -112,6 +112,7 @@
            return b;
        }catch (Exception e){
            e.printStackTrace();
        }finally {
            unlock();
        }
        return false;

 user/guns-admin/src/main/resources/application-dev.yml

@@ -1,5 +1,5 @@
server:
  port: 7006
  port: 8006

guns:
  swagger-open: true              #是否开启swagger (true/false)
@@ -48,7 +48,7 @@
eureka:
  client:
    service-url: #注册中心地址
      defaultZone: http://sinata:sinata@192.168.110.106:8000/eureka #启用身份验证的方式连接
      defaultZone: http://sinata:sinata@192.168.110.106:8001/eureka #启用身份验证的方式连接
    register-with-eureka: true #在注册中心进行注册
    fetch-registry: true #从Eureka中获取注册信息。

			@@ -2,6 +2,7 @@
			<project version="4">
			<component name="CompilerConfiguration">
			<annotationProcessing>
			<profile default="true" name="Default" enabled="true" />
			<profile name="Maven default annotation processors profile" enabled="true">
			<sourceOutputDir name="target/generated-sources/annotations" />
			<sourceTestOutputDir name="target/generated-test-sources/test-annotations" />
			@@ -11,12 +12,5 @@
			<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>

			@@ -1,9 +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" />
			<file url="file://$PROJECT_DIR$" charset="UTF-8" />
			<file url="file://$PROJECT_DIR$/guns-admin" charset="UTF-8" />
			<file url="file://$PROJECT_DIR$/guns-core" charset="UTF-8" />
			<file url="file://$PROJECT_DIR$/guns-generator" charset="UTF-8" />
			</component>
			</project>

			@@ -8,5 +8,7 @@
			</list>
			</option>
			</component>
			<component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" default="true" project-jdk-name="1.8" project-jdk-type="JavaSDK" />
			<component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" project-jdk-name="1.8" project-jdk-type="JavaSDK">
			<output url="file://$PROJECT_DIR$/out" />
			</component>
			</project>

			@@ -797,6 +797,8 @@
			.eq("state", 2).last(" and failureTime > now() order by failureTime limit 0, 1"));
			if(null != youTuiDriver){
			driverInfo.setYouTuiEnd(youTuiDriver.getType() == 1 ? youTuiDriver.getFailureTime().getTime() : youTuiDriver.getEndTime().getTime());
			driverInfo.setType(youTuiDriver.getType());
			driverInfo.setSurplusQuantity(youTuiDriver.getSurplusQuantity());
			}
			List<Integer> state = Arrays.asList(107, 108, 109);
			int count = orderService.selectCount(new EntityWrapper<Order>().eq("driverId", uid).eq("status", 1).in("state", state).last(" and DATE_FORMAT(createTime, '%Y-%m-%d') = DATE_FORMAT(now(), '%Y-%m-%d')"));

			@@ -999,6 +999,17 @@
			Map<String, String> distance1 = MapUtil.getDistance(orderInfoWarpper.getStartLng() + "," + orderInfoWarpper.getStartLat(), value, 0);
			orderInfoWarpper.setPickUpTime(Integer.valueOf(distance1.get("duration")) / 60);
			}

			Map<String, String> distance = MapUtil.getDistance(order.getStartLng() + "," + order.getStartLat(), order.getEndLng() + "," + order.getEndLat(), 1);
			if(null != distance){
			Double d = Double.valueOf(distance.get("distance")) / 1000;
			orderInfoWarpper.setEstimatedMileage(d);
			orderInfoWarpper.setEstimatedTime(Double.valueOf(Integer.valueOf(distance.get("duration")) / 60));
			Driver driver = driverService.selectById(uid);
			Order orderPrice = getOrderPrice(1, d, 0, order, "", driver.getBranchOfficeId());
			orderInfoWarpper.setEstimatedPrice(orderPrice.getEstimatedPrice());
			}

			orderInfoWarpper.setDriverId(order.getDriverId());
			return orderInfoWarpper;
			}

			@@ -19,6 +19,10 @@
			private String name;
			@ApiModelProperty("电话")
			private String phone;
			@ApiModelProperty("优推类型（1=次数，2=小时）")
			private Integer type;
			@ApiModelProperty("优推剩余数量")
			private Integer surplusQuantity;
			@ApiModelProperty("优推结束时间")
			private Long youTuiEnd;
			@ApiModelProperty("账户余额")

			@@ -42,7 +42,7 @@
			eureka:
			client:
			service-url: #注册中心地址
			defaultZone: http://sinata:sinata@127.0.0.1:8000/eureka #启用身份验证的方式连接
			defaultZone: http://sinata:sinata@192.168.110.106:8001/eureka #启用身份验证的方式连接
			register-with-eureka: true #在注册中心进行注册
			fetch-registry: true #从Eureka中获取注册信息。

			@@ -2,20 +2,22 @@
			<project version="4">
			<component name="CompilerConfiguration">
			<annotationProcessing>
			<profile default="true" name="Default" enabled="true" />
			<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="guns-core" />
			<module name="user (1)" />
			<module name="guns-generator" />
			<module name="user" />
			<module name="user (1)" />
			</profile>
			</annotationProcessing>
			</component>
			<component name="JavacSettings">
			<option name="ADDITIONAL_OPTIONS_OVERRIDE">
			<module name="guns-core" options="-parameters" />
			<module name="guns-generator" options="-parameters" />
			<module name="guns-core" options="" />
			<module name="guns-generator" options="" />
			<module name="user (1)" options="-parameters" />
			</option>
			</component>

			@@ -1,9 +1,12 @@
			<?xml version="1.0" encoding="UTF-8"?>
			<project version="4">
			<component name="Encoding">
			<file url="file://$PROJECT_DIR$" charset="UTF-8" />
			<file url="file://$PROJECT_DIR$/guns-admin" charset="UTF-8" />
			<file url="file://$PROJECT_DIR$/guns-admin/src/main/java" charset="UTF-8" />
			<file url="file://$PROJECT_DIR$/guns-core" charset="UTF-8" />
			<file url="file://$PROJECT_DIR$/guns-core/src/main/java" charset="UTF-8" />
			<file url="file://$PROJECT_DIR$/guns-generator" 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>

			@@ -8,5 +8,5 @@
			</list>
			</option>
			</component>
			<component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" default="true" project-jdk-name="1.8" project-jdk-type="JavaSDK" />
			<component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" default="false" project-jdk-name="1.8" project-jdk-type="JavaSDK" />
			</project>

			@@ -67,10 +67,9 @@
			</dependency>
			<dependency>
			<groupId>org.redisson</groupId>
			<artifactId>redisson-spring-boot-starter</artifactId>
			<version>3.16.8</version>
			<artifactId>redisson</artifactId>
			<version>3.14.0</version>
			</dependency>

			<dependency>
			<groupId>com.fasterxml.jackson.core</groupId>
			<artifactId>jackson-core</artifactId>
			@@ -143,15 +142,6 @@
			<dependency>
			<groupId>io.jsonwebtoken</groupId>
			<artifactId>jjwt</artifactId>
			</dependency>
			<dependency>
			<groupId>redis.clients</groupId>
			<artifactId>jedis</artifactId>
			<version>2.9.0</version>
			</dependency>
			<dependency>
			<groupId>org.springframework.boot</groupId>
			<artifactId>spring-boot-starter-data-redis</artifactId>
			</dependency>
			<dependency>
			<groupId>cn.jpush.api</groupId>

New file
			@@ -0,0 +1,28 @@
			package com.supersavedriving.user.config;

			import org.redisson.Redisson;
			import org.redisson.api.RedissonClient;
			import org.redisson.config.Config;
			import org.springframework.beans.factory.annotation.Value;
			import org.springframework.context.annotation.Bean;
			import org.springframework.context.annotation.Configuration;

			@Configuration
			public class RedissonConfig {

			@Value("${spring.redis.host}")
			private String host;
			@Value("${spring.redis.password}")
			private String password;
			@Value("${spring.redis.port}")
			private Integer port;


			@Bean
			public RedissonClient redissonClient() {
			Config config = new Config();
			config.useSingleServer().setAddress("redis://" + host + ":" + port);
			config.useSingleServer().setPassword(password);
			return Redisson.create(config);
			}
			}

			@@ -17,6 +17,8 @@
			import com.supersavedriving.user.modular.system.util.MallBook.util.TrhRequest;
			import com.supersavedriving.user.modular.system.util.mongodb.model.Location;
			import com.supersavedriving.user.modular.system.warpper.*;
			import org.redisson.api.RLock;
			import org.redisson.api.RedissonClient;
			import org.slf4j.Logger;
			import org.slf4j.LoggerFactory;
			import org.springframework.beans.BeanUtils;
			@@ -37,6 +39,7 @@
			import java.text.SimpleDateFormat;
			import java.time.LocalDateTime;
			import java.util.*;
			import java.util.concurrent.TimeUnit;
			import java.util.stream.Collectors;


			@@ -74,8 +77,8 @@
			@Autowired
			private RedisUtil redisUtil;

			// @Autowired
			// private RedissonClient redissonClient;
			@Autowired
			private RedissonClient redissonClient;

			@Autowired
			private MongoTemplate mongoTemplate;
			@@ -432,11 +435,11 @@
			*/
			@Override
			public ResultUtil travelOrder(Integer uid, TravelOrder travelOrder) throws Exception {
			// RLock lock1 = redissonClient.getLock("travelOrder:" + uid);
			// boolean lock2 = lock1.tryLock(5, 10, TimeUnit.SECONDS);
			// if(!lock2){
			// return ResultUtil.error("系统繁忙，请稍后重试");
			// }
			RLock lock1 = redissonClient.getLock("travelOrder:" + uid);
			boolean lock2 = lock1.tryLock(5, 10, TimeUnit.SECONDS);
			if(!lock2){
			return ResultUtil.error("系统繁忙，请稍后重试");
			}
			try {
			List<Integer> state = Arrays.asList(101, 102, 103, 104, 105, 106, 107, 201, 401);
			Order order = this.selectOne(new EntityWrapper<Order>().eq("userId", uid).eq("status", 1).in("state", state));
			@@ -537,10 +540,7 @@
			pushUtil.pushOrderInfo(order.getDriverId(), 2, pushOrderInfoWarpper);
			}else{
			//推单
			Order finalOrder = order;
			new Thread(()->{
			pushOrder(finalOrder.getId());
			}).start();
			pushOrder(order.getId());
			}
			}
			}
			@@ -549,7 +549,7 @@
			}catch (Exception e){
			e.printStackTrace();
			}finally {
			// lock1.unlock();
			lock1.unlock();
			}
			return ResultUtil.error("系统异常");
			}
			@@ -561,6 +561,7 @@
			* 订单推送逻辑
			*/
			public void pushOrder(Long orderId){
			RLock lock1 = redissonClient.getLock("pushOrder:" + orderId);
			try {
			Order order = this.selectById(orderId);
			/**
			@@ -570,28 +571,14 @@
			* 合适司：积分 > 评分 > 距离
			* 3.司机没有接单直接将订单置入大厅
			*/
			boolean lock = redisUtil.lock(5);
			if(!lock){
			int num1 = 1;
			while (num1 <= 10){
			Thread.sleep(3000);//等待3秒
			lock = redisUtil.lock(5);
			if(lock){
			break;
			}else{
			num1++;
			}
			}
			}
			if(!lock){
			boolean lock2 = lock1.tryLock(5, 10, TimeUnit.SECONDS);
			if(!lock2){
			order.setHallOrder(1);
			this.updateById(order);
			ExtraPushOrder(order);
			redisUtil.unlock();
			}
			SystemConfig systemConfig = systemConfigService.selectOne(new EntityWrapper<SystemConfig>().eq("type", 1));
			if(null == systemConfig){
			redisUtil.unlock();
			return;
			}
			JSONObject jsonObject = JSON.parseObject(systemConfig.getContent());
			@@ -779,10 +766,10 @@
			ExtraPushOrder(order);
			redisUtil.setStrValue("lobbyOrder", "true");
			}
			redisUtil.unlock();
			}catch (Exception e){
			e.printStackTrace();
			redisUtil.unlock();
			}finally {
			lock1.unlock();
			}

			}

			@@ -96,7 +96,7 @@
			int num1 = 1;
			while (num1 <= 10){
			try {
			Thread.sleep(1000);//等待3秒
			Thread.sleep(1000);
			} catch (InterruptedException e) {
			e.printStackTrace();
			}
			@@ -112,6 +112,7 @@
			return b;
			}catch (Exception e){
			e.printStackTrace();
			}finally {
			unlock();
			}
			return false;

			@@ -1,5 +1,5 @@
			server:
			port: 7006
			port: 8006

			guns:
			swagger-open: true #是否开启swagger (true/false)
			@@ -48,7 +48,7 @@
			eureka:
			client:
			service-url: #注册中心地址
			defaultZone: http://sinata:sinata@192.168.110.106:8000/eureka #启用身份验证的方式连接
			defaultZone: http://sinata:sinata@192.168.110.106:8001/eureka #启用身份验证的方式连接
			register-with-eureka: true #在注册中心进行注册
			fetch-registry: true #从Eureka中获取注册信息。