Merge branch 'dm_dev' of http://gitlab.ioubuy.cn/yaobenzhang/dm_project into dm_dev

jz-dm-apigateway/pom.xml

@@ -87,6 +87,16 @@
             <groupId>com.github.xiaoymin</groupId>
             <artifactId>swagger-bootstrap-ui</artifactId>
         </dependency>
+        <dependency>
+            <groupId>com.jz.common</groupId>
+            <artifactId>jz-dm-common</artifactId>
+            <version>1.0.0-SNAPSHOT</version>
+            <scope>compile</scope>
+        </dependency>
+        <dependency>
+            <groupId>io.projectreactor</groupId>
+            <artifactId>reactor-core</artifactId>
+        </dependency>
     </dependencies>
 
 </project>
\ No newline at end of file

jz-dm-apigateway/src/main/java/com/jz/dm/models/enity/BaseObject.java → jz-dm-apigateway/src/main/java/com/jz/dm/common/base/BaseObject.java

-package com.jz.dm.models.enity;
+package com.jz.dm.common.base;
 
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableField;

jz-dm-apigateway/src/main/java/com/jz/dm/models/enums/Format.java → jz-dm-apigateway/src/main/java/com/jz/dm/common/enums/Format.java

-package com.jz.dm.models.enums;
+package com.jz.dm.common.enums;
 
 /**
  * 数据格式

jz-dm-apigateway/src/main/java/com/jz/dm/models/enums/GatewayResultCode.java → jz-dm-apigateway/src/main/java/com/jz/dm/common/enums/GatewayResultCode.java

-package com.jz.dm.models.enums;
+package com.jz.dm.common.enums;
 
 
 
@@ -36,7 +36,7 @@ public enum GatewayResultCode implements ResultCode {
     ILLEGAL_TIMETEMP("ILLEGAL_TIMETEMP", "无效时间戳"),
 
     /** 接口未授权 */
-    INTERFACE_NO_AUTHORITY("INTERFACE_NO_AUTHORITY", "接口未授权"),
+    //INTERFACE_NO_AUTHORITY("INTERFACE_NO_AUTHORITY", "接口未授权"),
 
     /** 请求超过限制 */
     RATE_LIMIT_EXCEEDED("RATE_LIMIT_EXCEEDED", "请求超过限制"),

jz-dm-apigateway/src/main/java/com/jz/dm/models/enums/RouteType.java → jz-dm-apigateway/src/main/java/com/jz/dm/common/enums/RouteType.java

-package com.jz.dm.models.enums;
+package com.jz.dm.common.enums;
 
 /**
  * 路由类型

jz-dm-apigateway/src/main/java/com/jz/dm/controller/OrganizationManageController.java

@@ -22,4 +22,47 @@ public class OrganizationManageController {
 
     @Autowired
     private OrganizationManageService organizationManageService;
+
+    ///**
+    //* @Description:组织列表查询
+    //* @return: 组织列表
+    //* @Author: Mr.zhang
+    //* @Date: 2020-12-24
+    //*/
+    //@ApiOperation("组织列表查询")
+    //@PostMapping(value = "/listOrg")
+    //public Mono<Result> listOrganization(@RequestBody @Valid OrganizationManageListQueryReq req) {
+    //    return Mono.fromSupplier(() -> Result.of_success(organizationManageService.listOrganization(req)));
+    //}
+    ///**
+    //* @Description:组织信息详情信息查询
+    //* @return: 组织详情
+    //* @Author: Mr.zhang
+    //* @Date: 2020-12-24
+    //*/
+    //@ApiOperation("组织详情查询")
+    //@PostMapping(value = "/getOrgDetail")
+    //public Mono<Result> getOrganizationDetail(@RequestBody @Valid OrganizationManageDetailQueryReq req) {
+    //    return Mono.fromSupplier(() -> Result.of_success(organizationManageService.getOrganizationDetail(req)));
+    //}
+    ///**
+    // * @Description:添加组织信息
+    // * @Author: Mr.zhang
+    // * @Date: 2020-12-24
+    // */
+    //@ApiOperation("添加组织")
+    //@PostMapping(value = "/add")
+    //public Mono<Result> add(@RequestBody @Valid OrganizationManageAddReq req) {
+    //    return Mono.fromSupplier(() -> Result.of_success(organizationManageService.add(req)));
+    //}
+    ///**
+    // * @Description:更新组织信息
+    // * @Author: Mr.zhang
+    // * @Date: 2020-12-24
+    // */
+    //@ApiOperation("更新组织信息")
+    //@PostMapping(value = "/update")
+    //public Mono<Result> update(@RequestBody @Valid OrganizationManageUpdateReq req) {
+    //    return Mono.fromSupplier(() -> Result.of_success(organizationManageService.update(req)));
+    //}
 }

jz-dm-apigateway/src/main/java/com/jz/dm/filter/AuthFilter.java

+package com.jz.dm.filter;
+
+import com.jz.dm.common.constant.Constants;
+import com.jz.dm.models.enity.GatewayRequest;
+import com.jz.dm.models.enity.GatewayResponse;
+import org.springframework.stereotype.Component;
+
+/**
+ * @author ZC
+ * @PACKAGE_NAME: com.jz.dm.filter
+ * @PROJECT_NAME: jz-dm-parent
+ * @NAME: AuthFilter
+ * @DATE: 2020-12-23/17:43
+ * @DAY_NAME_SHORT: 周三
+ * @Description: 认证过滤器
+ **/
+@Component("authFilter")
+public class AuthFilter extends AbstractFilter {
+
+
+    @Override
+    public String getFilterName() {
+        return "AuthFilter";
+    }
+
+    @Override
+    public int getOrder() {
+        return Constants.FILTER_ORDER_5;
+    }
+    @Override
+    protected void internalDoFilter(GatewayRequest request, GatewayResponse response, FilterChain chain) {
+
+        //TODO 主要做计费计次验证
+        chain.doFilter(request, response);
+    }
+}

jz-dm-apigateway/src/main/java/com/jz/dm/filter/CheckArgsFilter.java

@@ -6,8 +6,8 @@ import com.jz.dm.common.util.StringUtil;
 import com.jz.dm.common.constant.Constants;
 import com.jz.dm.models.enity.GatewayRequest;
 import com.jz.dm.models.enity.GatewayResponse;
-import com.jz.dm.models.enums.Format;
-import com.jz.dm.models.enums.GatewayResultCode;
+import com.jz.dm.common.enums.Format;
+import com.jz.dm.common.enums.GatewayResultCode;
 import org.springframework.stereotype.Component;
 
 import java.nio.charset.Charset;

jz-dm-apigateway/src/main/java/com/jz/dm/filter/CheckPostSizeFilter.java

@@ -5,7 +5,7 @@ import com.jz.dm.common.constant.Constants;
 import com.jz.dm.models.enity.GatewayRequest;
 import com.jz.dm.models.enity.GatewayResponse;
 import com.jz.dm.models.enity.RequestContext;
-import com.jz.dm.models.enums.GatewayResultCode;
+import com.jz.dm.common.enums.GatewayResultCode;
 import org.springframework.stereotype.Component;
 
 import javax.servlet.http.HttpServletRequest;

jz-dm-apigateway/src/main/java/com/jz/dm/filter/CheckTimestampFilter.java

@@ -4,7 +4,7 @@ import com.jz.dm.common.exception.GatewayException;
 import com.jz.dm.common.constant.Constants;
 import com.jz.dm.models.enity.GatewayRequest;
 import com.jz.dm.models.enity.GatewayResponse;
-import com.jz.dm.models.enums.GatewayResultCode;
+import com.jz.dm.common.enums.GatewayResultCode;
 import org.springframework.stereotype.Component;
 
 /**
@@ -19,7 +19,7 @@ public class CheckTimestampFilter extends AbstractFilter {
      * 时间戳超时分钟，10分钟
      */
     //private static final long max = 1000 * 60 * 10; //10分钟
-    private static final long max = 1000 * 60 * 60*24; //10分钟
+    private static final long max = 1000 * 60 * 60*24; //24小时
 
     @Override
     public int getOrder() {

jz-dm-apigateway/src/main/java/com/jz/dm/filter/FilterChainImpl.java

@@ -5,7 +5,7 @@ import com.jz.dm.common.util.LogUtil;
 import com.jz.dm.common.util.ResultCode;
 import com.jz.dm.models.enity.GatewayRequest;
 import com.jz.dm.models.enity.GatewayResponse;
-import com.jz.dm.models.enums.GatewayResultCode;
+import com.jz.dm.common.enums.GatewayResultCode;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 

jz-dm-apigateway/src/main/java/com/jz/dm/filter/InvokeRouteFilter.java

@@ -8,8 +8,8 @@ import com.jz.dm.common.constant.Constants;
 import com.jz.dm.common.constant.LoggingConstants;
 import com.jz.dm.gateway.DefaultOpenApiDispatcher;
 import com.jz.dm.models.enity.*;
-import com.jz.dm.models.enums.GatewayResultCode;
-import com.jz.dm.models.enums.RouteType;
+import com.jz.dm.common.enums.GatewayResultCode;
+import com.jz.dm.common.enums.RouteType;
 import org.slf4j.Logger;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;

jz-dm-apigateway/src/main/java/com/jz/dm/filter/VerifySignFilter.java

@@ -5,7 +5,7 @@ import com.jz.dm.models.enity.GatewayRequest;
 import com.jz.dm.models.enity.GatewayResponse;
 import com.jz.dm.models.enity.OpenApi;
 import com.jz.dm.models.enity.RequestContext;
-import com.jz.dm.models.enums.RouteType;
+import com.jz.dm.common.enums.RouteType;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Component;
 

jz-dm-apigateway/src/main/java/com/jz/dm/models/domian/ApiAuth.java

@@ -3,7 +3,7 @@ package com.jz.dm.models.domian;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.fasterxml.jackson.annotation.JsonFormat;
-import com.jz.dm.models.enity.BaseObject;
+import com.jz.dm.common.base.BaseObject;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.EqualsAndHashCode;

jz-dm-apigateway/src/main/java/com/jz/dm/models/domian/ApiInterface.java

@@ -2,7 +2,7 @@ package com.jz.dm.models.domian;
 
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;
-import com.jz.dm.models.enity.BaseObject;
+import com.jz.dm.common.base.BaseObject;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.NoArgsConstructor;

jz-dm-apigateway/src/main/java/com/jz/dm/models/domian/ApiOpenApiEsFields.java

@@ -2,7 +2,7 @@ package com.jz.dm.models.domian;
 
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;
-import com.jz.dm.models.enity.BaseObject;
+import com.jz.dm.common.base.BaseObject;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.NoArgsConstructor;

jz-dm-apigateway/src/main/java/com/jz/dm/models/domian/ApiOpenApiEsTagconfig.java

@@ -2,7 +2,7 @@ package com.jz.dm.models.domian;
 
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;
-import com.jz.dm.models.enity.BaseObject;
+import com.jz.dm.common.base.BaseObject;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.NoArgsConstructor;

jz-dm-apigateway/src/main/java/com/jz/dm/models/domian/ApiOrg.java

@@ -2,7 +2,7 @@ package com.jz.dm.models.domian;
 
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;
-import com.jz.dm.models.enity.BaseObject;
+import com.jz.dm.common.base.BaseObject;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.NoArgsConstructor;

jz-dm-apigateway/src/main/java/com/jz/dm/models/domian/ApiReqLog.java

@@ -3,7 +3,7 @@ package com.jz.dm.models.domian;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.fasterxml.jackson.annotation.JsonFormat;
-import com.jz.dm.models.enity.BaseObject;
+import com.jz.dm.common.base.BaseObject;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.EqualsAndHashCode;

jz-dm-apigateway/src/main/java/com/jz/dm/models/domian/ApiSyncingDatasource.java

@@ -2,7 +2,7 @@ package com.jz.dm.models.domian;
 
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;
-import com.jz.dm.models.enity.BaseObject;
+import com.jz.dm.common.base.BaseObject;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.NoArgsConstructor;

jz-dm-apigateway/src/main/java/com/jz/dm/models/domian/ApiSyncingDatasourceType.java

@@ -2,7 +2,7 @@ package com.jz.dm.models.domian;
 
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;
-import com.jz.dm.models.enity.BaseObject;
+import com.jz.dm.common.base.BaseObject;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.NoArgsConstructor;

jz-dm-apigateway/src/main/java/com/jz/dm/models/enity/BaseRequest.java

-package com.jz.dm.models.enity;
-
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-/**
- * @author ZC
- * @PACKAGE_NAME: com.jz.dm.models.enity
- * @PROJECT_NAME: jz-dm-parent
- * @NAME: BaseRequest
- * @DATE: 2020-12-22/15:14
- * @DAY_NAME_SHORT: 周二
- * @Description:
- **/
-@Data
-public class BaseRequest {
-
-    @ApiModelProperty("当前页码")
-    private long pageNum = 1;
-
-    @ApiModelProperty("每页条数")
-    private long pageSize = 20;
-
-}

jz-dm-apigateway/src/main/java/com/jz/dm/models/enity/OpenApi.java

@@ -2,7 +2,7 @@ package com.jz.dm.models.enity;
 
 
 import com.alibaba.fastjson.JSON;
-import com.jz.dm.models.enums.RouteType;
+import com.jz.dm.common.enums.RouteType;
 
 import java.util.Date;
 import java.util.HashMap;

jz-dm-apigateway/src/main/java/com/jz/dm/models/req/OrganizationManageAddReq.java

+package com.jz.dm.models.req;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import javax.validation.constraints.NotNull;
+import java.io.Serializable;
+
+/**
+ * @author ZC
+ * @PACKAGE_NAME: com.jz.dm.models.req
+ * @PROJECT_NAME: jz-dm-parent
+ * @NAME: OrganizationManageListQueryReq
+ * @DATE: 2020-12-24/10:34
+ * @DAY_NAME_SHORT: 周四
+ * @Description:
+ **/
+@Data
+@ApiModel("组织管理详情请求体")
+public class OrganizationManageAddReq implements Serializable {
+
+    //@ApiModelProperty(value = "组织编码(组织唯一标识)",required = true)
+    //@NotNull(message = "组织编码不能为空")
+    //private String orgCode;
+
+    @ApiModelProperty(value = "组织名称",required = true)
+    @NotNull(message = "组织名称不能为空")
+    private String orgName;
+
+    @ApiModelProperty(value = "组织描述",required = false)
+    private String orgDesc;
+
+    @ApiModelProperty(value = "组织英文名称",required = false)
+    private String orgCnName;
+
+    @ApiModelProperty(value = "组织邮箱",required = false)
+    private String orgMail;
+
+    @ApiModelProperty(value = "备注",required = false)
+    private String remark;
+}

jz-dm-apigateway/src/main/java/com/jz/dm/models/req/OrganizationManageDetailQueryReq.java

+package com.jz.dm.models.req;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import javax.validation.constraints.NotNull;
+import java.io.Serializable;
+
+/**
+ * @author ZC
+ * @PACKAGE_NAME: com.jz.dm.models.req
+ * @PROJECT_NAME: jz-dm-parent
+ * @NAME: OrganizationManageListQueryReq
+ * @DATE: 2020-12-24/10:34
+ * @DAY_NAME_SHORT: 周四
+ * @Description:
+ **/
+@Data
+@ApiModel("组织管理详情请求体")
+public class OrganizationManageDetailQueryReq  implements Serializable {
+    @ApiModelProperty(value = "组织id",required = true)
+    @NotNull(message = "组织id不能为空")
+    private Long id;
+}

jz-dm-apigateway/src/main/java/com/jz/dm/models/req/OrganizationManageListQueryReq.java

+package com.jz.dm.models.req;
+
+import com.jz.common.bean.BasePageBean;
+import io.swagger.annotations.ApiModel;
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * @author ZC
+ * @PACKAGE_NAME: com.jz.dm.models.req
+ * @PROJECT_NAME: jz-dm-parent
+ * @NAME: OrganizationManageListQueryReq
+ * @DATE: 2020-12-24/10:34
+ * @DAY_NAME_SHORT: 周四
+ * @Description:
+ **/
+@Data
+@ApiModel("组织管理查询请求体")
+public class OrganizationManageListQueryReq extends BasePageBean implements Serializable {
+}

jz-dm-apigateway/src/main/java/com/jz/dm/models/req/OrganizationManageUpdateReq.java

+package com.jz.dm.models.req;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import javax.validation.constraints.NotNull;
+import java.io.Serializable;
+
+/**
+ * @author ZC
+ * @PACKAGE_NAME: com.jz.dm.models.req
+ * @PROJECT_NAME: jz-dm-parent
+ * @NAME: OrganizationManageUpdateReq
+ * @DATE: 2020-12-24/11:46
+ * @DAY_NAME_SHORT: 周四
+ * @Description:
+ **/
+@Data
+@ApiModel("更新组织请求体")
+public class OrganizationManageUpdateReq implements Serializable {
+    @ApiModelProperty(value = "id",required = true)
+    @NotNull(message = "id不能为空")
+    private Long id;
+
+    @ApiModelProperty(value = "组织名称",required = true)
+    @NotNull(message = "组织名称不能为空")
+    private String orgName;
+
+    @ApiModelProperty(value = "组织描述",required = false)
+    private String orgDesc;
+
+    @ApiModelProperty(value = "组织英文名称",required = false)
+    private String orgCnName;
+
+    @ApiModelProperty(value = "组织邮箱",required = false)
+    private String orgMail;
+
+    @ApiModelProperty(value = "备注",required = false)
+    private String remark;
+}

jz-dm-apigateway/src/main/java/com/jz/dm/service/OrganizationManageService.java

@@ -10,4 +10,31 @@ package com.jz.dm.service;
  * @Description:
  **/
 public interface OrganizationManageService {
+    ///**
+    // * 分页查询组织列表信息
+    // * @param req
+    // * @return
+    // */
+    //IPage<ApiOrg> listOrganization(OrganizationManageListQueryReq req);
+    //
+    ///**
+    // * 查询组织详情信息
+    // * @param req
+    // * @return
+    // */
+    //Result getOrganizationDetail(OrganizationManageDetailQueryReq req);
+    //
+    ///**
+    // * 添加组织
+    // * @param req
+    // * @return
+    // */
+    //Result add(OrganizationManageAddReq req);
+    //
+    ///**
+    // * 更新组织信息
+    // * @param req
+    // * @return
+    // */
+    //Result update(OrganizationManageUpdateReq req);
 }

jz-dm-apigateway/src/main/java/com/jz/dm/service/impl/OrganizationManageImpl.java

 package com.jz.dm.service.impl;
 
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.jz.common.constant.ResultMsg;
+import com.jz.common.utils.Result;
+import com.jz.dm.mapper.ApiOrgMapper;
+import com.jz.dm.models.domian.ApiOrg;
+import com.jz.dm.models.req.OrganizationManageAddReq;
+import com.jz.dm.models.req.OrganizationManageDetailQueryReq;
+import com.jz.dm.models.req.OrganizationManageListQueryReq;
+import com.jz.dm.models.req.OrganizationManageUpdateReq;
 import com.jz.dm.service.OrganizationManageService;
 import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.BeanUtils;
 import org.springframework.stereotype.Service;
 
+import javax.annotation.Resource;
+import java.util.Date;
+
 /**
  * @author ZC
  * @PACKAGE_NAME: com.jz.dm.service.impl
@@ -16,4 +31,78 @@ import org.springframework.stereotype.Service;
 @Service("organizationManageService")
 @Slf4j
 public class OrganizationManageImpl implements OrganizationManageService {
+
+     @Resource
+     private ApiOrgMapper apiOrgMapper;
+     //@Resource
+     //private RedisTemplate redisTemplate;
+    ///**
+    // * 组织列表信息查询
+    // * @param req
+    // * @return
+    // */
+    //@Override
+    //public IPage<ApiOrg> listOrganization(OrganizationManageListQueryReq req) {
+    //    IPage<ApiOrg> page = new Page<>(req.getPageNum(), req.getPageSize());
+    //    QueryWrapper<ApiOrg> query = new QueryWrapper<>();
+    //    query.orderByDesc("create_time");
+    //    return apiOrgMapper.selectPage(page,query);
+    //}
+    //
+    ///**
+    // * 获取组织详情
+    // * @param req
+    // * @return
+    // */
+    //@Override
+    //public Result getOrganizationDetail(OrganizationManageDetailQueryReq req) {
+    //    return Result.of_success(apiOrgMapper.selectById(req.getId()));
+    //}
+    //
+    ///**
+    // * 添加组织
+    // * @param req
+    // * @return
+    // */
+    //@Override
+    //public Result add(OrganizationManageAddReq req) {
+    //    //SysUserDto currentUser = (SysUserDto)redisTemplate.opsForValue().get("user"+ RedisMessageConstant.SENDTYPE_LOGIN_SYS);
+    //    //if (null == currentUser){
+    //    //    return Result.of_error(ResultMsg.USER_NOT_EXIST);
+    //    //}
+    //    ApiOrg apiOrg = new ApiOrg();
+    //    BeanUtils.copyProperties(req,apiOrg);
+    //    apiOrg.setOrgCode("1111");//组织编码需要生成
+    //    //apiOrg.setCreateUser(currentUser.getUserName());
+    //    if (apiOrgMapper.insert(apiOrg) > 0){
+    //        return Result.of_success(ResultMsg.INSERT_SUCCESS);
+    //    }
+    //    return Result.of_error(ResultMsg.INSERT_FAIL);
+    //}
+    //
+    ///**
+    // * 更新组织
+    // * @param req
+    // * @return
+    // */
+    //@Override
+    //public Result update(OrganizationManageUpdateReq req) {
+    //    //SysUserDto currentUser = (SysUserDto)redisTemplate.opsForValue().get("user"+ RedisMessageConstant.SENDTYPE_LOGIN_SYS);
+    //    //if (null == currentUser){
+    //    //    return Result.of_error(ResultMsg.USER_NOT_EXIST);
+    //    //}
+    //    ApiOrg apiOrg = apiOrgMapper.selectById(req.getId());
+    //    if (null == apiOrg){
+    //        return Result.of_error("组织信息不存在!");
+    //    }
+    //    ApiOrg apiOrgUpdate = new ApiOrg();
+    //    apiOrgUpdate.setId(apiOrg.getId());
+    //    BeanUtils.copyProperties(req,apiOrgUpdate);
+    //    apiOrgUpdate.setUpdateDate(new Date());
+    //    //apiOrgUpdate.setUpdateUser(currentUser.getUserName());
+    //    if (apiOrgMapper.updateById(apiOrgUpdate) > 0){
+    //        return Result.of_success(ResultMsg.UPDATE_SUCCESS);
+    //    }
+    //    return Result.of_success(ResultMsg.UPDATE_FAIL);
+    //}
 }

jz-dm-apigateway/src/main/resources/application-test.yml

@@ -47,3 +47,24 @@ spring:
         # 日志用的filter:log4j
         # 防御sql注入的filter:wall
         filters: stat
+  cache:
+    type: CAFFEINE
+    caffeine:
+      spec: maximumSize=1000,expireAfterWrite=30s
+    public-key: rajZdV0xpCox+2vEHFLsKq2o2XVdMaQq
+    redis:
+      #database: 0
+       host: 192.168.1.139
+       port: 6379
+      #timeout: 5000
+#      cluster:
+#        nodes:
+#          - 192.168.31.167:6379
+#          - 192.168.31.167:6380
+#          - 192.168.31.167:6381
+#          - 192.168.31.167:6382
+#          - 192.168.31.167:6383
+#          - 192.168.31.167:6384
+    #使用redis管理session设置为redis，否则none
+  session:
+      store-type: none
\ No newline at end of file

pom.xml

@@ -45,6 +45,7 @@
 		<commons-lang3.version>3.8.1</commons-lang3.version>
 		<springfox-swagger2.version>2.9.2</springfox-swagger2.version>
 		<swagger-bootstrap-ui.version>1.9.6</swagger-bootstrap-ui.version>
+		<lombok.version>1.18.16</lombok.version>
 	</properties>
 
 	<dependencyManagement>
@@ -204,6 +205,11 @@
 				<artifactId>swagger-bootstrap-ui</artifactId>
 				<version>${swagger-bootstrap-ui.version}</version>
 			</dependency>
+			<dependency>
+				<groupId>org.projectlombok</groupId>
+				<artifactId>lombok</artifactId>
+				<version>${lombok.version}</version>
+			</dependency>
 		</dependencies>
 	</dependencyManagement>