Merge branch 'dev/dev' into dev/dev_xp

src/main/java/com/ai/da/service/impl/GenerateServiceImpl.java

@@ -2808,7 +2808,11 @@ public class GenerateServiceImpl extends ServiceImpl<GenerateMapper, Generate> i
 
         requestBody.set("prompt", prompt);
         requestBody.set("seed", 42);
-        requestBody.set("aspect_ratio", "9:16");
+        if (func.equals(PATTERN)){
+            requestBody.set("aspect_ratio", "1:1");
+        } else {
+            requestBody.set("aspect_ratio", "9:16");
+        }
         requestBody.set("output_format", "png");
 
         log.info("flux 请求入参：{}", requestBody);

src/main/java/com/ai/da/service/impl/SysFileServiceImpl.java

@@ -216,10 +216,11 @@ public class SysFileServiceImpl extends ServiceImpl<SysFileMapper, SysFile> impl
             sysFile = CopyUtil.copyObject(sysFileMapper.selectById(id), SysFileVO.class);
             if (Objects.nonNull(sysFile)){
                 LocalCacheUtils.setSysFileCache(id, sysFile);
-                return sysFile;
+            } else {
+                return null;
             }
         }
-        return null;
+        return sysFile;
     }
 
     @Override