Merge branch 'develop' of github.com:msslulu/tiny-engine-backend-java into fix/bug

Author: msslulu

app/src/main/resources/sql/mysql/01_create_all_tables_ddl_v1.0.0.mysql.sql

@@ -581,7 +581,7 @@ create table `t_tenant`
     `id`                int          not null auto_increment comment '主键id',
     `org_code`          varchar(255) comment '组织唯一代码',
     `name_cn`           varchar(255) not null comment '组织中文名',
-    `name_en`           varchar(255) comment '组织英文名',
+    `name_en`           varchar(255)  comment '组织英文名',
     `description`       varchar(2000) comment '组织描述',
     `created_by`        varchar(60)  not null comment '创建人',
     `created_time`      timestamp    not null default current_timestamp comment '创建时间',

base/src/main/java/com/tinyengine/it/controller/AiChatController.java

@@ -153,7 +153,7 @@ public ResponseEntity<?> completions(@RequestBody ChatRequest request,
     @PostMapping("/encrypt-key")
     public Result<AiToken> getToken(@RequestBody ChatRequest request) throws Exception {
         String apiKey = request.getApiKey();
-        if(apiKey == null || apiKey.isEmpty()) {
+        if (apiKey == null || apiKey.isEmpty()) {
             return Result.failed(ExceptionEnum.CM320);
         }
         String token = aiChatV1Service.getToken(apiKey);

base/src/main/java/com/tinyengine/it/login/utils/JwtUtil.java

@@ -116,6 +116,7 @@ private List<Map<String, Object>> convertTenantsToSimpleMap(List<Tenant> tenants
             simple.put("description", tenant.getDescription());
             simple.put("createdBy", tenant.getCreatedBy());
             simple.put("lastUpdatedBy", tenant.getLastUpdatedBy());
+            simple.put("isInUse", tenant.getIsInUse());
             // 不传递日期字段，避免序列化问题
             return simple;
         }).collect(Collectors.toList());
@@ -182,6 +183,7 @@ public List<Tenant> getTenantIdFromToken(String token) {
             tenant.setDescription((String) map.get("description"));
             tenant.setCreatedBy((String) map.get("createdBy"));
             tenant.setLastUpdatedBy((String) map.get("lastUpdatedBy"));
+            tenant.setIsInUse((Boolean) map.get("isInUse"));
             return tenant;
         }).collect(Collectors.toList());
     }

base/src/main/java/com/tinyengine/it/model/dto/AiToken.java

@@ -27,7 +27,7 @@ public class AiToken {
     public  AiToken(String token) {
         this.token = token;
     }
-    public AiToken(){
+    public AiToken() {
 
     }
 }

base/src/main/java/com/tinyengine/it/service/app/impl/AppServiceImpl.java

@@ -29,7 +29,6 @@
 import com.tinyengine.it.model.entity.App;
 import com.tinyengine.it.model.entity.I18nEntry;
 import com.tinyengine.it.model.entity.Platform;
-import com.tinyengine.it.model.entity.Tenant;
 import com.tinyengine.it.service.app.AppService;
 import com.tinyengine.it.service.app.I18nEntryService;
 import com.tinyengine.it.service.app.impl.v1.AppV1ServiceImpl;
@@ -197,14 +196,16 @@ public Result<App> updateAppById(App app) {
     @Override
     @SystemServiceLog(description = "应用创建实现方法")
     public Result<App> createApp(App app) {
-        if (app.getTenantId() == null || app.getTenantId().isEmpty()) {
-            return Result.failed(ExceptionEnum.CM002);
+        if (loginUserContext.getTenantId() == null ) {
+            return Result.failed(ExceptionEnum.CM337);
         }
+        app.setTenantId(loginUserContext.getTenantId());
         List<App> appResult = baseMapper.queryAppByCondition(app);
         if (!appResult.isEmpty()) {
             return Result.failed(ExceptionEnum.CM003);
         }
         app.setIsPublish(false);
+        app.setPlatformHistoryId("1");
         int result = baseMapper.createApp(app);
         if (result < 1) {
             return Result.failed(ExceptionEnum.CM001);

base/src/main/java/com/tinyengine/it/service/app/impl/v1/AiChatV1ServiceImpl.java

@@ -210,12 +210,12 @@ private StreamingResponseBody processStreamResponse(HttpRequest.Builder requestB
                 throw new ServiceException("500", e.getMessage());
             }
 
-            log.info("收到AI API响应，状态码: {}", response.statusCode());
+            log.info("Received AI API response, status code {}", response.statusCode());
 
             if (response.statusCode() != 200) {
                 String errorBody = new String(response.body().readAllBytes(), StandardCharsets.UTF_8);
 
-                log.info("错误响应内容: {}", errorBody);
+                log.info("errorBody: {}", errorBody);
 
                 JsonNode errorNode = JsonUtils.MAPPER.readTree(errorBody);
                 throw new ServiceException(String.valueOf(response.statusCode()), errorNode.get("error").get("message").asText());

base/src/main/java/com/tinyengine/it/service/app/impl/v1/AppV1ServiceImpl.java

@@ -17,6 +17,7 @@
 
 import com.fasterxml.jackson.core.type.TypeReference;
 import com.tinyengine.it.common.context.LoginUserContext;
+import com.tinyengine.it.common.exception.ExceptionEnum;
 import com.tinyengine.it.common.exception.ServiceException;
 import com.tinyengine.it.common.log.SystemServiceLog;
 import com.tinyengine.it.common.utils.Schema;
@@ -280,7 +281,9 @@ private List<PackagesDto> getPackages() {
      */
     public MetaDto getMetaDto(Integer id) {
         App app = appMapper.queryAppById(id, loginUserContext.getTenantId());
-
+        if (app == null) {
+            throw new ServiceException(ExceptionEnum.CM009.getResultCode(), ExceptionEnum.CM009.getResultMsg());
+        }
         Platform platform = platformService.queryPlatformById(app.getPlatformId());
 
         // 当前版本暂无设计器数据

base/src/main/java/com/tinyengine/it/service/material/impl/ResourceServiceImpl.java

@@ -20,7 +20,6 @@
 import com.tinyengine.it.common.exception.ServiceException;
 import com.tinyengine.it.common.log.SystemServiceLog;
 import com.tinyengine.it.common.utils.ImageThumbnailGenerator;
-import com.tinyengine.it.common.utils.MultipartFileHashUtils;
 import com.tinyengine.it.common.utils.Utils;
 import com.tinyengine.it.mapper.ResourceGroupResourceMapper;
 import com.tinyengine.it.mapper.ResourceMapper;

base/src/test/java/com/tinyengine/it/controller/UserControllerTest.java

@@ -17,7 +17,6 @@
 import static org.mockito.Mockito.when;
 
 import com.tinyengine.it.common.base.Result;
-import com.tinyengine.it.common.context.LoginUserContext;
 import com.tinyengine.it.common.handler.MockUserContext;
 import com.tinyengine.it.common.utils.TestUtil;
 import com.tinyengine.it.mapper.AuthUsersUnitsRolesMapper;

base/src/test/java/com/tinyengine/it/service/app/impl/AppServiceImplTest.java

@@ -19,9 +19,7 @@
 
 import cn.hutool.core.util.ReflectUtil;
 import com.tinyengine.it.common.base.Result;
-import com.tinyengine.it.common.context.LoginUserContext;
 import com.tinyengine.it.common.handler.MockUserContext;
-import com.tinyengine.it.common.utils.TestUtil;
 import com.tinyengine.it.mapper.AppMapper;
 import com.tinyengine.it.mapper.I18nEntryMapper;
 import com.tinyengine.it.model.dto.I18nEntryDto;