v1.0.3

2026-04-04 23:37:32 +00:00 · 2024-04-01 22:21:29 +08:00
parent cead269b19
commit dea23f13ef
552 changed files with 2144 additions and 154437 deletions
--- a/ruoyi-admin/src/main/java/com/xmzs/controller/AuthController.java
+++ b/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;

-
-
    /**
     * 登录方法
     *
--- a/ruoyi-admin/src/main/java/com/xmzs/controller/CaptchaController.java
+++ b/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()) {
--- a/ruoyi-admin/src/main/java/com/xmzs/controller/ChatController.java
+++ b/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();
-    }
-
    /**
     * 聊天记录
     */
--- a/ruoyi-admin/src/main/java/com/xmzs/controller/PayController.java
+++ b/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);
--- a/ruoyi-admin/src/main/resources/application-dev.yml
+++ b/ruoyi-admin/src/main/resources/application-dev.yml
@@ -1,7 +1,7 @@
 --- # 监控中心配置
 spring.boot.admin.client:
  # 增加客户端开关
-  enabled: true
+  enabled: false
  url: http://localhost:9090/admin
  instance:
    service-host-type: IP
@@ -51,36 +51,36 @@ spring:
          # rewriteBatchedStatements=true 批处理优化 大幅提升批量插入更新删除性能(对数据库有性能损耗 使用批量操作应考虑性能问题)
          url: jdbc:mysql://127.0.0.1:3306/ry-vue?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8&autoReconnect=true&rewriteBatchedStatements=true
          username: ry-vue
-          password: xxx
+          password: ry-vue

        # 从库数据源
-#        slave:
-#          lazy: true
-#          type: ${spring.datasource.type}
-#          driverClassName: com.mysql.cj.jdbc.Driver
-#          url: jdbc:mysql://localhost:3306/ry-vue?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8&autoReconnect=true&rewriteBatchedStatements=true
-#          username:
-#          password:
-#        oracle:
-#          type: ${spring.datasource.type}
-#          driverClassName: oracle.jdbc.OracleDriver
-#          url: jdbc:oracle:thin:@//localhost:1521/XE
-#          username: ROOT
-#          password: root
-#          hikari:
-#            connectionTestQuery: SELECT 1 FROM DUAL
-#        postgres:
-#          type: ${spring.datasource.type}
-#          driverClassName: org.postgresql.Driver
-#          url: jdbc:postgresql://localhost:5432/postgres?useUnicode=true&characterEncoding=utf8&useSSL=true&autoReconnect=true&reWriteBatchedInserts=true
-#          username: root
-#          password: root
-#        sqlserver:
-#          type: ${spring.datasource.type}
-#          driverClassName: com.microsoft.sqlserver.jdbc.SQLServerDriver
-#          url: jdbc:sqlserver://localhost:1433;DatabaseName=tempdb;SelectMethod=cursor;encrypt=false;rewriteBatchedStatements=true
-#          username: SA
-#          password: root
+      #        slave:
+      #          lazy: true
+      #          type: ${spring.datasource.type}
+      #          driverClassName: com.mysql.cj.jdbc.Driver
+      #          url: jdbc:mysql://localhost:3306/ry-vue?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8&autoReconnect=true&rewriteBatchedStatements=true
+      #          username:
+      #          password:
+      #        oracle:
+      #          type: ${spring.datasource.type}
+      #          driverClassName: oracle.jdbc.OracleDriver
+      #          url: jdbc:oracle:thin:@//localhost:1521/XE
+      #          username: ROOT
+      #          password: root
+      #          hikari:
+      #            connectionTestQuery: SELECT 1 FROM DUAL
+      #        postgres:
+      #          type: ${spring.datasource.type}
+      #          driverClassName: org.postgresql.Driver
+      #          url: jdbc:postgresql://localhost:5432/postgres?useUnicode=true&characterEncoding=utf8&useSSL=true&autoReconnect=true&reWriteBatchedInserts=true
+      #          username: root
+      #          password: root
+      #        sqlserver:
+      #          type: ${spring.datasource.type}
+      #          driverClassName: com.microsoft.sqlserver.jdbc.SQLServerDriver
+      #          url: jdbc:sqlserver://localhost:1433;DatabaseName=tempdb;SelectMethod=cursor;encrypt=false;rewriteBatchedStatements=true
+      #          username: SA
+      #          password: root
      hikari:
        # 最大连接池数量
        maxPoolSize: 20
--- a/ruoyi-admin/src/main/resources/application-prod.yml
+++ b/ruoyi-admin/src/main/resources/application-prod.yml
@@ -4,7 +4,7 @@ spring.servlet.multipart.location: /ruoyi/server/temp
 --- # 监控中心配置
 spring.boot.admin.client:
  # 增加客户端开关
-  enabled: true
+  enabled: false
  url: http://localhost:9090/admin
  instance:
    service-host-type: IP
--- a/ruoyi-admin/src/main/resources/application.yml
+++ b/ruoyi-admin/src/main/resources/application.yml
@@ -212,27 +212,6 @@ mybatis-encryptor:
  # 公私钥 非对称算法的公私钥 如：SM2，RSA
  publicKey:
  privateKey:
--- # mail 邮件发送
-mail:
-  enabled: true
-  host: smtp.163.com
-  port: 465
-  # 是否需要用户名密码验证
-  auth: true
-  # 发送方，遵循RFC-822标准
-  from: ageerle@163.com
-  # 用户名（注意：如果使用foxmail邮箱，此处user为qq号）
-  user: ageerle@163.com
-  # 密码（填写授权码）
-  pass: xxxx
-  # 使用 STARTTLS安全连接，STARTTLS是对纯文本通信协议的扩展。
-  starttlsEnable: true
-  # 使用SSL安全连接
-  sslEnable: true
-  # SMTP超时时长，单位毫秒，缺省值不超时
-  timeout: 0
-  # Socket连接超时值，单位毫秒，缺省值不超时
-  connectionTimeout: 0

 # Swagger配置
 swagger:
@@ -313,15 +292,12 @@ management:

 --- # websocket
 websocket:
-  enabled: true
+  enabled: false
  # 路径
  path: ''
  # 设置访问源地址
  allowedOrigins: '*'
-# chatgpt配置信息
-chat:
-  apiKey: 'sk-xxx'
-  apiHost: 'https://api.pandarobot.chat/'
+
 # 微信小程序配置信息
 wx:
  miniapp:
@@ -338,6 +314,8 @@ baidu:
  textReview:
    apiKey: '' # apiKey
    secretKey: '' # secretKey
+  appKey: xxxxxxxxxxxxxxxxx
+  secretKey: xxxxxxxxxxxxxxxxxxxxxxx

 wechat:
  #  是否使用微信 true/false
@@ -353,23 +331,62 @@ keyword:
  image: "ai画图"
  #  ai语音指令(TTS模型 https://platform.openai.com/docs/api-reference/audio)
  audio: "ai语音"
+
 mj:
-  api-secret:
+  api-secret: 'sk-xx'
  task-store:
    type: in_memory
    timeout: 30d
  translate-way: gpt
-#  proxy:
-#    host: 127.0.0.1
-#    port: 10809
+  #  proxy:
+  #    host: 127.0.0.1
+  #    port: 10809
  ng-discord:
-    server: https://discord.pandarobot.chat/
-    cdn: https://app.pandarobot.chat/
-    wss: https://gateway.pandarobot.chat/
+    server: 'https://xxx.pandarobot.chat/'
+    cdn: 'https://xxx.pandarobot.chat/'
+    wss: 'https://xxx.pandarobot.chat/'
  openai:
-    gpt-api-url: 'https://api.gptgod.online/'
-    gpt-api-key: 'xxxxxxx'
+    gpt-api-url: 'https://api.pandarobot.chat/'
+    gpt-api-key: 'sk-xx'
  accounts:
-    - guild-id: 'xxxxxx'
-      channel-id: 'xxxxx'
-      user-token: 'xxxxxxx'
+    - guild-id: 'xx'
+      channel-id: 'xx'
+      user-token: 'xx'
+
+--- # mail 邮件发送
+mail:
+  enabled: true
+  host: smtp.163.com
+  port: 465
+  # 是否需要用户名密码验证
+  auth: true
+  # 发送方，遵循RFC-822标准
+  from: ageerle@163.com
+  # 用户名（注意：如果使用foxmail邮箱，此处user为qq号）
+  user: ageerle@163.com
+  # 密码（填写授权码）
+  pass: TOGXBVPYFVPFRQMQ
+  # 使用 STARTTLS安全连接，STARTTLS是对纯文本通信协议的扩展。
+  starttlsEnable: true
+  # 使用SSL安全连接
+  sslEnable: true
+  # SMTP超时时长，单位毫秒，缺省值不超时
+  timeout: 0
+  # Socket连接超时值，单位毫秒，缺省值不超时
+  connectionTimeout: 0
+
+# chatgpt配置信息
+chat:
+  apiKey: 'sk-xxx'
+  apiHost: 'https://api.pandarobot.chat/'
+
+# 支付配置信息
+pay:
+  pid: 'xxx'
+  key: 'xxx'
+  payUrl: 'https://pay.pandarobot.chat/mapi.php'
+  notify_url: 'https://www.pandarobot.chat/pay/returnUrl'
+  return_url: 'https://www.pandarobot.chat/pay/notifyUrl'
+  type: 'wxpay'
+  device: 'pc'
+  sign_type: 'MD5'