feat:修改首页轮播图访问地址

donate-service/src/main/java/com/uas/service/donate/model/MicroServicesConf.java

@@ -29,7 +29,7 @@ public class MicroServicesConf {
     /**
      * 轮播
      */
-    @Value("#{'10.10.100.23'}")
+    @Value("${cms.url}")
     private String carouselMicroServiceIp;
 
   /*  public String getMicroServiceIp() {
@@ -76,8 +76,8 @@ public class MicroServicesConf {
         return String.format("http://%s:%d%s", this.floorMicroServiceIp,port, requestUrl);
     }*/
 
-    public String getRequestUrlForCarousel(int port, String requestUrl) {
-        return String.format("http://%s:%d%s", this.carouselMicroServiceIp,port, requestUrl);
+    public String getRequestUrlForCarousel(String requestUrl) {
+        return String.format("%s%s", this.carouselMicroServiceIp, requestUrl);
     }
 
  /*   public String getRequestUrl(int port, String requestUrl, PageParams pageable) {

donate-service/src/main/java/com/uas/service/donate/service/impl/CarouselServiceImpl.java

@@ -1,7 +1,7 @@
 package com.uas.service.donate.service.impl;
 
+import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
-
 import com.uas.service.donate.model.MicroServicesConf;
 import com.uas.service.donate.service.CarouselService;
 import com.uas.service.donate.util.JsonUtil;
@@ -24,11 +24,16 @@ public class CarouselServiceImpl implements CarouselService {
         this.restTemplate = restTemplate;
     }
 
+    @Override
     public List<JSONObject> getCarousels(String useFor){
-        String url=conf.getRequestUrlForCarousel(20030,"/carousels?usedFor="+useFor);
-        String result=restTemplate.getForEntity(url,String.class).getBody();
-        List<JSONObject> r= JsonUtil.parseJsonToObject(result);
-        return r;
+        try {
+            String url=conf.getRequestUrlForCarousel("/cmsApi?method=queryContentPage&module=donate_banner_carousel&orderBy=order_number%20ASC");
+            String result=restTemplate.getForEntity(url,String.class).getBody();
+            return JsonUtil.parseJsonToObject(JSON.parseObject(result).getString("data"));
+        } catch (Exception e) {
+            e.printStackTrace();
+            return null;
+        }
     }
 
 }

donate-service/src/main/resources/config/application-dev.properties

@@ -64,3 +64,7 @@ mailGotPrize=
 messageGotPrize=
 messageTakeAward=
 messageUrl=http://message.ubtob.com/sms/send
+
+
+#cms config
+cms.url=http://cms.usoftchina.com/

donate-service/src/main/resources/config/application-prod.properties

@@ -64,3 +64,6 @@ mailGotPrize=
 messageGotPrize=
 messageTakeAward=
 messageUrl=http://message.ubtob.com/sms/send
+
+#cms config
+cms.url=http://cms.usoftchina.com/

donate-service/src/main/resources/config/application-test.properties

@@ -60,4 +60,7 @@ mailGotPrize=
 ## messageConfig
 messageGotPrize=
 messageTakeAward=
-messageUrl=http://message.ubtob.com/sms/send
+messageUrl=http://message.ubtob.com/sms/send
+
+#cms config
+cms.url=http://cms.usoftchina.com/

donate-service/src/main/resources/templates/index.ftl

@@ -726,7 +726,7 @@
                     <div class="swiper-wrapper">
                     <#if carouselList?exists>
                         <#list carouselList as carousel>
-                            <div class="swiper-slide"><img src=${carousel.pictureUrl} /></div>
+                            <div class="swiper-slide"><img src=${carousel.pictureLink} /></div>
                         </#list>
                     </#if>
                     </div>