From 652ad4e88d77e64d971021f9e071459478b72ffc Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期四, 09 二月 2023 00:22:23 +0800
Subject: [PATCH] 新增加司机端接口和日志注解
---
driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/service/impl/DriverServiceImpl.java | 212 +++++++++++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 206 insertions(+), 6 deletions(-)
diff --git a/driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/service/impl/DriverServiceImpl.java b/driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/service/impl/DriverServiceImpl.java
index 0718c77..3bebf26 100644
--- a/driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/service/impl/DriverServiceImpl.java
+++ b/driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/service/impl/DriverServiceImpl.java
@@ -2,12 +2,33 @@
import com.baomidou.mybatisplus.mapper.EntityWrapper;
import com.baomidou.mybatisplus.service.impl.ServiceImpl;
+import com.supersavedriving.driver.core.common.constant.JwtConstants;
+import com.supersavedriving.driver.core.shiro.ShiroKit;
+import com.supersavedriving.driver.core.shiro.ShiroUser;
+import com.supersavedriving.driver.core.util.JwtTokenUtil;
+import com.supersavedriving.driver.core.util.ToolUtil;
import com.supersavedriving.driver.modular.system.dao.DriverMapper;
+import com.supersavedriving.driver.modular.system.model.BranchOffice;
import com.supersavedriving.driver.modular.system.model.Driver;
+import com.supersavedriving.driver.modular.system.service.IBranchOfficeService;
import com.supersavedriving.driver.modular.system.service.IDriverService;
+import com.supersavedriving.driver.modular.system.util.RedisUtil;
import com.supersavedriving.driver.modular.system.util.ResultUtil;
+import com.supersavedriving.driver.modular.system.util.UUIDUtil;
import com.supersavedriving.driver.modular.system.warpper.DriverRegisterWarpper;
+import com.supersavedriving.driver.modular.system.warpper.TokenWarpper;
+import org.apache.shiro.authc.SimpleAuthenticationInfo;
+import org.apache.shiro.authc.UsernamePasswordToken;
+import org.apache.shiro.authc.credential.HashedCredentialsMatcher;
+import org.apache.shiro.crypto.hash.Md5Hash;
+import org.apache.shiro.util.ByteSource;
+import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
+
+import javax.servlet.http.HttpServletRequest;
+import java.util.Date;
+
+import static org.bouncycastle.asn1.x500.style.RFC4519Style.c;
/**
* 司机
@@ -16,6 +37,14 @@
*/
@Service
public class DriverServiceImpl extends ServiceImpl<DriverMapper, Driver> implements IDriverService {
+
+ private final String salt = "i#sm4";
+
+ @Autowired
+ private IBranchOfficeService branchOfficeService;
+
+ @Autowired
+ private RedisUtil redisUtil;
/**
@@ -39,17 +68,25 @@
//账号审核拒绝后的处理
if(null != driver && driver.getApprovalStatus() == 3){
- driver = setDriverParamete(driver, driverRegisterWarpper);
- this.updateById(driver);
+ try {
+ driver = setDriverParamete(driver, driverRegisterWarpper);
+ }catch (Exception e){
+ return ResultUtil.error(e.getMessage());
+ }
+ this.updateAllColumnById(driver);
}
//新账号
if(null == driver){
driver = new Driver();
- driver = setDriverParamete(driver, driverRegisterWarpper);
+ driver.setCode(UUIDUtil.getNumberRandom(16));
+ try {
+ driver = setDriverParamete(driver, driverRegisterWarpper);
+ }catch (Exception e){
+ return ResultUtil.error(e.getMessage());
+ }
+ driver.setCreateTime(new Date());
this.insert(driver);
}
- //发送消息
-
return ResultUtil.success();
}
@@ -60,7 +97,170 @@
* @param driverRegisterWarpper
* @return
*/
- public Driver setDriverParamete(Driver driver, DriverRegisterWarpper driverRegisterWarpper){
+ public Driver setDriverParamete(Driver driver, DriverRegisterWarpper driverRegisterWarpper) throws Exception{
+ driver.setAvatar(driverRegisterWarpper.getAvatar());
+ driver.setPhone(driverRegisterWarpper.getPhone());
+ driver.setEmergencyContact(driverRegisterWarpper.getEmergencyContact());
+ driver.setEmergencyPhone(driverRegisterWarpper.getEmergencyPhone());
+ driver.setIdcardBack(driverRegisterWarpper.getIdcardBack());
+ driver.setIdcardFront(driverRegisterWarpper.getIdcardFront());
+ driver.setDriverLicense(driverRegisterWarpper.getDriverLicense());
+ //注册地
+ String code = driverRegisterWarpper.getCode();
+ BranchOffice branchOffice = branchOfficeService.selectOne(new EntityWrapper<BranchOffice>().eq("districtCode", code).eq("status", 1));
+ if(null == branchOffice){
+ throw new Exception("该区域无服务商");
+ }
+ driver.setBranchOfficeId(branchOffice.getId());
+ driver.setAgentId(branchOffice.getAgentId());
+ driver.setInviterType(driverRegisterWarpper.getInviterType());
+ driver.setInviterId(driverRegisterWarpper.getInviterId());
+ driver.setApprovalStatus(1);
+ driver.setApprovalNotes("");
+ driver.setApprovalTime(null);
+ driver.setApprovalUserId(null);
+ driver.setStatus(1);
return driver;
}
+
+
+ /**
+ * 司机登录逻辑
+ * @param receiver 国家代码+86
+ * @param phone 登录手机号
+ * @param code 短信验证码
+ * @return
+ * @throws Exception
+ */
+ @Override
+ public ResultUtil<TokenWarpper> driverLogin(String receiver, String phone, String code) throws Exception {
+ String value = redisUtil.getValue(receiver + phone);
+ if(ToolUtil.isEmpty(value)){
+ return ResultUtil.error("短信验证码无效");
+ }
+ if(!value.equals(code)){
+ return ResultUtil.error("短信验证码无效");
+ }
+ String token = getToken(phone, code);
+ if(ToolUtil.isEmpty(token)){
+ return ResultUtil.error("登录异常，请联系管理员。");
+ }
+ Driver driver = this.selectOne(new EntityWrapper<Driver>().eq("phone", phone).ne("status", 3));
+ if(null == driver){
+ return ResultUtil.error("请先进行注册");
+ }
+ if(driver.getStatus() == 2){
+ return ResultUtil.error("账号已被冻结，请联系管理员。");
+ }
+ if(driver.getApprovalStatus() == 1){
+ return ResultUtil.error("账号正在审核中。");
+ }
+ if(driver.getApprovalStatus() == 3){
+ return ResultUtil.error("账号审核不通过，请重新申请。");
+ }
+
+ TokenWarpper tokenWarpper = new TokenWarpper();
+ tokenWarpper.setToken(token);
+ tokenWarpper.setValidTime(7200L);
+ tokenWarpper.setIsSetPassword(ToolUtil.isEmpty(driver.getPassword()) ? 0 : 1);
+ return ResultUtil.success(tokenWarpper);
+ }
+
+
+ /**
+ * 获取身份凭证
+ * @param phone
+ * @param password
+ * @return
+ * @throws Exception
+ */
+ private String getToken(String phone, String password) throws Exception{
+ //封装请求账号密码为shiro可验证的token
+ UsernamePasswordToken usernamePasswordToken = new UsernamePasswordToken(phone, password.toCharArray());
+
+ //获取数据库中的账号密码，准备比对
+ String credentials = ShiroKit.md5(password, salt);
+ Driver driver = this.selectOne(new EntityWrapper<Driver>().eq("phone", phone).eq("status", 1));
+ ByteSource credentialsSalt = new Md5Hash(salt);
+ SimpleAuthenticationInfo simpleAuthenticationInfo = new SimpleAuthenticationInfo(
+ new ShiroUser(), credentials, credentialsSalt, "");
+
+ //校验用户账号密码
+ HashedCredentialsMatcher md5CredentialsMatcher = new HashedCredentialsMatcher();
+ md5CredentialsMatcher.setHashAlgorithmName(ShiroKit.hashAlgorithmName);
+ md5CredentialsMatcher.setHashIterations(ShiroKit.hashIterations);
+ boolean passwordTrueFlag = md5CredentialsMatcher.doCredentialsMatch(
+ usernamePasswordToken, simpleAuthenticationInfo);
+
+ if (passwordTrueFlag) {
+ String token = JwtTokenUtil.generateToken(phone);
+ String key = token;
+ if(token.length() > 16){
+ key = token.substring(token.length() - 16);
+ }
+ redisUtil.setStrValue(key, driver.getId().toString(), 7200);//2小时
+ return token;
+ }
+ return "";
+ }
+
+
+ /**
+ * 刷新token
+ * @param uid
+ * @return
+ * @throws Exception
+ */
+ @Override
+ public ResultUtil<TokenWarpper> flushedToken(Integer uid) throws Exception {
+ Driver driver = this.selectById(uid);
+ String token = getToken(driver.getPhone(), driver.getPhone());
+ if(ToolUtil.isEmpty(token)){
+ return ResultUtil.error("刷新token异常，请联系管理员。");
+ }
+ TokenWarpper tokenWarpper = new TokenWarpper();
+ tokenWarpper.setToken(token);
+ tokenWarpper.setValidTime(7200L);
+ tokenWarpper.setIsSetPassword(ToolUtil.isEmpty(driver.getPassword()) ? 0 : 1);
+ return ResultUtil.success(tokenWarpper);
+ }
+
+ /**
+ * 校验token获取用户信息
+ * @param request
+ * @return
+ * @throws Exception
+ */
+ @Override
+ public Integer getUserByRequset(HttpServletRequest request) throws Exception {
+ String requestHeader = request.getHeader(JwtConstants.AUTH_HEADER);
+ if (ToolUtil.isNotEmpty(requestHeader) && requestHeader.startsWith("Bearer ")) {
+ requestHeader = requestHeader.substring(requestHeader.indexOf(" ") + 1);
+ String key = null;
+ int length = requestHeader.length();
+ if(length > 16){
+ key = requestHeader.substring(length - 16);
+ }else{
+ key = requestHeader;
+ }
+ String value = redisUtil.getValue(key);
+ return null != value ? Integer.valueOf(value) : null;
+ }else{
+ return null;
+ }
+ }
+
+
+ /**
+ * 设置司机密码
+ * @param uid
+ * @param password
+ * @throws Exception
+ */
+ @Override
+ public void setPassword(Integer uid, String password) throws Exception {
+ Driver driver = this.selectById(uid);
+ driver.setPassword(ShiroKit.md5(password, salt));
+ this.updateById(driver);
+ }
}
--
Gitblit v1.7.1