zlei6/ragflow
1
0
Fork 0
mirror of https://github.com/infiniflow/ragflow.git synced 2026-08-05 15:20:30 +08:00
Code Issues Packages Projects Releases Wiki Activity

Go: refactor and add version type (#16863)

Browse Source 
### Summary

```
RAGFlow(admin)> show version;
+--------------+-----------------------+
| field        | value                 |
+--------------+-----------------------+
| version      | v0.26.4-84-g547bc8614 |
| version_type | open source           |
+--------------+-----------------------+
```

---------

Signed-off-by: Jin Hai <haijin.chn@gmail.com>
This commit is contained in:
Jin Hai
2026-07-13 18:00:35 +08:00
committed by GitHub
parent 09abe5f513
commit 8bc18154d2
14 changed files with 129 additions and 138 deletions
Download Patch File Download Diff File Expand all files Collapse all files

87
internal/admin/handler.go
View File

@@ -84,7 +84,7 @@ func (h *Handler) Ping(c *gin.Context) {
// Login handle admin login
// @Summary Admin Login
// @Description Admin login verification using email, only superuser can login
// @Description Admin login verification using email, only superuser can log in
// @Tags admin
// @Accept json
// @Produce json
@@ -170,51 +170,66 @@ type ListUsersRequest struct {
// ListUsers handle list users
func (h *Handler) ListUsers(c *gin.Context) {
var err error
var pageInt int
page := c.Param("page")
if page == "" {
pageInt = 0
} else {
pageInt, err = strconv.Atoi(page)
if err != nil {
common.ErrorWithCode(c, common.CodeBadRequest, "Page must be an integer")
return
}
name := c.DefaultQuery("keyword", "")
status := c.DefaultQuery("status", "")
role := c.DefaultQuery("role", "")
sort := c.DefaultQuery("sort", "") // descending or ascending
orderBy := c.DefaultQuery("order", "") // order by field
pageInt, err := common.ParseRequestIntPositive(c, c.Query("page"), "page", 1)
if err != nil {
common.ErrorWithCode(c, common.CodeBadRequest, err.Error())
return
}
pageSizeInt, err := common.ParseRequestIntPositive(c, c.Query("page_size"), "page_size", 10)
if err != nil {
common.ErrorWithCode(c, common.CodeBadRequest, err.Error())
return
}
plan := c.Query("plan") // plan name
topInt, err := common.ParseRequestIntPositive(c, c.Query("top"), "top", 0)
if err != nil {
common.ErrorWithCode(c, common.CodeBadRequest, err.Error())
return
}
quotaInt, err := common.ParseRequestIntPositive(c, c.Query("quota"), "quota", 0)
if err != nil {
common.ErrorWithCode(c, common.CodeBadRequest, err.Error())
return
}
if quotaInt > 100 {
common.ErrorWithCode(c, common.CodeBadRequest, "Quota must be less than or equal to 100")
return
}
daysInt, err := common.ParseRequestIntPositive(c, c.Query("days"), "days", 0)
if err != nil {
common.ErrorWithCode(c, common.CodeBadRequest, err.Error())
return
}
var pageSizeInt int
pageSize := c.Param("page_size")
if pageSize == "" {
pageSizeInt = 0
} else {
pageSizeInt, err = strconv.Atoi(pageSize)
if err != nil {
common.ErrorWithCode(c, common.CodeBadRequest, "Page size must be an integer")
return
}
}
var req ListUsersRequest
var users []map[string]interface{}
if err = c.ShouldBindJSON(&req); err != nil {
users, err = h.service.ListUsers(pageInt, pageSizeInt)
if err != nil {
common.ErrorWithCode(c, common.CodeServerError, err.Error())
return
}
switch common.GetRAGFlowType() {
case common.OpenSourceVersion:
common.SuccessWithData(c, users, "Get all users")
} else {
users, err = h.service.ListUsersEnterprise(pageInt, pageSizeInt, req.UserStatus, req.OrderBy, req.Plan, req.Top, req.Days, req.Quota)
users, err = h.service.ListUsers(pageInt, pageSizeInt, name, status, sort, orderBy)
if err != nil {
common.ErrorWithCode(c, common.CodeServerError, err.Error())
return
}
common.SuccessWithData(c, users, "List users")
case common.EnterpriseEdition:
users, err = h.service.ListUsersEE(pageInt, pageSizeInt, name, status, role, sort, orderBy, plan, topInt, daysInt, quotaInt)
if err != nil {
common.ErrorWithCode(c, common.CodeServerError, err.Error())
return
}
default:
common.ErrorWithCode(c, common.CodeBadRequest, "Invalid RAGFlow type")
return
}
common.SuccessWithData(c, users, "List users")
return
}
// CreateUserHTTPRequest create user request
@@ -730,8 +745,8 @@ func (h *Handler) ListEnvironments(c *gin.Context) {
// GetVersion handle get version
func (h *Handler) GetVersion(c *gin.Context) {
version := h.service.GetVersion()
common.SuccessWithData(c, gin.H{"version": version}, "")
version, versionType := h.service.GetVersion()
common.SuccessWithData(c, gin.H{"version": version, "version_type": versionType}, "")
}
// GetFingerprint handle get system fingerprint

0
internal/admin/enterprise_handler.go → internal/admin/handler_ee.go
View File

8
internal/admin/service.go
View File

@@ -140,8 +140,8 @@ func generateRandomHex(n int) string {
}
// ListUsers list all users
func (s *Service) ListUsers(page, pageSize int) ([]map[string]interface{}, error) {
users, _, err := s.userDAO.List(page*pageSize, pageSize)
func (s *Service) ListUsers(pageIndex, pageSize int, name, status, sort, orderBy string) ([]map[string]interface{}, error) {
users, _, err := s.userDAO.List(pageIndex*pageSize, pageSize, name, status, sort, orderBy)
if err != nil {
return nil, err
}
@@ -1544,8 +1544,8 @@ func (s *Service) ListEnvironments() ([]map[string]interface{}, error) {
// Version methods
// GetVersion get RAGFlow version
func (s *Service) GetVersion() string {
return utility.GetRAGFlowVersion()
func (s *Service) GetVersion() (string, string) {
return common.GetRAGFlowVersion(), common.GetRAGFlowType()
}
// Sandbox methods

31
internal/admin/enterprise_service.go → internal/admin/service_ee.go
View File

@@ -788,26 +788,19 @@ func (s *Service) ShowUsersActivity(days, windows *int) (map[string]interface{},
return result, nil
}
func (s *Service) ListUsersEnterprise(pageIndex, pageSize int, status, orderBy, plan *string, top, days, quota *int) ([]map[string]interface{}, error) {
func (s *Service) ListUsersEE(pageIndex, pageSize int, name string, status, role, sort, orderBy, plan string, top, days, quota int) ([]map[string]interface{}, error) {
item := map[string]interface{}{}
if status != nil {
item["status"] = *status
}
if orderBy != nil {
item["order_by"] = *orderBy
}
if plan != nil {
item["plan"] = *plan
}
if top != nil {
item["top"] = *top
}
if days != nil {
item["days"] = *days
}
if quota != nil {
item["quota"] = *quota
}
item["pageIndex"] = pageIndex
item["pageSize"] = pageSize
item["name"] = name
item["status"] = status
item["role"] = role
item["sort"] = sort
item["order_by"] = orderBy
item["plan"] = plan
item["top"] = top
item["days"] = days
item["quota"] = quota
var result []map[string]interface{}
result = append(result, item)