Merge branch 'pre' into 'master'

Pre

See merge request !323

liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-web/src/main/java/com/liquidnet/client/admin/web/controller/zhengzai/goblin/GoblinSelfCategoryAdminController.java

@@ -47,8 +47,12 @@ public class GoblinSelfCategoryAdminController extends BaseController {
     @RequestMapping("list")
     @ResponseBody
     public TableDataInfo list() {
-        PageHelper.startPage(0, 1000, "mid");
-        return getDataTable(goblinSelfGoodsCategoryService.listForMultiGrade());
+//        PageHelper.startPage(0, 1000, "mid");
+//        return getDataTable(goblinSelfGoodsCategoryService.listForMultiGrade());
+        TableDataInfo rspData = new TableDataInfo();
+        rspData.setCode(0);
+        rspData.setRows(goblinSelfGoodsCategoryService.listForMultiGrade());
+        return rspData;
     }
 
     @ApiOperation(value = "筛选")
@@ -130,9 +134,9 @@ public class GoblinSelfCategoryAdminController extends BaseController {
                 if (catePidObj.getName().equals(name.trim())) {
                     return AjaxResult.warn("分类名称与父级分类重复，请核实");
                 }
-                if (goblinSelfGoodsCategoryService.countForMatchName(catePid, name.trim()) > 0) {
-                    return AjaxResult.warn("分类名称重复，请核实");
-                }
+//                if (goblinSelfGoodsCategoryService.countForMatchName(catePid, name.trim()) > 0) {
+//                    return AjaxResult.warn("分类名称重复，请核实");
+//                }
                 break;
             case "3":
                 queryWrapper.eq(GoblinSelfGoodsCategory::getCateId, catePid).eq(GoblinSelfGoodsCategory::getGrade, "2");
@@ -140,12 +144,12 @@ public class GoblinSelfCategoryAdminController extends BaseController {
                 if (null == catePidObj) {
                     return AjaxResult.warn("父级分类无效");
                 }
-                if (catePidObj.getName().equals(name.trim())) {
-                    return AjaxResult.warn("分类名称与父级分类重复，请核实");
-                }
-                if (goblinSelfGoodsCategoryService.countForMatchName(catePidObj.getCatePid(), name.trim()) > 0) {
-                    return AjaxResult.warn("分类名称重复，请核实");
-                }
+//                if (catePidObj.getName().equals(name.trim())) {
+//                    return AjaxResult.warn("分类名称与父级分类重复，请核实");
+//                }
+//                if (goblinSelfGoodsCategoryService.countForMatchName(catePidObj.getCatePid(), name.trim()) > 0) {
+//                    return AjaxResult.warn("分类名称重复，请核实");
+//                }
                 break;
             default:
                 return AjaxResult.warn("分类层级无效");

liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-web/src/main/resources/templates/zhengzai/goblin/category/category.html

@@ -208,6 +208,7 @@
             removeUrl: prefix + "/rmv/{id}",
             sortName: "mid",
             modalName: "商品分类",
+            pagination: false,
             // onCheck: onCheck,
             columns: [{
                 radio: true

liquidnet-bus-common/liquidnet-common-web/src/main/java/com/liquidnet/common/web/filter/GlobalAuthorityInterceptor.java

@@ -85,9 +85,9 @@ public class GlobalAuthorityInterceptor extends HandlerInterceptorAdapter {
                 request.setAttribute(CurrentUtil.uTag, JsonUtils.toJson(claims));
 
             } catch (ExpiredJwtException expiredJwtEx) {
-                log.error("Ex.ExpiredJwtException:{},responseCode:{}", expiredJwtEx.getMessage(), responseCode = TOKEN_INVALID);
+                log.warn("Ex.ExpiredJwtException:{},responseCode:{}", expiredJwtEx.getMessage(), responseCode = TOKEN_INVALID);
             } catch (Exception ex) {
-                log.error("Ex.Exception:{},responseCode:{}", ex.getMessage(), responseCode = TOKEN_ILLEGAL);
+                log.warn("Ex.Exception:{},responseCode:{}", ex.getMessage(), responseCode = TOKEN_ILLEGAL);
             }
         } else {
             responseCode = TOKEN_ILLEGAL;
@@ -276,7 +276,7 @@ public class GlobalAuthorityInterceptor extends HandlerInterceptorAdapter {
 //            log.info("#ATH.ENCRYPT耗时:{}ms", System.currentTimeMillis() - s);
 //            s = System.currentTimeMillis();
             ResponseDto<String> check = feignAuthorityClient.check(encrypt);
-            log.info("#ATH.VALID耗时:{}ms", System.currentTimeMillis() - s);
+            log.debug("#ATH.VALID耗时:{}ms", System.currentTimeMillis() - s);
             if (check.isSuccess()) {
                 String valEncrypt = check.getData();
 
@@ -287,7 +287,7 @@ public class GlobalAuthorityInterceptor extends HandlerInterceptorAdapter {
                 }
             }
         } catch (Exception e) {
-            log.error("GLOBAL:Authority Check Exception", e);
+            log.warn("Ex.Authority Check Exception[ssokey={}]", ssokey, e);
         }
         return val;
     }

liquidnet-bus-do/liquidnet-service-goblin-do/src/main/java/com/liquidnet/service/goblin/mapper/GoblinSelfGoodsCategoryMapper.java

@@ -40,7 +40,7 @@ public interface GoblinSelfGoodsCategoryMapper extends BaseMapper<GoblinSelfGood
             "WHERE gsgc.del_flg='0'")
     int statsForForMultiGrade();
 
-    // SELECT cf.cate_id AS fcateId, cf.name AS fname, cf.icon AS ficon, cf.ne_isbn AS fneIsbn, cf.counts AS fcounts , cs.cate_id AS scateId, cs.name AS sname, cs.icon AS sicon, cs.ne_isbn AS sneIsbn, cs.counts AS scounts , ct.cate_id AS tcateId, ct.name AS tname, ct.icon AS ticon, ct.ne_isbn AS tneIsbn, ct.counts AS tcounts FROM goblin_self_goods_category cf LEFT JOIN ( SELECT cate_id, name, icon, grade, ne_isbn , counts, cate_pid FROM goblin_self_goods_category WHERE grade = '2' AND del_flg = '0' ) cs ON cs.cate_pid = cf.cate_id LEFT JOIN ( SELECT cate_id, name, icon, grade, ne_isbn , counts, cate_pid FROM goblin_self_goods_category WHERE grade = '3' AND del_flg = '0' ) ct ON ct.cate_pid = cs.cate_id WHERE cf.grade = '1' AND del_flg = '0'
+    // SELECT cf.cate_id AS fcateId, cf.name AS fname, cf.icon AS ficon, cf.ne_isbn AS fneIsbn, cf.counts AS fcounts , cs.cate_id AS scateId, cs.name AS sname, cs.icon AS sicon, cs.ne_isbn AS sneIsbn, cs.counts AS scounts , ct.cate_id AS tcateId, ct.name AS tname, ct.icon AS ticon, ct.ne_isbn AS tneIsbn, ct.counts AS tcounts FROM goblin_self_goods_category cf LEFT JOIN ( SELECT mid, cate_id, name, icon, grade , ne_isbn, counts, cate_pid FROM goblin_self_goods_category WHERE grade = '2' AND del_flg = '0' ) cs ON cs.cate_pid = cf.cate_id LEFT JOIN ( SELECT mid, cate_id, name, icon, grade , ne_isbn, counts, cate_pid FROM goblin_self_goods_category WHERE grade = '3' AND del_flg = '0' ) ct ON ct.cate_pid = cs.cate_id WHERE cf.grade = '1' AND del_flg = '0' ORDER BY cf.mid, cs.mid, ct.mid;
     @Select({"select cf.cate_id fcateId," +
             "       cf.name    fname," +
             "       cf.icon    ficon," +
@@ -58,12 +58,12 @@ public interface GoblinSelfGoodsCategoryMapper extends BaseMapper<GoblinSelfGood
             "       ct.counts  tcounts " +
             "from goblin_self_goods_category cf " +
             "         left join (" +
-            "    select cate_id, name, icon, grade, ne_isbn, counts, cate_pid from goblin_self_goods_category where grade = '2' and del_flg = '0' " +
+            "    select mid, cate_id, name, icon, grade, ne_isbn, counts, cate_pid from goblin_self_goods_category where grade = '2' and del_flg = '0' " +
             ") cs on cs.cate_pid = cf.cate_id " +
             "         left join (" +
-            "    select cate_id, name, icon, grade, ne_isbn, counts, cate_pid from goblin_self_goods_category where grade = '3' and del_flg = '0' " +
+            "    select mid, cate_id, name, icon, grade, ne_isbn, counts, cate_pid from goblin_self_goods_category where grade = '3' and del_flg = '0' " +
             ") ct on ct.cate_pid = cs.cate_id " +
-            "where cf.grade = '1' and del_flg = '0'"})
+            "where cf.grade = '1' and del_flg = '0' ORDER BY cf.mid,cs.mid,ct.mid"})
     List<GoblinSelfGoodsCategoryDto> listForMultiGrade();
 
     List<String> listForMultiGradeCateId(@Param("cateIdArr") String[] cateIdArr);