TRX 1 år sedan
förälder
incheckning
b149ffe608

+ 2 - 0
FullCardServer/src/main/java/com/zhongshu/card/server/core/service/devices/DevicePermissIotService.java

@@ -9,6 +9,7 @@ import com.github.microservice.models.devicePermiss.UserPermiss;
 import com.github.microservice.models.iot.IotSendParam;
 import com.github.microservice.models.iot.PermissionChange;
 import com.github.microservice.net.ResultContent;
+import com.github.microservice.types.FunctionType;
 import com.zhongshu.card.client.model.school.CardInfoModel;
 import com.zhongshu.card.client.type.school.CardState;
 import com.zhongshu.card.client.utils.DateUtils;
@@ -131,6 +132,7 @@ public class DevicePermissIotService {
                 IotSendParam param = new IotSendParam();
                 param.setDeviceId(deviceId);
                 param.setIdentifier("permissionNotice");
+                param.setFunctionType(FunctionType.Server);
 
                 PermissionChange change = new PermissionChange();
                 change.setTime(DateUtils.paresTime(System.currentTimeMillis(), DateUtils.FORMAT_LONG));

+ 3 - 2
FullCardServer/src/main/java/com/zhongshu/card/server/core/service/openAPI/OpenAPIRegisterService.java

@@ -31,10 +31,11 @@ public class OpenAPIRegisterService {
 
     public ResultContent initRegisterPAIS() {
         String str = restTemplate.getForObject("http://" + serviceId + "/v3/api-docs", String.class);
-        List<OpenApiInfo> openAPIS = OpenAPIScan.scanAPI(str, "一卡通", "openAPI");
+        String sign = "openAPI";
+        List<OpenApiInfo> openAPIS = OpenAPIScan.scanAPI(str, "一卡通", sign);
         RefreshApiParam param = new RefreshApiParam();
         param.setServerName(serviceId.toLowerCase());
-        param.setPredicateArgs("/openAPI/**");
+        param.setPredicateArgs(String.format("/%s/**", sign));
         param.setOpenApiInfo(openAPIS);
         param.setApiType(ApiType.FullCard.name());