From 05aa6865f6b180f1ee8fe8b9eefc1f39b6eb888b Mon Sep 17 00:00:00 2001
From: Sheyu-yao <ysy570231@gmail.com>
Date: Sun, 14 Jan 2024 20:20:58 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .idea/vcs.xml                                 |   6 +
 .idea/workspace.xml                           | 163 +++++++++++++-----
 .../{ => auth}/AuthServiceApplication.java    |   7 +-
 .../{ => auth}/controller/AuthController.java |   8 +-
 .../com/ysy/auth/service/AuthService.java     |   8 +
 .../service/impl/AuthServiceImpl.java         |  18 +-
 .../java/com/ysy/service/AuthService.java     |   8 -
 ysy-common/pom.xml                            |   6 +-
 .../config/MybatisPlusConfig.java             |   2 +-
 .../com/ysy/{ => common}/domain/po/Apply.java |   2 +-
 .../ysy/{ => common}/domain/po/Record.java    |   2 +-
 .../com/ysy/{ => common}/domain/po/Rider.java |   2 +-
 .../com/ysy/{ => common}/domain/result/R.java |   2 +-
 .../ysy/{ => common}/domain/vo/RiderVO.java   |   3 +-
 .../exception/GlobalExceptionHandler.java     |  13 +-
 .../remote/SystemClientRemote.java            |  10 +-
 .../utils/gateway/GatewayUtils.java           |   6 +-
 .../ysy/{ => common}/utils/jwt/JwtUtil.java   |   2 +-
 .../{ => common}/utils/tools/StringUtils.java |   2 +-
 .../ysy/{ => gateway}/GatewayApplication.java |   6 +-
 .../{ => gateway}/config/AuthProperties.java  |   2 +-
 .../filter/GlobalAuthFilter.java              |  10 +-
 .../{ => apply}/ApplyServiceApplication.java  |   7 +-
 .../controller/ApplyController.java           |   6 +-
 .../ysy/{ => apply}/mapper/ApplyMapper.java   |   4 +-
 .../ysy/{ => apply}/service/ApplyService.java |   6 +-
 .../service/impl/ApplyServiceImpl.java        |  19 +-
 .../SystemServiceApplication.java             |   6 +-
 .../controller/RiderController.java}          |  14 +-
 .../ysy/{ => system}/mapper/RiderMapper.java  |   4 +-
 .../{ => system}/service/RiderService.java    |   6 +-
 .../service/impl/RiderServiceImpl.java        |  11 +-
 32 files changed, 221 insertions(+), 150 deletions(-)
 create mode 100644 .idea/vcs.xml
 rename ysy-auth/src/main/java/com/ysy/{ => auth}/AuthServiceApplication.java (62%)
 rename ysy-auth/src/main/java/com/ysy/{ => auth}/controller/AuthController.java (81%)
 create mode 100644 ysy-auth/src/main/java/com/ysy/auth/service/AuthService.java
 rename ysy-auth/src/main/java/com/ysy/{ => auth}/service/impl/AuthServiceImpl.java (74%)
 delete mode 100644 ysy-auth/src/main/java/com/ysy/service/AuthService.java
 rename ysy-common/src/main/java/com/ysy/{ => common}/config/MybatisPlusConfig.java (96%)
 rename ysy-common/src/main/java/com/ysy/{ => common}/domain/po/Apply.java (97%)
 rename ysy-common/src/main/java/com/ysy/{ => common}/domain/po/Record.java (95%)
 rename ysy-common/src/main/java/com/ysy/{ => common}/domain/po/Rider.java (95%)
 rename ysy-common/src/main/java/com/ysy/{ => common}/domain/result/R.java (96%)
 rename ysy-common/src/main/java/com/ysy/{ => common}/domain/vo/RiderVO.java (91%)
 rename ysy-common/src/main/java/com/ysy/{ => common}/exception/GlobalExceptionHandler.java (57%)
 rename ysy-common/src/main/java/com/ysy/{ => common}/remote/SystemClientRemote.java (50%)
 rename ysy-common/src/main/java/com/ysy/{ => common}/utils/gateway/GatewayUtils.java (95%)
 rename ysy-common/src/main/java/com/ysy/{ => common}/utils/jwt/JwtUtil.java (96%)
 rename ysy-common/src/main/java/com/ysy/{ => common}/utils/tools/StringUtils.java (97%)
 rename ysy-gateway/src/main/java/com/ysy/{ => gateway}/GatewayApplication.java (70%)
 rename ysy-gateway/src/main/java/com/ysy/{ => gateway}/config/AuthProperties.java (93%)
 rename ysy-gateway/src/main/java/com/ysy/{ => gateway}/filter/GlobalAuthFilter.java (89%)
 rename ysy-modules/ysy-apply/src/main/java/com/ysy/{ => apply}/ApplyServiceApplication.java (57%)
 rename ysy-modules/ysy-apply/src/main/java/com/ysy/{ => apply}/controller/ApplyController.java (83%)
 rename ysy-modules/ysy-apply/src/main/java/com/ysy/{ => apply}/mapper/ApplyMapper.java (71%)
 rename ysy-modules/ysy-apply/src/main/java/com/ysy/{ => apply}/service/ApplyService.java (59%)
 rename ysy-modules/ysy-apply/src/main/java/com/ysy/{ => apply}/service/impl/ApplyServiceImpl.java (78%)
 rename ysy-modules/ysy-system/src/main/java/com/ysy/{ => system}/SystemServiceApplication.java (57%)
 rename ysy-modules/ysy-system/src/main/java/com/ysy/{controller/SystemController.java => system/controller/RiderController.java} (66%)
 rename ysy-modules/ysy-system/src/main/java/com/ysy/{ => system}/mapper/RiderMapper.java (70%)
 rename ysy-modules/ysy-system/src/main/java/com/ysy/{ => system}/service/RiderService.java (63%)
 rename ysy-modules/ysy-system/src/main/java/com/ysy/{ => system}/service/impl/RiderServiceImpl.java (83%)

diff --git a/.idea/vcs.xml b/.idea/vcs.xml
new file mode 100644
index 0000000..94a25f7
--- /dev/null
+++ b/.idea/vcs.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="VcsDirectoryMappings">
+    <mapping directory="$PROJECT_DIR$" vcs="Git" />
+  </component>
+</project>
\ No newline at end of file
diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 93e7ab1..f77da27 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -4,7 +4,39 @@
     <option name="autoReloadType" value="SELECTIVE" />
   </component>
   <component name="ChangeListManager">
-    <list default="true" id="88964528-da9b-4dce-b2e1-90e4281b93bb" name="Changes" comment="" />
+    <list default="true" id="88964528-da9b-4dce-b2e1-90e4281b93bb" name="Changes" comment="初始化">
+      <change afterPath="$PROJECT_DIR$/.idea/vcs.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/ysy-auth/src/main/java/com/ysy/AuthServiceApplication.java" beforeDir="false" afterPath="$PROJECT_DIR$/ysy-auth/src/main/java/com/ysy/auth/AuthServiceApplication.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/ysy-auth/src/main/java/com/ysy/controller/AuthController.java" beforeDir="false" afterPath="$PROJECT_DIR$/ysy-auth/src/main/java/com/ysy/auth/controller/AuthController.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/ysy-auth/src/main/java/com/ysy/service/AuthService.java" beforeDir="false" afterPath="$PROJECT_DIR$/ysy-auth/src/main/java/com/ysy/auth/service/AuthService.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/ysy-auth/src/main/java/com/ysy/service/impl/AuthServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/ysy-auth/src/main/java/com/ysy/auth/service/impl/AuthServiceImpl.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/ysy-common/pom.xml" beforeDir="false" afterPath="$PROJECT_DIR$/ysy-common/pom.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/ysy-common/src/main/java/com/ysy/config/MybatisPlusConfig.java" beforeDir="false" afterPath="$PROJECT_DIR$/ysy-common/src/main/java/com/ysy/common/config/MybatisPlusConfig.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/ysy-common/src/main/java/com/ysy/domain/po/Apply.java" beforeDir="false" afterPath="$PROJECT_DIR$/ysy-common/src/main/java/com/ysy/common/domain/po/Apply.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/ysy-common/src/main/java/com/ysy/domain/po/Record.java" beforeDir="false" afterPath="$PROJECT_DIR$/ysy-common/src/main/java/com/ysy/common/domain/po/Record.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/ysy-common/src/main/java/com/ysy/domain/po/Rider.java" beforeDir="false" afterPath="$PROJECT_DIR$/ysy-common/src/main/java/com/ysy/common/domain/po/Rider.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/ysy-common/src/main/java/com/ysy/domain/result/R.java" beforeDir="false" afterPath="$PROJECT_DIR$/ysy-common/src/main/java/com/ysy/common/domain/result/R.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/ysy-common/src/main/java/com/ysy/domain/vo/RiderVO.java" beforeDir="false" afterPath="$PROJECT_DIR$/ysy-common/src/main/java/com/ysy/common/domain/vo/RiderVO.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/ysy-common/src/main/java/com/ysy/exception/GlobalExceptionHandler.java" beforeDir="false" afterPath="$PROJECT_DIR$/ysy-common/src/main/java/com/ysy/common/exception/GlobalExceptionHandler.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/ysy-common/src/main/java/com/ysy/remote/SystemClientRemote.java" beforeDir="false" afterPath="$PROJECT_DIR$/ysy-common/src/main/java/com/ysy/common/remote/SystemClientRemote.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/ysy-common/src/main/java/com/ysy/utils/gateway/GatewayUtils.java" beforeDir="false" afterPath="$PROJECT_DIR$/ysy-common/src/main/java/com/ysy/common/utils/gateway/GatewayUtils.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/ysy-common/src/main/java/com/ysy/utils/jwt/JwtUtil.java" beforeDir="false" afterPath="$PROJECT_DIR$/ysy-common/src/main/java/com/ysy/common/utils/jwt/JwtUtil.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/ysy-common/src/main/java/com/ysy/utils/tools/StringUtils.java" beforeDir="false" afterPath="$PROJECT_DIR$/ysy-common/src/main/java/com/ysy/common/utils/tools/StringUtils.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/ysy-gateway/src/main/java/com/ysy/GatewayApplication.java" beforeDir="false" afterPath="$PROJECT_DIR$/ysy-gateway/src/main/java/com/ysy/gateway/GatewayApplication.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/ysy-gateway/src/main/java/com/ysy/config/AuthProperties.java" beforeDir="false" afterPath="$PROJECT_DIR$/ysy-gateway/src/main/java/com/ysy/gateway/config/AuthProperties.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/ysy-gateway/src/main/java/com/ysy/filter/GlobalAuthFilter.java" beforeDir="false" afterPath="$PROJECT_DIR$/ysy-gateway/src/main/java/com/ysy/gateway/filter/GlobalAuthFilter.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/ysy-modules/ysy-apply/src/main/java/com/ysy/ApplyServiceApplication.java" beforeDir="false" afterPath="$PROJECT_DIR$/ysy-modules/ysy-apply/src/main/java/com/ysy/apply/ApplyServiceApplication.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/ysy-modules/ysy-apply/src/main/java/com/ysy/controller/ApplyController.java" beforeDir="false" afterPath="$PROJECT_DIR$/ysy-modules/ysy-apply/src/main/java/com/ysy/apply/controller/ApplyController.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/ysy-modules/ysy-apply/src/main/java/com/ysy/mapper/ApplyMapper.java" beforeDir="false" afterPath="$PROJECT_DIR$/ysy-modules/ysy-apply/src/main/java/com/ysy/apply/mapper/ApplyMapper.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/ysy-modules/ysy-apply/src/main/java/com/ysy/service/ApplyService.java" beforeDir="false" afterPath="$PROJECT_DIR$/ysy-modules/ysy-apply/src/main/java/com/ysy/apply/service/ApplyService.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/ysy-modules/ysy-apply/src/main/java/com/ysy/service/impl/ApplyServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/ysy-modules/ysy-apply/src/main/java/com/ysy/apply/service/impl/ApplyServiceImpl.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/ysy-modules/ysy-system/src/main/java/com/ysy/SystemServiceApplication.java" beforeDir="false" afterPath="$PROJECT_DIR$/ysy-modules/ysy-system/src/main/java/com/ysy/system/SystemServiceApplication.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/ysy-modules/ysy-system/src/main/java/com/ysy/controller/SystemController.java" beforeDir="false" afterPath="$PROJECT_DIR$/ysy-modules/ysy-system/src/main/java/com/ysy/system/controller/RiderController.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/ysy-modules/ysy-system/src/main/java/com/ysy/mapper/RiderMapper.java" beforeDir="false" afterPath="$PROJECT_DIR$/ysy-modules/ysy-system/src/main/java/com/ysy/system/mapper/RiderMapper.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/ysy-modules/ysy-system/src/main/java/com/ysy/service/RiderService.java" beforeDir="false" afterPath="$PROJECT_DIR$/ysy-modules/ysy-system/src/main/java/com/ysy/system/service/RiderService.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/ysy-modules/ysy-system/src/main/java/com/ysy/service/impl/RiderServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/ysy-modules/ysy-system/src/main/java/com/ysy/system/service/impl/RiderServiceImpl.java" afterDir="false" />
+    </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
     <option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" />
@@ -18,6 +50,9 @@
       </list>
     </option>
   </component>
+  <component name="Git.Settings">
+    <option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$" />
+  </component>
   <component name="MavenImportPreferences">
     <option name="generalSettings">
       <MavenGeneralSettings>
@@ -26,36 +61,43 @@
       </MavenGeneralSettings>
     </option>
   </component>
-  <component name="ProjectColorInfo"><![CDATA[{
-  "associatedIndex": 6
-}]]></component>
+  <component name="ProjectColorInfo">{
+  &quot;associatedIndex&quot;: 6
+}</component>
   <component name="ProjectId" id="2apjXkTQBGD1Lya9b7KwYJoFZ8H" />
+  <component name="ProjectLevelVcsManager">
+    <ConfirmationsSetting value="1" id="Add" />
+  </component>
   <component name="ProjectViewState">
     <option name="hideEmptyMiddlePackages" value="true" />
     <option name="showLibraryContents" value="true" />
   </component>
-  <component name="PropertiesComponent"><![CDATA[{
-  "keyToString": {
-    "RequestMappingsPanelOrder0": "0",
-    "RequestMappingsPanelOrder1": "1",
-    "RequestMappingsPanelWidth0": "75",
-    "RequestMappingsPanelWidth1": "75",
-    "RunOnceActivity.OpenProjectViewOnStart": "true",
-    "RunOnceActivity.ShowReadmeOnStart": "true",
-    "WebServerToolWindowFactoryState": "false",
-    "jdk.selected.JAVA_MODULE": "17",
-    "last_opened_file_path": "C:/Users/Hasee/Desktop/senior_grade5_week01/ysy-modules/ysy-apply/src/main/resources",
-    "node.js.detected.package.eslint": "true",
-    "node.js.detected.package.tslint": "true",
-    "node.js.selected.package.eslint": "(autodetect)",
-    "node.js.selected.package.tslint": "(autodetect)",
-    "project.structure.last.edited": "Modules",
-    "project.structure.proportion": "0.0",
-    "project.structure.side.proportion": "0.0",
-    "settings.editor.selected.configurable": "editor.preferences.tabs",
-    "vue.rearranger.settings.migration": "true"
+  <component name="PropertiesComponent">{
+  &quot;keyToString&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;WebServerToolWindowFactoryState&quot;: &quot;false&quot;,
+    &quot;git-widget-placeholder&quot;: &quot;master&quot;,
+    &quot;jdk.selected.JAVA_MODULE&quot;: &quot;17&quot;,
+    &quot;last_opened_file_path&quot;: &quot;C:/Users/Hasee/Desktop/senior_grade5_week01/ysy-modules/ysy-apply/src/main/resources&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.15&quot;,
+    &quot;project.structure.side.proportion&quot;: &quot;0.2&quot;,
+    &quot;settings.editor.selected.configurable&quot;: &quot;reference.settings.project.maven.runner&quot;,
+    &quot;spring.configuration.checksum&quot;: &quot;60d9e760ae25323a26478f12f86db80c&quot;,
+    &quot;vue.rearranger.settings.migration&quot;: &quot;true&quot;
   }
-}]]></component>
+}</component>
   <component name="ReactorSettings">
     <option name="notificationShown" value="true" />
   </component>
@@ -79,13 +121,13 @@
       </set>
     </option>
   </component>
-  <component name="RunManager" selected="Spring Boot.ApplyServiceApplication">
+  <component name="RunManager" selected="Spring Boot.GatewayApplication">
     <configuration name="SystemServiceApplication" type="Application" factoryName="Application" temporary="true" nameIsGenerated="true">
-      <option name="MAIN_CLASS_NAME" value="com.ysy.SystemServiceApplication" />
+      <option name="MAIN_CLASS_NAME" value="com.ysy.system.SystemServiceApplication" />
       <module name="ysy-system" />
       <extension name="coverage">
         <pattern>
-          <option name="PATTERN" value="com.ysy.*" />
+          <option name="PATTERN" value="com.ysy.auth.*" />
           <option name="ENABLED" value="true" />
         </pattern>
       </extension>
@@ -95,10 +137,10 @@
     </configuration>
     <configuration name="ApplyServiceApplication" type="SpringBootApplicationConfigurationType" factoryName="Spring Boot" temporary="true" nameIsGenerated="true">
       <module name="ysy-apply" />
-      <option name="SPRING_BOOT_MAIN_CLASS" value="com.ysy.ApplyServiceApplication" />
+      <option name="SPRING_BOOT_MAIN_CLASS" value="com.ysy.apply.ApplyServiceApplication" />
       <extension name="coverage">
         <pattern>
-          <option name="PATTERN" value="com.ysy.*" />
+          <option name="PATTERN" value="com.ysy.apply.*" />
           <option name="ENABLED" value="true" />
         </pattern>
       </extension>
@@ -108,10 +150,10 @@
     </configuration>
     <configuration name="AuthServiceApplication" type="SpringBootApplicationConfigurationType" factoryName="Spring Boot" temporary="true" nameIsGenerated="true">
       <module name="ysy-auth" />
-      <option name="SPRING_BOOT_MAIN_CLASS" value="com.ysy.AuthServiceApplication" />
+      <option name="SPRING_BOOT_MAIN_CLASS" value="com.ysy.auth.AuthServiceApplication" />
       <extension name="coverage">
         <pattern>
-          <option name="PATTERN" value="com.ysy.*" />
+          <option name="PATTERN" value="com.ysy.auth.*" />
           <option name="ENABLED" value="true" />
         </pattern>
       </extension>
@@ -121,10 +163,10 @@
     </configuration>
     <configuration name="GatewayApplication" type="SpringBootApplicationConfigurationType" factoryName="Spring Boot" temporary="true" nameIsGenerated="true">
       <module name="ysy-gateway" />
-      <option name="SPRING_BOOT_MAIN_CLASS" value="com.ysy.GatewayApplication" />
+      <option name="SPRING_BOOT_MAIN_CLASS" value="com.ysy.gateway.GatewayApplication" />
       <extension name="coverage">
         <pattern>
-          <option name="PATTERN" value="com.ysy.*" />
+          <option name="PATTERN" value="com.ysy.gateway.*" />
           <option name="ENABLED" value="true" />
         </pattern>
       </extension>
@@ -134,10 +176,10 @@
     </configuration>
     <configuration name="SystemServiceApplication" type="SpringBootApplicationConfigurationType" factoryName="Spring Boot" temporary="true" nameIsGenerated="true">
       <module name="ysy-system" />
-      <option name="SPRING_BOOT_MAIN_CLASS" value="com.ysy.SystemServiceApplication" />
+      <option name="SPRING_BOOT_MAIN_CLASS" value="com.ysy.system.SystemServiceApplication" />
       <extension name="coverage">
         <pattern>
-          <option name="PATTERN" value="com.ysy.*" />
+          <option name="PATTERN" value="com.ysy.system.*" />
           <option name="ENABLED" value="true" />
         </pattern>
       </extension>
@@ -148,8 +190,8 @@
     <recent_temporary>
       <list>
         <item itemvalue="Spring Boot.SystemServiceApplication" />
-        <item itemvalue="Spring Boot.GatewayApplication" />
         <item itemvalue="Spring Boot.AuthServiceApplication" />
+        <item itemvalue="Spring Boot.GatewayApplication" />
         <item itemvalue="Spring Boot.ApplyServiceApplication" />
         <item itemvalue="Application.SystemServiceApplication" />
       </list>
@@ -163,22 +205,49 @@
       <option name="number" value="Default" />
       <option name="presentableId" value="Default" />
       <updated>1705022459502</updated>
-      <workItem from="1705022460543" duration="16480000" />
+      <workItem from="1705022460543" duration="26554000" />
+      <workItem from="1705105106156" duration="6505000" />
+      <workItem from="1705231338774" duration="2711000" />
     </task>
+    <task id="LOCAL-00001" summary="初始化">
+      <option name="closed" value="true" />
+      <created>1705040594040</created>
+      <option name="number" value="00001" />
+      <option name="presentableId" value="LOCAL-00001" />
+      <option name="project" value="LOCAL" />
+      <updated>1705040594041</updated>
+    </task>
+    <option name="localTasksCounter" value="2" />
     <servers />
   </component>
   <component name="TypeScriptGeneratedFilesManager">
     <option name="version" value="3" />
   </component>
+  <component name="Vcs.Log.Tabs.Properties">
+    <option name="TAB_STATES">
+      <map>
+        <entry key="MAIN">
+          <value>
+            <State />
+          </value>
+        </entry>
+      </map>
+    </option>
+  </component>
+  <component name="VcsManagerConfiguration">
+    <MESSAGE value="初始化" />
+    <option name="LAST_COMMIT_MESSAGE" value="初始化" />
+  </component>
   <component name="XDebuggerManager">
-    <breakpoint-manager>
-      <breakpoints>
-        <line-breakpoint enabled="true" type="java-line">
-          <url>file://$PROJECT_DIR$/ysy-auth/src/main/java/com/ysy/service/impl/AuthServiceImpl.java</url>
-          <line>30</line>
-          <option name="timeStamp" value="6" />
-        </line-breakpoint>
-      </breakpoints>
-    </breakpoint-manager>
+    <watches-manager>
+      <configuration name="SpringBootApplicationConfigurationType">
+        <watch expression="configurations.get(1)" />
+        <watch expression="configurations.get(0)" />
+      </configuration>
+    </watches-manager>
+  </component>
+  <component name="XSLT-Support.FileAssociations.UIState">
+    <expand />
+    <select />
   </component>
 </project>
\ No newline at end of file
diff --git a/ysy-auth/src/main/java/com/ysy/AuthServiceApplication.java b/ysy-auth/src/main/java/com/ysy/auth/AuthServiceApplication.java
similarity index 62%
rename from ysy-auth/src/main/java/com/ysy/AuthServiceApplication.java
rename to ysy-auth/src/main/java/com/ysy/auth/AuthServiceApplication.java
index c491336..d1645c8 100644
--- a/ysy-auth/src/main/java/com/ysy/AuthServiceApplication.java
+++ b/ysy-auth/src/main/java/com/ysy/auth/AuthServiceApplication.java
@@ -1,14 +1,11 @@
-package com.ysy;
+package com.ysy.auth;
 
-import com.ysy.exception.GlobalExceptionHandler;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.springframework.cloud.openfeign.EnableFeignClients;
-import org.springframework.context.annotation.Import;
 
 @SpringBootApplication
-@EnableFeignClients(basePackages = "com.ysy.remote")
-@Import({GlobalExceptionHandler.class})
+@EnableFeignClients(basePackages = "com.ysy.common.remote")
 public class AuthServiceApplication {
     public static void main(String[] args) {
         SpringApplication.run(AuthServiceApplication.class, args);
diff --git a/ysy-auth/src/main/java/com/ysy/controller/AuthController.java b/ysy-auth/src/main/java/com/ysy/auth/controller/AuthController.java
similarity index 81%
rename from ysy-auth/src/main/java/com/ysy/controller/AuthController.java
rename to ysy-auth/src/main/java/com/ysy/auth/controller/AuthController.java
index 6e43a32..20b2abf 100644
--- a/ysy-auth/src/main/java/com/ysy/controller/AuthController.java
+++ b/ysy-auth/src/main/java/com/ysy/auth/controller/AuthController.java
@@ -1,8 +1,8 @@
-package com.ysy.controller;
+package com.ysy.auth.controller;
 
-import com.ysy.domain.result.R;
-import com.ysy.domain.vo.RiderVO;
-import com.ysy.service.AuthService;
+import com.ysy.common.domain.result.R;
+import com.ysy.common.domain.vo.RiderVO;
+import com.ysy.auth.service.AuthService;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
diff --git a/ysy-auth/src/main/java/com/ysy/auth/service/AuthService.java b/ysy-auth/src/main/java/com/ysy/auth/service/AuthService.java
new file mode 100644
index 0000000..aa0a968
--- /dev/null
+++ b/ysy-auth/src/main/java/com/ysy/auth/service/AuthService.java
@@ -0,0 +1,8 @@
+package com.ysy.auth.service;
+
+import com.ysy.common.domain.result.R;
+import com.ysy.common.domain.vo.RiderVO;
+
+public interface AuthService {
+    R authLoginByRiderVO(RiderVO riderVO);
+}
diff --git a/ysy-auth/src/main/java/com/ysy/service/impl/AuthServiceImpl.java b/ysy-auth/src/main/java/com/ysy/auth/service/impl/AuthServiceImpl.java
similarity index 74%
rename from ysy-auth/src/main/java/com/ysy/service/impl/AuthServiceImpl.java
rename to ysy-auth/src/main/java/com/ysy/auth/service/impl/AuthServiceImpl.java
index 0320cc5..54c993e 100644
--- a/ysy-auth/src/main/java/com/ysy/service/impl/AuthServiceImpl.java
+++ b/ysy-auth/src/main/java/com/ysy/auth/service/impl/AuthServiceImpl.java
@@ -1,13 +1,13 @@
-package com.ysy.service.impl;
+package com.ysy.auth.service.impl;
 
 import cn.hutool.core.bean.BeanUtil;
 import com.alibaba.fastjson2.JSON;
-import com.ysy.domain.po.Rider;
-import com.ysy.domain.result.R;
-import com.ysy.domain.vo.RiderVO;
-import com.ysy.remote.SystemClientRemote;
-import com.ysy.service.AuthService;
-import com.ysy.utils.jwt.JwtUtil;
+import com.ysy.common.domain.po.Rider;
+import com.ysy.common.domain.result.R;
+import com.ysy.common.domain.vo.RiderVO;
+import com.ysy.common.remote.SystemClientRemote;
+import com.ysy.auth.service.AuthService;
+import com.ysy.common.utils.jwt.JwtUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.redis.core.StringRedisTemplate;
 import org.springframework.stereotype.Service;
@@ -28,10 +28,10 @@ public class AuthServiceImpl implements AuthService {
     @Override
     public R authLoginByRiderVO(RiderVO riderVO) {
         //服务远程调用
-        R result = systemClientRemote.riderByRiderName(riderVO.getRiderName());
+        R result = systemClientRemote.getRiderByRiderName(riderVO.getRiderName());
 
         //不存在用户
-        Assert.notNull(result.getData(), "不存在该用户");
+        Assert.notNull(result.getData().get("rider"), "不存在该用户");
 
         Rider rider = JSON.parseObject(JSON.toJSONString(result.getData().get("rider")), Rider.class);
 
diff --git a/ysy-auth/src/main/java/com/ysy/service/AuthService.java b/ysy-auth/src/main/java/com/ysy/service/AuthService.java
deleted file mode 100644
index ccb89d4..0000000
--- a/ysy-auth/src/main/java/com/ysy/service/AuthService.java
+++ /dev/null
@@ -1,8 +0,0 @@
-package com.ysy.service;
-
-import com.ysy.domain.result.R;
-import com.ysy.domain.vo.RiderVO;
-
-public interface AuthService {
-    R authLoginByRiderVO(RiderVO riderVO);
-}
diff --git a/ysy-common/pom.xml b/ysy-common/pom.xml
index a1fe930..bfe0c5f 100644
--- a/ysy-common/pom.xml
+++ b/ysy-common/pom.xml
@@ -167,10 +167,10 @@
             <scope>test</scope>
         </dependency>
 
+        <!-- Hibernate Validator -->
         <dependency>
-            <groupId>jakarta.validation</groupId>
-            <artifactId>jakarta.validation-api</artifactId>
-            <version>3.0.2</version>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-validation</artifactId>
         </dependency>
     </dependencies>
 </project>
\ No newline at end of file
diff --git a/ysy-common/src/main/java/com/ysy/config/MybatisPlusConfig.java b/ysy-common/src/main/java/com/ysy/common/config/MybatisPlusConfig.java
similarity index 96%
rename from ysy-common/src/main/java/com/ysy/config/MybatisPlusConfig.java
rename to ysy-common/src/main/java/com/ysy/common/config/MybatisPlusConfig.java
index 6dc78c4..2cb54bb 100644
--- a/ysy-common/src/main/java/com/ysy/config/MybatisPlusConfig.java
+++ b/ysy-common/src/main/java/com/ysy/common/config/MybatisPlusConfig.java
@@ -1,4 +1,4 @@
-package com.ysy.config;
+package com.ysy.common.config;
 
 import com.baomidou.mybatisplus.annotation.DbType;
 import com.baomidou.mybatisplus.extension.plugins.MybatisPlusInterceptor;
diff --git a/ysy-common/src/main/java/com/ysy/domain/po/Apply.java b/ysy-common/src/main/java/com/ysy/common/domain/po/Apply.java
similarity index 97%
rename from ysy-common/src/main/java/com/ysy/domain/po/Apply.java
rename to ysy-common/src/main/java/com/ysy/common/domain/po/Apply.java
index 4d08a85..2989af2 100644
--- a/ysy-common/src/main/java/com/ysy/domain/po/Apply.java
+++ b/ysy-common/src/main/java/com/ysy/common/domain/po/Apply.java
@@ -1,4 +1,4 @@
-package com.ysy.domain.po;
+package com.ysy.common.domain.po;
 
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableField;
diff --git a/ysy-common/src/main/java/com/ysy/domain/po/Record.java b/ysy-common/src/main/java/com/ysy/common/domain/po/Record.java
similarity index 95%
rename from ysy-common/src/main/java/com/ysy/domain/po/Record.java
rename to ysy-common/src/main/java/com/ysy/common/domain/po/Record.java
index f8b53f2..c16153a 100644
--- a/ysy-common/src/main/java/com/ysy/domain/po/Record.java
+++ b/ysy-common/src/main/java/com/ysy/common/domain/po/Record.java
@@ -1,4 +1,4 @@
-package com.ysy.domain.po;
+package com.ysy.common.domain.po;
 
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableField;
diff --git a/ysy-common/src/main/java/com/ysy/domain/po/Rider.java b/ysy-common/src/main/java/com/ysy/common/domain/po/Rider.java
similarity index 95%
rename from ysy-common/src/main/java/com/ysy/domain/po/Rider.java
rename to ysy-common/src/main/java/com/ysy/common/domain/po/Rider.java
index b1dc93a..98aa2e8 100644
--- a/ysy-common/src/main/java/com/ysy/domain/po/Rider.java
+++ b/ysy-common/src/main/java/com/ysy/common/domain/po/Rider.java
@@ -1,4 +1,4 @@
-package com.ysy.domain.po;
+package com.ysy.common.domain.po;
 
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
diff --git a/ysy-common/src/main/java/com/ysy/domain/result/R.java b/ysy-common/src/main/java/com/ysy/common/domain/result/R.java
similarity index 96%
rename from ysy-common/src/main/java/com/ysy/domain/result/R.java
rename to ysy-common/src/main/java/com/ysy/common/domain/result/R.java
index 28f704b..1b3b509 100644
--- a/ysy-common/src/main/java/com/ysy/domain/result/R.java
+++ b/ysy-common/src/main/java/com/ysy/common/domain/result/R.java
@@ -1,4 +1,4 @@
-package com.ysy.domain.result;
+package com.ysy.common.domain.result;
 
 import lombok.AllArgsConstructor;
 import lombok.Data;
diff --git a/ysy-common/src/main/java/com/ysy/domain/vo/RiderVO.java b/ysy-common/src/main/java/com/ysy/common/domain/vo/RiderVO.java
similarity index 91%
rename from ysy-common/src/main/java/com/ysy/domain/vo/RiderVO.java
rename to ysy-common/src/main/java/com/ysy/common/domain/vo/RiderVO.java
index 4d4fa63..3825710 100644
--- a/ysy-common/src/main/java/com/ysy/domain/vo/RiderVO.java
+++ b/ysy-common/src/main/java/com/ysy/common/domain/vo/RiderVO.java
@@ -1,4 +1,5 @@
-package com.ysy.domain.vo;
+package com.ysy.common.domain.vo;
+
 
 import jakarta.validation.constraints.NotBlank;
 import lombok.AllArgsConstructor;
diff --git a/ysy-common/src/main/java/com/ysy/exception/GlobalExceptionHandler.java b/ysy-common/src/main/java/com/ysy/common/exception/GlobalExceptionHandler.java
similarity index 57%
rename from ysy-common/src/main/java/com/ysy/exception/GlobalExceptionHandler.java
rename to ysy-common/src/main/java/com/ysy/common/exception/GlobalExceptionHandler.java
index 0d07f3d..6e1caa1 100644
--- a/ysy-common/src/main/java/com/ysy/exception/GlobalExceptionHandler.java
+++ b/ysy-common/src/main/java/com/ysy/common/exception/GlobalExceptionHandler.java
@@ -1,13 +1,12 @@
-package com.ysy.exception;
+package com.ysy.common.exception;
 
-import com.ysy.domain.result.R;
+import com.ysy.common.domain.result.R;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.context.annotation.Configuration;
+import org.springframework.web.bind.MethodArgumentNotValidException;
 import org.springframework.web.bind.annotation.ExceptionHandler;
 import org.springframework.web.bind.annotation.RestControllerAdvice;
 
-import java.util.Arrays;
-
 @RestControllerAdvice
 @Configuration
 @Slf4j
@@ -17,4 +16,10 @@ public class GlobalExceptionHandler {
         log.error("服务端报错：[{}]", e.getMessage(), e.getLocalizedMessage(), e);
         return R.fail(e.getMessage());
     }
+
+    @ExceptionHandler(MethodArgumentNotValidException.class)
+    public R methodArgumentNotValidExceptionHandler(MethodArgumentNotValidException e) {
+        log.error("服务端报错：[{}]", e.getMessage(), e.getLocalizedMessage(), e);
+        return R.fail(e.getMessage());
+    }
 }
diff --git a/ysy-common/src/main/java/com/ysy/remote/SystemClientRemote.java b/ysy-common/src/main/java/com/ysy/common/remote/SystemClientRemote.java
similarity index 50%
rename from ysy-common/src/main/java/com/ysy/remote/SystemClientRemote.java
rename to ysy-common/src/main/java/com/ysy/common/remote/SystemClientRemote.java
index 989e329..a905d57 100644
--- a/ysy-common/src/main/java/com/ysy/remote/SystemClientRemote.java
+++ b/ysy-common/src/main/java/com/ysy/common/remote/SystemClientRemote.java
@@ -1,14 +1,14 @@
-package com.ysy.remote;
+package com.ysy.common.remote;
 
-import com.ysy.domain.result.R;
+import com.ysy.common.domain.result.R;
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PathVariable;
 
-@FeignClient(value = "systemService", path = "/system")
+@FeignClient(value = "systemService", path = "/rider")
 public interface SystemClientRemote {
-    @GetMapping("/rider/{riderName}")
-    public R riderByRiderName(@PathVariable String riderName);
+    @GetMapping("/get/{riderName}")
+    R getRiderByRiderName(@PathVariable String riderName);
 
 
 }
diff --git a/ysy-common/src/main/java/com/ysy/utils/gateway/GatewayUtils.java b/ysy-common/src/main/java/com/ysy/common/utils/gateway/GatewayUtils.java
similarity index 95%
rename from ysy-common/src/main/java/com/ysy/utils/gateway/GatewayUtils.java
rename to ysy-common/src/main/java/com/ysy/common/utils/gateway/GatewayUtils.java
index 64a56a0..bca6074 100644
--- a/ysy-common/src/main/java/com/ysy/utils/gateway/GatewayUtils.java
+++ b/ysy-common/src/main/java/com/ysy/common/utils/gateway/GatewayUtils.java
@@ -1,10 +1,10 @@
-package com.ysy.utils.gateway;
+package com.ysy.common.utils.gateway;
 
 
 
 import com.alibaba.fastjson2.JSON;
-import com.ysy.domain.result.R;
-import com.ysy.utils.tools.StringUtils;
+import com.ysy.common.domain.result.R;
+import com.ysy.common.utils.tools.StringUtils;
 import lombok.extern.log4j.Log4j2;
 import org.springframework.core.io.buffer.DataBuffer;
 import org.springframework.http.HttpHeaders;
diff --git a/ysy-common/src/main/java/com/ysy/utils/jwt/JwtUtil.java b/ysy-common/src/main/java/com/ysy/common/utils/jwt/JwtUtil.java
similarity index 96%
rename from ysy-common/src/main/java/com/ysy/utils/jwt/JwtUtil.java
rename to ysy-common/src/main/java/com/ysy/common/utils/jwt/JwtUtil.java
index b363df6..6103ee9 100644
--- a/ysy-common/src/main/java/com/ysy/utils/jwt/JwtUtil.java
+++ b/ysy-common/src/main/java/com/ysy/common/utils/jwt/JwtUtil.java
@@ -1,4 +1,4 @@
-package com.ysy.utils.jwt;
+package com.ysy.common.utils.jwt;
 
 import com.auth0.jwt.JWT;
 import com.auth0.jwt.JWTVerifier;
diff --git a/ysy-common/src/main/java/com/ysy/utils/tools/StringUtils.java b/ysy-common/src/main/java/com/ysy/common/utils/tools/StringUtils.java
similarity index 97%
rename from ysy-common/src/main/java/com/ysy/utils/tools/StringUtils.java
rename to ysy-common/src/main/java/com/ysy/common/utils/tools/StringUtils.java
index 2a16e3e..8191f3a 100644
--- a/ysy-common/src/main/java/com/ysy/utils/tools/StringUtils.java
+++ b/ysy-common/src/main/java/com/ysy/common/utils/tools/StringUtils.java
@@ -1,4 +1,4 @@
-package com.ysy.utils.tools;
+package com.ysy.common.utils.tools;
 
 import org.springframework.util.AntPathMatcher;
 
diff --git a/ysy-gateway/src/main/java/com/ysy/GatewayApplication.java b/ysy-gateway/src/main/java/com/ysy/gateway/GatewayApplication.java
similarity index 70%
rename from ysy-gateway/src/main/java/com/ysy/GatewayApplication.java
rename to ysy-gateway/src/main/java/com/ysy/gateway/GatewayApplication.java
index e6abdd3..09f939b 100644
--- a/ysy-gateway/src/main/java/com/ysy/GatewayApplication.java
+++ b/ysy-gateway/src/main/java/com/ysy/gateway/GatewayApplication.java
@@ -1,11 +1,11 @@
-package com.ysy;
+package com.ysy.gateway;
 
-import com.ysy.exception.GlobalExceptionHandler;
 import org.springframework.boot.SpringApplication;
+import org.springframework.boot.autoconfigure.AutoConfiguration;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
-import org.springframework.context.annotation.Import;
 
 @SpringBootApplication
+@AutoConfiguration
 public class GatewayApplication {
     public static void main(String[] args) {
         SpringApplication.run(GatewayApplication.class, args);
diff --git a/ysy-gateway/src/main/java/com/ysy/config/AuthProperties.java b/ysy-gateway/src/main/java/com/ysy/gateway/config/AuthProperties.java
similarity index 93%
rename from ysy-gateway/src/main/java/com/ysy/config/AuthProperties.java
rename to ysy-gateway/src/main/java/com/ysy/gateway/config/AuthProperties.java
index 34c1d30..1ac9d72 100644
--- a/ysy-gateway/src/main/java/com/ysy/config/AuthProperties.java
+++ b/ysy-gateway/src/main/java/com/ysy/gateway/config/AuthProperties.java
@@ -1,4 +1,4 @@
-package com.ysy.config;
+package com.ysy.gateway.config;
 
 import lombok.Data;
 import org.springframework.boot.context.properties.ConfigurationProperties;
diff --git a/ysy-gateway/src/main/java/com/ysy/filter/GlobalAuthFilter.java b/ysy-gateway/src/main/java/com/ysy/gateway/filter/GlobalAuthFilter.java
similarity index 89%
rename from ysy-gateway/src/main/java/com/ysy/filter/GlobalAuthFilter.java
rename to ysy-gateway/src/main/java/com/ysy/gateway/filter/GlobalAuthFilter.java
index f7ac30a..ca50421 100644
--- a/ysy-gateway/src/main/java/com/ysy/filter/GlobalAuthFilter.java
+++ b/ysy-gateway/src/main/java/com/ysy/gateway/filter/GlobalAuthFilter.java
@@ -1,9 +1,9 @@
-package com.ysy.filter;
+package com.ysy.gateway.filter;
 
-import com.ysy.config.AuthProperties;
-import com.ysy.utils.gateway.GatewayUtils;
-import com.ysy.utils.jwt.JwtUtil;
-import com.ysy.utils.tools.StringUtils;
+import com.ysy.gateway.config.AuthProperties;
+import com.ysy.common.utils.gateway.GatewayUtils;
+import com.ysy.common.utils.jwt.JwtUtil;
+import com.ysy.common.utils.tools.StringUtils;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.cloud.gateway.filter.GatewayFilterChain;
diff --git a/ysy-modules/ysy-apply/src/main/java/com/ysy/ApplyServiceApplication.java b/ysy-modules/ysy-apply/src/main/java/com/ysy/apply/ApplyServiceApplication.java
similarity index 57%
rename from ysy-modules/ysy-apply/src/main/java/com/ysy/ApplyServiceApplication.java
rename to ysy-modules/ysy-apply/src/main/java/com/ysy/apply/ApplyServiceApplication.java
index 5681646..58b02ac 100644
--- a/ysy-modules/ysy-apply/src/main/java/com/ysy/ApplyServiceApplication.java
+++ b/ysy-modules/ysy-apply/src/main/java/com/ysy/apply/ApplyServiceApplication.java
@@ -1,13 +1,10 @@
-package com.ysy;
+package com.ysy.apply;
 
-import com.ysy.config.MybatisPlusConfig;
-import com.ysy.exception.GlobalExceptionHandler;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
-import org.springframework.context.annotation.Import;
 
 @SpringBootApplication
-@Import({GlobalExceptionHandler.class, MybatisPlusConfig.class})
+//@Import({GlobalExceptionHandler.class, MybatisPlusConfig.class})
 public class ApplyServiceApplication {
     public static void main(String[] args) {
         SpringApplication.run(ApplyServiceApplication.class, args);
diff --git a/ysy-modules/ysy-apply/src/main/java/com/ysy/controller/ApplyController.java b/ysy-modules/ysy-apply/src/main/java/com/ysy/apply/controller/ApplyController.java
similarity index 83%
rename from ysy-modules/ysy-apply/src/main/java/com/ysy/controller/ApplyController.java
rename to ysy-modules/ysy-apply/src/main/java/com/ysy/apply/controller/ApplyController.java
index a6693c3..83e437e 100644
--- a/ysy-modules/ysy-apply/src/main/java/com/ysy/controller/ApplyController.java
+++ b/ysy-modules/ysy-apply/src/main/java/com/ysy/apply/controller/ApplyController.java
@@ -1,7 +1,7 @@
-package com.ysy.controller;
+package com.ysy.apply.controller;
 
-import com.ysy.domain.result.R;
-import com.ysy.service.ApplyService;
+import com.ysy.apply.service.ApplyService;
+import com.ysy.common.domain.result.R;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PathVariable;
diff --git a/ysy-modules/ysy-apply/src/main/java/com/ysy/mapper/ApplyMapper.java b/ysy-modules/ysy-apply/src/main/java/com/ysy/apply/mapper/ApplyMapper.java
similarity index 71%
rename from ysy-modules/ysy-apply/src/main/java/com/ysy/mapper/ApplyMapper.java
rename to ysy-modules/ysy-apply/src/main/java/com/ysy/apply/mapper/ApplyMapper.java
index cd0a969..9e0a296 100644
--- a/ysy-modules/ysy-apply/src/main/java/com/ysy/mapper/ApplyMapper.java
+++ b/ysy-modules/ysy-apply/src/main/java/com/ysy/apply/mapper/ApplyMapper.java
@@ -1,7 +1,7 @@
-package com.ysy.mapper;
+package com.ysy.apply.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.ysy.domain.po.Apply;
+import com.ysy.common.domain.po.Apply;
 import org.apache.ibatis.annotations.Mapper;
 
 @Mapper
diff --git a/ysy-modules/ysy-apply/src/main/java/com/ysy/service/ApplyService.java b/ysy-modules/ysy-apply/src/main/java/com/ysy/apply/service/ApplyService.java
similarity index 59%
rename from ysy-modules/ysy-apply/src/main/java/com/ysy/service/ApplyService.java
rename to ysy-modules/ysy-apply/src/main/java/com/ysy/apply/service/ApplyService.java
index 5269a81..623854b 100644
--- a/ysy-modules/ysy-apply/src/main/java/com/ysy/service/ApplyService.java
+++ b/ysy-modules/ysy-apply/src/main/java/com/ysy/apply/service/ApplyService.java
@@ -1,8 +1,8 @@
-package com.ysy.service;
+package com.ysy.apply.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
-import com.ysy.domain.po.Apply;
-import com.ysy.domain.result.R;
+import com.ysy.common.domain.po.Apply;
+import com.ysy.common.domain.result.R;
 
 public interface ApplyService extends IService<Apply> {
     R getApplyList(Integer pageNum);
diff --git a/ysy-modules/ysy-apply/src/main/java/com/ysy/service/impl/ApplyServiceImpl.java b/ysy-modules/ysy-apply/src/main/java/com/ysy/apply/service/impl/ApplyServiceImpl.java
similarity index 78%
rename from ysy-modules/ysy-apply/src/main/java/com/ysy/service/impl/ApplyServiceImpl.java
rename to ysy-modules/ysy-apply/src/main/java/com/ysy/apply/service/impl/ApplyServiceImpl.java
index c4a23a6..6faa0b9 100644
--- a/ysy-modules/ysy-apply/src/main/java/com/ysy/service/impl/ApplyServiceImpl.java
+++ b/ysy-modules/ysy-apply/src/main/java/com/ysy/apply/service/impl/ApplyServiceImpl.java
@@ -1,22 +1,19 @@
-package com.ysy.service.impl;
+package com.ysy.apply.service.impl;
 
 import com.alibaba.fastjson2.JSON;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.ysy.domain.po.Apply;
-import com.ysy.domain.po.Rider;
-import com.ysy.domain.result.R;
-import com.ysy.mapper.ApplyMapper;
-import com.ysy.service.ApplyService;
+import com.ysy.common.domain.po.Apply;
+import com.ysy.common.domain.po.Rider;
+import com.ysy.common.domain.result.R;
+import com.ysy.apply.mapper.ApplyMapper;
+import com.ysy.apply.service.ApplyService;
 import jakarta.servlet.http.HttpServletRequest;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.redis.core.StringRedisTemplate;
 import org.springframework.stereotype.Service;
 
 import java.util.List;
-import java.util.function.Consumer;
 
 @Service
 public class ApplyServiceImpl extends ServiceImpl<ApplyMapper, Apply> implements ApplyService {
@@ -45,6 +42,10 @@ public class ApplyServiceImpl extends ServiceImpl<ApplyMapper, Apply> implements
                                             .eq("state", 0))
                                     .orderByDesc("order_time");
 
+//        LambdaQueryWrapper<Apply> lambdaQueryWrapper = new LambdaQueryWrapper<>();
+
+//        lambdaQueryWrapper.eq(rider.getRiderId() != null, Apply::getRiderId, rider.getRiderId());
+
         List<Apply> applyList = applyMapper.selectList(queryWrapper);
 
 //        IPage<Apply> iPage1 = iPage.setRecords(applyList);
diff --git a/ysy-modules/ysy-system/src/main/java/com/ysy/SystemServiceApplication.java b/ysy-modules/ysy-system/src/main/java/com/ysy/system/SystemServiceApplication.java
similarity index 57%
rename from ysy-modules/ysy-system/src/main/java/com/ysy/SystemServiceApplication.java
rename to ysy-modules/ysy-system/src/main/java/com/ysy/system/SystemServiceApplication.java
index 088f9f4..221a8a4 100644
--- a/ysy-modules/ysy-system/src/main/java/com/ysy/SystemServiceApplication.java
+++ b/ysy-modules/ysy-system/src/main/java/com/ysy/system/SystemServiceApplication.java
@@ -1,13 +1,9 @@
-package com.ysy;
+package com.ysy.system;
 
-import com.ysy.config.MybatisPlusConfig;
-import com.ysy.exception.GlobalExceptionHandler;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
-import org.springframework.context.annotation.Import;
 
 @SpringBootApplication
-@Import({GlobalExceptionHandler.class, MybatisPlusConfig.class})
 public class SystemServiceApplication {
     public static void main(String[] args) {
         SpringApplication.run(SystemServiceApplication.class, args);
diff --git a/ysy-modules/ysy-system/src/main/java/com/ysy/controller/SystemController.java b/ysy-modules/ysy-system/src/main/java/com/ysy/system/controller/RiderController.java
similarity index 66%
rename from ysy-modules/ysy-system/src/main/java/com/ysy/controller/SystemController.java
rename to ysy-modules/ysy-system/src/main/java/com/ysy/system/controller/RiderController.java
index 308d62b..bc952f8 100644
--- a/ysy-modules/ysy-system/src/main/java/com/ysy/controller/SystemController.java
+++ b/ysy-modules/ysy-system/src/main/java/com/ysy/system/controller/RiderController.java
@@ -1,7 +1,7 @@
-package com.ysy.controller;
+package com.ysy.system.controller;
 
-import com.ysy.domain.result.R;
-import com.ysy.service.RiderService;
+import com.ysy.common.domain.result.R;
+import com.ysy.system.service.RiderService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PathVariable;
@@ -9,13 +9,13 @@ import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
 @RestController
-@RequestMapping("/system")
-public class SystemController {
+@RequestMapping("/rider")
+public class RiderController {
     @Autowired
     private RiderService riderService;
 
-    @GetMapping("/rider/{riderName}")
-    public R riderByRiderName(@PathVariable String riderName) {
+    @GetMapping("/get/{riderName}")
+    public R getRiderByRiderName(@PathVariable String riderName) {
         return riderService.getRiderByRiderName(riderName);
     }
 
diff --git a/ysy-modules/ysy-system/src/main/java/com/ysy/mapper/RiderMapper.java b/ysy-modules/ysy-system/src/main/java/com/ysy/system/mapper/RiderMapper.java
similarity index 70%
rename from ysy-modules/ysy-system/src/main/java/com/ysy/mapper/RiderMapper.java
rename to ysy-modules/ysy-system/src/main/java/com/ysy/system/mapper/RiderMapper.java
index 5ef5b80..26b250d 100644
--- a/ysy-modules/ysy-system/src/main/java/com/ysy/mapper/RiderMapper.java
+++ b/ysy-modules/ysy-system/src/main/java/com/ysy/system/mapper/RiderMapper.java
@@ -1,7 +1,7 @@
-package com.ysy.mapper;
+package com.ysy.system.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.ysy.domain.po.Rider;
+import com.ysy.common.domain.po.Rider;
 import org.apache.ibatis.annotations.Mapper;
 
 @Mapper
diff --git a/ysy-modules/ysy-system/src/main/java/com/ysy/service/RiderService.java b/ysy-modules/ysy-system/src/main/java/com/ysy/system/service/RiderService.java
similarity index 63%
rename from ysy-modules/ysy-system/src/main/java/com/ysy/service/RiderService.java
rename to ysy-modules/ysy-system/src/main/java/com/ysy/system/service/RiderService.java
index e5660d3..88f687d 100644
--- a/ysy-modules/ysy-system/src/main/java/com/ysy/service/RiderService.java
+++ b/ysy-modules/ysy-system/src/main/java/com/ysy/system/service/RiderService.java
@@ -1,8 +1,8 @@
-package com.ysy.service;
+package com.ysy.system.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
-import com.ysy.domain.po.Rider;
-import com.ysy.domain.result.R;
+import com.ysy.common.domain.po.Rider;
+import com.ysy.common.domain.result.R;
 
 public interface RiderService extends IService<Rider> {
     R getRiderByRiderName(String riderName);
diff --git a/ysy-modules/ysy-system/src/main/java/com/ysy/service/impl/RiderServiceImpl.java b/ysy-modules/ysy-system/src/main/java/com/ysy/system/service/impl/RiderServiceImpl.java
similarity index 83%
rename from ysy-modules/ysy-system/src/main/java/com/ysy/service/impl/RiderServiceImpl.java
rename to ysy-modules/ysy-system/src/main/java/com/ysy/system/service/impl/RiderServiceImpl.java
index c7532c5..f824f99 100644
--- a/ysy-modules/ysy-system/src/main/java/com/ysy/service/impl/RiderServiceImpl.java
+++ b/ysy-modules/ysy-system/src/main/java/com/ysy/system/service/impl/RiderServiceImpl.java
@@ -1,13 +1,12 @@
-package com.ysy.service.impl;
+package com.ysy.system.service.impl;
 
 import com.alibaba.fastjson2.JSON;
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.ysy.domain.po.Rider;
-import com.ysy.domain.result.R;
-import com.ysy.mapper.RiderMapper;
-import com.ysy.service.RiderService;
+import com.ysy.common.domain.po.Rider;
+import com.ysy.common.domain.result.R;
+import com.ysy.system.mapper.RiderMapper;
+import com.ysy.system.service.RiderService;
 import jakarta.servlet.http.HttpServletRequest;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;