更新！

FullCardServer/src/main/java/com/zhongshu/card/server/core/controller/orgManager/AreaController.java

@@ -39,11 +39,11 @@ public class AreaController {
         return this.areaService.addArea(param);
     }
 
-    //    @ResourceAuth(value = "areaManager", type = AuthType.Platform, remark = "区域管理_区域列表_160_Menu")
-    @ResourceAuth(value = "areaManager", type = AuthType.Project, remark = "区域管理_区域列表_160_Menu")
-    @ResourceAuth(value = "areaManager", type = AuthType.School, remark = "区域管理_区域列表_160_Menu")
-    @ResourceAuth(value = "areaManager", type = AuthType.BusinessMain, remark = "区域管理_区域列表_160_Menu")
-    @ResourceAuth(value = "areaManager", type = AuthType.CommonOrg, remark = "区域管理_区域列表_160_Menu")
+    //    @ResourceAuth(value = "projectAreaManager", type = AuthType.Platform, remark = "区域管理_区域列表_160_Menu")
+    @ResourceAuth(value = "projectAreaManager", type = AuthType.Project, remark = "区域管理_区域列表_160_Menu")
+    @ResourceAuth(value = "projectAreaManager", type = AuthType.School, remark = "区域管理_区域列表_160_Menu")
+    @ResourceAuth(value = "projectAreaManager", type = AuthType.BusinessMain, remark = "区域管理_区域列表_160_Menu")
+    @ResourceAuth(value = "projectAreaManager", type = AuthType.CommonOrg, remark = "区域管理_区域列表_160_Menu")
     @ResourceAuth(value = AuthConstant.SuperAdmin, type = AuthType.Platform, remark = "")
     @ResourceAuth(value = AuthConstant.Admin, type = AuthType.Project, remark = "")
     @ResourceAuth(value = AuthConstant.Admin, type = AuthType.School, remark = "")

FullCardServer/src/main/java/com/zhongshu/card/server/core/controller/orgManager/AreaTypeManagerController.java

@@ -37,11 +37,11 @@ public class AreaTypeManagerController {
     @Autowired
     DictInfoService dictInfoService;
 
-    //    @ResourceAuth(value = "areaTypeList", type = AuthType.Platform, remark = "区域管理_区域类型_161_Menu")
-    @ResourceAuth(value = "areaTypeList", type = AuthType.Project, remark = "区域管理_区域类型_161_Menu")
-    @ResourceAuth(value = "areaTypeList", type = AuthType.School, remark = "区域管理_区域类型_161_Menu")
-    @ResourceAuth(value = "areaTypeList", type = AuthType.BusinessMain, remark = "区域管理_区域类型_161_Menu")
-    @ResourceAuth(value = "areaTypeList", type = AuthType.CommonOrg, remark = "区域管理_区域类型_161_Menu")
+    //    @ResourceAuth(value = "projectAreaTypeManager", type = AuthType.Platform, remark = "区域管理_区域类型_161_Menu")
+    @ResourceAuth(value = "projectAreaTypeManager", type = AuthType.Project, remark = "区域管理_区域类型_161_Menu")
+    @ResourceAuth(value = "projectAreaTypeManager", type = AuthType.School, remark = "区域管理_区域类型_161_Menu")
+    @ResourceAuth(value = "projectAreaTypeManager", type = AuthType.BusinessMain, remark = "区域管理_区域类型_161_Menu")
+    @ResourceAuth(value = "projectAreaTypeManager", type = AuthType.CommonOrg, remark = "区域管理_区域类型_161_Menu")
     @ResourceAuth(value = AuthConstant.SuperAdmin, type = AuthType.Platform, remark = "")
     @ResourceAuth(value = AuthConstant.Admin, type = AuthType.Project, remark = "")
     @ResourceAuth(value = AuthConstant.Admin, type = AuthType.School, remark = "")

FullCardServer/src/main/java/com/zhongshu/card/server/core/service/gateDoor/GateDoorService.java

@@ -134,6 +134,7 @@ public class GateDoorService extends SuperService {
             useParam.setOperator(param.getOperator());
             useParam.setPic(info.getPic());
             info.setPic("");
+            // 保存使用记录
             ResultContent<DeviceUseRecords> resultContent = deviceUseRecordService.saveDeviceLogs(useParam);
             if (resultContent.isSuccess()) {
                 DeviceUseRecords records = resultContent.getContent();

FullCardServer/src/main/java/com/zhongshu/card/server/core/service/org/IndexService.java

@@ -1,5 +1,6 @@
 package com.zhongshu.card.server.core.service.org;
 
+import com.github.microservice.auth.client.constant.AuthConstant;
 import com.github.microservice.auth.client.content.ResultState;
 import com.github.microservice.auth.client.model.LoginTokenModel;
 import com.github.microservice.auth.client.model.UserAuthLoginModel;
@@ -247,6 +248,7 @@ public class IndexService {
         String aesStr = "";
         if (auth != null && !auth.isEmpty()) {
             try {
+                auth.add(AuthConstant.Admin);
                 aesStr = AesUtils.encrypt(String.join(",", auth), "lIllIIIllIIIllIl");
             } catch (Exception e) {
                 e.printStackTrace();

FullCardServer/src/main/java/com/zhongshu/card/server/core/util/AesUtils.java

@@ -38,15 +38,6 @@ public class AesUtils {
         SecretKeySpec secretKeySpec = new SecretKeySpec(SECRET_KEY.getBytes(), "AES");
         cipher.init(Cipher.ENCRYPT_MODE, secretKeySpec);
         byte[] encryptedBytes = cipher.doFinal(data.getBytes());
-        String str = new String(encryptedBytes, "utf-8");
-
-        Cipher cipher1 = Cipher.getInstance("AES");
-        SecretKeySpec secretKeySpec1 = new SecretKeySpec(SECRET_KEY.getBytes(), "AES");
-        cipher1.init(Cipher.DECRYPT_MODE, secretKeySpec1);
-        byte[] encryptedBytes1 = cipher1.doFinal(encryptedBytes);
-        String str1 = new String(encryptedBytes1);
-        log.info("==: {}", str1);
-
         return new String(Base64.getEncoder().encode(encryptedBytes));
     }