diff --git a/payment-base-app/payment-base-app.iml b/payment-base-app/payment-base-app.iml index a2bbd1d..3a03a55 100644 --- a/payment-base-app/payment-base-app.iml +++ b/payment-base-app/payment-base-app.iml @@ -79,7 +79,7 @@ - + @@ -106,10 +106,12 @@ - - + + + + @@ -126,23 +128,21 @@ - - + + - - - + + + - - - + + + - - diff --git a/payment-base-app/pom.xml b/payment-base-app/pom.xml index 4c291d9..522cacb 100644 --- a/payment-base-app/pom.xml +++ b/payment-base-app/pom.xml @@ -74,6 +74,13 @@ 2.6.2 + + + com.auth0 + java-jwt + 3.7.0 + + com.github.wechatpay-apiv3 @@ -106,7 +113,7 @@ org.redisson redisson-spring-boot-starter - 3.15.1 + 3.11.3 com.alibaba diff --git a/payment-base-app/src/main/java/com/base/springcloud/aspect/config/PayConfigurer.java b/payment-base-app/src/main/java/com/base/springcloud/aspect/config/PayConfigurer.java index 93af01f..88ff99c 100644 --- a/payment-base-app/src/main/java/com/base/springcloud/aspect/config/PayConfigurer.java +++ b/payment-base-app/src/main/java/com/base/springcloud/aspect/config/PayConfigurer.java @@ -2,10 +2,12 @@ package com.base.springcloud.aspect.config; import com.base.springcloud.aspect.interceptor.PayInterceptor; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Component; import org.springframework.web.servlet.config.annotation.CorsRegistry; import org.springframework.web.servlet.config.annotation.InterceptorRegistry; import org.springframework.web.servlet.config.annotation.WebMvcConfigurer; +@Component public class PayConfigurer implements WebMvcConfigurer { @Autowired diff --git a/payment-base-app/src/main/java/com/base/springcloud/aspect/config/RedisConfig.java b/payment-base-app/src/main/java/com/base/springcloud/aspect/config/RedisConfig.java index 266771b..2beb139 100644 --- a/payment-base-app/src/main/java/com/base/springcloud/aspect/config/RedisConfig.java +++ b/payment-base-app/src/main/java/com/base/springcloud/aspect/config/RedisConfig.java @@ -54,6 +54,8 @@ public class RedisConfig extends CachingConfigurerSupport { Config config = new Config(); config.useSingleServer().setAddress("redis://" + host + ":" + port); config.useSingleServer().setPassword(password); + // 设置1秒钟ping一次来维持连接 + config.useSingleServer().setPingConnectionInterval(1000); return (Redisson) Redisson.create(config); } } \ No newline at end of file diff --git a/payment-base-app/src/main/java/com/base/springcloud/controller/MerchantController.java b/payment-base-app/src/main/java/com/base/springcloud/controller/MerchantController.java index a4e3591..1fd033c 100644 --- a/payment-base-app/src/main/java/com/base/springcloud/controller/MerchantController.java +++ b/payment-base-app/src/main/java/com/base/springcloud/controller/MerchantController.java @@ -1,5 +1,6 @@ package com.base.springcloud.controller; +import com.base.springcloud.aspect.annotation.LoginRequired; import com.base.springcloud.base.CommonResult; import com.base.springcloud.bo.MerchantConfigBO; import com.base.springcloud.constant.ErrorConstant; @@ -27,6 +28,7 @@ public class MerchantController { @ApiOperation(value = "商户支付信息配置", notes = "商户信息配置新增接口") @PostMapping("/merchantConfig") + @LoginRequired(department = true) public CommonResult paymentConfigure(MerchantConfigReqDTO merchantConfigDTO) { MerchantConfigBO merchantConfigBO = new MerchantConfigBO(); BeanUtils.copyProperties(merchantConfigDTO, merchantConfigBO); diff --git a/payment-base-app/src/main/java/com/base/springcloud/entity/User.java b/payment-base-app/src/main/java/com/base/springcloud/entity/User.java index d928051..f6cb454 100644 --- a/payment-base-app/src/main/java/com/base/springcloud/entity/User.java +++ b/payment-base-app/src/main/java/com/base/springcloud/entity/User.java @@ -22,7 +22,7 @@ public class User { private Integer sex; - private String email ; + private String email; private String phone; diff --git a/payment-base-app/src/main/java/com/base/springcloud/service/imp/MerchantServiceImp.java b/payment-base-app/src/main/java/com/base/springcloud/service/imp/MerchantServiceImp.java index c942013..fbfab55 100644 --- a/payment-base-app/src/main/java/com/base/springcloud/service/imp/MerchantServiceImp.java +++ b/payment-base-app/src/main/java/com/base/springcloud/service/imp/MerchantServiceImp.java @@ -1,6 +1,7 @@ package com.base.springcloud.service.imp; import com.base.springcloud.aspect.annotation.BusinessException; +import com.base.springcloud.aspect.annotation.LoginRequired; import com.base.springcloud.bo.MerchantConfigBO; import com.base.springcloud.bo.OrderBO; import com.base.springcloud.constant.ErrorConstant; diff --git a/payment-base-app/src/main/java/com/base/springcloud/service/imp/UserServiceImp.java b/payment-base-app/src/main/java/com/base/springcloud/service/imp/UserServiceImp.java index bfd9939..f7add23 100644 --- a/payment-base-app/src/main/java/com/base/springcloud/service/imp/UserServiceImp.java +++ b/payment-base-app/src/main/java/com/base/springcloud/service/imp/UserServiceImp.java @@ -1,5 +1,7 @@ package com.base.springcloud.service.imp; +import com.alibaba.fastjson.JSON; +import com.alibaba.fastjson.JSONObject; import com.base.springcloud.aspect.annotation.BusinessException; import com.base.springcloud.constant.ErrorConstant; import com.base.springcloud.constant.PaymentConstant; @@ -8,6 +10,7 @@ import com.base.springcloud.entity.User; import com.base.springcloud.service.UserService; import com.base.springcloud.util.JwtUtil; import com.base.springcloud.util.RedisUtil; +import com.google.gson.JsonObject; import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.cache.annotation.Cacheable; diff --git a/payment-base-app/src/main/java/com/base/springcloud/util/TokenUtils.java b/payment-base-app/src/main/java/com/base/springcloud/util/TokenUtils.java index 591cacf..74c6c5e 100644 --- a/payment-base-app/src/main/java/com/base/springcloud/util/TokenUtils.java +++ b/payment-base-app/src/main/java/com/base/springcloud/util/TokenUtils.java @@ -2,6 +2,7 @@ package com.base.springcloud.util; import com.base.springcloud.aspect.annotation.BusinessException; import com.base.springcloud.constant.ErrorConstant; +import com.base.springcloud.constant.PaymentConstant; import com.base.springcloud.entity.User; import com.base.springcloud.service.UserService; import org.apache.commons.lang3.StringUtils; @@ -17,6 +18,9 @@ public class TokenUtils { @Autowired private UserService userService; + @Autowired + private RedisUtil redisUtil; + private static UserService service; @PostConstruct @@ -48,9 +52,11 @@ public class TokenUtils { User user = service.getUser(username); // 校验token是否超时失效 & 或者账号密码是否错误 - service.TokenValidity(token,user); + //TokenValidity(token,user); } + + public static void departmentInfo(HttpServletRequest request) { } diff --git a/payment-base-app/src/main/resources/application.yml b/payment-base-app/src/main/resources/application.yml index 658789b..7794fce 100644 --- a/payment-base-app/src/main/resources/application.yml +++ b/payment-base-app/src/main/resources/application.yml @@ -20,24 +20,19 @@ spring: #password: pay123123 # redis 配置 redis: - database: 10 - # 地址 - host: 127.0.0.1 - # 端口，默认为6379 - port: 6379 - # 密码 - password: 123456 - # 连接超时时间 - timeout: 10s + database: 1 + host: 47.102.131.171 lettuce: pool: - # 连接池中的最小空闲连接 - min-idle: 0 - # 连接池中的最大空闲连接 - # 连接池的最大数据库连接数 - max-active: 8 - # #连接池最大阻塞等待时间（使用负值表示没有限制） - max-wait: -1ms + max-active: 8 #最大连接数据库连接数,设 0 为没有限制 + max-idle: 8 #最大等待连接中的数量,设 0 为没有限制 + max-wait: -1ms #最大建立连接等待时间。如果超过此时间将接到异常。设为-1表示无限制。 + min-idle: 0 #最小等待连接中的数量,设 0 为没有限制 + shutdown-timeout: 100ms + password: Redis@CS0731 + port: 6200 + cache: + type: simple servlet: multipart : max-request-size : 10MB diff --git a/payment-base-app/src/main/resources/com/base/payment/mapper/UserMapper.xml b/payment-base-app/src/main/resources/com/base/payment/mapper/UserMapper.xml index b1ab96a..66d99b3 100644 --- a/payment-base-app/src/main/resources/com/base/payment/mapper/UserMapper.xml +++ b/payment-base-app/src/main/resources/com/base/payment/mapper/UserMapper.xml @@ -10,7 +10,7 @@ - + diff --git a/payment-base-app/src/main/resources/generatorConfig.xml b/payment-base-app/src/main/resources/generatorConfig.xml index 590e834..47e9246 100644 --- a/payment-base-app/src/main/resources/generatorConfig.xml +++ b/payment-base-app/src/main/resources/generatorConfig.xml @@ -74,7 +74,7 @@ - +