fix：openapi bug与i18n

@@ -286,7 +286,7 @@ public class DeviceController extends BaseController {
                 throw new ThingsboardException(e.getErrorCode());
             }
         }
-        return  ResponseEntity.ok("私有成功");
+        return  ResponseEntity.ok(String.format(MessageUtils.message("private.success")));
     }
 
     @ApiOperation(value = "Make device publicly available (assignDeviceToPublicCustomer)",
@@ -320,7 +320,7 @@ public class DeviceController extends BaseController {
                 throw new ThingsboardException(e.getErrorCode());
             }
         }
-        return  ResponseEntity.ok("公开成功");
+        return  ResponseEntity.ok(String.format(MessageUtils.message("publicly.successful")));
     }
 
     @ApiOperation(value = "设备凭证详情",

@@ -100,7 +100,10 @@ public class TkOpenApiController extends BaseController {
   @GetMapping("/getMenu")
   @PreAuthorize("@check.checkPermissions({'TENANT_ADMIN'},{})")
   public ResponseEntity<List<ApiMenuDTO>> getMenu() throws ThingsboardException {
-    return ResponseEntity.ok(apiService.getMenu(getCurrentUser().getCurrentTenantId()));
+    List<String> tenantIds = new ArrayList<>();
+    tenantIds.add(EntityId.NULL_UUID.toString());
+    tenantIds.add(getCurrentUser().getTenantId().toString());
+    return ResponseEntity.ok(apiService.getMenu(tenantIds));
   }
 
 

@@ -193,6 +193,8 @@ choice.device.profile.rule.chain.is.used.for.convert = The selected product [% s
 choice.device.profile.rule.chain.is.used.for.scene = The selected product [% s] is currently being used by the scene linkage [% s] and cannot change the rule chain!!
 openapi.app.isnull= The application does not exist
 openapi.api.isnull= API does not exist
+publicly.successful = Publicly successful
+private.success = Private Success
 
 
 

@@ -191,5 +191,7 @@ rule.chain.used.by.device.profile = 该规则链正在被ã€%s】产å“使用,ä¸
 same.type.node.name.already.exists = 同类型的节点名称已被使用
 choice.device.profile.rule.chain.is.used.for.convert = 选中的产品【%s】正在被数据流转【%s】使用，不能更换规则链！！
 choice.device.profile.rule.chain.is.used.for.scene = 选中的产品【%s】正在被场景联动【%s】使用，不能更换规则链！！
-openapi.app.isnull= 应用不存在
-openapi.api.isnull= api不存在
\ No newline at end of file
+openapi.app.isnull = 应用不存在
+openapi.api.isnull = api不存在
+publicly.successful = 公开成功
+private.success = 私有成功
\ No newline at end of file

@@ -103,9 +103,11 @@ public class OpenApiImpl extends AbstractBaseService<OpenApiMapper, TkOpenApiEnt
   }
 
   @Override
-  public List<ApiMenuDTO> getMenu(String tenantId) {
+  public List<ApiMenuDTO> getMenu(List<String> tenantIds) {
     List<TkOpenApiEntity> list  = baseMapper.selectList(new LambdaQueryWrapper<TkOpenApiEntity>()
-            .eq(TkOpenApiEntity::getTenantId,tenantId));
+            .in(tenantIds!= null,
+                    TkOpenApiEntity::getTenantId,
+                    tenantIds));
     List<ApiMenuDTO> listDto =  new ArrayList<>();
     if(!list.isEmpty()){
       for (TkOpenApiEntity entity: list) {

@@ -22,7 +22,7 @@ public interface OpenApiService extends BaseService<TkOpenApiEntity>{
 
     OpenApiDTO update(OpenApiDTO dto, String tenantId);
 
-    List<ApiMenuDTO> getMenu(String tenantId);
+    List<ApiMenuDTO> getMenu(List<String> tenantIds);
 
     List<OpenApiContrlooerDTO> getByListId(List<String> ids);