 林zp
|
67050f972e
|
添加一个路由守护
|
2025-03-30 00:20:09 +08:00 |
|
  欣南科技andGitHub
|
ffafd32693
|
Merge pull request #579 from xinnan-tech/test-manager-api
manage-api集成测试
|
2025-03-29 21:56:04 +08:00 |
|
 hrz
|
ab4ec5e468
|
update：完成user、agent、device三个模块接口测试
|
2025-03-29 21:52:06 +08:00 |
|
|
hrzandGitHub
|
a07277feb8
|
Merge pull request #580 from xinnan-tech/manager-api-newdevice
修改了设备模块的绑定设备接口的逻辑
|
2025-03-29 18:10:00 +08:00 |
|
|
hrzandGitHub
|
a3cd4b6e66
|
Merge branch 'test-manager-api' into manager-api-newdevice
|
2025-03-29 18:09:51 +08:00 |
|
|
hrz
|
25b7e76407
|
update:格式化代码
|
2025-03-29 18:00:06 +08:00 |
|
|
hrz
|
630cb13066
|
update:优化泛型代码
|
2025-03-29 17:49:39 +08:00 |
|
|
hrz
|
81188a0129
|
update:删除无用文件
|
2025-03-29 17:15:19 +08:00 |
|
|
hrzandGitHub
|
cf1abd90a0
|
Merge pull request #577 from CaixyPromise/main
实现OTA接口
|
2025-03-29 17:12:08 +08:00 |
|
|
hrzandGitHub
|
6865a8be45
|
Merge branch 'test-manager-api' into main
|
2025-03-29 17:11:58 +08:00 |
|
|
hrz
|
b63fcc80a1
|
update:整合现有版本
|
2025-03-29 17:06:53 +08:00 |
|
 caixypromise
|
a19ba6d48b
|
chore: 因为在OTA激活设备时要求绑定用户信息，如果不把这里的调试功能注释则拿不到用户信息，会数据不完整。
|
2025-03-29 16:04:57 +08:00 |
|
|
caixypromise
|
70b6efe922
|
feature: 新增实现OTA功能——实现设备激活、前端输入激活码验证并保存设备。
|
2025-03-29 16:02:30 +08:00 |
|
|
caixypromise
|
0b07269346
|
chore: DeviceEntity设备实体类的Id字段类型错误，数据库内为varchar，映射类型为Long;
|
2025-03-29 15:59:48 +08:00 |
|
|
hrz
|
2988e5eef2
|
merge:main分支的manager-web和xiaozhi-server
|
2025-03-29 10:49:55 +08:00 |
|
|
hrzandGitHub
|
fe87889ccd
|
Merge pull request #572 from dreamchen/feature_manager-web&api_agent&device&roleConfig&ota&syncConfig
Feature manager web&api agent&device&role config&ota&sync config
|
2025-03-29 10:27:55 +08:00 |
|
|
hrzandGitHub
|
0598ab4400
|
Merge pull request #574 from LinZeb906791229/main
get_ip_info接口优化
|
2025-03-29 09:06:05 +08:00 |
|
|
hrzandGitHub
|
7d090f8ecc
|
Merge pull request #573 from mkanako/fix_function_call_type
修复function call的参数类型定义错误
|
2025-03-29 09:02:44 +08:00 |
|
 kanako
|
088ee47b3c
|
修复function call的参数类型定义错误
|
2025-03-28 23:44:07 +08:00 |
|
 Erlei Chen
|
a320b4c001
|
update：调整方法鉴权
|
2025-03-28 23:17:53 +08:00 |
|
|
Erlei Chen
|
3adce95340
|
Merge branch 'main' into MVP
|
2025-03-28 23:13:24 +08:00 |
|
 abin
|
2a6bfd792a
|
get_ip_info接口优化
将失效的https://freeipapi.com/api/json替换为https://whois.pconline.com.cn/ipJson.jsp?json=true
|
2025-03-28 22:52:21 +08:00 |
|
|
Erlei Chen
|
0816f1f589
|
feature：为合并mian做准备
|
2025-03-28 22:22:23 +08:00 |
|
|
欣南科技andGitHub
|
497def8055
|
Merge pull request #569 from xinnan-tech/add-tag
update:0.1.16版本
v0.1.16
|
2025-03-28 18:48:05 +08:00 |
|
|
hrz
|
62be26ff47
|
update:0.1.16版本
- 增加mcp服务
- 支持Dify、Coze时使用独立的意图识别
|
2025-03-28 18:47:20 +08:00 |
|
|
hrzandGitHub
|
6a81d80778
|
Merge pull request #492 from xinnan-tech/mcp-client
增加mcp的tool功能，可自行配置mcp服务，实现命令控制
|
2025-03-28 18:42:24 +08:00 |
|
 剑雨
|
8914beae26
|
修改了设备模块的绑定设备接口的逻辑
--DeviceBindDTO.java 把原来设备请求头dto改为绑定dto
--DeviceController.java 修改设备绑定接口，改为需要提供智能体和设备验证码2个参数，通过设备验证码获取到mac地址，把用户id，mac地址，智能体id保存到数据库
--DeviceEntity.java 继承基础实体类
--DeviceService.java 修改绑定设备方法定义
--DeviceServiceImpl.java 重写绑定设备方法
|
2025-03-28 18:04:01 +08:00 |
|
|
hrzandGitHub
|
60c38a8dea
|
Merge pull request #562 from mkanako/fix_handle_device
fix:修复handle_device.py 参数类型定义错误导致DoubaoLLM调用报 400 错误
|
2025-03-28 17:51:04 +08:00 |
|
|
欣南科技andGitHub
|
4e0934debf
|
Merge pull request #567 from xinnan-tech/fix_intent_llm
fix：Dify、Coze可使用独立意图识别
|
2025-03-28 17:49:27 +08:00 |
|
|
hrz
|
17126303fa
|
fix:已经使用了intent_llm，不应该再回到functioncall的chat中
|
2025-03-28 17:17:14 +08:00 |
|
 CGDandGitHub
|
98fa95190c
|
Merge pull request #563 from xinnan-tech/web_UserManagement_optimize
优化了“用户管理”，分页还未调整
|
2025-03-28 15:42:03 +08:00 |
|
 Ran_Chen
|
3a2261107c
|
优化了“用户管理”，分页还未调整
|
2025-03-28 15:24:53 +08:00 |
|
 kanakoandGitHub
|
b1b64abed9
|
fix:修复handle_device.py 参数类型定义错误导致DoubaoLLM调用报 400 错误
|
2025-03-28 14:20:11 +08:00 |
|
|
hrz
|
05356b6652
|
update:简化intent_llm代码
|
2025-03-28 14:13:54 +08:00 |
|
|
CGDandGitHub
|
cbd0c6615d
|
Merge pull request #558 from xinnan-tech/web-HeaderBar-optimize
优化“导航栏”响应调整
|
2025-03-28 11:35:52 +08:00 |
|
|
Sakura-RanChenandGitHub
|
90e389efa2
|
Merge pull request #560 from xinnan-tech/web-api-AgentTemplate-get
完成“获取智能体模板”
|
2025-03-28 11:34:36 +08:00 |
|
|
CGD
|
00a0b26797
|
完成“获取智能体模板”
|
2025-03-28 11:20:08 +08:00 |
|
|
Ran_Chen
|
69b5ffe3bf
|
优化“导航栏”响应调整
|
2025-03-28 11:08:12 +08:00 |
|
 玄凤科技
|
31539294eb
|
调整mcp等待时间为15秒
|
2025-03-28 09:52:27 +08:00 |
|
|
玄凤科技
|
d1a2307134
|
Merge branch 'mcp-client' of https://github.com/xinnan-tech/xiaozhi-esp32-server into mcp-client
# Conflicts:
# main/xiaozhi-server/core/connection.py
# main/xiaozhi-server/requirements.txt
|
2025-03-28 09:11:48 +08:00 |
|
|
hrzandGitHub
|
97b777f1b2
|
Merge pull request #550 from Ike-li/fix_Dockerfile-server
修复 Dockerfile-server 注释
|
2025-03-27 22:30:26 +08:00 |
|
|
Erlei Chen
|
c565bfc6bc
|
feature：实现角色配置
|
2025-03-27 22:14:52 +08:00 |
|
|
Sakura-RanChenandGitHub
|
a63137abc9
|
Merge pull request #551 from xinnan-tech/web-API-device
Web api device
|
2025-03-27 17:59:54 +08:00 |
|
|
CGD
|
3ca06f8d50
|
完成”绑定设备“功能
|
2025-03-27 17:54:05 +08:00 |
|
 Ike-li
|
e5b0e202be
|
修复 Dockerfile-server 注释
|
2025-03-27 15:39:11 +08:00 |
|
|
Erlei Chen
|
41db6aafd9
|
feature：角色配置能力部分实现
|
2025-03-27 14:06:40 +08:00 |
|
|
CGDandGitHub
|
c66385d1f7
|
Merge pull request #547 from xinnan-tech/web-AddModel-optimize
优化“添加模型”页面布局
|
2025-03-27 11:57:01 +08:00 |
|
|
Ran_Chen
|
b0304fd875
|
优化“添加模型”页面布局
|
2025-03-27 11:54:05 +08:00 |
|
|
CGD
|
5bfc3efc9c
|
完成“解绑设备”
|
2025-03-27 11:24:49 +08:00 |
|
|
hrzandGitHub
|
62845cfcf1
|
Merge pull request #515 from koalalgx/main
意图识别intent_llm单独配置独立的LLM，意图识别intent_llm增加天气和新闻查询function
|
2025-03-27 10:43:49 +08:00 |
|