sheyu
/
senior_grade5_week01
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

修改

master
Sheyu-yao 2024-01-14 20:20:58 +08:00
parent 5ad9419e4e
commit 05aa6865f6
32 changed files with 221 additions and 150 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
.idea/vcs.xml 100644
View File

@ -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>

163
.idea/workspace.xml
View File

@ -4,7 +4,39 @@
<option name="autoReloadType" value="SELECTIVE" /> <option name="autoReloadType" value="SELECTIVE" />
</component> </component>
<component name="ChangeListManager"> <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="SHOW_DIALOG" value="false" />
<option name="HIGHLIGHT_CONFLICTS" value="true" /> <option name="HIGHLIGHT_CONFLICTS" value="true" />
<option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" /> <option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" />
@ -18,6 +50,9 @@
</list> </list>
</option> </option>
</component> </component>
<component name="Git.Settings">
<option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$" />
</component>
<component name="MavenImportPreferences"> <component name="MavenImportPreferences">
<option name="generalSettings"> <option name="generalSettings">
<MavenGeneralSettings> <MavenGeneralSettings>
@ -26,36 +61,43 @@
</MavenGeneralSettings> </MavenGeneralSettings>
</option> </option>
</component> </component>
<component name="ProjectColorInfo"><![CDATA[{ <component name="ProjectColorInfo">{
"associatedIndex": 6 &quot;associatedIndex&quot;: 6
}]]></component> }</component>
<component name="ProjectId" id="2apjXkTQBGD1Lya9b7KwYJoFZ8H" /> <component name="ProjectId" id="2apjXkTQBGD1Lya9b7KwYJoFZ8H" />
<component name="ProjectLevelVcsManager">
<ConfirmationsSetting value="1" id="Add" />
</component>
<component name="ProjectViewState"> <component name="ProjectViewState">
<option name="hideEmptyMiddlePackages" value="true" /> <option name="hideEmptyMiddlePackages" value="true" />
<option name="showLibraryContents" value="true" /> <option name="showLibraryContents" value="true" />
</component> </component>
<component name="PropertiesComponent"><![CDATA[{ <component name="PropertiesComponent">{
"keyToString": { &quot;keyToString&quot;: {
"RequestMappingsPanelOrder0": "0", &quot;RequestMappingsPanelOrder0&quot;: &quot;0&quot;,
"RequestMappingsPanelOrder1": "1", &quot;RequestMappingsPanelOrder1&quot;: &quot;1&quot;,
"RequestMappingsPanelWidth0": "75", &quot;RequestMappingsPanelWidth0&quot;: &quot;75&quot;,
"RequestMappingsPanelWidth1": "75", &quot;RequestMappingsPanelWidth1&quot;: &quot;75&quot;,
"RunOnceActivity.OpenProjectViewOnStart": "true", &quot;RunOnceActivity.OpenProjectViewOnStart&quot;: &quot;true&quot;,
"RunOnceActivity.ShowReadmeOnStart": "true", &quot;RunOnceActivity.ShowReadmeOnStart&quot;: &quot;true&quot;,
"WebServerToolWindowFactoryState": "false", &quot;SHARE_PROJECT_CONFIGURATION_FILES&quot;: &quot;true&quot;,
"jdk.selected.JAVA_MODULE": "17", &quot;WebServerToolWindowFactoryState&quot;: &quot;false&quot;,
"last_opened_file_path": "C:/Users/Hasee/Desktop/senior_grade5_week01/ysy-modules/ysy-apply/src/main/resources", &quot;git-widget-placeholder&quot;: &quot;master&quot;,
"node.js.detected.package.eslint": "true", &quot;jdk.selected.JAVA_MODULE&quot;: &quot;17&quot;,
"node.js.detected.package.tslint": "true", &quot;last_opened_file_path&quot;: &quot;C:/Users/Hasee/Desktop/senior_grade5_week01/ysy-modules/ysy-apply/src/main/resources&quot;,
"node.js.selected.package.eslint": "(autodetect)", &quot;node.js.detected.package.eslint&quot;: &quot;true&quot;,
"node.js.selected.package.tslint": "(autodetect)", &quot;node.js.detected.package.tslint&quot;: &quot;true&quot;,
"project.structure.last.edited": "Modules", &quot;node.js.selected.package.eslint&quot;: &quot;(autodetect)&quot;,
"project.structure.proportion": "0.0", &quot;node.js.selected.package.tslint&quot;: &quot;(autodetect)&quot;,
"project.structure.side.proportion": "0.0", &quot;nodejs_package_manager_path&quot;: &quot;npm&quot;,
"settings.editor.selected.configurable": "editor.preferences.tabs", &quot;project.structure.last.edited&quot;: &quot;Project&quot;,
"vue.rearranger.settings.migration": "true" &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"> <component name="ReactorSettings">
<option name="notificationShown" value="true" /> <option name="notificationShown" value="true" />
</component> </component>
@ -79,13 +121,13 @@
</set> </set>
</option> </option>
</component> </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"> <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" /> <module name="ysy-system" />
<extension name="coverage"> <extension name="coverage">
<pattern> <pattern>
<option name="PATTERN" value="com.ysy.*" /> <option name="PATTERN" value="com.ysy.auth.*" />
<option name="ENABLED" value="true" /> <option name="ENABLED" value="true" />
</pattern> </pattern>
</extension> </extension>
@ -95,10 +137,10 @@
</configuration> </configuration>
<configuration name="ApplyServiceApplication" type="SpringBootApplicationConfigurationType" factoryName="Spring Boot" temporary="true" nameIsGenerated="true"> <configuration name="ApplyServiceApplication" type="SpringBootApplicationConfigurationType" factoryName="Spring Boot" temporary="true" nameIsGenerated="true">
<module name="ysy-apply" /> <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"> <extension name="coverage">
<pattern> <pattern>
<option name="PATTERN" value="com.ysy.*" /> <option name="PATTERN" value="com.ysy.apply.*" />
<option name="ENABLED" value="true" /> <option name="ENABLED" value="true" />
</pattern> </pattern>
</extension> </extension>
@ -108,10 +150,10 @@
</configuration> </configuration>
<configuration name="AuthServiceApplication" type="SpringBootApplicationConfigurationType" factoryName="Spring Boot" temporary="true" nameIsGenerated="true"> <configuration name="AuthServiceApplication" type="SpringBootApplicationConfigurationType" factoryName="Spring Boot" temporary="true" nameIsGenerated="true">
<module name="ysy-auth" /> <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"> <extension name="coverage">
<pattern> <pattern>
<option name="PATTERN" value="com.ysy.*" /> <option name="PATTERN" value="com.ysy.auth.*" />
<option name="ENABLED" value="true" /> <option name="ENABLED" value="true" />
</pattern> </pattern>
</extension> </extension>
@ -121,10 +163,10 @@
</configuration> </configuration>
<configuration name="GatewayApplication" type="SpringBootApplicationConfigurationType" factoryName="Spring Boot" temporary="true" nameIsGenerated="true"> <configuration name="GatewayApplication" type="SpringBootApplicationConfigurationType" factoryName="Spring Boot" temporary="true" nameIsGenerated="true">
<module name="ysy-gateway" /> <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"> <extension name="coverage">
<pattern> <pattern>
<option name="PATTERN" value="com.ysy.*" /> <option name="PATTERN" value="com.ysy.gateway.*" />
<option name="ENABLED" value="true" /> <option name="ENABLED" value="true" />
</pattern> </pattern>
</extension> </extension>
@ -134,10 +176,10 @@
</configuration> </configuration>
<configuration name="SystemServiceApplication" type="SpringBootApplicationConfigurationType" factoryName="Spring Boot" temporary="true" nameIsGenerated="true"> <configuration name="SystemServiceApplication" type="SpringBootApplicationConfigurationType" factoryName="Spring Boot" temporary="true" nameIsGenerated="true">
<module name="ysy-system" /> <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"> <extension name="coverage">
<pattern> <pattern>
<option name="PATTERN" value="com.ysy.*" /> <option name="PATTERN" value="com.ysy.system.*" />
<option name="ENABLED" value="true" /> <option name="ENABLED" value="true" />
</pattern> </pattern>
</extension> </extension>
@ -148,8 +190,8 @@
<recent_temporary> <recent_temporary>
<list> <list>
<item itemvalue="Spring Boot.SystemServiceApplication" /> <item itemvalue="Spring Boot.SystemServiceApplication" />
<item itemvalue="Spring Boot.GatewayApplication" />
<item itemvalue="Spring Boot.AuthServiceApplication" /> <item itemvalue="Spring Boot.AuthServiceApplication" />
<item itemvalue="Spring Boot.GatewayApplication" />
<item itemvalue="Spring Boot.ApplyServiceApplication" /> <item itemvalue="Spring Boot.ApplyServiceApplication" />
<item itemvalue="Application.SystemServiceApplication" /> <item itemvalue="Application.SystemServiceApplication" />
</list> </list>
@ -163,22 +205,49 @@
<option name="number" value="Default" /> <option name="number" value="Default" />
<option name="presentableId" value="Default" /> <option name="presentableId" value="Default" />
<updated>1705022459502</updated> <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>
<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 /> <servers />
</component> </component>
<component name="TypeScriptGeneratedFilesManager"> <component name="TypeScriptGeneratedFilesManager">
<option name="version" value="3" /> <option name="version" value="3" />
</component> </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"> <component name="XDebuggerManager">
<breakpoint-manager> <watches-manager>
<breakpoints> <configuration name="SpringBootApplicationConfigurationType">
<line-breakpoint enabled="true" type="java-line"> <watch expression="configurations.get(1)" />
<url>file://$PROJECT_DIR$/ysy-auth/src/main/java/com/ysy/service/impl/AuthServiceImpl.java</url> <watch expression="configurations.get(0)" />
<line>30</line> </configuration>
<option name="timeStamp" value="6" /> </watches-manager>
</line-breakpoint> </component>
</breakpoints> <component name="XSLT-Support.FileAssociations.UIState">
</breakpoint-manager> <expand />
<select />
</component> </component>
</project> </project>

7
ysy-auth/src/main/java/com/ysy/AuthServiceApplication.java → ysy-auth/src/main/java/com/ysy/auth/AuthServiceApplication.java
View File

@ -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.SpringApplication;
import org.springframework.boot.autoconfigure.SpringBootApplication; import org.springframework.boot.autoconfigure.SpringBootApplication;
import org.springframework.cloud.openfeign.EnableFeignClients; import org.springframework.cloud.openfeign.EnableFeignClients;
import org.springframework.context.annotation.Import;
@SpringBootApplication @SpringBootApplication
@EnableFeignClients(basePackages = "com.ysy.remote") @EnableFeignClients(basePackages = "com.ysy.common.remote")
@Import({GlobalExceptionHandler.class})
public class AuthServiceApplication { public class AuthServiceApplication {
public static void main(String[] args) { public static void main(String[] args) {
SpringApplication.run(AuthServiceApplication.class, args); SpringApplication.run(AuthServiceApplication.class, args);

8
ysy-auth/src/main/java/com/ysy/controller/AuthController.java → ysy-auth/src/main/java/com/ysy/auth/controller/AuthController.java
View File

@ -1,8 +1,8 @@
package com.ysy.controller; package com.ysy.auth.controller;
import com.ysy.domain.result.R; import com.ysy.common.domain.result.R;
import com.ysy.domain.vo.RiderVO; import com.ysy.common.domain.vo.RiderVO;
import com.ysy.service.AuthService; import com.ysy.auth.service.AuthService;
import org.springframework.validation.annotation.Validated; import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestBody;

8
ysy-auth/src/main/java/com/ysy/auth/service/AuthService.java 100644
View File

@ -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);
}

18
ysy-auth/src/main/java/com/ysy/service/impl/AuthServiceImpl.java → ysy-auth/src/main/java/com/ysy/auth/service/impl/AuthServiceImpl.java
View File

@ -1,13 +1,13 @@
package com.ysy.service.impl; package com.ysy.auth.service.impl;
import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.bean.BeanUtil;
import com.alibaba.fastjson2.JSON; import com.alibaba.fastjson2.JSON;
import com.ysy.domain.po.Rider; import com.ysy.common.domain.po.Rider;
import com.ysy.domain.result.R; import com.ysy.common.domain.result.R;
import com.ysy.domain.vo.RiderVO; import com.ysy.common.domain.vo.RiderVO;
import com.ysy.remote.SystemClientRemote; import com.ysy.common.remote.SystemClientRemote;
import com.ysy.service.AuthService; import com.ysy.auth.service.AuthService;
import com.ysy.utils.jwt.JwtUtil; import com.ysy.common.utils.jwt.JwtUtil;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.data.redis.core.StringRedisTemplate; import org.springframework.data.redis.core.StringRedisTemplate;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
@ -28,10 +28,10 @@ public class AuthServiceImpl implements AuthService {
@Override @Override
public R authLoginByRiderVO(RiderVO riderVO) { 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); Rider rider = JSON.parseObject(JSON.toJSONString(result.getData().get("rider")), Rider.class);

8
ysy-auth/src/main/java/com/ysy/service/AuthService.java
View File

@ -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);
}

6
ysy-common/pom.xml
View File

@ -167,10 +167,10 @@
<scope>test</scope> <scope>test</scope>
</dependency> </dependency>
<!-- Hibernate Validator -->
<dependency> <dependency>
<groupId>jakarta.validation</groupId> <groupId>org.springframework.boot</groupId>
<artifactId>jakarta.validation-api</artifactId> <artifactId>spring-boot-starter-validation</artifactId>
<version>3.0.2</version>
</dependency> </dependency>
</dependencies> </dependencies>
</project> </project>

2
ysy-common/src/main/java/com/ysy/config/MybatisPlusConfig.java → ysy-common/src/main/java/com/ysy/common/config/MybatisPlusConfig.java
View File

@ -1,4 +1,4 @@
package com.ysy.config; package com.ysy.common.config;
import com.baomidou.mybatisplus.annotation.DbType; import com.baomidou.mybatisplus.annotation.DbType;
import com.baomidou.mybatisplus.extension.plugins.MybatisPlusInterceptor; import com.baomidou.mybatisplus.extension.plugins.MybatisPlusInterceptor;

2
ysy-common/src/main/java/com/ysy/domain/po/Apply.java → ysy-common/src/main/java/com/ysy/common/domain/po/Apply.java
View File

@ -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.IdType;
import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableField;

2
ysy-common/src/main/java/com/ysy/domain/po/Record.java → ysy-common/src/main/java/com/ysy/common/domain/po/Record.java
View File

@ -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.IdType;
import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableField;

2
ysy-common/src/main/java/com/ysy/domain/po/Rider.java → ysy-common/src/main/java/com/ysy/common/domain/po/Rider.java
View File

@ -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.TableField;
import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableId;

2
ysy-common/src/main/java/com/ysy/domain/result/R.java → ysy-common/src/main/java/com/ysy/common/domain/result/R.java
View File

@ -1,4 +1,4 @@
package com.ysy.domain.result; package com.ysy.common.domain.result;
import lombok.AllArgsConstructor; import lombok.AllArgsConstructor;
import lombok.Data; import lombok.Data;

3
ysy-common/src/main/java/com/ysy/domain/vo/RiderVO.java → ysy-common/src/main/java/com/ysy/common/domain/vo/RiderVO.java
View File

@ -1,4 +1,5 @@
package com.ysy.domain.vo; package com.ysy.common.domain.vo;
import jakarta.validation.constraints.NotBlank; import jakarta.validation.constraints.NotBlank;
import lombok.AllArgsConstructor; import lombok.AllArgsConstructor;

13
ysy-common/src/main/java/com/ysy/exception/GlobalExceptionHandler.java → ysy-common/src/main/java/com/ysy/common/exception/GlobalExceptionHandler.java
View File

@ -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 lombok.extern.slf4j.Slf4j;
import org.springframework.context.annotation.Configuration; 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.ExceptionHandler;
import org.springframework.web.bind.annotation.RestControllerAdvice; import org.springframework.web.bind.annotation.RestControllerAdvice;
import java.util.Arrays;
@RestControllerAdvice @RestControllerAdvice
@Configuration @Configuration
@Slf4j @Slf4j
@ -17,4 +16,10 @@ public class GlobalExceptionHandler {
log.error("服务端报错：[{}]", e.getMessage(), e.getLocalizedMessage(), e); log.error("服务端报错：[{}]", e.getMessage(), e.getLocalizedMessage(), e);
return R.fail(e.getMessage()); 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());
}
} }

10
ysy-common/src/main/java/com/ysy/remote/SystemClientRemote.java → ysy-common/src/main/java/com/ysy/common/remote/SystemClientRemote.java
View File

@ -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.cloud.openfeign.FeignClient;
import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PathVariable; import org.springframework.web.bind.annotation.PathVariable;
@FeignClient(value = "systemService", path = "/system") @FeignClient(value = "systemService", path = "/rider")
public interface SystemClientRemote { public interface SystemClientRemote {
@GetMapping("/rider/{riderName}") @GetMapping("/get/{riderName}")
public R riderByRiderName(@PathVariable String riderName); R getRiderByRiderName(@PathVariable String riderName);
} }

6
ysy-common/src/main/java/com/ysy/utils/gateway/GatewayUtils.java → ysy-common/src/main/java/com/ysy/common/utils/gateway/GatewayUtils.java
View File

@ -1,10 +1,10 @@
package com.ysy.utils.gateway; package com.ysy.common.utils.gateway;
import com.alibaba.fastjson2.JSON; import com.alibaba.fastjson2.JSON;
import com.ysy.domain.result.R; import com.ysy.common.domain.result.R;
import com.ysy.utils.tools.StringUtils; import com.ysy.common.utils.tools.StringUtils;
import lombok.extern.log4j.Log4j2; import lombok.extern.log4j.Log4j2;
import org.springframework.core.io.buffer.DataBuffer; import org.springframework.core.io.buffer.DataBuffer;
import org.springframework.http.HttpHeaders; import org.springframework.http.HttpHeaders;

2
ysy-common/src/main/java/com/ysy/utils/jwt/JwtUtil.java → ysy-common/src/main/java/com/ysy/common/utils/jwt/JwtUtil.java
View File

@ -1,4 +1,4 @@
package com.ysy.utils.jwt; package com.ysy.common.utils.jwt;
import com.auth0.jwt.JWT; import com.auth0.jwt.JWT;
import com.auth0.jwt.JWTVerifier; import com.auth0.jwt.JWTVerifier;

2
ysy-common/src/main/java/com/ysy/utils/tools/StringUtils.java → ysy-common/src/main/java/com/ysy/common/utils/tools/StringUtils.java
View File

@ -1,4 +1,4 @@
package com.ysy.utils.tools; package com.ysy.common.utils.tools;
import org.springframework.util.AntPathMatcher; import org.springframework.util.AntPathMatcher;

6
ysy-gateway/src/main/java/com/ysy/GatewayApplication.java → ysy-gateway/src/main/java/com/ysy/gateway/GatewayApplication.java
View File

@ -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.SpringApplication;
import org.springframework.boot.autoconfigure.AutoConfiguration;
import org.springframework.boot.autoconfigure.SpringBootApplication; import org.springframework.boot.autoconfigure.SpringBootApplication;
import org.springframework.context.annotation.Import;
@SpringBootApplication @SpringBootApplication
@AutoConfiguration
public class GatewayApplication { public class GatewayApplication {
public static void main(String[] args) { public static void main(String[] args) {
SpringApplication.run(GatewayApplication.class, args); SpringApplication.run(GatewayApplication.class, args);

2
ysy-gateway/src/main/java/com/ysy/config/AuthProperties.java → ysy-gateway/src/main/java/com/ysy/gateway/config/AuthProperties.java
View File

@ -1,4 +1,4 @@
package com.ysy.config; package com.ysy.gateway.config;
import lombok.Data; import lombok.Data;
import org.springframework.boot.context.properties.ConfigurationProperties; import org.springframework.boot.context.properties.ConfigurationProperties;

10
ysy-gateway/src/main/java/com/ysy/filter/GlobalAuthFilter.java → ysy-gateway/src/main/java/com/ysy/gateway/filter/GlobalAuthFilter.java
View File

@ -1,9 +1,9 @@
package com.ysy.filter; package com.ysy.gateway.filter;
import com.ysy.config.AuthProperties; import com.ysy.gateway.config.AuthProperties;
import com.ysy.utils.gateway.GatewayUtils; import com.ysy.common.utils.gateway.GatewayUtils;
import com.ysy.utils.jwt.JwtUtil; import com.ysy.common.utils.jwt.JwtUtil;
import com.ysy.utils.tools.StringUtils; import com.ysy.common.utils.tools.StringUtils;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.cloud.gateway.filter.GatewayFilterChain; import org.springframework.cloud.gateway.filter.GatewayFilterChain;

7
ysy-modules/ysy-apply/src/main/java/com/ysy/ApplyServiceApplication.java → ysy-modules/ysy-apply/src/main/java/com/ysy/apply/ApplyServiceApplication.java
View File

@ -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.SpringApplication;
import org.springframework.boot.autoconfigure.SpringBootApplication; import org.springframework.boot.autoconfigure.SpringBootApplication;
import org.springframework.context.annotation.Import;
@SpringBootApplication @SpringBootApplication
@Import({GlobalExceptionHandler.class, MybatisPlusConfig.class}) //@Import({GlobalExceptionHandler.class, MybatisPlusConfig.class})
public class ApplyServiceApplication { public class ApplyServiceApplication {
public static void main(String[] args) { public static void main(String[] args) {
SpringApplication.run(ApplyServiceApplication.class, args); SpringApplication.run(ApplyServiceApplication.class, args);

6
ysy-modules/ysy-apply/src/main/java/com/ysy/controller/ApplyController.java → ysy-modules/ysy-apply/src/main/java/com/ysy/apply/controller/ApplyController.java
View File

@ -1,7 +1,7 @@
package com.ysy.controller; package com.ysy.apply.controller;
import com.ysy.domain.result.R; import com.ysy.apply.service.ApplyService;
import com.ysy.service.ApplyService; import com.ysy.common.domain.result.R;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PathVariable; import org.springframework.web.bind.annotation.PathVariable;

4
ysy-modules/ysy-apply/src/main/java/com/ysy/mapper/ApplyMapper.java → ysy-modules/ysy-apply/src/main/java/com/ysy/apply/mapper/ApplyMapper.java
View File

@ -1,7 +1,7 @@
package com.ysy.mapper; package com.ysy.apply.mapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper; 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; import org.apache.ibatis.annotations.Mapper;
@Mapper @Mapper

6
ysy-modules/ysy-apply/src/main/java/com/ysy/service/ApplyService.java → ysy-modules/ysy-apply/src/main/java/com/ysy/apply/service/ApplyService.java
View File

@ -1,8 +1,8 @@
package com.ysy.service; package com.ysy.apply.service;
import com.baomidou.mybatisplus.extension.service.IService; import com.baomidou.mybatisplus.extension.service.IService;
import com.ysy.domain.po.Apply; import com.ysy.common.domain.po.Apply;
import com.ysy.domain.result.R; import com.ysy.common.domain.result.R;
public interface ApplyService extends IService<Apply> { public interface ApplyService extends IService<Apply> {
R getApplyList(Integer pageNum); R getApplyList(Integer pageNum);

19
ysy-modules/ysy-apply/src/main/java/com/ysy/service/impl/ApplyServiceImpl.java → ysy-modules/ysy-apply/src/main/java/com/ysy/apply/service/impl/ApplyServiceImpl.java
View File

@ -1,22 +1,19 @@
package com.ysy.service.impl; package com.ysy.apply.service.impl;
import com.alibaba.fastjson2.JSON; import com.alibaba.fastjson2.JSON;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; 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.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.ysy.domain.po.Apply; import com.ysy.common.domain.po.Apply;
import com.ysy.domain.po.Rider; import com.ysy.common.domain.po.Rider;
import com.ysy.domain.result.R; import com.ysy.common.domain.result.R;
import com.ysy.mapper.ApplyMapper; import com.ysy.apply.mapper.ApplyMapper;
import com.ysy.service.ApplyService; import com.ysy.apply.service.ApplyService;
import jakarta.servlet.http.HttpServletRequest; import jakarta.servlet.http.HttpServletRequest;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.data.redis.core.StringRedisTemplate; import org.springframework.data.redis.core.StringRedisTemplate;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import java.util.List; import java.util.List;
import java.util.function.Consumer;
@Service @Service
public class ApplyServiceImpl extends ServiceImpl<ApplyMapper, Apply> implements ApplyService { public class ApplyServiceImpl extends ServiceImpl<ApplyMapper, Apply> implements ApplyService {
@ -45,6 +42,10 @@ public class ApplyServiceImpl extends ServiceImpl<ApplyMapper, Apply> implements
.eq("state", 0)) .eq("state", 0))
.orderByDesc("order_time"); .orderByDesc("order_time");
// LambdaQueryWrapper<Apply> lambdaQueryWrapper = new LambdaQueryWrapper<>();
// lambdaQueryWrapper.eq(rider.getRiderId() != null, Apply::getRiderId, rider.getRiderId());
List<Apply> applyList = applyMapper.selectList(queryWrapper); List<Apply> applyList = applyMapper.selectList(queryWrapper);
// IPage<Apply> iPage1 = iPage.setRecords(applyList); // IPage<Apply> iPage1 = iPage.setRecords(applyList);

6
ysy-modules/ysy-system/src/main/java/com/ysy/SystemServiceApplication.java → ysy-modules/ysy-system/src/main/java/com/ysy/system/SystemServiceApplication.java
View File

@ -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.SpringApplication;
import org.springframework.boot.autoconfigure.SpringBootApplication; import org.springframework.boot.autoconfigure.SpringBootApplication;
import org.springframework.context.annotation.Import;
@SpringBootApplication @SpringBootApplication
@Import({GlobalExceptionHandler.class, MybatisPlusConfig.class})
public class SystemServiceApplication { public class SystemServiceApplication {
public static void main(String[] args) { public static void main(String[] args) {
SpringApplication.run(SystemServiceApplication.class, args); SpringApplication.run(SystemServiceApplication.class, args);

14
ysy-modules/ysy-system/src/main/java/com/ysy/controller/SystemController.java → ysy-modules/ysy-system/src/main/java/com/ysy/system/controller/RiderController.java
View File

@ -1,7 +1,7 @@
package com.ysy.controller; package com.ysy.system.controller;
import com.ysy.domain.result.R; import com.ysy.common.domain.result.R;
import com.ysy.service.RiderService; import com.ysy.system.service.RiderService;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PathVariable; 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; import org.springframework.web.bind.annotation.RestController;
@RestController @RestController
@RequestMapping("/system") @RequestMapping("/rider")
public class SystemController { public class RiderController {
@Autowired @Autowired
private RiderService riderService; private RiderService riderService;
@GetMapping("/rider/{riderName}") @GetMapping("/get/{riderName}")
public R riderByRiderName(@PathVariable String riderName) { public R getRiderByRiderName(@PathVariable String riderName) {
return riderService.getRiderByRiderName(riderName); return riderService.getRiderByRiderName(riderName);
} }

4
ysy-modules/ysy-system/src/main/java/com/ysy/mapper/RiderMapper.java → ysy-modules/ysy-system/src/main/java/com/ysy/system/mapper/RiderMapper.java
View File

@ -1,7 +1,7 @@
package com.ysy.mapper; package com.ysy.system.mapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper; 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; import org.apache.ibatis.annotations.Mapper;
@Mapper @Mapper

6
ysy-modules/ysy-system/src/main/java/com/ysy/service/RiderService.java → ysy-modules/ysy-system/src/main/java/com/ysy/system/service/RiderService.java
View File

@ -1,8 +1,8 @@
package com.ysy.service; package com.ysy.system.service;
import com.baomidou.mybatisplus.extension.service.IService; import com.baomidou.mybatisplus.extension.service.IService;
import com.ysy.domain.po.Rider; import com.ysy.common.domain.po.Rider;
import com.ysy.domain.result.R; import com.ysy.common.domain.result.R;
public interface RiderService extends IService<Rider> { public interface RiderService extends IService<Rider> {
R getRiderByRiderName(String riderName); R getRiderByRiderName(String riderName);

11
ysy-modules/ysy-system/src/main/java/com/ysy/service/impl/RiderServiceImpl.java → ysy-modules/ysy-system/src/main/java/com/ysy/system/service/impl/RiderServiceImpl.java
View File

@ -1,13 +1,12 @@
package com.ysy.service.impl; package com.ysy.system.service.impl;
import com.alibaba.fastjson2.JSON; 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.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.ysy.domain.po.Rider; import com.ysy.common.domain.po.Rider;
import com.ysy.domain.result.R; import com.ysy.common.domain.result.R;
import com.ysy.mapper.RiderMapper; import com.ysy.system.mapper.RiderMapper;
import com.ysy.service.RiderService; import com.ysy.system.service.RiderService;
import jakarta.servlet.http.HttpServletRequest; import jakarta.servlet.http.HttpServletRequest;
import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;