maven远程部署配置

admin

2021-06-05 10ceb8fd7972048310188cc4d4646ab86cd69cb9

maven远程部署配置

 app/pom.xml

@@ -152,23 +152,21 @@
        <!--</exclusions>-->
        <!--</dependency>-->

      <dependency>
        <dependency>
            <groupId>com.ks</groupId>
            <artifactId>lib-common</artifactId>
            <version>0.0.1-SNAPSHOT</version>
            <scope>system</scope>
            <systemPath>${project.basedir}/src/main/libs/lib-common.jar</systemPath>
            <version>0.0.1</version>
        </dependency>


        <dependency>
            <groupId>com.ks</groupId>
            <artifactId>lib-common</artifactId>
            <version>0.0.1-SNAPSHOT</version>
            <scope>system</scope>
            <systemPath>${project.basedir}/src/main/libs/lib-common.jar</systemPath>
            <version>0.0.1</version>
        </dependency>



        <!-- https://mvnrepository.com/artifact/dom4j/dom4j -->
        <dependency>
            <groupId>dom4j</groupId>

 app/src/main/libs/lib-common.jar

Binary files differ

 app/src/main/resources/application.yml

@@ -1,103 +1,3 @@
server:
  port: 8088
  tomcat:
    uri-encoding: UTF-8

spring:
  main:
    allow-bean-definition-overriding: true
  http:
    encoding:
      force: true
      charset: UTF-8
      enabled: true
  data:
    mongodb:
      username: admin
      password: admin
      #172.16.16.44
      #193.112.35.168
      host: 118.195.138.153
      port: 27017
      database: lijin
      authentication-database: admin
  datasource:
    #gz-cdb-r13d0yi9.sql.tencentcdb.com:62929
    #172.16.16.17:3306
    url: jdbc:mysql://127.0.0.1:3306/tejia_app?&useTimezone=true&serverTimezone=GMT%2B8
    username: root
    password: root
    driver-class-name: com.mysql.jdbc.Driver
    type: com.alibaba.druid.pool.DruidDataSource
    druid:
      initial-size: 8
      min-idle: 1
      max-active: 20
      max-wait: 60000
      time-between-eviction-runsMillis: 60000
      min-evictable-idle-timeMillis: 300000
      validation-query: select 'x' FROM DUAL
      test-while-idle: true
      test-on-borrow: false
      test-on-return: false
      pool-prepared-statements: true
      max-open-prepared-statements: 20
      max-pool-prepared-statement-per-connection-size: 20
      filters: stat
      connection-properties: druid.stat.mergeSql=true;druid.stat.slowSqlMillis=5000
      use-global-data-source-stat: true
mybatis:
  mapper-locations : classpath:mapper/*.xml
  type-aliases-package: com.ks.goldcorn.pojo.DO
  configuration:
    log-impl: org.apache.ibatis.logging.slf4j.Slf4jImpl

redis:
  #172.16.16.3
  #193.112.34.40
  host: 118.195.138.153
  port: 6379
  password: 123456
  timeout: 5000
  jedis:
    pool:
      max-wait: 10000
      max-idle: 200
      max-total: 1024
  database: 4

dubbo:
  application:
    name: lijin-provider
  registry:
    protocol: zookeeper
#    address: zookeeper://193.112.35.168:2181
    address: zookeeper://118.195.138.153:2181
    client: curator
  protocol:
    name: dubbo
    port: 20901
  scan:
    base-packages: com.ks.lijin.service.remote
  provider:
    timeout: 10000


xxl:
  job:
    accessToken:
    executor:
      appname: demo
      ip:
      logpath: /data/applogs/xxl-job/jobhandler
      logretentiondays: -1
      port: 9999
    admin:
      addresses: http://localhost:8081/xxl-job-admin
logging:
  level:
    com:
      ks:
        lucky:
          mapper: debug
    org.springframework.data.mongodb.core: DEBUG
  profiles:
    active: test

 facade-lijin/pom.xml

@@ -20,37 +20,25 @@
            <version>0.0.1-SNAPSHOT</version>
        </dependency>

      <dependency>


        <dependency>
            <groupId>com.ks</groupId>
            <artifactId>lib-common</artifactId>
            <version>0.0.1-SNAPSHOT</version>
            <scope>system</scope>
            <systemPath>${project.basedir}/src/main/libs/lib-common.jar</systemPath>
            <version>0.0.1</version>
        </dependency>

        <dependency>
            <groupId>com.ks</groupId>
            <artifactId>facade-goods</artifactId>
            <version>0.0.1-SNAPSHOT</version>
            <scope>system</scope>
            <systemPath>${project.basedir}/src/main/libs/facade-goods.jar</systemPath>
            <version>0.0.1</version>
        </dependency>


        <dependency>
            <groupId>com.ks</groupId>
            <artifactId>lib-common</artifactId>
            <version>0.0.1-SNAPSHOT</version>
            <scope>system</scope>
            <systemPath>${project.basedir}/src/main/libs/lib-common.jar</systemPath>
        </dependency>



        <dependency>
            <groupId>com.yeshi</groupId>
            <artifactId>utils</artifactId>
            <version>0.0.3</version>
            <version>0.0.4</version>
            <exclusions>
                <exclusion>
                    <groupId>org.slf4j</groupId>
@@ -67,11 +55,9 @@


        <dependency>
            <groupId>taobao</groupId>
            <artifactId>taobao</artifactId>
            <version>1.0.0</version>
            <scope>system</scope>
            <systemPath>${project.basedir}/src/main/libs/taobao-sdk-java-auto_1533536267316-20180829.jar</systemPath>
            <groupId>com.taobao.taoke</groupId>
            <artifactId>api</artifactId>
            <version>20180829</version>
        </dependency>



 facade-lijin/src/main/libs/facade-goods.jar

Binary files differ

 facade-lijin/src/main/libs/lib-common.jar

Binary files differ

 facade-lijin/src/main/libs/taobao-sdk-java-auto_1533536267316-20180829.jar

Binary files differ

 facade-vip/pom.xml

@@ -18,9 +18,7 @@
        <dependency>
            <groupId>com.ks</groupId>
            <artifactId>lib-common</artifactId>
            <version>0.0.1-SNAPSHOT</version>
            <scope>system</scope>
            <systemPath>${project.basedir}/src/main/libs/lib-common.jar</systemPath>
            <version>0.0.1</version>
            <exclusions>
                <exclusion>
                    <groupId>org.slf4j</groupId>
@@ -39,7 +37,7 @@
        <dependency>
            <groupId>com.yeshi</groupId>
            <artifactId>utils</artifactId>
            <version>0.0.3</version>
            <version>0.0.4</version>
            <exclusions>
                <exclusion>
                    <groupId>org.slf4j</groupId>

 facade-vip/src/main/java/com/ks/vip/pojo/DTO/PayWayInfoDTO.java

@@ -1,17 +1,21 @@
package com.ks.vip.pojo.DTO;

public class PayWayInfoDTO {
import com.ks.vip.pojo.Enums.PayWayEnum;

    private int payWay;
import java.io.Serializable;

public class PayWayInfoDTO implements Serializable {

    private PayWayEnum payWay;

    private String payUrl;

    private String alipayFormId;

    public PayWayInfoDTO(int payWay, String payUrl,String alipayFormId) {
    public PayWayInfoDTO(PayWayEnum payWay, String payUrl, String alipayFormId) {
        this.payWay = payWay;
        this.payUrl = payUrl;
        this.alipayFormId=alipayFormId;
        this.alipayFormId = alipayFormId;
    }


@@ -23,13 +27,6 @@
        this.alipayFormId = alipayFormId;
    }

    public int getPayWay() {
        return payWay;
    }

    public void setPayWay(int payWay) {
        this.payWay = payWay;
    }

    public String getPayUrl() {
        return payUrl;
@@ -38,4 +35,12 @@
    public void setPayUrl(String payUrl) {
        this.payUrl = payUrl;
    }

    public PayWayEnum getPayWay() {
        return payWay;
    }

    public void setPayWay(PayWayEnum payWay) {
        this.payWay = payWay;
    }
}

 facade-vip/src/main/java/com/ks/vip/pojo/DTO/VipOrderDTO.java

@@ -3,10 +3,11 @@
import com.ks.vip.pojo.Enums.PayWayEnum;
import org.yeshi.utils.generater.mybatis.Column;

import java.io.Serializable;
import java.math.BigDecimal;
import java.util.Date;

public class VipOrderDTO {
public class VipOrderDTO implements Serializable {

    private Long comboId;


 facade-vip/src/main/java/com/ks/vip/service/VipOrederPayService.java

@@ -6,6 +6,9 @@
import com.ks.vip.pojo.DO.VipOrder;
import com.ks.vip.pojo.DTO.PayWayInfoDTO;
import com.ks.vip.pojo.DTO.VipOrderDTO;
import org.yeshi.utils.exception.WXPayException;

import java.util.Map;

public interface VipOrederPayService {

@@ -16,16 +19,18 @@
     * @param t
     * @throws VipOrderException
     */
    public PayWayInfoDTO addOrderWithPay(VipOrderDTO t, String notifyUrl, String returnUrl) throws VipOrderException;

    public PayWayInfoDTO addOrderWithPay(VipOrderDTO t, String notifyUrl, String returnUrl,String ip) throws VipOrderException;

    /**
     * 订单支付
     *
     * 创建支付订单
     * @param ip
     * @param order
     * @param notifyUrl
     * @param returnUrl
     * @return
     * @throws OrderPayException
     */
    public PayWayInfoDTO payOrder(VipOrder order, String notifyUrl, String returnUrl) throws OrderPayException;
    public PayWayInfoDTO payOrder( VipOrder order, String notifyUrl, String returnUrl,String ip) throws OrderPayException;


    /**
@@ -45,4 +50,19 @@
     */
    public VipOrder checkOrderPayState(Long id);


    /**
     * 获取微信支付成功的订单号
     * @param notifyContent
     * @return
     */
    public String getWXPaySuccessOutOrderNo(String notifyContent) throws Exception;


    /**
     * 获取支付宝支付成功的订单号
     * @param params
     * @return
     */
    public String getAlipayPaySuccessOutOrderNo(Map<String, String> params) throws Exception;
}

 facade-vip/src/main/java/com/ks/vip/service/VipOrederService.java

@@ -9,23 +9,34 @@

public interface VipOrederService {

   public long count(VipOrder t);
    public long count(VipOrder t);

   public List<VipOrder> listByPage(int page, int pageSize, VipOrder t);
    public List<VipOrder> listByPage(int page, int pageSize, VipOrder t);

   public void insertSelective(VipOrder t);
    public void insertSelective(VipOrder t);

   public void updateByPrimaryKeySelective(VipOrder t);
    public void updateByPrimaryKeySelective(VipOrder t);

   public void delete(Long id);
    public void delete(Long id);

   public void addOrderByWatchVideo(String uid, Long gradeId, Integer hour) throws VipOrderException;
    public void addOrderByWatchVideo(String uid, Long gradeId, Integer hour) throws VipOrderException;

   /**
    * 是否可以
    * @param uid
    * @return
    */
   public boolean canAddOrderByWatchVideo(String uid);
    /**
     * 是否可以
     *
     * @param uid
     * @return
     */
    public boolean canAddOrderByWatchVideo(String uid);


    /**
     * 根据三方订单ID查询订单
     *
     * @param orderId
     * @return
     */
    public VipOrder selectByThreeOrderId(String orderId);


}

 facade-vip/src/main/libs/lib-common.jar

Binary files differ

 facade-vip/src/main/libs/taobao-sdk-java-auto_1533536267316-20180829.jar

Binary files differ

 pom.xml

@@ -205,6 +205,18 @@
            <version>2.9.0</version>
        </dependency>

        <!-- https://mvnrepository.com/artifact/org.apache.httpcomponents/httpclient -->
        <dependency>
            <groupId>org.apache.httpcomponents</groupId>
            <artifactId>httpclient</artifactId>
            <version>4.5.4</version>
            <exclusions>
                <exclusion>
                    <groupId>org.slf4j</groupId>
                    <artifactId>slf4j-log4j12</artifactId>
                </exclusion>
            </exclusions>
        </dependency>


    </dependencies>
@@ -224,4 +236,18 @@
        </plugins>
    </build>

    <distributionManagement>
        <repository>
            <id>java-release</id>
            <name>java-release</name>
            <url>http://193.112.35.168:8081/nexus/content/repositories/releases/</url>
        </repository>

        <snapshotRepository>
            <id>java-snapshot</id>
            <name>java-snapshot</name>
            <url>http://193.112.35.168:8081/nexus/content/repositories/snapshots/</url>
        </snapshotRepository>
    </distributionManagement>

</project>

 service-lijin/pom.xml

@@ -11,7 +11,7 @@

    <groupId>com.ks</groupId>
    <artifactId>service-lijin</artifactId>
    <version>0.0.1-SNAPSHOT</version>
    <version>0.0.1</version>
    <name>service-lijin</name>
    <description>淘礼金服务</description>


 service-lijin/src/main/resources/application-pro.yml

New file
@@ -0,0 +1,110 @@
server:
  port: 8087
  tomcat:
    uri-encoding: UTF-8

spring:
  main:
    allow-bean-definition-overriding: true
  http:
    encoding:
      force: true
      charset: UTF-8
      enabled: true
  data:
    mongodb:
      username: yeshi
      password: Yeshi2016@
      host: 172.16.16.44
      port: 27017
      database: lijin
      authentication-database: admin
  datasource:
    #gz-cdb-r13d0yi9.sql.tencentcdb.com:62929
    #172.16.16.17:3306
    url: jdbc:mysql://172.16.16.17:3306/ec_lijin?&useTimezone=true&serverTimezone=GMT%2B8
    username: root
    password: Yeshi2016@
    driver-class-name: com.mysql.jdbc.Driver
    type: com.alibaba.druid.pool.DruidDataSource
    druid:
      initial-size: 8
      min-idle: 1
      max-active: 20
      max-wait: 60000
      time-between-eviction-runsMillis: 60000
      min-evictable-idle-timeMillis: 300000
      validation-query: select 'x' FROM DUAL
      test-while-idle: true
      test-on-borrow: false
      test-on-return: false
      pool-prepared-statements: true
      max-open-prepared-statements: 20
      max-pool-prepared-statement-per-connection-size: 20
      filters: stat
      connection-properties: druid.stat.mergeSql=true;druid.stat.slowSqlMillis=5000
      use-global-data-source-stat: true

  redis:
    host: 172.16.16.15
    port: 6379
    password: crs-43yhgz0i:Yeshi2016@
    timeout: 5000ms
    database: 8
    lettuce:
      pool:
        max-active: 1024
        max-wait: 10000ms
        max-idle: 200
        time-between-eviction-runs: 60000ms
        min-idle: 8
      jedis:
        pool:
          max-active: 1024
          max-wait: 10000ms
          max-idle: 200
          time-between-eviction-runs: 60000ms
          min-idle: 8


mybatis:
  mapper-locations : classpath:mapper/*.xml
  type-aliases-package: com.ks.goldcorn.pojo.DO
  configuration:
    log-impl: org.apache.ibatis.logging.slf4j.Slf4jImpl


dubbo:
  application:
    name: lijin-provider
  registry:
    protocol: zookeeper
    address: zookeeper://172.16.16.26:2181
    #    address: zookeeper://118.195.138.153:2181
    client: curator
  protocol:
    name: dubbo
    port: 20902
  scan:
    base-packages: com.ks.lijin.service.remote
  provider:
    timeout: 10000
#    host: 193.112.35.168
xxl:
  job:
    accessToken:
    executor:
      appname: demo
      ip:
      logpath: /data/applogs/xxl-job/jobhandler
      logretentiondays: -1
      port: 9994
    admin:
      addresses: http://111.231.250.166:9000/xxl-job-admin
logging:
  level:
    com:
      ks:
        lijin:
          mapper: debug
    org.springframework.data.mongodb.core: DEBUG

 service-lijin/src/main/resources/application.yml

@@ -1,3 +1,3 @@
spring:
  profiles:
    active: test
    active: pro

 service-vip/pom.xml

@@ -30,26 +30,26 @@
            <version>0.0.1-SNAPSHOT</version>
        </dependency>

      <!--  <dependency>
            <groupId>com.ks</groupId>
            <artifactId>facade-app</artifactId>
            <version>0.0.1-SNAPSHOT</version>
        </dependency>-->
        <!--  <dependency>
              <groupId>com.ks</groupId>
              <artifactId>facade-app</artifactId>
              <version>0.0.1-SNAPSHOT</version>
          </dependency>-->

        <dependency>
            <groupId>org.springframework.boot</groupId>
            <artifactId>spring-boot-starter</artifactId>
        </dependency>

       <!-- <dependency>
            <groupId>org.springframework.security</groupId>
            <artifactId>spring-security-config</artifactId>
        </dependency>
        <!-- <dependency>
             <groupId>org.springframework.security</groupId>
             <artifactId>spring-security-config</artifactId>
         </dependency>

        <dependency>
            <groupId>org.springframework.security</groupId>
            <artifactId>spring-security-web</artifactId>
        </dependency>-->
         <dependency>
             <groupId>org.springframework.security</groupId>
             <artifactId>spring-security-web</artifactId>
         </dependency>-->

        <dependency>
            <groupId>org.springframework.boot</groupId>
@@ -138,10 +138,10 @@

        <!--devtools热部署-->
        <!--<dependency>-->
            <!--<groupId>org.springframework.boot</groupId>-->
            <!--<artifactId>spring-boot-devtools</artifactId>-->
            <!--<optional>true</optional>-->
            <!--<scope>true</scope>-->
        <!--<groupId>org.springframework.boot</groupId>-->
        <!--<artifactId>spring-boot-devtools</artifactId>-->
        <!--<optional>true</optional>-->
        <!--<scope>true</scope>-->
        <!--</dependency>-->
        <dependency>
            <groupId>com.ks</groupId>
@@ -167,6 +167,12 @@
            <version>2.4</version>
        </dependency>

        <dependency>
            <groupId>com.github.wechatpay-apiv3</groupId>
            <artifactId>wechatpay-apache-httpclient</artifactId>
            <version>0.2.1</version>
        </dependency>


    </dependencies>

@@ -176,6 +182,7 @@
            <plugin>
                <groupId>org.springframework.boot</groupId>
                <artifactId>spring-boot-maven-plugin</artifactId>
                <version>2.4.1</version>
            </plugin>
        </plugins>
    </build>

 service-vip/src/main/java/com/ks/vip/config/RedisConfiguration.java

File was deleted

 service-vip/src/main/java/com/ks/vip/service/manager/RedisManager.java

File was deleted

 service-vip/src/main/java/com/ks/vip/service/remote/VipOrderPayServiceImpl.java

@@ -14,19 +14,24 @@
import com.ks.vip.service.VipCenterService;
import com.ks.vip.service.VipComboService;
import com.ks.vip.service.VipOrederPayService;
import com.ks.vip.service.manager.RedisManager;
import com.ks.vip.util.Constant;
import com.ks.vip.util.PayUtil;
import org.apache.dubbo.config.annotation.Service;
import org.springframework.data.redis.core.RedisTemplate;
import org.springframework.data.redis.core.StringRedisTemplate;
import org.springframework.transaction.annotation.Transactional;
import org.yeshi.utils.StringUtil;
import org.yeshi.utils.alipay.AlipayH5PayUtil;
import org.yeshi.utils.entity.wx.WXPayOrderInfoV3;
import org.yeshi.utils.wx.WXPayV3Util;
import redis.clients.jedis.Jedis;
import redis.clients.jedis.JedisPool;

import javax.annotation.Resource;
import java.util.Date;
import java.util.Map;
import java.util.UUID;
import java.util.concurrent.TimeUnit;

@Service(version = "1.0")
public class VipOrderPayServiceImpl implements VipOrederPayService {
@@ -41,12 +46,12 @@
    private VipCenterService vipCenterService;

    @Resource
    private RedisManager redisManager;
    private JedisPool jedisPool;


    @Override
    @Transactional(rollbackFor = Exception.class)
    public PayWayInfoDTO addOrderWithPay(VipOrderDTO t, String notifyUrl, String returnUrl) throws VipOrderException {
    public PayWayInfoDTO addOrderWithPay(VipOrderDTO t, String notifyUrl, String returnUrl, String ip) throws VipOrderException {
        if (t.getComboId() == null || t.getComboId() <= 0) {
            throw new VipOrderException(1, "套餐ID不能为空");
        }
@@ -75,17 +80,22 @@

        // 插入订单信息
        VipOrder newOrder = new VipOrder();
        newOrder.setState(VipOrder.STATE_INIT);
        newOrder.setComboId(t.getComboId());
        newOrder.setUid(t.getUid());
        newOrder.setThreeOrderId(t.getThreeOrderId());
        newOrder.setPayWay(t.getPayWay().name());
        newOrder.setType(orderType);
        newOrder.setPayMoney(t.getPayMoney());
        newOrder.setCreateTime(new Date());
        vipOrderMapper.insertSelective(newOrder);

        if (returnUrl != null) {
            returnUrl += "?id=" + newOrder.getId();
        }
        // 支付方式
        try {
            return payOrder(newOrder, notifyUrl, returnUrl);
            return payOrder(newOrder, notifyUrl, returnUrl, ip);
        } catch (OrderPayException e) {
            e.printStackTrace();
            throw new VipOrderException(VipOrderException.CODE_CREATE_PAY_ORDER_FAIL, e.getMsg());
@@ -95,27 +105,33 @@

    @Override
    @Transactional(rollbackFor = Exception.class)
    public PayWayInfoDTO payOrder(VipOrder order, String notifyUrl, String returnUrl) throws OrderPayException {
    public PayWayInfoDTO payOrder(VipOrder order, String notifyUrl, String returnUrl, String ip) throws OrderPayException {
        if (order.getState() == VipOrder.STATE_PAY) {
            throw new OrderPayException(OrderPayException.CODE_ALREADY_PAY, "已经完成支付");
        }
        String goodsTitle = Constant.ORDER_PAY_TITLE;
        String orderId = order.getId() + "";
        String orderId = order.getThreeOrderId() + "";
        switch (order.getPayWay()) {
            //生成支付宝支付订单
            case "alipay":
                String form = PayUtil.getVipChargeAlipayForm(orderId, goodsTitle, orderId, order.getPayMoney(), notifyUrl, returnUrl);
                String form = PayUtil.getVipChargeAlipayForm(goodsTitle, orderId, order.getPayMoney(), notifyUrl, returnUrl);
                if (StringUtil.isNullOrEmpty(form)) {
                    throw new OrderPayException(OrderPayException.CODE_CREATE_PAY_ORDER_FAIL, "创建支付宝支付订单失败");
                }
                //暂存2分钟
                String id = StringUtil.Md5(UUID.randomUUID().toString() + "#" + System.currentTimeMillis());
                redisManager.cacheCommonString(id, form, 120);
                return new PayWayInfoDTO(PayWayEnum.alipay.getWay(), null, id);
                Jedis jedis = jedisPool.getResource();
                try {
                    jedis.set(id, form);
                    jedis.expire(id, 120);
                } finally {
                    jedis.close();
                }
                return new PayWayInfoDTO(PayWayEnum.alipay, null, id);
            case "weChat":
                try {
                    String payUrl = PayUtil.createWXOrder(null, orderId, order.getPayMoney(), goodsTitle, notifyUrl, returnUrl);
                    return new PayWayInfoDTO(PayWayEnum.weChat.getWay(), payUrl, null);
                    String payUrl = PayUtil.createWXOrder(ip, orderId, order.getPayMoney(), goodsTitle, notifyUrl, returnUrl);
                    return new PayWayInfoDTO(PayWayEnum.weChat, payUrl, null);
                } catch (Exception e) {
                    throw new OrderPayException(OrderPayException.CODE_CREATE_PAY_ORDER_FAIL, e.getMessage());
                }
@@ -125,7 +141,12 @@

    @Override
    public String getAlipayForm(String formId) {
        return redisManager.getCommonString(formId);
        Jedis jedis = jedisPool.getResource();
        try {
            return jedis.get(formId);
        } finally {
            jedis.close();
        }
    }


@@ -168,6 +189,16 @@
        return null;
    }

    @Override
    public String getWXPaySuccessOutOrderNo(String notifyContent) throws Exception {
        return WXPayV3Util.getPaySuccessOutOrderNo(notifyContent, PayUtil.getWXAPP());
    }

    @Override
    public String getAlipayPaySuccessOutOrderNo(Map<String, String> params) throws Exception {
        return AlipayH5PayUtil.getPaySuccessNotifyOutOrderNo(params, PayUtil.getAlipayApp());
    }


    /**
     * 支付成功更新处理

 service-vip/src/main/java/com/ks/vip/service/remote/VipOrderServiceImpl.java

@@ -116,4 +116,16 @@
        //TODO 写入配置信息
        return count < 5;
    }

    @Override
    public VipOrder selectByThreeOrderId(String orderId) {
        VipOrderQuery vipOrderQuery = new VipOrderQuery();
        vipOrderQuery.threeOrderId = orderId;
        vipOrderQuery.count = 1;
        List<VipOrder> orderList = vipOrderMapper.listByPage(vipOrderQuery);
        if (orderList == null || orderList.size() == 0) {
            return null;
        }
        return orderList.get(0);
    }
}

 service-vip/src/main/java/com/ks/vip/util/Constant.java

@@ -6,7 +6,7 @@
    public final static String HOST = "";

    // 支付地址
    public final static String ORDER_PAY_TITLE = "购买会员";
    public final static String ORDER_PAY_TITLE = "特价会员购买";




 service-vip/src/main/java/com/ks/vip/util/PayUtil.java

@@ -71,7 +71,7 @@
     * @param money
     * @return
     */
    public static String getVipChargeAlipayForm(String id, String goodsTitle, String orderNo, BigDecimal money,String notifyUrl,String returnUrl) {
    public static String getVipChargeAlipayForm(String goodsTitle, String orderNo, BigDecimal money,String notifyUrl,String returnUrl) {
        try {
            AlipayAppInfo appInfo = getAlipayApp();
            String form = AlipayH5PayUtil.createOrderForm(appInfo, orderNo, money, goodsTitle, returnUrl, notifyUrl);

 service-vip/src/main/resources/alipay.properties

@@ -1,3 +1,3 @@
app_id=1
private_key=1
alipay_public_key=1
app_id=2021002148607905
private_key=MIIEvwIBADANBgkqhkiG9w0BAQEFAASCBKkwggSlAgEAAoIBAQCdcA5PJyJYaNRfvxMzoDzoTL56NNppqgzK+qyGXm4CYTSlCwOZMBpp3/OcD+Gs7WOeXcPChz2pzy+JigOKWWs0k2zReLmkW7mIG17nLoT8jEp8HmGd8kOnsmsrkVmrNN/U+9g9TFV8ggYIgBpd04FB504j9z6unjSSSc/E/kBr9ofX+DWhddjPzqGz9USxVx6oFNzOUcS+TFHxjpH+S4pX+k7ttZvcQQrmMv1914zv2gu9h8SOyk5S3UI9QJLAg0yqHfQ5/LbBpFUgThNbAUuNEJBP46fdbyv8DoMNnK3jEV3sfvT4oc0L7bCecafRR42SUnAqU2hpFMV8ygiAlSt5AgMBAAECggEAEnddRk15ytLo7h4UW37VBg5SXTUr1S779yb164DR+Hd8XEtxbZtlzbtV8J0wRD9H6wBmgL+qLOu/UKuehLC+UVllbyBw7eVQWrWTKRycvp6Z8fsCSitrYhUcWuzejqVSB8JOd8onUMZTfNXBwfWX+Knv0WojsQmfcvUzaJDF76O47MZDz+oIkDg8wDz80tCsxldPGzVVuLecTcONyKD2q9SfojTbC8Ppmucl2pXgtIzWcrDoYBM6qHk2h50uGB8cAed6v5tZcxepoRrlhuiU5BUaP1uXaCRadwI5K3yngeWpa43lIyhbK8rgKXgwAtb49IiJCI5L/m5ATaiG+cHuLQKBgQDJLCAE/HVw4TWz9m9JQAw7lFf68rWV0Bd6CrRMn9avkzAAp6wY+2sIYfP7ec0ZygrFXFs1MH8DpnWZfW2/mLGk9Zwh81n0d5l1XyAiqbqbMpu+QG5gB0CULpuEShAIfq640NyRvbw1kwE5DG2pZaZD0JxdeCeCcQijOtS5fg6jTwKBgQDIWIwjyJuMdPtF+jXJXIc2XgiywA3IOO1f3YhT0P5rT3zCzm4LZllYLZETE2cFu7A0C5tbWYL7sE4/t6yJPwY8eBRMqVexMKlwVKCl3f+X/JvXNP72hQfXZi/iO5zMVpeeksgp2Oct5Z+BYh1BOa0VjdeXGwgUTW2WUlDN2fcytwKBgQCxO4iyG+Ezo5X2iKQeuqiMTPL+CZpk9EHaqVeTMjan1Fq0GQSLteTkK7gR04sYr2Gx4t4QDDu6cYqlwVVROSs4k5IMbyLPOBcgyr+7CiF23a1MfeNAAuOoKS+l6sIZWdKAzLGmTKxl3q9zHTn3xbAnisBXsKXOS9s6Q3hqO16WDQKBgQDG4nhEMaqQ9bRYFHp+qdcklpbl9Bf6cuDasQ3bvvZCS0dcEBdYQ8Nf8OQ63qEAJQFXuUoBlkucVbpoMIscOC+VqdLlA5slMFyUQb60yjwogkGmk1qkGQ3eu/e/C1St2Sxs4+PG/ycH/hKpG2BVVs9HPWcO/2u20+J9PrwujjmC4wKBgQChNNCJza65YV7z9s52Rw5Xn8SWPObFkyQa15Mff4bjHf4DBEMIXAjWwmgzDw0HnBrTq+ytoDcU1kkzqE9pdkagzBSnm5CrOiyfsemrOJMValnudKCkwTvyS2FaSkEBeelv6C9M9IT96v2bLMbvb4tK7a1Qrq2NBZyt2ozXnOU2dA==
alipay_public_key=MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAvHWEgMOlGb/VbN5pcSXv+DLX2EJ43p93zP9eyao8ghj1LcBSf5Sx4gYpuySKZ0oimILb+ErOAlDzcXwvMxcVTK0W2M6UaUW0Vh71vOorqggOGqMJsSDpV1hvYrUSCYu1Qe5KtV85w+Kw4dImC3fayIaxUMhwySuniQ/uQtezRHn/vwXrGigu3Y2tRgPMUptqA14EYEfhpm3KjLXsqWdJBO6ziiqILHJtow65QzkeoLM2ZHpYH6oYy2rIj/iSIpos18MKWvr4XrqSptJYIQp+G3dwqjlt2kk4bpgAXQSR6wKAtGTkAYvlOSpkQXVqI3tIGZO3ZM9bFQurMBoJFX790wIDAQAB

 service-vip/src/main/resources/application.yml

@@ -1,3 +1,3 @@
spring:
  profiles:
    active: test
    active: pro

 service-vip/src/main/resources/mapper/VipOrderMapper.xml

@@ -138,7 +138,7 @@
        select
        <include refid="Base_Column_List"/>
        from vip_order
        where o_three_order_id=#{query.threeOrderId}
        where o_three_order_id=#{threeOrderId}
    </select>



 service-vip/src/main/resources/wxpay.properties

@@ -1,4 +1,4 @@
app_id=1
mch_id=1
mch_serial_no=1
api_v3_key=1
app_id=wxc22f3bd53cb25012
mch_id=1520950211
mch_serial_no=68E815B30C95747A572B2DCDBC838FC784A78F55
api_v3_key=XYJkJ2018FAfaodCCx899mLl138rfGVd

 service-vip/src/test/java/com/ks/LuckyTest.java

File was deleted