Merge branch 'master' into pre

# Conflicts:
#	netflix-dao/src/main/java/com/cyksj/model/entity/ChatgptUserCarUsedRecord.java

netflix-dao/src/main/java/com/cyksj/model/entity/ChatgptUserCarUsedRecord.java

@@ -32,4 +32,9 @@ public class ChatgptUserCarUsedRecord extends BaseEntity{
 	 */
 	private Integer gptFour;
 
+	/**
+	 * true用户次数限制
+	 */
+	private Boolean isUserLimit;
+
 }

netflix-service/src/main/java/com/cyksj/service/chatgpt/impl/ChatGptAccountServiceImpl.java

@@ -494,6 +494,11 @@ public class ChatGptAccountServiceImpl implements ChatGptAccountService {
                 conversationLimitResponse.setNextAvailableTime(nextAvailableTime);
             }
             conversationLimitResponse.setLimited(true);
+            //用户次数使用限制
+            ChatgptUserCarUsedRecord chatgptUserCarUsedRecord = new ChatgptUserCarUsedRecord();
+            chatgptUserCarUsedRecord.setUserToken(userToken);
+            chatgptUserCarUsedRecord.setIsUserLimit(true);
+            chatgptUserCarUsedRecordMapper.insert(chatgptUserCarUsedRecord);
             return conversationLimitResponse;
         } else {
             // 如果未超过限制，记录当前请求的时间戳