1. 修复返回 e 办报文未加密返回的错误

yudao-module-system/yudao-module-system-server/src/main/java/cn/iocoder/yudao/module/system/controller/admin/sync/SyncController.java

@@ -56,18 +56,18 @@ public class SyncController {
     @PostMapping("/SchemaService")
     @TenantIgnore
     @PermitAll
-    public SchemaResponseVO getSchema(@RequestBody String encryptedBody) {
+    public String getSchema(@RequestBody String encryptedBody) {
         String bimRequestId = null;
         try {
             SchemaRequestVO req = decryptRequest(encryptedBody, SchemaRequestVO.class);
             bimRequestId = req.getBimRequestId();
-            return schemaService.getSchema(req);
+            return encrypt(schemaService.getSchema(req));
         } catch (Exception e) {
             SchemaResponseVO errorResp = new SchemaResponseVO();
             errorResp.setBimRequestId(bimRequestId);
             errorResp.setResultCode("500");
             errorResp.setMessage(e.getMessage());
-            return errorResp;
+            return encrypt(errorResp);
         }
     }
 
@@ -75,18 +75,18 @@ public class SyncController {
     @PostMapping("/OrgCreateService")
     @TenantIgnore
     @PermitAll
-    public OrgCreateResponseVO createOrg(@RequestBody String encryptedBody) {
+    public String createOrg(@RequestBody String encryptedBody) {
         String bimRequestId = null;
         try {
             OrgCreateRequestVO req = decryptRequest(encryptedBody, OrgCreateRequestVO.class);
             bimRequestId = req.getBimRequestId();
-            return organizationService.createOrg(req);
+            return encrypt(organizationService.createOrg(req));
         } catch (Exception e) {
             OrgCreateResponseVO errorResp = new OrgCreateResponseVO();
             errorResp.setBimRequestId(bimRequestId);
             errorResp.setResultCode("500");
             errorResp.setMessage(e.getMessage());
-            return errorResp;
+            return encrypt(errorResp);
         }
     }
 
@@ -94,18 +94,18 @@ public class SyncController {
     @PostMapping("/OrgDeleteService")
     @TenantIgnore
     @PermitAll
-    public OrgDeleteResponseVO deleteOrg(@RequestBody String encryptedBody) {
+    public String deleteOrg(@RequestBody String encryptedBody) {
         String bimRequestId = null;
         try {
             OrgDeleteRequestVO req = decryptRequest(encryptedBody, OrgDeleteRequestVO.class);
             bimRequestId = req.getBimRequestId();
-            return organizationService.deleteOrg(req);
+            return encrypt(organizationService.deleteOrg(req));
         } catch (Exception e) {
             OrgDeleteResponseVO errorResp = new OrgDeleteResponseVO();
             errorResp.setBimRequestId(bimRequestId);
             errorResp.setResultCode("500");
             errorResp.setMessage(e.getMessage());
-            return errorResp;
+            return encrypt(errorResp);
         }
     }
 
@@ -113,18 +113,18 @@ public class SyncController {
     @PostMapping("/OrgUpdateService")
     @TenantIgnore
     @PermitAll
-    public OrgUpdateResponseVO updateOrg(@RequestBody String encryptedBody) {
+    public String updateOrg(@RequestBody String encryptedBody) {
         String bimRequestId = null;
         try {
             OrgUpdateRequestVO req = decryptRequest(encryptedBody, OrgUpdateRequestVO.class);
             bimRequestId = req.getBimRequestId();
-            return organizationService.updateOrg(req);
+            return encrypt(organizationService.updateOrg(req));
         } catch (Exception e) {
             OrgUpdateResponseVO errorResp = new OrgUpdateResponseVO();
             errorResp.setBimRequestId(bimRequestId);
             errorResp.setResultCode("500");
             errorResp.setMessage(e.getMessage());
-            return errorResp;
+            return encrypt(errorResp);
         }
     }
 
@@ -132,18 +132,18 @@ public class SyncController {
     @PostMapping("/QueryAllOrgIdsService")
     @TenantIgnore
     @PermitAll
-    public OrgListResponseVO listOrg(@RequestBody String encryptedBody) {
+    public String listOrg(@RequestBody String encryptedBody) {
         String bimRequestId = null;
         try {
             OrgListRequestVO req = decryptRequest(encryptedBody, OrgListRequestVO.class);
             bimRequestId = req.getBimRequestId();
-            return organizationService.listOrgIds(req);
+            return encrypt(organizationService.listOrgIds(req));
         } catch (Exception e) {
             OrgListResponseVO errorResp = new OrgListResponseVO();
             errorResp.setBimRequestId(bimRequestId);
             errorResp.setResultCode("500");
             errorResp.setMessage(e.getMessage());
-            return errorResp;
+            return encrypt(errorResp);
         }
     }
 
@@ -151,18 +151,18 @@ public class SyncController {
     @PostMapping("/QueryOrgByIdService")
     @TenantIgnore
     @PermitAll
-    public OrgGetResponseVO getOrg(@RequestBody String encryptedBody) {
+    public String getOrg(@RequestBody String encryptedBody) {
         String bimRequestId = null;
         try {
             OrgGetRequestVO req = decryptRequest(encryptedBody, OrgGetRequestVO.class);
             bimRequestId = req.getBimRequestId();
-            return organizationService.getOrgById(req);
+            return encrypt(organizationService.getOrgById(req));
         } catch (Exception e) {
             OrgGetResponseVO errorResp = new OrgGetResponseVO();
             errorResp.setBimRequestId(bimRequestId);
             errorResp.setResultCode("500");
             errorResp.setMessage(e.getMessage());
-            return errorResp;
+            return encrypt(errorResp);
         }
     }
 
@@ -170,18 +170,18 @@ public class SyncController {
     @PostMapping("/UserCreateService")
     @TenantIgnore
     @PermitAll
-    public UserCreateResponseVO createUser(@RequestBody String encryptedBody) {
+    public String createUser(@RequestBody String encryptedBody) {
         String bimRequestId = null;
         try {
             UserCreateRequestVO req = decryptRequest(encryptedBody, UserCreateRequestVO.class);
             bimRequestId = req.getBimRequestId();
-            return accountService.createUser(req);
+            return encrypt(accountService.createUser(req));
         } catch (Exception e) {
             UserCreateResponseVO errorResp = new UserCreateResponseVO();
             errorResp.setBimRequestId(bimRequestId);
             errorResp.setResultCode("500");
             errorResp.setMessage(e.getMessage());
-            return errorResp;
+            return encrypt(errorResp);
         }
     }
 
@@ -189,18 +189,18 @@ public class SyncController {
     @PostMapping("/UserDeleteService")
     @TenantIgnore
     @PermitAll
-    public UserDeleteResponseVO deleteUser(@RequestBody String encryptedBody) {
+    public String deleteUser(@RequestBody String encryptedBody) {
         String bimRequestId = null;
         try {
             UserDeleteRequestVO req = decryptRequest(encryptedBody, UserDeleteRequestVO.class);
             bimRequestId = req.getBimRequestId();
-            return accountService.deleteUser(req);
+            return encrypt(accountService.deleteUser(req));
         } catch (Exception e) {
             UserDeleteResponseVO errorResp = new UserDeleteResponseVO();
             errorResp.setBimRequestId(bimRequestId);
             errorResp.setResultCode("500");
             errorResp.setMessage(e.getMessage());
-            return errorResp;
+            return encrypt(errorResp);
         }
     }
 
@@ -208,18 +208,18 @@ public class SyncController {
     @PostMapping("/UserUpdateService")
     @TenantIgnore
     @PermitAll
-    public UserUpdateResponseVO updateUser(@RequestBody String encryptedBody) {
+    public String updateUser(@RequestBody String encryptedBody) {
         String bimRequestId = null;
         try {
             UserUpdateRequestVO req = decryptRequest(encryptedBody, UserUpdateRequestVO.class);
             bimRequestId = req.getBimRequestId();
-            return accountService.updateUser(req);
+            return encrypt(accountService.updateUser(req));
         } catch (Exception e) {
             UserUpdateResponseVO errorResp = new UserUpdateResponseVO();
             errorResp.setBimRequestId(bimRequestId);
             errorResp.setResultCode("500");
             errorResp.setMessage(e.getMessage());
-            return errorResp;
+            return encrypt(errorResp);
         }
     }
 
@@ -227,18 +227,18 @@ public class SyncController {
     @PostMapping("/QueryAllUserIdsService")
     @TenantIgnore
     @PermitAll
-    public UserListResponseVO listUser(@RequestBody String encryptedBody) {
+    public String listUser(@RequestBody String encryptedBody) {
         String bimRequestId = null;
         try {
             UserListRequestVO req = decryptRequest(encryptedBody, UserListRequestVO.class);
             bimRequestId = req.getBimRequestId();
-            return accountService.listUserIds(req);
+            return encrypt(accountService.listUserIds(req));
         } catch (Exception e) {
             UserListResponseVO errorResp = new UserListResponseVO();
             errorResp.setBimRequestId(bimRequestId);
             errorResp.setResultCode("500");
             errorResp.setMessage(e.getMessage());
-            return errorResp;
+            return encrypt(errorResp);
         }
     }
 
@@ -246,18 +246,18 @@ public class SyncController {
     @PostMapping("/QueryUserByIdService")
     @TenantIgnore
     @PermitAll
-    public UserGetResponseVO getUser(@RequestBody String encryptedBody) {
+    public String getUser(@RequestBody String encryptedBody) {
         String bimRequestId = null;
         try {
             UserGetRequestVO req = decryptRequest(encryptedBody, UserGetRequestVO.class);
             bimRequestId = req.getBimRequestId();
-            return accountService.getUserById(req);
+            return encrypt(accountService.getUserById(req));
         } catch (Exception e) {
             UserGetResponseVO errorResp = new UserGetResponseVO();
             errorResp.setBimRequestId(bimRequestId);
             errorResp.setResultCode("500");
             errorResp.setMessage(e.getMessage());
-            return errorResp;
+            return encrypt(errorResp);
         }
     }
 
@@ -291,4 +291,15 @@ public class SyncController {
         SecurityFrameworkUtils.setLoginUser(loginUser, getRequest());
         return JSON.parseObject(bodyJson, clazz);
     }
+
+    private <T> String encrypt(T object) {
+        String bodyJson;
+        String jsonString = JSON.toJSONString(object);
+        try {
+            bodyJson = SyncVerifyUtil.encrypt(jsonString, encryptKey, "AES");
+        } catch (Exception e) {
+            throw exception(SYNC_DECRYPT_TYPE);
+        }
+        return bodyJson;
+    }
 }