提示词修改

docker-compose.yml

@@ -4,6 +4,9 @@ services:
     build: .
     volumes:
       # 日志目录映射
-      - ./log:/log
+      - ./log:/app/log
     ports:
-      - '10095:8080'
+      - '10095:8080'
+networks:
+  back_default:
+    driver: bridge

src/main/java/com/aida/lanecarford/common/security/JwtInterceptor.java

@@ -2,7 +2,6 @@ package com.aida.lanecarford.common.security;
 
 import com.aida.lanecarford.common.security.config.JwtProperties;
 import com.aida.lanecarford.common.security.context.UserContext;
-import com.aida.lanecarford.exception.BusinessException;
 import com.aida.lanecarford.util.CacheUtil;
 import com.aida.lanecarford.vo.AuthPrincipalVO;
 import com.alibaba.fastjson.JSONObject;
@@ -25,7 +24,7 @@ public class JwtInterceptor implements HandlerInterceptor {
     private final JwtProperties jwtProperties;
 
     @Override
-    public boolean preHandle(HttpServletRequest request, HttpServletResponse response, Object handler) throws Exception {
+    public boolean preHandle(HttpServletRequest request, HttpServletResponse response, Object handler) {
         if ("OPTIONS".equalsIgnoreCase(request.getMethod())) {
             return true;
         }
@@ -41,7 +40,8 @@ public class JwtInterceptor implements HandlerInterceptor {
             String extracted = jwtUtil.extractUserinfo(jwtToken);
             if (StringUtil.isNullOrEmpty(extracted)) {
                 log.warn("TOKEN已过期，请重新登录！(token without userInfo)");
-                throw new BusinessException("Token has expired, please log in again.");
+                response.setStatus(HttpServletResponse.SC_UNAUTHORIZED);
+//                throw new BusinessException("Token has expired, please log in again.");
             }
 
             AuthPrincipalVO authPrincipalVO = JSONObject.parseObject(extracted, AuthPrincipalVO.class);
@@ -54,10 +54,12 @@ public class JwtInterceptor implements HandlerInterceptor {
 
             if (Objects.isNull(token)) {
                 log.warn("TOKEN已过期，请重新登录！(local cache empty)");
-                throw new BusinessException("Token has expired, please log in again.");
+                response.setStatus(HttpServletResponse.SC_UNAUTHORIZED);
+//                throw new BusinessException("Token has expired, please log in again.");
             } else if (!token.toString().equals(jwtToken)) {
                 log.warn("TOKEN已过期，请重新登录！(token not match local cache)");
-                throw new BusinessException("Token has expired, please log in again.");
+                response.setStatus(HttpServletResponse.SC_UNAUTHORIZED);
+//                throw new BusinessException("Token has expired, please log in again.");
             }
             return true;
         }

src/main/java/com/aida/lanecarford/controller/CustomerPhotoController.java

@@ -4,6 +4,7 @@ import com.aida.lanecarford.common.ApiResponse;
 import com.aida.lanecarford.dto.CustomerPhotoDto;
 import com.aida.lanecarford.entity.CustomerPhoto;
 import com.aida.lanecarford.service.CustomerPhotoService;
+import jakarta.validation.Valid;
 import lombok.RequiredArgsConstructor;
 import org.springframework.web.bind.annotation.ModelAttribute;
 import org.springframework.web.bind.annotation.PostMapping;
@@ -24,7 +25,7 @@ public class CustomerPhotoController {
     private final CustomerPhotoService customerPhotoService;
 
     @PostMapping("/upload")
-    public ApiResponse<CustomerPhoto> upload(@ModelAttribute CustomerPhotoDto customerPhotoDto) {
+    public ApiResponse<CustomerPhoto> upload(@Valid @ModelAttribute CustomerPhotoDto customerPhotoDto) {
         CustomerPhoto customerPhoto = customerPhotoService.upload(customerPhotoDto);
         return ApiResponse.success(customerPhoto);
     }

src/main/java/com/aida/lanecarford/controller/LoginController.java

@@ -121,4 +121,12 @@ public class LoginController {
         return ApiResponse.success(loginService.parseGoogleAccessToken(accessToken));
     }
 
+    //修改用户信息
+    @Operation(summary = "修改用户信息",
+            description = "传username，email，password三个值，password要加密")
+    @PostMapping("/updateUserInfo")
+    public ApiResponse<String> updateUserInfo(@RequestBody User user) {
+        return ApiResponse.success(loginService.updateUserInfo(user));
+    }
+
 }

src/main/java/com/aida/lanecarford/controller/TryOnEffectController.java

@@ -92,28 +92,28 @@ public class TryOnEffectController {
         return ApiResponse.success();
     }
 
-    /**
-     * 首页默认图换脸演示
-     */
-    @Operation(summary = "首页点击换脸", description = "传入上传顾客照片后得到的ID")
-    @PostMapping("/reFace")
-    public ApiResponse<String> reFace(@Nullable @RequestParam Long customerPhotoId,
-                                      @Nullable @RequestParam String prompt,
-                                      @Nullable @RequestParam String tryonUrl) {
-        if (customerPhotoId == null&& StringUtil.isNullOrEmpty(prompt)&& StringUtil.isNullOrEmpty(tryonUrl)){
-            return ApiResponse.error("system error:Parameter null");
-        }
-        String result = "";
-        if (StringUtil.isNullOrEmpty(prompt)){
-            //换脸
-            result = tryOnEffectService.reFace(customerPhotoId);
-        }else {
-            if (StringUtil.isNullOrEmpty(tryonUrl)){
-                return ApiResponse.error("system error:Parameter null");
-            }
-            //根据提示词修改图像
-            result = tryOnEffectService.generateUrl(prompt,tryonUrl);
-        }
-        return ApiResponse.success("操作成功",result);
-    }
+//    /**
+//     * 首页默认图换脸演示
+//     */
+//    @Operation(summary = "首页点击换脸", description = "传入上传顾客照片后得到的ID")
+//    @PostMapping("/reFace")
+//    public ApiResponse<String> reFace(@Nullable @RequestParam Long customerPhotoId,
+//                                      @Nullable @RequestParam String prompt,
+//                                      @Nullable @RequestParam String tryonUrl) {
+//        if (customerPhotoId == null&& StringUtil.isNullOrEmpty(prompt)&& StringUtil.isNullOrEmpty(tryonUrl)){
+//            return ApiResponse.error("system error:Parameter null");
+//        }
+//        String result = "";
+//        if (StringUtil.isNullOrEmpty(prompt)){
+//            //换脸
+//            result = tryOnEffectService.reFace(customerPhotoId);
+//        }else {
+//            if (StringUtil.isNullOrEmpty(tryonUrl)){
+//                return ApiResponse.error("system error:Parameter null");
+//            }
+//            //根据提示词修改图像
+//            result = tryOnEffectService.generateUrl(prompt,tryonUrl);
+//        }
+//        return ApiResponse.success("操作成功",result);
+//    }
 }

src/main/java/com/aida/lanecarford/exception/GlobalExceptionHandler.java

@@ -88,6 +88,12 @@ public class GlobalExceptionHandler {
 
         logger.error("MinIO异常: {}", e.getMessage(), e);
         
+        // 如果是文件为空等参数错误，返回参数错误码
+        String message = e.getMessage();
+        if (message != null && (message.contains("文件不能为空") || message.contains("不能为空"))) {
+            return ApiResponse.error(ResultEnum.PARAMETER_ERROR.getCode(), "File cannot be empty");
+        }
+        
         return ApiResponse.error(ResultEnum.ERROR.getCode(), "File storage service error");
     }
 

src/main/java/com/aida/lanecarford/service/LoginService.java

@@ -36,4 +36,6 @@ public interface LoginService extends IService<User> {
     LoginVO parseGoogleCredential(String credential) throws ParseException, JOSEException, IOException;
 
     LoginVO parseGoogleAccessToken(String accessToken);
+
+    String updateUserInfo(User user);
 }

src/main/java/com/aida/lanecarford/service/TryOnEffectService.java

@@ -44,8 +44,8 @@ public interface TryOnEffectService extends IService<TryOnEffect> {
      */
     boolean addComment(Suggestion suggestion);
 
+    //已废弃
     String reFace(Long customerPhotoId);
-
     String generateUrl(String prompt, String tryonUrl);
 
     PageResult<TryOnResultVO> getTryOnHistoricals(HistoricalDTO historicalDTO);

src/main/java/com/aida/lanecarford/service/impl/CustomerPhotoServiceImpl.java

@@ -1,9 +1,11 @@
 package com.aida.lanecarford.service.impl;
 
 import com.aida.lanecarford.common.constant.MinioFileConstants;
+import com.aida.lanecarford.common.response.ResultEnum;
 import com.aida.lanecarford.config.MinioConfig;
 import com.aida.lanecarford.dto.CustomerPhotoDto;
 import com.aida.lanecarford.entity.CustomerPhoto;
+import com.aida.lanecarford.exception.BusinessException;
 import com.aida.lanecarford.mapper.CustomerPhotoMapper;
 import com.aida.lanecarford.service.CustomerPhotoService;
 import com.aida.lanecarford.util.CopyUtil;
@@ -11,6 +13,7 @@ import com.aida.lanecarford.util.MinioUtil;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import lombok.RequiredArgsConstructor;
 import org.springframework.stereotype.Service;
+import org.springframework.web.multipart.MultipartFile;
 
 /**
  * 顾客照片服务实现类
@@ -26,9 +29,14 @@ public class CustomerPhotoServiceImpl extends ServiceImpl<CustomerPhotoMapper, C
 
     @Override
     public CustomerPhoto upload(CustomerPhotoDto customerPhotoDto) {
+        // 验证文件是否为空
+        MultipartFile file = customerPhotoDto.getFile();
+        if (file == null || file.isEmpty()) {
+            throw new BusinessException(ResultEnum.PARAMETER_ERROR, "File cannot be empty", "文件不能为空");
+        }
 
         String logicalUrl = minioUtil.uploadFile(
-                customerPhotoDto.getFile(), 
+                file, 
                 MinioFileConstants.FileType.CUSTOMER_PHOTO,
                 minioConfig.getBucketName()
         );

src/main/java/com/aida/lanecarford/service/impl/CustomerServiceImpl.java

@@ -108,6 +108,8 @@ public class CustomerServiceImpl extends ServiceImpl<CustomerMapper, Customer> i
             customer.setCreatedTime(LocalDateTime.now());
 
             save(customer);
+        } else {
+            throw new BusinessException("VIP ID'" + vipId + "' already exists.Please proceed directly to check-in.");
         }
 
         return customer;

src/main/java/com/aida/lanecarford/service/impl/LoginServiceImpl.java

@@ -353,6 +353,66 @@ public class LoginServiceImpl extends ServiceImpl<UserMapper, User> implements L
         }
     }
 
+    @Override
+    public String updateUserInfo(User user) {
+        // 1. 获取当前登录用户ID
+        AuthPrincipalVO userHolder = UserContext.getUserHolder();
+        if (Objects.isNull(userHolder)) {
+            throw new BusinessException("User not logged in", "用户未登录", ResultEnum.ERROR.getCode());
+        }
+        
+        Long userId = userHolder.getId();
+        
+        // 2. 验证用户是否存在
+        User existingUser = getById(userId);
+        if (Objects.isNull(existingUser)) {
+            throw new BusinessException("User not found", "用户不存在", ResultEnum.ERROR.getCode());
+        }
+        
+        // 3. 构建更新条件，只更新有值的字段
+        UpdateWrapper<User> updateWrapper = new UpdateWrapper<>();
+        updateWrapper.lambda().eq(User::getId, userId);
+        
+        boolean hasUpdate = false;
+        
+        // 如果username有值，则更新
+        if (!StringUtil.isNullOrEmpty(user.getUsername())) {
+            updateWrapper.lambda().set(User::getUsername, user.getUsername());
+            hasUpdate = true;
+        }
+        
+        // 如果email有值，则更新
+        if (!StringUtil.isNullOrEmpty(user.getEmail())) {
+            updateWrapper.lambda().set(User::getEmail, user.getEmail());
+            hasUpdate = true;
+        }
+        
+        // 如果password有值，则更新
+        if (!StringUtil.isNullOrEmpty(user.getPassword())) {
+            updateWrapper.lambda().set(User::getPassword, user.getPassword());
+            hasUpdate = true;
+        }
+        
+        // 4. 如果没有需要更新的字段，返回提示信息
+        if (!hasUpdate) {
+            return "No fields to update";
+        }
+        
+        // 5. 执行更新
+        boolean updated = update(updateWrapper);
+        
+        if (updated) {
+            log.info("用户信息更新成功 userId={}, updatedFields=username:{}, email:{}, password:{}", 
+                    userId, 
+                    !StringUtil.isNullOrEmpty(user.getUsername()),
+                    !StringUtil.isNullOrEmpty(user.getEmail()),
+                    !StringUtil.isNullOrEmpty(user.getPassword()));
+            return "User information updated successfully";
+        } else {
+            throw new BusinessException("Failed to update user information", "更新用户信息失败", ResultEnum.ERROR.getCode());
+        }
+    }
+
     private static final String TOKEN_URL = "https://oauth2.googleapis.com/token";
 
     public GoogleUser getGoogleUserFromCode(String code) {

src/main/java/com/aida/lanecarford/service/impl/TryOnEffectServiceImpl.java

@@ -131,7 +131,7 @@ public class TryOnEffectServiceImpl extends ServiceImpl<TryOnEffectMapper, TryOn
                     "\n" +
                     "**Placement Detail:** Outerwear must be worn on the outside, and if a bag is present, it must be visible.\n" +
                     "**Quality:** Ultra-high resolution, The figure should fill the frame as much as possible,studio photography quality. Emphasize **realistic fabric textures and sharp print fidelity**.\n" +
-                    "**Negative Constraints (Exclude):** **NO text, NO borders, NO tables, NO multiple models, NO extra items.** **CRITICAL: NO cropping of the head or face.**";
+                    "**Negative Constraints (Exclude):** **NO text, NO borders, NO tables, NO multiple models, All items must be worn on the person; they must not be displayed anywhere else except on the model.** **CRITICAL: NO cropping of the head or face.**";
             aiRreultlogicalUrl = AITryOnEffect(prompt, imageUrls);
 
         } else if (tryOnEffectDto.getIsRegenerated() == 1 && imageUrls.size() == 1) {
@@ -213,6 +213,7 @@ public class TryOnEffectServiceImpl extends ServiceImpl<TryOnEffectMapper, TryOn
         }
     }
 
+    //已废弃
     @Override
     public String reFace(Long customerPhotoId) {