1、36壁纸细节调整修改

2、百度feigin类名修改

ruoyi-ui/src/views/business/webmagic/_36wallpaper/show/index.vue

@@ -27,7 +27,7 @@
         <el-col :span="4" v-for="data in wallpaperList">
           <div class="grid-content bg-purple">
 
-            <div style="height: 10px;background-color: #ffba00"></div>
+            <div style="height: 7px;background-color: #ffba00"></div>
 
             <!--图片div-->
             <div style="">
@@ -35,18 +35,20 @@
                 :src="data.pictureUrl"
                 fit="fill"
                 style="height: 160px"
-                :alt="data.pictureName"
                 :preview-src-list="[data.pictureUrl]">
               </el-image>
             </div>
 
+            <div style="height: 7px;background-color: #ffba00"></div>
+
             <!--标签div-->
-            <div style="margin-top: 5px">
+            <div style="">
               <div v-for="label in data.labels" style="float: left;margin-left: 4px;margin-top: 4px">
                 <el-tag>{{ label }}</el-tag>
               </div>
             </div>
 
+
           </div>
         </el-col>
       </el-row>

xjs-business/xjs-business-common/src/main/java/com/xjs/consts/ApiConst.java

@@ -199,6 +199,11 @@ public class ApiConst {
      */
     public static final String ROLL_JOKE_URL = "https://www.mxnzp.com/api/jokes/list/random";
 
+    /**
+     * 百度智能联想语义API地址
+     */
+    public static final String BAI_DU_AI_LX_URL= "http://suggestion.baidu.com/su?";
+
 
     //-----------------------api请求参数常量-----------------------------
 

xjs-business/xjs-business-openapi/src/main/java/com/xjs/common/client/api/baidu/BaiduTranslationFeignClient.java

@@ -2,7 +2,7 @@ package com.xjs.common.client.api.baidu;
 
 import com.alibaba.fastjson.JSONObject;
 import com.xjs.annotation.ApiLog;
-import com.xjs.common.client.factory.BaiduFeignFactory;
+import com.xjs.common.client.factory.BaiduTranslationFeignFactory;
 import com.xjs.translation.domain.qo.translation.BaiDuTranslationQo;
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.web.bind.annotation.PostMapping;
@@ -14,8 +14,8 @@ import static com.xjs.consts.ApiConst.*;
  * @desc 百度翻译接口api调用
  * @create 2021-12-25
  */
-@FeignClient(name = "baidu", url = BAIDU_FY_URL, fallbackFactory = BaiduFeignFactory.class)
+@FeignClient(name = "baidu", url = BAIDU_FY_URL, fallbackFactory = BaiduTranslationFeignFactory.class)
-public interface BaiduFeignClient {
+public interface BaiduTranslationFeignClient {
 
     @PostMapping(headers = {"Content-Type=application/x-www-form-urlencoded"})
     @ApiLog(name = BAIDU_FY,

xjs-business/xjs-business-openapi/src/main/java/com/xjs/common/client/factory/BaiduTranslationFeignFactory.java

@@ -2,7 +2,7 @@ package com.xjs.common.client.factory;
 
 import com.alibaba.fastjson.JSONObject;
 import com.ruoyi.common.core.domain.R;
-import com.xjs.common.client.api.baidu.BaiduFeignClient;
+import com.xjs.common.client.api.baidu.BaiduTranslationFeignClient;
 import lombok.extern.log4j.Log4j2;
 import org.springframework.cloud.openfeign.FallbackFactory;
 import org.springframework.stereotype.Component;
@@ -16,9 +16,9 @@ import static com.xjs.consts.ApiConst.DEMOTE_ERROR;
  */
 @Log4j2
 @Component
-public class BaiduFeignFactory implements FallbackFactory<BaiduFeignClient> {
+public class BaiduTranslationFeignFactory implements FallbackFactory<BaiduTranslationFeignClient> {
     @Override
-    public BaiduFeignClient create(Throwable cause) {
+    public BaiduTranslationFeignClient create(Throwable cause) {
         log.error("api模块百度翻译服务调用失败:{},执行降级处理", cause.getMessage());
         return  qo -> {
             JSONObject jsonObject = new JSONObject();

xjs-business/xjs-business-openapi/src/main/java/com/xjs/common/task/CheckApiStatusTask.java

@@ -9,7 +9,7 @@ import com.xjs.annotation.ApiLog;
 import com.xjs.business.warning.RemoteWarningCRUDFeign;
 import com.xjs.business.warning.domain.ApiRecord;
 import com.xjs.common.client.api.alapi.AlapiJokeAllFeignClient;
-import com.xjs.common.client.api.baidu.BaiduFeignClient;
+import com.xjs.common.client.api.baidu.BaiduTranslationFeignClient;
 import com.xjs.common.client.api.gaode.GaodeWeatherFeignClient;
 import com.xjs.common.client.api.lq.LqAWordFeignClient;
 import com.xjs.common.client.api.lq.LqDogDiaryFeignClient;
@@ -89,7 +89,7 @@ public class CheckApiStatusTask {
     @Autowired
     private AlapiJokeAllFeignClient alapiJokeAllFeignClient;
     @Autowired
-    private BaiduFeignClient baiduFeignClient;
+    private BaiduTranslationFeignClient baiduTranslationFeignClient;
     @Autowired
     private GaodeWeatherFeignClient gaodeWeatherFeignClient;
     @Autowired
@@ -777,12 +777,12 @@ public class CheckApiStatusTask {
         baiDuTranslationQo.setQ(content);
         baiDuTranslationQo.setSalt(baiduProperties.getSalt());
 
-        JSONObject jsonObject = baiduFeignClient.translationApi(baiDuTranslationQo);
+        JSONObject jsonObject = baiduTranslationFeignClient.translationApi(baiDuTranslationQo);
         if (!jsonObject.containsKey(DEMOTE_ERROR)) {
             return;
         }
 
-        String[] info = this.getAnnotationInfo(BaiduFeignClient.class).get(0);
+        String[] info = this.getAnnotationInfo(BaiduTranslationFeignClient.class).get(0);
 
         this.selectAndUpdate(info);
 

xjs-business/xjs-business-openapi/src/main/java/com/xjs/translation/factory/impl/BaiDuTranslationFactory.java

@@ -3,7 +3,7 @@ package com.xjs.translation.factory.impl;
 import cn.hutool.crypto.SecureUtil;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
-import com.xjs.common.client.api.baidu.BaiduFeignClient;
+import com.xjs.common.client.api.baidu.BaiduTranslationFeignClient;
 import com.xjs.properties.BaiduProperties;
 import com.xjs.exception.ApiException;
 import com.xjs.translation.domain.qo.translation.BaiDuTranslationQo;
@@ -28,7 +28,7 @@ public class BaiDuTranslationFactory implements TranslationFactory {
     @Autowired
     private BaiduProperties baiduProperties;
     @Autowired
-    private BaiduFeignClient baiduFeignClient;
+    private BaiduTranslationFeignClient baiduTranslationFeignClient;
 
 
     @Override
@@ -43,7 +43,7 @@ public class BaiDuTranslationFactory implements TranslationFactory {
         String sign = SecureUtil.md5(append);
         baiDuTranslationQo.setSign(sign);
         baiDuTranslationQo.setQ(translationQo.getQ());
-        JSONObject jsonObject = baiduFeignClient.translationApi(baiDuTranslationQo);
+        JSONObject jsonObject = baiduTranslationFeignClient.translationApi(baiDuTranslationQo);
         System.out.println(jsonObject);
         //接口内部错误以及网络错误都抛异常
         if(jsonObject.containsKey("error_code") || jsonObject.containsKey(DEMOTE_ERROR)){

xjs-business/xjs-business-webmagic/src/main/java/com/xjs/_36wallpaper/pojo/_36wallpaper.java

@@ -11,6 +11,7 @@ import lombok.EqualsAndHashCode;
 
 import java.io.Serializable;
 import java.util.Date;
+import java.util.List;
 
 /**
  * 36壁纸网图片数据实体类
@@ -48,7 +49,7 @@ public class _36wallpaper extends BaseEntity implements Serializable {
      * label分割成数组
      */
     @TableField(exist = false)
-    private String[] labels;
+    private List<String> labels;
 
     /** 创建时间 */
     @Excel(name = "创建时间",dateFormat = "yyyy-MM-dd HH:mm:ss")

xjs-business/xjs-business-webmagic/src/main/java/com/xjs/_36wallpaper/service/impl/_36wallpaperServiceImpl.java

@@ -18,6 +18,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
+import java.util.Arrays;
 import java.util.List;
 import java.util.regex.Pattern;
 
@@ -143,13 +144,18 @@ public class _36wallpaperServiceImpl extends ServiceImpl<_36wallpaperMapper, _36
                     .or().like("type", condition)
                     .or().like("label", condition);
         });
+        wr.orderByDesc("create_time");
         Page<_36wallpaper> wallpaperList = this.page(page, wr);
         for (_36wallpaper record : wallpaperList.getRecords()) {
             //分割label
             String label = record.getLabel();
             if (StringUtils.isNotEmpty(label)) {
                 String[] strings = label.split(",");
-                record.setLabels(strings);
+                record.setLabels(Arrays.asList(strings));
+            }
+            //只返回9个标签
+            if (record.getLabels().size() >= 9) {
+                record.setLabels(record.getLabels().subList(0,9));
             }
         }