fix

rankin-resource-service/src/main/java/cn/rankin/resourceservice/controller/ResourceController.java

@@ -27,6 +27,8 @@ public class ResourceController {
     public static String HTTP_VIDEO_DOMAIN = "http://efunvideo.ai160.com";
     public static String LJ_VIDEO_DOMAIN = "http://ljvideo.ai160.com";
 
+    public static String HTTPS_VIDEO_DOMAIN = "https://efunvideo.ai160.com";
+
     @RequestMapping(value = "/list")
     public APIResult<Page<Resource>> search(ResourceSearchDTO resourceSearchDTO) {
         log.info(JSON.toJSONString(resourceSearchDTO));

rankin-resource-service/src/main/java/cn/rankin/resourceservice/dto/ResourceDetail.java

@@ -7,9 +7,7 @@ import cn.rankin.resourceservice.controller.ResourceController;
 import lombok.Data;
 import lombok.ToString;
 import org.apache.commons.lang.StringUtils;
-import org.springframework.beans.factory.annotation.Value;
 
-import javax.persistence.Transient;
 import java.io.Serializable;
 import java.util.Date;
 
@@ -47,10 +45,6 @@ public class ResourceDetail implements Serializable {
     // 类型
     private Integer dataRate;
 
-    @Value("${resource.video.domain}")
-    @Transient
-    private String videoDomain;
-
     public Resource toNativeResource() {
         if (type.intValue() == ResourceType.AUDIO) {
             return toNativeAudio();
@@ -67,8 +61,8 @@ public class ResourceDetail implements Serializable {
         resource.setName(title);
         resource.setType(type);
         if(StringUtils.isNotBlank(fullPath)){
-            resource.setUrl(fullPath.replace(ResourceController.HTTP_VIDEO_DOMAIN, videoDomain)
-                                    .replace(ResourceController.LJ_VIDEO_DOMAIN, videoDomain));
+            resource.setUrl(fullPath.replace(ResourceController.HTTP_VIDEO_DOMAIN, ResourceController.HTTPS_VIDEO_DOMAIN)
+                                    .replace(ResourceController.LJ_VIDEO_DOMAIN, ResourceController.HTTPS_VIDEO_DOMAIN));
         }else{
             resource.setUrl(fullPath);
         }

rankin-resource-service/src/main/java/cn/rankin/resourceservice/dto/ResourceRemote.java

@@ -10,11 +10,8 @@ import cn.rankin.common.utils.constant.ResourceType;
 import cn.rankin.resourceservice.controller.ResourceController;
 import lombok.Data;
 import org.apache.commons.lang.StringUtils;
-import org.springframework.beans.factory.annotation.Value;
-import org.springframework.stereotype.Component;
 
 @Data
-@Component
 public class ResourceRemote implements Serializable {
 
     private static final long serialVersionUID = 1L;
@@ -46,10 +43,6 @@ public class ResourceRemote implements Serializable {
     @Transient
     private Set<ResourceAudio> audios = new HashSet<ResourceAudio>();
 
-    @Value("${resource.video.domain}")
-    @Transient
-    private String videoDomain;
-
     public List<Resource> toNativeResource() {
         if (type == null) {
             return new ArrayList<>();
@@ -74,8 +67,8 @@ public class ResourceRemote implements Serializable {
             resource.setType(type);
             if(StringUtils.isNotBlank(v.getFullPath())){
                 resource.setUrl(v.getFullPath()
-                                .replace(ResourceController.HTTP_VIDEO_DOMAIN, videoDomain)
-                                .replace(ResourceController.LJ_VIDEO_DOMAIN, videoDomain));
+                                .replace(ResourceController.HTTP_VIDEO_DOMAIN, ResourceController.HTTPS_VIDEO_DOMAIN)
+                                .replace(ResourceController.LJ_VIDEO_DOMAIN, ResourceController.HTTPS_VIDEO_DOMAIN));
             }else{
                 resource.setUrl(v.getFullPath());
             }