根据数据库修改实体类表

api-server/src/main/java/com/zq/api/config/FeignConfig.java

 package com.zq.api.config;
 
+import com.zq.common.constant.FeignHeader;
+import com.zq.common.constant.SystemName;
 import com.zq.common.http.HttpRequestUtils;
 import feign.RequestInterceptor;
 import feign.RequestTemplate;
@@ -11,6 +13,10 @@ import java.util.Arrays;
 import java.util.Enumeration;
 import java.util.List;
 
+/**
+ * @author wilmiam
+ * @since 2021-09-06 11:46
+ */
 @Configuration
 public class FeignConfig {
 
@@ -45,13 +51,14 @@ public class FeignConfig {
             @Override
             public void apply(RequestTemplate template) {
                 HttpServletRequest request = HttpRequestUtils.getRequest();
-                template.header("X-App-Token", request.getParameter("token"));
+                template.header(FeignHeader.FEIGN_HEADER_API_TOKEN, request.getParameter("token"));
+                template.header(FeignHeader.FEIGN_HEADER_SERVER_NAME, SystemName.API);
                 Enumeration<String> headerNames = request.getHeaderNames();
                 if (headerNames != null) {
                     while (headerNames.hasMoreElements()) {
                         String name = headerNames.nextElement();
                         // 跳过content-length
-                        if (name.equals("content-length")) {
+                        if ("content-length".equalsIgnoreCase(name)) {
                             continue;
                         }
                         if (HEADERS_TO_TRY.contains(name.toUpperCase())) {

api-server/src/main/java/com/zq/api/constant/ApiCodeEnum.java

@@ -2,6 +2,9 @@ package com.zq.api.constant;
 
 /**
  * API响应码
+ *
+ * @author wilmiam
+ * @since 2021-09-06 10:17
  */
 public enum ApiCodeEnum {
 
@@ -33,7 +36,7 @@ public enum ApiCodeEnum {
 
     ;
 
-    private String code;
+    private final String code;
     private String msg;
 
     ApiCodeEnum(String code, String msg) {

api-server/src/main/java/com/zq/api/form/ApiResp.java

@@ -3,6 +3,10 @@ package com.zq.api.form;
 import com.zq.api.constant.ApiCodeEnum;
 import lombok.Getter;
 
+/**
+ * @author wilmiam
+ * @since 2021-09-06 10:14
+ */
 @Getter
 public class ApiResp {
 

civil-common-utils/src/main/java/com/zq/common/config/base/UnifiedExceptionHandler.java

 package com.zq.common.config.base;
 
+import com.zq.common.constant.FeignHeader;
+import com.zq.common.constant.SystemName;
 import com.zq.common.exception.BusinessException;
 import com.zq.common.utils.ThrowableUtil;
 import com.zq.common.vo.ResultVo;
@@ -94,8 +96,9 @@ public class UnifiedExceptionHandler {
     @ExceptionHandler(DataAccessException.class)
     public ResultVo handleDataAccessException(DataAccessException ex, HttpServletRequest request) {
         log.error(">> 访问数据失败 " + request.getRequestURI(), ex);
+        String header = request.getHeader(FeignHeader.FEIGN_HEADER_SERVER_NAME);
         String error = "服务器繁忙";
-        if (request.getRequestURI().contains("/app/")) {
+        if (StringUtils.isNotBlank(header) && SystemName.API.equals(header)) {
             error = ThrowableUtil.getStackTrace(ex);
         }
         return ResultVo.fail(HttpStatus.INTERNAL_SERVER_ERROR.value(), error);
@@ -104,8 +107,9 @@ public class UnifiedExceptionHandler {
     @ExceptionHandler(value = Exception.class)
     public ResultVo defaultErrorHandler(Exception ex, HttpServletRequest request) {
         log.error(">> 服务器内部错误 " + request.getRequestURI(), ex);
+        String header = request.getHeader(FeignHeader.FEIGN_HEADER_SERVER_NAME);
         String error = "服务器繁忙";
-        if (request.getRequestURI().contains("/app/")) {
+        if (StringUtils.isNotBlank(header) && SystemName.API.equals(header)) {
             error = ThrowableUtil.getStackTrace(ex);
         }
         return ResultVo.fail(HttpStatus.INTERNAL_SERVER_ERROR.value(), error);

civil-common-utils/src/main/java/com/zq/common/constant/CloudConstant.java → civil-common-utils/src/main/java/com/zq/common/constant/CivilConstant.java

@@ -21,7 +21,7 @@ package com.zq.common.constant;
  * @author Zheng Jie
  * @date 2018-12-26
  */
-public class CloudConstant {
+public class CivilConstant {
 
     /**
      * 用于IP定位转换
@@ -44,4 +44,5 @@ public class CloudConstant {
         // IP归属地查询
         public static final String IP_URL = "http://whois.pconline.com.cn/ipJson.jsp?ip=%s&json=true";
     }
+
 }

civil-common-utils/src/main/java/com/zq/common/constant/DBName.java

 package com.zq.common.constant;
 
+/**
+ * @author wilmiam
+ * @since 2021-09-06 09:33
+ */
 public class DBName {
 
-    // mz_big_data
+    /**
+     * mz_big_data
+     */
     public final static String MASTER = "master";
 
-    // 殡葬
+    /**
+     * 殡葬
+     */
     public final static String GXBZ = "gxbz";
 
-    // 残疾
+    /**
+     * 残疾
+     */
     public final static String GXCJ = "gxcj";
 
-    // 低保
+    /**
+     * 低保
+     */
     public final static String GXDB = "gxdb";
 
-    // 婚姻
+    /**
+     * 婚姻
+     */
     public final static String GXHY = "gxhy";
 
-    // 社会组织
+    /**
+     * 社会组织
+     */
     public final static String GXSHZZ = "gxshzz";
 
-    // 儿童
+    /**
+     * 儿童
+     */
     public final static String GXET = "gxet";
 
-    // 养老
+    /**
+     * 养老
+     */
     public final static String GXYL = "gxyl";
 
-    // 社会救助
+    /**
+     * 社会救助
+     */
     public final static String GXSHJZ = "gxshjz";
 
-    // 资源目录管理
+    /**
+     * 资源目录管理
+     */
     public final static String RESOURCE = "resource";
 }

civil-common-utils/src/main/java/com/zq/common/constant/FeignHeader.java

+package com.zq.common.constant;
+
+/**
+ * feign要添加的请求头
+ *
+ * @author wilmiam
+ * @since 2021/9/6 9:43
+ */
+public class FeignHeader {
+
+    /**
+     * feign添加服务名的请求头字段
+     */
+    public static final String FEIGN_HEADER_SERVER_NAME = "X-Server-Name";
+
+    /**
+     * feign添加api-token的请求头字段
+     */
+    public static final String FEIGN_HEADER_API_TOKEN = "X-Api-Token";
+}

civil-common-utils/src/main/java/com/zq/common/constant/SystemName.java

 package com.zq.common.constant;
 
+/**
+ * @author wilmiam
+ * @since 2021-09-06 09:16
+ */
 public class SystemName {
 
     public static final String SYS = "sys";
 
     public static final String PORTAL = "portal";
 
+    public static final String API = "api";
+
 }

civil-common-utils/src/main/java/com/zq/common/http/HttpRequestUtils.java

@@ -4,7 +4,7 @@ import cn.hutool.http.HttpUtil;
 import cn.hutool.json.JSONUtil;
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
-import com.zq.common.constant.CloudConstant;
+import com.zq.common.constant.CivilConstant;
 import eu.bitwalker.useragentutils.Browser;
 import eu.bitwalker.useragentutils.UserAgent;
 import org.apache.commons.lang3.StringUtils;
@@ -245,7 +245,7 @@ public class HttpRequestUtils {
      * 根据ip获取详细地址
      */
     public static String getHttpCityInfo(String ip) {
-        String api = String.format(CloudConstant.Url.IP_URL, ip);
+        String api = String.format(CivilConstant.Url.IP_URL, ip);
         cn.hutool.json.JSONObject object = JSONUtil.parseObj(HttpUtil.get(api));
         return object.get("addr", String.class);
     }

portal-server/src/main/java/com/zq/portal/config/TokenFilter.java

@@ -21,11 +21,11 @@ import com.zq.common.config.security.SecurityProperties;
 import com.zq.common.context.ContextUtils;
 import com.zq.common.vo.OnlineUserDto;
 import io.jsonwebtoken.ExpiredJwtException;
+import org.apache.commons.lang3.StringUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.security.core.Authentication;
 import org.springframework.security.core.context.SecurityContextHolder;
-import org.springframework.util.StringUtils;
 import org.springframework.web.filter.GenericFilterBean;
 
 import javax.servlet.FilterChain;
@@ -77,7 +77,7 @@ public class TokenFilter extends GenericFilterBean {
                     // userCacheClean.cleanUserCache(String.valueOf(tokenProvider.getClaims(token).get(TokenProvider.AUTHORITIES_KEY)));
                 }
             }
-            if (onlineUserDto != null && StringUtils.hasText(token)) {
+            if (onlineUserDto != null && StringUtils.isNotBlank(token)) {
                 Authentication authentication = tokenProvider.getAuthentication(token);
                 SecurityContextHolder.getContext().setAuthentication(authentication);
                 // Token 续期
@@ -98,11 +98,14 @@ public class TokenFilter extends GenericFilterBean {
      */
     private String resolveToken(HttpServletRequest request) {
         String bearerToken = request.getHeader(properties.getHeader());
-        if (StringUtils.hasText(bearerToken) && bearerToken.startsWith(properties.getTokenStartWith())) {
+        if (StringUtils.isBlank(bearerToken)) {
+            return null;
+        }
+        if (bearerToken.startsWith(properties.getTokenStartWith())) {
             // 去掉令牌前缀
             return bearerToken.replace(properties.getTokenStartWith(), "");
         } else {
-            log.debug("非法Token：{}, {}", request.getRequestURL(), bearerToken);
+            log.debug("非法Token：{}", bearerToken);
         }
         return null;
     }

resource-server/src/main/java/com/zq/resource/config/TokenFilter.java

@@ -21,11 +21,11 @@ import com.zq.common.config.security.SecurityProperties;
 import com.zq.common.context.ContextUtils;
 import com.zq.common.vo.OnlineUserDto;
 import io.jsonwebtoken.ExpiredJwtException;
+import org.apache.commons.lang3.StringUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.security.core.Authentication;
 import org.springframework.security.core.context.SecurityContextHolder;
-import org.springframework.util.StringUtils;
 import org.springframework.web.filter.GenericFilterBean;
 
 import javax.servlet.FilterChain;
@@ -77,7 +77,7 @@ public class TokenFilter extends GenericFilterBean {
                     // userCacheClean.cleanUserCache(String.valueOf(tokenProvider.getClaims(token).get(TokenProvider.AUTHORITIES_KEY)));
                 }
             }
-            if (onlineUserDto != null && StringUtils.hasText(token)) {
+            if (onlineUserDto != null && StringUtils.isNotBlank(token)) {
                 Authentication authentication = tokenProvider.getAuthentication(token);
                 SecurityContextHolder.getContext().setAuthentication(authentication);
                 // Token 续期
@@ -98,7 +98,10 @@ public class TokenFilter extends GenericFilterBean {
      */
     private String resolveToken(HttpServletRequest request) {
         String bearerToken = request.getHeader(properties.getHeader());
-        if (StringUtils.hasText(bearerToken) && bearerToken.startsWith(properties.getTokenStartWith())) {
+        if (StringUtils.isBlank(bearerToken)) {
+            return null;
+        }
+        if (bearerToken.startsWith(properties.getTokenStartWith())) {
             // 去掉令牌前缀
             return bearerToken.replace(properties.getTokenStartWith(), "");
         } else {

resource-server/src/main/java/com/zq/resource/constant/ShareApiEnum.java

@@ -7,13 +7,172 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
+/**
+ * @author wilmiam
+ * @since 2021-09-01 16:45
+ */
 @Getter
 public enum ShareApiEnum {
 
     /**
      * 机构注册
      */
-    DEPT_REGISTERED("/basic/organ/adminRegister", "机构注册"),
+    ORGAN_REGISTER("/basic/organ/adminRegister", "机构注册"),
+
+    /**
+     * 应用系统注册接口
+     */
+    APP_REGISTER("/basic/app/register", "应用系统注册接口"),
+
+    /**
+     * 应用系统注册接口
+     */
+    APP_MODIFY("/basic/app/modify", "应用系统修改接口"),
+
+    /**
+     * 目录分类注册接口
+     */
+    CATALOG_GROUP_REGISTER("/basic/catalogcategory/register", "目录分类注册接口"),
+
+    /**
+     * 目录分类变更接口
+     */
+    CATALOG_GROUP_MODIFY("/basic/catalogcategory/modify", "目录分类变更接口"),
+
+    /**
+     * 目录分类撤销接口
+     */
+    CATALOG_GROUP_CANCEL("/basic/catalogcategory/cancel", "目录分类撤销接口"),
+
+    /**
+     * 目录注册接口
+     */
+    CATALOG_REGISTER("/basic/catalog/register", "目录注册接口"),
+
+    /**
+     * 目录变更接口
+     */
+    CATALOG_MODIFY("/basic/catalog/modify", "目录变更接口"),
+
+    /**
+     * 目录撤销接口
+     */
+    CATALOG_CANCEL("/basic/catalog/cancel", "目录撤销接口"),
+
+    /**
+     * 库表资源注册接口
+     */
+    TABLE_REGISTER("/basic/table/register", "库表资源注册接口"),
+
+    /**
+     * 库表资源撤销接口
+     */
+    TABLE_CANCEL("/basic/table/cancel", "库表资源撤销接口"),
+
+    /**
+     * 文件资源注册接口
+     */
+    FILE_REGISTER("/basic/file/register", "文件资源注册接口"),
+
+    /**
+     * 文件资源撤销接口
+     */
+    FILE_CANCEL("/basic/file/cancel", "文件资源撤销接口"),
+
+    /**
+     * 接口资源注册接口
+     */
+    SERVICE_REGISTER("/basic/service/register", "接口资源注册接口"),
+
+    /**
+     * 接口资源撤销接口
+     */
+    SERVICE_CANCEL("/basic/service/cancel", "接口资源撤销接口"),
+
+    /**
+     * 接口资源说明附件上传接口
+     */
+    FILE_UPLOAD("basic/apply/fileupload", "接口资源说明附件上传接口"),
+
+    /**
+     * 接口资源说明附件下载接口
+     */
+    FILE_DOWNLOAD("/basic/apply/filedowload", "接口资源说明附件下载接口"),
+
+    /**
+     * 代码主项注册或修改接口
+     */
+    CODE_MAIN_SAVE_UPDATE("/basic/code/saveOrUpdateCodeMain", "代码主项注册或修改接口"),
+
+    /**
+     * 代码主项删除接口
+     */
+    CODE_MAIN_DELETE("/basic/code/deleteCodeMain", "代码主项删除接口"),
+
+    /**
+     * 代码子项注册或修改接口
+     */
+    CODE_ITEM_SAVE_UPDATE("/basic/code/saveOrUpdateCodeItem", "代码子项注册或修改接口"),
+
+    /**
+     * 代码子项删除接口
+     */
+    CODE_ITEM_DELETE("/basic/code/deleteCodeItem", "代码子项删除接口"),
+
+    /**
+     * 数据元所属领域注册修改接口
+     */
+    STANDARD_CATEGORY_ADD("/basic/standardcategory/add", "数据元所属领域注册修改接口"),
+
+    /**
+     * 数据元所属领域撤销接口
+     */
+    STANDARD_CATEGORY_DELETE("/basic/standardcategory/delete", "数据元所属领域撤销接口"),
+
+    /**
+     * 数据元注册修改接口
+     */
+    STANDARD_ADD("/basic/dataStandard/add", "数据元注册修改接口"),
+
+    /**
+     * 数据元撤销接口
+     */
+    STANDARD_DELETE("/basic/standardDataStandard/delete", "数据元撤销接口"),
+
+    /**
+     * 映射元数据注册接口
+     */
+    STANDARD_FILE_ADD("/basic/Standardfile/add", "映射元数据注册接口"),
+
+    /**
+     * 映射元数据撤销接口
+     */
+    STANDARD_FILE_DELETE("/basic/Standardfile/delete", "映射元数据撤销接口"),
+
+    /**
+     * 平台运行监控接口
+     */
+    DATA_MONITOR_ADD("/basic/datamonitor/add", "平台运行监控接口"),
+
+    /**
+     * 处室职责注册或修改接口
+     */
+    DUTIES_ADD_UPDATE("/basic/qzsxqd/addOrUpdateDuties", "处室职责注册或修改接口"),
+
+    /**
+     * 处室职责删除接口
+     */
+    DUTIES_DELETE("/basic/qzsxqd/deleteDuties", "处室职责删除接口"),
+
+    /**
+     * 职责办事项注册或修改接口
+     */
+    RESPONSIBILITY_ADD_UPDATE("/basic/qzsxqd/addOrUpdateResponsibility", "职责办事项注册或修改接口"),
+
+    /**
+     * 职责办事项删除接口
+     */
+    RESPONSIBILITY_DELETE("/basic/qzsxqd/deleteResponsibility", "职责办事项删除接口"),
 
     ;
 

resource-server/src/main/java/com/zq/resource/controller/admin/AreaController.java

@@ -18,7 +18,7 @@ import java.util.List;
 @Api(tags = "区域相关接口")
 @RequiredArgsConstructor
 @RestController
-@RequestMapping(value = "/resource/admin/area")
+@RequestMapping(value = "/resource/area")
 public class AreaController {
 
     private final AreaService areaService;

resource-server/src/main/java/com/zq/resource/controller/admin/CategoryController.java

@@ -20,7 +20,7 @@ import org.springframework.web.bind.annotation.*;
 @Api(tags = "资源目录相关接口")
 @RequiredArgsConstructor
 @RestController
-@RequestMapping(value = "/resource/admin/category")
+@RequestMapping(value = "/resource/category")
 public class CategoryController {
 
     private final CategoryService categoryService;
@@ -41,6 +41,20 @@ public class CategoryController {
     @ApiOperation("添加目录")
     @PostMapping(value = "/addCategory")
     public ResultVo addCategory(@RequestBody DataCategory vo) {
+        AssertUtils.hasText(vo.getGroupId(), "缺少分组ID");
+        AssertUtils.hasText(vo.getCataTitle(), "缺少目录名称");
+        AssertUtils.hasText(vo.getDeptId(), "缺少目录提供部门ID");
+        AssertUtils.hasText(vo.getResourceFormat(), "缺少息资源格式分类");
+        AssertUtils.notNull(vo.getPublishedTime(), "缺少发布时间");
+        AssertUtils.notNull(vo.getSharedType(), "缺少共享类型");
+        AssertUtils.hasText(vo.getSharedCondition(), "缺少共享条件");
+        AssertUtils.hasText(vo.getSharedWay(), "缺少共享方式");
+        AssertUtils.notNull(vo.getOpenType(), "缺少开放类型");
+        AssertUtils.hasText(vo.getUpdateCycle(), "缺少更新周期");
+        AssertUtils.hasText(vo.getBelongField(), "缺少所属领域");
+        AssertUtils.hasText(vo.getHierarchyValue(), "缺少层级属性");
+        AssertUtils.hasText(vo.getOpenField(), "缺少开放领域");
+        AssertUtils.hasText(vo.getIsPublishBasicInfo(), "缺少可发布目录");
 
         categoryService.addCategory(vo);
         return ResultVo.success();

resource-server/src/main/java/com/zq/resource/controller/admin/CategoryGroupController.java

+package com.zq.resource.controller.admin;
+
+import cn.hutool.core.collection.CollUtil;
+import com.zq.common.utils.AssertUtils;
+import com.zq.common.vo.IdVo;
+import com.zq.common.vo.PageVo;
+import com.zq.common.vo.ResultVo;
+import com.zq.resource.entity.DataCategoryGroup;
+import com.zq.resource.service.CategoryService;
+import com.zq.resource.vo.DataCategoryGroupFindVo;
+import com.zq.resource.vo.DataCategoryGroupVo;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.RequiredArgsConstructor;
+import org.springframework.web.bind.annotation.*;
+
+/**
+ * @author wilmiam
+ * @since 2021/8/19 14:33
+ */
+@Api(tags = "资源目录分组相关接口")
+@RequiredArgsConstructor
+@RestController
+@RequestMapping(value = "/resource/category/group")
+public class CategoryGroupController {
+
+    private final CategoryService categoryService;
+
+    @ApiOperation("获取目录分组列表")
+    @PostMapping(value = "/getCategoryGroupList")
+    public ResultVo<PageVo<DataCategoryGroup>> getCategoryGroupList(@RequestBody DataCategoryGroupFindVo vo) {
+        return ResultVo.success(categoryService.getCategoryGroupList(vo));
+    }
+
+    @ApiOperation("获取目录信息")
+    @PostMapping(value = "/getCategoryGroupInfo/{categoryGroupId}")
+    public ResultVo<DataCategoryGroupVo> getCategoryGroupInfo(@PathVariable String categoryGroupId) {
+        AssertUtils.hasText(categoryGroupId, "ID不能为空");
+        return ResultVo.success(categoryService.getCategoryGroupInfo(categoryGroupId));
+    }
+
+    @ApiOperation("添加目录")
+    @PostMapping(value = "/addCategoryGroup")
+    public ResultVo addCategoryGroup(@RequestBody DataCategoryGroup vo) {
+        AssertUtils.hasText(vo.getGroupName(), "缺少目录分组名称");
+        AssertUtils.hasText(vo.getCreditCode(), "缺少社会信用代码");
+
+        categoryService.addCategoryGroupGroup(vo);
+        return ResultVo.success();
+    }
+
+    @ApiOperation("修改目录")
+    @PostMapping(value = "/modifyCategoryGroup")
+    public ResultVo modifyCategoryGroup(@RequestBody DataCategoryGroup vo) {
+        AssertUtils.hasText(vo.getId());
+
+        categoryService.modifyCategoryGroup(vo);
+        return ResultVo.success();
+    }
+
+    @ApiOperation("注册目录")
+    @PostMapping(value = "/registerCategoryGroup")
+    public ResultVo registerCategory(@RequestBody IdVo vo) {
+        AssertUtils.isTrue(CollUtil.isNotEmpty(vo.getIds()), "至少选择一项");
+
+        categoryService.registerCategoryGroup(vo.getIds());
+        return ResultVo.success();
+    }
+
+}

resource-server/src/main/java/com/zq/resource/controller/admin/DeptController.java

@@ -21,7 +21,7 @@ import java.util.List;
 @Api(tags = "机构部门相关接口")
 @RequiredArgsConstructor
 @RestController
-@RequestMapping(value = "/resource/admin/dept")
+@RequestMapping(value = "/resource/dept")
 public class DeptController {
 
     private final DeptService deptService;

resource-server/src/main/java/com/zq/resource/controller/admin/DictController.java

@@ -21,7 +21,7 @@ import org.springframework.web.bind.annotation.RestController;
 @Api(tags = "数据字典相关接口")
 @RequiredArgsConstructor
 @RestController
-@RequestMapping(value = "/resource/admin/dict")
+@RequestMapping(value = "/resource/dict")
 public class DictController {
 
     private final DictService dictService;

resource-server/src/main/java/com/zq/resource/controller/admin/SystemController.java

@@ -21,7 +21,7 @@ import org.springframework.web.bind.annotation.RestController;
 @Api(tags = "系统资源相关接口")
 @RequiredArgsConstructor
 @RestController
-@RequestMapping(value = "/resource/admin/system")
+@RequestMapping(value = "/resource/system")
 public class SystemController {
 
     private final SystemInfoService systemInfoService;

resource-server/src/main/java/com/zq/resource/entity/CategoryInterface.java

@@ -25,9 +25,9 @@ import java.util.Date;
 public class CategoryInterface {
 
     /**
-     * 自增
+     * ID
      */
-    @ApiModelProperty("自增")
+    @ApiModelProperty("ID")
     @TableId(type = IdType.ASSIGN_UUID)
     private String id;
 

resource-server/src/main/java/com/zq/resource/entity/CategoryInterfaceAttach.java

@@ -25,9 +25,9 @@ import java.util.Date;
 public class CategoryInterfaceAttach {
 
     /**
-     * 自增
+     * ID
      */
-    @ApiModelProperty("自增")
+    @ApiModelProperty("ID")
     @TableId(type = IdType.ASSIGN_UUID)
     private String id;
 

resource-server/src/main/java/com/zq/resource/entity/CodeItem.java

@@ -25,9 +25,9 @@ import java.util.Date;
 public class CodeItem {
 
     /**
-     * 自增id
+     * ID
      */
-    @ApiModelProperty("自增id")
+    @ApiModelProperty("ID")
     @TableId(type = IdType.ASSIGN_UUID)
     private String id;
 

resource-server/src/main/java/com/zq/resource/entity/DataCategory.java

@@ -25,9 +25,9 @@ import java.util.Date;
 public class DataCategory {
 
     /**
-     * 自增
+     * ID
      */
-    @ApiModelProperty("自增")
+    @ApiModelProperty("ID")
     @TableId(type = IdType.ASSIGN_UUID)
     private String id;
 

resource-server/src/main/java/com/zq/resource/entity/DataCategoryGroup.java

@@ -31,12 +31,6 @@ public class DataCategoryGroup {
     private String id;
 
     /**
-     * 目录分类编码
-     */
-    @ApiModelProperty("目录分类编码")
-    private String groupId;
-
-    /**
      * 目录分类名称
      */
     @ApiModelProperty("目录分类名称")

resource-server/src/main/java/com/zq/resource/entity/DataDict.java

@@ -26,9 +26,9 @@ import java.util.Date;
 public class DataDict {
 
     /**
-     * 自增
+     * ID
      */
-    @ApiModelProperty("自增")
+    @ApiModelProperty("ID")
     @TableId(type = IdType.ASSIGN_UUID)
     private String id;
 

resource-server/src/main/java/com/zq/resource/entity/OrgDept.java

@@ -25,9 +25,9 @@ import java.util.Date;
 public class OrgDept {
 
     /**
-     * 自增
+     * ID
      */
-    @ApiModelProperty("自增")
+    @ApiModelProperty("ID")
     @TableId(type = IdType.ASSIGN_UUID)
     private String id;
 

resource-server/src/main/java/com/zq/resource/entity/StandardData.java

@@ -25,9 +25,9 @@ import java.util.Date;
 public class StandardData {
 
     /**
-     * 自增id
+     * ID
      */
-    @ApiModelProperty("自增id")
+    @ApiModelProperty("ID")
     @TableId(type = IdType.ASSIGN_UUID)
     private String id;
 

resource-server/src/main/java/com/zq/resource/entity/StandardDataMapping.java

@@ -25,9 +25,9 @@ import java.util.Date;
 public class StandardDataMapping {
 
     /**
-     * 自增id
+     * ID
      */
-    @ApiModelProperty("自增id")
+    @ApiModelProperty("ID")
     @TableId(type = IdType.ASSIGN_UUID)
     private String id;
 

resource-server/src/main/java/com/zq/resource/entity/SystemInfo.java

@@ -25,9 +25,9 @@ import java.util.Date;
 public class SystemInfo {
 
     /**
-     * 自增
+     * ID
      */
-    @ApiModelProperty("自增")
+    @ApiModelProperty("ID")
     @TableId(type = IdType.ASSIGN_UUID)
     private String id;
 

resource-server/src/main/java/com/zq/resource/service/CategoryService.java

 package com.zq.resource.service;
 
+import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.date.DateUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.baomidou.mybatisplus.core.toolkit.StringUtils;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.zq.common.utils.AssertUtils;
 import com.zq.common.utils.PagingUtils;
 import com.zq.common.vo.PageVo;
 import com.zq.resource.constant.ShareStatusEnum;
 import com.zq.resource.dao.DataCategoryDao;
+import com.zq.resource.dao.DataCategoryGroupDao;
 import com.zq.resource.entity.DataCategory;
+import com.zq.resource.entity.DataCategoryGroup;
 import com.zq.resource.vo.DataCategoryFindVo;
+import com.zq.resource.vo.DataCategoryGroupFindVo;
+import com.zq.resource.vo.DataCategoryGroupVo;
 import lombok.RequiredArgsConstructor;
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.stereotype.Service;
 
 import java.util.HashMap;
@@ -27,6 +32,7 @@ import java.util.Set;
 public class CategoryService {
 
     private final DataCategoryDao dataCategoryDao;
+    private final DataCategoryGroupDao dataCategoryGroupDao;
 
     public PageVo<DataCategory> getCategoryList(DataCategoryFindVo vo) {
         LambdaQueryWrapper<DataCategory> lambdaQuery = Wrappers.lambdaQuery(DataCategory.class);
@@ -51,6 +57,24 @@ public class CategoryService {
         DataCategory dataCategory = dataCategoryDao.selectById(vo.getId());
         AssertUtils.notNull(dataCategory, "无此目录");
 
+        dataCategory.setGroupId(vo.getGroupId());
+        dataCategory.setCataTitle(vo.getCataTitle());
+        dataCategory.setDeptId(vo.getDeptId());
+        dataCategory.setDescription(vo.getDescription());
+        dataCategory.setResourceFormat(vo.getResourceFormat());
+        dataCategory.setPublishedTime(vo.getPublishedTime());
+        dataCategory.setSharedType(vo.getSharedType());
+        dataCategory.setSharedCondition(vo.getSharedCondition());
+        dataCategory.setSharedWay(vo.getSharedWay());
+        dataCategory.setOpenType(vo.getOpenType());
+        dataCategory.setUpdateCycle(vo.getUpdateCycle());
+        dataCategory.setBelongField(vo.getBelongField());
+        dataCategory.setOpenCondition(vo.getSharedCondition());
+        dataCategory.setUseDemand(vo.getUseDemand());
+        dataCategory.setHierarchyValue(vo.getHierarchyValue());
+        dataCategory.setAttach(vo.getAttach());
+        dataCategory.setOpenField(vo.getOpenField());
+        dataCategory.setIsPublishBasicInfo(vo.getIsPublishBasicInfo());
         dataCategory.setUpdateTime(DateUtil.date());
 
         dataCategoryDao.updateById(dataCategory);
@@ -91,4 +115,73 @@ public class CategoryService {
     public DataCategory getCategoryInfo(String categoryId) {
         return dataCategoryDao.selectById(categoryId);
     }
+
+    public void addCategoryGroupGroup(DataCategoryGroup vo) {
+        if (vo.getOrderNum() == null) {
+            vo.setOrderNum(0);
+        }
+        vo.setCreateTime(DateUtil.date());
+        vo.setUpdateTime(DateUtil.date());
+
+        dataCategoryGroupDao.insert(vo);
+    }
+
+    public void modifyCategoryGroup(DataCategoryGroup vo) {
+        DataCategoryGroup dataCategoryGroup = dataCategoryGroupDao.selectById(vo.getId());
+        AssertUtils.notNull(dataCategoryGroup, "无此目录分类");
+
+        dataCategoryGroup.setGroupName(vo.getGroupName());
+        dataCategoryGroup.setCreditCode(vo.getCreditCode());
+        dataCategoryGroup.setRemark(vo.getRemark());
+        dataCategoryGroup.setOrderNum(vo.getOrderNum());
+        dataCategoryGroup.setUpdateTime(DateUtil.date());
+
+        dataCategoryGroupDao.updateById(dataCategoryGroup);
+    }
+
+    public DataCategoryGroupVo getCategoryGroupInfo(String categoryGroupId) {
+        DataCategoryGroup dataCategoryGroup = dataCategoryGroupDao.selectById(categoryGroupId);
+
+        DataCategoryGroupVo dataCategoryGroupVo = BeanUtil.copyProperties(dataCategoryGroup, DataCategoryGroupVo.class);
+        if (StringUtils.isNotBlank(dataCategoryGroup.getParentId())) {
+            DataCategoryGroup parentCategoryGroup = dataCategoryGroupDao.selectById(dataCategoryGroup.getParentId());
+            dataCategoryGroupVo.setParentName(parentCategoryGroup.getGroupName());
+        }
+
+        return dataCategoryGroupVo;
+    }
+
+    public PageVo<DataCategoryGroup> getCategoryGroupList(DataCategoryGroupFindVo vo) {
+        LambdaQueryWrapper<DataCategoryGroup> lambdaQuery = Wrappers.lambdaQuery(DataCategoryGroup.class);
+
+        if (StringUtils.isNotBlank(vo.getGroupName())) {
+            lambdaQuery.like(DataCategoryGroup::getGroupName, vo.getGroupName());
+            vo.setGroupName(null);
+        }
+        if (StringUtils.isNotBlank(vo.getCreditCode())) {
+            lambdaQuery.like(DataCategoryGroup::getCreditCode, vo.getCreditCode());
+            vo.setCreditCode(null);
+        }
+        if (StringUtils.isNotBlank(vo.getRemark())) {
+            lambdaQuery.like(DataCategoryGroup::getRemark, vo.getRemark());
+            vo.setRemark(null);
+        }
+
+        return PagingUtils.paging(vo, dataCategoryGroupDao, DataCategoryGroup.class, lambdaQuery);
+    }
+
+    public void registerCategoryGroup(Set<String> ids) {
+        for (String id : ids) {
+            DataCategoryGroup dataCategoryGroup = dataCategoryGroupDao.selectById(id);
+            if (dataCategoryGroup != null) {
+                Map<String, Object> params = new HashMap<>(6);
+                params.put("group_id", dataCategoryGroup.getId());
+                params.put("group_name", dataCategoryGroup.getGroupName());
+                params.put("parent_id", dataCategoryGroup.getParentId());
+                params.put("credit_code", dataCategoryGroup.getCreditCode());
+                params.put("remark", dataCategoryGroup.getRemark());
+                params.put("order_num", dataCategoryGroup.getOrderNum());
+            }
+        }
+    }
 }

resource-server/src/main/java/com/zq/resource/vo/DataCategoryFindVo.java

@@ -22,9 +22,9 @@ import java.util.Date;
 public class DataCategoryFindVo extends PageReqVo {
 
     /**
-     * 自增
+     * ID
      */
-    @ApiModelProperty("自增")
+    @ApiModelProperty("ID")
     private String id;
 
     /**

resource-server/src/main/java/com/zq/resource/vo/DataCategoryGroupFindVo.java

+package com.zq.resource.vo;
+
+import com.zq.common.vo.PageReqVo;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.util.Date;
+
+/**
+ * 资源目录分类(DataCategoryGroup)实体类
+ *
+ * @author makejava
+ * @since 2021-08-31 15:23:39
+ */
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+@Builder
+public class DataCategoryGroupFindVo extends PageReqVo {
+
+    /**
+     * id
+     */
+    private String id;
+
+    /**
+     * 目录分类编码
+     */
+    @ApiModelProperty("目录分类编码")
+    private String groupId;
+
+    /**
+     * 目录分类名称
+     */
+    @ApiModelProperty("目录分类名称")
+    private String groupName;
+
+    /**
+     * 父目录分类编码
+     */
+    @ApiModelProperty("父目录分类编码")
+    private String parentId;
+
+    /**
+     * 目录分类授权部门的社会信用代码
+     */
+    @ApiModelProperty("目录分类授权部门的社会信用代码")
+    private String creditCode;
+
+    /**
+     * 目录分类描述
+     */
+    @ApiModelProperty("目录分类描述")
+    private String remark;
+
+    /**
+     * 目录分类排序编号
+     */
+    @ApiModelProperty("目录分类排序编号")
+    private Integer orderNum;
+
+    /**
+     * 创建时间
+     */
+    @ApiModelProperty("创建时间")
+    private Date createTime;
+
+    /**
+     * 更新时间
+     */
+    @ApiModelProperty("更新时间")
+    private Date updateTime;
+
+}
\ No newline at end of file

resource-server/src/main/java/com/zq/resource/vo/DataCategoryGroupVo.java

+package com.zq.resource.vo;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.util.Date;
+
+/**
+ * 资源目录分类(DataCategoryGroup)实体类
+ *
+ * @author makejava
+ * @since 2021-08-31 15:23:39
+ */
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+@Builder
+public class DataCategoryGroupVo {
+
+    /**
+     * id
+     */
+    private String id;
+
+    /**
+     * 目录分类编码
+     */
+    @ApiModelProperty("目录分类编码")
+    private String groupId;
+
+    /**
+     * 目录分类名称
+     */
+    @ApiModelProperty("目录分类名称")
+    private String groupName;
+
+    /**
+     * 父目录分类编码
+     */
+    @ApiModelProperty("父目录分类编码")
+    private String parentId;
+
+    @ApiModelProperty("父目录分类名称")
+    private String parentName;
+
+    /**
+     * 目录分类授权部门的社会信用代码
+     */
+    @ApiModelProperty("目录分类授权部门的社会信用代码")
+    private String creditCode;
+
+    /**
+     * 目录分类描述
+     */
+    @ApiModelProperty("目录分类描述")
+    private String remark;
+
+    /**
+     * 目录分类排序编号
+     */
+    @ApiModelProperty("目录分类排序编号")
+    private Integer orderNum;
+
+    /**
+     * 创建时间
+     */
+    @ApiModelProperty("创建时间")
+    private Date createTime;
+
+    /**
+     * 更新时间
+     */
+    @ApiModelProperty("更新时间")
+    private Date updateTime;
+
+}
\ No newline at end of file

resource-server/src/main/java/com/zq/resource/vo/DataDictFindVo.java

@@ -23,9 +23,9 @@ import java.util.Date;
 public class DataDictFindVo extends PageReqVo {
 
     /**
-     * 自增
+     * ID
      */
-    @ApiModelProperty("自增")
+    @ApiModelProperty("ID")
     private String id;
 
     /**

resource-server/src/main/java/com/zq/resource/vo/OrgDeptFindVo.java

@@ -22,9 +22,9 @@ import java.util.Date;
 public class OrgDeptFindVo extends PageReqVo {
 
     /**
-     * 自增
+     * ID
      */
-    @ApiModelProperty("自增")
+    @ApiModelProperty("ID")
     private String id;
 
     /**

resource-server/src/main/java/com/zq/resource/vo/OrgDeptVo.java

@@ -21,9 +21,9 @@ import java.util.Date;
 public class OrgDeptVo {
 
     /**
-     * 自增
+     * ID
      */
-    @ApiModelProperty("自增")
+    @ApiModelProperty("ID")
     private String id;
 
     /**

resource-server/src/main/java/com/zq/resource/vo/ShareApiResponse.java

 package com.zq.resource.vo;
 
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONArray;
+import com.alibaba.fastjson.JSONObject;
 import lombok.Data;
+import lombok.extern.slf4j.Slf4j;
 
-import java.util.Map;
-
+/**
+ * @author wilmiam
+ * @since 2021-09-04 09:38
+ */
+@Slf4j
 @Data
 public class ShareApiResponse {
 
     private String code;
 
-    private Map<String, Object> data;
+    private String data;
 
     private String message;
 
@@ -22,13 +29,35 @@ public class ShareApiResponse {
     }
 
     public String getString(String key) {
-        Object obj = data.get(key);
-        return obj == null ? "" : obj.toString();
+        JSONObject object = getJSONObject();
+        return object.getString(key);
     }
 
     public Integer getInteger(String key) {
-        Object obj = data.get(key);
-        return obj == null ? null : Integer.parseInt(obj.toString());
+        JSONObject object = getJSONObject();
+        return object.getInteger(key);
+    }
+
+    public JSONArray getJSONArray() {
+        JSONArray jsonArray = null;
+        try {
+            jsonArray = JSON.parseArray(data);
+        } catch (Exception e) {
+            log.error("解析响应数据DATA失败: {}", e.getMessage());
+            log.error("DATA数据: {}", data);
+        }
+        return jsonArray == null ? new JSONArray() : jsonArray;
+    }
+
+    public JSONObject getJSONObject() {
+        JSONObject jsonObject = null;
+        try {
+            jsonObject = JSON.parseObject(data);
+        } catch (Exception e) {
+            log.error("解析响应数据DATA失败: {}", e.getMessage());
+            log.error("DATA数据: {}", data);
+        }
+        return jsonObject == null ? new JSONObject() : jsonObject;
     }
 
 }

resource-server/src/main/java/com/zq/resource/vo/SystemInfoFindVo.java

@@ -22,9 +22,9 @@ import java.util.Date;
 public class SystemInfoFindVo extends PageReqVo {
 
     /**
-     * 自增
+     * ID
      */
-    @ApiModelProperty("自增")
+    @ApiModelProperty("ID")
     private String id;
 
     /**

sys-server/src/main/java/com/zq/system/config/FileProperties.java

@@ -15,7 +15,7 @@
  */
 package com.zq.system.config;
 
-import com.zq.common.constant.CloudConstant;
+import com.zq.common.constant.CivilConstant;
 import lombok.Data;
 import org.springframework.boot.context.properties.ConfigurationProperties;
 import org.springframework.context.annotation.Configuration;
@@ -46,9 +46,9 @@ public class FileProperties {
 
     public ElPath getPath() {
         String os = System.getProperty("os.name");
-        if (os.toLowerCase().startsWith(CloudConstant.WIN)) {
+        if (os.toLowerCase().startsWith(CivilConstant.WIN)) {
             return windows;
-        } else if (os.toLowerCase().startsWith(CloudConstant.MAC)) {
+        } else if (os.toLowerCase().startsWith(CivilConstant.MAC)) {
             return mac;
         }
         return linux;

sys-server/src/main/java/com/zq/system/config/security/TokenFilter.java

@@ -21,11 +21,11 @@ import com.zq.common.vo.OnlineUserDto;
 import com.zq.system.modules.system.service.OnlineUserService;
 import com.zq.system.modules.system.service.UserCacheClean;
 import io.jsonwebtoken.ExpiredJwtException;
+import org.apache.commons.lang3.StringUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.security.core.Authentication;
 import org.springframework.security.core.context.SecurityContextHolder;
-import org.springframework.util.StringUtils;
 import org.springframework.web.filter.GenericFilterBean;
 
 import javax.servlet.FilterChain;
@@ -80,7 +80,7 @@ public class TokenFilter extends GenericFilterBean {
                     userCacheClean.cleanUserCache(String.valueOf(tokenProvider.getClaims(token).get(TokenProvider.AUTHORITIES_KEY)));
                 }
             }
-            if (onlineUserDto != null && StringUtils.hasText(token)) {
+            if (onlineUserDto != null && StringUtils.isNotBlank(token)) {
                 Authentication authentication = tokenProvider.getAuthentication(token);
                 SecurityContextHolder.getContext().setAuthentication(authentication);
                 // Token 续期
@@ -98,7 +98,10 @@ public class TokenFilter extends GenericFilterBean {
      */
     private String resolveToken(HttpServletRequest request) {
         String bearerToken = request.getHeader(properties.getHeader());
-        if (StringUtils.hasText(bearerToken) && bearerToken.startsWith(properties.getTokenStartWith())) {
+        if (StringUtils.isBlank(bearerToken)) {
+            return null;
+        }
+        if (bearerToken.startsWith(properties.getTokenStartWith())) {
             // 去掉令牌前缀
             return bearerToken.replace(properties.getTokenStartWith(), "");
         } else {

sys-server/src/main/java/com/zq/system/modules/system/service/impl/UserServiceImpl.java

@@ -35,7 +35,10 @@ import com.zq.system.modules.system.domain.Job;
 import com.zq.system.modules.system.domain.Role;
 import com.zq.system.modules.system.domain.User;
 import com.zq.system.modules.system.domain.vo.LoginVo;
-import com.zq.system.modules.system.repository.*;
+import com.zq.system.modules.system.repository.DeptRepository;
+import com.zq.system.modules.system.repository.JobRepository;
+import com.zq.system.modules.system.repository.RoleRepository;
+import com.zq.system.modules.system.repository.UserRepository;
 import com.zq.system.modules.system.service.OnlineUserService;
 import com.zq.system.modules.system.service.UserCacheClean;
 import com.zq.system.modules.system.service.UserService;

user-server/src/main/java/com/zq/user/config/TokenFilter.java

@@ -21,11 +21,11 @@ import com.zq.common.config.security.SecurityProperties;
 import com.zq.common.context.ContextUtils;
 import com.zq.common.vo.OnlineUserDto;
 import io.jsonwebtoken.ExpiredJwtException;
+import org.apache.commons.lang3.StringUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.security.core.Authentication;
 import org.springframework.security.core.context.SecurityContextHolder;
-import org.springframework.util.StringUtils;
 import org.springframework.web.filter.GenericFilterBean;
 
 import javax.servlet.FilterChain;
@@ -77,7 +77,7 @@ public class TokenFilter extends GenericFilterBean {
                     // userCacheClean.cleanUserCache(String.valueOf(tokenProvider.getClaims(token).get(TokenProvider.AUTHORITIES_KEY)));
                 }
             }
-            if (onlineUserDto != null && StringUtils.hasText(token)) {
+            if (onlineUserDto != null && StringUtils.isNotBlank(token)) {
                 Authentication authentication = tokenProvider.getAuthentication(token);
                 SecurityContextHolder.getContext().setAuthentication(authentication);
                 // Token 续期
@@ -98,7 +98,10 @@ public class TokenFilter extends GenericFilterBean {
      */
     private String resolveToken(HttpServletRequest request) {
         String bearerToken = request.getHeader(properties.getHeader());
-        if (StringUtils.hasText(bearerToken) && bearerToken.startsWith(properties.getTokenStartWith())) {
+        if (StringUtils.isBlank(bearerToken)) {
+            return null;
+        }
+        if (bearerToken.startsWith(properties.getTokenStartWith())) {
             // 去掉令牌前缀
             return bearerToken.replace(properties.getTokenStartWith(), "");
         } else {