Merge branch 'master' of http://gitlab.scsmile.cn/zxf/smart_gov_platform

base-manager/src/main/java/com/mortals/xhx/base/system/menu/service/impl/MenuServiceImpl.java

@@ -122,6 +122,9 @@ public class MenuServiceImpl extends AbstractCRUDServiceImpl<MenuDao, MenuEntity
         MenuQuery query = new MenuQuery();
         query.setOrderColList(Arrays.asList(new OrderCol("orderId")));
         query.setOrderKind(OrderCol.ASCENDING);
+
+
+
         //判断移动的是一级菜单还是二级菜单
         MenuEntity menuEntity = this.get(id);
         if (menuEntity.getParentId() == 0) {

base-manager/src/main/java/com/mortals/xhx/module/site/service/impl/SiteServiceImpl.java

@@ -10,6 +10,7 @@ import com.mortals.framework.common.Rest;
 import com.mortals.framework.exception.AppException;
 import com.mortals.framework.model.Context;
 import com.mortals.framework.model.PageInfo;
+import com.mortals.framework.model.Result;
 import com.mortals.framework.service.impl.AbstractCRUDCacheServiceImpl;
 import com.mortals.framework.util.DataUtil;
 import com.mortals.framework.util.StringUtils;
@@ -341,7 +342,6 @@ public class SiteServiceImpl extends AbstractCRUDCacheServiceImpl<SiteDao, SiteE
             userPdu.setPage(1);
             userPdu.setSize(-1);
             Rest<RespData<List<UserPdu>>> list = userFeign.list(userPdu);
-
             userService.updateUserList(list.getData().getData());
         }
         super.removeAfter(ids, context, result);
@@ -400,6 +400,12 @@ public class SiteServiceImpl extends AbstractCRUDCacheServiceImpl<SiteDao, SiteE
         siteQuery.setAreaCode(matchCode + "%");
         List<SiteEntity> siteEntities = this.find(siteQuery);
 
+        PageInfo pageInfo = new PageInfo();
+        pageInfo.setCurrPage(1);
+        pageInfo.setPrePageResult(10);
+        
+
+
         return siteEntities;
     }
 

base-manager/src/test/java/com/mortals/httpclient/product/ProductController.http

@@ -4,6 +4,7 @@ POST {{baseUrl}}/product/list
 Content-Type: application/json
 
 {
+  "productName": "%窗%",
     "page":1,
     "size":10
 }

base-manager/src/test/java/com/mortals/httpclient/skin/SkinBaseController.http

@@ -4,8 +4,9 @@ POST {{baseUrl}}/skin/base/list
 Content-Type: application/json
 
 {
+  "fieldName": "背景大图",
   "page": 1,
-  "size": 100
+  "size": 10
 }
 
 

smart-gateway/src/main/resources/bootstrap.yml

@@ -94,6 +94,15 @@ spring:
           metadata:
             response-timeout: 200000
             connect-timeout: 200000
+        # 精细化服务
+        - id: refined-manager
+          #uri: http://192.168.0.98:21080
+          uri: lb://refined-manager
+          predicates:
+            - Path=/refined/**
+          metadata:
+            response-timeout: 200000
+            connect-timeout: 200000
     nacos:
       # Nacos 作为注册中心的配置项，对应 NacosDiscoveryProperties 配置类
       discovery: