Selaa lähdekoodia

增加开放接口对于当前访问应用部署过期时间的判断

luoshi 2 vuotta sitten
vanhempi
commit
2cb87dd7b0

+ 7 - 0
src/main/java/com/qmth/ops/api/security/AccessDeploy.java

@@ -3,6 +3,8 @@ package com.qmth.ops.api.security;
 import com.qmth.boot.core.security.model.AccessEntity;
 import com.qmth.ops.biz.domain.Deploy;
 
+import java.util.Collection;
+
 public class AccessDeploy implements AccessEntity {
 
     private Deploy deploy;
@@ -21,6 +23,11 @@ public class AccessDeploy implements AccessEntity {
         return deploy.getAccessSecret();
     }
 
+    @Override
+    public Collection<String> getAllowIP() {
+        return deploy.getIpAllow();
+    }
+
     public Deploy getDeploy() {
         return deploy;
     }

+ 3 - 1
src/main/java/com/qmth/ops/api/security/OpenAuthorizationService.java

@@ -3,6 +3,7 @@ package com.qmth.ops.api.security;
 import com.qmth.boot.core.security.annotation.AuthorizationComponent;
 import com.qmth.boot.core.security.service.AuthorizationService;
 import com.qmth.boot.core.sms.model.SmsConstants;
+import com.qmth.boot.core.solar.model.AppControl;
 import com.qmth.boot.tools.signature.SignatureType;
 import com.qmth.ops.api.constants.OpsApiConstants;
 import com.qmth.ops.biz.domain.Deploy;
@@ -28,6 +29,7 @@ public class OpenAuthorizationService implements AuthorizationService<AccessDepl
 
     @Override
     public boolean hasPermission(AccessDeploy accessDeploy, String path) {
-        return true;
+        AppControl control = accessDeploy.getDeploy().getControl();
+        return control == null || !control.hasExpired();
     }
 }

+ 1 - 0
src/main/java/com/qmth/ops/biz/domain/Deploy.java

@@ -117,4 +117,5 @@ public class Deploy implements Serializable {
     public void setUpdateTime(Long updateTime) {
         this.updateTime = updateTime;
     }
+
 }