lisang
/
jeepay
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
407 Commits 3 Branches 25 Tags 9.2 MiB
Commit Graph

407 Commits

Author SHA1 Message Date
陈泉 d565b50905 Docker Compose 支持 2022-03-30 15:00:57 +08:00
陈泉 bb149173ea 支持 JDK 17 2022-03-30 15:00:40 +08:00
陈泉 b86b55cafa 添加 Docker 支持 
编译命令

```
docker buildx build . --build-arg PORT=9216 --build-arg PLATFORM=payment -t jeepay-payment:latest
```
```
docker buildx build . --build-arg PORT=9217 --build-arg PLATFORM=manager -t jeepay-manager:latest
```
```
docker buildx build . --build-arg PORT=9218 --build-arg PLATFORM=merchant -t jeepay-merchant:latest
```

如果你需要多平台镜像，你可以使用 `--platform linux/amd64,linux/arm64`
 ```
docker buildx build . --build-arg PORT=9218 --build-arg PLATFORM=merchant -t jeepay-merchant:latest --platform linux/amd64,linux/arm64
```

启动命令
```
docker run -d -p 9216:9216 jeepay-payment:latest
```
```
docker run -d -p 9217:9217 jeepay-manager:latest
```
```
docker run -d -p 9218:9218 jeepay-merchant:latest
```

## Docker Compose 一次性运行所有环境
由于每个人的环境都不太一样，这里没有添加到项目内，可以放到文档里作为 demo
```
version: '3'

services:
  mysql:
    hostname: mysql
    container_name: mysql
    #    image: mysql:8
    image: mysql/mysql-server:latest
    ports:
      - '3306:3306'
    environment:
      MYSQL_ROOT_PASSWORD: 'root'
      MYSQL_DATABASE: 'jeepay'
    volumes:
      - './data/mysql:/var/lib/mysql'
      - './data/mysql/conf.d:/etc/mysql/conf.d'
      - './data/mysql/log:/var/log/mysql'
      - './data/mysql/data:/var/lib/mysql/data'
      - './docs/sql/init.sql:/workspace/init.sql'
  #  activemq 并没有官方维护的 Docker 镜像这里不推荐使用。
  #  activemq:
  #    container_name: activemq
  #    image: activemq:5.15.3
  #    ports:
  #      - '61616:61616'
  #      - '8161:8161'
  #    environment:
  #      ACTIVEMQ_USER: 'admin'
  #      ACTIVEMQ_PASSWORD: 'admin'
  #  rocketmq 配置 https://github.com/apache/rocketmq-docker
  #  rabbitmq:
  #    hostname: rabbitmq
  #    container_name: rabbitmq
  #    image: rabbitmq:latest
  #    ports:
  #      - "15672:15672"
  #      - "4369:4369"
  #      - "5672:5672"
  #      - "25672:25672"
  #    environment:
  #      RABBITMQ_DEFAULT_USER: 'admin'
  #      RABBITMQ_DEFAULT_PASS: 'admin'
  #      RABBITMQ_DEFAULT_VHOST: 'jeepay'
  #    volumes:
  #      - './data/rabbitmq:/var/lib/rabbitmq'
  #      - './data/rabbitmq/conf:/etc/rabbitmq'
  #      - './data/rabbitmq/log:/var/log/rabbitmq'
  #      - './data/rabbitmq/data:/var/lib/rabbitmq/data'
  payment:
    build:
      context: .
      dockerfile: Dockerfile
      args:
        PORT: 9216
        PLATFORM: payment
    image: jeepay_payment:latest
    hostname: payment
    container_name: jeepay-payment
    ports:
      - "9216:9216"
    depends_on:
      - mysql
  #      - rabbitmq
  manager:
    build:
      context: .
      dockerfile: Dockerfile
      args:
        PORT: 9217
        PLATFORM: manager
    image: jeepay_manager:latest
    hostname: manager
    container_name: jeepay-manager
    ports:
      - "9217:9217"
    depends_on:
      - mysql
  #      - rabbitmq
  merchant:
    build:
      context: .
      dockerfile: Dockerfile
      args:
        PORT: 9218
        PLATFORM: merchant
    image: jeepay_merchant:latest
    hostname: merchant
    container_name: jeepay-merchant
    ports:
      - "9218:9218"
    depends_on:
      - mysql
#      - rabbitmq
```
 2022-03-29 19:26:47 +08:00
dingzhiwei 2b04ff54de 修复微信、支付宝设置订单超时时间问题 2022-03-29 18:44:29 +08:00
dingzhiwei 63b6b225b1 升级版本v1.13.0 2022-03-29 16:46:17 +08:00
dingzhiwei aeb702203a 删除多余引用 2022-03-29 15:55:11 +08:00
dingzhiwei bbd521731b 修复paypal支付查询问题 2022-03-26 14:26:24 +08:00
dingzhiwei c3456cbb8a 微信和支付接口增加支付超时时间 2022-03-10 15:22:15 +08:00
zhuxiao 676e0d0f8a 优化微信V3支付 2022-03-02 09:49:15 +08:00
zhuxiao ac6e491ef6 微信支付配置添加证书文件(apiclient_cert.pem) 2022-03-01 19:18:03 +08:00
dingzhiwei 2aa6c194d1 修改微信v2接口退款bug 2022-02-28 21:49:02 +08:00
xiaoyu 4e64d785f0 下单可用通道代码优化 2022-02-10 10:30:45 +08:00
xiaoyu 2e62a74513 Merge remote-tracking branch 'origin/dev' into dev 2022-02-09 17:54:54 +08:00
xiaoyu bdcb71005b 修改接口状态后仍调用该接口问题修改 2022-02-09 17:54:48 +08:00
terrfly 137db44117 分账mq不在判断订单状态； 2022-01-26 16:53:31 +08:00
dingzhiwei 595e510171 升级版本v1.12.0 2022-01-26 16:22:44 +08:00
xiaoyu 27ce7f7217 Merge remote-tracking branch 'origin/dev' into dev 2022-01-26 16:04:51 +08:00
xiaoyu cb8435c83d 微信关闭订单传入订单号修改 2022-01-26 16:04:34 +08:00
dingzhiwei 312da02b85 升级版本v1.12.0 2022-01-26 15:27:03 +08:00
terrfly 68f95a111c 修改依赖版本号； 2022-01-26 14:26:42 +08:00
xiaoyu 14b496f2f6 微信退款回调修改 2022-01-26 11:43:44 +08:00
dingzhiwei f5ee97aed4 增加微信H5由payment项目地址统一跳转 2022-01-26 00:44:22 +08:00
xiaoyu 71b4cc667f 微信退款回调，微信、支付宝、云闪付关闭订单接口 2022-01-25 18:13:58 +08:00
terrfly e6c0f79440 处理微信分账的响应信息； 2022-01-25 16:59:56 +08:00
terrfly e0646c4ec6 修改分账默认时间为80s 2022-01-25 16:59:20 +08:00
terrfly 86ff9c2777 添加分账重试权限； 2022-01-25 16:59:04 +08:00
terrfly 121598e13c 订单分账MQ支持重新发起分账接口； 2022-01-25 16:58:42 +08:00
xiaoyu 4ba0a56c3a 支付宝转账IdentityType参数更改ALIPAY_LOGON_ID 2022-01-20 18:53:08 +08:00
xiaoyu 0a3fce9de6 支付宝转账缺失参数修改 2022-01-20 17:41:21 +08:00
xiaoyu ea9a69ec6b 支付宝转账product_code字段 2022-01-20 14:14:02 +08:00
xiaoyu 6251980b4a 支付宝sdk升级4.22.22.ALL，支付宝转账修改 2022-01-19 17:02:23 +08:00
dingzhiwei 7341c3cd2f 修改删除服务商时查看子商户数量bug 2022-01-14 18:15:53 +08:00
dingzhiwei e460325478 修复微信v3接口小程序支付报错问题：https://gitee.com/jeequan/jeepay/issues/I4PJKX 2022-01-06 06:58:49 +08:00
dingzhiwei 370394c4cc 升级版本v1.11.0 2021-12-24 12:19:05 +08:00
dingzhiwei b346442084 升级版本v1.11.0 2021-12-23 16:58:55 +08:00
zhuxiao ece03a8343 修复判断错误 2021-12-17 18:38:42 +08:00
dingzhiwei 445b55449c 优化PayPay支付通道 2021-12-17 17:45:31 +08:00
dingzhiwei 564613d50e 优化阿里云rocketMQ 2021-12-16 22:46:18 +08:00
大森林 8a2c815d17 !8 优化阿里云RocketMQ配置属性，修复Message无法消费到的问题 
Merge pull request !8 from 皮生/dev
 2021-12-16 12:56:20 +00:00
pimh 4161f0f53e 优化阿里云RocketMQ配置属性，修复Message无法消费到的问题 2021-12-16 20:41:28 +08:00
dingzhiwei 29416263a7 Merge remote-tracking branch 'origin/dev' into dev 2021-12-16 19:50:58 +08:00
dingzhiwei dc1e48c410 优化阿里云rocketMQ 2021-12-16 19:50:50 +08:00
zhuxiao 9f6cb73112 优化微信支付subAppId和subOpenid支持使用子商户的 2021-12-16 09:28:28 +08:00
dingzhiwei 0c54ea2f96 优化pom.xml 2021-12-15 07:32:54 +08:00
大森林 a307feb471 !7 支持阿里云RocketMQ商业版 
Merge pull request !7 from 皮生/dev
 2021-12-14 23:16:26 +00:00
pimh 91d06832e9 支持阿里云RocketMQ商业版 
(cherry picked from commit 4424aafed63e13be53934872c8d27e853bbc2be2)
 2021-12-14 22:18:50 +08:00
大森林 21814d0365 !6 feta: 添加 Paypal 渠道支持 
Merge pull request !6 from 青木/paypal
 2021-11-29 07:07:43 +00:00
陈泉 a4e26945fc style: 调整代码风格 2021-11-29 15:02:40 +08:00
陈泉 4576597c2f feta: 完善注释，调整状态码处理逻辑 2021-11-29 14:16:04 +08:00
陈泉 66f42e85e2 feta: paypal 支付渠道 2021-11-29 14:00:29 +08:00