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

435 Commits

Author SHA1 Message Date
dingzhiwei a37dc48c2a 升级版本v1.14.0 2022-07-08 18:31:15 +08:00
zhuxiao 19f7115931 修复微信退款通知 应检验退款金额问题 2022-06-27 09:29:22 +08:00
xiaoyu 65500b5892 日志表 请求、响应参数长度修改 2022-06-13 09:45:16 +08:00
terrfly 0a9ccc53b4 OSS证书下载到本地： 当文件夹不存在时， 需要创建。 避免下载提示文件夹不存在导致业务异常。 2022-05-27 10:23:30 +08:00
terrfly b31372ef3d 分账执行API, 解决提示订单不存在的问题 2022-05-27 10:21:02 +08:00
xiaoyu 43c9a6bb28 商户删除优化 2022-05-17 09:45:41 +08:00
大森林 3a32cad4cf
!18 修复订单关闭传递参数字段与文档描述不一致 
Merge pull request !18 from 青木/dev
 2022-04-28 03:58:43 +00:00
陈泉 83031d2f24 修复订单关闭传递参数字段与文档描述不一致 2022-04-28 11:53:36 +08:00
大森林 cea60b1698
!17 添加插件，实现docker 构建镜像及推送镜像 
Merge pull request !17 from yhydev/future-docker
 2022-04-27 09:24:05 +00:00
大森林 cbdfae5bd1
!16 修复 OSS 保存路径问题，以及特殊环境下 OSS 下载到本地会出现 UnknownHost 错误。 
Merge pull request !16 from 青木/dev
 2022-04-25 04:05:28 +00:00
陈泉 f19f27cdb6 修复OSS保存路径未考虑设置前缀 2022-04-25 09:50:31 +08:00
dingzhiwei c83e7895a1 修改参数转换json字符串拼接问题 2022-04-16 01:37:27 +08:00
dingzhiwei 7786ecd804 修改参数转换json字符串拼接问题 2022-04-15 22:58:17 +08:00
yhy 56e8b473f4 修复插件依赖，及使用环境变量传递jvm参数和java参数 2022-04-11 08:14:28 +00:00
yhy 5aeabbc53d 添加docker构建功能及文档 2022-04-08 15:16:17 +00:00
terrfly 60478ac94b
!13 从请求中获取参数并以+=拼接的方式,使用更为优雅的流式拼接 
Merge pull request !13 from 奔跑阿飞/dev
 2022-04-06 03:23:43 +00:00
afei 0411d0354a 从请求中获取参数并以+=拼接的方式,使用更为优雅的流式拼接 2022-04-04 10:41:26 +08:00
大森林 aa16ada8ca
!12 优化 Docker 编译时 Maven 镜像设置 
Merge pull request !12 from 青木/dev
 2022-04-01 02:54:49 +00:00
陈泉 4ab4bebfcf 添加Maven设置，加速依赖包下载过程 2022-03-31 10:02:33 +08:00
大森林 1bdf43d6e0
!11 添加 Docker 支持 
Merge pull request !11 from 青木/dev
 2022-03-30 15:13:29 +00:00
陈泉 1537ef040e 添加域名和SSL配置入口 2022-03-30 18:02:53 +08:00
陈泉 1ff8994da4 完善统一前端部署 2022-03-30 17:45:41 +08:00
陈泉 b3b37a3a69 添加 UI 仓库 2022-03-30 17:01:30 +08:00
陈泉 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 292e80b8ad Merge branch 'dev' 2022-03-29 18:44:53 +08:00
dingzhiwei 2b04ff54de 修复微信、支付宝设置订单超时时间问题 2022-03-29 18:44:29 +08:00
dingzhiwei fab6aaf9c7 Merge remote-tracking branch 'origin/master' 2022-03-29 17:36:20 +08:00
dingzhiwei 63b6b225b1 升级版本v1.13.0 2022-03-29 16:46:17 +08:00
大森林 e1b17a6f92
!9 修复 IllegalAccessError 错误 
Merge pull request !9 from 青木/master
 2022-03-29 08:09:43 +00:00
dingzhiwei aeb702203a 删除多余引用 2022-03-29 15:55:11 +08:00
陈泉 96a6a4f670 支持 JDK 17 编译 2022-03-29 15:55:00 +08:00
青木 6d17cf2507
升级 lombok 版本修复 IllegalAccessError 异常 
```
[ERROR] Failed to execute goal org.apache.maven.plugins:maven-compiler-plugin:3.1:compile (default-compile) on project jeepay-z-codegen: Fatal error compiling: java.lang.IllegalAccessError: class lombok.javac.apt.LombokProcessor (in unnamed module @0x122d6c22) cannot access class com.sun.tools.javac.processing.JavacProcessingEnvironment (in module jdk.compiler) because module jdk.compiler does not export com.sun.tools.javac.processing to unnamed module @0x122d6c22 -> [Help 1]
```
 2022-03-29 07:45:23 +00: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