opensource/HuLa-Server
3
0
Fork 0
mirror of https://github.com/HuLaSpark/HuLa-Server.git synced 2026-08-29 00:03:28 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'gitee/dev' into ql

Browse Source 
# Conflicts:
#	hula-im-service/src/main/java/com/hula/ai/gpt/service/impl/ChatServiceImpl.java
#	hula-im-service/src/main/java/com/hula/ai/gpt/service/impl/GptServiceImpl.java
#	hula-im-service/src/main/java/com/hula/ai/llm/base/service/impl/TongYiServiceImpl.java
#	hula-im-service/src/main/resources/application-dev.yml
#	sql/hula-im.sql
This commit is contained in:
ql
2025-05-29 17:50:01 +08:00
parent f1d9bc8eb7 6358549cd0
commit 4eeb9133c1
2 changed files with 13 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
hula-im-service/src/main/resources/application-dev.yml
+8 -8
View File
@@ -51,11 +51,11 @@ spring:
api-key: sk-abc
HuLa-IM:
HOST: localhost #域名
HOST: 127.0.0.1 #域名
MYSQL_PORT: 3306 #端口
DATABASE_NAME: hula-im #数据库名
MYSQL_USER_NAME: root #数据库用户名
MYSQL_PASSWORD: root #数据库密码
MYSQL_PASSWORD: 123456 #数据库密码
REDIS:
PAW: 123456 #redis密码, 如果是数字密码最好用引号包裹起来
PORT: 6379 # redis端口号
@@ -68,14 +68,14 @@ HuLa-IM:
JWT: #JWT配置
SECRET: dsfsdfsdfsdfsd
ROCKETMQ: #rocketmq配置
NAME-SERVER: 192.168.2.200:9876 # nameserver地址
ACCESS-KEY: hula-server
SECRET-KEY: 123456789
NAME-SERVER: 127.0.0.1:9876 # nameserver地址
ACCESS-KEY: hulaspark
SECRET-KEY: hula123456789
mail:
host: smtp.qq.com
port: 587
username: 11 # 发件人邮箱
password: 11 # 邮箱SMTP授权码
port: 465
username: xxxxxxxxxxxxxxx # 发件人邮箱
password: xxxxxxxx # 邮箱SMTP授权码
uid:
database:
sql/hula-im.sql
+5 -3
View File
@@ -11,7 +11,7 @@
Target Server Version : 80031 (8.0.31)
File Encoding : 65001
Date: 27/04/2025 16:00:45
Date: 28/05/2025 14:53:35
*/
SET NAMES utf8mb4;
@@ -175,6 +175,7 @@ CREATE TABLE `ai_gpt_chat_message` (
-- Records of ai_gpt_chat_message
-- ----------------------------
INSERT INTO `ai_gpt_chat_message` VALUES (78095167005053952, 78094677378781184, 'f34e52b5-c853-4355-b70d-f0186fe2d356', '', 'LocalLM', 'chatglm3-6b', '32131', 'text', 'user', '', 1, '', 0, NULL, '', 3, '2025-03-06 10:49:40', NULL, NULL, 0);
-- ----------------------------
-- Table structure for ai_gpt_comb
-- ----------------------------
@@ -188,8 +189,8 @@ CREATE TABLE `ai_gpt_comb` (
`price` decimal(10, 2) NULL DEFAULT 0.00 COMMENT '价格',
`status` smallint NULL DEFAULT 1 COMMENT '状态 0 禁用 1 启用',
`remark` varchar(250) CHARACTER SET utf8mb3 COLLATE utf8mb3_general_ci NULL DEFAULT '' COMMENT '备注',
`created_by` bigint DEFAULT 0 NOT NULL COMMENT '创建者',
`created_time` datetime DEFAULT (now()) NOT NULL ON UPDATE CURRENT_TIMESTAMP COMMENT '创建时间',
`created_by` bigint NOT NULL DEFAULT 0 COMMENT '创建者',
`created_time` datetime NOT NULL DEFAULT (now()) ON UPDATE CURRENT_TIMESTAMP COMMENT '创建时间',
`updated_by` bigint NULL DEFAULT NULL COMMENT '更新者',
`updated_time` datetime NULL DEFAULT NULL COMMENT '更新时间',
`is_del` tinyint(1) NOT NULL DEFAULT 0 COMMENT '是否删除',
@@ -403,6 +404,7 @@ CREATE TABLE `black` (
`id` bigint UNSIGNED NOT NULL AUTO_INCREMENT COMMENT 'id',
`type` int NOT NULL COMMENT '拉黑目标类型 1.ip 2uid',
`target` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL COMMENT '拉黑目标',
`deadline` datetime(3) NOT NULL DEFAULT CURRENT_TIMESTAMP(3) COMMENT '截止时间',
`create_time` datetime(3) NOT NULL DEFAULT CURRENT_TIMESTAMP(3) COMMENT '创建时间',
`update_time` datetime(3) NOT NULL DEFAULT CURRENT_TIMESTAMP(3) ON UPDATE CURRENT_TIMESTAMP(3) COMMENT '修改时间',
PRIMARY KEY (`id`) USING BTREE,