|
|
@@ -12,7 +12,6 @@ import javax.validation.constraints.NotNull;
|
|
|
import org.apache.commons.lang3.StringUtils;
|
|
|
import org.springframework.beans.BeanUtils;
|
|
|
import org.springframework.beans.factory.annotation.Autowired;
|
|
|
-import org.springframework.beans.factory.annotation.Value;
|
|
|
import org.springframework.data.domain.Page;
|
|
|
import org.springframework.data.domain.PageRequest;
|
|
|
import org.springframework.data.domain.Sort;
|
|
|
@@ -40,6 +39,7 @@ import cn.com.qmth.examcloud.core.basic.dao.ResourceRepo;
|
|
|
import cn.com.qmth.examcloud.core.basic.dao.entity.ResourceEntity;
|
|
|
import cn.com.qmth.examcloud.core.basic.service.ResourceService;
|
|
|
import cn.com.qmth.examcloud.core.basic.service.bean.ResourceInfo;
|
|
|
+import cn.com.qmth.examcloud.web.bootstrap.PropertyHolder;
|
|
|
import cn.com.qmth.examcloud.web.support.ControllerSupport;
|
|
|
import io.swagger.annotations.Api;
|
|
|
import io.swagger.annotations.ApiOperation;
|
|
|
@@ -50,9 +50,6 @@ import io.swagger.annotations.ApiOperation;
|
|
|
@RequestMapping("${$rmp.ctr.basic}/resource")
|
|
|
public class ResourceController extends ControllerSupport {
|
|
|
|
|
|
- @Value("${$upyun.site.1.domain}")
|
|
|
- private String upyunFileUrl;
|
|
|
-
|
|
|
@Autowired
|
|
|
private ResourceRepo resourceRepo;
|
|
|
|
|
|
@@ -97,6 +94,7 @@ public class ResourceController extends ControllerSupport {
|
|
|
|
|
|
List<ResourceDomain> resourceDomainList = Lists.newArrayList();
|
|
|
|
|
|
+ String upyunFileUrl = PropertyHolder.getString("$upyun.site.1.domain");
|
|
|
while (iterator.hasNext()) {
|
|
|
ResourceEntity next = iterator.next();
|
|
|
ResourceDomain bean = new ResourceDomain();
|
WANG