yangdamao 1 ano atrás
pai
commit
726e42a94c

+ 10 - 13
run-prod.sh

@@ -2,23 +2,23 @@
 # 定义应用组名
 group_admin_name='zhongzheng'
 # 定义应用名称
-app_admin_name='zhongzheng-saas-admin'
+app_admin_name='zhongzheng-saas-admin-top'
 # 定义应用版本
 app_admin_version='1.0-SNAPSHOT'
 # 定义应用环境
 profile_active='prod'
-echo '----copy jar admin----'
+echo '----copy jar admin top----'
 docker stop ${app_admin_name}
-echo '----stop container admin----'
+echo '----stop container admin top----'
 docker rm ${app_admin_name}
-echo '----rm container admin----'
+echo '----rm container admin top----'
 docker rmi ${group_admin_name}/${app_admin_name}:${app_admin_version}
-echo '----rm image admin----'
+echo '----rm image admin top----'
 # 打包编译docker镜像
-docker build -f /mydata/maven/build/Dockerfile-admi -t ${group_admin_name}/${app_admin_name}:${app_admin_version} .
-echo '----build image admin----'
+docker build -f /mydata/maven/build/Dockerfile-saas -t ${group_admin_name}/${app_admin_name}:${app_admin_version} .
+echo '----build image admin top----'
 docker run \
--p 5030:5030 \
+-p 7077:7077 \
 --name ${app_admin_name} \
 --restart=always \
 --log-opt max-size=50m \
@@ -27,11 +27,8 @@ docker run \
 -e TZ="Asia/Shanghai" \
 -v /etc/localtime:/etc/localtime \
 -v /usr/share/fonts:/usr/share/fonts \
--v /data/logs/prod_admin:/logs \
+-v /data/logs/prod_admin_top:/logs \
 -v /mydata/app/${app_admin_name}/logs:/var/logs \
 -v /data/nginx/conf.d:/data/nginx/conf.d \
 -d ${group_admin_name}/${app_admin_name}:${app_admin_version}
-echo '----start container admin----'
-
-
-
+echo '----start container admin top----'

+ 1 - 0
zhongzheng-admin-saas/src/main/resources/application-prod.yml

@@ -167,6 +167,7 @@ oldOrder:
     refundPay: https://cloud.xyyxt.net/common/platform/pay
     refundPayHandle: https://cloud.xyyxt.net/common/platform/pay/handle
     updateRemark: http://www.xyyxt.net/WitSystem/BussinessApi/UpdateOrderAuditRemark
+    getResitTimes: http://www.xyyxt.net/System/BussinessApi/GetResitTimes
 
 oldSys:
     host: https://www.xyyxt.net

+ 1 - 0
zhongzheng-admin/src/main/resources/application-prod.yml

@@ -167,6 +167,7 @@ oldOrder:
     refundPay: https://cloud.xyyxt.net/common/platform/pay
     refundPayHandle: https://cloud.xyyxt.net/common/platform/pay/handle
     updateRemark: http://www.xyyxt.net/WitSystem/BussinessApi/UpdateOrderAuditRemark
+    getResitTimes: http://www.xyyxt.net/System/BussinessApi/GetResitTimes
 
 oldSys:
     host: http://www.xyyxt.net

+ 1 - 0
zhongzheng-api/src/main/resources/application-prod.yml

@@ -179,6 +179,7 @@ oldOrder:
     refundPay: https://cloud.xyyxt.net/common/platform/pay
     refundPayHandle: https://cloud.xyyxt.net/common/platform/pay/handle
     updateRemark: http://www.xyyxt.net/WitSystem/BussinessApi/UpdateOrderAuditRemark
+    getResitTimes: http://www.xyyxt.net/System/BussinessApi/GetResitTimes
 
 oldSys:
     host: http://test.jqbao.net

+ 1 - 1
zhongzheng-system/src/main/resources/mapper/modules/exam/ExamApplyMapper.xml

@@ -294,7 +294,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             1 =1
           and us.user_id = #{userId}
           and us.exam_status = 0
-          and subscribe_status = 1
+          and us.subscribe_status = 1
           and us.goods_id = #{goodsId}
           and us.order_goods_id = #{orderGoodsId}
     </select>