submit

run-prod.sh

@@ -33,45 +33,5 @@ docker run \
 -d ${group_admin_name}/${app_admin_name}:${app_admin_version}
 echo '----start container admin----'
 
-echo "开始等待20秒..."
-# 1-10秒内随机
-sleep 5
-echo "等待后继续"
-
-#!/usr/bin/env bash
-# 定义应用组名
-group_admin_name='zhongzheng'
-# 定义应用名称
-app_admin_name='zhongzheng-saas-admin-top'
-# 定义应用版本
-app_admin_version='1.0-SNAPSHOT'
-# 定义应用环境
-profile_active='prod'
-echo '----copy jar admin top----'
-docker stop ${app_admin_name}
-echo '----stop container admin top----'
-docker rm ${app_admin_name}
-echo '----rm container admin top----'
-docker rmi ${group_admin_name}/${app_admin_name}:${app_admin_version}
-echo '----rm image admin top----'
-# 打包编译docker镜像
-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 7077:7077 \
---name ${app_admin_name} \
---restart=always \
---log-opt max-size=50m \
---log-opt max-file=3 \
--e 'spring.profiles.active'=${profile_active} \
--e TZ="Asia/Shanghai" \
--v /etc/localtime:/etc/localtime \
--v /usr/share/fonts:/usr/share/fonts \
--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 top----'
-
 
 

zhongzheng-system/src/main/java/com/zhongzheng/modules/course/service/impl/CourseSectionWatchPerServiceImpl.java

@@ -80,7 +80,7 @@ public class CourseSectionWatchPerServiceImpl extends ServiceImpl<CourseSectionW
             format = format + "&watchPer="+watchPer.getWatchPer();
         }
         String s = Base64.encode(format);
-        String url = String.format("%s?param=%s",liveHost,s);
+        String url = String.format("%s?param=%s&tenantId=%s",liveHost,s,watchPer.getTenantId());
         vo.setEnCodePC(url);
         vo.setEnCode(url);
         if (ObjectUtils.isNull(watchPer)){