From 3a79c3ded377f8584794e253cc6f733d5b2a06b2 Mon Sep 17 00:00:00 2001 From: bunny <1319900154@qq.com> Date: Fri, 12 Apr 2024 12:36:39 +0800 Subject: [PATCH] =?UTF-8?q?feat(=E6=89=93=E5=8C=85):=20=E9=A1=B9=E7=9B=AE?= =?UTF-8?q?=E6=89=93=E5=8C=85?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .idea/misc.xml | 5 + service-gateway/pom.xml | 51 +++++++ service/pom.xml | 1 - service/service-acl/pom.xml | 6 +- service/service-activity/pom.xml | 51 +++++++ service/service-cart/Dockerfile | 21 +++ service/service-cart/pom.xml | 51 +++++++ service/service-home/pom.xml | 51 +++++++ service/service-order/pom.xml | 51 +++++++ service/service-payment/pom.xml | 28 ---- .../payment/ServicePaymentApplication.java | 15 -- .../ssyx/payment/api/WeixinController.java | 62 -------- .../ssyx/payment/config/Knife4jConfig.java | 54 ------- .../ssyx/payment/service/PaymentService.java | 19 --- .../ssyx/payment/service/WeixinService.java | 23 --- .../service/impl/PaymentServiceImpl.java | 87 ----------- .../service/impl/WeixinServiceImpl.java | 135 ------------------ .../src/main/resources/application-dev.yml | 28 ---- .../src/main/resources/application.yml | 77 ---------- .../src/main/resources/banner.txt | 16 --- .../src/main/resources/favicon.ico | Bin 13342 -> 0 bytes service/service-product/pom.xml | 53 ++++++- service/service-search/pom.xml | 51 +++++++ service/service-sys/pom.xml | 51 +++++++ service/service-user/pom.xml | 8 +- 25 files changed, 444 insertions(+), 551 deletions(-) create mode 100644 service/service-cart/Dockerfile delete mode 100644 service/service-payment/pom.xml delete mode 100644 service/service-payment/src/main/java/com/atguigu/ssyx/payment/ServicePaymentApplication.java delete mode 100644 service/service-payment/src/main/java/com/atguigu/ssyx/payment/api/WeixinController.java delete mode 100644 service/service-payment/src/main/java/com/atguigu/ssyx/payment/config/Knife4jConfig.java delete mode 100644 service/service-payment/src/main/java/com/atguigu/ssyx/payment/service/PaymentService.java delete mode 100644 service/service-payment/src/main/java/com/atguigu/ssyx/payment/service/WeixinService.java delete mode 100644 service/service-payment/src/main/java/com/atguigu/ssyx/payment/service/impl/PaymentServiceImpl.java delete mode 100644 service/service-payment/src/main/java/com/atguigu/ssyx/payment/service/impl/WeixinServiceImpl.java delete mode 100644 service/service-payment/src/main/resources/application-dev.yml delete mode 100644 service/service-payment/src/main/resources/application.yml delete mode 100644 service/service-payment/src/main/resources/banner.txt delete mode 100644 service/service-payment/src/main/resources/favicon.ico diff --git a/.idea/misc.xml b/.idea/misc.xml index 9b83232..1bda726 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -13,6 +13,11 @@ + diff --git a/service-gateway/pom.xml b/service-gateway/pom.xml index 0a956dd..5da1111 100644 --- a/service-gateway/pom.xml +++ b/service-gateway/pom.xml @@ -14,6 +14,9 @@ https://maven.apache.org + + 192.168.3.98:1100 + ssyx UTF-8 @@ -44,4 +47,52 @@ spring-cloud-starter-alibaba-nacos-discovery + + + + + org.springframework.boot + spring-boot-maven-plugin + + + org.apache.maven.plugins + maven-surefire-plugin + + true + + + + com.spotify + docker-maven-plugin + 1.2.2 + + + + build-image + + package + + build + push + + + + + harbor + http://${docker.repostory} + + + http://192.168.3.98:2375 + + + ${docker.repostory}/${docker.registry.name}/${project.artifactId}:${project.version} + + + ${project.basedir} + + false + + + + diff --git a/service/pom.xml b/service/pom.xml index 2f97606..1abe627 100644 --- a/service/pom.xml +++ b/service/pom.xml @@ -22,7 +22,6 @@ service-home service-cart service-order - service-payment diff --git a/service/service-acl/pom.xml b/service/service-acl/pom.xml index 8c4ed7e..793311a 100644 --- a/service/service-acl/pom.xml +++ b/service/service-acl/pom.xml @@ -14,7 +14,8 @@ https://maven.apache.org - 192.168.1.4:1100 + + 192.168.3.98:1100 ssyx UTF-8 @@ -59,7 +60,8 @@ harbor http://${docker.repostory} - http://192.168.1.4:2375 + + http://192.168.3.98:2375 ${docker.repostory}/${docker.registry.name}/${project.artifactId}:${project.version} diff --git a/service/service-activity/pom.xml b/service/service-activity/pom.xml index a0d856c..8046c15 100644 --- a/service/service-activity/pom.xml +++ b/service/service-activity/pom.xml @@ -14,6 +14,9 @@ https://maven.apache.org + + 192.168.3.98:1100 + ssyx UTF-8 @@ -24,4 +27,52 @@ 1.0-SNAPSHOT + + + + + org.springframework.boot + spring-boot-maven-plugin + + + org.apache.maven.plugins + maven-surefire-plugin + + true + + + + com.spotify + docker-maven-plugin + 1.2.2 + + + + build-image + + package + + build + push + + + + + harbor + http://${docker.repostory} + + + http://192.168.3.98:2375 + + + ${docker.repostory}/${docker.registry.name}/${project.artifactId}:${project.version} + + + ${project.basedir} + + false + + + + diff --git a/service/service-cart/Dockerfile b/service/service-cart/Dockerfile new file mode 100644 index 0000000..ef109ac --- /dev/null +++ b/service/service-cart/Dockerfile @@ -0,0 +1,21 @@ +FROM openjdk:17 +MAINTAINER bunny + +#系统编码 +ENV LANG=C.UTF-8 LC_ALL=C.UTF-8 + +# 设置时区，构建镜像时执行的命令 +RUN ln -sf /usr/share/zoneinfo/Asia/Shanghai /etc/localtime +RUN echo "Asia/Shanghai" > /etc/timezone + +# 设定工作目录 +WORKDIR /home/bunny + +# 复制jar包 +COPY target/*.jar /home/bunny/app.jar + +#启动容器时的进程 +ENTRYPOINT ["java","-jar","/home/bunny/app.jar"] + +#暴露 8080 端口 +EXPOSE 8080 \ No newline at end of file diff --git a/service/service-cart/pom.xml b/service/service-cart/pom.xml index e1860c1..c71e7c8 100644 --- a/service/service-cart/pom.xml +++ b/service/service-cart/pom.xml @@ -14,6 +14,9 @@ https://maven.apache.org + + 192.168.3.98:1100 + ssyx UTF-8 @@ -29,4 +32,52 @@ 1.0-SNAPSHOT + + + + + org.springframework.boot + spring-boot-maven-plugin + + + org.apache.maven.plugins + maven-surefire-plugin + + true + + + + com.spotify + docker-maven-plugin + 1.2.2 + + + + build-image + + package + + build + push + + + + + harbor + http://${docker.repostory} + + + http://192.168.3.98:2375 + + + ${docker.repostory}/${docker.registry.name}/${project.artifactId}:${project.version} + + + ${project.basedir} + + false + + + + diff --git a/service/service-home/pom.xml b/service/service-home/pom.xml index 4d56fd3..580ff5d 100644 --- a/service/service-home/pom.xml +++ b/service/service-home/pom.xml @@ -14,6 +14,9 @@ https://maven.apache.org + + 192.168.3.98:1100 + ssyx UTF-8 @@ -39,4 +42,52 @@ 1.0-SNAPSHOT + + + + + org.springframework.boot + spring-boot-maven-plugin + + + org.apache.maven.plugins + maven-surefire-plugin + + true + + + + com.spotify + docker-maven-plugin + 1.2.2 + + + + build-image + + package + + build + push + + + + + harbor + http://${docker.repostory} + + + http://192.168.3.98:2375 + + + ${docker.repostory}/${docker.registry.name}/${project.artifactId}:${project.version} + + + ${project.basedir} + + false + + + + diff --git a/service/service-order/pom.xml b/service/service-order/pom.xml index 14e19af..7d0a54e 100644 --- a/service/service-order/pom.xml +++ b/service/service-order/pom.xml @@ -14,6 +14,9 @@ https://maven.apache.org + + 192.168.3.98:1100 + ssyx UTF-8 @@ -40,4 +43,52 @@ compile + + + + + org.springframework.boot + spring-boot-maven-plugin + + + org.apache.maven.plugins + maven-surefire-plugin + + true + + + + com.spotify + docker-maven-plugin + 1.2.2 + + + + build-image + + package + + build + push + + + + + harbor + http://${docker.repostory} + + + http://192.168.3.98:2375 + + + ${docker.repostory}/${docker.registry.name}/${project.artifactId}:${project.version} + + + ${project.basedir} + + false + + + + diff --git a/service/service-payment/pom.xml b/service/service-payment/pom.xml deleted file mode 100644 index f37ba91..0000000 --- a/service/service-payment/pom.xml +++ /dev/null @@ -1,28 +0,0 @@ - - 4.0.0 - - com.atguigu - service - 1.0-SNAPSHOT - - - service-payment - jar - - service-payment - https://maven.apache.org - - - UTF-8 - - - - - - com.github.wxpay - wxpay-sdk - 0.0.3 - - - diff --git a/service/service-payment/src/main/java/com/atguigu/ssyx/payment/ServicePaymentApplication.java b/service/service-payment/src/main/java/com/atguigu/ssyx/payment/ServicePaymentApplication.java deleted file mode 100644 index d4a295a..0000000 --- a/service/service-payment/src/main/java/com/atguigu/ssyx/payment/ServicePaymentApplication.java +++ /dev/null @@ -1,15 +0,0 @@ -package com.atguigu.ssyx.payment; - -import org.springframework.boot.SpringApplication; -import org.springframework.cloud.client.SpringCloudApplication; -import org.springframework.cloud.client.discovery.EnableDiscoveryClient; -import org.springframework.transaction.annotation.EnableTransactionManagement; - -@SpringCloudApplication -@EnableTransactionManagement -@EnableDiscoveryClient -public class ServicePaymentApplication { - public static void main(String[] args) { - SpringApplication.run(ServicePaymentApplication.class, args); - } -} \ No newline at end of file diff --git a/service/service-payment/src/main/java/com/atguigu/ssyx/payment/api/WeixinController.java b/service/service-payment/src/main/java/com/atguigu/ssyx/payment/api/WeixinController.java deleted file mode 100644 index d355137..0000000 --- a/service/service-payment/src/main/java/com/atguigu/ssyx/payment/api/WeixinController.java +++ /dev/null @@ -1,62 +0,0 @@ -package com.atguigu.ssyx.payment.api; - -import com.atguigu.ssyx.common.result.Result; -import com.atguigu.ssyx.enums.PaymentType; -import com.atguigu.ssyx.payment.service.PaymentService; -import com.atguigu.ssyx.payment.service.WeixinService; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiOperation; -import io.swagger.annotations.ApiParam; -import lombok.extern.slf4j.Slf4j; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.PathVariable; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; - -import java.util.Map; - -/** - *

- * 微信支付 API - *

- */ -@Api(tags = "微信支付接口") -@RestController -@RequestMapping("/api/payment/weixin") -@Slf4j -public class WeixinController { - - @Autowired - private WeixinService weixinPayService; - - @Autowired - private PaymentService paymentService; - - @ApiOperation(value = "下单 小程序支付") - @GetMapping("/createJsapi/{orderNo}") - public Result createJsapi( - @ApiParam(name = "orderNo", value = "订单No", required = true) - @PathVariable("orderNo") String orderNo) { - return Result.ok(weixinPayService.createJsapi(orderNo)); - } - - @ApiOperation(value = "查询支付状态") - @GetMapping("/queryPayStatus/{orderNo}") - public Result queryPayStatus( - @ApiParam(name = "orderNo", value = "订单No", required = true) - @PathVariable("orderNo") String orderNo) { - // 调用查询接口 - Map resultMap = weixinPayService.queryPayStatus(orderNo, PaymentType.WEIXIN.name()); - if (resultMap == null) {// 出错 - return Result.error("支付出错"); - } - if ("SUCCESS".equals(resultMap.get("trade_state"))) {// 如果成功 - // 更改订单状态，处理支付结果 - String out_trade_no = resultMap.get("out_trade_no"); - paymentService.paySuccess(out_trade_no, PaymentType.WEIXIN, resultMap); - return Result.success("支付成功"); - } - return Result.success("支付中"); - } -} \ No newline at end of file diff --git a/service/service-payment/src/main/java/com/atguigu/ssyx/payment/config/Knife4jConfig.java b/service/service-payment/src/main/java/com/atguigu/ssyx/payment/config/Knife4jConfig.java deleted file mode 100644 index 0d9e5d8..0000000 --- a/service/service-payment/src/main/java/com/atguigu/ssyx/payment/config/Knife4jConfig.java +++ /dev/null @@ -1,54 +0,0 @@ -package com.atguigu.ssyx.payment.config; - -import org.springframework.context.annotation.Bean; -import org.springframework.context.annotation.Configuration; -import springfox.documentation.builders.ApiInfoBuilder; -import springfox.documentation.builders.ParameterBuilder; -import springfox.documentation.builders.PathSelectors; -import springfox.documentation.builders.RequestHandlerSelectors; -import springfox.documentation.schema.ModelRef; -import springfox.documentation.service.ApiInfo; -import springfox.documentation.service.Contact; -import springfox.documentation.service.Parameter; -import springfox.documentation.spi.DocumentationType; -import springfox.documentation.spring.web.plugins.Docket; -import springfox.documentation.swagger2.annotations.EnableSwagger2WebMvc; - -import java.util.ArrayList; -import java.util.List; - -@Configuration -@EnableSwagger2WebMvc -public class Knife4jConfig { - @Bean - public Docket adminApiConfig() { - List pars = new ArrayList<>(); - ParameterBuilder tokenPar = new ParameterBuilder(); - tokenPar.name("adminId") - .description("用户token") - .defaultValue("1") - .modelRef(new ModelRef("string")) - .parameterType("header") - .required(false) - .build(); - pars.add(tokenPar.build()); - - return new Docket(DocumentationType.SWAGGER_2) - .groupName("支付相关API") - .apiInfo(adminApiInfo()) - .select() - .apis(RequestHandlerSelectors.basePackage("com.atguigu.ssyx.activity.controller")) - .paths(PathSelectors.regex("/admin/.*")) - .build() - .globalOperationParameters(pars); - } - - private ApiInfo adminApiInfo() { - return new ApiInfoBuilder() - .title("后台管理系统-API文档") - .description("本文档描述了尚上优选后台系统服务接口定义") - .version("1.0") - .contact(new Contact("atguigu", "http://atguigu.com", "atguigu")) - .build(); - } -} \ No newline at end of file diff --git a/service/service-payment/src/main/java/com/atguigu/ssyx/payment/service/PaymentService.java b/service/service-payment/src/main/java/com/atguigu/ssyx/payment/service/PaymentService.java deleted file mode 100644 index df95bdf..0000000 --- a/service/service-payment/src/main/java/com/atguigu/ssyx/payment/service/PaymentService.java +++ /dev/null @@ -1,19 +0,0 @@ -package com.atguigu.ssyx.payment.service; - -import com.atguigu.ssyx.enums.PaymentType; -import com.atguigu.ssyx.model.order.PaymentInfo; - -import java.util.Map; - -public interface PaymentService { - - /** - * 保存交易记录 - */ - PaymentInfo savePaymentInfo(String orderNo, PaymentType paymentType); - - PaymentInfo getPaymentInfo(String orderNo, PaymentType paymentType); - - // 支付成功 - void paySuccess(String orderNo, PaymentType paymentType, Map paramMap); -} \ No newline at end of file diff --git a/service/service-payment/src/main/java/com/atguigu/ssyx/payment/service/WeixinService.java b/service/service-payment/src/main/java/com/atguigu/ssyx/payment/service/WeixinService.java deleted file mode 100644 index 7084310..0000000 --- a/service/service-payment/src/main/java/com/atguigu/ssyx/payment/service/WeixinService.java +++ /dev/null @@ -1,23 +0,0 @@ -package com.atguigu.ssyx.payment.service; - -import java.util.Map; - -public interface WeixinService { - - /** - * 根据订单号下单，生成支付链接 - * - * @param orderNo - * @return - */ - Map createJsapi(String orderNo); - - /** - * 根据订单号去微信第三方查询支付状态 - * - * @param orderNo - * @return - */ - Map queryPayStatus(String orderNo, String paymentType); - -} \ No newline at end of file diff --git a/service/service-payment/src/main/java/com/atguigu/ssyx/payment/service/impl/PaymentServiceImpl.java b/service/service-payment/src/main/java/com/atguigu/ssyx/payment/service/impl/PaymentServiceImpl.java deleted file mode 100644 index a5de038..0000000 --- a/service/service-payment/src/main/java/com/atguigu/ssyx/payment/service/impl/PaymentServiceImpl.java +++ /dev/null @@ -1,87 +0,0 @@ -package com.atguigu.ssyx.payment.service.impl; - -import com.atguigu.ssyx.common.result.ResultCodeEnum; -import com.atguigu.ssyx.enums.PaymentStatus; -import com.atguigu.ssyx.enums.PaymentType; -import com.atguigu.ssyx.model.order.OrderInfo; -import com.atguigu.ssyx.model.order.PaymentInfo; -import com.atguigu.ssyx.payment.service.PaymentService; -import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; -import lombok.extern.slf4j.Slf4j; -import org.springframework.stereotype.Service; -import org.springframework.transaction.annotation.Transactional; - -import javax.annotation.Resource; -import java.math.BigDecimal; -import java.util.Date; -import java.util.Map; - -@Service -@Slf4j -public class PaymentServiceImpl implements PaymentService { - - @Resource - private PaymentInfoMapper paymentInfoMapper; - - @Resource - private OrderFeignClient orderFeignClient; - - @Resource - private RabbitService rabbitService; - - @Transactional(rollbackFor = Exception.class) - @Override - public PaymentInfo savePaymentInfo(String orderNo, PaymentType paymentType) { - OrderInfo order = orderFeignClient.getOrderInfoByOrderNo(orderNo); - if (null == order) { - throw new GmallException(ResultCodeEnum.DATA_ERROR); - } - // 保存交易记录 - PaymentInfo paymentInfo = new PaymentInfo(); - paymentInfo.setCreateTime(new Date()); - paymentInfo.setOrderId(order.getId()); - paymentInfo.setPaymentType(paymentType); - paymentInfo.setUserId(order.getUserId()); - paymentInfo.setOrderNo(order.getOrderNo()); - paymentInfo.setPaymentStatus(PaymentStatus.UNPAID); - String subject = "test"; - paymentInfo.setSubject(subject); - // paymentInfo.setTotalAmount(order.getTotalAmount()); - paymentInfo.setTotalAmount(new BigDecimal("0.01")); - - paymentInfoMapper.insert(paymentInfo); - return paymentInfo; - } - - @Override - public PaymentInfo getPaymentInfo(String orderNo, PaymentType paymentType) { - LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); - queryWrapper.eq(PaymentInfo::getOrderNo, orderNo); - queryWrapper.eq(PaymentInfo::getPaymentType, paymentType); - return paymentInfoMapper.selectOne(queryWrapper); - } - - @Transactional(rollbackFor = Exception.class) - @Override - public void paySuccess(String orderNo, PaymentType paymentType, Map paramMap) { - LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); - queryWrapper.eq(PaymentInfo::getOrderNo, orderNo); - queryWrapper.eq(PaymentInfo::getPaymentType, paymentType); - PaymentInfo paymentInfo = paymentInfoMapper.selectOne(queryWrapper); - if (paymentInfo.getPaymentStatus() != PaymentStatus.UNPAID) { - return; - } - - PaymentInfo paymentInfoUpd = new PaymentInfo(); - paymentInfoUpd.setPaymentStatus(PaymentStatus.PAID); - String tradeNo = paymentType == PaymentType.WEIXIN ? paramMap.get("ransaction_id") : paramMap.get("trade_no"); - paymentInfoUpd.setTradeNo(tradeNo); - paymentInfoUpd.setCallbackTime(new Date()); - paymentInfoUpd.setCallbackContent(paramMap.toString()); - paymentInfoMapper.update(paymentInfoUpd, new LambdaQueryWrapper().eq(PaymentInfo::getOrderNo, orderNo)); - // 表示交易成功！ - - // 发送消息 - rabbitService.sendMessage(MqConst.EXCHANGE_PAY_DIRECT, MqConst.ROUTING_PAY_SUCCESS, orderNo); - } -} \ No newline at end of file diff --git a/service/service-payment/src/main/java/com/atguigu/ssyx/payment/service/impl/WeixinServiceImpl.java b/service/service-payment/src/main/java/com/atguigu/ssyx/payment/service/impl/WeixinServiceImpl.java deleted file mode 100644 index 3b0258b..0000000 --- a/service/service-payment/src/main/java/com/atguigu/ssyx/payment/service/impl/WeixinServiceImpl.java +++ /dev/null @@ -1,135 +0,0 @@ -package com.atguigu.ssyx.payment.service.impl; - -import com.alibaba.fastjson.JSON; -import com.atguigu.ssyx.enums.PaymentType; -import com.atguigu.ssyx.model.order.PaymentInfo; -import com.atguigu.ssyx.payment.service.PaymentService; -import com.atguigu.ssyx.payment.service.WeixinService; -import com.atguigu.ssyx.payment.util.ConstantPropertiesUtils; -import com.atguigu.ssyx.payment.util.HttpClient; -import com.atguigu.ssyx.vo.user.UserLoginVo; -import com.github.wxpay.sdk.WXPayUtil; -import lombok.extern.slf4j.Slf4j; -import org.springframework.data.redis.core.RedisTemplate; -import org.springframework.stereotype.Service; -import org.springframework.util.StringUtils; - -import javax.annotation.Resource; -import java.math.BigDecimal; -import java.util.Date; -import java.util.HashMap; -import java.util.Map; -import java.util.concurrent.TimeUnit; - -@Service -@Slf4j -public class WeixinServiceImpl implements WeixinService { - - @Resource - private PaymentService paymentService; - - @Resource - private RedisTemplate redisTemplate; - - /** - * 根据订单号下单，生成支付链接 - */ - @Override - public Map createJsapi(String orderNo) { - try { -// Map payMap = (Map) redisTemplate.opsForValue().get(orderNo); -// if(null != payMap) return payMap; - - PaymentInfo paymentInfo = paymentService.getPaymentInfo(orderNo, PaymentType.WEIXIN); - if (null == paymentInfo) { - paymentInfo = paymentService.savePaymentInfo(orderNo, PaymentType.WEIXIN); - } - - Map paramMap = new HashMap(); - // 1、设置参数 - paramMap.put("appid", ConstantPropertiesUtils.APPID); - paramMap.put("mch_id", ConstantPropertiesUtils.PARTNER); - paramMap.put("nonce_str", WXPayUtil.generateNonceStr()); - paramMap.put("body", paymentInfo.getSubject()); - paramMap.put("out_trade_no", paymentInfo.getOrderNo()); - int totalFee = paymentInfo.getTotalAmount().multiply(new BigDecimal(100)).intValue(); - paramMap.put("total_fee", String.valueOf(totalFee)); - paramMap.put("spbill_create_ip", "127.0.0.1"); - paramMap.put("notify_url", ConstantPropertiesUtils.NOTIFYURL); - paramMap.put("trade_type", "JSAPI"); -// paramMap.put("openid", "o1R-t5trto9c5sdYt6l1ncGmY5iY"); - UserLoginVo userLoginVo = (UserLoginVo) redisTemplate.opsForValue().get("user:login:" + paymentInfo.getUserId()); - if (null != userLoginVo && !StringUtils.isEmpty(userLoginVo.getOpenId())) { - paramMap.put("openid", userLoginVo.getOpenId()); - } else { - paramMap.put("openid", "oD7av4igt-00GI8PqsIlg5FROYnI"); - } - - // 2、HTTPClient来根据URL访问第三方接口并且传递参数 - HttpClient client = new HttpClient("https://api.mch.weixin.qq.com/pay/unifiedorder"); - - // client设置参数 - client.setXmlParam(WXPayUtil.generateSignedXml(paramMap, ConstantPropertiesUtils.PARTNERKEY)); - client.setHttps(true); - client.post(); - // 3、返回第三方的数据 - String xml = client.getContent(); - Map resultMap = WXPayUtil.xmlToMap(xml); - log.info("微信下单返回结果：{}", JSON.toJSONString(resultMap)); - - // 4、再次封装参数 - Map parameterMap = new HashMap<>(); - String prepayId = String.valueOf(resultMap.get("prepay_id")); - String packages = "prepay_id=" + prepayId; - parameterMap.put("appId", ConstantPropertiesUtils.APPID); - parameterMap.put("nonceStr", resultMap.get("nonce_str")); - parameterMap.put("package", packages); - parameterMap.put("signType", "MD5"); - parameterMap.put("timeStamp", String.valueOf(new Date().getTime())); - String sign = WXPayUtil.generateSignature(parameterMap, ConstantPropertiesUtils.PARTNERKEY); - - // 返回结果 - Map result = new HashMap(); - result.put("timeStamp", parameterMap.get("timeStamp")); - result.put("nonceStr", parameterMap.get("nonceStr")); - result.put("signType", "MD5"); - result.put("paySign", sign); - result.put("package", packages); - if (null != resultMap.get("result_code")) { - // 微信支付二维码2小时过期，可采取2小时未支付取消订单 - redisTemplate.opsForValue().set(orderNo, result, 120, TimeUnit.MINUTES); - } - return result; - } catch (Exception e) { - e.printStackTrace(); - return new HashMap<>(); - } - } - - @Override - public Map queryPayStatus(String orderNo, String paymentType) { - try { - // 1、封装参数 - Map paramMap = new HashMap<>(); - paramMap.put("appid", ConstantPropertiesUtils.APPID); - paramMap.put("mch_id", ConstantPropertiesUtils.PARTNER); - paramMap.put("out_trade_no", orderNo); - paramMap.put("nonce_str", WXPayUtil.generateNonceStr()); - - // 2、设置请求 - HttpClient client = new HttpClient("https://api.mch.weixin.qq.com/pay/orderquery"); - client.setXmlParam(WXPayUtil.generateSignedXml(paramMap, ConstantPropertiesUtils.PARTNERKEY)); - client.setHttps(true); - client.post(); - // 3、返回第三方的数据 - String xml = client.getContent(); - Map resultMap = WXPayUtil.xmlToMap(xml); - // 6、转成Map - // 7、返回 - return resultMap; - } catch (Exception e) { - e.printStackTrace(); - } - return null; - } -} \ No newline at end of file diff --git a/service/service-payment/src/main/resources/application-dev.yml b/service/service-payment/src/main/resources/application-dev.yml deleted file mode 100644 index f09be2b..0000000 --- a/service/service-payment/src/main/resources/application-dev.yml +++ /dev/null @@ -1,28 +0,0 @@ -server: - port: 8210 - -bunny: - datasource: - host: 106.15.251.123 - port: 3305 - sqlData: shequ-order - username: root - password: "02120212" - - redis: - host: 47.120.65.66 - port: 6379 - database: 3 - password: "02120212" - - rabbitmq: - # host: 192.168.1.4 - host: 192.168.3.98 - port: 5672 - username: bunny - password: "02120212" - - nacos: - server-addr: z-bunny.cn:8848 - discovery: - namespace: ssyx \ No newline at end of file diff --git a/service/service-payment/src/main/resources/application.yml b/service/service-payment/src/main/resources/application.yml deleted file mode 100644 index f2b9ccd..0000000 --- a/service/service-payment/src/main/resources/application.yml +++ /dev/null @@ -1,77 +0,0 @@ -server: - port: 8210 -spring: - application: - name: service-payment - profiles: - active: dev - - datasource: - type: com.zaxxer.hikari.HikariDataSource - driver-class-name: com.mysql.cj.jdbc.Driver - url: jdbc:mysql://${bunny.datasource.host}:${bunny.datasource.port}/${bunny.datasource.sqlData}?serverTimezone=GMT%2B8&useSSL=false&characterEncoding=utf-8&allowPublicKeyRetrieval=true - username: ${bunny.datasource.username} - password: ${bunny.datasource.password} - - redis: - host: ${bunny.redis.host} - port: ${bunny.redis.port} - database: ${bunny.redis.database} - password: ${bunny.redis.password} - lettuce: - pool: - max-active: 20 #最大连接数 - max-wait: -1 #最大阻塞等待时间(负数表示没限制) - max-idle: 5 #最大空闲 - min-idle: 0 #最小空闲 - - rabbitmq: - host: ${bunny.rabbitmq.host} - port: ${bunny.rabbitmq.port} - username: ${bunny.rabbitmq.username} - password: ${bunny.rabbitmq.password} - publisher-confirm-type: CORRELATED - publisher-returns: true - listener: - simple: - prefetch: 1 - concurrency: 3 - acknowledge-mode: manual - retry: - enabled: true # 开启消费者失败重试 - initial-interval: 1000ms # 初始失败等待时长 - multiplier: 1 # 下次失败等待时间被树，下次等待时长 multiplier * last-interval - max-attempts: 3 # 最大重试次数 - stateless: true # true 无状态 false 有状态。如果业务中包含事务，这里改为false - - cloud: - sentinel: - log: - dir: logs/${spring.application.name}/sentinel - nacos: - discovery: - namespace: ${bunny.nacos.discovery.namespace} - server-addr: ${bunny.nacos.server-addr} - - jackson: - date-format: yyyy-MM-dd HH:mm:ss - time-zone: GMT+8 - -logging: - level: - com.atguigu.ssyx.order.mapper: debug - com.atguigu.ssyx.order.controller: info - com.atguigu.ssyx.order.service: info - pattern: - dateformat: HH:mm:ss:SSS - file: - path: "logs/${spring.application.name}" - -# 微信 -weixin: - #小程序微信公众平台appId - appid: wxcc651fcbab275e33 - partner: 1481962542 - partnerkey: MXb72b9RfshXZD4FRGV5KLqmv5bx9LT9 - notifyurl: http://gmall-prod.atguigu.cn/api/payment/weixin/notify - cert: D:\yygh_work\yygh_parent\service\service-order\src\main\resources\apiclient_cert.p12 \ No newline at end of file diff --git a/service/service-payment/src/main/resources/banner.txt b/service/service-payment/src/main/resources/banner.txt deleted file mode 100644 index cc77fc2..0000000 --- a/service/service-payment/src/main/resources/banner.txt +++ /dev/null @@ -1,16 +0,0 @@ ------------------▄██-█▄--------- ------------------███▄██▄-------- ------------------███████-------- ------------------▀███████------- --------------------██████▄▄----- --------------------█████████▄--- --------------------██████▄████-- --------▄███████████████████████- ------▄███████████████████████▀-- ----▄██████████████████████------ ----███████████████████████------ ----███████████████████████------ --▄▄██████████████████████▀------ --█████████████████▀█████-------- --▀██████████████▀▀-▀█████▄------ --------▀▀▀▀▀▀▀▀▀------▀▀▀▀------ \ No newline at end of file diff --git a/service/service-payment/src/main/resources/favicon.ico b/service/service-payment/src/main/resources/favicon.ico deleted file mode 100644 index 1ba397c45de65f92b238bb9f94608320bf32209b..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 13342 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 diff --git a/service/service-product/pom.xml b/service/service-product/pom.xml index 7f9b4ff..21c0677 100644 --- a/service/service-product/pom.xml +++ b/service/service-product/pom.xml @@ -14,6 +14,9 @@ https://maven.apache.org + + 192.168.3.98:1100 + ssyx UTF-8 @@ -23,10 +26,58 @@ rabbit-util 1.0-SNAPSHOT - + cn.hutool hutool-all + + + + + org.springframework.boot + spring-boot-maven-plugin + + + org.apache.maven.plugins + maven-surefire-plugin + + true + + + + com.spotify + docker-maven-plugin + 1.2.2 + + + + build-image + + package + + build + push + + + + + harbor + http://${docker.repostory} + + + http://192.168.3.98:2375 + + + ${docker.repostory}/${docker.registry.name}/${project.artifactId}:${project.version} + + + ${project.basedir} + + false + + + + diff --git a/service/service-search/pom.xml b/service/service-search/pom.xml index 1ad2136..3a73fce 100644 --- a/service/service-search/pom.xml +++ b/service/service-search/pom.xml @@ -14,6 +14,9 @@ https://maven.apache.org + + 192.168.3.98:1100 + ssyx UTF-8 @@ -44,4 +47,52 @@ spring-boot-starter-data-redis + + + + + org.springframework.boot + spring-boot-maven-plugin + + + org.apache.maven.plugins + maven-surefire-plugin + + true + + + + com.spotify + docker-maven-plugin + 1.2.2 + + + + build-image + + package + + build + push + + + + + harbor + http://${docker.repostory} + + + http://192.168.3.98:2375 + + + ${docker.repostory}/${docker.registry.name}/${project.artifactId}:${project.version} + + + ${project.basedir} + + false + + + + diff --git a/service/service-sys/pom.xml b/service/service-sys/pom.xml index ec1ceaf..d0c7ac4 100644 --- a/service/service-sys/pom.xml +++ b/service/service-sys/pom.xml @@ -14,10 +14,61 @@ https://maven.apache.org + + 192.168.3.98:1100 + ssyx UTF-8 + + + + + org.springframework.boot + spring-boot-maven-plugin + + + org.apache.maven.plugins + maven-surefire-plugin + + true + + + + com.spotify + docker-maven-plugin + 1.2.2 + + + + build-image + + package + + build + push + + + + + harbor + http://${docker.repostory} + + + http://192.168.3.98:2375 + + + ${docker.repostory}/${docker.registry.name}/${project.artifactId}:${project.version} + + + ${project.basedir} + + false + + + + diff --git a/service/service-user/pom.xml b/service/service-user/pom.xml index 0ed9c23..6aae797 100644 --- a/service/service-user/pom.xml +++ b/service/service-user/pom.xml @@ -14,8 +14,9 @@ https://maven.apache.org - 192.168.1.4:1100 - spzx + + 192.168.3.98:1100 + ssyx UTF-8 @@ -65,7 +66,8 @@ harbor http://${docker.repostory} - http://192.168.1.4:2375 + + http://192.168.3.98:2375 ${docker.repostory}/${docker.registry.name}/${project.artifactId}:${project.version}