Merge pull request #44 from humpback/develop-0.0.1

Develop 0.0.1

Author: JamesYYang

.github/workflows/build-develop.yml

@@ -49,6 +49,8 @@ jobs:
         uses: docker/metadata-action@v5
         with:
           images: humpbacks/humpback-server
+          tags: |
+            type=raw,value=develop
       
       - name: Build and push
         uses: docker/build-push-action@v6

.github/workflows/build-main.yml

@@ -0,0 +1,63 @@
+name: Build and Deploy
+
+on:
+  push:
+    tags:
+      - '*'
+    branches:
+      - main
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@v4
+      
+      - name: Set up Node.js
+        uses: actions/setup-node@v3
+        with:
+          node-version: '20.x'
+      
+      - name: Install dependencies and build front
+        working-directory: ./front
+        run: |
+          npm install -g pnpm
+          pnpm install
+          pnpm run build
+      
+      - name: Set up Go
+        uses: actions/setup-go@v5
+        with:
+          go-version: '1.24'
+      
+      - name: Install dependencies and build backend
+        working-directory: ./backend
+        run: |
+          go mod download
+          CGO_ENABLED=0 go build -o humpback
+      
+      - name: Login Docker Hub
+        uses: docker/login-action@v3
+        with:
+          username: ${{ secrets.DOCKER_USERNAME }}
+          password: ${{ secrets.DOCKER_PASSWORD }}
+
+      - name: Docker meta
+        id: meta
+        uses: docker/metadata-action@v5
+        with:
+          images: humpbacks/humpback-server
+          tags: |
+            type=ref,event=tag
+            type=raw,value=latest
+      
+      - name: Build and push
+        uses: docker/build-push-action@v6
+        with:
+          context: .
+          file: ./Dockerfile
+          push: true
+          tags: ${{ steps.meta.outputs.tags }}
+          labels: ${{ steps.meta.outputs.labels }}

README.md

@@ -1 +1,63 @@
 # humpback-server
+
+[![PkgGoDev](https://pkg.go.dev/badge/github.com/docker/docker)](https://golang.org/)
+[![Vue 3](https://img.shields.io/badge/vue-3.x-brightgreen.svg)](https://v3.vuejs.org/)
+[![Docker](https://img.shields.io/badge/docker-pull-blue?logo=docker)](https://hub.docker.com/r/humpbacks/humpback-server)
+[![GitHub release (latest SemVer)](https://img.shields.io/github/v/release/humpbacks/humpback-server?sort=semver)](https://github.com/humpbacks/humpback-server/releases/latest)
+
+![Humpback logo](/assets/logo.png)
+
+Lightweight container service management platform site.
+
+## Language
+
+- [English](README.md)
+- [中文](README.zh.md)
+
+## Feature
+
+- Multiple Deployment Strategies: Flexible deployment strategies to meet your various business scenarios.
+- Supporting Multiple Cluster：One-stop operation and management of multiple clusters.
+- Centralized Access Control： Granular permission control (team and individual levels).
+- Friendly Web UI: An intuitive web interface that hides the complexity of container operations.
+
+## Getting Started
+
+* [Humpback Guides](https://humpback.github.io/humpback)
+
+## Installing
+
+First, create the volume that Humpback Server will use to store its database:
+
+```bash
+docker volume create humpback_data
+```
+
+Then, install the Humpback Server container:
+
+```bash
+docker run -d \
+  --name humpback-server \
+  -p 8100:8100 \
+  -p 8101:8101 \
+  --restart=always \
+  -v humpback_data:/workspace/data \
+  -e LOCATION=prd \
+  humpbacks/humpback-server
+```
+
+By default, Humpback Server will expose the UI over port `8100` and expose a API server over port `8101` for receiving
+agent report.
+
+Humpback Server has now been installed. you can log into your Humpback Server instance by opening a web browser and
+going to:
+
+```
+http://localhost:8100
+```
+
+The initial super administrator account and password are **humpback**
+
+## License
+
+Humpback Server is licensed under the [Apache Licence 2.0](http://www.apache.org/licenses/LICENSE-2.0.html).   

README.zh.md

@@ -0,0 +1,60 @@
+# humpback-server
+
+[![PkgGoDev](https://pkg.go.dev/badge/github.com/docker/docker)](https://golang.org/)
+[![Vue 3](https://img.shields.io/badge/vue-3.x-brightgreen.svg)](https://v3.vuejs.org/)
+[![GitHub release (latest SemVer)](https://img.shields.io/github/v/release/humpbacks/humpback-server?sort=semver)](https://github.com/humpbacks/humpback-server/releases/latest)
+
+![Humpback logo](/assets/logo.png)
+
+轻量级容器服务管理平台Web。
+
+## 语言
+
+- [English](README.md)
+- [中文](README.zh.md)
+
+## 特征
+
+- 多种部署策略: 灵活多样的部署策略满足你的各种业务场景需求。
+- 支持多集群：一站式运维多个集群。
+- 集中式访问控制： 不同粒度的权限控制（团队和个人）。
+- 简洁易用的界面: 简洁易用但功能强大的用户界面让你不需要面对容器的复杂性。
+
+## 快速开始
+
+* [Humpback文档](https://humpback.github.io/humpback)
+
+## 安装
+
+首先，创建一个volume用于存储Humpback Server的数据库：
+
+```bash
+docker volume create humpback_data
+```
+
+接下，使用下面的命令创建Humpback Server容器：
+
+```bash
+docker run -d \
+  --name humpback-server \
+  -p 8100:8100 \
+  -p 8101:8101 \
+  --restart=always \
+  -v humpback_data:/workspace/data \
+  -e LOCATION=prd \
+  humpbacks/humpback-server
+```
+
+Humpback Server默认会监听两个端口，`8100`端口是web站点，`8101`是API服务器，主要接受agent汇报的数据。
+
+命令运行成功后，你可以通过打开下面的站点检查Humpback Server是否启动成功。
+
+```
+http://localhost:8100
+```
+
+初始化的超级管理员账号密码均为 **humpback**
+
+## 许可证
+
+Humpback Server 根据 [Apache Licence 2.0](http://www.apache.org/licenses/LICENSE-2.0.html) 获得许可。

assets/logo.png

@@ -22,7 +22,6 @@ type Router struct {
 
 func InitRouter(nodeCh chan types.NodeSimpleInfo, serviceCh chan types.ServiceChangeInfo) *Router {
 	gin.SetMode(gin.ReleaseMode)
-	gin.Default()
 	r := &Router{engine: gin.New()}
 	r.setMiddleware(nodeCh, serviceCh)
 	r.setRoute()
@@ -48,7 +47,7 @@ func (api *Router) Close(c context.Context) error {
 }
 
 func (api *Router) setMiddleware(nodeCh chan types.NodeSimpleInfo, serviceCh chan types.ServiceChangeInfo) {
-	api.engine.Use(middleware.Log(), middleware.CorsCheck(), middleware.HandleError(), middleware.SetEventChannel(nodeCh, serviceCh))
+	api.engine.Use(gin.Recovery(), middleware.Log(), middleware.CorsCheck(), middleware.HandleError(), middleware.SetEventChannel(nodeCh, serviceCh))
 }
 
 func (api *Router) setRoute() {

backend/api/api.go

@@ -108,10 +108,16 @@ func (s *ActivityAllQueryReqInfo) Check() error {
 	return nil
 }
 
-func (s *ActivityAllQueryReqInfo) IsValid(timestampStr string) (bool, error) {
+func (s *ActivityAllQueryReqInfo) IsValid(timestampStr, userId string) (bool, error) {
 	timestamp, err := strconv.ParseInt(timestampStr, 10, 64)
 	if err != nil {
 		return false, err
 	}
-	return timestamp > s.StartAt, nil
+	if timestamp < s.StartAt {
+		return false, nil
+	}
+	if types.IsUser(s.UserInfo.Role) && userId != s.UserInfo.UserId {
+		return false, nil
+	}
+	return true, nil
 }

backend/api/handle/models/activity.go

@@ -1030,9 +1030,9 @@ func ActivityAllQuery(info *models.ActivityAllQueryReqInfo) (map[string][]*types
 	for key, bucket := range buckets {
 		go func(name string, bucket string) {
 			defer wg.Done()
-			list, err := db.ActivityAllQuery(info, bucket)
+			list, err := db.ActivityQueryByStartAtAndUser(info, bucket)
 			if err != nil {
-				slog.Error("[ActivityAllQuery] List activities failed.", "Bucket", bucket, "Error", err.Error())
+				slog.Error("[ActivityQueryByStartAtAndUser] List activities failed.", "Bucket", bucket, "Error", err.Error())
 				return
 			}
 			l.Lock()

backend/internal/controller/controller_activity.go

@@ -81,7 +81,7 @@ func ActivityQuery(info *models.ActivityQueryReqInfo, bucket string) (*response.
 	return results, nil
 }
 
-func ActivityAllQuery(info *models.ActivityAllQueryReqInfo, bucket string) ([]*types.ActivityInfo, error) {
+func ActivityQueryByStartAtAndUser(info *models.ActivityAllQueryReqInfo, bucket string) ([]*types.ActivityInfo, error) {
 	var (
 		results = make([]*types.ActivityInfo, 0)
 	)
@@ -101,7 +101,7 @@ func ActivityAllQuery(info *models.ActivityAllQueryReqInfo, bucket string) ([]*t
 				break
 			}
 			keys := strings.Split(string(k), "-")
-			valid, err := info.IsValid(keys[0])
+			valid, err := info.IsValid(keys[0], keys[1])
 			if err != nil {
 				return err
 			}

backend/internal/db/activity.go

@@ -1,5 +1,6 @@
 {
   "globals": {
+    "ActivityInfo": true,
     "BaseInfo": true,
     "BytesToGB": true,
     "Component": true,
@@ -8,11 +9,12 @@
     "ConfigInfo": true,
     "ConfigType": true,
     "ContainerNetworkStats": true,
-    "ContainerPerformance": true,
     "ContainerStats": true,
     "ContainerStatus": true,
+    "ContainersPerformance": true,
     "CopyToClipboard": true,
     "CreateCancelRequest": true,
+    "DashboardResourceStatisticsInfo": true,
     "Debounce": true,
     "DirectiveBinding": true,
     "EffectScope": true,
@@ -34,6 +36,7 @@
     "MaybeRefOrGetter": true,
     "NewBaseEmptyInfo": true,
     "NewConfigEmptyInfo": true,
+    "NewDashboardResourceStatisticsInfo": true,
     "NewGroupEmptyInfo": true,
     "NewNodeEmptyInfo": true,
     "NewPageInfo": true,
@@ -62,6 +65,7 @@
     "RSAPublicKey": true,
     "Ref": true,
     "RegistryInfo": true,
+    "ResourceExceptionServiceInfo": true,
     "ResponseQuery": true,
     "ResponseSuccess": true,
     "RuleCannotBeEmpty": true,
@@ -103,6 +107,7 @@
     "ShowWarningMsg": true,
     "SortInfo": true,
     "SortType": true,
+    "StatisticsCountInfo": true,
     "StorageEventType": true,
     "TableHeight": true,
     "TeamInfo": true,
@@ -112,6 +117,7 @@
     "VNode": true,
     "WritableComputedRef": true,
     "acceptHMRUpdate": true,
+    "activityService": true,
     "asyncComputed": true,
     "autoResetRef": true,
     "commonService": true,
@@ -135,6 +141,7 @@
     "createTemplatePromise": true,
     "createUnrefFn": true,
     "customRef": true,
+    "dashboardService": true,
     "debouncedRef": true,
     "debouncedWatch": true,
     "defineAsyncComponent": true,
@@ -220,6 +227,7 @@
     "shallowReactive": true,
     "shallowReadonly": true,
     "shallowRef": true,
+    "statisticsCountService": true,
     "storageEventBus": true,
     "storeToRefs": true,
     "stores": true,
@@ -452,17 +460,6 @@
     "IconMdiPlay": true,
     "IconMdiRestart": true,
     "IconMdiSquare": true,
-    "IconMdiStopCircleOutline": true,
-    "ContainersPerformance": true,
-    "activityService": true,
-    "ActivityInfo": true,
-    "dashboardService": true,
-    "DashboardResourceStatisticsInfo": true,
-    "ResouceExceptionServcieInfo": true,
-    "ResourceExceptionServcieInfo": true,
-    "ResourceExceptionServiceInfo": true,
-    "NewDashboardResourceStatisticsInfo": true,
-    "StatisticsCountInfo": true,
-    "statisticsCountService": true
+    "IconMdiStopCircleOutline": true
   }
 }