feat 0 支付工程

payment-base-app/payment-base-app.iml

@@ -79,7 +79,7 @@
     <orderEntry type="library" scope="TEST" name="Maven: org.mockito:mockito-core:2.23.4" level="project" />
     <orderEntry type="library" name="Maven: net.bytebuddy:byte-buddy:1.9.12" level="project" />
     <orderEntry type="library" scope="TEST" name="Maven: net.bytebuddy:byte-buddy-agent:1.9.12" level="project" />
-    <orderEntry type="library" scope="TEST" name="Maven: org.objenesis:objenesis:2.6" level="project" />
+    <orderEntry type="library" name="Maven: org.objenesis:objenesis:2.6" level="project" />
     <orderEntry type="library" scope="TEST" name="Maven: org.hamcrest:hamcrest-core:1.3" level="project" />
     <orderEntry type="library" scope="TEST" name="Maven: org.hamcrest:hamcrest-library:1.3" level="project" />
     <orderEntry type="library" scope="TEST" name="Maven: org.skyscreamer:jsonassert:1.5.0" level="project" />
@@ -106,10 +106,12 @@
     <orderEntry type="library" name="Maven: org.mapstruct:mapstruct:1.2.0.Final" level="project" />
     <orderEntry type="library" name="Maven: io.springfox:springfox-swagger-ui:2.9.2" level="project" />
     <orderEntry type="library" name="Maven: com.google.code.gson:gson:2.6.2" level="project" />
-    <orderEntry type="library" name="Maven: com.github.wechatpay-apiv3:wechatpay-apache-httpclient:0.4.2" level="project" />
-    <orderEntry type="library" scope="RUNTIME" name="Maven: org.apache.httpcomponents:httpmime:4.5.8" level="project" />
+    <orderEntry type="library" name="Maven: com.auth0:java-jwt:3.7.0" level="project" />
     <orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-databind:2.9.8" level="project" />
     <orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-core:2.9.8" level="project" />
+    <orderEntry type="library" name="Maven: commons-codec:commons-codec:1.11" level="project" />
+    <orderEntry type="library" name="Maven: com.github.wechatpay-apiv3:wechatpay-apache-httpclient:0.4.2" level="project" />
+    <orderEntry type="library" scope="RUNTIME" name="Maven: org.apache.httpcomponents:httpmime:4.5.8" level="project" />
     <orderEntry type="library" name="Maven: commons-net:commons-net:3.1" level="project" />
     <orderEntry type="library" name="Maven: org.springframework.data:spring-data-redis:2.1.6.RELEASE" level="project" />
     <orderEntry type="library" name="Maven: org.springframework.data:spring-data-keyvalue:2.1.6.RELEASE" level="project" />
@@ -126,23 +128,21 @@
     <orderEntry type="library" name="Maven: io.netty:netty-resolver:4.1.34.Final" level="project" />
     <orderEntry type="library" name="Maven: io.projectreactor:reactor-core:3.2.8.RELEASE" level="project" />
     <orderEntry type="library" name="Maven: org.reactivestreams:reactive-streams:1.0.2" level="project" />
-    <orderEntry type="library" name="Maven: org.redisson:redisson-spring-boot-starter:3.15.1" level="project" />
-    <orderEntry type="library" name="Maven: org.redisson:redisson:3.15.1" level="project" />
+    <orderEntry type="library" name="Maven: org.redisson:redisson-spring-boot-starter:3.11.3" level="project" />
+    <orderEntry type="library" name="Maven: org.redisson:redisson:3.11.3" level="project" />
     <orderEntry type="library" name="Maven: io.netty:netty-codec:4.1.34.Final" level="project" />
     <orderEntry type="library" name="Maven: io.netty:netty-buffer:4.1.34.Final" level="project" />
     <orderEntry type="library" name="Maven: io.netty:netty-resolver-dns:4.1.34.Final" level="project" />
     <orderEntry type="library" name="Maven: io.netty:netty-codec-dns:4.1.34.Final" level="project" />
     <orderEntry type="library" name="Maven: javax.cache:cache-api:1.1.0" level="project" />
-    <orderEntry type="library" name="Maven: io.reactivex.rxjava3:rxjava:3.0.10" level="project" />
-    <orderEntry type="library" name="Maven: org.jboss.marshalling:jboss-marshalling-river:2.0.10.Final" level="project" />
-    <orderEntry type="library" name="Maven: org.jboss.marshalling:jboss-marshalling:2.0.10.Final" level="project" />
+    <orderEntry type="library" name="Maven: io.reactivex.rxjava2:rxjava:2.2.8" level="project" />
+    <orderEntry type="library" name="Maven: de.ruedigermoeller:fst:2.57" level="project" />
+    <orderEntry type="library" name="Maven: org.javassist:javassist:3.21.0-GA" level="project" />
     <orderEntry type="library" name="Maven: com.fasterxml.jackson.dataformat:jackson-dataformat-yaml:2.9.8" level="project" />
-    <orderEntry type="library" name="Maven: org.jodd:jodd-bean:5.1.6" level="project" />
-    <orderEntry type="library" name="Maven: org.jodd:jodd-core:5.1.6" level="project" />
-    <orderEntry type="library" name="Maven: org.redisson:redisson-spring-data-24:3.15.1" level="project" />
+    <orderEntry type="library" name="Maven: org.jodd:jodd-bean:5.0.13" level="project" />
+    <orderEntry type="library" name="Maven: org.jodd:jodd-core:5.0.13" level="project" />
+    <orderEntry type="library" name="Maven: org.redisson:redisson-spring-data-21:3.11.3" level="project" />
     <orderEntry type="library" name="Maven: com.alibaba:fastjson:1.2.47" level="project" />
-    <orderEntry type="library" name="Maven: com.auth0:java-jwt:3.7.0" level="project" />
-    <orderEntry type="library" name="Maven: commons-codec:commons-codec:1.11" level="project" />
     <orderEntry type="library" name="Maven: org.springframework.cloud:spring-cloud-starter-feign:1.4.7.RELEASE" level="project" />
     <orderEntry type="library" name="Maven: org.springframework.cloud:spring-cloud-starter-openfeign:2.1.1.RELEASE" level="project" />
     <orderEntry type="library" name="Maven: org.springframework.cloud:spring-cloud-starter:2.1.1.RELEASE" level="project" />

payment-base-app/pom.xml

@@ -74,6 +74,13 @@
             <version>2.6.2</version>
         </dependency>
 
+        <!--JWT-->
+        <dependency>
+            <groupId>com.auth0</groupId>
+            <artifactId>java-jwt</artifactId>
+            <version>3.7.0</version>
+        </dependency>
+
         <!-- 添加微信支付jar包 -->
         <dependency>
             <groupId>com.github.wechatpay-apiv3</groupId>
@@ -106,7 +113,7 @@
         <dependency>
             <groupId>org.redisson</groupId>
             <artifactId>redisson-spring-boot-starter</artifactId>
-            <version>3.15.1</version>
+            <version>3.11.3</version>
         </dependency>
         <dependency>
             <groupId>com.alibaba</groupId>

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

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);
 	}
 }

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);

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;
 

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;

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;

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) {
 
 	}

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

payment-base-app/src/main/resources/com/base/payment/mapper/UserMapper.xml

@@ -10,7 +10,7 @@
     <result column="avatar" jdbcType="VARCHAR" property="avatar" />
     <result column="birthday" jdbcType="TIMESTAMP" property="birthday" />
     <result column="sex" jdbcType="INTEGER" property="sex" />
-    <result column="email" jdbcType="VARCHAR" property="email  " />
+    <result column="email" jdbcType="VARCHAR" property="email" />
     <result column="phone" jdbcType="VARCHAR" property="phone" />
     <result column="org_code" jdbcType="VARCHAR" property="orgCode" />
     <result column="status" jdbcType="INTEGER" property="status" />

payment-base-app/src/main/resources/generatorConfig.xml

@@ -74,7 +74,7 @@
             <columnOverride column="avatar" property="avatar" jdbcType="VARCHAR" />
             <columnOverride column="birthday" property="birthday" jdbcType="TIMESTAMP" />
             <columnOverride column="sex" property="sex" jdbcType="TINYINT" />
-            <columnOverride column="email" property="email  " jdbcType="VARCHAR" />
+            <columnOverride column="email" property="email" jdbcType="VARCHAR" />
             <columnOverride column="phone" property="phone" jdbcType="VARCHAR" />
             <columnOverride column="org_code" property="orgCode" jdbcType="VARCHAR" />
             <columnOverride column="status" property="status" jdbcType="TINYINT" />