diff --git a/.idea/.gitignore b/.idea/.gitignore deleted file mode 100644 index 5c98b42..0000000 --- a/.idea/.gitignore +++ /dev/null @@ -1,2 +0,0 @@ -# Default ignored files -/workspace.xml \ No newline at end of file diff --git a/.idea/compiler.xml b/.idea/compiler.xml deleted file mode 100644 index caca779..0000000 --- a/.idea/compiler.xml +++ /dev/null @@ -1,18 +0,0 @@ - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/encodings.xml b/.idea/encodings.xml deleted file mode 100644 index 56b73e8..0000000 --- a/.idea/encodings.xml +++ /dev/null @@ -1,10 +0,0 @@ - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/bcprov_ext_jdk15on_1_46.xml b/.idea/libraries/bcprov_ext_jdk15on_1_46.xml deleted file mode 100644 index b13b5ac..0000000 --- a/.idea/libraries/bcprov_ext_jdk15on_1_46.xml +++ /dev/null @@ -1,15 +0,0 @@ - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/misc.xml b/.idea/misc.xml deleted file mode 100644 index fa18721..0000000 --- a/.idea/misc.xml +++ /dev/null @@ -1,19 +0,0 @@ - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/uiDesigner.xml b/.idea/uiDesigner.xml deleted file mode 100644 index e96534f..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/payment-base-app/pom.xml b/payment-base-app/pom.xml index d5087e5..a1bbbe9 100644 --- a/payment-base-app/pom.xml +++ b/payment-base-app/pom.xml @@ -12,12 +12,6 @@ payment-base-app - - - org.springframework.cloud - spring-cloud-starter-netflix-eureka-client - - org.springframework.boot spring-boot-starter-web @@ -157,5 +151,104 @@ + + + commons-httpclient + commons-httpclient + 3.0.1 + + + commons-logging + commons-logging + 1.1 + + + commons-codec + commons-codec + 1.3 + + + commons-lang + commons-lang + 2.3 + + + bcprov-ext-jdk15on + bcprov-ext-jdk15on + 1.4.6 + + + hiiposm_engine_simple + hiiposm_engine_simple + 2.3.4 + + + securityAPI-client + securityAPI-client + 1.0.0 + + + + + org.apache.maven.plugins + maven-assembly-plugin + 3.0.0 + + + + + + org.apache.maven.plugins + maven-compiler-plugin + 3.1 + + + maven-assembly-plugin + + + + com.base.app + + + + jar-with-dependencies + + + + + + make-assemble + package + + single + + + + + + + + + + maven-public + maven-public + http://maven.hnrr.com.cn/repository/maven-public/ + + true + + + + + + nexus-releases + maven-releases + http://maven.hnrr.com.cn/repository/maven-releases/ + + + nexus-snapshots + maven-snapshots + http://maven.hnrr.com.cn/repository/maven-snapshots/ + + \ No newline at end of file diff --git a/payment-base-app/src/main/java/com/base/springcloud/PaymentBaseApplication.java b/payment-base-app/src/main/java/com/base/springcloud/PaymentBaseApplication.java index 9de14ba..88869c8 100644 --- a/payment-base-app/src/main/java/com/base/springcloud/PaymentBaseApplication.java +++ b/payment-base-app/src/main/java/com/base/springcloud/PaymentBaseApplication.java @@ -4,12 +4,10 @@ import org.mybatis.spring.annotation.MapperScan; import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.SpringBootApplication; import org.springframework.cache.annotation.EnableCaching; -import org.springframework.cloud.netflix.eureka.EnableEurekaClient; import org.springframework.scheduling.annotation.EnableScheduling; import springfox.documentation.swagger2.annotations.EnableSwagger2; @SpringBootApplication -@EnableEurekaClient @EnableSwagger2 @EnableScheduling @EnableCaching 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 a2ed6dc..a0edac2 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 @@ -2,11 +2,20 @@ package com.base.springcloud.service.imp; import com.base.springcloud.bo.MerchantConfigBO; import com.base.springcloud.bo.OrderBO; +import com.base.springcloud.constant.PaymentConstant; import com.base.springcloud.dao.MerchantConfigMapper; import com.base.springcloud.entity.MerchantConfig; +import com.base.springcloud.entity.WxpayTradeVo; import com.base.springcloud.service.MerchantService; import com.base.springcloud.util.FtpUtil; +import com.base.springcloud.util.WxpayUtils; +import com.fasterxml.jackson.databind.node.ObjectNode; +import com.wechat.pay.contrib.apache.httpclient.WechatPayHttpClientBuilder; import org.apache.commons.lang.StringUtils; +import org.apache.http.client.methods.CloseableHttpResponse; +import org.apache.http.client.methods.HttpGet; +import org.apache.http.client.utils.URIBuilder; +import org.apache.http.util.EntityUtils; import org.springframework.beans.BeanUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Value; @@ -134,7 +143,7 @@ public class MerchantServiceImp implements MerchantService { File file = new File(FTP_BASEPATH + mchId + suffixName); try { certfile.transferTo(file); - return file.getPath() + mchId + suffixName; + return file.getPath(); } catch (IOException e) { // TODO 抛出业务异常 } @@ -185,8 +194,8 @@ public class MerchantServiceImp implements MerchantService { /*public static void main(String[] args) { WxpayTradeVo wxpayTradeVo = new WxpayTradeVo(); - wxpayTradeVo.setAppid("wxd678efh567hg6787"); - wxpayTradeVo.setMchid("1230000109"); + wxpayTradeVo.setAppid("wxa91984b310053c3d"); + wxpayTradeVo.setMchid("1610494969"); wxpayTradeVo.setDescription("Image形象店-深圳腾大-QQ公仔"); wxpayTradeVo.setOut_trade_no("20220301095644"); wxpayTradeVo.setNotify_url("https://www.weixin.qq.com/wxpay/pay.php"); @@ -194,6 +203,11 @@ public class MerchantServiceImp implements MerchantService { wxTradeAmountVo.setTotal(1l); wxTradeAmountVo.setCurrency("CNY"); wxpayTradeVo.setAmount(wxTradeAmountVo); - ObjectNode objectNode = WxpayUtils.getWxpay(wxpayTradeVo, PaymentConstant.NATIVE,"114233","1069818635","13587645303"); + ObjectNode objectNode = WxpayUtils.getWxpay(wxpayTradeVo, + PaymentConstant.NATIVE, + "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"); + System.out.println(objectNode); }*/ } \ No newline at end of file diff --git a/payment-base-app/src/main/java/com/base/springcloud/util/WxpayUtils.java b/payment-base-app/src/main/java/com/base/springcloud/util/WxpayUtils.java index f12e360..8d476af 100644 --- a/payment-base-app/src/main/java/com/base/springcloud/util/WxpayUtils.java +++ b/payment-base-app/src/main/java/com/base/springcloud/util/WxpayUtils.java @@ -17,7 +17,9 @@ import org.apache.http.entity.ContentType; import org.apache.http.entity.StringEntity; import org.apache.http.impl.client.CloseableHttpClient; import org.apache.http.util.EntityUtils; +import org.springframework.stereotype.Component; import org.springframework.util.Base64Utils; +import sun.misc.BASE64Decoder; import javax.crypto.BadPaddingException; import javax.crypto.Cipher; @@ -30,6 +32,8 @@ import java.io.IOException; import java.io.UnsupportedEncodingException; import java.nio.charset.StandardCharsets; import java.security.*; +import java.security.cert.CertificateException; +import java.security.cert.CertificateFactory; import java.security.cert.X509Certificate; import java.time.LocalDateTime; import java.time.ZoneOffset; @@ -41,6 +45,7 @@ import java.util.stream.Collectors; * * @author shuaifengjie.com */ +@Component @Slf4j public class WxpayUtils { @@ -95,7 +100,7 @@ public class WxpayUtils { * @param serialNo * @return */ - public static void refund(WxpayRefundVo tradeVo, String mchid, String privateKey, String certificate, String serialNo) { + public static void refund(WxpayRefundVo tradeVo, String mchid, String privateKey, String certificate, String serialNo) { // ... String responseBody = response(JSON.toJSONString(tradeVo), REFUND_URL, mchid, privateKey, certificate, serialNo); log.info("======>>> wxrefund response body: ", responseBody); @@ -115,31 +120,25 @@ public class WxpayUtils { public static String response(String data, String url, String mchid, String privateKey, String certificate, String serialNo) { log.info("====>>> wxpay response, mchid: {}, serialNo: {}, url: {}, privateKey: {}, certificate: {}, data: {}", mchid, serialNo, url, privateKey, certificate, data); - // ... HttpPost httpPost = new HttpPost(url); StringEntity reqEntity = new StringEntity(data, ContentType.create("application/json", "utf-8")); - // ... httpPost.setEntity(reqEntity); httpPost.addHeader("Accept", "application/json"); - // ... CloseableHttpResponse response = null; // 返回 String body = null; try { // 商户私钥 PrivateKey merchantPrivateKey = PemUtil.loadPrivateKey(new ByteArrayInputStream(privateKey.getBytes("utf-8"))); - // ... response = getClient(mchid, serialNo, merchantPrivateKey, certificate).execute(httpPost); log.info("====>>> wxpay response, result: {}", JSON.toJSONString(response)); - // response = httpClient.execute(httpPost); - // assertTrue(response.getStatusLine().getStatusCode() != 401); int statusCode = response.getStatusLine().getStatusCode(); HttpEntity entity = response.getEntity(); body = EntityUtils.toString(entity); log.info("====>>> wxpay response, success: {}, body: {}", statusCode, body); if (statusCode != 200) { - @SuppressWarnings("unchecked") Map errorMsg = StringHelper.json2map(body); + log.info("====>>> wxpay response, fail errorMsg: {}", errorMsg); } // 执行释放 EntityUtils.consume(entity); @@ -167,18 +166,20 @@ public class WxpayUtils { * @return * @throws UnsupportedEncodingException */ - public static CloseableHttpClient getClient(String mchid, String serialNo, PrivateKey privateKey, String certificate) throws UnsupportedEncodingException { - - // 使用自动更新的签名验证器，不需要传入证书 -// AutoUpdateCertificatesVerifier verifier = new AutoUpdateCertificatesVerifier( -// new WechatPay2Credentials(mchId, new PrivateKeySigner(mchSerialNo, merchantPrivateKey)), apiV3Key.getBytes("utf-8")); - - // builder - WechatPayHttpClientBuilder builder = WechatPayHttpClientBuilder.create().withMerchant(mchid, serialNo, privateKey); -// .withValidator(new WechatPay2Validator(verifier)); - + public static CloseableHttpClient getClient(String mchid, String serialNo, PrivateKey privateKey, String certificate) throws CertificateException, IOException { + //byte[] bytes = certificate.getBytes(StandardCharsets.UTF_8); + ByteArrayInputStream base = new ByteArrayInputStream(new BASE64Decoder().decodeBuffer(certificate)); List certs = new ArrayList<>(); - certs.add(PemUtil.loadCertificate(new ByteArrayInputStream(certificate.getBytes("utf-8")))); + CertificateFactory certificateFactory = CertificateFactory.getInstance("X.509"); + X509Certificate cert = null; + try { + cert = (X509Certificate) certificateFactory.generateCertificate(base); + }catch (CertificateException e){ + throw e; + } + assert cert != null; + certs.add(cert); + WechatPayHttpClientBuilder builder = WechatPayHttpClientBuilder.create().withMerchant(mchid, serialNo, privateKey); builder.withWechatpay(certs); return builder.build(); } diff --git a/payment-base-app/src/main/resources/application.yml b/payment-base-app/src/main/resources/application.yml index 5e60d42..bc856a2 100644 --- a/payment-base-app/src/main/resources/application.yml +++ b/payment-base-app/src/main/resources/application.yml @@ -1,20 +1,7 @@ server: - port: 8001 #服务端口 -#eureka配置 -eureka: - client: - #表示是否将自己注册进eureka 默认为true - register-with-eureka: true - #是否从EurekaServer中抓取已有的注册信息，默认为true，单点无所谓，集群必须设置true才能和ribbon使用负载均衡 - fetch-registry: true - service-url: - #集群配置 - defaultZone: http://eureka7002.com:7002/eureka - instance: - #服务名称修改 - instance-id: PAYMENT-BASE - #访问路径可以显示ip地址 - prefer-ip-address: true + port: 5080 #服务端口 + servlet: + context-path: /rbs-pay #spring相关配置 spring: application: @@ -22,10 +9,10 @@ spring: datasource: type: com.alibaba.druid.pool.DruidDataSource #当前数据源操作类型 driver-class-name: org.gjt.mm.mysql.Driver #数据库驱动包 - url: jdbc:mysql://106.14.81.251:3306/rbs_erp_test?characterEncoding=UTF-8&useUnicode=true&useSSL=false&tinyInt1isBit=false - username: root - password: hnrr%%360 - #rabbitmq 配置 + url: jdbc:mysql://rm-uf672osw4deemr4yt.mysql.rds.aliyuncs.com:3306/rbs_erp?characterEncoding=UTF-8&useUnicode=true&useSSL=false&tinyInt1isBit=false + username: hnrr + password: hnrr@0b6759c29a8e + #rabbitmq 配置 #rabbitmq: #host: localhost #port: 5672 @@ -33,12 +20,13 @@ spring: #password: pay123123 # redis 配置 redis: + database: 10 # 地址 - host: 127.0.0.1 + host: r-uf643kmbsoz7ledq2j.redis.rds.aliyuncs.com # 端口，默认为6379 port: 6379 # 密码 - password: 123456 + password: rds@53798a0fa6ce # 连接超时时间 timeout: 10s lettuce: diff --git a/payment-base-app/target/classes/application.yml b/payment-base-app/target/classes/application.yml index 4e8ece0..bc856a2 100644 --- a/payment-base-app/target/classes/application.yml +++ b/payment-base-app/target/classes/application.yml @@ -1,20 +1,7 @@ server: - port: 8001 #服务端口 -#eureka配置 -eureka: - client: - #表示是否将自己注册进eureka 默认为true - register-with-eureka: true - #是否从EurekaServer中抓取已有的注册信息，默认为true，单点无所谓，集群必须设置true才能和ribbon使用负载均衡 - fetch-registry: true - service-url: - #集群配置 - defaultZone: http://eureka7002.com:7002/eureka - instance: - #服务名称修改 - instance-id: PAYMENT-BASE - #访问路径可以显示ip地址 - prefer-ip-address: true + port: 5080 #服务端口 + servlet: + context-path: /rbs-pay #spring相关配置 spring: application: @@ -22,23 +9,24 @@ spring: datasource: type: com.alibaba.druid.pool.DruidDataSource #当前数据源操作类型 driver-class-name: org.gjt.mm.mysql.Driver #数据库驱动包 - url: jdbc:mysql://106.14.81.251:3306/rbs_erp_test?characterEncoding=UTF-8&useUnicode=true&useSSL=false&tinyInt1isBit=false - username: root - password: hnrr%%360 - #rabbitmq 配置 - rabbitmq: - host: localhost - port: 5672 - username: rbs-payment - password: pay123123 + url: jdbc:mysql://rm-uf672osw4deemr4yt.mysql.rds.aliyuncs.com:3306/rbs_erp?characterEncoding=UTF-8&useUnicode=true&useSSL=false&tinyInt1isBit=false + username: hnrr + password: hnrr@0b6759c29a8e + #rabbitmq 配置 + #rabbitmq: + #host: localhost + #port: 5672 + #username: rbs-payment + #password: pay123123 # redis 配置 redis: + database: 10 # 地址 - host: 127.0.0.1 + host: r-uf643kmbsoz7ledq2j.redis.rds.aliyuncs.com # 端口，默认为6379 port: 6379 # 密码 - password: 123456 + password: rds@53798a0fa6ce # 连接超时时间 timeout: 10s lettuce: diff --git a/payment-eureka-app/pom.xml b/payment-eureka-app/pom.xml deleted file mode 100644 index 53cb921..0000000 --- a/payment-eureka-app/pom.xml +++ /dev/null @@ -1,40 +0,0 @@ - - - - rbsservice - com.rbs.springcloud - 1.0-SNAPSHOT - - 4.0.0 - - payment-eureka-app - - - - - org.springframework.cloud - spring-cloud-starter-netflix-eureka-server - - - - org.springframework.boot - spring-boot-starter-web - - - org.springframework.boot - spring-boot-starter-actuator - - - org.projectlombok - lombok - true - - - org.springframework.boot - spring-boot-starter-test - test - - - \ No newline at end of file diff --git a/payment-eureka-app/src/main/java/com/eureka/server/springclould/EurekaServerApplication.java b/payment-eureka-app/src/main/java/com/eureka/server/springclould/EurekaServerApplication.java deleted file mode 100644 index 01d2dfd..0000000 --- a/payment-eureka-app/src/main/java/com/eureka/server/springclould/EurekaServerApplication.java +++ /dev/null @@ -1,14 +0,0 @@ -package com.eureka.server.springclould; - -import org.springframework.boot.SpringApplication; -import org.springframework.boot.autoconfigure.SpringBootApplication; -import org.springframework.cloud.netflix.eureka.server.EnableEurekaServer; - -@SpringBootApplication -@EnableEurekaServer -public class EurekaServerApplication { - - public static void main(String[] args) { - SpringApplication.run(EurekaServerApplication.class, args); - } -} \ No newline at end of file diff --git a/payment-eureka-app/src/main/resources/application.yml b/payment-eureka-app/src/main/resources/application.yml deleted file mode 100644 index e30b8c3..0000000 --- a/payment-eureka-app/src/main/resources/application.yml +++ /dev/null @@ -1,11 +0,0 @@ -server: - port: 7002 -eureka: - instance: - hostname: eureka7002.com #eureka服务端的实例名称 - client: - register-with-eureka: false #false表示不向注册中心注册自己。 - fetch-registry: false #false表示自己端就是注册中心，我的职责就是维护服务实例，并不需要去检索服务 - service-url: - #设置与eureka server交互的地址和注册服务都需要依赖这个地址 - defaultZone: http://eureka7002.com:7002/eureka/ #集群就是指向其他的eureka \ No newline at end of file diff --git a/payment-eureka-app/target/classes/application.yml b/payment-eureka-app/target/classes/application.yml deleted file mode 100644 index e30b8c3..0000000 --- a/payment-eureka-app/target/classes/application.yml +++ /dev/null @@ -1,11 +0,0 @@ -server: - port: 7002 -eureka: - instance: - hostname: eureka7002.com #eureka服务端的实例名称 - client: - register-with-eureka: false #false表示不向注册中心注册自己。 - fetch-registry: false #false表示自己端就是注册中心，我的职责就是维护服务实例，并不需要去检索服务 - service-url: - #设置与eureka server交互的地址和注册服务都需要依赖这个地址 - defaultZone: http://eureka7002.com:7002/eureka/ #集群就是指向其他的eureka \ No newline at end of file diff --git a/payment-eureka-app/target/classes/com/eureka/server/springclould/EurekaServerApplication.class b/payment-eureka-app/target/classes/com/eureka/server/springclould/EurekaServerApplication.class deleted file mode 100644 index 5359c82..0000000 Binary files a/payment-eureka-app/target/classes/com/eureka/server/springclould/EurekaServerApplication.class and /dev/null differ diff --git a/pom.xml b/pom.xml index 4133b22..10f5792 100644 --- a/pom.xml +++ b/pom.xml @@ -12,7 +12,6 @@ 1.0-SNAPSHOT payment-base-app - payment-eureka-app