yangdamao 1 月之前
父节点
当前提交
f7f90f9b63
共有 2 个文件被更改,包括 40 次插入0 次删除
  1. 39 0
      run-prod.sh
  2. 1 0
      zhichen-api/src/main/java/com/zhichen/controller/order/OrderGoodsRefundController.java

+ 39 - 0
run-prod.sh

@@ -1,3 +1,42 @@
+#!/usr/bin/env bash
+# 定义应用组名
+group_name='zhichen'
+# 定义应用名称
+app_name='zhichen-saas-api'
+# 定义应用版本
+app_version='1.0-SNAPSHOT'
+# 定义应用环境
+profile_active='prod'
+echo '----copy jar----'
+docker stop ${app_name}
+echo '----stop container----'
+docker rm ${app_name}
+echo '----rm container----'
+docker rmi ${group_name}/${app_name}:${app_version}
+echo '----rm image----'
+# 打包编译docker镜像
+docker build -f /mydata/maven/build/Dockerfile -t ${group_name}/${app_name}:${app_version} .
+echo '----build image----'
+docker run -p 5055:5055 --name ${app_name} \
+--restart=always \
+-e 'spring.profiles.active'=${profile_active} \
+-e TZ="Asia/Shanghai" \
+-m 10240m \
+--cpus=3 \
+--log-opt max-size=50m \
+--log-opt max-file=3 \
+-v /etc/localtime:/etc/localtime \
+-v /usr/share/fonts:/usr/share/fonts \
+-v /data/logs/prod_api:/logs \
+-v /mydata/app/${app_name}/logs:/var/logs \
+-d ${group_name}/${app_name}:${app_version}
+echo '----start container----'
+
+echo "开始等待20秒..."
+# 1-10秒内随机
+sleep 5
+echo "等待后继续"
+
 #!/usr/bin/env bash
 # 定义应用组名
 group_admin_name='zhichen'

+ 1 - 0
zhichen-api/src/main/java/com/zhichen/controller/order/OrderGoodsRefundController.java

@@ -54,6 +54,7 @@ public class OrderGoodsRefundController extends BaseController {
     @Log(title = "订单商品退款", businessType = BusinessType.INSERT)
     @PostMapping()
     public AjaxResult add(@RequestBody OrderGoodsRefundAddBo bo) {
+
         ClientLoginUser loginUser = wxTokenService.getLoginUser(ServletUtils.getRequest());
         bo.setUserId(loginUser.getUser().getUserId());
         return AjaxResult.success(iOrderGoodsRefundService.placeRefundSmallOrder(bo));