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 @@
+
+
+
+
+
+
\ 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 @@
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -18,6 +50,9 @@
+
+
+
-
+ {
+ "associatedIndex": 6
+}
+
+
+
- {
+ "keyToString": {
+ "RequestMappingsPanelOrder0": "0",
+ "RequestMappingsPanelOrder1": "1",
+ "RequestMappingsPanelWidth0": "75",
+ "RequestMappingsPanelWidth1": "75",
+ "RunOnceActivity.OpenProjectViewOnStart": "true",
+ "RunOnceActivity.ShowReadmeOnStart": "true",
+ "SHARE_PROJECT_CONFIGURATION_FILES": "true",
+ "WebServerToolWindowFactoryState": "false",
+ "git-widget-placeholder": "master",
+ "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)",
+ "nodejs_package_manager_path": "npm",
+ "project.structure.last.edited": "Project",
+ "project.structure.proportion": "0.15",
+ "project.structure.side.proportion": "0.2",
+ "settings.editor.selected.configurable": "reference.settings.project.maven.runner",
+ "spring.configuration.checksum": "60d9e760ae25323a26478f12f86db80c",
+ "vue.rearranger.settings.migration": "true"
}
-}]]>
+}
@@ -79,13 +121,13 @@
-
+
-
+
-
+
@@ -95,10 +137,10 @@
-
+
-
+
@@ -108,10 +150,10 @@
-
+
-
+
@@ -121,10 +163,10 @@
-
+
-
+
@@ -134,10 +176,10 @@
-
+
-
+
@@ -148,8 +190,8 @@
@@ -163,22 +205,49 @@
1705022459502
-
+
+
+
+
+
+ 1705040594040
+
+
+
+ 1705040594041
+
+
+
+
+
+
+
+
+
-
-
-
- file://$PROJECT_DIR$/ysy-auth/src/main/java/com/ysy/service/impl/AuthServiceImpl.java
- 30
-
-
-
-
+
+
+
+
+
+
+
+
+
+
\ 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 @@
test
+
- jakarta.validation
- jakarta.validation-api
- 3.0.2
+ org.springframework.boot
+ spring-boot-starter-validation
\ 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 {
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 implements ApplyService {
@@ -45,6 +42,10 @@ public class ApplyServiceImpl extends ServiceImpl implements
.eq("state", 0))
.orderByDesc("order_time");
+// LambdaQueryWrapper lambdaQueryWrapper = new LambdaQueryWrapper<>();
+
+// lambdaQueryWrapper.eq(rider.getRiderId() != null, Apply::getRiderId, rider.getRiderId());
+
List applyList = applyMapper.selectList(queryWrapper);
// IPage 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 {
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;