5.0

sop-admin/sop-admin-backend/pom.xml

@@ -38,7 +38,7 @@
         <commons-logging.version>1.2</commons-logging.version>
         <validation-api.version>2.0.1.Final</validation-api.version>
         <hibernate-validator.version>6.0.13.Final</hibernate-validator.version>
-        <fastmybatis.version>3.0.11</fastmybatis.version>
+        <fastmybatis.version>3.0.12</fastmybatis.version>
     </properties>
 
     <dependencies>

sop-admin/sop-admin-backend/src/main/java/com/gitee/sop/adminbackend/common/RSATool.java

@@ -8,7 +8,6 @@ import org.bouncycastle.asn1.ASN1Primitive;
 import org.bouncycastle.asn1.pkcs.PrivateKeyInfo;
 
 import javax.crypto.Cipher;
-import javax.swing.plaf.PanelUI;
 import java.security.KeyFactory;
 import java.security.KeyPair;
 import java.security.KeyPairGenerator;

sop-admin/sop-admin-backend/src/main/java/com/gitee/sop/adminbackend/common/SpringContext.java

@@ -1,7 +1,6 @@
 package com.gitee.sop.adminbackend.common;
 
 import org.springframework.context.ApplicationContext;
-import org.springframework.context.ApplicationEvent;
 
 /**
  * @author 六如
@@ -26,7 +25,7 @@ public class SpringContext {
         return ctx;
     }
 
-    public static void publishEvent(ApplicationEvent event) {
+    public static void publishEvent(Object event) {
         ctx.publishEvent(event);
     }
 }

sop-admin/sop-admin-backend/src/main/java/com/gitee/sop/adminbackend/config/Configs.java

@@ -1,8 +1,8 @@
 package com.gitee.sop.adminbackend.config;
 
-import com.gitee.sop.adminbackend.common.enums.ConfigKeyEnum;
 import com.gitee.sop.adminbackend.common.IConfig;
 import com.gitee.sop.adminbackend.common.SpringContext;
+import com.gitee.sop.adminbackend.common.enums.ConfigKeyEnum;
 
 import java.util.function.Supplier;
 

sop-admin/sop-admin-backend/src/main/java/com/gitee/sop/adminbackend/controller/ExceptionHandlerController.java

@@ -1,9 +1,9 @@
 package com.gitee.sop.adminbackend.controller;
 
-import com.gitee.sop.adminbackend.common.resp.Result;
 import com.gitee.sop.adminbackend.common.exception.BizException;
 import com.gitee.sop.adminbackend.common.exception.ErrorCode;
 import com.gitee.sop.adminbackend.common.exception.ExceptionCode;
+import com.gitee.sop.adminbackend.common.resp.Result;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.context.support.DefaultMessageSourceResolvable;
 import org.springframework.validation.ObjectError;

sop-admin/sop-admin-backend/src/main/java/com/gitee/sop/adminbackend/controller/isv/IsvInfoController.java

@@ -7,7 +7,6 @@ import com.gitee.sop.adminbackend.common.RSATool;
 import com.gitee.sop.adminbackend.common.dto.StatusUpdateDTO;
 import com.gitee.sop.adminbackend.common.req.StatusUpdateParam;
 import com.gitee.sop.adminbackend.common.resp.Result;
-import com.gitee.sop.adminbackend.controller.isv.req.IsvGroupSettingParam;
 import com.gitee.sop.adminbackend.controller.isv.req.IsvInfoAddParam;
 import com.gitee.sop.adminbackend.controller.isv.req.IsvInfoUpdateKeysParam;
 import com.gitee.sop.adminbackend.controller.isv.req.IsvInfoUpdateParam;
@@ -15,13 +14,13 @@ import com.gitee.sop.adminbackend.controller.isv.req.IsvKeysGenParam;
 import com.gitee.sop.adminbackend.dao.entity.IsvInfo;
 import com.gitee.sop.adminbackend.service.isv.IsvInfoService;
 import com.gitee.sop.adminbackend.service.isv.PermIsvGroupService;
-import com.gitee.sop.adminbackend.service.isv.dto.IsvGroupSettingDTO;
 import com.gitee.sop.adminbackend.service.isv.dto.IsvInfoAddDTO;
 import com.gitee.sop.adminbackend.service.isv.dto.IsvInfoDTO;
 import com.gitee.sop.adminbackend.service.isv.dto.IsvInfoUpdateDTO;
 import com.gitee.sop.adminbackend.service.isv.dto.IsvInfoUpdateKeysDTO;
 import com.gitee.sop.adminbackend.service.isv.dto.IsvKeysDTO;
 import com.gitee.sop.adminbackend.util.CopyUtil;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PostMapping;
@@ -29,8 +28,6 @@ import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
-import javax.annotation.Resource;
-
 
 /**
  * @author 六如
@@ -39,9 +36,9 @@ import javax.annotation.Resource;
 @RequestMapping("isv")
 public class IsvInfoController {
 
-    @Resource
+    @Autowired
     private IsvInfoService isvInfoService;
-    @Resource
+    @Autowired
     private PermIsvGroupService permIsvGroupService;
 
 

sop-admin/sop-admin-backend/src/main/java/com/gitee/sop/adminbackend/controller/isv/PermGroupController.java

@@ -8,6 +8,7 @@ import com.gitee.sop.adminbackend.controller.isv.req.PermGroupPageParam;
 import com.gitee.sop.adminbackend.controller.isv.req.PermGroupParam;
 import com.gitee.sop.adminbackend.dao.entity.PermGroup;
 import com.gitee.sop.adminbackend.service.isv.PermGroupService;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PostMapping;
@@ -15,7 +16,6 @@ import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
-import javax.annotation.Resource;
 import java.util.List;
 
 /**
@@ -27,7 +27,7 @@ import java.util.List;
 @RequestMapping("perm/group")
 public class PermGroupController {
 
-    @Resource
+    @Autowired
     private PermGroupService permGroupService;
 
     /**

sop-admin/sop-admin-backend/src/main/java/com/gitee/sop/adminbackend/controller/isv/PermGroupPermissionController.java

@@ -9,6 +9,7 @@ import com.gitee.sop.adminbackend.dao.entity.ApiInfo;
 import com.gitee.sop.adminbackend.service.isv.PermGroupPermissionService;
 import com.gitee.sop.adminbackend.service.isv.dto.PermGroupPermissionDTO;
 import com.gitee.sop.adminbackend.util.CopyUtil;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PostMapping;
@@ -16,8 +17,6 @@ import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
-import javax.annotation.Resource;
-
 /**
  * @author 六如
  */
@@ -25,7 +24,7 @@ import javax.annotation.Resource;
 @RequestMapping("perm/group/permission")
 public class PermGroupPermissionController {
 
-    @Resource
+    @Autowired
     private PermGroupPermissionService permGroupPermissionService;
 
     /**

sop-admin/sop-admin-backend/src/main/java/com/gitee/sop/adminbackend/controller/isv/PermIsvGroupController.java

@@ -1,10 +1,13 @@
 package com.gitee.sop.adminbackend.controller.isv;
 
+import com.gitee.sop.adminbackend.common.SpringContext;
 import com.gitee.sop.adminbackend.common.resp.Result;
 import com.gitee.sop.adminbackend.controller.isv.req.IsvGroupSettingParam;
 import com.gitee.sop.adminbackend.service.isv.PermIsvGroupService;
 import com.gitee.sop.adminbackend.service.isv.dto.IsvGroupSettingDTO;
+import com.gitee.sop.adminbackend.service.isv.event.ChangeIsvPermEvent;
 import com.gitee.sop.adminbackend.util.CopyUtil;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PostMapping;
@@ -12,7 +15,7 @@ import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
-import javax.annotation.Resource;
+import java.util.Collections;
 import java.util.List;
 
 /**
@@ -22,7 +25,7 @@ import java.util.List;
 @RequestMapping("perm/isv/group")
 public class PermIsvGroupController {
 
-    @Resource
+    @Autowired
     private PermIsvGroupService permIsvGroupService;
 
     /**
@@ -47,6 +50,10 @@ public class PermIsvGroupController {
     public Result<Integer> updateIsvGroup(@Validated @RequestBody IsvGroupSettingParam param) {
         IsvGroupSettingDTO isvGroupSettingDTO = CopyUtil.copyBean(param, IsvGroupSettingDTO::new);
         int i = permIsvGroupService.updateIsvGroup(isvGroupSettingDTO);
+        if (i > 0) {
+            // 刷新isv权限
+            SpringContext.publishEvent(new ChangeIsvPermEvent(Collections.singletonList(isvGroupSettingDTO.getIsvId())));
+        }
         return Result.ok(i);
     }
 

sop-admin/sop-admin-backend/src/main/java/com/gitee/sop/adminbackend/controller/sys/LoginController.java

@@ -8,14 +8,13 @@ import com.gitee.sop.adminbackend.service.sys.login.dto.LoginDTO;
 import com.gitee.sop.adminbackend.service.sys.login.dto.LoginUser;
 import com.gitee.sop.adminbackend.service.sys.login.enums.RegTypeEnum;
 import com.gitee.sop.adminbackend.util.CopyUtil;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
-import javax.annotation.Resource;
-
 /**
  * 登录相关接口
  *
@@ -25,7 +24,7 @@ import javax.annotation.Resource;
 @RequestMapping("sys")
 public class LoginController {
 
-    @Resource
+    @Autowired
     private LoginService loginService;
 
     /**

sop-admin/sop-admin-backend/src/main/java/com/gitee/sop/adminbackend/controller/sys/SysAdminUserController.java

@@ -3,7 +3,6 @@ package com.gitee.sop.adminbackend.controller.sys;
 import com.gitee.fastmybatis.core.PageInfo;
 import com.gitee.fastmybatis.core.query.Query;
 import com.gitee.fastmybatis.core.query.param.PageParam;
-import com.gitee.sop.adminbackend.common.req.IdParam;
 import com.gitee.sop.adminbackend.common.resp.Result;
 import com.gitee.sop.adminbackend.dao.entity.SysAdminUser;
 import com.gitee.sop.adminbackend.service.sys.SysAdminUserService;

sop-admin/sop-admin-backend/src/main/java/com/gitee/sop/adminbackend/dao/entity/ApiInfo.java

@@ -1,13 +1,12 @@
 package com.gitee.sop.adminbackend.dao.entity;
 
-import java.time.LocalDateTime;
-
 import com.gitee.fastmybatis.annotation.Pk;
 import com.gitee.fastmybatis.annotation.PkStrategy;
 import com.gitee.fastmybatis.annotation.Table;
-
 import lombok.Data;
 
+import java.time.LocalDateTime;
+
 
 /**
  * 表名：api_info

sop-admin/sop-admin-backend/src/main/java/com/gitee/sop/adminbackend/dao/entity/IsvInfo.java

@@ -1,13 +1,12 @@
 package com.gitee.sop.adminbackend.dao.entity;
 
-import java.time.LocalDateTime;
-
 import com.gitee.fastmybatis.annotation.Pk;
 import com.gitee.fastmybatis.annotation.PkStrategy;
 import com.gitee.fastmybatis.annotation.Table;
-
 import lombok.Data;
 
+import java.time.LocalDateTime;
+
 
 /**
  * 表名：isv_info

sop-admin/sop-admin-backend/src/main/java/com/gitee/sop/adminbackend/dao/entity/IsvKeys.java

@@ -1,13 +1,12 @@
 package com.gitee.sop.adminbackend.dao.entity;
 
-import java.time.LocalDateTime;
-
 import com.gitee.fastmybatis.annotation.Pk;
 import com.gitee.fastmybatis.annotation.PkStrategy;
 import com.gitee.fastmybatis.annotation.Table;
-
 import lombok.Data;
 
+import java.time.LocalDateTime;
+
 
 /**
  * 表名：isv_keys

sop-admin/sop-admin-backend/src/main/java/com/gitee/sop/adminbackend/dao/entity/PermGroup.java

@@ -1,13 +1,12 @@
 package com.gitee.sop.adminbackend.dao.entity;
 
-import java.time.LocalDateTime;
-
 import com.gitee.fastmybatis.annotation.Pk;
 import com.gitee.fastmybatis.annotation.PkStrategy;
 import com.gitee.fastmybatis.annotation.Table;
-
 import lombok.Data;
 
+import java.time.LocalDateTime;
+
 
 /**
  * 表名：perm_group

sop-admin/sop-admin-backend/src/main/java/com/gitee/sop/adminbackend/dao/entity/PermGroupPermission.java

@@ -1,13 +1,12 @@
 package com.gitee.sop.adminbackend.dao.entity;
 
-import java.time.LocalDateTime;
-
 import com.gitee.fastmybatis.annotation.Pk;
 import com.gitee.fastmybatis.annotation.PkStrategy;
 import com.gitee.fastmybatis.annotation.Table;
-
 import lombok.Data;
 
+import java.time.LocalDateTime;
+
 
 /**
  * 表名：perm_group_permission

sop-admin/sop-admin-backend/src/main/java/com/gitee/sop/adminbackend/dao/entity/PermIsvGroup.java

@@ -1,13 +1,12 @@
 package com.gitee.sop.adminbackend.dao.entity;
 
-import java.time.LocalDateTime;
-
 import com.gitee.fastmybatis.annotation.Pk;
 import com.gitee.fastmybatis.annotation.PkStrategy;
 import com.gitee.fastmybatis.annotation.Table;
-
 import lombok.Data;
 
+import java.time.LocalDateTime;
+
 
 /**
  * 表名：perm_isv_group

sop-admin/sop-admin-backend/src/main/java/com/gitee/sop/adminbackend/dao/entity/SysAdminUser.java

@@ -1,13 +1,12 @@
 package com.gitee.sop.adminbackend.dao.entity;
 
-import java.time.LocalDateTime;
-
 import com.gitee.fastmybatis.annotation.Pk;
 import com.gitee.fastmybatis.annotation.PkStrategy;
 import com.gitee.fastmybatis.annotation.Table;
-
 import lombok.Data;
 
+import java.time.LocalDateTime;
+
 
 /**
  * 表名：sys_admin_user

sop-admin/sop-admin-backend/src/main/java/com/gitee/sop/adminbackend/dao/entity/SysConfig.java

@@ -1,13 +1,12 @@
 package com.gitee.sop.adminbackend.dao.entity;
 
-import java.time.LocalDateTime;
-
 import com.gitee.fastmybatis.annotation.Pk;
 import com.gitee.fastmybatis.annotation.PkStrategy;
 import com.gitee.fastmybatis.annotation.Table;
-
 import lombok.Data;
 
+import java.time.LocalDateTime;
+
 
 /**
  * 表名：sys_config

sop-admin/sop-admin-backend/src/main/java/com/gitee/sop/adminbackend/dao/mapper/ApiInfoMapper.java

@@ -3,10 +3,12 @@ package com.gitee.sop.adminbackend.dao.mapper;
 
 import com.gitee.fastmybatis.core.mapper.BaseMapper;
 import com.gitee.sop.adminbackend.dao.entity.ApiInfo;
+import org.apache.ibatis.annotations.Mapper;
 
 /**
  * @author 六如
  */
+@Mapper
 public interface ApiInfoMapper extends BaseMapper<ApiInfo> {
 
     default ApiInfo getByNameVersion(String apiName, String apiVersion) {

sop-admin/sop-admin-backend/src/main/java/com/gitee/sop/adminbackend/dao/mapper/IsvInfoMapper.java

@@ -2,10 +2,12 @@ package com.gitee.sop.adminbackend.dao.mapper;
 
 import com.gitee.fastmybatis.core.mapper.BaseMapper;
 import com.gitee.sop.adminbackend.dao.entity.IsvInfo;
+import org.apache.ibatis.annotations.Mapper;
 
 /**
  * @author 六如
  */
+@Mapper
 public interface IsvInfoMapper extends BaseMapper<IsvInfo> {
 
     default IsvInfo getByAppId(String appId) {

sop-admin/sop-admin-backend/src/main/java/com/gitee/sop/adminbackend/dao/mapper/PermIsvGroupMapper.java

@@ -2,10 +2,12 @@ package com.gitee.sop.adminbackend.dao.mapper;
 
 import com.gitee.fastmybatis.core.mapper.BaseMapper;
 import com.gitee.sop.adminbackend.dao.entity.PermIsvGroup;
+import org.apache.ibatis.annotations.Mapper;
 
 /**
  * @author 六如
  */
+@Mapper
 public interface PermIsvGroupMapper extends BaseMapper<PermIsvGroup> {
 
 }

sop-admin/sop-admin-backend/src/main/java/com/gitee/sop/adminbackend/service/isv/IsvInfoService.java

@@ -4,22 +4,26 @@ import com.gitee.fastmybatis.core.PageInfo;
 import com.gitee.fastmybatis.core.query.LambdaQuery;
 import com.gitee.fastmybatis.core.support.LambdaService;
 import com.gitee.sop.adminbackend.common.RSATool;
+import com.gitee.sop.adminbackend.common.SpringContext;
 import com.gitee.sop.adminbackend.common.dto.StatusUpdateDTO;
 import com.gitee.sop.adminbackend.common.enums.StatusEnum;
 import com.gitee.sop.adminbackend.common.enums.YesOrNoEnum;
 import com.gitee.sop.adminbackend.dao.entity.IsvInfo;
 import com.gitee.sop.adminbackend.dao.entity.IsvKeys;
-import com.gitee.sop.adminbackend.dao.entity.PermIsvGroup;
 import com.gitee.sop.adminbackend.dao.mapper.IsvInfoMapper;
-import com.gitee.sop.adminbackend.service.isv.dto.IsvGroupSettingDTO;
 import com.gitee.sop.adminbackend.service.isv.dto.IsvInfoAddDTO;
 import com.gitee.sop.adminbackend.service.isv.dto.IsvInfoDTO;
 import com.gitee.sop.adminbackend.service.isv.dto.IsvInfoUpdateDTO;
 import com.gitee.sop.adminbackend.service.isv.dto.IsvInfoUpdateKeysDTO;
 import com.gitee.sop.adminbackend.service.isv.dto.IsvKeysDTO;
-import com.gitee.sop.adminbackend.service.isv.dto.IsvKeysGenDTO;
+import com.gitee.sop.adminbackend.service.isv.event.ChangeIsvInfoEvent;
 import com.gitee.sop.adminbackend.util.CopyUtil;
 import com.gitee.sop.adminbackend.util.IdGen;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import org.springframework.util.CollectionUtils;
+
 import java.text.SimpleDateFormat;
 import java.util.Collections;
 import java.util.Date;
@@ -28,12 +32,6 @@ import java.util.Map;
 import java.util.Optional;
 import java.util.function.Function;
 import java.util.stream.Collectors;
-import javax.annotation.Resource;
-import org.apache.commons.lang3.StringUtils;
-import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
-import org.springframework.util.CollectionUtils;
-
 
 
 /**
@@ -42,9 +40,9 @@ import org.springframework.util.CollectionUtils;
 @Service
 public class IsvInfoService implements LambdaService<IsvInfo, IsvInfoMapper> {
 
-    @Resource
+    @Autowired
     private IsvKeysService isvKeysService;
-    @Resource
+    @Autowired
     private PermIsvGroupService permIsvGroupService;
 
     public PageInfo<IsvInfoDTO> doPage(LambdaQuery<IsvInfo> query) {
@@ -104,34 +102,24 @@ public class IsvInfoService implements LambdaService<IsvInfo, IsvInfoMapper> {
         rec.setAppId(appKey);
         rec.setStatus(StatusEnum.ENABLE.getStatus());
         this.save(rec);
+        this.sendChangeEvent(rec.getId());
         return rec.getId();
     }
 
     public int update(IsvInfoUpdateDTO isvInfoUpdateDTO) {
-        return this.query()
+        int cnt = this.query()
                 .eq(IsvInfo::getId, isvInfoUpdateDTO.getId())
                 .set(IsvInfo::getStatus, isvInfoUpdateDTO.getStatus())
                 .set(IsvInfo::getRemark, isvInfoUpdateDTO.getRemark())
                 .update();
+        sendChangeEvent(isvInfoUpdateDTO.getId());
+        return cnt;
     }
 
     public int updateKeys(IsvInfoUpdateKeysDTO isvInfoUpdateKeysDTO) {
         return isvKeysService.saveKeys(isvInfoUpdateKeysDTO);
     }
 
-
-    private IsvKeysGenDTO createIsvKeys(RSATool.KeyFormat keyFormat) throws Exception {
-        IsvKeysGenDTO isvKeysGenDTO = new IsvKeysGenDTO();
-
-        RSATool.KeyStore keyStoreIsv = this.createKeys(keyFormat);
-        isvKeysGenDTO.setPublicKeyIsv(keyStoreIsv.getPublicKey());
-        isvKeysGenDTO.setPrivateKeyIsv(keyStoreIsv.getPrivateKey());
-
-        isvKeysGenDTO.setPublicKeyPlatform("");
-        isvKeysGenDTO.setPrivateKeyPlatform("");
-        return isvKeysGenDTO;
-    }
-
     public IsvKeysDTO getKeys(Long isvId) {
         IsvKeys isvKeys = isvKeysService.get(IsvKeys::getIsvId, isvId);
         if (isvKeys == null) {
@@ -154,10 +142,19 @@ public class IsvInfoService implements LambdaService<IsvInfo, IsvInfoMapper> {
      * @return 返回影响行数
      */
     public int updateStatus(StatusUpdateDTO statusUpdateDTO) {
-        return this.query()
+        Long isvId = statusUpdateDTO.getId();
-                .eq(IsvInfo::getId, statusUpdateDTO.getId())
+        int cnt = this.query()
+                .eq(IsvInfo::getId, isvId)
                 .set(IsvInfo::getStatus, statusUpdateDTO.getStatus())
                 .update();
+        // 同步isv信息
+        this.sendChangeEvent(isvId);
+        return cnt;
     }
 
+    private void sendChangeEvent(Long isvId) {
+        SpringContext.publishEvent(new ChangeIsvInfoEvent(Collections.singletonList(isvId)));
+    }
+
+
 }

sop-admin/sop-admin-backend/src/main/java/com/gitee/sop/adminbackend/service/isv/IsvKeysService.java

@@ -1,12 +1,16 @@
 package com.gitee.sop.adminbackend.service.isv;
 
 import com.gitee.fastmybatis.core.support.LambdaService;
+import com.gitee.sop.adminbackend.common.SpringContext;
 import com.gitee.sop.adminbackend.dao.entity.IsvKeys;
 import com.gitee.sop.adminbackend.dao.mapper.IsvKeysMapper;
 import com.gitee.sop.adminbackend.service.isv.dto.IsvInfoUpdateKeysDTO;
+import com.gitee.sop.adminbackend.service.isv.event.ChangeIsvKeyEvent;
 import com.gitee.sop.adminbackend.util.CopyUtil;
 import org.springframework.stereotype.Service;
 
+import java.util.Collections;
+
 
 /**
  * @author 六如
@@ -20,7 +24,10 @@ public class IsvKeysService implements LambdaService<IsvKeys, IsvKeysMapper> {
             isvKeys = new IsvKeys();
         }
         CopyUtil.copyPropertiesIgnoreNull(isvInfoUpdateKeysDTO, isvKeys);
-        return this.saveOrUpdate(isvKeys);
+        int cnt = this.saveOrUpdate(isvKeys);
+        // 发送变更事件
+        SpringContext.publishEvent(new ChangeIsvKeyEvent(Collections.singletonList(isvInfoUpdateKeysDTO.getIsvId())));
+        return cnt;
     }
 
 }

sop-admin/sop-admin-backend/src/main/java/com/gitee/sop/adminbackend/service/isv/PermGroupPermissionService.java

@@ -3,15 +3,19 @@ package com.gitee.sop.adminbackend.service.isv;
 import com.gitee.fastmybatis.core.PageInfo;
 import com.gitee.fastmybatis.core.query.LambdaQuery;
 import com.gitee.fastmybatis.core.support.LambdaService;
+import com.gitee.sop.adminbackend.common.SpringContext;
 import com.gitee.sop.adminbackend.dao.entity.ApiInfo;
 import com.gitee.sop.adminbackend.dao.entity.PermGroupPermission;
+import com.gitee.sop.adminbackend.dao.entity.PermIsvGroup;
 import com.gitee.sop.adminbackend.dao.mapper.ApiInfoMapper;
 import com.gitee.sop.adminbackend.dao.mapper.PermGroupPermissionMapper;
+import com.gitee.sop.adminbackend.dao.mapper.PermIsvGroupMapper;
 import com.gitee.sop.adminbackend.service.isv.dto.PermGroupPermissionDTO;
+import com.gitee.sop.adminbackend.service.isv.event.ChangeIsvPermEvent;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.util.CollectionUtils;
 
-import javax.annotation.Resource;
 import java.util.Collection;
 import java.util.List;
 import java.util.stream.Collectors;
@@ -23,8 +27,10 @@ import java.util.stream.Collectors;
 @Service
 public class PermGroupPermissionService implements LambdaService<PermGroupPermission, PermGroupPermissionMapper> {
 
-    @Resource
+    @Autowired
     private ApiInfoMapper apiInfoMapper;
+    @Autowired
+    private PermIsvGroupMapper permIsvGroupMapper;
 
     public PageInfo<PermGroupPermission> doPage(LambdaQuery<PermGroupPermission> query) {
         query.orderByDesc(PermGroupPermission::getId);
@@ -51,6 +57,12 @@ public class PermGroupPermissionService implements LambdaService<PermGroupPermis
         return apiInfoMapper.page(query);
     }
 
+    /**
+     * 设置组权限
+     *
+     * @param param
+     * @return
+     */
     public int setting(PermGroupPermissionDTO param) {
         Long groupId = param.getGroupId();
         List<Long> apiIdList = param.getApiIdList();
@@ -72,13 +84,31 @@ public class PermGroupPermissionService implements LambdaService<PermGroupPermis
                     return permGroupPermission;
                 })
                 .collect(Collectors.toList());
-        return this.saveBatch(saveList);
+        int cnt = this.saveBatch(saveList);
+
+        // 刷新isv权限
+        this.refreshIsvPerm(groupId);
+
+        return cnt;
     }
 
+    private void refreshIsvPerm(Long groupId) {
+        List<Long> isvIds = permIsvGroupMapper.query()
+                .eq(PermIsvGroup::getGroupId, groupId)
+                .listUniqueValue(PermIsvGroup::getIsvId);
+
+        SpringContext.publishEvent(new ChangeIsvPermEvent(isvIds));
+    }
+
+
     public int delete(Long groupId, Collection<Long> apiIds) {
-        return this.query()
+        int cnt = this.query()
                 .eq(PermGroupPermission::getGroupId, groupId)
                 .in(PermGroupPermission::getApiId, apiIds)
                 .delete();
+
+        this.refreshIsvPerm(groupId);
+
+        return cnt;
     }
 }

sop-admin/sop-admin-backend/src/main/java/com/gitee/sop/adminbackend/service/isv/PermGroupService.java

@@ -8,9 +8,9 @@ import com.gitee.sop.adminbackend.dao.entity.PermGroup;
 import com.gitee.sop.adminbackend.dao.entity.PermIsvGroup;
 import com.gitee.sop.adminbackend.dao.mapper.PermGroupMapper;
 import com.gitee.sop.adminbackend.dao.mapper.PermIsvGroupMapper;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
-import javax.annotation.Resource;
 import java.util.Collection;
 import java.util.Map;
 
@@ -21,7 +21,7 @@ import java.util.Map;
 @Service
 public class PermGroupService implements LambdaService<PermGroup, PermGroupMapper> {
 
-    @Resource
+    @Autowired
     PermIsvGroupMapper permIsvGroupMapper;
 
     public PageInfo<PermGroup> doPage(LambdaQuery<PermGroup> query) {

sop-admin/sop-admin-backend/src/main/java/com/gitee/sop/adminbackend/service/isv/PermIsvGroupService.java

@@ -3,16 +3,19 @@ package com.gitee.sop.adminbackend.service.isv;
 import com.gitee.fastmybatis.core.PageInfo;
 import com.gitee.fastmybatis.core.query.LambdaQuery;
 import com.gitee.fastmybatis.core.support.LambdaService;
+import com.gitee.sop.adminbackend.common.SpringContext;
 import com.gitee.sop.adminbackend.dao.entity.PermIsvGroup;
 import com.gitee.sop.adminbackend.dao.mapper.PermIsvGroupMapper;
 import com.gitee.sop.adminbackend.service.isv.dto.IsvGroupSettingDTO;
+import com.gitee.sop.adminbackend.service.isv.event.ChangeIsvPermEvent;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.util.CollectionUtils;
 
-import javax.annotation.Resource;
 import java.util.ArrayList;
 import java.util.Collection;
+import java.util.Collections;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -26,7 +29,7 @@ import java.util.stream.Collectors;
 @Service
 public class PermIsvGroupService implements LambdaService<PermIsvGroup, PermIsvGroupMapper> {
 
-    @Resource
+    @Autowired
     private PermGroupService permGroupService;
 
     public PageInfo<PermIsvGroup> doPage(LambdaQuery<PermIsvGroup> query) {
@@ -70,10 +73,7 @@ public class PermIsvGroupService implements LambdaService<PermIsvGroup, PermIsvG
                     return permIsvGroup;
                 }).collect(Collectors.toList());
 
-        int cnt = this.saveBatch(saveList);
+        return this.saveBatch(saveList);
-        // TODO:同步到网关
-
-        return cnt;
     }
 
     public List<Long> listIsvGroupId(Long isvId) {
@@ -87,7 +87,7 @@ public class PermIsvGroupService implements LambdaService<PermIsvGroup, PermIsvG
     public boolean isUsed(Long groupId) {
         return this.query()
                 .eq(PermIsvGroup::getGroupId, groupId)
-                .get() != null;
+                .getCount() > 0;
     }
 
 }

sop-admin/sop-admin-backend/src/main/java/com/gitee/sop/adminbackend/service/isv/dto/IsvGroupSettingDTO.java

@@ -2,7 +2,6 @@ package com.gitee.sop.adminbackend.service.isv.dto;
 
 import lombok.Data;
 
-import javax.validation.constraints.NotEmpty;
 import javax.validation.constraints.NotNull;
 import java.util.List;
 

sop-admin/sop-admin-backend/src/main/java/com/gitee/sop/adminbackend/service/isv/dto/IsvInfoDTO.java

@@ -1,8 +1,5 @@
 package com.gitee.sop.adminbackend.service.isv.dto;
 
-import com.gitee.fastmybatis.annotation.Pk;
-import com.gitee.fastmybatis.annotation.PkStrategy;
-import com.gitee.fastmybatis.annotation.Table;
 import lombok.Data;
 
 import java.time.LocalDateTime;

sop-admin/sop-admin-backend/src/main/java/com/gitee/sop/adminbackend/service/isv/event/ChangeApiInfoEvent.java

@@ -0,0 +1,17 @@
+package com.gitee.sop.adminbackend.service.isv.event;
+
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+
+import java.util.Collection;
+
+/**
+ * @author 六如
+ */
+@Getter
+@AllArgsConstructor
+public class ChangeApiInfoEvent {
+
+    private final Collection<Long> apiIds;
+
+}

sop-admin/sop-admin-backend/src/main/java/com/gitee/sop/adminbackend/service/isv/event/ChangeIsvInfoEvent.java

@@ -0,0 +1,17 @@
+package com.gitee.sop.adminbackend.service.isv.event;
+
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+
+import java.util.Collection;
+
+/**
+ * @author 六如
+ */
+@Getter
+@AllArgsConstructor
+public class ChangeIsvInfoEvent {
+
+    private final Collection<Long> isvIds;
+
+}

sop-admin/sop-admin-backend/src/main/java/com/gitee/sop/adminbackend/service/isv/event/ChangeIsvKeyEvent.java

@@ -0,0 +1,17 @@
+package com.gitee.sop.adminbackend.service.isv.event;
+
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+
+import java.util.List;
+
+/**
+ * @author 六如
+ */
+@Getter
+@AllArgsConstructor
+public class ChangeIsvKeyEvent {
+
+    private final List<Long> isvIds;
+
+}

sop-admin/sop-admin-backend/src/main/java/com/gitee/sop/adminbackend/service/isv/event/ChangeIsvPermEvent.java

@@ -0,0 +1,17 @@
+package com.gitee.sop.adminbackend.service.isv.event;
+
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+
+import java.util.List;
+
+/**
+ * @author 六如
+ */
+@Getter
+@AllArgsConstructor
+public class ChangeIsvPermEvent {
+
+    private final List<Long> isvIds;
+
+}

sop-admin/sop-admin-backend/src/main/java/com/gitee/sop/adminbackend/service/isv/listener/ChangeListener.java

@@ -0,0 +1,79 @@
+package com.gitee.sop.adminbackend.service.isv.listener;
+
+import com.gitee.sop.adminbackend.dao.entity.IsvInfo;
+import com.gitee.sop.adminbackend.dao.mapper.IsvInfoMapper;
+import com.gitee.sop.adminbackend.service.isv.event.ChangeApiInfoEvent;
+import com.gitee.sop.adminbackend.service.isv.event.ChangeIsvInfoEvent;
+import com.gitee.sop.adminbackend.service.isv.event.ChangeIsvKeyEvent;
+import com.gitee.sop.adminbackend.service.isv.event.ChangeIsvPermEvent;
+import com.gitee.sop.support.service.RefreshService;
+import org.apache.dubbo.config.annotation.DubboReference;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.context.event.EventListener;
+import org.springframework.stereotype.Component;
+
+import java.util.Collection;
+import java.util.List;
+
+/**
+ * 变更监听
+ *
+ * @author 六如
+ */
+@Component
+public class ChangeListener {
+
+    @DubboReference
+    private RefreshService refreshService;
+
+    @Autowired
+    private IsvInfoMapper isvInfoMapper;
+
+    /**
+     * 监听isv信息变更
+     *
+     * @param event
+     */
+    @EventListener
+    public void onChangeApiInfoEvent(ChangeApiInfoEvent event) {
+        Collection<Long> apiIds = event.getApiIds();
+        refreshService.refreshApi(apiIds);
+    }
+
+    /**
+     * 监听isv信息变更
+     *
+     * @param event
+     */
+    @EventListener
+    public void onChangeIsvInfoEvent(ChangeIsvInfoEvent event) {
+        Collection<Long> isvIds = event.getIsvIds();
+        Collection<String> appIds = isvInfoMapper.query()
+                .in(IsvInfo::getId, isvIds)
+                .listUniqueValue(IsvInfo::getAppId);
+        refreshService.refreshIsv(appIds);
+    }
+
+    /**
+     * 监听isv秘钥变更
+     *
+     * @param event
+     */
+    @EventListener
+    public void onChangeIsvKeyEvent(ChangeIsvKeyEvent event) {
+        List<Long> isvIds = event.getIsvIds();
+        refreshService.refreshSecret(isvIds);
+    }
+
+    /**
+     * 监听isv分组变更
+     *
+     * @param event
+     */
+    @EventListener
+    public void onChangeIsvGroupEvent(ChangeIsvPermEvent event) {
+        List<Long> isvIds = event.getIsvIds();
+        refreshService.refreshIsvPerm(isvIds);
+    }
+
+}

sop-admin/sop-admin-backend/src/main/java/com/gitee/sop/adminbackend/service/serve/ApiInfoService.java

@@ -1,11 +1,15 @@
 package com.gitee.sop.adminbackend.service.serve;
 
 import com.gitee.fastmybatis.core.support.LambdaService;
+import com.gitee.sop.adminbackend.common.SpringContext;
 import com.gitee.sop.adminbackend.common.dto.StatusUpdateDTO;
 import com.gitee.sop.adminbackend.dao.entity.ApiInfo;
 import com.gitee.sop.adminbackend.dao.mapper.ApiInfoMapper;
+import com.gitee.sop.adminbackend.service.isv.event.ChangeApiInfoEvent;
 import org.springframework.stereotype.Service;
 
+import java.util.Collections;
+
 
 /**
  * @author 六如
@@ -20,10 +24,22 @@ public class ApiInfoService implements LambdaService<ApiInfo, ApiInfoMapper> {
      * @return 返回影响行数
      */
     public int updateStatus(StatusUpdateDTO statusUpdateDTO) {
-        return this.query()
+        int cnt = this.query()
                 .eq(ApiInfo::getId, statusUpdateDTO.getId())
                 .set(ApiInfo::getStatus, statusUpdateDTO.getStatus())
                 .update();
+        this.sendChangeEvent(statusUpdateDTO.getId());
+        return cnt;
     }
 
+    @Override
+    public int update(ApiInfo entity) {
+        int cnt = LambdaService.super.update(entity);
+        sendChangeEvent(entity.getId());
+        return cnt;
+    }
+
+    private void sendChangeEvent(Long id) {
+        SpringContext.publishEvent(new ChangeApiInfoEvent(Collections.singletonList(id)));
+    }
 }

sop-admin/sop-admin-backend/src/main/java/com/gitee/sop/adminbackend/service/sys/SysConfigService.java

@@ -9,10 +9,10 @@ import com.gitee.sop.adminbackend.util.CopyUtil;
 import com.google.common.cache.CacheBuilder;
 import com.google.common.cache.CacheLoader;
 import com.google.common.cache.LoadingCache;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.core.env.Environment;
 import org.springframework.stereotype.Service;
 
-import javax.annotation.Resource;
 import java.util.Objects;
 import java.util.Optional;
 import java.util.concurrent.TimeUnit;
@@ -23,7 +23,7 @@ import java.util.concurrent.TimeUnit;
 @Service
 public class SysConfigService extends BaseLambdaService<SysConfig, SysConfigMapper> implements IConfig {
 
-    @Resource
+    @Autowired
     private Environment environment;
 
     // key: configKey, value: configValue

sop-admin/sop-admin-backend/src/main/java/com/gitee/sop/adminbackend/service/sys/UpgradeService.java

@@ -7,11 +7,11 @@ import com.gitee.sop.adminbackend.service.sys.login.enums.RegTypeEnum;
 import com.gitee.sop.adminbackend.util.PasswordUtil;
 import org.apache.commons.codec.digest.DigestUtils;
 import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.crypto.bcrypt.BCrypt;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.PostConstruct;
-import javax.annotation.Resource;
 
 /**
  * @author 六如
@@ -19,13 +19,13 @@ import javax.annotation.Resource;
 @Service
 public class UpgradeService {
 
-    @Resource
+    @Autowired
     private SysConfigService sysConfigService;
 
-    @Resource
+    @Autowired
     private SysAdminUserService sysAdminUserService;
 
-    @Resource
+    @Autowired
     private UpgradeMapper upgradeMapper;
 
     @PostConstruct

sop-admin/sop-admin-backend/src/main/java/com/gitee/sop/adminbackend/service/sys/login/LoginService.java

@@ -2,6 +2,7 @@ package com.gitee.sop.adminbackend.service.sys.login;
 
 import com.alibaba.nacos.shaded.com.google.common.collect.Sets;
 import com.gitee.sop.adminbackend.common.enums.ConfigKeyEnum;
+import com.gitee.sop.adminbackend.common.enums.StatusEnum;
 import com.gitee.sop.adminbackend.common.exception.BizException;
 import com.gitee.sop.adminbackend.config.Configs;
 import com.gitee.sop.adminbackend.dao.entity.SysAdminUser;
@@ -10,19 +11,18 @@ import com.gitee.sop.adminbackend.service.sys.login.dto.LoginDTO;
 import com.gitee.sop.adminbackend.service.sys.login.dto.LoginForm;
 import com.gitee.sop.adminbackend.service.sys.login.dto.LoginResult;
 import com.gitee.sop.adminbackend.service.sys.login.dto.LoginUser;
-import com.gitee.sop.adminbackend.common.enums.StatusEnum;
 import com.gitee.sop.adminbackend.service.sys.login.enums.RegTypeEnum;
 import com.gitee.sop.adminbackend.util.CopyUtil;
 import com.gitee.sop.adminbackend.util.GenerateUtil;
 import com.gitee.sop.adminbackend.util.JwtUtil;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.math.NumberUtils;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.crypto.bcrypt.BCrypt;
 import org.springframework.stereotype.Service;
 import org.springframework.util.Assert;
 import org.springframework.util.StringUtils;
 
-import javax.annotation.Resource;
 import java.time.LocalDateTime;
 import java.time.format.DateTimeFormatter;
 import java.util.HashMap;
@@ -36,10 +36,10 @@ import java.util.Objects;
 @Slf4j
 public class LoginService {
 
-    @Resource
+    @Autowired
     private SysAdminUserService sysAdminUserService;
 
-    @Resource
+    @Autowired
     private UserCacheManager userCacheManager;
 
 

sop-admin/sop-admin-backend/src/main/java/com/gitee/sop/adminbackend/service/sys/login/impl/DefaultUserCacheManager.java

@@ -1,11 +1,11 @@
 package com.gitee.sop.adminbackend.service.sys.login.impl;
 
 import com.gitee.sop.adminbackend.common.User;
+import com.gitee.sop.adminbackend.common.enums.StatusEnum;
 import com.gitee.sop.adminbackend.dao.entity.SysAdminUser;
 import com.gitee.sop.adminbackend.service.sys.SysAdminUserService;
 import com.gitee.sop.adminbackend.service.sys.login.UserCacheManager;
 import com.gitee.sop.adminbackend.service.sys.login.dto.LoginUser;
-import com.gitee.sop.adminbackend.common.enums.StatusEnum;
 import com.gitee.sop.adminbackend.util.CopyUtil;
 import com.google.common.cache.CacheBuilder;
 import com.google.common.cache.CacheLoader;

sop-admin/sop-admin-backend/src/main/resources/application.properties

@@ -6,6 +6,13 @@ spring.application.name=sop-admin-backend
 dubbo.protocol.name=dubbo
 dubbo.protocol.port=-1
 dubbo.application.qos-enable=false
+dubbo.consumer.check=false
+# ### register config see:https://cn.dubbo.apache.org/zh-cn/overview/mannual/java-sdk/reference-manual/registry/overview/
+# ------
+# nacos://localhost:8848        Cluster config:nacos://localhost:8848?backup=localshot:8846,localshot:8847
+# zookeeper://localhost:2181    Cluster config:zookeeper://10.20.153.10:2181?backup=10.20.153.11:2181,10.20.153.12:2181
+# redis://localhost:6379        Cluster config:redis://10.20.153.10:6379?backup=10.20.153.11:6379,10.20.153.12:6379
+# ------
 dubbo.registry.address=zookeeper://localhost:2181
 
 ####### mysql config #######

sop-admin/sop-admin-backend/src/test/java/com/gitee/sop/adminbackend/service/LoginServiceTest.java

@@ -6,7 +6,7 @@ import com.gitee.sop.adminbackend.service.sys.login.LoginService;
 import com.gitee.sop.adminbackend.service.sys.login.dto.LoginDTO;
 import com.gitee.sop.adminbackend.service.sys.login.dto.LoginUser;
 import com.gitee.sop.adminbackend.service.sys.login.enums.RegTypeEnum;
-import javax.annotation.Resource;
+import org.springframework.beans.factory.annotation.Autowired;
 
 import org.apache.commons.codec.digest.DigestUtils;
 import org.junit.jupiter.api.Test;
@@ -19,7 +19,7 @@ import org.springframework.util.Assert;
  */
 public class LoginServiceTest extends BaseTest {
 
-    @Resource
+    @Autowired
     LoginService loginService;
 
     @Test

sop-admin/sop-admin-backend/src/test/java/com/gitee/sop/adminbackend/service/PasswordTest.java

@@ -7,7 +7,7 @@ import org.apache.commons.codec.digest.DigestUtils;
 import org.junit.jupiter.api.Test;
 import org.springframework.security.crypto.bcrypt.BCrypt;
 
-import javax.annotation.Resource;
+import org.springframework.beans.factory.annotation.Autowired;
 
 
 /**
@@ -15,7 +15,7 @@ import javax.annotation.Resource;
  */
 public class PasswordTest extends BaseTest {
 
-    @Resource
+    @Autowired
     SysAdminUserService sysAdminUserService;
 
     /**

sop-admin/sop-admin-frontend/src/views/serve/api/index.ts

@@ -242,8 +242,7 @@ export const editFormData = ref<any>(editFormDataGen());
 export const editFormRules = {
   application: [{ required: true, message: "请输入应用名称" }],
   apiName: [{ required: true, message: "请输入接口名称" }],
-  apiVersion: [{ required: true, message: "请输入版本号" }],
+  apiVersion: [{ required: true, message: "请输入版本号" }]
-  description: [{ required: true, message: "请输入接口描述" }]
 };
 export const isCustomRegSource = computed(() => {
   return editFormData.value.regSource === RegSource.CUSTOM;

sop-gateway/pom.xml

@@ -38,7 +38,7 @@
         <commons-logging.version>1.2</commons-logging.version>
         <validation-api.version>2.0.1.Final</validation-api.version>
         <hibernate-validator.version>6.0.13.Final</hibernate-validator.version>
-        <fastmybatis.version>3.0.11</fastmybatis.version>
+        <fastmybatis.version>3.0.12</fastmybatis.version>
     </properties>
 
     <dependencies>
@@ -229,7 +229,7 @@
             <dependency>
                 <groupId>org.projectlombok</groupId>
                 <artifactId>lombok</artifactId>
-                <version>1.18.30</version>
+                <version>1.18.34</version>
             </dependency>
             <dependency>
                 <groupId>javax.servlet</groupId>

sop-gateway/src/main/java/com/gitee/sop/gateway/common/ApiInfoDTO.java

@@ -11,6 +11,8 @@ import java.io.Serializable;
 public class ApiInfoDTO implements Serializable {
     private static final long serialVersionUID = 2183251167679411550L;
 
+    private Long id;
+
     /**
      * 所属应用
      */

sop-gateway/src/main/java/com/gitee/sop/gateway/common/CacheKey.java

@@ -0,0 +1,11 @@
+package com.gitee.sop.gateway.common;
+
+/**
+ * @author 六如
+ */
+public class CacheKey {
+    public static final String KEY_API = "sop:api";
+    public static final String KEY_ISV = "sop:isv";
+    public static final String KEY_SEC = "sop:sec";
+    public static final String KEY_ISV_PERM = "sop:isv-perm";
+}

sop-gateway/src/main/java/com/gitee/sop/gateway/common/SopConstants.java

@@ -12,5 +12,6 @@ public class SopConstants {
 
     public static final Charset CHARSET_UTF8 = StandardCharsets.UTF_8;
     public static final String UTF8 = "UTF-8";
+    public static final String NULL = "null";
 
 }

sop-gateway/src/main/java/com/gitee/sop/gateway/common/enums/StatusEnum.java

@@ -1,4 +1,4 @@
-package com.gitee.sop.gateway.common;
+package com.gitee.sop.gateway.common.enums;
 
 import lombok.AllArgsConstructor;
 import lombok.Getter;

sop-gateway/src/main/java/com/gitee/sop/gateway/common/enums/YesOrNoEnum.java

@@ -0,0 +1,26 @@
+package com.gitee.sop.gateway.common.enums;
+
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+
+import java.util.Objects;
+
+/**
+ * @author 六如
+ */
+@AllArgsConstructor
+@Getter
+public enum YesOrNoEnum {
+    YES(1),
+    NO(0);
+
+    private final int value;
+
+    public static YesOrNoEnum of(Integer value) {
+        return Objects.equals(value, YES.value) ? YES : NO;
+    }
+
+    public static YesOrNoEnum of(Boolean value) {
+        return Objects.equals(value, true) ? YES : NO;
+    }
+}

sop-gateway/src/main/java/com/gitee/sop/gateway/config/IndexConfig.java

@@ -7,12 +7,15 @@ import com.gitee.sop.gateway.service.RouteService;
 import com.gitee.sop.gateway.service.RouteServiceImpl;
 import com.gitee.sop.gateway.service.interceptor.internal.ResultRouteInterceptor;
 import com.gitee.sop.gateway.service.manager.ApiManager;
+import com.gitee.sop.gateway.service.manager.IsvApiPermissionManager;
 import com.gitee.sop.gateway.service.manager.IsvManager;
 import com.gitee.sop.gateway.service.manager.SecretManager;
 import com.gitee.sop.gateway.service.manager.impl.LocalApiManagerImpl;
+import com.gitee.sop.gateway.service.manager.impl.LocalIsvApiPermissionManagerImpl;
 import com.gitee.sop.gateway.service.manager.impl.LocalIsvManagerImpl;
 import com.gitee.sop.gateway.service.manager.impl.LocalSecretManagerImpl;
 import com.gitee.sop.gateway.service.manager.impl.RedisApiManagerImpl;
+import com.gitee.sop.gateway.service.manager.impl.RedisIsvApiPermissionManagerImpl;
 import com.gitee.sop.gateway.service.manager.impl.RedisIsvManagerImpl;
 import com.gitee.sop.gateway.service.manager.impl.RedisSecretManager;
 import lombok.extern.slf4j.Slf4j;
@@ -66,6 +69,18 @@ public class IndexConfig {
         return new RedisSecretManager();
     }
 
+    @Bean
+    @ConditionalOnProperty(value = "gateway.manager.isv-api-perm", havingValue = "local", matchIfMissing = true)
+    public IsvApiPermissionManager localIsvApiPermissionManager() {
+        return new LocalIsvApiPermissionManagerImpl();
+    }
+
+    @Bean
+    @ConditionalOnProperty(value = "gateway.manager.isv-api-perm", havingValue = "redis")
+    public IsvApiPermissionManager redisIsvApiPermissionManager() {
+        return new RedisIsvApiPermissionManagerImpl();
+    }
+
 
     //  DEFAULT ROUTE INTERCEPTOR
     @Bean

sop-gateway/src/main/java/com/gitee/sop/gateway/controller/IndexController.java

@@ -9,7 +9,7 @@ import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
 
-import javax.annotation.Resource;
+import org.springframework.beans.factory.annotation.Autowired;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 import java.io.IOException;
@@ -22,10 +22,10 @@ import java.io.IOException;
 @Controller
 public class IndexController {
 
-    @Resource
+    @Autowired
     private RouteService routeService;
 
-    @Resource
+    @Autowired
     private ParamExecutor<HttpServletRequest, HttpServletResponse> paramExecutor;
 
     @GetMapping("/")

sop-gateway/src/main/java/com/gitee/sop/gateway/dao/entity/IsvKeys.java

@@ -1,7 +1,6 @@
 package com.gitee.sop.gateway.dao.entity;
 
 import java.time.LocalDateTime;
-import java.util.Date;
 
 import com.gitee.fastmybatis.annotation.Pk;
 import com.gitee.fastmybatis.annotation.PkStrategy;
@@ -20,9 +19,15 @@ import lombok.Data;
 @Data
 public class IsvKeys {
 
+    /**
+     * id
+     */
     private Long id;
 
-    private String appId;
+    /**
+     * isv_info.id
+     */
+    private Long isvId;
 
     /**
      * 秘钥格式，1：PKCS8(JAVA适用)，2：PKCS1(非JAVA适用)
@@ -49,8 +54,14 @@ public class IsvKeys {
      */
     private String privateKeyPlatform;
 
+    /**
+     * 添加时间
+     */
     private LocalDateTime addTime;
 
+    /**
+     * 修改时间
+     */
     private LocalDateTime updateTime;
 
 

sop-gateway/src/main/java/com/gitee/sop/gateway/dao/entity/PermGroupPermission.java

@@ -0,0 +1,48 @@
+package com.gitee.sop.gateway.dao.entity;
+
+import java.time.LocalDateTime;
+
+import com.gitee.fastmybatis.annotation.Pk;
+import com.gitee.fastmybatis.annotation.PkStrategy;
+import com.gitee.fastmybatis.annotation.Table;
+
+import lombok.Data;
+
+
+/**
+ * 表名：perm_group_permission
+ * 备注：组权限表
+ *
+ * @author 六如
+ */
+@Table(name = "perm_group_permission", pk = @Pk(name = "id", strategy = PkStrategy.INCREMENT))
+@Data
+public class PermGroupPermission {
+
+    /**
+     * id
+     */
+    private Long id;
+
+    /**
+     * 组id
+     */
+    private Long groupId;
+
+    /**
+     * api_info.id
+     */
+    private Long apiId;
+
+    /**
+     * 添加时间
+     */
+    private LocalDateTime addTime;
+
+    /**
+     * 修改时间
+     */
+    private LocalDateTime updateTime;
+
+
+}

sop-gateway/src/main/java/com/gitee/sop/gateway/dao/entity/PermIsvGroup.java

@@ -0,0 +1,39 @@
+package com.gitee.sop.gateway.dao.entity;
+
+import java.time.LocalDateTime;
+
+import com.gitee.fastmybatis.annotation.Pk;
+import com.gitee.fastmybatis.annotation.PkStrategy;
+import com.gitee.fastmybatis.annotation.Table;
+
+import lombok.Data;
+
+
+/**
+ * 表名：perm_isv_group
+ * 备注：isv分组
+ *
+ * @author 六如
+ */
+@Table(name = "perm_isv_group", pk = @Pk(name = "id", strategy = PkStrategy.INCREMENT))
+@Data
+public class PermIsvGroup {
+
+    private Long id;
+
+    /**
+     * isv_info表id
+     */
+    private Long isvId;
+
+    /**
+     * 组id
+     */
+    private Long groupId;
+
+    private LocalDateTime addTime;
+
+    private LocalDateTime updateTime;
+
+
+}

sop-gateway/src/main/java/com/gitee/sop/gateway/dao/mapper/ApiInfoMapper.java

@@ -3,10 +3,12 @@ package com.gitee.sop.gateway.dao.mapper;
 
 import com.gitee.fastmybatis.core.mapper.BaseMapper;
 import com.gitee.sop.gateway.dao.entity.ApiInfo;
+import org.apache.ibatis.annotations.Mapper;
 
 /**
  * @author 六如
  */
+@Mapper
 public interface ApiInfoMapper extends BaseMapper<ApiInfo> {
 
     default ApiInfo getByNameVersion(String apiName, String apiVersion) {

sop-gateway/src/main/java/com/gitee/sop/gateway/dao/mapper/IsvInfoMapper.java

@@ -2,10 +2,12 @@ package com.gitee.sop.gateway.dao.mapper;
 
 import com.gitee.fastmybatis.core.mapper.BaseMapper;
 import com.gitee.sop.gateway.dao.entity.IsvInfo;
+import org.apache.ibatis.annotations.Mapper;
 
 /**
  * @author 六如
  */
+@Mapper
 public interface IsvInfoMapper extends BaseMapper<IsvInfo> {
 
     default IsvInfo getByAppId(String appId) {

sop-gateway/src/main/java/com/gitee/sop/gateway/dao/mapper/IsvKeysMapper.java

@@ -2,14 +2,16 @@ package com.gitee.sop.gateway.dao.mapper;
 
 import com.gitee.fastmybatis.core.mapper.BaseMapper;
 import com.gitee.sop.gateway.dao.entity.IsvKeys;
+import org.apache.ibatis.annotations.Mapper;
 
 /**
  * @author 六如
  */
+@Mapper
 public interface IsvKeysMapper extends BaseMapper<IsvKeys> {
 
-    default IsvKeys getByAppId(String appId) {
+    default IsvKeys getByIsvId(Long isvId) {
-        return this.get(IsvKeys::getAppId, appId);
+        return this.get(IsvKeys::getIsvId, isvId);
     }
 
 }

sop-gateway/src/main/java/com/gitee/sop/gateway/dao/mapper/PermGroupPermissionMapper.java

@@ -0,0 +1,13 @@
+package com.gitee.sop.gateway.dao.mapper;
+
+import com.gitee.fastmybatis.core.mapper.BaseMapper;
+import com.gitee.sop.gateway.dao.entity.PermGroupPermission;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * @author 六如
+ */
+@Mapper
+public interface PermGroupPermissionMapper extends BaseMapper<PermGroupPermission> {
+
+}

sop-gateway/src/main/java/com/gitee/sop/gateway/dao/mapper/PermIsvGroupMapper.java

@@ -0,0 +1,13 @@
+package com.gitee.sop.gateway.dao.mapper;
+
+import com.gitee.fastmybatis.core.mapper.BaseMapper;
+import com.gitee.sop.gateway.dao.entity.PermIsvGroup;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * @author 六如
+ */
+@Mapper
+public interface PermIsvGroupMapper extends BaseMapper<PermIsvGroup> {
+
+}

sop-gateway/src/main/java/com/gitee/sop/gateway/service/ParamExecutorImpl.java

@@ -15,7 +15,7 @@ import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.io.IOUtils;
 import org.apache.commons.lang3.StringUtils;
 
-import javax.annotation.Resource;
+import org.springframework.beans.factory.annotation.Autowired;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 import java.io.IOException;
@@ -36,7 +36,7 @@ public class ParamExecutorImpl implements ParamExecutor<HttpServletRequest, Http
     private static final String MULTIPART = "multipart";
     private static final String FORM = "form";
 
-    @Resource
+    @Autowired
     private ApiConfig apiConfig;
 
     @Override

sop-gateway/src/main/java/com/gitee/sop/gateway/service/RouteServiceImpl.java

@@ -26,7 +26,7 @@ import org.springframework.util.ObjectUtils;
 import org.springframework.web.multipart.MultipartFile;
 
 import javax.annotation.PostConstruct;
-import javax.annotation.Resource;
+import org.springframework.beans.factory.annotation.Autowired;
 import java.io.IOException;
 import java.util.ArrayList;
 import java.util.Collection;
@@ -44,13 +44,13 @@ import java.util.Optional;
 @Slf4j
 public class RouteServiceImpl implements RouteService {
 
-    @Resource
+    @Autowired
     protected Validator validator;
 
-    @Resource
+    @Autowired
     protected GenericServiceInvoker genericServiceInvoker;
 
-    @Resource
+    @Autowired
     protected ExceptionExecutor exceptionExecutor;
 
     @Autowired(required = false)

sop-gateway/src/main/java/com/gitee/sop/gateway/service/dubbo/ApiRegisterServiceImpl.java

@@ -1,7 +1,7 @@
 package com.gitee.sop.gateway.service.dubbo;
 
 import com.gitee.sop.gateway.common.ApiInfoDTO;
-import com.gitee.sop.gateway.common.StatusEnum;
+import com.gitee.sop.gateway.common.enums.StatusEnum;
 import com.gitee.sop.gateway.dao.entity.ApiInfo;
 import com.gitee.sop.gateway.dao.mapper.ApiInfoMapper;
 import com.gitee.sop.gateway.service.manager.ApiManager;
@@ -11,7 +11,7 @@ import com.gitee.sop.support.service.dto.RegisterDTO;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.dubbo.config.annotation.DubboService;
 
-import javax.annotation.Resource;
+import org.springframework.beans.factory.annotation.Autowired;
 
 /**
  * @author 六如
@@ -20,10 +20,12 @@ import javax.annotation.Resource;
 @DubboService
 public class ApiRegisterServiceImpl implements ApiRegisterService {
 
-    @Resource
+    private static final int REG_SOURCE_SYS = 1;
+
+    @Autowired
     private ApiManager apiCacheManager;
 
-    @Resource
+    @Autowired
     private ApiInfoMapper apiInfoMapper;
 
     @Override
@@ -37,7 +39,7 @@ public class ApiRegisterServiceImpl implements ApiRegisterService {
             apiInfo = new ApiInfo();
         }
         CopyUtil.copyPropertiesIgnoreNull(apiInfoDTO, apiInfo);
-        apiInfo.setRegSource(1);
+        apiInfo.setRegSource(REG_SOURCE_SYS);
         // 保存到数据库
         apiInfoMapper.saveOrUpdate(apiInfo);
         // 保存到缓存

sop-gateway/src/main/java/com/gitee/sop/gateway/service/dubbo/IsvServiceImpl.java

@@ -1,26 +0,0 @@
-package com.gitee.sop.gateway.service.dubbo;
-
-import com.gitee.sop.gateway.service.manager.IsvManager;
-import com.gitee.sop.support.service.IsvService;
-import lombok.extern.slf4j.Slf4j;
-import org.apache.dubbo.config.annotation.DubboService;
-
-import javax.annotation.Resource;
-
-/**
- * @author 六如
- */
-@DubboService
-@Slf4j
-public class IsvServiceImpl implements IsvService {
-
-    @Resource
-    private IsvManager isvManager;
-
-    @Override
-    public void refresh(String appId) {
-        log.info("refresh Isv, appId={}", appId);
-        // 刷新isv信息
-        isvManager.reload(appId);
-    }
-}

sop-gateway/src/main/java/com/gitee/sop/gateway/service/dubbo/RefreshServiceImpl.java

@@ -0,0 +1,50 @@
+package com.gitee.sop.gateway.service.dubbo;
+
+import com.gitee.sop.gateway.service.manager.ApiManager;
+import com.gitee.sop.gateway.service.manager.IsvApiPermissionManager;
+import com.gitee.sop.gateway.service.manager.IsvManager;
+import com.gitee.sop.gateway.service.manager.SecretManager;
+import com.gitee.sop.support.service.RefreshService;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.dubbo.config.annotation.DubboService;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import java.util.Collection;
+
+/**
+ * @author 六如
+ */
+@DubboService
+@Slf4j
+public class RefreshServiceImpl implements RefreshService {
+
+    @Autowired
+    private IsvManager isvManager;
+    @Autowired
+    private SecretManager secretManager;
+    @Autowired
+    private IsvApiPermissionManager isvApiPermissionManager;
+    @Autowired
+    private ApiManager apiManager;
+
+    @Override
+    public void refreshApi(Collection<Long> apiIds) {
+        apiManager.refresh(apiIds);
+    }
+
+    @Override
+    public void refreshIsv(Collection<String> appIds) {
+        isvManager.refresh(appIds);
+    }
+
+    @Override
+    public void refreshIsvPerm(Collection<Long> isvIds) {
+        isvApiPermissionManager.refresh(isvIds);
+    }
+
+
+    @Override
+    public void refreshSecret(Collection<Long> isvIds) {
+        secretManager.refresh(isvIds);
+    }
+}

sop-gateway/src/main/java/com/gitee/sop/gateway/service/manager/ApiManager.java

@@ -2,12 +2,14 @@ package com.gitee.sop.gateway.service.manager;
 
 import com.gitee.sop.gateway.common.ApiInfoDTO;
 
+import java.util.Collection;
+import java.util.Map;
 import java.util.function.Supplier;
 
 /**
  * @author 六如
  */
-public interface ApiManager {
+public interface ApiManager extends Manager<Collection<Long>, Map<Long, ApiInfoDTO>> {
 
     void save(ApiInfoDTO apiInfoDTO);
 

sop-gateway/src/main/java/com/gitee/sop/gateway/service/manager/CacheManager.java

@@ -0,0 +1,9 @@
+package com.gitee.sop.gateway.service.manager;
+
+/**
+ * @author 六如
+ */
+public interface CacheManager {
+
+
+}

sop-gateway/src/main/java/com/gitee/sop/gateway/service/manager/IsvApiPermissionManager.java

@@ -1,12 +1,24 @@
 package com.gitee.sop.gateway.service.manager;
 
+import com.gitee.sop.gateway.common.ApiInfoDTO;
+
+import java.util.Collection;
+import java.util.Collections;
+import java.util.List;
+import java.util.Map;
+
 /**
  * isv接口授权管理
  *
  * @author 六如
  */
-public interface IsvApiPermissionManager {
+public interface IsvApiPermissionManager extends Manager<Collection<Long>, Map<Long, List<Long>>> {
-
-    boolean hasPermission(String appId, String apiNameVersion);
 
+    /**
+     * isv是否可以访问接口
+     * @param isvId isvId
+     * @param apiInfoDTO apiInfoDTO
+     * @return true:能访问
+     */
+    boolean hasPermission(Long isvId, ApiInfoDTO apiInfoDTO);
 }

sop-gateway/src/main/java/com/gitee/sop/gateway/service/manager/IsvManager.java

@@ -2,10 +2,13 @@ package com.gitee.sop.gateway.service.manager;
 
 import com.gitee.sop.gateway.service.manager.dto.IsvDTO;
 
+import java.util.Collection;
+import java.util.Map;
+
 /**
  * @author 六如
  */
-public interface IsvManager {
+public interface IsvManager extends Manager<Collection<String>, Map<String, IsvDTO>> {
 
     /**
      * 获取isv信息
@@ -14,11 +17,4 @@ public interface IsvManager {
      * @return 返回isv信息, 没有返回null
      */
     IsvDTO getIsv(String appId);
-
-    /**
-     * 重新加载isv信息到内存中
-     *
-     * @param appId appId
-     */
-    void reload(String appId);
 }

sop-gateway/src/main/java/com/gitee/sop/gateway/service/manager/Manager.java

@@ -0,0 +1,16 @@
+package com.gitee.sop.gateway.service.manager;
+
+/**
+ * @param <T> 入参
+ * @param <R> 出参
+ * @author 六如
+ */
+public interface Manager<T, R> {
+
+    R refresh(T id);
+
+    default void init() {
+
+    }
+
+}

sop-gateway/src/main/java/com/gitee/sop/gateway/service/manager/SecretManager.java

@@ -1,19 +1,20 @@
 package com.gitee.sop.gateway.service.manager;
 
+import java.util.Collection;
+import java.util.Map;
+
 /**
  * 秘钥管理
  *
  * @author 六如
  */
-public interface SecretManager {
+public interface SecretManager extends Manager<Collection<Long>, Map<Long, String>> {
 
     /**
      * 获取用户上传的公钥
      *
-     * @param appId appId
+     * @param isvId isvId
      * @return 返回公钥内容
      */
-    String getIsvPublicKey(String appId);
+    String getIsvPublicKey(Long isvId);
-
-    String reload(String appId);
 }

sop-gateway/src/main/java/com/gitee/sop/gateway/service/manager/dto/IsvDTO.java

@@ -8,6 +8,8 @@ import lombok.Data;
 @Data
 public class IsvDTO {
 
+    private Long id;
+
     private String appId;
 
     private Integer status;

sop-gateway/src/main/java/com/gitee/sop/gateway/service/manager/impl/IsvApiPermissionManagerImpl.java

@@ -1,16 +0,0 @@
-package com.gitee.sop.gateway.service.manager.impl;
-
-import com.gitee.sop.gateway.service.manager.IsvApiPermissionManager;
-import org.springframework.stereotype.Service;
-
-/**
- * @author 六如
- */
-@Service
-public class IsvApiPermissionManagerImpl implements IsvApiPermissionManager {
-
-    @Override
-    public boolean hasPermission(String appId, String apiNameVersion) {
-        return false;
-    }
-}

sop-gateway/src/main/java/com/gitee/sop/gateway/service/manager/impl/LocalApiManagerImpl.java

@@ -6,20 +6,26 @@ import com.gitee.sop.gateway.dao.mapper.ApiInfoMapper;
 import com.gitee.sop.gateway.service.manager.ApiManager;
 import com.gitee.sop.gateway.util.CopyUtil;
 
-import javax.annotation.Resource;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+
+import java.util.Collection;
+import java.util.Collections;
 import java.util.Map;
 import java.util.Optional;
 import java.util.concurrent.ConcurrentHashMap;
+import java.util.function.Function;
 
 /**
  * 本地存储接口信息.
  * @author 六如
  */
+@Slf4j
 public class LocalApiManagerImpl implements ApiManager {
 
     private static final Map<String, Optional<ApiInfoDTO>> CACHE = new ConcurrentHashMap<>();
 
-    @Resource
+    @Autowired
     protected ApiInfoMapper apiInfoMapper;
 
     @Override
@@ -28,6 +34,7 @@ public class LocalApiManagerImpl implements ApiManager {
         CACHE.put(key, Optional.of(apiInfoDTO));
     }
 
+
     @Override
     public ApiInfoDTO get(String apiName, String apiVersion) {
         String key = apiName + apiVersion;
@@ -36,4 +43,24 @@ public class LocalApiManagerImpl implements ApiManager {
             return Optional.ofNullable(CopyUtil.copyBean(apiInfo, ApiInfoDTO::new));
         }).orElse(null);
     }
+
+    @Override
+    public Map<Long, ApiInfoDTO> refresh(Collection<Long> id) {
+        log.info("刷新api信息, id={}", id);
+        Map<Long, ApiInfo> apiIdMap = apiInfoMapper.query()
+                .in(ApiInfo::getId, id)
+                .map(ApiInfo::getId, Function.identity());
+
+        apiIdMap.values().forEach(this::cache);
+        return Collections.emptyMap();
+    }
+
+    protected ApiInfoDTO cache(ApiInfo apiInfo) {
+        ApiInfoDTO apiInfoDTO = CopyUtil.copyBean(apiInfo, ApiInfoDTO::new);
+        String key = apiInfoDTO.buildApiNameVersion();
+        CACHE.put(key, Optional.of(apiInfoDTO));
+        log.info("更新接口本地缓存, apiInfoDTO={}", apiInfoDTO);
+        return apiInfoDTO;
+    }
+
 }

sop-gateway/src/main/java/com/gitee/sop/gateway/service/manager/impl/LocalIsvApiPermissionManagerImpl.java

@@ -0,0 +1,99 @@
+package com.gitee.sop.gateway.service.manager.impl;
+
+import com.gitee.sop.gateway.common.ApiInfoDTO;
+import com.gitee.sop.gateway.common.enums.YesOrNoEnum;
+import com.gitee.sop.gateway.dao.entity.ApiInfo;
+import com.gitee.sop.gateway.dao.entity.PermGroupPermission;
+import com.gitee.sop.gateway.dao.entity.PermIsvGroup;
+import com.gitee.sop.gateway.dao.mapper.ApiInfoMapper;
+import com.gitee.sop.gateway.dao.mapper.PermGroupPermissionMapper;
+import com.gitee.sop.gateway.dao.mapper.PermIsvGroupMapper;
+import com.gitee.sop.gateway.service.manager.IsvApiPermissionManager;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.util.CollectionUtils;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Objects;
+
+/**
+ * 缓存ISV接口权限
+ *
+ * @author 六如
+ */
+@Slf4j
+public class LocalIsvApiPermissionManagerImpl implements IsvApiPermissionManager {
+
+    // key:isvId, value: List<apiName+apiVersion>
+    private static final Map<Long, List<Long>> CACHE = new HashMap<>();
+
+    @Autowired
+    private PermGroupPermissionMapper permGroupPermissionMapper;
+    @Autowired
+    private PermIsvGroupMapper permIsvGroupMapper;
+    @Autowired
+    private ApiInfoMapper apiInfoMapper;
+
+    @Override
+    public boolean hasPermission(Long isvId, ApiInfoDTO apiInfoDTO) {
+        // 通用接口都可以访问
+        if (Objects.equals(apiInfoDTO.getIsPermission(), YesOrNoEnum.NO.getValue())) {
+            return true;
+        }
+        return doCheck(isvId, apiInfoDTO);
+    }
+
+    public boolean doCheck(Long isvId, ApiInfoDTO apiInfoDTO) {
+        List<Long> apiNameVerionList = CACHE.computeIfAbsent(isvId, k -> this.listApiId(isvId));
+        if (CollectionUtils.isEmpty(apiNameVerionList)) {
+            return false;
+        }
+        return apiNameVerionList.contains(apiInfoDTO.getId());
+    }
+
+    @Override
+    public Map<Long, List<Long>> refresh(Collection<Long> isvIds) {
+        log.info("刷新isv接口权限, isvIds={}", isvIds);
+        if (CollectionUtils.isEmpty(isvIds)) {
+            return Collections.emptyMap();
+        }
+        Map<Long, List<Long>> map = new HashMap<>(isvIds.size() * 2);
+        for (Long isvId : isvIds) {
+            List<Long> apiIdList = this.listApiId(isvId);
+            map.put(isvId, apiIdList);
+            // 缓存
+            cache(isvId, apiIdList);
+        }
+        return map;
+    }
+
+    protected void cache(Long isvId, List<Long> apiIdList) {
+        CACHE.put(isvId, apiIdList);
+        log.info("更新isv接口id本地缓存, isvId={}, apiIdList={}", isvId, apiIdList);
+    }
+
+    protected List<Long> listApiId(Long isvId) {
+        List<Long> groupIds = permIsvGroupMapper.query()
+                .eq(PermIsvGroup::getIsvId, isvId)
+                .listUniqueValue(PermIsvGroup::getGroupId);
+        if (groupIds.isEmpty()) {
+            return Collections.emptyList();
+        }
+        List<Long> apiIdList = permGroupPermissionMapper.query()
+                .in(PermGroupPermission::getGroupId, groupIds)
+                .listUniqueValue(PermGroupPermission::getApiId);
+        if (apiIdList.isEmpty()) {
+            return Collections.emptyList();
+        }
+        return apiInfoMapper.query()
+                .select(ApiInfo::getApiName, ApiInfo::getApiVersion)
+                .in(ApiInfo::getId, apiIdList)
+                .listUniqueValue(ApiInfo::getId);
+    }
+
+
+}

sop-gateway/src/main/java/com/gitee/sop/gateway/service/manager/impl/LocalIsvManagerImpl.java

@@ -5,8 +5,13 @@ import com.gitee.sop.gateway.dao.mapper.IsvInfoMapper;
 import com.gitee.sop.gateway.service.manager.IsvManager;
 import com.gitee.sop.gateway.service.manager.dto.IsvDTO;
 import com.gitee.sop.gateway.util.CopyUtil;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.util.CollectionUtils;
 
-import javax.annotation.Resource;
+import org.springframework.beans.factory.annotation.Autowired;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.HashMap;
 import java.util.Map;
 import java.util.Optional;
 import java.util.concurrent.ConcurrentHashMap;
@@ -14,12 +19,12 @@ import java.util.concurrent.ConcurrentHashMap;
 /**
  * @author 六如
  */
+@Slf4j
 public class LocalIsvManagerImpl implements IsvManager {
 
     private static final Map<String, Optional<IsvDTO>> CACHE = new ConcurrentHashMap<>();
 
-
+    @Autowired
-    @Resource
     protected IsvInfoMapper isvInfoMapper;
 
     @Override
@@ -31,10 +36,25 @@ public class LocalIsvManagerImpl implements IsvManager {
     }
 
     @Override
-    public void reload(String appId) {
+    public Map<String, IsvDTO> refresh(Collection<String> appIds) {
-        IsvInfo isvInfo = isvInfoMapper.getByAppId(appId);
+        log.info("刷新isv, appId={}", appIds);
-        IsvDTO isvDTO = CopyUtil.copyBean(isvInfo, IsvDTO::new);
+        if (CollectionUtils.isEmpty(appIds)) {
+            return Collections.emptyMap();
+        }
+        Map<String, IsvDTO> map = new HashMap<>(appIds.size() * 2);
+        for (String appId : appIds) {
+            IsvInfo isvInfo = isvInfoMapper.getByAppId(appId);
+            IsvDTO isvDTO = CopyUtil.copyBean(isvInfo, IsvDTO::new);
+            map.put(appId, isvDTO);
+
+            cache(appId, isvDTO);
+        }
+        return map;
+    }
+
+    protected void cache(String appId, IsvDTO isvDTO) {
         CACHE.put(appId, Optional.ofNullable(isvDTO));
+        log.info("更新isv本地缓存, isvDTO={}", isvDTO);
     }
 
 }

sop-gateway/src/main/java/com/gitee/sop/gateway/service/manager/impl/LocalSecretManagerImpl.java

@@ -3,8 +3,13 @@ package com.gitee.sop.gateway.service.manager.impl;
 import com.gitee.sop.gateway.dao.entity.IsvKeys;
 import com.gitee.sop.gateway.dao.mapper.IsvKeysMapper;
 import com.gitee.sop.gateway.service.manager.SecretManager;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.util.CollectionUtils;
 
-import javax.annotation.Resource;
+import org.springframework.beans.factory.annotation.Autowired;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.HashMap;
 import java.util.Map;
 import java.util.Optional;
 import java.util.concurrent.ConcurrentHashMap;
@@ -12,30 +17,48 @@ import java.util.concurrent.ConcurrentHashMap;
 /**
  * @author 六如
  */
+@Slf4j
 public class LocalSecretManagerImpl implements SecretManager {
 
-    private static final Map<String, Optional<String>> CACHE = new ConcurrentHashMap<>();
+    private static final Map<Long, Optional<String>> CACHE = new ConcurrentHashMap<>();
 
-    @Resource
+    @Autowired
     protected IsvKeysMapper isvKeysMapper;
 
     @Override
-    public String getIsvPublicKey(String appId) {
+    public String getIsvPublicKey(Long isvId) {
-        return CACHE.computeIfAbsent(appId, k -> {
+        return CACHE.computeIfAbsent(isvId, k -> {
-                    String publicKey = isvKeysMapper.query()
+                    String publicKey = doGetPublicKey(isvId);
-                            .eq(IsvKeys::getAppId, appId)
-                            .getValue(IsvKeys::getPublicKeyIsv);
                     return Optional.ofNullable(publicKey);
                 })
                 .orElse(null);
     }
 
     @Override
-    public String reload(String appId) {
+    public Map<Long, String> refresh(Collection<Long> isvIds) {
-        String publicKey = isvKeysMapper.query()
+        log.info("刷新isv秘钥, isvId={}", isvIds);
-                .eq(IsvKeys::getAppId, appId)
+        if (CollectionUtils.isEmpty(isvIds)) {
-                .getValue(IsvKeys::getPublicKeyIsv);
+            return Collections.emptyMap();
-        CACHE.put(appId, Optional.ofNullable(publicKey));
+        }
-        return publicKey;
+        Map<Long, String> map = new HashMap<>(isvIds.size() * 2);
+        for (Long isvId : isvIds) {
+            String publicKey = doGetPublicKey(isvId);
+            map.put(isvId, publicKey);
+
+            this.cache(isvId, publicKey);
+        }
+        return map;
     }
+
+    protected void cache(Long isvId, String publicKey) {
+        CACHE.put(isvId, Optional.ofNullable(publicKey));
+        log.info("更新isv秘钥本地缓存, isvId={}", isvId);
+    }
+
+    protected String doGetPublicKey(Long isvId) {
+        return isvKeysMapper.query()
+                .eq(IsvKeys::getIsvId, isvId)
+                .getValue(IsvKeys::getPublicKeyIsv);
+    }
+
 }

sop-gateway/src/main/java/com/gitee/sop/gateway/service/manager/impl/RedisApiManagerImpl.java

@@ -1,14 +1,17 @@
 package com.gitee.sop.gateway.service.manager.impl;
 
 import com.gitee.sop.gateway.common.ApiInfoDTO;
+import com.gitee.sop.gateway.common.CacheKey;
 import com.gitee.sop.gateway.dao.entity.ApiInfo;
 import com.gitee.sop.gateway.util.CopyUtil;
 import com.gitee.sop.gateway.util.JsonUtil;
 import lombok.extern.slf4j.Slf4j;
+import org.springframework.data.redis.core.BoundHashOperations;
 import org.springframework.data.redis.core.StringRedisTemplate;
+import org.springframework.util.ObjectUtils;
 
 import javax.annotation.PostConstruct;
-import javax.annotation.Resource;
+import org.springframework.beans.factory.annotation.Autowired;
 import java.util.List;
 
 /**
@@ -19,10 +22,10 @@ import java.util.List;
 @Slf4j
 public class RedisApiManagerImpl extends LocalApiManagerImpl {
 
-    private static final String KEY_API = "sop:api";
+    private static final String KEY_API = CacheKey.KEY_API;
 
-    @Resource
+    @Autowired
-    private StringRedisTemplate stringRedisTemplate;
+    StringRedisTemplate stringRedisTemplate;
 
     @Override
     public void save(ApiInfoDTO apiInfoDTO) {
@@ -30,20 +33,33 @@ public class RedisApiManagerImpl extends LocalApiManagerImpl {
         stringRedisTemplate.opsForHash().put(KEY_API, key, JsonUtil.toJSONString(apiInfoDTO));
     }
 
-    protected void cache(String key, ApiInfo apiInfo) {
+    protected ApiInfoDTO cache(ApiInfo apiInfo) {
+        String key = apiInfo.getApiName() + apiInfo.getApiVersion();
         ApiInfoDTO apiInfoDTO = CopyUtil.copyBean(apiInfo, ApiInfoDTO::new);
         stringRedisTemplate.opsForHash().put(KEY_API, key, JsonUtil.toJSONString(apiInfoDTO));
+        log.info("更新接口redis缓存, apiInfoDTO={}", apiInfoDTO);
+        return apiInfoDTO;
     }
 
     @Override
     public ApiInfoDTO get(String apiName, String apiVersion) {
         String key = apiName + apiVersion;
         try {
-            Object value = stringRedisTemplate.opsForHash().get(KEY_API, key);
+            BoundHashOperations<String, String, String> operations = stringRedisTemplate.boundHashOps(KEY_API);
+            String value = operations.get(key);
             if (value == null) {
+                // 从数据库中读取
+                ApiInfo apiInfo = apiInfoMapper.getByNameVersion(apiName, apiVersion);
+                if (apiInfo == null) {
+                    operations.put(key, "");
+                    return null;
+                }
+                return this.cache(apiInfo);
+            }
+            if (ObjectUtils.isEmpty(value)) {
                 return null;
             }
-            return JsonUtil.parseObject(String.valueOf(value), ApiInfoDTO.class);
+            return JsonUtil.parseObject(value, ApiInfoDTO.class);
         } catch (Exception e) {
             log.error("redis访问失败", e);
             return super.get(apiName, apiVersion);
@@ -55,8 +71,7 @@ public class RedisApiManagerImpl extends LocalApiManagerImpl {
         log.info("load apiInfo to redis");
         List<ApiInfo> apiInfos = this.apiInfoMapper.listAll();
         for (ApiInfo apiInfo : apiInfos) {
-            String key = apiInfo.getApiName() + apiInfo.getApiVersion();
+            this.cache(apiInfo);
-            this.cache(key, apiInfo);
         }
     }
 }

sop-gateway/src/main/java/com/gitee/sop/gateway/service/manager/impl/RedisIsvApiPermissionManagerImpl.java

@@ -0,0 +1,71 @@
+package com.gitee.sop.gateway.service.manager.impl;
+
+import com.gitee.sop.gateway.common.ApiInfoDTO;
+import com.gitee.sop.gateway.common.CacheKey;
+import com.gitee.sop.gateway.common.SopConstants;
+import com.gitee.sop.gateway.dao.entity.IsvInfo;
+import com.gitee.sop.gateway.dao.mapper.IsvInfoMapper;
+import com.gitee.sop.gateway.util.JsonUtil;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.data.redis.core.BoundHashOperations;
+import org.springframework.data.redis.core.StringRedisTemplate;
+
+import javax.annotation.PostConstruct;
+import org.springframework.beans.factory.annotation.Autowired;
+import java.util.Collections;
+import java.util.List;
+import java.util.Map;
+import java.util.Objects;
+import java.util.Set;
+import java.util.stream.Collectors;
+
+/**
+ * @author 六如
+ */
+@Slf4j
+public class RedisIsvApiPermissionManagerImpl extends LocalIsvApiPermissionManagerImpl {
+
+    private static final String CACHE_KEY = CacheKey.KEY_ISV_PERM;
+
+    @Autowired
+    private StringRedisTemplate stringRedisTemplate;
+
+    @Autowired
+    private IsvInfoMapper isvInfoMapper;
+
+    @Override
+    public boolean doCheck(Long isvId, ApiInfoDTO apiInfoDTO) {
+        BoundHashOperations<String, Object, String> operations = stringRedisTemplate.boundHashOps(CACHE_KEY);
+        String value = operations.get(isvId);
+        if (Objects.equals(value, SopConstants.NULL)) {
+            return false;
+        }
+        List<Long> apiIdList;
+        if (value == null) {
+            Map<Long, List<Long>> cache = this.refresh(Collections.singletonList(isvId));
+            apiIdList = cache.get(isvId);
+        } else {
+            apiIdList = JsonUtil.parseArray(value, Long.class);
+        }
+        return apiIdList != null && apiIdList.contains(apiInfoDTO.getId());
+    }
+
+
+    @Override
+    protected void cache(Long isvId, List<Long> apiIdList) {
+        stringRedisTemplate.opsForHash().put(CACHE_KEY, isvId, JsonUtil.toJSONString(apiIdList));
+        log.info("更新isv接口id redis缓存, isvId={}, apiIdList={}", isvId, apiIdList);
+    }
+
+    @PostConstruct
+    @Override
+    public void init() {
+        Set<Long> isvIds = isvInfoMapper.listAll()
+                .stream()
+                .map(IsvInfo::getId)
+                .collect(Collectors.toSet());
+        this.refresh(isvIds);
+    }
+
+
+}

sop-gateway/src/main/java/com/gitee/sop/gateway/service/manager/impl/RedisIsvManagerImpl.java

@@ -1,5 +1,7 @@
 package com.gitee.sop.gateway.service.manager.impl;
 
+import com.gitee.sop.gateway.common.CacheKey;
+import com.gitee.sop.gateway.common.SopConstants;
 import com.gitee.sop.gateway.dao.entity.IsvInfo;
 import com.gitee.sop.gateway.service.manager.dto.IsvDTO;
 import com.gitee.sop.gateway.util.CopyUtil;
@@ -8,8 +10,11 @@ import lombok.extern.slf4j.Slf4j;
 import org.springframework.data.redis.core.StringRedisTemplate;
 
 import javax.annotation.PostConstruct;
-import javax.annotation.Resource;
+import org.springframework.beans.factory.annotation.Autowired;
+import java.util.Collections;
 import java.util.List;
+import java.util.Map;
+import java.util.Objects;
 
 /**
  * @author 六如
@@ -17,19 +22,21 @@ import java.util.List;
 @Slf4j
 public class RedisIsvManagerImpl extends LocalIsvManagerImpl {
 
-    private static final String KEY_ISV = "sop:isv";
+    private static final String KEY_ISV = CacheKey.KEY_ISV;
 
-    @Resource
+    @Autowired
     private StringRedisTemplate stringRedisTemplate;
 
-
     @Override
     public IsvDTO getIsv(String appId) {
         try {
             Object value = stringRedisTemplate.opsForHash().get(KEY_ISV, appId);
+            if (Objects.equals(value, SopConstants.NULL)) {
+                return null;
+            }
             if (value == null) {
-                IsvInfo isvInfo = this.isvInfoMapper.getByAppId(appId);
+                Map<String, IsvDTO> cache = this.refresh(Collections.singletonList(appId));
-                return this.cache(isvInfo);
+                return cache.get(appId);
             }
             return JsonUtil.parseObject(String.valueOf(value), IsvDTO.class);
         } catch (Exception e) {
@@ -39,23 +46,19 @@ public class RedisIsvManagerImpl extends LocalIsvManagerImpl {
     }
 
     @Override
-    public void reload(String appId) {
+    protected void cache(String appId, IsvDTO isvDTO) {
-        IsvInfo isvInfo = isvInfoMapper.getByAppId(appId);
+        stringRedisTemplate.opsForHash().put(KEY_ISV, appId, JsonUtil.toJSONString(isvDTO));
-        this.cache(isvInfo);
+        log.info("更新isv redis缓存, isvDTO={}", isvDTO);
     }
 
     @PostConstruct
+    @Override
     public void init() {
         log.info("load isvInfo to redis");
         List<IsvInfo> isvInfos = this.isvInfoMapper.listAll();
         for (IsvInfo isvInfo : isvInfos) {
-            this.cache(isvInfo);
+            this.cache(isvInfo.getAppId(), CopyUtil.copyBean(isvInfo, IsvDTO::new));
         }
     }
 
-    protected IsvDTO cache(IsvInfo isvInfo) {
-        IsvDTO isvDTO = CopyUtil.copyBean(isvInfo, IsvDTO::new);
-        stringRedisTemplate.opsForHash().put(KEY_ISV, isvInfo.getAppId(), JsonUtil.toJSONString(isvDTO));
-        return isvDTO;
-    }
 }

sop-gateway/src/main/java/com/gitee/sop/gateway/service/manager/impl/RedisSecretManager.java

@@ -1,13 +1,17 @@
 package com.gitee.sop.gateway.service.manager.impl;
 
+import com.gitee.sop.gateway.common.CacheKey;
+import com.gitee.sop.gateway.common.SopConstants;
 import com.gitee.sop.gateway.dao.entity.IsvKeys;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.data.redis.core.StringRedisTemplate;
 
 import javax.annotation.PostConstruct;
-import javax.annotation.Resource;
+import org.springframework.beans.factory.annotation.Autowired;
+import java.util.Collections;
 import java.util.List;
-import java.util.Optional;
+import java.util.Map;
+import java.util.Objects;
 
 /**
  * @author 六如
@@ -15,44 +19,45 @@ import java.util.Optional;
 @Slf4j
 public class RedisSecretManager extends LocalSecretManagerImpl {
 
-    private static final String KEY_ISV = "sop:sec";
+    private static final String KEY_SEC = CacheKey.KEY_SEC;
 
-    @Resource
+    @Autowired
     private StringRedisTemplate stringRedisTemplate;
 
     @Override
-    public String getIsvPublicKey(String appId) {
+    public String getIsvPublicKey(Long isvId) {
         try {
-            Object value = stringRedisTemplate.opsForHash().get(KEY_ISV, appId);
+            Object value = stringRedisTemplate.opsForHash().get(KEY_SEC, isvId);
+            if (Objects.equals(value, SopConstants.NULL)) {
+                return null;
+            }
             if (value == null) {
-                return this.reload(appId);
+                Map<Long, String> cache = this.refresh(Collections.singletonList(isvId));
+                return cache.get(isvId);
             }
             return String.valueOf(value);
         } catch (Exception e) {
             log.error("操作redis失败", e);
-            return super.getIsvPublicKey(appId);
+            return super.getIsvPublicKey(isvId);
         }
     }
 
     @Override
-    public String reload(String appId) {
+    protected void cache(Long isvId, String publicKey) {
-        IsvKeys isvKeys = this.isvKeysMapper.getByAppId(appId);
+        if (publicKey == null) {
-        return this.cache(appId, isvKeys);
+            publicKey = SopConstants.NULL;
-    }
+        }
-
+        stringRedisTemplate.opsForHash().put(KEY_SEC, isvId, publicKey);
-
+        log.info("更新isv秘钥redis缓存, isvId={}", isvId);
-    protected String cache(String appId, IsvKeys isvKeys) {
-        String publicKey = Optional.ofNullable(isvKeys).map(IsvKeys::getPublicKeyIsv).orElse("");
-        stringRedisTemplate.opsForHash().put(KEY_ISV, appId, publicKey);
-        return publicKey;
     }
 
     @PostConstruct
+    @Override
     public void init() {
         log.info("load isvKey to redis");
         List<IsvKeys> isvKeys = this.isvKeysMapper.listAll();
         for (IsvKeys isvKey : isvKeys) {
-            this.cache(isvKey.getAppId(), isvKey);
+            this.cache(isvKey.getIsvId(), isvKey.getPublicKeyIsv());
         }
     }
 

sop-gateway/src/main/java/com/gitee/sop/gateway/service/validate/ApiValidator.java

@@ -1,7 +1,7 @@
 package com.gitee.sop.gateway.service.validate;
 
 import com.gitee.sop.gateway.common.ApiInfoDTO;
-import com.gitee.sop.gateway.common.StatusEnum;
+import com.gitee.sop.gateway.common.enums.StatusEnum;
 import com.gitee.sop.gateway.config.ApiConfig;
 import com.gitee.sop.gateway.exception.ApiException;
 import com.gitee.sop.gateway.message.ErrorEnum;
@@ -24,7 +24,7 @@ import org.springframework.util.unit.DataSize;
 import org.springframework.web.multipart.MultipartFile;
 
 import javax.annotation.PostConstruct;
-import javax.annotation.Resource;
+import org.springframework.beans.factory.annotation.Autowired;
 import java.time.Duration;
 import java.time.LocalDateTime;
 import java.time.format.DateTimeFormatter;
@@ -55,25 +55,25 @@ public class ApiValidator implements Validator {
     @Value("${upload.total-file-max-size}")
     private DataSize maxFileSize;
 
-    @Resource
+    @Autowired
     private Signer signer;
 
-    @Resource
+    @Autowired
     private ApiConfig apiConfig;
 
-    @Resource
+    @Autowired
     private ApiManager apiCacheManager;
 
-    @Resource
+    @Autowired
     private IpBlacklistManager ipBlacklistManager;
 
-    @Resource
+    @Autowired
     private IsvApiPermissionManager isvApiPermissionManager;
 
-    @Resource
+    @Autowired
     private IsvManager isvManager;
 
-    @Resource
+    @Autowired
     private SecretManager secretManager;
 
     private DateTimeFormatter dateTimeFormatter;
@@ -96,7 +96,7 @@ public class ApiValidator implements Validator {
         ApiRequest apiRequest = apiRequestContext.getApiRequest();
         ApiInfoDTO apiInfo = apiCacheManager.get(apiRequest.getMethod(), apiRequest.getVersion());
         // 检查接口信息
-        checkApiInfo(apiRequestContext, apiInfo);
+        checkApiInfo(apiRequestContext, apiInfo, isvDTO);
 
         // 检查上传文件
         checkUploadFile(apiRequestContext);
@@ -105,7 +105,7 @@ public class ApiValidator implements Validator {
         return apiInfo;
     }
 
-    public void checkApiInfo(ApiRequestContext apiRequestContext, ApiInfoDTO apiInfoDTO) {
+    public void checkApiInfo(ApiRequestContext apiRequestContext, ApiInfoDTO apiInfoDTO, IsvDTO isvDTO) {
         // 检查路由是否存在
         if (apiInfoDTO == null) {
             throw new ApiException(ErrorEnum.ISV_INVALID_METHOD, apiRequestContext.getLocale());
@@ -119,8 +119,7 @@ public class ApiValidator implements Validator {
         if (needCheckPermission) {
             ApiRequest apiRequest = apiRequestContext.getApiRequest();
             String appKey = apiRequest.getAppId();
-            String nameVersion = apiRequest.takeNameVersion();
+            boolean hasPermission = isvApiPermissionManager.hasPermission(isvDTO.getId(), apiInfoDTO);
-            boolean hasPermission = isvApiPermissionManager.hasPermission(appKey, nameVersion);
             if (!hasPermission) {
                 throw new ApiException(ErrorEnum.ISV_ROUTE_NO_PERMISSIONS, apiRequestContext.getLocale());
             }
@@ -255,7 +254,7 @@ public class ApiValidator implements Validator {
                     apiRequest.takeNameVersion(), apiConfig.getSignName());
         }
         // ISV上传的公钥
-        String publicKey = secretManager.getIsvPublicKey(isv.getAppId());
+        String publicKey = secretManager.getIsvPublicKey(isv.getId());
         if (ObjectUtils.isEmpty(publicKey)) {
             throw new ApiException(ErrorEnum.ISV_MISSING_SIGNATURE_CONFIG, apiRequestContext.getLocale(),
                     apiRequest.takeNameVersion());

sop-gateway/src/main/java/com/gitee/sop/gateway/service/validate/alipay/AlipaySigner.java

@@ -12,7 +12,7 @@ import com.gitee.sop.gateway.service.validate.Signer;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Component;
 
-import javax.annotation.Resource;
+import org.springframework.beans.factory.annotation.Autowired;
 import java.util.HashMap;
 import java.util.Map;
 
@@ -26,7 +26,7 @@ import java.util.Map;
 @Component
 public class AlipaySigner implements Signer {
 
-    @Resource
+    @Autowired
     private ApiConfig apiConfig;
 
     @Override

sop-gateway/src/main/java/com/gitee/sop/gateway/util/JsonUtil.java

@@ -3,6 +3,7 @@ package com.gitee.sop.gateway.util;
 import com.alibaba.fastjson2.JSON;
 import org.springframework.util.ObjectUtils;
 
+import java.util.List;
 import java.util.Objects;
 
 /**
@@ -26,4 +27,11 @@ public class JsonUtil {
         return JSON.parseObject(value, clazz);
     }
 
+    public static <T> List<T> parseArray(String value, Class<T> clazz) {
+        if (Objects.equals(value, "null") || ObjectUtils.isEmpty(value)) {
+            return null;
+        }
+        return JSON.parseArray(value, clazz);
+    }
+
 }

sop-gateway/src/main/resources/application-test.properties

@@ -2,12 +2,8 @@ dubbo.registry.address=nacos://localhost:8848
 
 mybatis.print-sql=true
 
-# api manager,local/redis
+# manager cache type, local/redis
-gateway.manager.api=redis
+gateway.manager.cache-type=redis
-# isv manager,local/redis
-gateway.manager.isv=redis
-# secret manger,local/redis
-gateway.manager.secret=redis
 
 # mysql config
 mysql.host=127.0.0.1:3306

sop-gateway/src/main/resources/application.properties

@@ -2,28 +2,32 @@ spring.profiles.active=dev
 spring.application.name=sop-index
 server.port=8081
 
-####### index config #######
+####### gateway config #######
 # request entry path
 gateway.path=/api
+# manager cache type, local/redis
+gateway.manager.cache-type=local
 # api manager,local/redis
-gateway.manager.api=local
+gateway.manager.api=${gateway.manager.cache-type}
 # isv manager,local/redis
-gateway.manager.isv=local
+gateway.manager.isv=${gateway.manager.cache-type}
 # secret manger,local/redis
-gateway.manager.secret=local
+gateway.manager.secret=${gateway.manager.cache-type}
+# isv api permission manager,local/redis
+gateway.manager.isv-api-perm=${gateway.manager.cache-type}
 
 ####### parameter name config #######
-api.param.app-id-name=app_id
+api.app-id-name=app_id
-api.param.api-name=method
+api.api-name=method
-api.param.format-name=format
+api.format-name=format
-api.param.charset-name=charset
+api.charset-name=charset
-api.param.sign-type-name=sign_type
+api.sign-type-name=sign_type
-api.param.sign-name=sign
+api.sign-name=sign
-api.param.timestamp-name=timestamp
+api.timestamp-name=timestamp
-api.param.version-name=version
+api.version-name=version
-api.param.notify-url-name=notify_url
+api.notify-url-name=notify_url
-api.param.app-auth-token-name=app_auth_token
+api.app-auth-token-name=app_auth_token
-api.param.biz-content-name=biz_content
+api.biz-content-name=biz_content
 
 ####### other config #######
 # api request timeout
@@ -81,9 +85,10 @@ mybatis.fill.com.gitee.fastmybatis.core.support.LocalDateTimeFillInsert=add_time
 mybatis.fill.com.gitee.fastmybatis.core.support.LocalDateTimeFillUpdate=update_time
 # mybatis config file
 mybatis.config-location=classpath:mybatis/mybatisConfig.xml
-
+# print sql, true/false
+mybatis.print-sql=false
 
 # print SQL
 logging.level.com.gitee.sop.gateway.dao=error
 logging.level.com.gitee.fastmybatis=info
-mybatis.print-sql=false
+

sop-support/sop-service-support/src/main/java/com/gitee/sop/support/service/IsvService.java

@@ -1,13 +0,0 @@
-package com.gitee.sop.support.service;
-
-/**
- *
- * @author 六如
- */
-public interface IsvService {
-    /**
-     * 刷新isv
-     * @param appId
-     */
-    void refresh(String appId);
-}

sop-support/sop-service-support/src/main/java/com/gitee/sop/support/service/RefreshService.java

@@ -0,0 +1,37 @@
+package com.gitee.sop.support.service;
+
+import java.util.Collection;
+
+/**
+ * @author 六如
+ */
+public interface RefreshService {
+
+    /**
+     * 刷新api信息
+     *
+     * @param apiIds
+     */
+    void refreshApi(Collection<Long> apiIds);
+
+    /**
+     * 刷新isv
+     *
+     * @param appIds
+     */
+    void refreshIsv(Collection<String> appIds);
+
+    /**
+     * 刷新isv接口权限
+     *
+     * @param isvIds
+     */
+    void refreshIsvPerm(Collection<Long> isvIds);
+
+    /**
+     * 刷新secret
+     *
+     * @param isvIds
+     */
+    void refreshSecret(Collection<Long> isvIds);
+}