Merge remote-tracking branch 'origin/dev' into jrz_dev

ace-auth/ace-auth-server/src/main/java/com/github/wxiaoqi/security/auth/service/impl/AppAuthServiceImpl.java

@@ -123,16 +123,16 @@ public class AppAuthServiceImpl implements AuthService {
     public ObjectRestResponse checkToken(String token) {
         try {
             if (StringUtils.isEmpty(token)){
-                return ObjectRestResponse.createFailedResult(ResultCode.NULL_CODE,"参数不能为空");
+                return ObjectRestResponse.createFailedResult(10003,"参数不能为空");
             }
             IJWTInfo ijwtInfo=jwtTokenUtil.getInfoFromToken(token);
             if (ijwtInfo==null){
-                return ObjectRestResponse.createFailedResult(ResultCode.NOTEXIST_CODE,"token失效");
+                return ObjectRestResponse.createFailedResult(10009,"token失效");
             }
             return ObjectRestResponse.succ();
         }catch (Exception e){
             e.printStackTrace();
-            return ObjectRestResponse.createFailedResult(ResultCode.NOTEXIST_CODE,"token失效");
+            return ObjectRestResponse.createFailedResult(10009,"token失效");
         }
 
     }

ace-auth/ace-auth-server/src/main/java/com/github/wxiaoqi/security/auth/service/impl/AuthServiceImpl.java

@@ -120,16 +120,16 @@ public class AuthServiceImpl implements AuthService {
     public ObjectRestResponse checkToken(String token) {
         try {
             if (StringUtils.isEmpty(token)){
-                return ObjectRestResponse.createFailedResult(ResultCode.NULL_CODE,"参数不能为空");
+                return ObjectRestResponse.createFailedResult(10003,"参数不能为空");
             }
             IJWTInfo ijwtInfo=jwtTokenUtil.getInfoFromToken(token);
             if (ijwtInfo==null){
-                return ObjectRestResponse.createFailedResult(ResultCode.NOTEXIST_CODE,"token失效");
+                return ObjectRestResponse.createFailedResult(10009,"token失效");
             }
             return ObjectRestResponse.succ();
         }catch (Exception e){
             e.printStackTrace();
-            return ObjectRestResponse.createFailedResult(ResultCode.NOTEXIST_CODE,"token失效");
+            return ObjectRestResponse.createFailedResult(10009,"token失效");
         }
 
     }

xx-tour/xx-tour-api/src/main/java/com/xxfc/platform/tour/feign/TourFeign.java

@@ -119,7 +119,7 @@ public interface TourFeign {
     ObjectRestResponse getOne(@PathVariable Integer id);
 
     //首页旅游列表
-    @GetMapping(value = "/gw/app/shopList")
+    @GetMapping(value = "/gw/shopList")
     List<GoodDataVO> goodListAll(@RequestParam(value = "page", defaultValue = "1") Integer page,
                                      @RequestParam(value = "limit",defaultValue = "4") Integer limit);
 

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

@@ -12,6 +12,7 @@ import org.springframework.transaction.annotation.Transactional;
 import tk.mybatis.mapper.entity.Example;
 import tk.mybatis.mapper.weekend.WeekendSqls;
 
+import java.security.SecureRandom;
 import java.util.*;
 
 
@@ -31,6 +32,8 @@ public class ArticleBiz extends BaseBiz<ArticleMapper, Article> {
     private final Integer HOME_PAGE_NUMBER = 4;
 
 
+
+
     /**
      * 文章列表
      *
@@ -41,7 +44,7 @@ public class ArticleBiz extends BaseBiz<ArticleMapper, Article> {
      */
     public PageInfo getArticleList(Integer page, Integer limit, Integer type) {
         PageHelper.startPage(page, limit);
-        List articleList = mapper.getArticleList(type);
+        List articleList = mapper.getArticleList(type,null);
         return PageInfo.of(articleList);
     }
 
@@ -73,7 +76,7 @@ public class ArticleBiz extends BaseBiz<ArticleMapper, Article> {
      */
     public List getThree(Integer type) {
 
-        List<Article> articleList = mapper.getArticleList(type);
+        List<Article> articleList = mapper.getArticleList(type,null);
         if (!Objects.isNull(articleList)) {
             int size = articleList.size();
             if (RANDOM_NUMBER >= size) {
@@ -100,16 +103,16 @@ public class ArticleBiz extends BaseBiz<ArticleMapper, Article> {
      * @return
      */
     public List getHomePageArticle(Integer type) {
-        List<Article> articleList = mapper.getArticleList(type);
-        if (Objects.isNull(articleList)) {
-            return new ArrayList();
-        } else {
-            if (articleList.size() > HOME_PAGE_NUMBER) {
-                return articleList.subList(0, HOME_PAGE_NUMBER);
-            } else {
+        List<Article> articleList = mapper.getArticleList(type,HOME_PAGE_NUMBER);
+//        if (Objects.isNull(articleList)) {
+//            return new ArrayList();
+//        } else {
+//            if (articleList.size() > HOME_PAGE_NUMBER) {
+//                return articleList.subList(0, HOME_PAGE_NUMBER);
+//            } else {
                 return articleList;
-            }
-        }
+//            }
+//        }
     }
 
     @Transactional(rollbackFor = Exception.class)

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

@@ -15,5 +15,5 @@ public interface ArticleMapper extends Mapper<Article> {
      * @param type
      * @return
      */
-    List<Article> getArticleList(@Param("type") Integer type);
+    List<Article> getArticleList(@Param("type") Integer type,@Param( "limit") Integer limit);
 }

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

@@ -5,7 +5,15 @@
 
     <select id="getArticleList" resultType="com.xxfc.platform.uccn.entity.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
+        where
+        is_del=0
+        and status=1
+        and (type=#{type} or type=0)
+        order by
+        weight   ASC ,add_time DESC
+        <if test="limit != null">
+            limit #{limit}
+        </if>
     </select>
 
 </mapper>
\ No newline at end of file