Merge branch 'dev' of http://113.105.137.151:22280/youjj/cloud-platform into dev

ace-gate/src/main/java/com/github/wxiaoqi/security/gate/filter/AccessGatewayFilter.java

@@ -92,6 +92,8 @@ public class AccessGatewayFilter implements GlobalFilter {
 
     @Override
     public Mono<Void> filter(ServerWebExchange serverWebExchange, GatewayFilterChain gatewayFilterChain) {
+
+        log.error("请求进入:AccessGatewayFilter");
         log.info("check token and user permission....");
         LinkedHashSet requiredAttribute = serverWebExchange.getRequiredAttribute(ServerWebExchangeUtils.GATEWAY_ORIGINAL_REQUEST_URL_ATTR);
         ServerHttpRequest request = serverWebExchange.getRequest();

ace-gate/src/main/java/com/github/wxiaoqi/security/gate/filter/ResponseRecordFilter.java

@@ -74,7 +74,7 @@ private static final ExchangeStrategies STRATEGIES;
     @Override
 
     public Mono<Void> writeWith(Publisher<? extends DataBuffer> body) {
-
+        log.error("请求进入:ResponseRecordFilter");
         HttpHeaders httpHeaders = new HttpHeaders();
         httpHeaders.add("Content-Type", "application/json");
         ResponseAdapter responseAdapter = new ResponseAdapter(body, httpHeaders);

xx-campsite/xx-campsite-server/src/main/java/com/xxfc/platform/campsite/biz/CampsiteShopBiz.java

@@ -343,7 +343,7 @@ public class CampsiteShopBiz extends BaseBiz<CampsiteShopMapper, CampsiteShop> {
         List<GoodDataVO> list = mapper.findAll();
         Set<GoodDataVO> resultList = new HashSet<>();
         if(CollectionUtils.isNotEmpty(list)) {
-            if(number == list.size()) {
+            if(number >= list.size()) {
                 return ObjectRestResponse.succ(list);
             }
             Set<Integer> set = new HashSet<>();

xx-tour/xx-tour-server/src/main/java/com/xxfc/platform/tour/biz/TourGoodBiz.java

@@ -334,7 +334,7 @@ public class TourGoodBiz extends BaseBiz<TourGoodMapper, TourGood> {
         List<TourGood> list = mapper.getCoordinateList(param);
         Set<TourGood> resultList = new HashSet<>();
         if(CollectionUtils.isNotEmpty(list)) {
-            if(number == list.size()) {
+            if(number >= list.size()) {
                 return ObjectRestResponse.succ(list);
             }
             Set<Integer> set = new HashSet<>();

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

@@ -6,8 +6,8 @@ public enum TypeEnum {
     VEHICLE(1, "车型"),
     TOUR(2, "旅游"),
     CAMPSITE(3, "营地"),
-    ACTIVITY(4, "活动");
-
+    ACTIVITY(4, "活动"),
+    NEWS(5, "新闻");
     private Integer code;
 
     private String msg;

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

@@ -28,6 +28,9 @@ public class RandomListBiz {
     @Autowired
     SummitActivityBiz summitActivityBiz;
 
+    @Autowired
+    ArticleBiz articleBiz;
+
 
     /**
      * @param type 类型
@@ -46,6 +49,8 @@ public class RandomListBiz {
                     return campsiteFeign.findRandomVehicle(number);
                 case ACTIVITY:
                     return ObjectRestResponse.succ(summitActivityBiz.getHostWithSummitActivity(number, location));
+                case NEWS:
+
             }
         }
         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 title,epitome,add_time,cover_image from article
+        select id, title,epitome,add_time,cover_image from article
         where is_del=0 and status=1  and (type=#{type} or type=0) order by weight   ASC ,add_time DESC
     </select>
 

xx-vehicle/xx-vehicle-server/src/main/java/com/xxfc/platform/vehicle/biz/VehicleModelBiz.java

@@ -83,7 +83,7 @@ public class VehicleModelBiz extends BaseBiz<VehicleModelMapper, VehicleModel> {
         List<VehicleModelVo> list = mapper.findVehicleModelPage(vmqc);
         Set<VehicleModelVo> resultList = new HashSet<>();
         if(CollectionUtils.isNotEmpty(list)) {
-            if(number == list.size()) {
+            if(number >= list.size()) {
                 return ObjectRestResponse.succ(list);
             }
             Set<Integer> set = new HashSet<>();