diff --git a/ruoyi-admin/src/main/java/org/ruoyi/controller/CaptchaController.java b/ruoyi-admin/src/main/java/org/ruoyi/controller/CaptchaController.java index 6a76d29d..444169d8 100644 --- a/ruoyi-admin/src/main/java/org/ruoyi/controller/CaptchaController.java +++ b/ruoyi-admin/src/main/java/org/ruoyi/controller/CaptchaController.java @@ -67,7 +67,7 @@ public class CaptchaController { String key = GlobalConstants.CAPTCHA_CODE_KEY + phonenumber; String code = RandomUtil.randomNumbers(4); RedisUtils.setCacheObject(key, code, Duration.ofMinutes(Constants.CAPTCHA_EXPIRATION)); - // 验证码模板id 自行处理 (查数据库或写死均可) + // 验证码模板id String templateId = ""; Map map = new HashMap<>(1); map.put("code", code); diff --git a/ruoyi-admin/src/main/resources/application.yml b/ruoyi-admin/src/main/resources/application.yml index 1d840e37..80479702 100644 --- a/ruoyi-admin/src/main/resources/application.yml +++ b/ruoyi-admin/src/main/resources/application.yml @@ -131,6 +131,8 @@ security: - /auth/reset/password # 聊天接口 - /chat/send + # 文件上传 + - /chat/upload # 静态资源 - /*.html - /**/*.html @@ -293,26 +295,6 @@ websocket: # 设置访问源地址 allowedOrigins: '*' -# 微信小程序配置信息 -wx: - miniapp: - configs: - - appid: # 你的appid - secret: # 你的secret - token: #微信小程序消息服务器配置的token - aesKey: #微信小程序消息服务器配置的EncodingAESKey - msgDataFormat: JSON - - # 企业微信应用 -wechat: - cp: - corpId: - appConfigs: - - agentId: - secret: '' - token: '' - aesKey: '' - spring: ai: openai: diff --git a/ruoyi-common/ruoyi-common-chat/src/main/java/org/ruoyi/common/chat/openai/OpenAiStreamClient.java b/ruoyi-common/ruoyi-common-chat/src/main/java/org/ruoyi/common/chat/openai/OpenAiStreamClient.java index e02dde19..dfd455ac 100644 --- a/ruoyi-common/ruoyi-common-chat/src/main/java/org/ruoyi/common/chat/openai/OpenAiStreamClient.java +++ b/ruoyi-common/ruoyi-common-chat/src/main/java/org/ruoyi/common/chat/openai/OpenAiStreamClient.java @@ -145,13 +145,15 @@ public class OpenAiStreamClient { .build(); } okHttpClient = builder.okHttpClient; + if (apiHost.endsWith("/")) { + this.openAiApi = new Retrofit.Builder() + .baseUrl(apiHost) + .client(okHttpClient) + .addCallAdapterFactory(RxJava2CallAdapterFactory.create()) + .addConverterFactory(JacksonConverterFactory.create()) + .build().create(OpenAiApi.class); + } -// this.openAiApi = new Retrofit.Builder() -// .baseUrl(apiHost) -// .client(okHttpClient) -// .addCallAdapterFactory(RxJava2CallAdapterFactory.create()) -// .addConverterFactory(JacksonConverterFactory.create()) -// .build().create(OpenAiApi.class); } /** diff --git a/ruoyi-common/ruoyi-common-mail/src/main/java/org/ruoyi/common/mail/config/MailConfig.java b/ruoyi-common/ruoyi-common-mail/src/main/java/org/ruoyi/common/mail/config/MailConfig.java index 28001d16..04979d0c 100644 --- a/ruoyi-common/ruoyi-common-mail/src/main/java/org/ruoyi/common/mail/config/MailConfig.java +++ b/ruoyi-common/ruoyi-common-mail/src/main/java/org/ruoyi/common/mail/config/MailConfig.java @@ -25,10 +25,8 @@ public class MailConfig { @Bean public MailAccount mailAccount() { - if (account == null) { - account = new MailAccount(); - updateMailAccount(); - } + account = new MailAccount(); + updateMailAccount(); return account; }