Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Feat/0.3.2 #717

Merged
merged 342 commits into from
Jun 28, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
342 commits
Select commit Hold shift + click to select a range
63726ba
feat: add sensitive words
yaojin3616 Jun 11, 2024
8b5cfa1
update
yaojin3616 Jun 11, 2024
a307a26
feat: evaluation backend (#612)
zgqgit Jun 12, 2024
5c2008f
feat: evaluation frontend (#616)
zgqgit Jun 12, 2024
f270f5c
feat: 修改用户组和设置用户时更新用户组的最近修改人和修改时间
zgqgit Jun 12, 2024
1b93b85
feat: 新增和修改用户时,将用户添加到默认用户组
zgqgit Jun 12, 2024
cc843ba
feat: 修改用户组名称、设置管理员、闭源变动时,更新用户组最近修改人
zgqgit Jun 12, 2024
eada806
feat: search label
changruib Jun 12, 2024
341e019
Merge branch 'feat-testing' of https://github.com/changruib/bisheng i…
changruib Jun 12, 2024
6c9c073
fix: search
changruib Jun 12, 2024
cf070c1
feat: 用户组管理员不属于用户组,只是作为管理员
zgqgit Jun 12, 2024
7f53ef6
feat: 增加一个获取所有超级管理员的接口
zgqgit Jun 12, 2024
fd5db45
Merge branch 'refs/heads/feat/0.3.13' into feat/0.3.1.4
zgqgit Jun 12, 2024
2cbb34e
feat: 修改下用户是否是用户组管理员的判断逻辑
zgqgit Jun 12, 2024
7abedbc
feat: delete group admin before add
yaojin3616 Jun 12, 2024
e6df20c
feat: group admin
yaojin3616 Jun 12, 2024
8ef0b5b
feat: delete build image
yaojin3616 Jun 12, 2024
b2062b3
fix: 修复建立用户组和资源关联时的报错
zgqgit Jun 12, 2024
ce821c6
feat: 修改获取用户组下资源列表的接口实现
zgqgit Jun 12, 2024
8827920
feat: vite config
changruib Jun 12, 2024
3442e32
Feat/0.3.13 (#624)
zgqgit Jun 12, 2024
4372731
fix: score
changruib Jun 12, 2024
48cbef8
feat: connect api in 0313
dolphin0618 Jun 12, 2024
a95d402
feat: 获取分组选的技能列表接口,简化返回的信息
zgqgit Jun 13, 2024
efdf82e
feat: evaluation frontend search (#626)
zgqgit Jun 13, 2024
27f517b
update gpt score
gulixin0922 Jun 13, 2024
f2d583b
fix: 修复用户组管理员的判断逻辑
zgqgit Jun 13, 2024
f90b3c0
fix: 修复获取技能时序列化的报错
zgqgit Jun 13, 2024
e5d610c
fix: 获取角色和用户列表时,过滤掉无权限查看的数据
zgqgit Jun 13, 2024
f9ab927
fix: 修复修改密码时的bug
zgqgit Jun 13, 2024
9b169a9
fix: 修复注册时的报错
zgqgit Jun 13, 2024
14ccf57
fix: 改密码接口的报错
zgqgit Jun 13, 2024
6de4d2a
fix: sso登陆是允许密码为空
zgqgit Jun 14, 2024
b2541ea
bug修复
QwQ-wuwuwu Jun 14, 2024
308a714
feat: add api in 314
dolphin0618 Jun 14, 2024
1f62d56
fix: 修复创建账号时密码是none的bug
zgqgit Jun 14, 2024
c13b455
feat: add sso config
yaojin3616 Jun 14, 2024
b4e687d
fix: sso创建的账号,添加普通用户角色
zgqgit Jun 14, 2024
366e9ce
fix: 修复非admin用户的权限检查报错
zgqgit Jun 14, 2024
e818b65
内容安全保存fix
QwQ-wuwuwu Jun 14, 2024
73b3b98
fix: 修复组内用户设置为管理员时的bug
zgqgit Jun 14, 2024
29733f0
fix: 设置和修改用户组和角色时根据权限不同去修改数据
zgqgit Jun 14, 2024
3070f9f
feat: 启用用户时清楚用户密码错误次数
zgqgit Jun 14, 2024
e1ff6bb
用户组编辑列表,用户管理员菜单
QwQ-wuwuwu Jun 14, 2024
81d5445
fix: lost rolelist by search
dolphin0618 Jun 14, 2024
7b7a7c0
bug: uuid error
yaojin3616 Jun 15, 2024
8e6d960
fix: 313 bug
dolphin0618 Jun 17, 2024
33769ea
Merge branch 'feat/0.3.1.4' of github.com:dataelement/bisheng into fe…
dolphin0618 Jun 17, 2024
0493e96
fix
QwQ-wuwuwu Jun 17, 2024
e30b965
Merge branch 'feat/0.3.1.4' of https://github.com/dataelement/bisheng…
QwQ-wuwuwu Jun 17, 2024
50daa29
feat: 知识库上传文件时,尝试将非utf-8编码的文件转为UTF-8编码格式
zgqgit Jun 17, 2024
3e158a0
feature: add skill stop method
yaojin3616 Jun 17, 2024
7865be8
fix: 修复默认用户未添加默认角色的bug
zgqgit Jun 17, 2024
ac172d7
feat: 获取用户组下的角色列表默认获取全部
zgqgit Jun 17, 2024
68d2494
feat: 用户密码修改后,清楚密码错误次数的技术
zgqgit Jun 17, 2024
f9f3406
fix:修复知识库写权限的校验
zgqgit Jun 17, 2024
655a452
Merge branch 'feat/0.3.1.4' of https://github.com/dataelement/bisheng…
QwQ-wuwuwu Jun 17, 2024
3462aa3
内容安全fix
QwQ-wuwuwu Jun 17, 2024
efcb4a6
fix:解决8.4.0版本的tenacity库报错
zgqgit Jun 17, 2024
47ba1b6
fix: Hide other versions
dolphin0618 Jun 17, 2024
e611066
Merge branch 'feat/0.3.1.4' of github.com:dataelement/bisheng into fe…
dolphin0618 Jun 17, 2024
07c76f2
bugfix: cancel task exception
yaojin3616 Jun 17, 2024
80d854f
fix:修复文件转编码的报错
zgqgit Jun 17, 2024
a29e99a
fix:修改default_llm的初始化方案
zgqgit Jun 17, 2024
93478b9
bugfix: cancel exception
yaojin3616 Jun 17, 2024
43c77cc
fix:修复spliter后总结标题丢失的问题
zgqgit May 24, 2024
4178a11
fix:修复助手覆盖答案时,将问题覆盖丢失的bug
zgqgit Jun 17, 2024
ccef53d
bugfix: cancel task when task done
yaojin3616 Jun 17, 2024
84b80c5
feature: change chunk get method to post method
yaojin3616 Jun 17, 2024
d9ad883
feat: Change chunk interface to post
dolphin0618 Jun 17, 2024
60a6c08
bugfix: message_id delete message
yaojin3616 Jun 17, 2024
1888564
feat: 上线助手技能列表默认返回全部
zgqgit Jun 17, 2024
bf196a9
fix: 修改上线列表返回的ID格式
zgqgit Jun 17, 2024
1e94faa
feat: 增加前端release镜像的打包
zgqgit Jun 17, 2024
dc17a2c
feat: 获取分组下的角色列表支持传分组id的列表
zgqgit Jun 18, 2024
a40116f
fix: 修复用户组管理员进行权限校验时可能导致的报错
zgqgit Jun 18, 2024
f7cbcdd
级联
QwQ-wuwuwu Jun 18, 2024
6e5b36b
fix: 获取助手和技能详情时校验下是否有操作权限
zgqgit Jun 18, 2024
5b6047f
feat: checkout 314
dolphin0618 Jun 18, 2024
c33adb6
Merge branch 'feat/0.3.1.4' of github.com:dataelement/bisheng into fe…
dolphin0618 Jun 18, 2024
9345568
feat: checkout 314
dolphin0618 Jun 18, 2024
bf98b65
fix: 助手、知识库、技能详情接口,无操作权限时统一返回403错误码
zgqgit Jun 18, 2024
16c21a0
fix: 文件上传相关的一些日志改为中文
zgqgit Jun 18, 2024
5c9927b
审计
QwQ-wuwuwu Jun 18, 2024
8af5c0c
角色列表fix
QwQ-wuwuwu Jun 18, 2024
c611ff8
feat: add 403page
dolphin0618 Jun 18, 2024
419443b
Merge branch 'feat/0.3.1.4' of https://github.com/dataelement/bisheng…
QwQ-wuwuwu Jun 18, 2024
827fdc1
fix: 提供审计日志接口,自定义工具支持获取被授权的工具列表
zgqgit Jun 18, 2024
6a040fe
Merge branch 'refs/heads/feat/0.3.1.4' into feat/0.3.1.5
zgqgit Jun 18, 2024
629e6d4
313国际化
QwQ-wuwuwu Jun 18, 2024
2d6d957
fix: verify csv file format
mapan2024 Jun 18, 2024
33de691
fix: file seek
mapan2024 Jun 18, 2024
6ea1d91
fix: label
changruib Jun 18, 2024
5943ad0
feat: 假回调返回技能已下线的信息
zgqgit Jun 19, 2024
997cada
feat: 查询审计日志时,操作用户支持多选
zgqgit Jun 19, 2024
4bce6bd
fix: file format check (#657)
zgqgit Jun 19, 2024
15d2b14
fix: label (#660)
zgqgit Jun 19, 2024
83894d2
feat: file limit
changruib Jun 19, 2024
13ded49
feat: 用户登录完成后返回有web_menu的权限
zgqgit Jun 19, 2024
4236199
feat: file limit (#662)
zgqgit Jun 19, 2024
9835bd7
fix:修改default_llm的初始化方案
zgqgit Jun 17, 2024
e3d38d2
审计
QwQ-wuwuwu Jun 19, 2024
afdfe5a
Configure tool and menu permissions for roles
dolphin0618 Jun 19, 2024
d52225c
fix: admin menu permissions
dolphin0618 Jun 19, 2024
b5311ef
feat: file limit text
changruib Jun 19, 2024
ab2e331
feat: error message
DurioLab Jun 19, 2024
a587f7e
feat: file limit text (#666)
zgqgit Jun 19, 2024
3ccfa48
fix: file format message (#665)
zgqgit Jun 19, 2024
7ebc2ba
fix: 修改llm初始化的方法
zgqgit Jun 19, 2024
247642a
merge: 313
dolphin0618 Jun 19, 2024
5774fd4
优雅代码
QwQ-wuwuwu Jun 19, 2024
fbb04af
feat: 完成助手新建会话时的日志入库和检索
zgqgit Jun 19, 2024
06db327
fix: chat of unlogin
dolphin0618 Jun 20, 2024
a17252c
feat: 技能新建会话时写审计日志
zgqgit Jun 20, 2024
71ec557
fix(App.tsx):修复user为null的逻辑
QwQ-wuwuwu Jun 20, 2024
4f0b65d
Merge branch 'feat/0.3.1.4' of https://github.com/dataelement/bisheng…
QwQ-wuwuwu Jun 20, 2024
682745f
fix: 管理员菜单权限
dolphin0618 Jun 20, 2024
5d0cd20
fix: 改密码接口参数改为body传参
zgqgit Jun 20, 2024
32d4105
fix: 修复获取用户列表的报错
zgqgit Jun 20, 2024
8cc140a
fix: 修改数据库类型
zgqgit Jun 20, 2024
b5fa9d0
fix: 按prd修改错误提示
zgqgit Jun 20, 2024
adaa490
fix: 默认180天
zgqgit Jun 20, 2024
2fd6a53
fix: 修复获取用户列表的报错
zgqgit Jun 20, 2024
c724f7f
fix: 修复获取用户列表的报错
zgqgit Jun 20, 2024
c4691c0
fix: 修改封禁提示词
zgqgit Jun 20, 2024
49242c3
fix: 已登录用户改密码时,明确告知是密码错误
zgqgit Jun 20, 2024
f0efe94
fix: 修复下es组件的报错
zgqgit Jun 20, 2024
12a9b5c
暂时
QwQ-wuwuwu Jun 20, 2024
3190fe6
Merge branch 'feat/0.3.1.4' of https://github.com/dataelement/bisheng…
QwQ-wuwuwu Jun 20, 2024
bffcde9
fix(Roles.tsx):角色列表默认请求修复
QwQ-wuwuwu Jun 20, 2024
d60b8b3
fix: 知识库权限校验组件把无用的参数去掉
zgqgit Jun 20, 2024
63a592c
fix: 角色管理增加用户组管理员的权限校验
zgqgit Jun 20, 2024
9a2110d
fix: 修复编辑角色时的bug
zgqgit Jun 20, 2024
df0c9c9
feat:增删改助手和技能时记录审计日志
zgqgit Jun 20, 2024
89a20a5
feat:知识库模块审计日志的完善
zgqgit Jun 20, 2024
bdf765b
feat:系统模块审计日志写入逻辑完善
zgqgit Jun 20, 2024
a10dc8f
Merge branch 'refs/heads/feat/0.3.1.4' into feat/0.3.1.5
zgqgit Jun 20, 2024
1443257
feat:系统模块审计日志记录完毕
zgqgit Jun 20, 2024
f6536bc
fix: 修复已登录用户改密码的报错
zgqgit Jun 21, 2024
ed027d4
Merge branch 'refs/heads/feat/0.3.1.4' into feat/0.3.1.5
zgqgit Jun 21, 2024
9b03f41
fix(LoginPage,SystemPage):修复用户列表重置密码入口,请求返回提示
QwQ-wuwuwu Jun 21, 2024
4ba5b12
Merge branch 'feat/0.3.1.4' of https://github.com/dataelement/bisheng…
QwQ-wuwuwu Jun 21, 2024
972be2f
fix: 修复重置用户密码时权限校验错误
zgqgit Jun 21, 2024
3ee4c94
fix: 修改密码错误的提示
zgqgit Jun 21, 2024
b586d60
fix: 多知识库组件增加parition key的判断
zgqgit Jun 21, 2024
834d695
fix(pages):314bug全部修复
QwQ-wuwuwu Jun 21, 2024
cb80d66
Merge branch 'feat/0.3.1.4' of https://github.com/dataelement/bisheng…
QwQ-wuwuwu Jun 21, 2024
af6a9f7
fix: 修复milvus多知识库时,parition模式搜索bug
zgqgit Jun 21, 2024
c518c0a
style(pages):用户列表文案变动
QwQ-wuwuwu Jun 21, 2024
1639dc7
fix: 修改下es分词后的日志
zgqgit Jun 21, 2024
55c8c51
Merge branch 'feat/0.3.1.4' of https://github.com/dataelement/bisheng…
QwQ-wuwuwu Jun 21, 2024
bca967c
feat: Set groups and roles for user
dolphin0618 Jun 21, 2024
d6cf01e
fix: 修复下milvus分数排序问题
zgqgit Jun 21, 2024
bc1bbe8
fix(pages):账号禁用提示修复
QwQ-wuwuwu Jun 21, 2024
5f55eb3
Merge branch 'feat/0.3.1.4' of https://github.com/dataelement/bisheng…
QwQ-wuwuwu Jun 21, 2024
d605d91
fix: 修复下es分数排序问题,增加v2获取技能信息的接口
zgqgit Jun 21, 2024
6ccc5ff
fix: 漏传了一个文件
zgqgit Jun 21, 2024
465082e
fix(pages):过期修改密码逻辑修复,编辑组件弹窗样式修复
QwQ-wuwuwu Jun 21, 2024
1203ffb
Merge branch 'feat/0.3.1.4' of https://github.com/dataelement/bisheng…
QwQ-wuwuwu Jun 21, 2024
d714198
fix: 接口和v1统一
zgqgit Jun 21, 2024
2a4a90a
fix: 修复用户组管理获取列表报错
zgqgit Jun 21, 2024
29533b0
fix: unlogin chat
dolphin0618 Jun 21, 2024
40f5951
Merge branch 'refs/heads/feat/0.3.1.4' into feat/0.3.1.5
zgqgit Jun 22, 2024
cad9d80
feat: 修复合并错误
zgqgit Jun 22, 2024
05d29af
feat: 修复审核日志的bug
zgqgit Jun 22, 2024
f11d123
style:api参数调整
QwQ-wuwuwu Jun 24, 2024
7fd304a
Merge branch 'feat/0.3.1.4' of https://github.com/dataelement/bisheng…
QwQ-wuwuwu Jun 24, 2024
2bf570d
feat:审计菜单
QwQ-wuwuwu Jun 24, 2024
01e91d2
feat: 修复参数的校验
zgqgit Jun 24, 2024
3761e51
feat: 修改助手历史会话的记录方案
zgqgit Jun 24, 2024
55f1308
fix:修复用户组筛选审计日志报错
zgqgit Jun 24, 2024
966bc68
feat: 增加安全检查消息的写入和更新
zgqgit Jun 24, 2024
50ea35f
feat: 增加获取所有操作人的接口
zgqgit Jun 24, 2024
f472e40
fix: 开始和结束日期传那个限制那个
zgqgit Jun 24, 2024
7a5abe1
fix:审计bug修复
QwQ-wuwuwu Jun 24, 2024
b472bc6
feat: for zhongying
dolphin0618 Jun 25, 2024
dd8b958
fix:审计级联,用户列表加载问题修复
QwQ-wuwuwu Jun 25, 2024
638ffe3
Merge branch 'feat/0.3.1.4' of https://github.com/dataelement/bisheng…
QwQ-wuwuwu Jun 25, 2024
cdda7ab
fix: 修复用户组筛选的bug
zgqgit Jun 25, 2024
2eeb1c3
Merge branch 'refs/heads/feat/0.3.1.4' into feat/0.3.1.5
zgqgit Jun 25, 2024
a181c27
style:审计列表样式优化
QwQ-wuwuwu Jun 25, 2024
342c111
style:审计列表表头样式修复
QwQ-wuwuwu Jun 25, 2024
63615ec
fix:审计表头,菜单授权默认状态,文案
QwQ-wuwuwu Jun 25, 2024
0b0d658
feat: collapse chat logs
dolphin0618 Jun 25, 2024
c31e80d
fix: 修复获取客户端ip的逻辑
zgqgit Jun 25, 2024
7ca6313
style:审计备注格式
QwQ-wuwuwu Jun 25, 2024
d89f2a2
Merge branch 'feat/0.3.1.4' of https://github.com/dataelement/bisheng…
QwQ-wuwuwu Jun 25, 2024
04429c4
fix qa gen bug
gulixin0922 Jun 25, 2024
4d7b25a
Feat/rag optimize (#694)
gulixin0922 Jun 25, 2024
8da5260
fix:工具展示,菜单权限
QwQ-wuwuwu Jun 25, 2024
3cd3e4f
style:审计列表
QwQ-wuwuwu Jun 25, 2024
097df92
fix:审计级联效果修复
QwQ-wuwuwu Jun 25, 2024
c969d20
feat: 修改elem_uns_loader组件的逻辑,增加转pdf的保底逻辑
zgqgit Jun 26, 2024
d4def19
Merge branch 'refs/heads/feat/0.3.1.4' into feat/0.3.1.5
zgqgit Jun 26, 2024
a41b67b
style:审计列表样式,知识列表样式,下拉选择框展示
QwQ-wuwuwu Jun 26, 2024
c9a065c
feat: QA对组件将k和chunk_size参数暴露出来
zgqgit Jun 26, 2024
7e56844
feat: 处理下stop的请求,防止报错
zgqgit Jun 26, 2024
708e73f
feat: 修改QA对组件生成的结果
zgqgit Jun 26, 2024
1e97e49
feat: 更新消息体的时候,取消溯源按钮
zgqgit Jun 26, 2024
588bc0a
fix qa gen v1 bug
gulixin0922 Jun 26, 2024
7e058ec
fix:角色列表下拉框搜索卡住修复
QwQ-wuwuwu Jun 26, 2024
9316b1b
Merge branch 'feat/0.3.1.5' into feat/rag_optimize
zgqgit Jun 26, 2024
af72b4d
fix qa gen v1 bug (#702)
zgqgit Jun 26, 2024
b417b22
fix: QAGenerationChain隐藏preset question
zgqgit Jun 26, 2024
c6d56c0
feat: sqlchain 支持流式输出, universalKV 支持sdk2.3
yaojin3616 Jun 26, 2024
0feab28
feat: 修改bisheng_retriever对象类型
zgqgit Jun 26, 2024
6ff6cfe
feat: 去掉QAGenerationChain的显示
zgqgit Jun 26, 2024
990a92e
fix:默认管理员展示,日期筛选范围,编辑用户卡住,展示,流量限制展示
QwQ-wuwuwu Jun 26, 2024
cfbad0d
Merge branch 'feat/0.3.1.4' of https://github.com/dataelement/bisheng…
QwQ-wuwuwu Jun 26, 2024
a2b7217
feat: add stop in chatpage
dolphin0618 Jun 26, 2024
bec4488
feat: 修复用户组编辑时日志关联移出的用户组
zgqgit Jun 26, 2024
0c280b6
feat: get input keys
mapan2024 Jun 26, 2024
01ebe44
fix: input keys
mapan2024 Jun 26, 2024
8bb50c7
feat: 更新自定义工具时加上权限判断
zgqgit Jun 26, 2024
18ada91
feat: fix run flow input keys (#706)
zgqgit Jun 26, 2024
9f18b66
Merge branch 'refs/heads/feat/0.3.1.4' into feat/0.3.1.5
zgqgit Jun 27, 2024
0da0ba1
feat: 0.3.1.4
dolphin0618 Jun 27, 2024
bd8fb56
Merge branch 'refs/heads/feat/0.3.1.4' into feat/0.3.1.5
zgqgit Jun 27, 2024
cbd1059
Merge branch 'refs/heads/feat/0.3.1.5' into feat/0.3.2
zgqgit Jun 27, 2024
83d2ab5
Merge branch 'refs/heads/feat/0.3.1.6' into feat/0.3.2
zgqgit Jun 27, 2024
dfe7e3d
feat: 修复合并导致的报错
zgqgit Jun 27, 2024
c5be07a
Merge branch 'feat/0.3.2' of https://github.com/dataelement/bisheng i…
QwQ-wuwuwu Jun 27, 2024
027cf69
fix:流量控制展示修复
QwQ-wuwuwu Jun 27, 2024
a4b4609
feat: 禁止编辑系统管理员的角色和用户组
zgqgit Jun 27, 2024
d0f2cbd
fix: 修复表单组件的顺序改变的bug
zgqgit Jun 27, 2024
b7311d6
Merge branch 'refs/heads/feat/0.3.1.5' into feat/0.3.2
zgqgit Jun 27, 2024
7b06cdf
feat:初始化部署时插入默认用户组
zgqgit Jun 27, 2024
5a2068f
merge: 0316
dolphin0618 Jun 27, 2024
74c0339
feat:删除用户组时将资源转移到默认用户组
zgqgit Jun 27, 2024
b9b581a
feat:去掉测试代码
zgqgit Jun 28, 2024
15ac5e9
fix:用户列表编辑多次改变选择选项不会收起
QwQ-wuwuwu Jun 28, 2024
96a58bd
feat:获取用户组角色列表时不返回系统管理员角色
zgqgit Jun 28, 2024
e9c8f00
fix: 修改下获取分组的排序
zgqgit Jun 28, 2024
3b6e465
feat:拖拽排序实现
QwQ-wuwuwu Jun 28, 2024
e9a3777
Merge branch 'feat/0.3.2' of https://github.com/dataelement/bisheng i…
QwQ-wuwuwu Jun 28, 2024
8cb77ec
fix: 修复删除用户组bug
zgqgit Jun 28, 2024
99bcf91
feat: Support level routing access system
dolphin0618 Jun 28, 2024
d322c50
feat:用户列表筛选已选项上浮置顶
QwQ-wuwuwu Jun 28, 2024
f6c52fa
Merge branch 'feat/0.3.2' of https://github.com/dataelement/bisheng i…
QwQ-wuwuwu Jun 28, 2024
ced76bd
feat: vite config
dolphin0618 Jun 28, 2024
49c3dc4
Merge branch 'feat/0.3.2' of https://github.com/dataelement/bisheng i…
QwQ-wuwuwu Jun 28, 2024
bebeda0
fix: 评测报错日志打印出堆栈
zgqgit Jun 28, 2024
ec619c1
fix: 删除用户组后清理角色信息,助手工具删除时判断权限校验
zgqgit Jun 28, 2024
1a36738
fix:拖拽排序修复
QwQ-wuwuwu Jun 28, 2024
2c68513
Merge branch 'feat/0.3.2' of https://github.com/dataelement/bisheng i…
QwQ-wuwuwu Jun 28, 2024
ef06c0d
fix: 删除用户组后清理角色信息,助手工具删除时判断权限校验
zgqgit Jun 28, 2024
078098b
fix: 角色列表按照创建时间倒序
zgqgit Jun 28, 2024
9aa1bda
Merge branch 'refs/heads/main' into feat/0.3.2
zgqgit Jun 28, 2024
10a9d8f
feat: vite config
dolphin0618 Jun 28, 2024
0284958
fix: Wait for user input in autogen
dolphin0618 Jun 28, 2024
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
180 changes: 155 additions & 25 deletions .drone.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,41 +2,171 @@ kind: pipeline # 定义对象类型,还有secret和signature两种类型
type: docker # 定义流水线类型,还有kubernetes、exec、ssh等类型
name: cicd # 定义流水线名称

clone:
disable: true

steps: # 定义流水线执行步骤,这些步骤将顺序执行
- name: clone
image: alpine/git
pull: if-not-exists
environment:
http_proxy:
from_secret: PROXY
https_proxy:
from_secret: PROXY
commands:
- git clone https://github.com/dataelement/bisheng.git .
- git checkout $DRONE_COMMIT

- name: package # 流水线名称
pull: if-not-exists
image: python:3.10-slim # 定义创建容器的Docker镜像
volumes: # 将容器内目录挂载到宿主机,仓库需要开启Trusted设置
- name: maven-cache
path: /root/.m2 # 将maven下载依赖的目录挂载出来,防止重复下载
- name: maven-build
- name: bisheng-cache
path: /app/build # 将应用打包好的Jar和执行脚本挂载出来
environment:
RELEASE_VERSION: 99.99.99
NEXUS_USER:
from_secret: NEXUS_USER
NEXUS_PASSWORD:
from_secret: NEXUS_PASSWORD
REPO:
from_secret: PY_NEXUS
commands: # 定义在Docker容器中执行的shell命令
- pip install Cython
- pip install wheel
- pip install twine
- pip config set global.index-url https://pypi.tuna.tsinghua.edu.cn/simple
- cd ./src/bisheng-langchain
- python setup.py bdist_wheel
- cp dist.* /app/build/

- name: build_backend
image: python:3.10-slim # 定义创建容器的Docker镜像
volumes: # 将容器内目录挂载到宿主机,仓库需要开启Trusted设置
- name: maven-cache
path: /root/.m2 # 将maven下载依赖的目录挂载出来,防止重复下载
- name: maven-build
path: /app/build # 将应用打包好的Jar和执行脚本挂载出来
- twine upload --verbose -u $NEXUS_USER -p $NEXUS_PASSWORD --repository-url $REPO dist/*.whl

- name: set poetry
pull: if-not-exists
image: golang
environment:
RELEASE_VERSION: 99.99.99
NEXUS_PUBLIC:
from_secret: NEXUS_PUBLIC
NEXUS_PUBLIC_PASSWORD:
from_secret: NEXUS_PUBLIC_PASSWORD
REPO:
from_secret: PY_NEXUS
PROXY:
from_secret: APT-GET
commands:
- cd ./src/backend
- pip install bisheng_langchain==$RELEASE_VERSION
- sed -i 's/^bisheng_langchain.*/bisheng_langchain = "'$RELEASE_VERSION'"/g' pyproject.toml
- poetry lock
- cd ./src/backend/
- echo $REPO
- REPO2=$(echo $REPO | sed 's/http:\\/\\///g')
- sed '/apt-get/ s|$| '"$PROXY"'|' Dockerfile
- sed -i 's/^bisheng_langchain.*/bisheng_langchain = "'$RELEASE_VERSION'"/g' pyproject.toml
- sed -i '6i\RUN pip config set global.index-url https://pypi.tuna.tsinghua.edu.cn/simple' Dockerfile
- sed -i '23i\RUN poetry source add --priority=supplemental foo http://'$NEXUS_PUBLIC':'$NEXUS_PUBLIC_PASSWORD'@'$REPO2'simple' Dockerfile
- sed -i '23i\RUN poetry source add --priority=primary qh https://pypi.tuna.tsinghua.edu.cn/simple' Dockerfile
- cat Dockerfile

- name: build_docker
pull: if-not-exists
image: plugins/docker
privileged: true
volumes: # 将容器内目录挂载到宿主机,仓库需要开启Trusted设置
- name: apt-cache
path: /var/cache/apt/archives # 将应用打包好的Jar和执行脚本挂载出来
- name: socket
path: /var/run/docker.sock
settings:
registry: http://192.168.106.8:6082
insecure: true
purge: true
repo: 192.168.106.8:6082/dataelement/bisheng-backend
tags: [ release ]
context: ./src/backend/
dockerfile: ./src/backend/Dockerfile
username:
from_secret: NEXUS_USER
password:
from_secret: NEXUS_PASSWORD
- name: build_docker_frontend
pull: if-not-exists
image: plugins/docker
privileged: true
volumes: # 将容器内目录挂载到宿主机,仓库需要开启Trusted设置
- name: apt-cache
path: /var/cache/apt/archives # 将应用打包好的Jar和执行脚本挂载出来
- name: socket
path: /var/run/docker.sock
settings:
registry: http://192.168.106.8:6082
insecure: true
purge: true
repo: 192.168.106.8:6082/dataelement/bisheng-frontend
tags: [ release ]
context: ./src/frontend/
dockerfile: ./src/frontend/Dockerfile
username:
from_secret: NEXUS_USER
password:
from_secret: NEXUS_PASSWORD

- name: ssh deploy
image: appleboy/drone-ssh
pull: if-not-exists
settings:
host: 192.168.106.116
username: root
password:
from_secret: sshpwd
script:
- echo =======找到目录=======
- cd /opt/server/bisheng-test
- echo =======直接启动=======
- docker compose pull
- docker compose up -d

- name: build-image # 步骤名称
image: plugins/docker # 使用镜像
settings: # 当前设置
username: # 账号名称
from_secret: docker_username
password: # 账号密码
from_secret: docker_password
dockerfile: deploy/Dockerfile # Dockerfile地址, 注意是相对地址
repo: yxs970707/deploy-web-demo # 镜像名称
- name: notify-start # notify
pull: if-not-exists
image: plugins/webhook
settings:
debug: true
urls:
from_secret: FEISHU_URL
content_type: application/json
template: |
{
"msg_type": "interactive",
"card": {
"type": "template",
"data": {
"template_id": "AAqkI9bnY5FUs",
"template_variable": {
"repo_name": "{{ repo.name }}",
"build_branch": "{{build.branch}}",
"build_author": "{{ DRONE_COMMIT_AUTHOR }}",
"link": "{{build.link}}",
"commit_msg": "{{ trim build.message }}",
"build_tag":"{{build.tag}}",
"build_start":"{{build.started}}",
"status": "{{ build.status }}"
}
}
}
}
when: # 成功
status:
- success
trigger:
branch:
- release
event:
- push

volumes:
- name: bisheng-cache
host:
path: /opt/drone/data/bisheng/
- name: apt-cache
host:
path: /opt/drone/data/bisheng/apt/
- name: socket
host:
path: /var/run/docker.sock
Loading