Merge branch 'master_feature_seo' into dev

# Conflicts:
#	xx-campsite/xx-campsite-server/src/main/resources/mapper/CampsiteShopMapper.xml

ace-common/src/main/java/com/github/wxiaoqi/security/common/vo/GoodDataVO.java

@@ -37,4 +37,6 @@ public  class GoodDataVO{
     @ApiModelProperty(value = "纬度")
     private Double latitude;
 
+    @ApiModelProperty("seo*html标签优化")
+    private String alt;
 }

xx-app/xx-app-api/src/main/java/com/xxfc/platform/app/entity/Banner.java

@@ -110,4 +110,9 @@ public class Banner {
      * 平台 0：APP 1：欣欣房车官网 2：滴房车官网
      */
     private Integer platform;
+
+    /**
+     * html 标签悬浮显示  seo 需要
+     */
+    private String alt;
 }

xx-app/xx-app-api/src/main/java/com/xxfc/platform/app/entity/vo/BannerVo.java

@@ -23,4 +23,9 @@ public class BannerVo {
      * 跳转链接地址
      */
     private String url;
+
+    /**
+     * seo html标签优化
+     */
+    private String alt;
 }

xx-app/xx-app-server/src/main/java/com/xxfc/platform/app/biz/BannerBiz.java

@@ -30,6 +30,7 @@ public class BannerBiz extends BaseBiz<BannerMapper,Banner> {
             bannerVo.setUrl(banner.getUrl());
             bannerVo.setTitle(banner.getTitle());
             bannerVo.setId(banner.getId());
+            bannerVo.setAlt(banner.getAlt());
             bannerVos.add(bannerVo);
         });
         return bannerVos;

xx-campsite/xx-campsite-api/src/main/java/com/xxfc/platform/campsite/dto/CampsiteShopAdminDTO.java

@@ -165,4 +165,7 @@ public class CampsiteShopAdminDTO {
     @ApiModelProperty(value = "海报背景")
     private String posterBackground;
 
+    @ApiModelProperty("seo*html标签优化")
+    private String alt;
+
 }

xx-campsite/xx-campsite-api/src/main/java/com/xxfc/platform/campsite/dto/CampsiteShopDetailDTO.java

@@ -76,4 +76,8 @@ public class CampsiteShopDetailDTO {
     @ApiModelProperty(value = "海报背景")
     private String posterBackground;
 
+    @ApiModelProperty("seo*html标签优化")
+    private String alt;
+
+
 }

xx-campsite/xx-campsite-api/src/main/java/com/xxfc/platform/campsite/entity/CampsiteShop.java

@@ -213,4 +213,7 @@ public class CampsiteShop implements Serializable {
     @Column(name = "poster_background")
     @ApiModelProperty(value = "海报背景")
     private String posterBackground;
+
+    @ApiModelProperty("seo*html标签优化")
+    private String alt;
 }

xx-campsite/xx-campsite-api/src/main/java/com/xxfc/platform/campsite/vo/CampsiteShopAdminVO.java

@@ -172,4 +172,7 @@ public class CampsiteShopAdminVO {
 
     @ApiModelProperty(value = "海报背景")
     private String posterBackground;
+
+    @ApiModelProperty("seo*html标签优化")
+    private String alt;
 }

xx-campsite/xx-campsite-server/src/main/resources/mapper/CampsiteShopMapper.xml

@@ -32,6 +32,7 @@
         <result property="isDel" column="is_del"/>
         <result property="hot" column="hot"/>
         <result property="saleState" column="sale_state"/>
+        <result property="alt" column="alt"/>
     </resultMap>
 
     <!--根据类型查询全部-->
@@ -73,7 +74,7 @@
 
     <!--首页查询全部-->
     <select id="findAllByHome" resultType="com.github.wxiaoqi.security.common.vo.GoodDataVO">
-        select cs.id as `id`,cs.name as `name`,cs.logo as `imgUrl`,cs.province_name as `name1`,cs.longitude,cs.latitude
+        select cs.id as `id`,cs.name as `name`,cs.logo as `imgUrl`,cs.province_name as `name1`,cs.longitude,cs.latitude,cs.alt
         FROM `campsite_shop`  cs
         where cs.sale_state=1 and cs.is_del=0
         order  by cs.hot desc
@@ -81,7 +82,7 @@
     </select>
 
     <select id="findAll" resultType="com.github.wxiaoqi.security.common.vo.GoodDataVO">
-        select cs.id as `id`,cs.name as `name`,cs.logo as `imgUrl`,cs.province_name as `name1`,cs.longitude,cs.latitude
+        select cs.id as `id`,cs.name as `name`,cs.logo as `imgUrl`,cs.province_name as `name1`,cs.longitude,cs.latitude,cs.alt
         FROM `campsite_shop`  cs
         where cs.sale_state=1 and cs.is_del=0
         order  by cs.hot desc
@@ -90,7 +91,7 @@
     <!--根据id查询详情-->
     <select id="findCampsiteShopDetailById" resultType="com.xxfc.platform.campsite.dto.CampsiteShopDetailDTO">
         select `name` as `name`,`province_name` as `provinceName`,`city_name` as `cityName`,`address` as `address`,`service_phone` as `phone`,`logo` as `logo`,`poster_background` as `posterBackground` ,
-        `content` as `content`,`configure` as `configure`,`longitude` as `longitude`,`latitude` as `latitude` from `campsite_shop` where `id`=#{id}
+        `content` as `content`,`configure` as `configure`,`longitude` as `longitude`,`latitude` as `latitude`,`alt` from `campsite_shop` where `id`=#{id}
     </select>
 
     <!--根据查询条件分页查询-->

xx-tour/xx-tour-api/src/main/java/com/xxfc/platform/tour/dto/TourGoodDTO.java

@@ -112,4 +112,7 @@ public class TourGoodDTO {
 	@ApiModelProperty(value = "海报背景")
 	private String posterBackground;
 
+	@ApiModelProperty("seo*html标签优化")
+	private String alt;
+
 }

xx-tour/xx-tour-api/src/main/java/com/xxfc/platform/tour/entity/TourGood.java

@@ -134,4 +134,7 @@ public class TourGood implements Serializable {
 	@Column(name = "poster_background")
 	@ApiModelProperty(value = "海报背景")
 	private String posterBackground;
+
+	@ApiModelProperty("seo*html标签优化")
+	private String alt;
 }

xx-tour/xx-tour-api/src/main/java/com/xxfc/platform/tour/vo/TourGoodDetailVo.java

@@ -129,6 +129,8 @@ public class TourGoodDetailVo {
 	List<GoodTagDTO> tagDTOS;
 
    private String posterBackground;
-	
+
+	@ApiModelProperty("seo*html标签优化")
+	private String alt;
 
 }

xx-uccn/xx-uccn-api/src/main/java/com/xxfc/platform/uccn/dto/FriendLinkDTO.java

+package com.xxfc.platform.uccn.dto;
+
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.io.Serializable;
+
+/**
+ * @author libin
+ * @version 1.0
+ * @description
+ * @data 2019/9/6 10:47
+ */
+@Data
+@Builder(toBuilder = true)
+@NoArgsConstructor
+@AllArgsConstructor
+public class FriendLinkDTO implements Serializable {
+    private static final long serialVersionUID = 1L;
+
+    private Long id;
+    /**
+     * 连接地址
+     */
+    private String linkUrl;
+    /**
+     * 名称
+     */
+    private String name;
+    /**
+     * 简要说明
+     */
+    private String brief;
+    /**
+     * 排序
+     */
+    private Integer rank;
+    /**
+     * 创建者id
+     */
+    private Integer crtUser;
+    /**
+     * 上架状态  上架：true 下架：false
+     */
+    private Boolean onState;
+    /**
+     * 平台 1：欣新房车官网 2：滴房车官网 0：无限制
+     */
+    private Integer platform;
+}

xx-uccn/xx-uccn-api/src/main/java/com/xxfc/platform/uccn/dto/FriendLinkFindDTO.java

+package com.xxfc.platform.uccn.dto;
+
+import com.github.wxiaoqi.security.common.vo.PageParam;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+/**
+ * @author libin
+ * @version 1.0
+ * @description
+ * @data 2019/9/6 12:05
+ */
+@Data
+@Builder(toBuilder = true)
+@AllArgsConstructor
+@NoArgsConstructor
+public class FriendLinkFindDTO extends PageParam {
+
+    private String  name;
+
+    private Boolean onState;
+}

xx-uccn/xx-uccn-api/src/main/java/com/xxfc/platform/uccn/dto/SummitActivitySaveDTO.java

@@ -103,4 +103,7 @@ public class SummitActivitySaveDTO implements Serializable {
 
     @ApiModelProperty(value = "排序")
     private Integer rank;
+
+    @ApiModelProperty("seo*html标签优化")
+    private String alt;
 }

xx-uccn/xx-uccn-api/src/main/java/com/xxfc/platform/uccn/entity/Article.java

@@ -3,14 +3,12 @@ package com.xxfc.platform.uccn.entity;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
-import io.swagger.annotations.ApiOperation;
 import lombok.Data;
 import org.springframework.format.annotation.DateTimeFormat;
 import tk.mybatis.mapper.annotation.KeySql;
 import tk.mybatis.mapper.code.IdentityDialect;
 
 import javax.persistence.Column;
-import javax.persistence.GeneratedValue;
 import javax.persistence.Id;
 import javax.persistence.Table;
 import java.util.Date;
@@ -139,4 +137,6 @@ public class Article {
     @ApiModelProperty(value = "上架时间")
     private Date addTime;
 
+    @ApiModelProperty("seo*html标签优化")
+    private String alt;
 }

xx-uccn/xx-uccn-api/src/main/java/com/xxfc/platform/uccn/entity/FriendLink.java

+package com.xxfc.platform.uccn.entity;
+
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import javax.persistence.*;
+import java.io.Serializable;
+
+/**
+ * @author libin
+ * @version 1.0
+ * @description 友情连接
+ * @data 2019/9/6 10:40
+ */
+
+@Data
+@Entity
+@Table(name = "friend_link")
+@Builder(toBuilder = true)
+@NoArgsConstructor
+@AllArgsConstructor
+
+public class FriendLink implements Serializable {
+    private static final long serialVersionUID = 1L;
+
+    @Id
+    @GeneratedValue(generator = "JDBC")
+    private Long id;
+    /**
+     * 连接地址
+     */
+    @Column(name = "link_url")
+    private String linkUrl;
+    /**
+     * 名称
+     */
+    private String name;
+    /**
+     * 简要说明
+     */
+    private String brief;
+    /**
+     * 排序
+     */
+    private Integer rank;
+    /**
+     * 创建时间
+     */
+    @Column(name = "crt_time")
+    private Long crtTime;
+    /**
+     * 更新时间
+     */
+    @Column(name = "upd_time")
+    private Long updTime;
+    /**
+     * 发布时间
+     */
+    @Column(name = "publish_time")
+    private Long publishTime;
+    /**
+     * 删除状态 true：正常 1：删除
+     */
+    @Column(name = "is_del")
+    private Boolean isDel;
+    /**
+     * 创建者id
+     */
+    @Column(name = "crt_user")
+    private Integer crtUser;
+    /**
+     * 上架状态  上架：true 下架：false
+     */
+    @Column(name = "on_state")
+    private Boolean onState;
+    /**
+     * 平台 1：欣新房车官网 2：滴房车官网 0:无限制
+     */
+    private Integer platform;
+}

xx-uccn/xx-uccn-api/src/main/java/com/xxfc/platform/uccn/entity/SummitActivity.java

@@ -241,4 +241,7 @@ public class SummitActivity implements Serializable {
     @ApiModelProperty(value = "排序")
     private Integer rank;
 
+    @ApiModelProperty("seo*html标签优化")
+    private String alt;
+
 }

xx-uccn/xx-uccn-api/src/main/java/com/xxfc/platform/uccn/vo/FriendLinkAdminVO.java

+package com.xxfc.platform.uccn.vo;
+
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.io.Serializable;
+
+/**
+ * @author libin
+ * @version 1.0
+ * @description
+ * @data 2019/9/6 10:53
+ */
+@Data
+@Builder(toBuilder = true)
+@NoArgsConstructor
+@AllArgsConstructor
+public class FriendLinkAdminVO implements Serializable {
+    private static final long serialVersionUID = 1L;
+
+    private Long id;
+    /**
+     * 连接地址
+     */
+    private String linkUrl;
+    /**
+     * 名称
+     */
+    private String name;
+    /**
+     * 简要说明
+     */
+    private String brief;
+    /**
+     * 排序
+     */
+    private Integer rank;
+    /**
+     * 创建时间
+     */
+    private Long crtTime;
+    /**
+     * 发布时间
+     */
+    private Long publishTime;
+    /**
+     * 创建者id
+     */
+    private Integer crtUser;
+    /**
+     * 上架状态  上架：true 下架：false
+     */
+    private Boolean onState;
+    /**
+     * 平台 1：欣新房车官网 2：滴房车官网 0：无限制
+     */
+    private Integer platform;
+}

xx-uccn/xx-uccn-api/src/main/java/com/xxfc/platform/uccn/vo/FriendLinkVO.java

+package com.xxfc.platform.uccn.vo;
+
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.io.Serializable;
+
+/**
+ * @author libin
+ * @version 1.0
+ * @description
+ * @data 2019/9/6 10:51
+ */
+@Data
+@Builder(toBuilder = true)
+@NoArgsConstructor
+@AllArgsConstructor
+public class FriendLinkVO implements Serializable {
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 连接地址
+     */
+    private String linkUrl;
+    /**
+     * 名称
+     */
+    private String name;
+    /**
+     * 简要说明
+     */
+    private String brief;
+
+}

xx-uccn/xx-uccn-api/src/main/java/com/xxfc/platform/uccn/vo/SummitActivityAdminVo.java

@@ -122,4 +122,7 @@ public class SummitActivityAdminVo implements Serializable {
 
     @ApiModelProperty(value = "排序")
     private Integer rank;
+
+    @ApiModelProperty("seo*html标签优化")
+    private String alt;
 }

xx-uccn/xx-uccn-api/src/main/java/com/xxfc/platform/uccn/vo/SummitActivityDetailVo.java

@@ -83,4 +83,6 @@ public class SummitActivityDetailVo implements Serializable {
     @JsonIgnore
     private Integer willNum;
 
+    @ApiModelProperty("seo*html标签优化")
+    private String alt;
 }

xx-uccn/xx-uccn-api/src/main/java/com/xxfc/platform/uccn/vo/SummitActivityVo.java

@@ -58,4 +58,7 @@ public class SummitActivityVo implements Serializable {
     @ApiModelProperty(value = "排序")
     @JsonIgnore
     private Integer rank;
+
+    @ApiModelProperty("seo*html标签优化")
+    private String alt;
 }

xx-uccn/xx-uccn-api/src/main/java/com/xxfc/platform/uccn/vo/TypeEnum.java

 package com.xxfc.platform.uccn.vo;
 
-import lombok.Data;
-
 public enum TypeEnum {
     VEHICLE(1, "车型"),
     TOUR(2, "旅游"),

xx-uccn/xx-uccn-server/src/main/java/com/xxfc/platform/uccn/biz/FriendLinkBiz.java

+package com.xxfc.platform.uccn.biz;
+
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.TypeReference;
+import com.github.wxiaoqi.security.common.biz.BaseBiz;
+import com.github.wxiaoqi.security.common.vo.PageDataVO;
+import com.xxfc.platform.uccn.dto.FriendLinkDTO;
+import com.xxfc.platform.uccn.dto.FriendLinkFindDTO;
+import com.xxfc.platform.uccn.entity.FriendLink;
+import com.xxfc.platform.uccn.mapper.FriendLinkMapper;
+import com.xxfc.platform.uccn.vo.FriendLinkAdminVO;
+import com.xxfc.platform.uccn.vo.FriendLinkVO;
+import org.apache.commons.collections.CollectionUtils;
+import org.springframework.beans.BeanUtils;
+import org.springframework.stereotype.Service;
+import org.springframework.util.StringUtils;
+import tk.mybatis.mapper.entity.Example;
+
+import java.time.Instant;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+import java.util.Objects;
+
+/**
+ * @author libin
+ * @version 1.0
+ * @description
+ * @data 2019/9/6 10:57
+ */
+@Service
+public class FriendLinkBiz extends BaseBiz<FriendLinkMapper, FriendLink> {
+
+    /**
+     * 保存编辑
+     * @param friendLinkDTO
+     */
+    public void saveFriendLink(FriendLinkDTO friendLinkDTO) {
+        FriendLink friendLink = new FriendLink();
+        BeanUtils.copyProperties(friendLinkDTO, friendLink);
+        if (friendLink.getOnState()){
+            friendLink.setPublishTime(Instant.now().toEpochMilli());
+        }
+        if (Objects.isNull(friendLinkDTO.getId())) {
+            friendLink.setCrtTime(Instant.now().toEpochMilli());
+            friendLink.setIsDel(false);
+            mapper.insertSelective(friendLink);
+        }else {
+            friendLink.setUpdTime(Instant.now().toEpochMilli());
+            mapper.updateByPrimaryKeySelective(friendLink);
+        }
+    }
+
+    /**
+     * 上下架
+     * @param id
+     */
+    public void  updateFriendLinkOnStateById(Long id,Boolean onState){
+        FriendLink friendLink = FriendLink.builder().id(id).onState(onState).updTime(Instant.now().toEpochMilli()).build();
+        if (onState){
+            friendLink.setPublishTime(Instant.now().toEpochMilli());
+        }
+        mapper.updateByPrimaryKeySelective(friendLink);
+    }
+
+    /**
+     * 删除
+     * @param id
+     */
+    public void deleteFriendLinkById(Long id){
+        FriendLink friendLink = FriendLink.builder().id(id).updTime(Instant.now().toEpochMilli()).isDel(true).build();
+        mapper.updateByPrimaryKeySelective(friendLink);
+    }
+
+    /**
+     * 根据id查询
+     * @param id
+     * @return
+     */
+    public FriendLinkDTO findFriendLinkById(Long id){
+        FriendLinkDTO friendLinkDTO = FriendLinkDTO.builder().build();
+        FriendLink friendLink = mapper.selectByPrimaryKey(id);
+        if (Objects.isNull(friendLink)){
+            return friendLinkDTO;
+        }
+        BeanUtils.copyProperties(friendLink,friendLinkDTO);
+        return friendLinkDTO;
+    }
+
+
+    public List<FriendLinkVO> listFriendLinkByPlatform(Integer platform){
+        List<FriendLinkVO> friendLinkVOS = new ArrayList<>();
+        Example example = new Example(FriendLink.class);
+        example.setOrderByClause("rank DESC,publish_time DESC");
+        Example.Criteria criteria = example.createCriteria();
+        criteria.andEqualTo("isDel",0);
+        criteria.andEqualTo("onState",true);
+        criteria.andIn("platform", Arrays.asList(platform,0));
+        criteria.andNotEqualTo("linkUrl","");
+        List<FriendLink> friendLinks = mapper.selectByExample(example);
+        if (CollectionUtils.isEmpty(friendLinks)){
+            return friendLinkVOS;
+        }
+        friendLinkVOS = JSON.parseObject(JSON.toJSONString(friendLinks), new TypeReference<List<FriendLinkVO>>() {
+        });
+        return friendLinkVOS;
+    }
+
+    public PageDataVO<FriendLinkAdminVO> listFriendLinkWithPage(FriendLinkFindDTO friendLinkFindDTO){
+        PageDataVO<FriendLinkAdminVO> pageDataVO = new PageDataVO<>();
+        Example example = new Example(FriendLink.class);
+        Example.Criteria criteria = example.createCriteria();
+        criteria.andEqualTo("isDel",0);
+        if (!StringUtils.isEmpty(friendLinkFindDTO.getName())){
+            criteria.andLike("name",String.format("%%%s%%",friendLinkFindDTO.getName().trim()));
+        }
+        if (Objects.nonNull(friendLinkFindDTO.getOnState())){
+            criteria.andEqualTo("onState",friendLinkFindDTO.getOnState());
+        }
+        PageDataVO<FriendLink> friendLinkPageDataVO = PageDataVO.pageInfo(friendLinkFindDTO.getPage(),friendLinkFindDTO.getLimit(),()->mapper.selectByExample(example));
+        List<FriendLink> data = friendLinkPageDataVO.getData();
+        if (CollectionUtils.isEmpty(data)){
+            return pageDataVO;
+        }
+
+        List<FriendLinkAdminVO> friendLinkAdminVOS = new ArrayList<>();
+        FriendLinkAdminVO friendLinkAdminVO;
+        for (FriendLink friendLink : data) {
+             friendLinkAdminVO = new FriendLinkAdminVO();
+            BeanUtils.copyProperties(friendLink,friendLinkAdminVO);
+            friendLinkAdminVOS.add(friendLinkAdminVO);
+        }
+        pageDataVO.setData(friendLinkAdminVOS);
+        pageDataVO.setPageSize(friendLinkPageDataVO.getPageSize());
+        pageDataVO.setPageNum(friendLinkPageDataVO.getPageNum());
+        pageDataVO.setTotalPage(friendLinkPageDataVO.getTotalPage());
+        pageDataVO.setTotalCount(friendLinkPageDataVO.getTotalCount());
+
+        return pageDataVO;
+    }
+}

xx-uccn/xx-uccn-server/src/main/java/com/xxfc/platform/uccn/biz/SummitActivityBiz.java

@@ -187,9 +187,7 @@ public class SummitActivityBiz extends BaseBiz<SummitActivityMapper, SummitActiv
             if (summitActivities.size() <= num) {
                 for (SummitActivity summitActivity : summitActivities) {
                     summitActivityVo = new SummitActivityVo();
-                    summitActivityVo.setId(summitActivity.getId());
-                    summitActivityVo.setBanner(summitActivity.getBanner());
-                    summitActivityVo.setTitle(summitActivity.getTitle());
+                    BeanUtils.copyProperties(summitActivity,summitActivityVo);
                     summitActivityVos.add(summitActivityVo);
                 }
             } else {
@@ -198,9 +196,7 @@ public class SummitActivityBiz extends BaseBiz<SummitActivityMapper, SummitActiv
                 for (Integer i : resultSet) {
                     summitActivityVo = new SummitActivityVo();
                     SummitActivity summitActivity = summitActivities.get(i);
-                    summitActivityVo.setId(summitActivity.getId());
-                    summitActivityVo.setBanner(summitActivity.getBanner());
-                    summitActivityVo.setTitle(summitActivity.getTitle());
+                    BeanUtils.copyProperties(summitActivity,summitActivityVo);
                     summitActivityVos.add(summitActivityVo);
                 }
             }

xx-uccn/xx-uccn-server/src/main/java/com/xxfc/platform/uccn/mapper/FriendLinkMapper.java

+package com.xxfc.platform.uccn.mapper;
+
+import com.xxfc.platform.uccn.entity.FriendLink;
+import tk.mybatis.mapper.common.Mapper;
+
+/**
+ * @author libin
+ * @version 1.0
+ * @description
+ * @data 2019/9/6 10:58
+ */
+public interface FriendLinkMapper extends Mapper<FriendLink> {
+}

xx-uccn/xx-uccn-server/src/main/java/com/xxfc/platform/uccn/rest/FriendLinkController.java

+package com.xxfc.platform.uccn.rest;
+
+import com.github.wxiaoqi.security.common.msg.ObjectRestResponse;
+import com.xxfc.platform.uccn.biz.FriendLinkBiz;
+import com.xxfc.platform.uccn.vo.FriendLinkVO;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.RequiredArgsConstructor;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.List;
+
+/**
+ * @author libin
+ * @version 1.0
+ * @description
+ * @data 2019/9/6 10:59
+ */
+@RestController
+@RequiredArgsConstructor(onConstructor = @__(@Autowired))
+@RequestMapping("/app/unauth/friend_link")
+@Api(tags = "友情链接*官网")
+public class FriendLinkController {
+
+     private final FriendLinkBiz friendLinkBiz;
+
+     @ApiOperation("查询链接列表")
+     @GetMapping("/list")
+     public ObjectRestResponse<List<FriendLinkVO>> listFriendLink(@RequestParam(value = "platform",required = false,defaultValue = "1") Integer platform){
+         List<FriendLinkVO> friendLinkVOS = friendLinkBiz.listFriendLinkByPlatform(platform);
+         return ObjectRestResponse.succ(friendLinkVOS);
+     }
+
+}

xx-uccn/xx-uccn-server/src/main/java/com/xxfc/platform/uccn/rest/admin/FriendLinkAdminController.java

+package com.xxfc.platform.uccn.rest.admin;
+
+import com.github.wxiaoqi.security.common.msg.ObjectRestResponse;
+import com.github.wxiaoqi.security.common.vo.PageDataVO;
+import com.xxfc.platform.uccn.biz.FriendLinkBiz;
+import com.xxfc.platform.uccn.dto.FriendLinkDTO;
+import com.xxfc.platform.uccn.dto.FriendLinkFindDTO;
+import com.xxfc.platform.uccn.vo.FriendLinkAdminVO;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.RequiredArgsConstructor;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+/**
+ * @author libin
+ * @version 1.0
+ * @description
+ * @data 2019/9/6 10:59
+ */
+@RestController
+@RequiredArgsConstructor(onConstructor = @__(@Autowired))
+@RequestMapping("/admin/friend_link")
+@Api(tags = "友情链接*后台")
+public class FriendLinkAdminController {
+
+     private final FriendLinkBiz friendLinkBiz;
+
+     @ApiOperation("分页")
+     @PostMapping("/page")
+     public ObjectRestResponse<PageDataVO<FriendLinkAdminVO>> listFriendLinkWithPage(@RequestBody FriendLinkFindDTO friendLinkFindDTO){
+          PageDataVO<FriendLinkAdminVO> pageDataVO = friendLinkBiz.listFriendLinkWithPage(friendLinkFindDTO);
+          return ObjectRestResponse.succ(pageDataVO);
+     }
+
+     @ApiOperation("根据id查询")
+     @GetMapping("/{id}")
+     public ObjectRestResponse<FriendLinkDTO> findFriendLink(@PathVariable(value = "id") Long id){
+          FriendLinkDTO friendLinkDTO = friendLinkBiz.findFriendLinkById(id);
+          return ObjectRestResponse.succ(friendLinkDTO);
+     }
+
+     @ApiOperation("编辑或保存")
+     @PostMapping("/save")
+     public ObjectRestResponse<Void> saveFriendLink(@RequestBody FriendLinkDTO friendLinkDTO){
+          friendLinkBiz.saveFriendLink(friendLinkDTO);
+          return ObjectRestResponse.succ();
+     }
+
+     @ApiOperation("上下架")
+     @PutMapping("/on_state/{id}/{state}")
+     public ObjectRestResponse<Void> updateFriendLinkOnstate(@PathVariable(value = "id") Long id,@PathVariable(value = "state") Boolean state){
+          friendLinkBiz.updateFriendLinkOnStateById(id,state);
+          return ObjectRestResponse.succ();
+     }
+
+     @ApiOperation("删除")
+     @DeleteMapping("/{id}")
+     public ObjectRestResponse<Void> deleteFriendLink(@PathVariable(value = "id") Long id){
+          friendLinkBiz.deleteFriendLinkById(id);
+          return ObjectRestResponse.succ();
+     }
+
+
+}

xx-uccn/xx-uccn-server/src/main/resources/mapper/ArticleMapper.xml

@@ -4,7 +4,7 @@
 <mapper namespace="com.xxfc.platform.uccn.mapper.ArticleMapper">
 
     <select id="getArticleList" resultType="com.xxfc.platform.uccn.entity.Article">
-        select id, title,epitome,add_time,cover_image from article
+        select id, title,epitome,add_time,cover_image,`alt` from article
         where
         is_del=0
         and status=1

xx-vehicle/xx-vehicle-api/src/main/java/com/xxfc/platform/vehicle/entity/VehicleModel.java

 package com.xxfc.platform.vehicle.entity;
 
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import javax.persistence.Column;
+import javax.persistence.GeneratedValue;
+import javax.persistence.Id;
+import javax.persistence.Table;
 import java.io.Serializable;
 import java.math.BigDecimal;
 import java.util.Date;
-import java.util.List;
-import javax.persistence.*;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.AllArgsConstructor;
-import lombok.Data;
 
 
 /**
@@ -164,4 +166,7 @@ public class VehicleModel implements Serializable {
 	@Column(name = "intro")
 	@ApiModelProperty(value = "简介")
 	private String intro;
+
+	@ApiModelProperty("seo*html标签优化")
+	private String alt;
 }

xx-vehicle/xx-vehicle-api/src/main/java/com/xxfc/platform/vehicle/pojo/VehicleModelVo.java

@@ -53,4 +53,7 @@ public class VehicleModelVo extends VehicleModel implements Serializable {
 	 */
 	List<VehiclePlatCata> UccnCataList;
 
+	@ApiModelProperty("seo*html标签优化")
+	private String alt;
+
 }