diff --git a/.gitignore b/.gitignore
index dc2ee1b..3310649 100644
--- a/.gitignore
+++ b/.gitignore
@@ -4,7 +4,8 @@ target/
!**/src/test/**/target/
### IntelliJ IDEA ###
-/.idea/
+.idea
+.idea/*.xml
.idea/modules.xml
.idea/jarRepositories.xml
.idea/compiler.xml
diff --git a/.idea/encodings.xml b/.idea/encodings.xml
deleted file mode 100644
index 75f1872..0000000
--- a/.idea/encodings.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/misc.xml b/.idea/misc.xml
deleted file mode 100644
index 82dbec8..0000000
--- a/.idea/misc.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/uiDesigner.xml b/.idea/uiDesigner.xml
deleted file mode 100644
index 2b63946..0000000
--- a/.idea/uiDesigner.xml
+++ /dev/null
@@ -1,124 +0,0 @@
-
-
-
-
- -
-
-
- -
-
-
- -
-
-
- -
-
-
- -
-
-
-
-
-
- -
-
-
-
-
-
- -
-
-
-
-
-
- -
-
-
-
-
-
- -
-
-
-
-
- -
-
-
-
-
- -
-
-
-
-
- -
-
-
-
-
- -
-
-
-
-
- -
-
-
-
-
- -
-
-
- -
-
-
-
-
- -
-
-
-
-
- -
-
-
-
-
- -
-
-
-
-
- -
-
-
-
-
- -
-
-
- -
-
-
- -
-
-
- -
-
-
- -
-
-
-
-
- -
-
-
- -
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/vcs.xml b/.idea/vcs.xml
deleted file mode 100644
index 94a25f7..0000000
--- a/.idea/vcs.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/workspace.xml b/.idea/workspace.xml
deleted file mode 100644
index f77da27..0000000
--- a/.idea/workspace.xml
+++ /dev/null
@@ -1,253 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- {
- "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"
- }
-}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- 1705022459502
-
-
- 1705022459502
-
-
-
-
-
-
- 1705040594040
-
-
-
- 1705040594041
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/ysy-auth/src/main/java/com/ysy/auth/AuthServiceApplication.java b/ysy-auth/src/main/java/com/ysy/auth/AuthServiceApplication.java
index d1645c8..589b3b4 100644
--- a/ysy-auth/src/main/java/com/ysy/auth/AuthServiceApplication.java
+++ b/ysy-auth/src/main/java/com/ysy/auth/AuthServiceApplication.java
@@ -1,13 +1,16 @@
package com.ysy.auth;
import org.springframework.boot.SpringApplication;
+import org.springframework.boot.autoconfigure.AutoConfiguration;
import org.springframework.boot.autoconfigure.SpringBootApplication;
import org.springframework.cloud.openfeign.EnableFeignClients;
@SpringBootApplication
+@AutoConfiguration
@EnableFeignClients(basePackages = "com.ysy.common.remote")
public class AuthServiceApplication {
public static void main(String[] args) {
+
SpringApplication.run(AuthServiceApplication.class, args);
}
}
\ No newline at end of file
diff --git a/ysy-auth/src/main/java/com/ysy/auth/controller/AuthController.java b/ysy-auth/src/main/java/com/ysy/auth/controller/AuthController.java
index 20b2abf..9f66471 100644
--- a/ysy-auth/src/main/java/com/ysy/auth/controller/AuthController.java
+++ b/ysy-auth/src/main/java/com/ysy/auth/controller/AuthController.java
@@ -1,5 +1,6 @@
package com.ysy.auth.controller;
+import com.ysy.common.domain.dto.RiderDTO;
import com.ysy.common.domain.result.R;
import com.ysy.common.domain.vo.RiderVO;
import com.ysy.auth.service.AuthService;
@@ -20,6 +21,6 @@ public class AuthController {
@PostMapping("/login")
public R authLogin(@RequestBody @Validated RiderVO riderVO) {
- return authService.authLoginByRiderVO(riderVO);
+ return R.success("rider", authService.authLoginByRiderVO(riderVO));
}
}
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
index aa0a968..1423f00 100644
--- a/ysy-auth/src/main/java/com/ysy/auth/service/AuthService.java
+++ b/ysy-auth/src/main/java/com/ysy/auth/service/AuthService.java
@@ -1,8 +1,8 @@
package com.ysy.auth.service;
-import com.ysy.common.domain.result.R;
+import com.ysy.common.domain.dto.RiderDTO;
import com.ysy.common.domain.vo.RiderVO;
public interface AuthService {
- R authLoginByRiderVO(RiderVO riderVO);
+ RiderDTO authLoginByRiderVO(RiderVO riderVO);
}
diff --git a/ysy-auth/src/main/java/com/ysy/auth/service/impl/AuthServiceImpl.java b/ysy-auth/src/main/java/com/ysy/auth/service/impl/AuthServiceImpl.java
index 54c993e..6c1d33e 100644
--- a/ysy-auth/src/main/java/com/ysy/auth/service/impl/AuthServiceImpl.java
+++ b/ysy-auth/src/main/java/com/ysy/auth/service/impl/AuthServiceImpl.java
@@ -2,12 +2,14 @@ package com.ysy.auth.service.impl;
import cn.hutool.core.bean.BeanUtil;
import com.alibaba.fastjson2.JSON;
+import com.ysy.common.domain.dto.RiderDTO;
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 com.ysy.common.utils.jwt.SecurityUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.data.redis.core.StringRedisTemplate;
import org.springframework.stereotype.Service;
@@ -26,7 +28,7 @@ public class AuthServiceImpl implements AuthService {
private StringRedisTemplate stringRedisTemplate;
@Override
- public R authLoginByRiderVO(RiderVO riderVO) {
+ public RiderDTO authLoginByRiderVO(RiderVO riderVO) {
//服务远程调用
R result = systemClientRemote.getRiderByRiderName(riderVO.getRiderName());
@@ -36,17 +38,26 @@ public class AuthServiceImpl implements AuthService {
Rider rider = JSON.parseObject(JSON.toJSONString(result.getData().get("rider")), Rider.class);
//密码错误
- Assert.isTrue(rider.getPassword().equals(riderVO.getPassword()), "密码错误");
+ Assert.isTrue(
+ SecurityUtils.matchesPassword(
+ riderVO.getPassword(),
+ rider.getSalt(),
+ rider.getPassword()),
+ "密码错误");
//生成token
- Map tokenMap = BeanUtil.beanToMap(rider, new HashMap<>(), false, false);
- String token = JwtUtil.getToken("rider", tokenMap);
+ Map claim = BeanUtil.beanToMap(rider, new HashMap<>(), false, false);
+ String token = JwtUtil.createToken(claim);
//登录成功存入缓存
stringRedisTemplate.opsForValue().set(token,
JSON.toJSONString(rider),
30, TimeUnit.MINUTES);
- return R.ok("登录成功","token", token);
+ //返回对象
+ RiderDTO riderDTO = new RiderDTO();
+ BeanUtil.copyProperties(rider, riderDTO, false);
+ riderDTO.setToken(token);
+ return riderDTO;
}
}
diff --git a/ysy-common/src/main/java/com/ysy/common/contant/ResultConstants.java b/ysy-common/src/main/java/com/ysy/common/contant/ResultConstants.java
new file mode 100644
index 0000000..3c23aa6
--- /dev/null
+++ b/ysy-common/src/main/java/com/ysy/common/contant/ResultConstants.java
@@ -0,0 +1,10 @@
+package com.ysy.common.contant;
+
+public class ResultConstants {
+ public final static int SUCCESS_CODE = 200;
+ public final static int FAIL_CODE = 300;
+ public final static int ERROR_CODE = 500;
+ public final static String SUCCESS_MSG = "success";
+ public final static String FAIL_MSG = "fail";
+ public final static String ERROR_MSG = "error";
+}
diff --git a/ysy-common/src/main/java/com/ysy/common/domain/dto/RiderDTO.java b/ysy-common/src/main/java/com/ysy/common/domain/dto/RiderDTO.java
new file mode 100644
index 0000000..6c8d964
--- /dev/null
+++ b/ysy-common/src/main/java/com/ysy/common/domain/dto/RiderDTO.java
@@ -0,0 +1,21 @@
+package com.ysy.common.domain.dto;
+
+
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+@Data
+@Builder
+@AllArgsConstructor
+@NoArgsConstructor
+public class RiderDTO {
+ private String riderName;
+
+ private Integer kilometer;
+
+ private Integer leftMoney;
+
+ private String token;
+}
diff --git a/ysy-common/src/main/java/com/ysy/common/domain/page/PageInfo.java b/ysy-common/src/main/java/com/ysy/common/domain/page/PageInfo.java
new file mode 100644
index 0000000..95190c8
--- /dev/null
+++ b/ysy-common/src/main/java/com/ysy/common/domain/page/PageInfo.java
@@ -0,0 +1,15 @@
+package com.ysy.common.domain.page;
+
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+import lombok.experimental.SuperBuilder;
+
+@Data
+@SuperBuilder
+@AllArgsConstructor
+@NoArgsConstructor
+public class PageInfo {
+ private Integer pageNum;
+ private Integer pageSize;
+}
diff --git a/ysy-common/src/main/java/com/ysy/common/domain/po/Rider.java b/ysy-common/src/main/java/com/ysy/common/domain/po/Rider.java
index 98aa2e8..12b3e9e 100644
--- a/ysy-common/src/main/java/com/ysy/common/domain/po/Rider.java
+++ b/ysy-common/src/main/java/com/ysy/common/domain/po/Rider.java
@@ -23,6 +23,9 @@ public class Rider {
@TableField("password")
private String password;
+ @TableField("salt")
+ private String salt;
+
@TableField("kilometer")
private Integer kilometer;
diff --git a/ysy-common/src/main/java/com/ysy/common/domain/result/PageResult.java b/ysy-common/src/main/java/com/ysy/common/domain/result/PageResult.java
new file mode 100644
index 0000000..2c961ad
--- /dev/null
+++ b/ysy-common/src/main/java/com/ysy/common/domain/result/PageResult.java
@@ -0,0 +1,30 @@
+package com.ysy.common.domain.result;
+
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.List;
+
+@Data
+public class PageResult implements Serializable {
+
+ private long total;
+
+ private List list;
+
+ public PageResult() {
+ }
+
+ public PageResult(long total, List list) {
+ this.total = total;
+ this.list = list;
+ }
+
+ public static PageResult toPageResult(long total, List list){
+ return new PageResult(total , list);
+ }
+
+ public static Result> toResult(long total, List list){
+ return Result.success(PageResult.toPageResult(total, list));
+ }
+}
diff --git a/ysy-common/src/main/java/com/ysy/common/domain/result/R.java b/ysy-common/src/main/java/com/ysy/common/domain/result/R.java
index 1b3b509..525dbe0 100644
--- a/ysy-common/src/main/java/com/ysy/common/domain/result/R.java
+++ b/ysy-common/src/main/java/com/ysy/common/domain/result/R.java
@@ -1,5 +1,6 @@
package com.ysy.common.domain.result;
+import com.ysy.common.contant.ResultConstants;
import lombok.AllArgsConstructor;
import lombok.Data;
import lombok.NoArgsConstructor;
@@ -27,23 +28,31 @@ public class R {
this.data.put(key, value);
}
- public static R ok(String msg) {
- return new R(200, msg);
+ public static R success() {
+ return new R(ResultConstants.SUCCESS_CODE, ResultConstants.SUCCESS_MSG);
}
- public static R ok(Map data) {
- return new R(200, "ok", data);
+ public static R success(String msg) {
+ return new R(ResultConstants.SUCCESS_CODE, msg);
}
- public static R ok(String key, Object value) {
- return new R(200, "ok", key, value);
+ public static R success(Map data) {
+ return new R(ResultConstants.SUCCESS_CODE, ResultConstants.SUCCESS_MSG, data);
}
- public static R ok(String msg, String key, Object value) {
- return new R(200, msg, key, value);
+ public static R success(String key, Object value) {
+ return new R(ResultConstants.SUCCESS_CODE, ResultConstants.SUCCESS_MSG, key, value);
+ }
+
+ public static R success(String msg, String key, Object value) {
+ return new R(ResultConstants.SUCCESS_CODE, msg, key, value);
+ }
+
+ public static R fail() {
+ return new R(ResultConstants.FAIL_CODE, ResultConstants.FAIL_MSG);
}
public static R fail(String msg) {
- return new R(300, msg);
+ return new R(ResultConstants.FAIL_CODE, msg);
}
}
diff --git a/ysy-common/src/main/java/com/ysy/common/domain/result/Result.java b/ysy-common/src/main/java/com/ysy/common/domain/result/Result.java
new file mode 100644
index 0000000..2e47a01
--- /dev/null
+++ b/ysy-common/src/main/java/com/ysy/common/domain/result/Result.java
@@ -0,0 +1,84 @@
+package com.ysy.common.domain.result;
+
+import com.ysy.common.contant.ResultConstants;
+import lombok.Data;
+
+import java.io.Serializable;
+
+@Data
+public class Result implements Serializable {
+ private static final long serialVersionUID = 1L;
+
+ public static final int SUCCESS = ResultConstants.SUCCESS_CODE;
+
+ public static final int FAIL = ResultConstants.FAIL_CODE;
+
+ public static final int ERROR = ResultConstants.ERROR_CODE;
+
+ public static final String SUCCESS_MSG = ResultConstants.SUCCESS_MSG;
+
+ public static final String FAIL_MSG = ResultConstants.FAIL_MSG;
+
+ public static final String ERROR_MSG = ResultConstants.ERROR_MSG;
+
+ //field
+ private int code;
+ private String msg;
+ private T data;
+
+ public static Result success() {
+ return restResult(SUCCESS, SUCCESS_MSG, null);
+ }
+
+ public static Result success(String msg) {
+ return restResult(SUCCESS, msg, null);
+ }
+
+ public static Result success(T data) {
+ return restResult(SUCCESS, SUCCESS_MSG, data);
+ }
+
+ public static Result success(String msg, T data) {
+ return restResult(SUCCESS, msg, data);
+ }
+
+ public static Result fail() {
+ return restResult(FAIL, FAIL_MSG, null);
+ }
+
+ public static Result fail(String msg) {
+ return restResult(FAIL, msg, null);
+ }
+
+ public static Result error() {
+ return restResult(ERROR, ERROR_MSG, null);
+ }
+
+ public static Result error(String msg) {
+ return restResult(ERROR, msg, null);
+ }
+
+ private static Result restResult(int code, String msg, T data) {
+ Result apiResult = new Result<>();
+ apiResult.setCode(code);
+ apiResult.setMsg(msg);
+ apiResult.setData(data);
+ return apiResult;
+ }
+
+ /**
+ * 成功
+ * @return 成功:true
+ */
+ public boolean isSuccess(){
+ return this.code == SUCCESS;
+ }
+
+ /**
+ * 失败
+ * @return 失败:false
+ */
+ public boolean isError(){
+ return !isSuccess();
+ }
+}
diff --git a/ysy-common/src/main/java/com/ysy/common/domain/vo/ApplyVO.java b/ysy-common/src/main/java/com/ysy/common/domain/vo/ApplyVO.java
new file mode 100644
index 0000000..0f30171
--- /dev/null
+++ b/ysy-common/src/main/java/com/ysy/common/domain/vo/ApplyVO.java
@@ -0,0 +1,16 @@
+package com.ysy.common.domain.vo;
+
+import com.ysy.common.domain.page.PageInfo;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+import lombok.experimental.SuperBuilder;
+
+@Data
+@SuperBuilder
+@AllArgsConstructor
+@NoArgsConstructor
+public class ApplyVO extends PageInfo {
+ private String username;
+}
diff --git a/ysy-common/src/main/java/com/ysy/common/domain/vo/RiderVO.java b/ysy-common/src/main/java/com/ysy/common/domain/vo/RiderVO.java
index 3825710..396e755 100644
--- a/ysy-common/src/main/java/com/ysy/common/domain/vo/RiderVO.java
+++ b/ysy-common/src/main/java/com/ysy/common/domain/vo/RiderVO.java
@@ -2,6 +2,7 @@ package com.ysy.common.domain.vo;
import jakarta.validation.constraints.NotBlank;
+import jakarta.validation.constraints.Pattern;
import lombok.AllArgsConstructor;
import lombok.Builder;
import lombok.Data;
@@ -13,8 +14,10 @@ import lombok.NoArgsConstructor;
@NoArgsConstructor
public class RiderVO {
@NotBlank(message = "用户名不能为空")
+ @Pattern(regexp = "\\w{5,11}", message = "用户名格式不正确")
private String riderName;
@NotBlank(message = "密码不能为空")
+ @Pattern(regexp = "\\d{5,11}", message = "密码格式不正确")
private String password;
}
diff --git a/ysy-common/src/main/java/com/ysy/common/utils/jwt/JwtUtil.java b/ysy-common/src/main/java/com/ysy/common/utils/jwt/JwtUtil.java
index 6103ee9..05fa5d1 100644
--- a/ysy-common/src/main/java/com/ysy/common/utils/jwt/JwtUtil.java
+++ b/ysy-common/src/main/java/com/ysy/common/utils/jwt/JwtUtil.java
@@ -10,12 +10,14 @@ import java.util.Date;
import java.util.Map;
public class JwtUtil {
+ private final static Date EXPIRE_TIME = new Date(System.currentTimeMillis() + 1000 * 60 * 60 * 24L);
private final static String SECRET = "qwertyuiopasdfghjkl";
+ private final static String CLAIM_NAME = "claim_name";
- public static String getToken(String name, Map claim) {
+ public static String createToken(Map claim) {
String token = JWT.create()
- .withClaim(name, claim)
-// .withExpiresAt(new Date(System.currentTimeMillis() + 1000 * 60 * 60 * 24))
+ .withClaim(CLAIM_NAME, claim)
+ //.withExpiresAt(EXPIRE_TIME)
.sign(Algorithm.HMAC256(SECRET));
return token;
}
@@ -27,9 +29,9 @@ public class JwtUtil {
return decodedJWT;
}
- public static Claim getClaim(String token, String name) {
+ public static Claim getClaim(String token) {
DecodedJWT decodedJWT = decodedJWT(token);
Map claims = decodedJWT.getClaims();
- return claims.get(name);
+ return claims.get(CLAIM_NAME);
}
}
diff --git a/ysy-common/src/main/java/com/ysy/common/utils/jwt/SecurityUtils.java b/ysy-common/src/main/java/com/ysy/common/utils/jwt/SecurityUtils.java
new file mode 100644
index 0000000..9299f9e
--- /dev/null
+++ b/ysy-common/src/main/java/com/ysy/common/utils/jwt/SecurityUtils.java
@@ -0,0 +1,55 @@
+package com.ysy.common.utils.jwt;
+
+
+import java.security.MessageDigest;
+import java.security.NoSuchAlgorithmException;
+import java.util.Base64;
+
+/**
+ * 安全服务工具类
+ *
+ * @author ruoyi
+ */
+public class SecurityUtils {
+
+
+ /**
+ * 生成BCryptPasswordEncoder密码
+ *
+ * @param password 密码
+ *
+ * @return 加密字符串
+ */
+ public static String encryptPassword (String password, String salt) {
+ return encryptMD5(password, salt);
+ }
+
+ /**
+ * 判断密码是否相同
+ *
+ * @param password 真实密码
+ * @param encodedPassword 加密后字符
+ *
+ * @return 结果
+ */
+ public static boolean matchesPassword (String password, String salt, String encodedPassword) {
+ return encryptMD5(password, salt).equals(encodedPassword);
+ }
+
+ /**
+ * 计算字符串的MD5加密值，并返回Base64编码的字符串。
+ * @param password 要加密的字符串
+ * @return 加密后的Base64编码字符串
+ */
+ public static String encryptMD5(String password, String salt) {
+ try {
+ MessageDigest md = MessageDigest.getInstance("MD5");
+ md.update((password + salt).getBytes()); // 加盐处理
+ byte[] digest = md.digest();
+ String encodeToString = Base64.getEncoder().encodeToString(digest);
+ return encodeToString;
+ } catch (NoSuchAlgorithmException e) {
+ throw new RuntimeException(e);
+ }
+ }
+}
diff --git a/ysy-gateway/src/main/resources/bootstrap.yml b/ysy-gateway/src/main/resources/bootstrap.yml
index 4f783de..a21ef87 100644
--- a/ysy-gateway/src/main/resources/bootstrap.yml
+++ b/ysy-gateway/src/main/resources/bootstrap.yml
@@ -27,33 +27,5 @@ spring:
- data-id: common-redis.yaml
group: SPRING_CLOUD_COMMONS
refresh: true
- - data-id: common-mysql.yaml
- group: SPRING_CLOUD_COMMONS
- refresh: true
- loadbalancer:
- nacos:
- #开启nacos权重生效
- enabled: true
- #网关配置
- gateway:
- #路由配置
- routes:
- #路由标识，全局唯一
- - id: auth-service
- #路由目标地址，lb代表负载均衡+服务名称
- uri: lb://authService
- #路由路径匹配规则
- predicates:
- - Path=/auth/**
-
- - id: system-service
- uri: lb://systemService
- predicates:
- - Path=/system/**
-
- - id: apply-service
- uri: lb://applyService
- predicates:
- - Path=/apply/**
diff --git a/ysy-modules/ysy-apply/src/main/java/com/ysy/apply/ApplyServiceApplication.java b/ysy-modules/ysy-apply/src/main/java/com/ysy/apply/ApplyServiceApplication.java
index 58b02ac..df9361e 100644
--- a/ysy-modules/ysy-apply/src/main/java/com/ysy/apply/ApplyServiceApplication.java
+++ b/ysy-modules/ysy-apply/src/main/java/com/ysy/apply/ApplyServiceApplication.java
@@ -1,10 +1,10 @@
package com.ysy.apply;
import org.springframework.boot.SpringApplication;
+import org.springframework.boot.autoconfigure.AutoConfiguration;
import org.springframework.boot.autoconfigure.SpringBootApplication;
@SpringBootApplication
-//@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/apply/controller/ApplyController.java b/ysy-modules/ysy-apply/src/main/java/com/ysy/apply/controller/ApplyController.java
index 83e437e..f01040b 100644
--- a/ysy-modules/ysy-apply/src/main/java/com/ysy/apply/controller/ApplyController.java
+++ b/ysy-modules/ysy-apply/src/main/java/com/ysy/apply/controller/ApplyController.java
@@ -1,12 +1,12 @@
package com.ysy.apply.controller;
+import com.baomidou.mybatisplus.core.metadata.IPage;
import com.ysy.apply.service.ApplyService;
+import com.ysy.common.domain.po.Apply;
import com.ysy.common.domain.result.R;
+import com.ysy.common.domain.vo.ApplyVO;
import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
@RestController
@RequestMapping("/apply")
@@ -14,8 +14,9 @@ public class ApplyController {
@Autowired
private ApplyService applyService;
- @GetMapping("/list/{pageNum}")
- public R applyList(@PathVariable Integer pageNum) {
- return applyService.getApplyList(pageNum);
+ @GetMapping("/list")
+ public R applyList(ApplyVO applyVO) {
+ IPage applyIPage = applyService.getApplyList(applyVO);
+ return R.success("applyList", applyIPage);
}
}
diff --git a/ysy-modules/ysy-apply/src/main/java/com/ysy/apply/service/ApplyService.java b/ysy-modules/ysy-apply/src/main/java/com/ysy/apply/service/ApplyService.java
index 623854b..fbc6fcb 100644
--- a/ysy-modules/ysy-apply/src/main/java/com/ysy/apply/service/ApplyService.java
+++ b/ysy-modules/ysy-apply/src/main/java/com/ysy/apply/service/ApplyService.java
@@ -1,9 +1,11 @@
package com.ysy.apply.service;
+import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.service.IService;
import com.ysy.common.domain.po.Apply;
import com.ysy.common.domain.result.R;
+import com.ysy.common.domain.vo.ApplyVO;
public interface ApplyService extends IService {
- R getApplyList(Integer pageNum);
+ IPage getApplyList(ApplyVO applyVO);
}
diff --git a/ysy-modules/ysy-apply/src/main/java/com/ysy/apply/service/impl/ApplyServiceImpl.java b/ysy-modules/ysy-apply/src/main/java/com/ysy/apply/service/impl/ApplyServiceImpl.java
index 6faa0b9..1dfe760 100644
--- a/ysy-modules/ysy-apply/src/main/java/com/ysy/apply/service/impl/ApplyServiceImpl.java
+++ b/ysy-modules/ysy-apply/src/main/java/com/ysy/apply/service/impl/ApplyServiceImpl.java
@@ -1,14 +1,19 @@
package com.ysy.apply.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.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
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 com.ysy.common.domain.vo.ApplyVO;
import jakarta.servlet.http.HttpServletRequest;
+import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.data.redis.core.StringRedisTemplate;
import org.springframework.stereotype.Service;
@@ -17,8 +22,6 @@ import java.util.List;
@Service
public class ApplyServiceImpl extends ServiceImpl implements ApplyService {
- @Autowired
- private ApplyMapper applyMapper;
@Autowired
private HttpServletRequest request;
@@ -27,28 +30,31 @@ public class ApplyServiceImpl extends ServiceImpl implements
private StringRedisTemplate stringRedisTemplate;
@Override
- public R getApplyList(Integer pageNum) {
+ public IPage getApplyList(ApplyVO applyVO) {
String token = request.getHeader("token");
String jsonString = stringRedisTemplate.opsForValue().get(token);
Rider rider = JSON.parseObject(jsonString, Rider.class);
-// IPage iPage = new Page<>(pageNum, 3);
+ IPage page = new Page<>();
+ page.setCurrent(applyVO.getPageNum());
+ page.setSize(applyVO.getPageSize());
- QueryWrapper queryWrapper = new QueryWrapper<>();
- queryWrapper.eq("rider_id", 0)
- .or(a ->
- a.eq("rider_id", rider.getRiderId())
- .eq("state", 0))
- .orderByDesc("order_time");
+ LambdaQueryWrapper lambdaQueryWrapper = new LambdaQueryWrapper<>();
-// LambdaQueryWrapper lambdaQueryWrapper = new LambdaQueryWrapper<>();
+ if (StringUtils.isNoneBlank(applyVO.getUsername())) {
+ lambdaQueryWrapper.like(Apply::getUsername, applyVO.getUsername());
+ }
-// lambdaQueryWrapper.eq(rider.getRiderId() != null, Apply::getRiderId, rider.getRiderId());
+ lambdaQueryWrapper
+ .and(a -> {
+ a.eq(Apply::getRiderId, 0)
+ .or(a1 ->
+ a1.eq(Apply::getRiderId, rider.getRiderId())
+ .eq(Apply::getState, 0));
+ })
+ .orderByDesc(Apply::getOrderTime);
- List applyList = applyMapper.selectList(queryWrapper);
-
-// IPage iPage1 = iPage.setRecords(applyList);
- return R.ok("applyList", applyList);
+ return page(page, lambdaQueryWrapper);
}
}
diff --git a/ysy-modules/ysy-system/src/main/java/com/ysy/system/service/impl/RiderServiceImpl.java b/ysy-modules/ysy-system/src/main/java/com/ysy/system/service/impl/RiderServiceImpl.java
index f824f99..d160020 100644
--- a/ysy-modules/ysy-system/src/main/java/com/ysy/system/service/impl/RiderServiceImpl.java
+++ b/ysy-modules/ysy-system/src/main/java/com/ysy/system/service/impl/RiderServiceImpl.java
@@ -1,6 +1,7 @@
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.common.domain.po.Rider;
@@ -23,10 +24,10 @@ public class RiderServiceImpl extends ServiceImpl implements
@Override
public R getRiderByRiderName(String riderName) {
- QueryWrapper queryWrapper = new QueryWrapper<>();
- queryWrapper.eq(StringUtils.isNotBlank(riderName), "rider_name", riderName);
- Rider one = getOne(queryWrapper);
- return R.ok("rider", one);
+ LambdaQueryWrapper lambdaQueryWrapper = new LambdaQueryWrapper<>();
+ lambdaQueryWrapper.eq(StringUtils.isNotBlank(riderName), Rider::getRiderName, riderName);
+ Rider one = getOne(lambdaQueryWrapper);
+ return R.success("rider", one);
}
@Override
@@ -36,6 +37,6 @@ public class RiderServiceImpl extends ServiceImpl implements
String jsonString = stringRedisTemplate.opsForValue().get(token);
Rider rider = JSON.parseObject(jsonString, Rider.class);
- return R.ok("rider", rider);
+ return R.success("rider", rider);
}
}