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

base-manager/src/main/java/com/mortals/xhx/base/system/resource/web/ResourceController.java

@@ -35,7 +35,6 @@ import com.mortals.xhx.common.code.SourceType;
 public class ResourceController extends BaseCRUDJsonBodyMappingController<ResourceService,ResourceEntity,Long> {
 
 	public ResourceController(){
-		super.setFormClass(ResourceForm.class);
 		super.setModuleDesc("资源信息");
 	}
 

base-manager/src/main/java/com/mortals/xhx/base/system/resource/web/ResourceForm.java

-/**
-* 文件：ResourceForm.java
-* 版本：1.0.0
-* 日期：
-* Copyright ® 
-* All right reserved.
-*/
-package com.mortals.xhx.base.system.resource.web;
-
-
-import com.mortals.framework.web.BaseCRUDFormLong;
-import com.mortals.xhx.base.system.resource.model.ResourceEntity;
-import com.mortals.xhx.base.system.resource.model.ResourceQuery;
-
-/**
- * <p>Title: 资源信息</p>
- * <p>Description: ResourceForm  </p>
- * <p>Copyright: Copyright &reg;  </p>
- * <p>Company: </p>
- * @author 
- * @version 1.0.0
- */
-public class ResourceForm extends BaseCRUDFormLong<ResourceEntity> {
-	private ResourceEntity entity = new ResourceEntity();
-	private ResourceQuery query = new ResourceQuery();
-	public ResourceForm(){
-		
-	}
-	
-    @Override
-	public ResourceEntity getEntity() {
-		return entity;
-	}
-
-	public void setEntity(ResourceEntity entity) {
-		this.entity = entity;
-	}
-
-	@Override
-	public ResourceQuery getQuery() {
-		return query;
-	}
-
-	public void setQuery(ResourceQuery query) {
-		this.query = query;
-	}
-}
\ No newline at end of file

base-manager/src/main/java/com/mortals/xhx/common/utils/MatterDetailHtmlParseUtil.java

 package com.mortals.xhx.common.utils;
 
+import cn.hutool.core.util.ReUtil;
+import cn.hutool.http.HttpUtil;
 import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONObject;
 import com.mortals.xhx.common.code.FiletypeEnum;
 import com.mortals.xhx.common.code.SourceEnum;
 import com.mortals.xhx.module.matter.model.MatterDatumFileEntity;
@@ -146,7 +149,23 @@ public class MatterDetailHtmlParseUtil {
                         fileEntity.setSource(SourceEnum.政务网.getValue());
                         fileEntity.setFiletype(FiletypeEnum.空白表格.getValue());
                         fileEntity.setFileName(prenode.text().trim());
-                        fileEntity.setFileUrl(node.firstChild().attr("href").trim());
+
+                        String onclickStr = node.firstChild().attr("onclick").trim();
+
+                        List<String> allGroup = ReUtil.findAllGroup1("'(.*?)'", onclickStr);
+                        if (!ObjectUtils.isEmpty(allGroup)) {
+                            String encryUrl = "http://www.sczwfw.gov.cn/jiq/interface/item/annex/encryptUrl?id=" + allGroup.get(0);
+
+                            String resp = HttpUtil.get(encryUrl);
+                            JSONObject obj = JSON.parseObject(resp);
+                            String code = obj.getString("code");
+                            String data = obj.getString("data");
+                            if ("0".equals(code)) {
+                                fileEntity.setFileUrl(data);
+                            }
+                        }
+
+                        // fileEntity.setFileUrl(node.firstChild().attr("href").trim());
                         datumFileEntities.add(fileEntity);
                     }
                 }
@@ -168,7 +187,22 @@ public class MatterDetailHtmlParseUtil {
                         fileEntity.setSource(SourceEnum.政务网.getValue());
                         fileEntity.setFiletype(FiletypeEnum.示例样表.getValue());
                         fileEntity.setFileName(prenode.text().trim());
-                        fileEntity.setFileUrl(node.firstChild().attr("href").trim());
+
+                        String onclickStr = node.firstChild().attr("onclick").trim();
+
+                        List<String> allGroup = ReUtil.findAllGroup1("'(.*?)'", onclickStr);
+                        if (!ObjectUtils.isEmpty(allGroup)) {
+                            String encryUrl = "http://www.sczwfw.gov.cn/jiq/interface/item/annex/encryptUrl?id=" + allGroup.get(0);
+
+                            String resp = HttpUtil.get(encryUrl);
+                            JSONObject obj = JSON.parseObject(resp);
+                            String code = obj.getString("code");
+                            String data = obj.getString("data");
+                            if ("0".equals(code)) {
+                                fileEntity.setFileUrl(data);
+                            }
+                        }
+                        // fileEntity.setFileUrl(node.firstChild().attr("href").trim());
                         datumSampleFileEntities.add(fileEntity);
                     }
                     map.put("sampleList", datumSampleFileEntities);
@@ -478,6 +512,7 @@ public class MatterDetailHtmlParseUtil {
         });
 
         List<Map<String, Object>> mapList = MatterDetailHtmlParseUtil.getsqclInfoMapByHtml(dom);
+        System.out.println("==============材料==============");
         System.out.println(JSON.toJSONString(mapList));
 
         Map<String, String> sltjMapByHtml = MatterDetailHtmlParseUtil.getSltjMapByHtml(dom);

base-manager/src/main/java/com/mortals/xhx/common/utils/MatterHtmlParseUtil.java

@@ -247,7 +247,7 @@ public class MatterHtmlParseUtil {
         params.put("taskType", "");
         Rest<List<MatterEntity>> rest = MatterHtmlParseUtil.getMatterList(params, url);
 
-        System.out.println(rest.getData().size());*/
+        System.out.println(rest.getData().size());
 
 /*        HashMap<String, String> params = new HashMap<>();
 

base-manager/src/main/java/com/mortals/xhx/common/utils/SyncGovMatterDetailThread.java

@@ -84,7 +84,7 @@ public class SyncGovMatterDetailThread implements Runnable {
             List<MatterEntity> matterEntityList = matterService.find(new MatterQuery().areaCode(siteEntity.getAreaCode()).source(SourceEnum.政务网.getValue()));
             log.info("查询事项列表结束");
             List<MatterEntity> unSyncDetailMatterList = matterEntityList.stream()
-                    .filter(f -> f.getHaveGetMatterInfo().equalsIgnoreCase("false"))
+                 //   .filter(f -> f.getHaveGetMatterInfo().equalsIgnoreCase("false"))
                     .collect(Collectors.toList());
 
             //查询站点事项相关

base-manager/src/main/java/com/mortals/xhx/module/app/web/AppController.java

@@ -2,6 +2,7 @@ package com.mortals.xhx.module.app.web;
 
 import cn.hutool.core.net.url.UrlBuilder;
 import cn.hutool.core.util.ZipUtil;
+import com.mortals.framework.annotation.UnAuth;
 import com.mortals.framework.ap.GlobalSysInfo;
 import com.mortals.framework.common.Rest;
 import com.mortals.framework.exception.AppException;
@@ -69,6 +70,16 @@ public class AppController extends BaseCRUDJsonBodyMappingController<AppService,
     }
 
 
+    /**
+     * @param query
+     * @return
+     */
+    @Override
+    @UnAuth
+    public Rest<Object> list(AppEntity query) {
+        return super.list(query);
+    }
+
     /**
      * @param query
      * @param model

base-manager/src/main/java/com/mortals/xhx/module/area/web/AreaController.java

@@ -2,6 +2,7 @@ package com.mortals.xhx.module.area.web;
 
 import com.alibaba.fastjson.JSONObject;
 import com.mortals.framework.annotation.UnAuth;
+import com.mortals.framework.common.Rest;
 import com.mortals.framework.model.Context;
 import com.mortals.framework.web.BaseCRUDJsonBodyMappingController;
 import com.mortals.xhx.base.system.param.service.ParamService;
@@ -49,6 +50,26 @@ public class AreaController extends BaseCRUDJsonBodyMappingController<AreaServic
     }
 
 
+    /**
+     * @param query
+     * @return
+     */
+    @Override
+    @UnAuth
+    public Rest<Object> list(AreaEntity query) {
+        return super.list(query);
+    }
+
+    /**
+     * @param id
+     * @return
+     */
+    @Override
+    @UnAuth
+    public String info(Long id) {
+        return super.info(id);
+    }
+
     /**
      * 获取站点下拉树列表
      */

base-manager/src/main/java/com/mortals/xhx/module/business/web/BusinessController.java

 package com.mortals.xhx.module.business.web;
 
 import com.alibaba.fastjson.JSONObject;
+import com.mortals.framework.annotation.UnAuth;
+import com.mortals.framework.common.Rest;
 import com.mortals.framework.exception.AppException;
 import com.mortals.framework.model.Context;
 import com.mortals.framework.model.PageInfo;
@@ -49,6 +51,15 @@ public class BusinessController extends BaseCRUDJsonBodyMappingController<Busine
         super.init(model, context);
     }
 
+    /**
+     * @param query
+     * @return
+     */
+    @Override
+    @UnAuth
+    public Rest<Object> list(BusinessEntity query) {
+        return super.list(query);
+    }
 
     @Override
     protected void doListBefore(BusinessEntity query, Map<String, Object> model, Context context) throws AppException {

base-manager/src/main/java/com/mortals/xhx/module/business/web/BusinessMatterController.java

 package com.mortals.xhx.module.business.web;
 
 import com.alibaba.fastjson.JSONObject;
+import com.mortals.framework.annotation.UnAuth;
+import com.mortals.framework.common.Rest;
 import com.mortals.framework.exception.AppException;
 import com.mortals.framework.model.Context;
 import com.mortals.framework.model.PageInfo;
@@ -47,6 +49,15 @@ public class BusinessMatterController extends BaseCRUDJsonBodyMappingController<
     }
 
 
+    /**
+     * @param query
+     * @return
+     */
+    @Override
+    @UnAuth
+    public Rest<Object> list(BusinessMatterEntity query) {
+        return super.list(query);
+    }
 
     @PostMapping(value = "businesslist")
     public String getListByBusiness(@RequestBody BusinessMatterQuery query) {

base-manager/src/main/java/com/mortals/xhx/module/dept/web/DeptController.java

@@ -52,10 +52,30 @@ public class DeptController extends BaseCRUDJsonBodyMappingController<DeptServic
         super.setModuleDesc("部门");
     }
 
+    /**
+     * @param query
+     * @return
+     */
+    @Override
+    @UnAuth
+    public Rest<Object> list(DeptEntity query) {
+        return super.list(query);
+    }
+
+    /**
+     * @param id
+     * @return
+     */
+    @Override
+    @UnAuth
+    public String info(Long id) {
+        return super.info(id);
+    }
+
     @Override
     protected void doListBefore(DeptEntity query, Map<String, Object> model, Context context) throws AppException {
 
-        if(ObjectUtils.isEmpty(query.getIdList())){
+        if (ObjectUtils.isEmpty(query.getIdList())) {
             if (ObjectUtils.isEmpty(query.getOrderColList())) {
                 query.setOrderColList(new ArrayList<OrderCol>() {
                     {
@@ -66,7 +86,7 @@ public class DeptController extends BaseCRUDJsonBodyMappingController<DeptServic
             } else {
                 query.getOrderColList().add(new OrderCol("a.createTime", OrderCol.DESCENDING));
             }
-        }else{
+        } else {
 
         }
         if (!ObjectUtils.isEmpty(query.getFilter()) && YesNoEnum.YES.getValue() == query.getFilter()) {

base-manager/src/main/java/com/mortals/xhx/module/matter/web/MatterAcceptController.java

 package com.mortals.xhx.module.matter.web;
 
+import com.mortals.framework.annotation.UnAuth;
+import com.mortals.framework.common.Rest;
 import com.mortals.framework.model.Context;
 import com.mortals.framework.web.BaseCRUDJsonBodyMappingController;
 import com.mortals.framework.web.BasePhpCRUDJsonMappingController;
@@ -35,4 +37,13 @@ public class MatterAcceptController extends BaseCRUDJsonBodyMappingController<Ma
         super.init(model, context);
     }
 
+    /**
+     * @param query
+     * @return
+     */
+    @Override
+    @UnAuth
+    public Rest<Object> list(MatterAcceptEntity query) {
+        return super.list(query);
+    }
 }
\ No newline at end of file

base-manager/src/main/java/com/mortals/xhx/module/matter/web/MatterChargesController.java

 package com.mortals.xhx.module.matter.web;
 
+import com.mortals.framework.annotation.UnAuth;
+import com.mortals.framework.common.Rest;
 import com.mortals.framework.model.Context;
 import com.mortals.framework.web.BaseCRUDJsonBodyMappingController;
 import com.mortals.framework.web.BasePhpCRUDJsonMappingController;
@@ -35,4 +37,13 @@ public class MatterChargesController extends BaseCRUDJsonBodyMappingController<M
         super.init(model, context);
     }
 
+    /**
+     * @param query
+     * @return
+     */
+    @Override
+    @UnAuth
+    public Rest<Object> list(MatterChargesEntity query) {
+        return super.list(query);
+    }
 }
\ No newline at end of file

base-manager/src/main/java/com/mortals/xhx/module/matter/web/MatterController.java

@@ -132,6 +132,25 @@ public class MatterController extends BaseCRUDJsonBodyMappingController<MatterSe
         super.init(model, context);
     }
 
+    /**
+     * @param query
+     * @return
+     */
+    @Override
+    @UnAuth
+    public Rest<Object> list(MatterEntity query) {
+        return super.list(query);
+    }
+
+    /**
+     * @param id
+     * @return
+     */
+    @Override
+    @UnAuth
+    public String info(Long id) {
+        return super.info(id);
+    }
 
     /**
      * 添加事项到站点

base-manager/src/main/java/com/mortals/xhx/module/matter/web/MatterDatumController.java

 package com.mortals.xhx.module.matter.web;
 
+import com.mortals.framework.annotation.UnAuth;
+import com.mortals.framework.common.Rest;
 import com.mortals.framework.exception.AppException;
 import com.mortals.framework.model.Context;
 import com.mortals.framework.web.BaseCRUDJsonBodyMappingController;
@@ -52,6 +54,15 @@ public class MatterDatumController extends BaseCRUDJsonBodyMappingController<Mat
         super.init(model, context);
     }
 
+    /**
+     * @param query
+     * @return
+     */
+    @Override
+    @UnAuth
+    public Rest<Object> list(MatterDatumEntity query) {
+        return super.list(query);
+    }
 
     @Override
     protected int viewAfter(Long id, Map<String, Object> model, MatterDatumEntity entity, Context context) throws AppException {

base-manager/src/main/java/com/mortals/xhx/module/matter/web/MatterDatumFileController.java

 package com.mortals.xhx.module.matter.web;
 
+import com.mortals.framework.annotation.UnAuth;
+import com.mortals.framework.common.Rest;
 import com.mortals.framework.model.Context;
 import com.mortals.framework.web.BaseCRUDJsonBodyMappingController;
 import com.mortals.framework.web.BasePhpCRUDJsonMappingController;
@@ -11,8 +13,8 @@ import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
 import java.util.Map;
+
 /**
- *
  * 材料附件
  *
  * @author zxfei
@@ -20,20 +22,29 @@ import java.util.Map;
  */
 @RestController
 @RequestMapping("matter/datum/file")
-public class MatterDatumFileController extends BaseCRUDJsonBodyMappingController<MatterDatumFileService,MatterDatumFileEntity,Long> {
+public class MatterDatumFileController extends BaseCRUDJsonBodyMappingController<MatterDatumFileService, MatterDatumFileEntity, Long> {
 
     @Autowired
     private ParamService paramService;
 
-    public MatterDatumFileController(){
-        super.setModuleDesc( "材料附件");
+    public MatterDatumFileController() {
+        super.setModuleDesc("材料附件");
     }
 
     @Override
-    protected void init( Map<String, Object> model, Context context) {
-        this.addDict(model, "filetype", paramService.getParamBySecondOrganize("MatterDatumFile","filetype"));
-        this.addDict(model, "source", paramService.getParamBySecondOrganize("MatterDatumFile","source"));
-        super.init( model, context);
+    protected void init(Map<String, Object> model, Context context) {
+        this.addDict(model, "filetype", paramService.getParamBySecondOrganize("MatterDatumFile", "filetype"));
+        this.addDict(model, "source", paramService.getParamBySecondOrganize("MatterDatumFile", "source"));
+        super.init(model, context);
     }
 
+    /**
+     * @param query
+     * @return
+     */
+    @Override
+    @UnAuth
+    public Rest<Object> list(MatterDatumFileEntity query) {
+        return super.list(query);
+    }
 }
\ No newline at end of file

base-manager/src/main/java/com/mortals/xhx/module/matter/web/MatterFlowlimitController.java

 package com.mortals.xhx.module.matter.web;
 
+import com.mortals.framework.annotation.UnAuth;
+import com.mortals.framework.common.Rest;
 import com.mortals.framework.model.Context;
 import com.mortals.framework.web.BaseCRUDJsonBodyMappingController;
 import com.mortals.framework.web.BasePhpCRUDJsonMappingController;
@@ -35,5 +37,13 @@ public class MatterFlowlimitController extends BaseCRUDJsonBodyMappingController
         super.init(model, context);
     }
 
-
+    /**
+     * @param query
+     * @return
+     */
+    @Override
+    @UnAuth
+    public Rest<Object> list(MatterFlowlimitEntity query) {
+        return super.list(query);
+    }
 }
\ No newline at end of file

base-manager/src/main/java/com/mortals/xhx/module/matter/web/MatterIntermediaryController.java

 package com.mortals.xhx.module.matter.web;
 
+import com.mortals.framework.annotation.UnAuth;
+import com.mortals.framework.common.Rest;
 import com.mortals.framework.model.Context;
 import com.mortals.framework.web.BaseCRUDJsonBodyMappingController;
 import com.mortals.framework.web.BasePhpCRUDJsonMappingController;
@@ -35,4 +37,13 @@ public class MatterIntermediaryController extends BaseCRUDJsonBodyMappingControl
         super.init(model, context);
     }
 
+    /**
+     * @param query
+     * @return
+     */
+    @Override
+    @UnAuth
+    public Rest<Object> list(MatterIntermediaryEntity query) {
+        return super.list(query);
+    }
 }
\ No newline at end of file

base-manager/src/main/java/com/mortals/xhx/module/matter/web/MatterQuestionController.java

 package com.mortals.xhx.module.matter.web;
 
+import com.mortals.framework.annotation.UnAuth;
+import com.mortals.framework.common.Rest;
 import com.mortals.framework.model.Context;
 import com.mortals.framework.web.BaseCRUDJsonBodyMappingController;
 import com.mortals.framework.web.BasePhpCRUDJsonMappingController;
@@ -35,5 +37,13 @@ public class MatterQuestionController extends BaseCRUDJsonBodyMappingController<
         super.init(model, context);
     }
 
-
+    /**
+     * @param query
+     * @return
+     */
+    @Override
+    @UnAuth
+    public Rest<Object> list(MatterQuestionEntity query) {
+        return super.list(query);
+    }
 }
\ No newline at end of file

base-manager/src/main/java/com/mortals/xhx/module/matter/web/MatterSetbaseController.java

 package com.mortals.xhx.module.matter.web;
 
+import com.mortals.framework.annotation.UnAuth;
+import com.mortals.framework.common.Rest;
 import com.mortals.framework.model.Context;
 import com.mortals.framework.web.BaseCRUDJsonBodyMappingController;
 import com.mortals.framework.web.BasePhpCRUDJsonMappingController;
@@ -36,4 +38,13 @@ public class MatterSetbaseController extends BaseCRUDJsonBodyMappingController<M
         super.init(model, context);
     }
 
+    /**
+     * @param query
+     * @return
+     */
+    @Override
+    @UnAuth
+    public Rest<Object> list(MatterSetbaseEntity query) {
+        return super.list(query);
+    }
 }
\ No newline at end of file

base-manager/src/main/java/com/mortals/xhx/module/site/web/SiteBusinessController.java

 package com.mortals.xhx.module.site.web;
 
 import com.alibaba.fastjson.JSONObject;
+import com.mortals.framework.annotation.UnAuth;
+import com.mortals.framework.common.Rest;
 import com.mortals.framework.exception.AppException;
 import com.mortals.framework.model.Context;
 import com.mortals.framework.model.PageInfo;
@@ -56,6 +58,15 @@ public class SiteBusinessController extends BaseCRUDJsonBodyMappingController<Si
         super.init(model, context);
     }
 
+    /**
+     * @param query
+     * @return
+     */
+    @Override
+    @UnAuth
+    public Rest<Object> list(SiteBusinessEntity query) {
+        return super.list(query);
+    }
 
     @PostMapping("list/exclude")
     public String excludeList(SiteBusinessEntity query) {

base-manager/src/main/java/com/mortals/xhx/module/site/web/SiteController.java

@@ -88,6 +88,25 @@ public class SiteController extends BaseCRUDJsonBodyMappingController<SiteServic
         super.init(model, context);
     }
 
+    /**
+     * @param query
+     * @return
+     */
+    @Override
+    @UnAuth
+    public Rest<Object> list(SiteEntity query) {
+        return super.list(query);
+    }
+
+    /**
+     * @param id
+     * @return
+     */
+    @Override
+    @UnAuth
+    public String info(Long id) {
+        return super.info(id);
+    }
 
     /**
      * 构建站点树

base-manager/src/main/java/com/mortals/xhx/module/site/web/SiteHallController.java

@@ -60,6 +60,26 @@ public class SiteHallController extends BaseCRUDJsonBodyMappingController<SiteHa
     }
 
 
+    /**
+     * @param query
+     * @return
+     */
+    @Override
+    @UnAuth
+    public Rest<Object> list(SiteHallEntity query) {
+        return super.list(query);
+    }
+
+    /**
+     * @param id
+     * @return
+     */
+    @Override
+    @UnAuth
+    public String info(Long id) {
+        return super.info(id);
+    }
+
     /**
      * 根据大厅查询所属业务
      */

base-manager/src/main/java/com/mortals/xhx/module/site/web/SiteMatterController.java

 package com.mortals.xhx.module.site.web;
 
+import com.mortals.framework.annotation.UnAuth;
+import com.mortals.framework.common.Rest;
 import com.mortals.framework.exception.AppException;
 import com.mortals.framework.model.Context;
 import com.mortals.framework.model.OrderCol;
@@ -34,6 +36,16 @@ public class SiteMatterController extends BaseCRUDJsonBodyMappingController<Site
         super.setModuleDesc("站点事项");
     }
 
+    /**
+     * @param query
+     * @return
+     */
+    @Override
+    @UnAuth
+    public Rest<Object> list(SiteMatterEntity query) {
+        return super.list(query);
+    }
+
     /**
      * @param query
      * @param model

base-manager/src/main/java/com/mortals/xhx/module/site/web/SiteThemeController.java

 package com.mortals.xhx.module.site.web;
+import com.mortals.framework.annotation.UnAuth;
+import com.mortals.framework.common.Rest;
 import com.mortals.framework.web.BaseCRUDJsonBodyMappingController;
 import com.mortals.xhx.base.system.param.service.ParamService;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -46,4 +48,13 @@ public class SiteThemeController extends BaseCRUDJsonBodyMappingController<SiteT
     }
 
 
+    /**
+     * @param query
+     * @return
+     */
+    @Override
+    @UnAuth
+    public Rest<Object> list(SiteThemeEntity query) {
+        return super.list(query);
+    }
 }
\ No newline at end of file

base-manager/src/main/java/com/mortals/xhx/module/site/web/SiteThemeMatterController.java

 package com.mortals.xhx.module.site.web;
+import com.mortals.framework.annotation.UnAuth;
+import com.mortals.framework.common.Rest;
 import com.mortals.framework.web.BaseCRUDJsonBodyMappingController;
 import com.mortals.xhx.base.system.param.service.ParamService;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -47,5 +49,13 @@ public class SiteThemeMatterController extends BaseCRUDJsonBodyMappingController
         super.init(model, context);
     }
 
-
+    /**
+     * @param query
+     * @return
+     */
+    @Override
+    @UnAuth
+    public Rest<Object> list(SiteThemeMatterEntity query) {
+        return super.list(query);
+    }
 }
\ No newline at end of file

base-manager/src/main/java/com/mortals/xhx/module/skin/web/SkinBaseController.java

@@ -5,7 +5,9 @@ import cn.hutool.core.net.url.UrlBuilder;
 import cn.hutool.core.util.CharsetUtil;
 import cn.hutool.core.util.ReUtil;
 import cn.hutool.core.util.StrUtil;
+import com.mortals.framework.annotation.UnAuth;
 import com.mortals.framework.ap.GlobalSysInfo;
+import com.mortals.framework.common.Rest;
 import com.mortals.framework.exception.AppException;
 import com.mortals.framework.util.DataUtil;
 import com.mortals.framework.web.BaseCRUDJsonBodyMappingController;
@@ -73,6 +75,26 @@ public class SkinBaseController extends BaseCRUDJsonBodyMappingController<SkinBa
     }
 
 
+    /**
+     * @param query
+     * @return
+     */
+    @Override
+    @UnAuth
+    public Rest<Object> list(SkinBaseEntity query) {
+        return super.list(query);
+    }
+
+    /**
+     * @param id
+     * @return
+     */
+    @Override
+    @UnAuth
+    public String info(Long id) {
+        return super.info(id);
+    }
+
     @Override
     protected void doListBefore(SkinBaseEntity query, Map<String, Object> model, Context context) throws AppException {
 

base-manager/src/main/java/com/mortals/xhx/module/sms/web/SmsSetController.java

 package com.mortals.xhx.module.sms.web;
 
+import com.mortals.framework.annotation.UnAuth;
+import com.mortals.framework.common.Rest;
 import com.mortals.framework.model.Context;
 import com.mortals.framework.web.BaseCRUDJsonBodyMappingController;
 import com.mortals.framework.web.BasePhpCRUDJsonMappingController;
@@ -36,4 +38,23 @@ public class SmsSetController extends BaseCRUDJsonBodyMappingController<SmsSetSe
         super.init(model, context);
     }
 
+    /**
+     * @param query
+     * @return
+     */
+    @Override
+    @UnAuth
+    public Rest<Object> list(SmsSetEntity query) {
+        return super.list(query);
+    }
+
+    /**
+     * @param id
+     * @return
+     */
+    @Override
+    @UnAuth
+    public String info(Long id) {
+        return super.info(id);
+    }
 }
\ No newline at end of file

base-manager/src/main/java/com/mortals/xhx/module/window/web/WindowBusinessController.java

 package com.mortals.xhx.module.window.web;
 
 import com.alibaba.fastjson.JSONObject;
+import com.mortals.framework.annotation.UnAuth;
+import com.mortals.framework.common.Rest;
 import com.mortals.framework.util.DataUtil;
 import com.mortals.framework.web.BaseCRUDJsonBodyMappingController;
 import com.mortals.framework.web.BasePhpCRUDJsonMappingController;
@@ -34,6 +36,13 @@ public class WindowBusinessController extends BaseCRUDJsonBodyMappingController<
         super.setModuleDesc("窗口业务");
     }
 
-
-
+    /**
+     * @param query
+     * @return
+     */
+    @Override
+    @UnAuth
+    public Rest<Object> list(WindowBusinessEntity query) {
+        return super.list(query);
+    }
 }
\ No newline at end of file

base-manager/src/main/java/com/mortals/xhx/module/window/web/WindowController.java

@@ -78,6 +78,25 @@ public class WindowController extends BaseCRUDJsonBodyMappingController<WindowSe
         super.init(model, context);
     }
 
+    /**
+     * @param query
+     * @return
+     */
+    @Override
+    @UnAuth
+    public Rest<Object> list(WindowEntity query) {
+        return super.list(query);
+    }
+
+    /**
+     * @param id
+     * @return
+     */
+    @Override
+    @UnAuth
+    public String info(Long id) {
+        return super.info(id);
+    }
 
     /**
      * 添加业务到窗口

base-manager/src/main/java/com/mortals/xhx/module/window/web/WindowMatterController.java

@@ -2,7 +2,9 @@ package com.mortals.xhx.module.window.web;
 
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.serializer.SerializerFeature;
+import com.mortals.framework.annotation.UnAuth;
 import com.mortals.framework.ap.GlobalSysInfo;
+import com.mortals.framework.common.Rest;
 import com.mortals.framework.exception.AppException;
 import com.mortals.framework.model.Context;
 import com.mortals.framework.model.OrderCol;
@@ -45,6 +47,15 @@ public class WindowMatterController extends BaseCRUDJsonBodyMappingController<Wi
         super.setModuleDesc("窗口事项");
     }
 
+    /**
+     * @param query
+     * @return
+     */
+    @Override
+    @UnAuth
+    public Rest<Object> list(WindowMatterEntity query) {
+        return super.list(query);
+    }
 
     @Override
     protected void doListBefore(WindowMatterEntity query, Map<String, Object> model, Context context) throws AppException {

base-manager/src/main/java/com/mortals/xhx/module/workman/web/WorkmanController.java

@@ -69,6 +69,14 @@ public class WorkmanController extends BaseCRUDJsonBodyMappingController<Workman
         super.init(model, context);
     }
 
+    /**
+     * @param query
+     * @return
+     */
+    @PostMapping(value = "interList")
+    public Rest<Object> interList(@RequestBody  WorkmanEntity query) {
+        return super.list(query);
+    }
 
     /**
      *
@@ -118,6 +126,8 @@ public class WorkmanController extends BaseCRUDJsonBodyMappingController<Workman
     }
 
 
+
+
     @PostMapping(value = "doImportPic")
     public String doImportPic(@RequestBody WorkmanEntity query) {
         JSONObject ret = new JSONObject();

base-manager/src/test/java/com/mortals/httpclient/window/WindowHallController.http

@@ -19,8 +19,7 @@ Content-Type: application/json
 
 {
     "page":1,
-    "size":-1,
-    "hallId": 11
+    "size":-1
 }
 
 

common-lib/src/main/java/com/mortals/xhx/feign/area/IApiAreaFeign.java

@@ -28,7 +28,7 @@ public interface IApiAreaFeign extends IFeign {
      * @param query
      * @return
      */
-    @PostMapping(value = "/area/list")
+    @PostMapping(value = "/area/interlist")
     String list(@RequestBody AreaEntity query);
 
 
@@ -38,7 +38,7 @@ public interface IApiAreaFeign extends IFeign {
      * @param id
      * @return
      */
-    @GetMapping(value = "/area/info")
+    @GetMapping(value = "/area/interinfo")
     String viewAreaInfo(@RequestParam(value = "id") Long id);
 
 

common-lib/src/main/java/com/mortals/xhx/feign/device/IDeviceFeign.java

@@ -26,7 +26,7 @@ public interface IDeviceFeign extends IFeign {
      * @param devicePdu
      * @return
      */
-    @PostMapping(value = "/device/list")
+    @PostMapping(value = "/device/interlist")
     Rest<RespData<List<DevicePdu>>> list(@RequestBody DevicePdu devicePdu);
 
 
@@ -36,7 +36,7 @@ public interface IDeviceFeign extends IFeign {
      * @param id
      * @return
      */
-    @GetMapping(value = "/device/info")
+    @GetMapping(value = "/device/interinfo")
     Rest<DevicePdu> info(@RequestParam(value = "id") Long id);
 
     /**

common-lib/src/main/java/com/mortals/xhx/feign/product/IProductFeign.java

@@ -22,7 +22,7 @@ public interface IProductFeign extends IFeign {
      * @param productPdu
      * @return
      */
-    @PostMapping(value = "/product/list")
+    @PostMapping(value = "/product/interlist")
     Rest<RespData<List<ProductPdu>>> list(@RequestBody ProductPdu productPdu);
 }
 

common-lib/src/main/java/com/mortals/xhx/feign/user/IUserFeign.java

@@ -29,7 +29,7 @@ public interface IUserFeign extends IFeign {
      * @param userPdu
      * @return
      */
-    @PostMapping(value = "/user/list")
+    @PostMapping(value = "/user/interlist")
     Rest<RespData<List<UserPdu>>> list(@RequestBody UserPdu userPdu);
 
 
@@ -39,7 +39,7 @@ public interface IUserFeign extends IFeign {
      * @param id
      * @return
      */
-    @GetMapping(value = "/user/info")
+    @GetMapping(value = "/user/interinfo")
     Rest<UserPdu> info(@RequestParam(value = "id") Long id);
 
     /**

portal-manager/src/main/bin/deploy.sh

@@ -102,8 +102,8 @@ project_ui_deploy() {
 main() {
   echo "后台服务部署"
   project_deploy
-  echo "前端服务部署"
-  project_ui_deploy
+  #echo "前端服务部署"
+  #project_ui_deploy
   exit ${RETVAL}
 }
 

portal-manager/src/main/java/com/mortals/xhx/base/system/resource/dao/ResourceDao.java

+/**
+* 文件：ResourceDao.java
+* 版本：1.0.0
+* 日期：
+* Copyright ® 
+* All right reserved.
+*/
+
+package com.mortals.xhx.base.system.resource.dao;
+
+
+import com.mortals.framework.dao.ICRUDDao;
+import com.mortals.xhx.base.system.resource.model.ResourceEntity;
+
+import java.util.List;
+
+/**
+ * <p>Title: 资源信息</p>
+ * <p>Description: ResourceDao DAO接口 </p>
+ * <p>Copyright: Copyright &reg;  </p>
+ * <p>Company: </p>
+ * @author 
+ * @version 1.0.0
+ */
+
+public interface ResourceDao extends ICRUDDao<ResourceEntity,Long> {
+     List<ResourceEntity> getListByUserId(Long userId);
+
+    List<ResourceEntity> getAll(int userType);
+}
\ No newline at end of file

portal-manager/src/main/java/com/mortals/xhx/base/system/resource/dao/ibatis/ResourceDaoImpl.java

+/**
+ * 文件：ResourceDaoImpl.java 版本：1.0.0 日期： Copyright ® All right reserved.
+ */
+
+package com.mortals.xhx.base.system.resource.dao.ibatis;
+
+import com.mortals.framework.dao.ibatis.BaseCRUDDaoMybatis;
+import com.mortals.framework.model.ParamDto;
+import com.mortals.xhx.base.system.resource.dao.ResourceDao;
+import com.mortals.xhx.base.system.resource.model.ResourceEntity;
+import org.springframework.stereotype.Repository;
+
+import java.util.HashMap;
+import java.util.List;
+
+/**
+ * <p>
+ * Title: 资源信息
+ * </p>
+ * <p>
+ * Description: ResourceDaoImpl DAO接口
+ * </p>
+ * <p>
+ * Copyright: Copyright &reg;
+ * </p>
+ * <p>
+ * Company:
+ * </p>
+ * @author
+ * @version 1.0.0
+ */
+@Repository("resourceDao")
+public class ResourceDaoImpl extends BaseCRUDDaoMybatis<ResourceEntity, Long> implements ResourceDao {
+
+    @Override
+    public List<ResourceEntity> getListByUserId(Long userId) {
+        ParamDto param = new ParamDto();
+        param.getCondition().put("userId", userId);
+        return getSqlSession().selectList(getSqlId("getListByUserId"), param);
+    }
+
+    @Override
+    public List<ResourceEntity> getAll(final int userType) {
+
+        return getSqlSession().selectList(getSqlId("getAllByUserType"), new HashMap<String, Object>() {
+
+            {
+                put("userType", userType);
+            }
+        });
+    }
+}
\ No newline at end of file

portal-manager/src/main/java/com/mortals/xhx/base/system/resource/model/ResourceEntity.java

+/**
+* 文件：ResourceEntity.java
+* 版本：1.0.0
+* 日期：
+* Copyright ® 
+* All right reserved.
+*/
+
+package com.mortals.xhx.base.system.resource.model;
+
+import com.mortals.framework.model.BaseEntityLong;
+
+import java.util.Date;
+
+/**
+ * <p>Title: 资源信息</p>
+ * <p>Description: ResourceEntity  </p>
+ * <p>Copyright: Copyright &reg;  </p>
+ * <p>Company: </p>
+ * @author 
+ * @version 1.0.0
+ */
+public class ResourceEntity extends BaseEntityLong{
+	private static final long serialVersionUID = 1547777703340L;
+	
+	/** 名称 */
+	private String name;
+
+	/** 连接地址，多个地址以逗号分隔 */
+	private String url;
+
+	/** 权限类型，0：无限制，1：无需登录查看，2：需要登录查看，3：需要角色权限查看，默认3 */
+	private Integer authType;
+
+	/** 资源类型，0：系统资源，1：开放资源，默认0 */
+	private Integer sourceType;
+
+	/** 创建时间 */
+	private Date createTime;
+
+	/** 创建用户 */
+	private Long createUserId;
+
+	/** 创建用户名称 */
+	private String createUserName;
+
+	/** 用户类型，0：系统用户 1:代理商用户 2:品牌商用户 */
+	private Integer userType;
+
+
+	public ResourceEntity(){
+		
+	}
+	/**
+	 * 获取 名称
+	 * @return name
+	 */
+	public String getName(){
+		return this.name;
+	}
+
+	/**
+	 * 设置 名称
+	 * @param name
+	 */
+	public void setName(String name){
+		this.name = name;
+	}
+
+	/**
+	 * 获取 连接地址，多个地址以逗号分隔
+	 * @return url
+	 */
+	public String getUrl(){
+		return this.url;
+	}
+
+	/**
+	 * 设置 连接地址，多个地址以逗号分隔
+	 * @param url
+	 */
+	public void setUrl(String url){
+		this.url = url;
+	}
+
+	/**
+	 * 获取 权限类型，0：无限制，1：无需登录查看，2：需要登录查看，3：需要角色权限查看，默认3
+	 * @return authType
+	 */
+	public Integer getAuthType(){
+		return this.authType;
+	}
+
+	/**
+	 * 设置 权限类型，0：无限制，1：无需登录查看，2：需要登录查看，3：需要角色权限查看，默认3
+	 * @param authType
+	 */
+	public void setAuthType(Integer authType){
+		this.authType = authType;
+	}
+
+	/**
+	 * 获取 资源类型，0：系统资源，1：开放资源，默认0
+	 * @return sourceType
+	 */
+	public Integer getSourceType(){
+		return this.sourceType;
+	}
+
+	/**
+	 * 设置 资源类型，0：系统资源，1：开放资源，默认0
+	 * @param sourceType
+	 */
+	public void setSourceType(Integer sourceType){
+		this.sourceType = sourceType;
+	}
+
+	/**
+	 * 获取 创建时间
+	 * @return createTime
+	 */
+	public Date getCreateTime(){
+		return this.createTime;
+	}
+
+	/**
+	 * 设置 创建时间
+	 * @param createTime
+	 */
+	public void setCreateTime(Date createTime){
+		this.createTime = createTime;
+	}
+
+	/**
+	 * 获取 创建用户
+	 * @return createUserId
+	 */
+	public Long getCreateUserId(){
+		return this.createUserId;
+	}
+
+	/**
+	 * 设置 创建用户
+	 * @param createUserId
+	 */
+	public void setCreateUserId(Long createUserId){
+		this.createUserId = createUserId;
+	}
+
+	/**
+	 * 获取 创建用户名称
+	 * @return createUserName
+	 */
+	public String getCreateUserName(){
+		return this.createUserName;
+	}
+
+	/**
+	 * 设置 创建用户名称
+	 * @param createUserName
+	 */
+	public void setCreateUserName(String createUserName){
+		this.createUserName = createUserName;
+	}
+
+	/**
+	 * 获取 用户类型，0：系统用户 1:代理商用户 2:品牌商用户
+	 * @return userType
+	 */
+	public Integer getUserType(){
+		return this.userType;
+	}
+
+	/**
+	 * 设置 用户类型，0：系统用户 1:代理商用户 2:品牌商用户
+	 * @param userType
+	 */
+	public void setUserType(Integer userType){
+		this.userType = userType;
+	}
+
+
+	@Override
+	public int hashCode() {
+		return this.getId().hashCode();
+	}
+	@Override
+	public boolean equals(Object obj) {
+		if (obj == null)
+			return false;
+		if (obj instanceof ResourceEntity) {
+			ResourceEntity tmp = (ResourceEntity) obj;
+			if (this.getId().longValue() == tmp.getId().longValue()) {
+				return true;
+			}
+		}
+		return false;
+	}
+	public String toString(){
+		StringBuilder sb = new StringBuilder("");
+		sb.append("id:").append(getId())
+		  .append(",name:").append(getName())
+		  .append(",url:").append(getUrl())
+		  .append(",authType:").append(getAuthType())
+		  .append(",sourceType:").append(getSourceType())
+		  .append(",createTime:").append(getCreateTime())
+		  .append(",createUserId:").append(getCreateUserId())
+		  .append(",createUserName:").append(getCreateUserName())
+		  .append(",userType:").append(getUserType());
+		return sb.toString();
+	}
+	public void initAttrValue(){
+		this.name = null;
+		this.url = null;
+		this.authType = 3;
+		this.sourceType = 0;
+		this.createTime = null;
+		this.createUserId = null;
+		this.createUserName = null;
+		this.userType = null;
+	}
+}
\ No newline at end of file

portal-manager/src/main/java/com/mortals/xhx/base/system/resource/service/ResourceService.java

+/**
+* 文件：ResourceService.java
+* 版本：1.0.0
+* 日期：
+* Copyright ® 
+* All right reserved.
+*/
+
+package com.mortals.xhx.base.system.resource.service;
+
+
+import com.mortals.framework.exception.AppException;
+import com.mortals.framework.service.ICRUDService;
+import com.mortals.xhx.base.system.resource.model.ResourceEntity;
+
+import java.util.List;
+import java.util.Set;
+
+/**
+ * <p>Title: 资源信息</p>
+ * <p>Description: ResourceService service接口 </p>
+ * <p>Copyright: Copyright &reg;  </p>
+ * <p>Company: </p>
+ * @author 
+ * @version 1.0.0
+ */
+
+public interface ResourceService extends ICRUDService<ResourceEntity,Long> {
+    /**
+     * 查询所有可用资源
+     * @return
+     * @throws AppException
+     */
+     List<ResourceEntity> findAllEnable() throws AppException;
+
+    /**
+     * 根据用户查询可用资源
+     * @param userId
+     * @return
+     * @throws AppException
+     */
+     List<ResourceEntity> findListByUserId(Long userId) throws AppException;
+
+    /**
+     * 查询用户可用资源
+     * @param userId
+     * @return 字符串，多个以逗号分隔
+     * @throws AppException
+     */
+     String findUrlByUserId(Long userId) throws AppException;
+
+    /**
+     * 查询用户用资源集合
+     * @param userId
+     * @return
+     * @throws AppException
+     */
+     Set<String> findUrlSetByUserId(Long userId) throws AppException;
+
+    /**
+     * 获取所有资源，不分页
+     * @return
+     * @param userType
+     */
+    List<ResourceEntity> findAll(int userType);
+}
\ No newline at end of file

portal-manager/src/main/java/com/mortals/xhx/base/system/resource/service/impl/ResourceServiceImpl.java

+/**
+* 文件：ResourceServiceImpl.java
+* 版本：1.0.0
+* 日期：
+* Copyright ® 
+* All right reserved.
+*/
+
+package com.mortals.xhx.base.system.resource.service.impl;
+
+import com.mortals.framework.exception.AppException;
+import com.mortals.framework.model.Context;
+import com.mortals.framework.service.ICacheService;
+import com.mortals.framework.service.impl.AbstractCRUDServiceImpl;
+import com.mortals.framework.util.DataUtil;
+import com.mortals.framework.util.StringUtils;
+import com.mortals.xhx.base.system.resource.dao.ResourceDao;
+import com.mortals.xhx.base.system.resource.model.ResourceEntity;
+import com.mortals.xhx.base.system.resource.model.ResourceQuery;
+import com.mortals.xhx.base.system.resource.service.ResourceService;
+import com.mortals.xhx.common.key.RedisKey;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.HashSet;
+import java.util.List;
+import java.util.Set;
+
+import static com.mortals.xhx.common.utils.MenuEncodeUtil.generateMenuUrlCode;
+
+/**
+ * <p>Title: 资源信息</p>
+ * <p>Description: ResourceServiceImpl service接口 </p>
+ * <p>Copyright: Copyright &reg;  </p>
+ * <p>Company: </p>
+ * @author 
+ * @version 1.0.0
+ */
+@Service("resourceService")
+public class ResourceServiceImpl extends AbstractCRUDServiceImpl<ResourceDao,ResourceEntity,Long> implements ResourceService {
+
+    @Autowired
+    private ICacheService cacheService;
+
+    @Override
+    public List<ResourceEntity> findAllEnable() throws AppException {
+        ResourceQuery params = new ResourceQuery();
+        return dao.getList(params);
+    }
+
+    @Override
+    public List<ResourceEntity> findListByUserId(Long userId) throws AppException {
+        return dao.getListByUserId(userId);
+    }
+
+    @Override
+    public String findUrlByUserId(Long userId) throws AppException {
+        Set<String> urls = this.findUrlSetByUserId(userId);
+        return StringUtils.converArray2Str(urls.toArray(new String[urls.size()]));
+    }
+
+    @Override
+    public Set<String> findUrlSetByUserId(Long userId) throws AppException {
+        Set<String> urls = new HashSet<>();
+        List<ResourceEntity> resList = this.findListByUserId(userId);
+        for (ResourceEntity res : resList) {
+            String url = res.getUrl();
+            if (StringUtils.isEmpty(url)) {
+                continue;
+            }
+            url = url.replaceAll("，", ",");
+            urls.addAll(StringUtils.converStr2Set(url));
+        }
+        return urls;
+    }
+
+    @Override
+    public List<ResourceEntity> findAll(int userType) {
+        return dao.getAll(userType);
+    }
+
+
+    @Override
+    protected void updateAfter(ResourceEntity entity, Context context) throws AppException {
+        updateUserMenuUrlCache();
+    }
+
+    @Override
+    protected void saveAfter(ResourceEntity entity, Context context) throws AppException {
+        updateUserMenuUrlCache();
+    }
+
+    private void updateUserMenuUrlCache() {
+        //更新用户菜单
+        Set<String> hkeys = cacheService.hkeys(RedisKey.KEY_USER_MENU_CACHE);
+        for (String userId : hkeys) {
+            Set<String> urls = this.findUrlSetByUserId(DataUtil.converStr2Long(userId,0L));
+            String menuUrlCode = generateMenuUrlCode(urls);
+            cacheService.hset(RedisKey.KEY_USER_MENU_CACHE, userId,menuUrlCode);
+        }
+    }
+}
\ No newline at end of file

portal-manager/src/main/java/com/mortals/xhx/base/system/resource/web/ResourceController.java

+package com.mortals.xhx.base.system.resource.web;
+
+
+import com.alibaba.fastjson.JSONObject;
+import com.mortals.framework.common.IBaseEnum;
+import com.mortals.framework.common.code.UserType;
+import com.mortals.framework.model.Context;
+import com.mortals.framework.web.BaseCRUDJsonBodyMappingController;
+import com.mortals.xhx.base.system.resource.model.ResourceEntity;
+import com.mortals.xhx.base.system.resource.service.ResourceService;
+import com.mortals.xhx.common.code.AuthType;
+import com.mortals.xhx.common.code.SourceType;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.HashMap;
+import java.util.Map;
+
+/**
+ * 资源信息
+ *
+ * @author: zxfei
+ * @date: 2022/5/7 15:27
+ */
+@Slf4j
+@RestController
+@RequestMapping("resource")
+public class ResourceController extends BaseCRUDJsonBodyMappingController<ResourceService,ResourceEntity,Long> {
+
+	public ResourceController(){
+		super.setModuleDesc("资源信息");
+	}
+
+	@Override
+	protected void init(Map<String, Object> model, Context context) {
+		Map<String, Object> statsus = new HashMap<String, Object>();
+		statsus.put("authType", AuthType.getEnumMap());
+		statsus.put("sourceType", SourceType.getEnumMap());
+		if (getCurUser().isAdmin()) {
+			statsus.put("userType",  IBaseEnum.getEnumMap(UserType.class));
+		} else {
+			statsus.put("userType", UserType.findByValue(getCurUser().getUserType()));
+		}
+		model.put(KEY_RESULT_DICT, statsus);
+	}
+
+	/**
+	 * 获取所有资源
+	 *
+	 * @return
+	 */
+	@PostMapping("allResources")
+	public String allResources(int userType) {
+		JSONObject ret = new JSONObject();
+		ret.put(KEY_RESULT_CODE, VALUE_RESULT_SUCCESS);
+		ret.put(KEY_RESULT_MSG, "所有的customer以及user");
+		ret.put(KEY_RESULT_DATA, service.findAll(userType));
+		return ret.toJSONString();
+	}
+	
+}
\ No newline at end of file

portal-manager/src/main/java/com/mortals/xhx/common/key/RedisKey.java

@@ -10,4 +10,9 @@ public class RedisKey {
      */
     public static final String KEY_MENU_CACHE = "iot:base:MenuCacheKey:";
 
+    public static final String KEY_USER_MENU_CACHE = "user:menu";
+
+
+    public static final String KEY_BURY_POINT_CACHE = "bury:point";
+
 }

portal-manager/src/main/java/com/mortals/xhx/common/utils/MenuEncodeUtil.java

+package com.mortals.xhx.common.utils;
+
+import com.mortals.framework.ap.GlobalSysInfo;
+import com.mortals.framework.ap.SysConstains;
+import com.mortals.framework.util.AESUtil;
+import lombok.extern.slf4j.Slf4j;
+
+import java.util.Set;
+
+@Slf4j
+public class MenuEncodeUtil {
+
+    public static String generateMenuUrlCode(Set<String> urls) {
+        try {
+            String securityKey = GlobalSysInfo.getPropertyValue(SysConstains.PROP_COOKIE_SECURITY_KEY);
+            StringBuilder sb = new StringBuilder();
+            if (urls != null && urls.size() > 0) {
+                for (String url : urls) {
+                    int index = url.hashCode() & (Integer.MAX_VALUE - 1);
+                    sb.append(index).append(",");
+                }
+            }
+            String menuUrl = sb.toString();
+            return AESUtil.encrypt(menuUrl, securityKey);
+        } catch (Throwable e) {
+            log.error("编码异常",e);
+            return null;
+        }
+    }
+}

portal-manager/src/main/java/com/mortals/xhx/daemon/applicationservice/ComsumerBurySaveService.java

+package com.mortals.xhx.daemon.applicationservice;
+
+import com.mortals.framework.service.ICacheService;
+import com.mortals.framework.springcloud.service.IApplicationStartedService;
+import com.mortals.xhx.module.page.model.pdu.BuryPointPdu;
+import com.mortals.xhx.module.page.service.PageAccessDepthService;
+import com.mortals.xhx.module.page.service.PageAccessService;
+import com.mortals.xhx.module.page.service.PageEventService;
+import com.mortals.xhx.module.page.service.PageRouteService;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+import org.springframework.util.ObjectUtils;
+
+import static com.mortals.xhx.common.key.RedisKey.KEY_BURY_POINT_CACHE;
+
+
+@Component
+@Slf4j
+public class ComsumerBurySaveService implements IApplicationStartedService {
+
+    protected Boolean stopped = false;
+    @Autowired
+    private ICacheService cacheService;
+
+    @Autowired
+    private PageAccessService pageAccessService;
+    @Autowired
+    private PageAccessDepthService pageAccessDepthService;
+    @Autowired
+    private PageEventService pageEventService;
+    @Autowired
+    private PageRouteService pageRouteService;
+
+    @Override
+    public void start() {
+        Thread sendThread = new Thread(new Runnable() {
+            @Override
+            public void run() {
+                int waitTime = 10;
+                while (!stopped) {
+                    try {
+                        BuryPointPdu pdu = cacheService.lpop(KEY_BURY_POINT_CACHE, BuryPointPdu.class);
+                        if(!ObjectUtils.isEmpty(pdu)){
+                            pageAccessService.saveByPdu(pdu);
+                            pageAccessDepthService.saveByPdu(pdu);
+                            pageEventService.saveByPdu(pdu);
+                            pageRouteService.saveByPdu(pdu);
+                        }
+
+                        try {
+                            Thread.sleep(waitTime);
+                        } catch (InterruptedException e2) {
+                        }
+
+                    } catch (Exception e) {
+                        log.error("异常", e);
+
+                        try {
+                            Thread.sleep(waitTime);
+                        } catch (InterruptedException e2) {
+                        }
+                    }
+                }
+            }
+        });
+
+        sendThread.start();
+    }
+
+    @Override
+    public void stop() {
+        log.info("停止服务..");
+        this.stopped = true;
+    }
+
+    @Override
+    public int getOrder() {
+        return 50;
+    }
+
+}

portal-manager/src/main/java/com/mortals/xhx/module/page/web/BuryPointController.java

@@ -4,6 +4,7 @@ import com.alibaba.fastjson.JSONObject;
 import com.mortals.framework.annotation.UnAuth;
 import com.mortals.framework.exception.AppException;
 import com.mortals.framework.model.Context;
+import com.mortals.framework.service.ICacheService;
 import com.mortals.framework.util.StringUtils;
 import com.mortals.framework.web.BaseJsonBodyController;
 import com.mortals.xhx.module.page.model.PageInfoEntity;
@@ -22,6 +23,8 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
+import static com.mortals.xhx.common.key.RedisKey.KEY_BURY_POINT_CACHE;
+
 /**
  * 页面埋点
  */
@@ -39,24 +42,26 @@ public class BuryPointController extends BaseJsonBodyController {
     private PageRouteService pageRouteService;
     @Autowired
     private PageInfoService pageInfoService;
+    @Autowired
+    private ICacheService cacheService;
 
     @PostMapping({"save"})
     @UnAuth
     public String save(@RequestBody BuryPointPdu pdu) {
         Map<String, Object> model = new HashMap();
-        Context context = this.getContext();
         int code = 1;
         String busiDesc = "保存页面数据埋点信息";
         try {
             validData(pdu);
-            pageAccessService.saveByPdu(pdu);
-            pageAccessDepthService.saveByPdu(pdu);
-            pageEventService.saveByPdu(pdu);
-            pageRouteService.saveByPdu(pdu);
+            cacheService.lpush(KEY_BURY_POINT_CACHE,pdu);
+//            pageAccessService.saveByPdu(pdu);
+//            pageAccessDepthService.saveByPdu(pdu);
+//            pageEventService.saveByPdu(pdu);
+//            pageRouteService.saveByPdu(pdu);
             model.put("message_info", busiDesc + "成功");
             this.recordSysLog(this.request, busiDesc + " 【成功】");
-        } catch (Exception var7) {
-            this.doException(this.request, busiDesc, model, var7);
+        } catch (Exception e) {
+            this.doException(this.request, busiDesc, model, e);
             code = -1;
         }
         model.put("entity", pdu);

portal-manager/src/main/resources/config/mybatis-sqlmap-config.xml

@@ -17,6 +17,8 @@
 			<property name="showSql" value="MySql" />
 		</plugin>
 		<plugin interceptor="com.mortals.framework.thirty.mybatis.LogInterceptor">
+			<property name="enableExecutorTime" value="true" />
+			<property name="showSql" value="false" />
 		</plugin>
 	</plugins>
 </configuration>
\ No newline at end of file