xuhy
2026-03-26 32382598c6efe043bf7792083e130a07610c4a4e
更换名称
9个文件已修改
221 ■■■■■ 已修改文件
.idea/compiler.xml 18 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
.idea/encodings.xml 1 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
.idea/workspace.xml 188 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
DriverOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/api/ZiOnController.java 2 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
DriverOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/MsgUtil.java 2 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/common/_right.html 2 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/index.html 2 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/login.html 4 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
UserOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/MsgUtil.java 2 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
.idea/compiler.xml
@@ -7,8 +7,8 @@
        <sourceTestOutputDir name="target/generated-test-sources/test-annotations" />
        <outputRelativeToContentRoot value="true" />
        <module name="guns-rest" />
        <module name="driver" />
        <module name="guns-generator" />
        <module name="driver" />
        <module name="guns-core" />
      </profile>
    </annotationProcessing>
@@ -16,11 +16,20 @@
      <module name="demo" target="1.8" />
      <module name="guns-admin" target="1.8" />
      <module name="guns-core (1)" target="1.8" />
      <module name="guns-core (2)" target="1.8" />
      <module name="guns-core (3)" target="1.8" />
      <module name="guns-generator (1)" target="1.8" />
      <module name="guns-generator (2)" target="1.8" />
      <module name="guns-generator (3)" target="1.8" />
      <module name="guns-parent (1)" target="1.8" />
      <module name="guns-parent (2)" target="1.8" />
      <module name="guns-parent (3)" target="1.8" />
      <module name="guns-rest (1)" target="1.8" />
      <module name="guns-rest (2)" target="1.8" />
      <module name="guns-rest (3)" target="1.8" />
      <module name="management" target="1.8" />
      <module name="message-push" target="1.8" />
      <module name="ministryoftransport" target="1.8" />
      <module name="user" target="1.8" />
      <module name="zuul" target="1.8" />
    </bytecodeTargetLevel>
@@ -32,12 +41,19 @@
      <module name="guns-admin" options="-parameters" />
      <module name="guns-core" options="-parameters" />
      <module name="guns-core (1)" options="-parameters" />
      <module name="guns-core (2)" options="-parameters" />
      <module name="guns-core (3)" options="-parameters" />
      <module name="guns-generator" options="-parameters" />
      <module name="guns-generator (1)" options="-parameters" />
      <module name="guns-generator (2)" options="-parameters" />
      <module name="guns-generator (3)" options="-parameters" />
      <module name="guns-rest" options="-parameters" />
      <module name="guns-rest (1)" options="-parameters" />
      <module name="guns-rest (2)" options="-parameters" />
      <module name="guns-rest (3)" options="-parameters" />
      <module name="management" options="-parameters" />
      <module name="message-push" options="-parameters" />
      <module name="ministryoftransport" options="-parameters" />
      <module name="user" options="-parameters" />
      <module name="zuul" options="-parameters" />
    </option>
.idea/encodings.xml
@@ -18,6 +18,7 @@
    <file url="file://$PROJECT_DIR$/ManagementOKTravel/guns-rest/src/main/java" charset="UTF-8" />
    <file url="file://$PROJECT_DIR$/ManagementOKTravel/src/main/java" charset="UTF-8" />
    <file url="file://$PROJECT_DIR$/MessagePushTravel/src/main/java" charset="UTF-8" />
    <file url="file://$PROJECT_DIR$/MinistryOfTransport/src/main/java" charset="UTF-8" />
    <file url="file://$PROJECT_DIR$/UserOKTravel/guns-admin/src/main/java" charset="UTF-8" />
    <file url="file://$PROJECT_DIR$/UserOKTravel/guns-core/src/main/java" charset="UTF-8" />
    <file url="file://$PROJECT_DIR$/UserOKTravel/guns-generator/src/main/java" charset="UTF-8" />
.idea/workspace.xml
@@ -4,55 +4,16 @@
    <option name="autoReloadType" value="SELECTIVE" />
  </component>
  <component name="ChangeListManager">
    <list default="true" id="095cce03-0a65-406c-a922-caeac4a7e655" name="更改" comment="8.12">
      <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/DispatchOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/GDFalconUtil.java" beforeDir="false" afterPath="$PROJECT_DIR$/DispatchOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/GDFalconUtil.java" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/DispatchOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/GDMapElectricFenceUtil.java" beforeDir="false" afterPath="$PROJECT_DIR$/DispatchOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/GDMapElectricFenceUtil.java" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/DispatchOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/GDMapGeocodingUtil.java" beforeDir="false" afterPath="$PROJECT_DIR$/DispatchOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/GDMapGeocodingUtil.java" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/DispatchOKTravel/guns-admin/src/main/resources/application.yml" beforeDir="false" afterPath="$PROJECT_DIR$/DispatchOKTravel/guns-admin/src/main/resources/application.yml" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/DriverOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/api/DriverController.java" beforeDir="false" afterPath="$PROJECT_DIR$/DriverOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/api/DriverController.java" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/DriverOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/api/ZiOnController.java" beforeDir="false" afterPath="$PROJECT_DIR$/DriverOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/api/ZiOnController.java" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/DriverOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/ALiSendSms.java" beforeDir="false" afterPath="$PROJECT_DIR$/DriverOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/ALiSendSms.java" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/DriverOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/GDFalconUtil.java" beforeDir="false" afterPath="$PROJECT_DIR$/DriverOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/GDFalconUtil.java" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/DriverOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/GDMapElectricFenceUtil.java" beforeDir="false" afterPath="$PROJECT_DIR$/DriverOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/GDMapElectricFenceUtil.java" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/DriverOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/GDMapGeocodingUtil.java" beforeDir="false" afterPath="$PROJECT_DIR$/DriverOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/GDMapGeocodingUtil.java" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/DriverOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/MsgUtil.java" beforeDir="false" afterPath="$PROJECT_DIR$/DriverOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/MsgUtil.java" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/DriverOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/PayMoneyUtil.java" beforeDir="false" afterPath="$PROJECT_DIR$/DriverOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/PayMoneyUtil.java" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/DriverOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/batches/WechatPay.java" beforeDir="false" afterPath="$PROJECT_DIR$/DriverOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/batches/WechatPay.java" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/DriverOKTravel/guns-admin/src/main/resources/application.yml" beforeDir="false" afterPath="$PROJECT_DIR$/DriverOKTravel/guns-admin/src/main/resources/application.yml" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/ManagementOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/OssUploadUtil.java" beforeDir="false" afterPath="$PROJECT_DIR$/ManagementOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/OssUploadUtil.java" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/ManagementOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/redisqueue/RedisFifoQueue.java" beforeDir="false" afterPath="$PROJECT_DIR$/ManagementOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/redisqueue/RedisFifoQueue.java" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/ManagementOKTravel/guns-admin/src/main/resources/application.yml" beforeDir="false" afterPath="$PROJECT_DIR$/ManagementOKTravel/guns-admin/src/main/resources/application.yml" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/common/_container.html" beforeDir="false" afterPath="$PROJECT_DIR$/ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/common/_container.html" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/common/_right.html" beforeDir="false" afterPath="$PROJECT_DIR$/ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/common/_right.html" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/home.html" beforeDir="false" afterPath="$PROJECT_DIR$/ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/home.html" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/index.html" beforeDir="false" afterPath="$PROJECT_DIR$/ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/index.html" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/login.html" beforeDir="false" afterPath="$PROJECT_DIR$/ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/login.html" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tOrderCrossCity/tOrderCrossCity_detail.html" beforeDir="false" afterPath="$PROJECT_DIR$/ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tOrderCrossCity/tOrderCrossCity_detail.html" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tOrderCrossCity/tOrderCrossCity_track.html" beforeDir="false" afterPath="$PROJECT_DIR$/ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tOrderCrossCity/tOrderCrossCity_track.html" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tOrderPrivateCar/tOrderPrivateCar_orderDetail.html" beforeDir="false" afterPath="$PROJECT_DIR$/ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tOrderPrivateCar/tOrderPrivateCar_orderDetail.html" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tOrderPrivateCar/tOrderPrivateCar_trajectory.html" beforeDir="false" afterPath="$PROJECT_DIR$/ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tOrderPrivateCar/tOrderPrivateCar_trajectory.html" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tOrderTaxi/tOrderTaxi_edit.html" beforeDir="false" afterPath="$PROJECT_DIR$/ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tOrderTaxi/tOrderTaxi_edit.html" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tOrderTaxi/tOrderTaxi_trajectory.html" beforeDir="false" afterPath="$PROJECT_DIR$/ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tOrderTaxi/tOrderTaxi_trajectory.html" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tSite/tSite_add.html" beforeDir="false" afterPath="$PROJECT_DIR$/ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tSite/tSite_add.html" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tSite/tSite_edit.html" beforeDir="false" afterPath="$PROJECT_DIR$/ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tSite/tSite_edit.html" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/ManagementOKTravel/guns-admin/src/main/webapp/static/img/logo.jpg" beforeDir="false" afterPath="$PROJECT_DIR$/ManagementOKTravel/guns-admin/src/main/webapp/static/img/logo.jpg" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/MessagePushTravel/src/main/java/com/sinata/push/util/applets/ChildChannelHandler.java" beforeDir="false" afterPath="$PROJECT_DIR$/MessagePushTravel/src/main/java/com/sinata/push/util/applets/ChildChannelHandler.java" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/MessagePushTravel/src/main/resources/redis.properties" beforeDir="false" afterPath="$PROJECT_DIR$/MessagePushTravel/src/main/resources/redis.properties" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/UserOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/GDMapElectricFenceUtil.java" beforeDir="false" afterPath="$PROJECT_DIR$/UserOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/GDMapElectricFenceUtil.java" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/UserOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/GDMapGeocodingUtil.java" beforeDir="false" afterPath="$PROJECT_DIR$/UserOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/GDMapGeocodingUtil.java" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/UserOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/HttpPostTool.java" beforeDir="false" afterPath="$PROJECT_DIR$/UserOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/HttpPostTool.java" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/UserOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/MsgUtil.java" beforeDir="false" afterPath="$PROJECT_DIR$/UserOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/MsgUtil.java" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/UserOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/OssUploadUtil.java" beforeDir="false" afterPath="$PROJECT_DIR$/UserOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/OssUploadUtil.java" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/UserOKTravel/guns-admin/src/main/resources/application.yml" beforeDir="false" afterPath="$PROJECT_DIR$/UserOKTravel/guns-admin/src/main/resources/application.yml" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/ZuulOKTravel/src/main/resources/application.yml" beforeDir="false" afterPath="$PROJECT_DIR$/ZuulOKTravel/src/main/resources/application.yml" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/ZuulOKTravel/src/main/resources/redis.properties" beforeDir="false" afterPath="$PROJECT_DIR$/ZuulOKTravel/src/main/resources/redis.properties" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/guns-logs/log_error.log" beforeDir="false" afterPath="$PROJECT_DIR$/guns-logs/log_error.log" afterDir="false" />
    </list>
    <list default="true" id="095cce03-0a65-406c-a922-caeac4a7e655" name="更改" comment="初始化代码" />
    <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="ChangesViewManager">
    <option name="groupingKeys">
      <option value="module" />
    </option>
  </component>
  <component name="Git.Settings">
    <option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$" />
@@ -79,44 +40,44 @@
    <option name="hideEmptyMiddlePackages" value="true" />
    <option name="showLibraryContents" value="true" />
  </component>
  <component name="PropertiesComponent"><![CDATA[{
  "keyToString": {
    "Application.ALiSendSms.executor": "Run",
    "Maven.demo [clean].executor": "Run",
    "Maven.demo [package].executor": "Run",
    "Maven.guns-core [clean].executor": "Run",
    "Maven.guns-generator [clean].executor": "Run",
    "Maven.guns-parent [clean].executor": "Run",
    "Maven.guns-parent [package].executor": "Run",
    "Maven.management [clean].executor": "Run",
    "Maven.management [package].executor": "Run",
    "Maven.message-push [clean].executor": "Run",
    "Maven.message-push [package].executor": "Run",
    "Maven.zuul [clean].executor": "Run",
    "Maven.zuul [package].executor": "Run",
    "RequestMappingsPanelOrder0": "0",
    "RequestMappingsPanelOrder1": "1",
    "RequestMappingsPanelWidth0": "75",
    "RequestMappingsPanelWidth1": "75",
    "RunOnceActivity.OpenProjectViewOnStart": "true",
    "RunOnceActivity.ShowReadmeOnStart": "true",
    "Spring Boot.GunsApplication.executor": "Debug",
    "git-widget-placeholder": "master",
    "kotlin-language-version-configured": "true",
    "last_opened_file_path": "D:/workSpace/JiXiChuXing",
    "node.js.detected.package.eslint": "true",
    "node.js.detected.package.tslint": "true",
    "node.js.selected.package.eslint": "(autodetect)",
    "node.js.selected.package.tslint": "(autodetect)",
    "nodejs_package_manager_path": "npm",
    "project.structure.last.edited": "Project",
    "project.structure.proportion": "0.0",
    "project.structure.side.proportion": "0.0",
    "run.configurations.included.in.services": "true",
    "settings.editor.selected.configurable": "MavenSettings",
    "vue.rearranger.settings.migration": "true"
  <component name="PropertiesComponent">{
  &quot;keyToString&quot;: {
    &quot;Application.ALiSendSms.executor&quot;: &quot;Run&quot;,
    &quot;Maven.demo [clean].executor&quot;: &quot;Run&quot;,
    &quot;Maven.demo [package].executor&quot;: &quot;Run&quot;,
    &quot;Maven.guns-core [clean].executor&quot;: &quot;Run&quot;,
    &quot;Maven.guns-generator [clean].executor&quot;: &quot;Run&quot;,
    &quot;Maven.guns-parent [clean].executor&quot;: &quot;Run&quot;,
    &quot;Maven.guns-parent [package].executor&quot;: &quot;Run&quot;,
    &quot;Maven.management [clean].executor&quot;: &quot;Run&quot;,
    &quot;Maven.management [package].executor&quot;: &quot;Run&quot;,
    &quot;Maven.message-push [clean].executor&quot;: &quot;Run&quot;,
    &quot;Maven.message-push [package].executor&quot;: &quot;Run&quot;,
    &quot;Maven.zuul [clean].executor&quot;: &quot;Run&quot;,
    &quot;Maven.zuul [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;Spring Boot.GunsApplication.executor&quot;: &quot;Debug&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;D:/workSpace/JiXiChuXing&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;Project&quot;,
    &quot;project.structure.proportion&quot;: &quot;0.0&quot;,
    &quot;project.structure.side.proportion&quot;: &quot;0.0&quot;,
    &quot;run.configurations.included.in.services&quot;: &quot;true&quot;,
    &quot;settings.editor.selected.configurable&quot;: &quot;MavenSettings&quot;,
    &quot;vue.rearranger.settings.migration&quot;: &quot;true&quot;
  }
}]]></component>
}</component>
  <component name="RunDashboard">
    <option name="configurationTypes">
      <set>
@@ -168,6 +129,30 @@
        <option name="Make" enabled="true" />
      </method>
    </configuration>
    <configuration name="GunsApplication (2)" type="SpringBootApplicationConfigurationType" factoryName="Spring Boot" nameIsGenerated="true">
      <option name="FRAME_DEACTIVATION_UPDATE_POLICY" value="UpdateClassesAndResources" />
      <module name="user" />
      <option name="SPRING_BOOT_MAIN_CLASS" value="com.stylefeng.guns.GunsApplication" />
      <method v="2">
        <option name="Make" enabled="true" />
      </method>
    </configuration>
    <configuration name="GunsApplication (3)" type="SpringBootApplicationConfigurationType" factoryName="Spring Boot" nameIsGenerated="true">
      <option name="FRAME_DEACTIVATION_UPDATE_POLICY" value="UpdateClassesAndResources" />
      <module name="management" />
      <option name="SPRING_BOOT_MAIN_CLASS" value="com.stylefeng.guns.GunsApplication" />
      <method v="2">
        <option name="Make" enabled="true" />
      </method>
    </configuration>
    <configuration name="GunsApplication (4)" type="SpringBootApplicationConfigurationType" factoryName="Spring Boot" nameIsGenerated="true">
      <option name="FRAME_DEACTIVATION_UPDATE_POLICY" value="UpdateClassesAndResources" />
      <module name="user" />
      <option name="SPRING_BOOT_MAIN_CLASS" value="com.stylefeng.guns.GunsApplication" />
      <method v="2">
        <option name="Make" enabled="true" />
      </method>
    </configuration>
    <configuration name="GunsApplication" type="SpringBootApplicationConfigurationType" factoryName="Spring Boot" nameIsGenerated="true">
      <option name="FRAME_DEACTIVATION_UPDATE_POLICY" value="UpdateClassesAndResources" />
      <module name="driver" />
@@ -177,7 +162,21 @@
      </method>
    </configuration>
    <configuration name="GunsRestApplication (1)" type="SpringBootApplicationConfigurationType" factoryName="Spring Boot" nameIsGenerated="true">
      <module name="guns-rest (1)" />
      <module name="guns-rest (3)" />
      <option name="SPRING_BOOT_MAIN_CLASS" value="com.stylefeng.guns.rest.GunsRestApplication" />
      <method v="2">
        <option name="Make" enabled="true" />
      </method>
    </configuration>
    <configuration name="GunsRestApplication (2)" type="SpringBootApplicationConfigurationType" factoryName="Spring Boot" nameIsGenerated="true">
      <module name="guns-rest (2)" />
      <option name="SPRING_BOOT_MAIN_CLASS" value="com.stylefeng.guns.rest.GunsRestApplication" />
      <method v="2">
        <option name="Make" enabled="true" />
      </method>
    </configuration>
    <configuration name="GunsRestApplication (3)" type="SpringBootApplicationConfigurationType" factoryName="Spring Boot" nameIsGenerated="true">
      <module name="guns-rest (3)" />
      <option name="SPRING_BOOT_MAIN_CLASS" value="com.stylefeng.guns.rest.GunsRestApplication" />
      <method v="2">
        <option name="Make" enabled="true" />
@@ -193,6 +192,13 @@
    <configuration name="MessagePushApplication" type="SpringBootApplicationConfigurationType" factoryName="Spring Boot" nameIsGenerated="true">
      <module name="message-push" />
      <option name="SPRING_BOOT_MAIN_CLASS" value="com.sinata.push.MessagePushApplication" />
      <method v="2">
        <option name="Make" enabled="true" />
      </method>
    </configuration>
    <configuration name="MinistryoftransportApplication" type="SpringBootApplicationConfigurationType" factoryName="Spring Boot" nameIsGenerated="true">
      <module name="ministryoftransport" />
      <option name="SPRING_BOOT_MAIN_CLASS" value="com.sinata.ministryoftransport.MinistryoftransportApplication" />
      <method v="2">
        <option name="Make" enabled="true" />
      </method>
@@ -221,6 +227,7 @@
      <workItem from="1723454155447" duration="16000" />
      <workItem from="1723454180614" duration="825000" />
      <workItem from="1774419243985" duration="19888000" />
      <workItem from="1774492287652" duration="1701000" />
    </task>
    <task id="LOCAL-00001" summary="8.12">
      <option name="closed" value="true" />
@@ -230,7 +237,15 @@
      <option name="project" value="LOCAL" />
      <updated>1723464342820</updated>
    </task>
    <option name="localTasksCounter" value="2" />
    <task id="LOCAL-00002" summary="初始化代码">
      <option name="closed" value="true" />
      <created>1774492759980</created>
      <option name="number" value="00002" />
      <option name="presentableId" value="LOCAL-00002" />
      <option name="project" value="LOCAL" />
      <updated>1774492759980</updated>
    </task>
    <option name="localTasksCounter" value="3" />
    <servers />
  </component>
  <component name="TypeScriptGeneratedFilesManager">
@@ -248,7 +263,10 @@
    </option>
  </component>
  <component name="VcsManagerConfiguration">
    <option name="CHECK_CODE_SMELLS_BEFORE_PROJECT_COMMIT" value="false" />
    <option name="CHECK_NEW_TODO" value="false" />
    <MESSAGE value="8.12" />
    <option name="LAST_COMMIT_MESSAGE" value="8.12" />
    <MESSAGE value="初始化代码" />
    <option name="LAST_COMMIT_MESSAGE" value="初始化代码" />
  </component>
</project>
DriverOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/api/ZiOnController.java
@@ -41,7 +41,7 @@
 */
@Controller
@RequestMapping("/api/zion")
@Api(tags = "龙易新增")
@Api(tags = "龙江易新增")
public class ZiOnController extends BaseController {
    @Autowired
DriverOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/MsgUtil.java
@@ -25,7 +25,7 @@
        requestDto.SecretName="SCSK00001826";
        requestDto.SecretKey="erxbcn@@839";
        requestDto.Mobile=phone;
        requestDto.Content="尊敬的乘客,您的订单已被司机"+name+"接单,车牌号"+num+",感谢您选择龙易出行,请耐心等待。";
        requestDto.Content="尊敬的乘客,您的订单已被司机"+name+"接单,车牌号"+num+",感谢您选择龙江易出行,请耐心等待。";
        requestDto.TemplateId="23342";
//        requestDto.ExtCode="扩展号";
        requestDto.SignName="【四川联裕信息科技有限公司】";
ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/common/_right.html
@@ -4,7 +4,7 @@
            <div class="navbar-header"><a class="navbar-minimalize minimalize-styl-2 btn btn-primary " href="#"><i class="fa fa-bars"></i> </a>
                <form role="search" class="navbar-form-custom" method="post" action="search_results.html">
                    <div class="form-group">
                        <input type="text" placeholder="龙易出行后台管理系统 …" class="form-control" name="top-search" id="top-search" value="龙易出行后台管理系统" disabled>
                        <input type="text" placeholder="龙江易出行后台管理系统 …" class="form-control" name="top-search" id="top-search" value="龙江易出行后台管理系统" disabled>
                    </div>
                </form>
            </div>
ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/index.html
@@ -4,7 +4,7 @@
    <meta charset="utf-8">
    <meta name="viewport" content="width=device-width, initial-scale=1.0">
    <meta name="renderer" content="webkit">
    <title>龙易出行 - 主页</title>
    <title>龙江易出行 - 主页</title>
    <link rel="shortcut icon" href="${ctxPath}/static/img/logo.jpg">
    <link href="${ctxPath}/static/css/bootstrap.min.css?v=3.3.6" rel="stylesheet">
    <link href="${ctxPath}/static/css/font-awesome.min.css?v=4.4.0" rel="stylesheet">
ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/login.html
@@ -4,7 +4,7 @@
    <meta charset="utf-8">
    <meta name="viewport" content="width=device-width, initial-scale=1.0">
    <title>龙易出行 - 登录</title>
    <title>龙江易出行 - 登录</title>
    <link rel="shortcut icon" href="${ctxPath}/static/img/logo.jpg">
    <link href="${ctxPath}/static/css/bootstrap.min.css?v=3.3.6" rel="stylesheet">
@@ -58,7 +58,7 @@
<img src="${ctxPath}/static/img/logo.jpg" style="width: 300px;height: 400px;z-index: 1000">
<div  style="position: relative;left: -20px; max-width: 300px;min-height: 300px;background: white;border-radius: 8px;box-sizing: border-box;padding: 0 30px 0 50px;display: flex;align-items: center;justify-content: center;">
    <div style="max-height: 100%">
        <h3 style="color: black;"><img src="${ctxPath}/static/img/logo.jpg" width="30px" height="30px"/>&nbsp;龙易出行管理后台</h3>
        <h3 style="color: black;"><img src="${ctxPath}/static/img/logo.jpg" width="30px" height="30px"/>&nbsp;龙江易出行管理后台</h3>
        <br/>
        <h4 style="color: red;">${tips!}</h4>
        <form class="m-t" role="form" action="${ctxPath}/login" method="post">
UserOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/MsgUtil.java
@@ -34,7 +34,7 @@
        requestDto.Content="您的订单已被司机"+name+"接单,联系电话"+driverPhone+"。车牌号"+num+"请耐心等待。";
//        requestDto.TemplateId="9541";
//        requestDto.ExtCode="扩展号";
//        requestDto.SignName="龙易出行";
//        requestDto.SignName="龙江易出行";
//        requestDto.Timing="定时时间";
//        requestDto.CustomId="自定义ID";
        String data = JSON.toJSONString(requestDto);