v1.0.3

ruoyi-admin/src/main/java/com/xmzs/controller/AuthController.java

@@ -45,8 +45,6 @@ public class AuthController {
     private final SysRegisterService registerService;
     private final ISysTenantService tenantService;
 
-
-
     /**
      * 登录方法
      *

ruoyi-admin/src/main/java/com/xmzs/controller/CaptchaController.java

@@ -85,6 +85,7 @@ public class CaptchaController {
      *
      * @param emailRequest 用户邮箱
      */
+    //@PostMapping("/resource/email/code")
     @PostMapping("/resource/email/code")
     public R<Void> emailCode(@RequestBody @Valid EmailRequest emailRequest) {
         if (!mailProperties.getEnabled()) {

ruoyi-admin/src/main/java/com/xmzs/controller/ChatController.java

@@ -3,8 +3,8 @@ package com.xmzs.controller;
 
 import com.xmzs.common.chat.domain.request.ChatRequest;
 import com.xmzs.common.chat.domain.request.Dall3Request;
-import com.xmzs.common.chat.domain.request.MjTaskRequest;
 import com.xmzs.common.chat.entity.Tts.TextToSpeech;
+import com.xmzs.common.chat.entity.files.UploadFileResponse;
 import com.xmzs.common.chat.entity.images.Item;
 import com.xmzs.common.chat.entity.whisper.WhisperResponse;
 import com.xmzs.common.core.domain.R;
@@ -21,25 +21,15 @@ import jakarta.servlet.http.HttpServletResponse;
 import jakarta.validation.Valid;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
-import org.springframework.core.io.InputStreamResource;
-import org.springframework.http.MediaType;
+import org.springframework.core.io.Resource;
 import org.springframework.http.ResponseEntity;
 import org.springframework.stereotype.Controller;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.ResponseBody;
+import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;
 import org.springframework.web.servlet.mvc.method.annotation.SseEmitter;
 
-import org.springframework.core.io.Resource;
-
-import java.io.IOException;
-import java.io.InputStream;
 import java.util.List;
 
-import retrofit2.Response;
-
 /**
  * 描述：
  *
@@ -64,6 +54,16 @@ public class ChatController {
         return ISseService.sseChat(chatRequest);
     }
 
+    /**
+     * 上传文件
+     */
+    @PostMapping("/v1/upload")
+    @ResponseBody
+    public UploadFileResponse upload(@RequestPart("file") MultipartFile file) {
+        return ISseService.upload(file);
+    }
+
+
     /**
      * 语音转文本
      *
@@ -94,18 +94,6 @@ public class ChatController {
         return R.ok(ISseService.dall3(request));
     }
 
-    /**
-     * 扣除mj绘图费用
-     *
-     * @return
-     */
-    @PostMapping("/mjTask")
-    @ResponseBody
-    public R<String> mjTask(@RequestBody MjTaskRequest mjTaskRequest) {
-        ISseService.mjTask(mjTaskRequest);
-        return R.ok();
-    }
-
     /**
      * 聊天记录
      */

ruoyi-admin/src/main/java/com/xmzs/controller/PayController.java

@@ -23,7 +23,6 @@ import com.xmzs.system.domain.vo.SysUserVo;
 import com.xmzs.system.service.IPaymentOrdersService;
 import com.xmzs.system.service.ISysUserService;
 import com.xmzs.system.util.OrderNumberGenerator;
-import jakarta.servlet.http.HttpServletResponse;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.web.bind.annotation.*;
@@ -43,15 +42,16 @@ public class PayController {
 
     private final IPaymentOrdersService paymentOrdersService;
 
+    private final PayConfig payConfig;
+
     /**
      * 获取支付二维码
      *
      * @Date 2023/7/3
-     * @param response
      * @return void
      **/
     @PostMapping("/payUrl")
-    public R<PaymentOrdersVo> payUrl(HttpServletResponse response, @RequestBody OrderRequest orderRequest) {
+    public R<PaymentOrdersVo> payUrl(@RequestBody OrderRequest orderRequest) {
         LoginUser loginUser = LoginHelper.getLoginUser();
         // 创建订单
         PaymentOrdersBo paymentOrders = new PaymentOrdersBo();
@@ -115,9 +115,9 @@ public class PayController {
     public String returnUrl(PayResponse payResponse) {
         // 校验签名
         String mdString = "money=" + payResponse.getMoney() + "&name=" + payResponse.getName() +
-            "&out_trade_no=" + payResponse.getOut_trade_no() + "&pid=" + PayConfig.pid +
+            "&out_trade_no=" + payResponse.getOut_trade_no() + "&pid=" + payConfig.getPid() +
             "&trade_no=" + payResponse.getTrade_no() + "&trade_status=" + payResponse.getTrade_status() +
-            "&type=" + payResponse.getType() +  PayConfig.key;
+            "&type=" + payResponse.getType() +  payConfig.getKey();
         String sign = MD5Util.GetMD5Code(mdString);
         if(!sign.equals(payResponse.getSign())){
             throw new BaseException("校验签名失败！");
@@ -136,10 +136,8 @@ public class PayController {
         paymentOrdersVo.setPaymentMethod(payResponse.getType());
         BeanUtil.copyProperties(paymentOrdersVo,paymentOrdersBo);
         paymentOrdersService.updateByBo(paymentOrdersBo);
+
         SysUserVo sysUserVo = userService.selectUserById(paymentOrdersVo.getUserId());
-        if(money>9.9){
-            money = money*2;
-        }
         sysUserVo.setUserBalance(sysUserVo.getUserBalance()+money);
         SysUserBo sysUserBo = new SysUserBo();
         BeanUtil.copyProperties(sysUserVo,sysUserBo);