Merge remote-tracking branch 'origin/master'

src/main/java/com/rymcu/forest/config/RedisListenerConfig.java

@@ -3,6 +3,7 @@ package com.rymcu.forest.config;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.data.redis.connection.RedisConnectionFactory;
+import org.springframework.data.redis.core.StringRedisTemplate;
 import org.springframework.data.redis.listener.RedisMessageListenerContainer;
 
 /**
@@ -21,4 +22,9 @@ public class RedisListenerConfig {
         container.setConnectionFactory(connectionFactory);
         return container;
     }
+
+    @Bean
+    public StringRedisTemplate stringRedisTemplate(RedisConnectionFactory redisConnectionFactory) {
+        return new StringRedisTemplate(redisConnectionFactory);
+    }
 }

src/main/java/com/rymcu/forest/openai/OpenAiController.java

@@ -60,7 +60,6 @@ public class OpenAiController {
             throw new IllegalArgumentException("参数异常！");
         }
         User user = UserUtils.getCurrentUserByToken();
-        Collections.reverse(messages);
         List<ChatMessage> list = new ArrayList<>(messages.size());
         if (messages.size() > 4) {
             messages = messages.subList(messages.size() - 4, messages.size());
@@ -78,9 +77,10 @@ public class OpenAiController {
 
     @NotNull
     private GlobalResult sendMessage(User user, List<ChatMessage> list) {
+        boolean isAdmin = UserUtils.isAdmin(user.getEmail());
         OpenAiService service = new OpenAiService(token, Duration.ofSeconds(180));
         ChatCompletionRequest completionRequest = ChatCompletionRequest.builder()
-                .model("gpt-3.5-turbo-16k-0613")
+                .model(isAdmin ? "gpt-4o" : "gpt-3.5-turbo-16k-0613")
                 .stream(true)
                 .messages(list)
                 .build();

src/main/java/com/rymcu/forest/util/UserUtils.java

@@ -78,4 +78,8 @@ public class UserUtils {
         }
         throw new UnauthenticatedException();
     }
+
+    public static boolean isAdmin(String email) {
+        return userMapper.hasAdminPermission(email);
+    }
 }