Merge branch 'master' of http://119.28.51.83/hewei/Jumeirah into Jw

fe2730a4 · zhangjw · 824eb260 · e44a28bd · fe2730a4 · fe2730a4
Commit fe2730a4 authored Oct 13, 2020 by zhangjw
17 changed files
--- a/common/src/main/java/com/jumeirah/common/entity/Stroke.java
+++ b/common/src/main/java/com/jumeirah/common/entity/Stroke.java
@@ -171,16 +171,16 @@ public class Stroke extends BaseEntity {
    @ApiModelProperty("用户充值截图证据,  传入数组")
    private String userRechargeCredentialsUrl;
-    @NotBlank(message = "商家开户银行不能为空")
+//    @NotBlank(message = "商家开户银行不能为空")
-    @ApiModelProperty("商家开户银行")
+//    @ApiModelProperty("商家开户银行")
-    private String rechargeBank;
+//    private String rechargeBank;
+//
-    @NotBlank(message = "商家开户名称不能为空")
+//    @NotBlank(message = "商家开户名称不能为空")
-    @ApiModelProperty("商家开户名称")
+//    @ApiModelProperty("商家开户名称")
-    private String rechargeName;
+//    private String rechargeName;
+//
-    @NotBlank(message = "商家银行卡号")
+//    @NotBlank(message = "商家银行卡号")
-    @ApiModelProperty("商家银行卡号")
+//    @ApiModelProperty("商家银行卡号")
-    private String rechargeBankNumber;
+//    private String rechargeBankNumber;
 }
--- a/common/src/main/java/com/jumeirah/common/enums/StatePaymentStatusEnum.java
+++ b/common/src/main/java/com/jumeirah/common/enums/StatePaymentStatusEnum.java
@@ -6,7 +6,7 @@ import lombok.AllArgsConstructor;
 import lombok.Getter;
 /**
- * 付款状态，0-未付款，1-付款中，2-已付款，3-退款中，99-已退款
+ * 付款状态，0-未付款，1-用户已付款,待审核，2-用户已付款,审核通过，3-退款中，99-已退款
 **/
 @Getter
 @AllArgsConstructor

--- a/common/src/main/java/com/jumeirah/common/service/impl/AppUserServiceImpl.java
+++ b/common/src/main/java/com/jumeirah/common/service/impl/AppUserServiceImpl.java
@@ -21,6 +21,7 @@ import io.geekidea.springbootplus.framework.core.pagination.PageInfo;
 import io.geekidea.springbootplus.framework.core.pagination.Paging;
 import io.geekidea.springbootplus.framework.shiro.cache.AppLoginRedisService;
 import io.geekidea.springbootplus.framework.shiro.jwt.JwtToken;
+import io.geekidea.springbootplus.framework.shiro.jwt.realm.LoginClientTypeEnum;
 import io.geekidea.springbootplus.framework.shiro.util.JwtUtil;
 import io.geekidea.springbootplus.framework.shiro.util.SaltUtil;
 import io.geekidea.springbootplus.framework.shiro.vo.LoginUserVo;
@@ -115,7 +116,7 @@ public class AppUserServiceImpl extends BaseServiceImpl<AppUserMapper, AppUser> 
        log.debug("token:{}", token);
        // 创建AuthenticationToken
-        JwtToken jwtToken = JwtToken.build(token, appUser.getId().toString(), appUser.getId(), newSalt, expireSecond, "app");
+        JwtToken jwtToken = JwtToken.build(token, appUser.getId().toString(), appUser.getId(), newSalt, expireSecond, LoginClientTypeEnum.APP.getType());
        boolean enableShiro = springBootPlusProperties.getShiro().isEnable();
        if (enableShiro) {

--- a/common/src/main/java/com/jumeirah/common/service/impl/MerchantUserServiceImpl.java
+++ b/common/src/main/java/com/jumeirah/common/service/impl/MerchantUserServiceImpl.java
@@ -26,6 +26,7 @@ import io.geekidea.springbootplus.framework.core.pagination.PageInfo;
 import io.geekidea.springbootplus.framework.core.pagination.Paging;
 import io.geekidea.springbootplus.framework.shiro.cache.MerchantLoginRedisService;
 import io.geekidea.springbootplus.framework.shiro.jwt.JwtToken;
+import io.geekidea.springbootplus.framework.shiro.jwt.realm.LoginClientTypeEnum;
 import io.geekidea.springbootplus.framework.shiro.util.JwtTokenUtil;
 import io.geekidea.springbootplus.framework.shiro.util.JwtUtil;
 import io.geekidea.springbootplus.framework.shiro.util.SaltUtil;
@@ -157,7 +158,7 @@ public class MerchantUserServiceImpl extends BaseServiceImpl<MerchantUserMapper,
        log.debug("token:{}", token);
        // 创建AuthenticationToken
-        JwtToken jwtToken = JwtToken.build(token, username,merchantUser.getId(), newSalt, expireSecond, "mer");
+        JwtToken jwtToken = JwtToken.build(token, username,merchantUser.getId(), newSalt, expireSecond, LoginClientTypeEnum.MERCHANT.getType());
        boolean enableShiro = springBootPlusProperties.getShiro().isEnable();
        if (enableShiro) {

--- a/common/src/main/java/com/jumeirah/common/service/impl/StrokeServiceImpl.java
+++ b/common/src/main/java/com/jumeirah/common/service/impl/StrokeServiceImpl.java
@@ -52,6 +52,12 @@ public class StrokeServiceImpl extends BaseServiceImpl<StrokeMapper, Stroke> imp
    public boolean deleteStroke(Long id) throws Exception {
        JwtToken jwtToken = (JwtToken) SecurityUtils.getSubject().getPrincipal();
        Stroke byId = super.getById(id);
+        // 如果已删除 直接返回true
+        if (byId == null) {
+            return true;
+        }
        // 判断该记录是否属于此用户
        if (!byId.getUserId().equals(jwtToken.getUserId())) {
            return false;
@@ -81,7 +87,8 @@ public class StrokeServiceImpl extends BaseServiceImpl<StrokeMapper, Stroke> imp
    @Override
    public Paging<StrokeQueryVo> getStrokePageList(StrokePageParam strokePageParam) throws Exception {
-        Page<StrokeQueryVo> page = new PageInfo<>(strokePageParam, OrderItem.asc(getLambdaColumn(Stroke::getCreateTime)));
+//        Page<StrokeQueryVo> page = new PageInfo<>(strokePageParam, OrderItem.asc(getLambdaColumn(Stroke::getCreateTime)));
+        Page<StrokeQueryVo> page = new PageInfo<>(strokePageParam, OrderItem.asc("s.create_time"));
        JwtToken jwtToken = (JwtToken) SecurityUtils.getSubject().getPrincipal();

--- a/common/src/main/java/com/jumeirah/common/service/impl/SysLoginServiceImpl.java
+++ b/common/src/main/java/com/jumeirah/common/service/impl/SysLoginServiceImpl.java
@@ -22,6 +22,7 @@ import io.geekidea.springbootplus.framework.common.api.ApiCode;
 import io.geekidea.springbootplus.framework.common.api.ApiResult;
 import io.geekidea.springbootplus.framework.shiro.cache.SysLoginRedisService;
 import io.geekidea.springbootplus.framework.shiro.jwt.JwtToken;
+import io.geekidea.springbootplus.framework.shiro.jwt.realm.LoginClientTypeEnum;
 import io.geekidea.springbootplus.framework.shiro.util.JwtTokenUtil;
 import io.geekidea.springbootplus.framework.shiro.util.JwtUtil;
 import io.geekidea.springbootplus.framework.shiro.util.SaltUtil;
@@ -161,7 +162,7 @@ public class SysLoginServiceImpl implements SysLoginService {
        log.debug("token:{}", token);
        // 创建AuthenticationToken
-        JwtToken jwtToken = JwtToken.build(token, username,sysUser.getId(), newSalt, expireSecond, "sys");
+        JwtToken jwtToken = JwtToken.build(token, username,sysUser.getId(), newSalt, expireSecond, LoginClientTypeEnum.SYSTEM.getType());
        boolean enableShiro = springBootPlusProperties.getShiro().isEnable();
        if (enableShiro) {

--- a/common/src/main/java/com/jumeirah/common/vo/StrokeQueryVo.java
+++ b/common/src/main/java/com/jumeirah/common/vo/StrokeQueryVo.java
@@ -46,7 +46,7 @@ public class StrokeQueryVo implements Serializable {
        @ApiModelProperty("行程类型，0-单程，1-往返行程，2-货运，3-医疗")
        private Integer type;
-        @ApiModelProperty("状态，0-审核中，1-进行中，2-已完成，99-取消")
+        @ApiModelProperty("付款状态，0-未付款，1-用户已付款,待审核，2-用户已付款,审核通过，3-退款中，99-已退款")
        private Integer status;
        @ApiModelProperty("价格")

--- a/common/src/main/resources/mapper/StrokeMapper.xml
+++ b/common/src/main/resources/mapper/StrokeMapper.xml
@@ -20,7 +20,7 @@
        user_id,
        mu.username AS merchantName,
        outset_airport_name,arrive_airport_name,arrive_plain_type_id,back_outset_airport_name,back_arrive_airport_name,
-        payment_status,audit_status,recharge_bank,recharge_name,recharge_bank_number
+        payment_status,audit_status,user_recharge_bank,user_recharge_name,user_recharge_bank_number
   </sql>
@@ -28,7 +28,7 @@
    <sql id="Base_Column_List">
        id, city_outset_id, deleted, city_outset_name, city_arrive_id, city_arrive_name, people_mun, plain_type_id, outset_time, return_time, type, status, create_time, update_time, goods_name, goods_size, goods_weight, disease_name, instruments, medical_persons, remarks, money, user_id
        ,outset_airport_name,arrive_airport_name,arrive_plain_type_id,back_outset_airport_name,back_arrive_airport_name,payment_status,audit_status, user_recharge_money,user_recharge_bank,user_recharge_name,
-    user_recharge_bank_number,user_recharge_credentials_url,recharge_bank,recharge_name,recharge_bank_number
+    user_recharge_bank_number,user_recharge_credentials_url
    </sql>
    <select id="getStrokeById" resultType="com.jumeirah.common.vo.StrokeDetailVo">
@@ -52,6 +52,7 @@
                and s.`status` = #{param.status}
            </if>
        </where>
    </select>
    <select id="getMcStrokePageList" parameterType="com.jumeirah.common.param.McStrokePageParam"
            resultType="com.jumeirah.common.vo.McStrokeQueryVo">

--- a/framework/src/main/java/io/geekidea/springbootplus/framework/log/controller/SysLoginLogController.java
+++ b/framework/src/main/java/io/geekidea/springbootplus/framework/log/controller/SysLoginLogController.java
@@ -44,7 +44,7 @@ import org.springframework.web.bind.annotation.RestController;
 */
 @Slf4j
 @RestController
-@RequestMapping("/sysLoginLog")
+@RequestMapping("/sys/sysLoginLog")
 @Module("log")
 @Api(value = "系统登录日志API", tags = {"系统登录日志"})
 public class SysLoginLogController extends BaseController {

--- a/framework/src/main/java/io/geekidea/springbootplus/framework/log/controller/SysOperationLogController.java
+++ b/framework/src/main/java/io/geekidea/springbootplus/framework/log/controller/SysOperationLogController.java
@@ -41,7 +41,7 @@ import org.springframework.web.bind.annotation.RestController;
 */
 @Slf4j
 @RestController
-@RequestMapping("/sysOperationLog")
+@RequestMapping("/sys/sysOperationLog")
 @Api(value = "系统操作日志API", tags = {"系统操作日志"})
 public class SysOperationLogController extends BaseController {

--- a/framework/src/main/java/io/geekidea/springbootplus/framework/shiro/jwt/JwtFilter.java
+++ b/framework/src/main/java/io/geekidea/springbootplus/framework/shiro/jwt/JwtFilter.java
@@ -16,7 +16,6 @@
 package io.geekidea.springbootplus.framework.shiro.jwt;
-import io.geekidea.springbootplus.config.constant.CommonRedisKey;
 import io.geekidea.springbootplus.config.properties.JwtProperties;
 import io.geekidea.springbootplus.framework.common.api.ApiCode;
 import io.geekidea.springbootplus.framework.common.api.ApiResult;
@@ -27,7 +26,6 @@ import io.geekidea.springbootplus.framework.shiro.util.JwtUtil;
 import io.geekidea.springbootplus.framework.shiro.vo.JwtTokenRedisVo;
 import io.geekidea.springbootplus.framework.util.HttpServletResponseUtil;
 import lombok.extern.slf4j.Slf4j;
-import org.apache.commons.codec.digest.DigestUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.shiro.authc.AuthenticationException;
 import org.apache.shiro.authc.AuthenticationToken;
@@ -54,13 +52,12 @@ public class JwtFilter extends AuthenticatingFilter {
    private final ShiroLoginService shiroLoginService;
    private final SysLoginRedisService sysLoginRedisService;
    private final JwtProperties jwtProperties;
-    private RedisTemplate redisTemplate;
    public JwtFilter(ShiroLoginService shiroLoginService, SysLoginRedisService loginRedisService, JwtProperties jwtProperties, RedisTemplate redisTemplate) {
        this.shiroLoginService = shiroLoginService;
        this.sysLoginRedisService = loginRedisService;
        this.jwtProperties = jwtProperties;
-        this.redisTemplate = redisTemplate;
    }
    /**
@@ -83,35 +80,13 @@ public class JwtFilter extends AuthenticatingFilter {
            throw new AuthenticationException("JWT Token已过期,token:" + token);
        }
-        Object jwtTokenRedisVo = null;
+        JwtTokenRedisVo jwt = shiroLoginService.getTokenInfoForRedis(token);
-        // 如果开启redis二次校验，或者设置为单个用户token登录，则先在redis中判断token是否存在
-        if (jwtProperties.isRedisCheck() || jwtProperties.isSingleLogin()) {
-            String tokenMd5 = DigestUtils.md5Hex(token);
-            jwtTokenRedisVo = redisTemplate.opsForValue().get(String.format(CommonRedisKey.LOGIN_TOKEN, tokenMd5));
-//            boolean redisExpired = sysLoginRedisService.exists(token);
-            if (jwtTokenRedisVo == null) {
-                throw new AuthenticationException("Redis Token不存在,token:" + token);
-            }
-        }
-        JwtTokenRedisVo jwt = (JwtTokenRedisVo) jwtTokenRedisVo;
-        if (jwt == null) {
-            throw new AuthenticationException("Redis Token不存在,token:" + token);
-        }
        String username = JwtUtil.getUsername(token);
-        String salt;
+        return JwtToken.build(token, username, jwt.getUserId(), shiroLoginService.getSalt(token), jwtProperties.getExpireSecond(), jwt.getType());
-        if (jwtProperties.isSaltCheck()) {
-            salt = sysLoginRedisService.getSalt(username);
-        } else {
-            salt = jwtProperties.getSecret();
    }
-        return JwtToken.build(token, username, jwt.getUserId(), salt, jwtProperties.getExpireSecond(), jwt.getType());
-    }
    /**
     * 访问失败处理

--- a/framework/src/main/java/io/geekidea/springbootplus/framework/shiro/jwt/realm/JwtRealmAppUser.java
+++ b/framework/src/main/java/io/geekidea/springbootplus/framework/shiro/jwt/realm/JwtRealmAppUser.java
@@ -63,7 +63,7 @@ public class JwtRealmAppUser extends AuthorizingRealm {
        // 设置角色/权限信息
        JwtToken jwtToken = (JwtToken) principalCollection.getPrimaryPrincipal();
-        if (!jwtToken.getType().equals("app")) {
+        if (!jwtToken.getType().equals(LoginClientTypeEnum.APP.getType())) {
            return null;
        }
 /*

--- a/framework/src/main/java/io/geekidea/springbootplus/framework/shiro/jwt/realm/JwtRealmMerchant.java
+++ b/framework/src/main/java/io/geekidea/springbootplus/framework/shiro/jwt/realm/JwtRealmMerchant.java
@@ -66,7 +66,7 @@ public class JwtRealmMerchant extends AuthorizingRealm {
        // 设置角色/权限信息
        JwtToken jwtToken = (JwtToken) principalCollection.getPrimaryPrincipal();
-        if (!jwtToken.getType().equals("mer")) {
+        if (!jwtToken.getType().equals(LoginClientTypeEnum.MERCHANT.getType())) {
            return null;
        }

--- a/framework/src/main/java/io/geekidea/springbootplus/framework/shiro/jwt/realm/JwtRealmSystem.java
+++ b/framework/src/main/java/io/geekidea/springbootplus/framework/shiro/jwt/realm/JwtRealmSystem.java
@@ -63,7 +63,7 @@ public class JwtRealmSystem extends AuthorizingRealm {
        // 设置角色/权限信息
        JwtToken jwtToken = (JwtToken) principalCollection.getPrimaryPrincipal();
-        if (!jwtToken.getType().equals("sys")) {
+        if (!jwtToken.getType().equals(LoginClientTypeEnum.SYSTEM.getType())) {
            return null;
        }
        // 获取username

--- a/framework/src/main/java/io/geekidea/springbootplus/framework/shiro/jwt/realm/LoginClientTypeEnum.java
+++ b/framework/src/main/java/io/geekidea/springbootplus/framework/shiro/jwt/realm/LoginClientTypeEnum.java
+package io.geekidea.springbootplus.framework.shiro.jwt.realm;
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+/**
+ * 客户端类型
+ */
+@Getter
+@AllArgsConstructor
+public enum LoginClientTypeEnum {
+    // app
+    APP("app"),
+    // 平台
+    SYSTEM("sys"),
+    // 商户
+    MERCHANT("mer");
+    private final String type;
+}
--- a/framework/src/main/java/io/geekidea/springbootplus/framework/shiro/service/ShiroLoginService.java
+++ b/framework/src/main/java/io/geekidea/springbootplus/framework/shiro/service/ShiroLoginService.java
@@ -17,6 +17,7 @@
 package io.geekidea.springbootplus.framework.shiro.service;
 import io.geekidea.springbootplus.framework.shiro.jwt.JwtToken;
+import io.geekidea.springbootplus.framework.shiro.vo.JwtTokenRedisVo;
 import javax.servlet.http.HttpServletResponse;
@@ -39,4 +40,20 @@ public interface ShiroLoginService {
     */
    void refreshToken(JwtToken jwtToken, HttpServletResponse httpServletResponse) throws Exception;
+    /**
+     * 从redis获取token信息
+     *
+     * @param token
+     * @return
+     */
+    JwtTokenRedisVo getTokenInfoForRedis(String token);
+    /**
+     * 获取盐
+     * @param token
+     * @return
+     */
+    String getSalt(String token);
 }
--- a/framework/src/main/java/io/geekidea/springbootplus/framework/shiro/service/impl/ShiroLoginServiceImpl.java
+++ b/framework/src/main/java/io/geekidea/springbootplus/framework/shiro/service/impl/ShiroLoginServiceImpl.java
@@ -17,14 +17,16 @@
 package io.geekidea.springbootplus.framework.shiro.service.impl;
 import io.geekidea.springbootplus.config.constant.CommonConstant;
+import io.geekidea.springbootplus.config.constant.CommonRedisKey;
 import io.geekidea.springbootplus.config.properties.JwtProperties;
-import io.geekidea.springbootplus.config.properties.SpringBootPlusProperties;
 import io.geekidea.springbootplus.framework.shiro.cache.SysLoginRedisService;
 import io.geekidea.springbootplus.framework.shiro.jwt.JwtToken;
 import io.geekidea.springbootplus.framework.shiro.service.ShiroLoginService;
 import io.geekidea.springbootplus.framework.shiro.util.JwtTokenUtil;
 import io.geekidea.springbootplus.framework.shiro.util.JwtUtil;
+import io.geekidea.springbootplus.framework.shiro.vo.JwtTokenRedisVo;
 import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.codec.digest.DigestUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.commons.lang3.time.DateUtils;
 import org.apache.shiro.authc.AuthenticationException;
@@ -47,7 +49,6 @@ import java.util.Date;
 @Service
 public class ShiroLoginServiceImpl implements ShiroLoginService {
    @Lazy
    @Autowired
    private SysLoginRedisService sysLoginRedisService;
@@ -58,10 +59,6 @@ public class ShiroLoginServiceImpl implements ShiroLoginService {
    @Lazy
    @Autowired
-    private SpringBootPlusProperties springBootPlusProperties;
-    @Lazy
-    @Autowired
    private RedisTemplate redisTemplate;
@@ -103,7 +100,7 @@ public class ShiroLoginServiceImpl implements ShiroLoginService {
        // 生成新token字符串
        String newToken = JwtUtil.generateToken(username, salt, Duration.ofSeconds(expireSecond));
        // 生成新JwtToken对象
-        JwtToken newJwtToken = JwtToken.build(newToken, username,jwtToken.getUserId(), salt, expireSecond, jwtToken.getType());
+        JwtToken newJwtToken = JwtToken.build(newToken, username, jwtToken.getUserId(), salt, expireSecond, jwtToken.getType());
        // 更新redis缓存
        sysLoginRedisService.refreshLoginInfo(token, username, newJwtToken);
        log.debug("刷新token成功，原token:{}，新token:{}", token, newToken);
@@ -112,4 +109,30 @@ public class ShiroLoginServiceImpl implements ShiroLoginService {
        httpServletResponse.setStatus(CommonConstant.JWT_REFRESH_TOKEN_CODE);
        httpServletResponse.setHeader(JwtTokenUtil.getTokenName(), newToken);
    }
+    @Override
+    public JwtTokenRedisVo getTokenInfoForRedis(String token) {
+        Object jwtTokenRedisVo = null;
+        // 如果开启redis二次校验，或者设置为单个用户token登录，则先在redis中判断token是否存在
+        if (jwtProperties.isRedisCheck() || jwtProperties.isSingleLogin()) {
+            String tokenMd5 = DigestUtils.md5Hex(token);
+            jwtTokenRedisVo = redisTemplate.opsForValue().get(String.format(CommonRedisKey.LOGIN_TOKEN, tokenMd5));
+//            boolean redisExpired = sysLoginRedisService.exists(token); // 判断是否存在
+            if (jwtTokenRedisVo == null) {
+                throw new AuthenticationException("Redis Token不存在,token:" + token);
+            }
+        }
+        return (JwtTokenRedisVo) jwtTokenRedisVo;
+    }
+    @Override
+    public String getSalt(String token) {
+        String username = JwtUtil.getUsername(token);
+        if (jwtProperties.isSaltCheck()) {
+            return sysLoginRedisService.getSalt(username);
+        } else {
+            return jwtProperties.getSecret();
+        }
+    }
 }