Merge remote-tracking branch 'origin/master'

fs-service/src/main/java/com/fs/course/service/impl/FsUserCourseVideoServiceImpl.java

@@ -71,6 +71,7 @@ import org.slf4j.LoggerFactory;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.BeansException;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Propagation;
 import org.springframework.transaction.annotation.Transactional;
@@ -97,6 +98,9 @@ import static com.fs.course.utils.LinkUtil.generateRandomStringWithLock;
 @Service
 public class FsUserCourseVideoServiceImpl implements IFsUserCourseVideoService
 {
+    @Value("${cloud_host.company_name}")
+    private String signProjectName;
+
     private static final Logger logger = LoggerFactory.getLogger(FsUserCourseVideoServiceImpl.class);
 
 
@@ -1554,7 +1558,11 @@ public class FsUserCourseVideoServiceImpl implements IFsUserCourseVideoService
         }
 
         if (userCompanyUser.getStatus() == 2) {
-            return ResponseResult.fail(504, "已被拉黑,请联系管理员");
+            if("福本源".equals(signProjectName)){
+                return ResponseResult.fail(504, "服务暂时不可用，请联系管理员");
+            } else {
+                return ResponseResult.fail(504, "已被拉黑,请联系管理员");
+            }
         }
 
         //查询看课记录