Merge branch 'main' of github.com:god-jason/bucket

.github/workflows/codeql.yml

@@ -0,0 +1,93 @@
+# For most projects, this workflow file will not need changing; you simply need
+# to commit it to your repository.
+#
+# You may wish to alter this file to override the set of languages analyzed,
+# or to provide custom queries or build logic.
+#
+# ******** NOTE ********
+# We have attempted to detect the languages in your repository. Please check
+# the `language` matrix defined below to confirm you have the correct set of
+# supported CodeQL languages.
+#
+name: "CodeQL"
+
+on:
+  push:
+    branches: [ "main" ]
+  pull_request:
+    branches: [ "main" ]
+  schedule:
+    - cron: '43 10 * * 5'
+
+jobs:
+  analyze:
+    name: Analyze (${{ matrix.language }})
+    # Runner size impacts CodeQL analysis time. To learn more, please see:
+    #   - https://gh.io/recommended-hardware-resources-for-running-codeql
+    #   - https://gh.io/supported-runners-and-hardware-resources
+    #   - https://gh.io/using-larger-runners (GitHub.com only)
+    # Consider using larger runners or machines with greater resources for possible analysis time improvements.
+    runs-on: ${{ (matrix.language == 'swift' && 'macos-latest') || 'ubuntu-latest' }}
+    timeout-minutes: ${{ (matrix.language == 'swift' && 120) || 360 }}
+    permissions:
+      # required for all workflows
+      security-events: write
+
+      # required to fetch internal or private CodeQL packs
+      packages: read
+
+      # only required for workflows in private repositories
+      actions: read
+      contents: read
+
+    strategy:
+      fail-fast: false
+      matrix:
+        include:
+        - language: go
+          build-mode: autobuild
+        # CodeQL supports the following values keywords for 'language': 'c-cpp', 'csharp', 'go', 'java-kotlin', 'javascript-typescript', 'python', 'ruby', 'swift'
+        # Use `c-cpp` to analyze code written in C, C++ or both
+        # Use 'java-kotlin' to analyze code written in Java, Kotlin or both
+        # Use 'javascript-typescript' to analyze code written in JavaScript, TypeScript or both
+        # To learn more about changing the languages that are analyzed or customizing the build mode for your analysis,
+        # see https://docs.github.com/en/code-security/code-scanning/creating-an-advanced-setup-for-code-scanning/customizing-your-advanced-setup-for-code-scanning.
+        # If you are analyzing a compiled language, you can modify the 'build-mode' for that language to customize how
+        # your codebase is analyzed, see https://docs.github.com/en/code-security/code-scanning/creating-an-advanced-setup-for-code-scanning/codeql-code-scanning-for-compiled-languages
+    steps:
+    - name: Checkout repository
+      uses: actions/checkout@v4
+
+    # Initializes the CodeQL tools for scanning.
+    - name: Initialize CodeQL
+      uses: github/codeql-action/init@v3
+      with:
+        languages: ${{ matrix.language }}
+        build-mode: ${{ matrix.build-mode }}
+        # If you wish to specify custom queries, you can do so here or in a config file.
+        # By default, queries listed here will override any specified in a config file.
+        # Prefix the list here with "+" to use these queries and those in the config file.
+
+        # For more details on CodeQL's query packs, refer to: https://docs.github.com/en/code-security/code-scanning/automatically-scanning-your-code-for-vulnerabilities-and-errors/configuring-code-scanning#using-queries-in-ql-packs
+        # queries: security-extended,security-and-quality
+
+    # If the analyze step fails for one of the languages you are analyzing with
+    # "We were unable to automatically build your code", modify the matrix above
+    # to set the build mode to "manual" for that language. Then modify this step
+    # to build your code.
+    # ℹ️ Command-line programs to run using the OS shell.
+    # 📚 See https://docs.github.com/en/actions/using-workflows/workflow-syntax-for-github-actions#jobsjob_idstepsrun
+    - if: matrix.build-mode == 'manual'
+      shell: bash
+      run: |
+        echo 'If you are using a "manual" build mode for one or more of the' \
+          'languages you are analyzing, replace this with the commands to build' \
+          'your code, for example:'
+        echo '  make bootstrap'
+        echo '  make release'
+        exit 1
+
+    - name: Perform CodeQL Analysis
+      uses: github/codeql-action/analyze@v3
+      with:
+        category: "/language:${{matrix.language}}"

.github/workflows/go.yml

@@ -0,0 +1,28 @@
+# This workflow will build a golang project
+# For more information see: https://docs.github.com/en/actions/automating-builds-and-tests/building-and-testing-go
+
+name: Go
+
+on:
+  push:
+    branches: [ "main" ]
+  pull_request:
+    branches: [ "main" ]
+
+jobs:
+
+  build:
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions/checkout@v4
+
+    - name: Set up Go
+      uses: actions/setup-go@v4
+      with:
+        go-version: '1.22'
+
+    - name: Build
+      run: go build -v ./...
+
+    - name: Test
+      run: go test -v ./...

README.md

@@ -1,2 +1,15 @@
 # bucket
-数据仓库
+物联大师之数据中台
+
+[![Go](https://github.com/god-jason/bucket/actions/workflows/go.yml/badge.svg)](https://github.com/god-jason/bucket/actions/workflows/go.yml)
+[![Go](https://github.com/god-jason/bucket/actions/workflows/codeql.yml/badge.svg)](https://github.com/god-jason/bucket/actions/workflows/codeql.yml)
+[![Go Reference](https://pkg.go.dev/badge/github.com/god-jason/bucket.svg)](https://pkg.go.dev/github.com/god-jason/bucket)
+[![Go Report Card](https://goreportcard.com/badge/github.com/god-jason/bucket)](https://goreportcard.com/report/github.com/god-jason/bucket)
+
+- 数据采集
+- 数据订阅
+- 历史存储
+- 公式计算
+- 数据分析
+- 异常报警
+

pkg/condition/and.go

@@ -1,5 +1,7 @@
 package condition
 
+import "github.com/god-jason/bucket/pkg/exception"
+
 type And struct {
 	Compares []*Compare `json:"compares,omitempty"`
 }

pkg/condition/condition.go

@@ -1,5 +1,7 @@
 package condition
 
+import "github.com/god-jason/bucket/pkg/exception"
+
 // Condition 条件，外OR，内And
 // 比如： （a>1 && b<2）||（c==2 && d<5）
 type Condition struct {

pkg/condition/or.go

@@ -1,5 +1,7 @@
 package condition
 
+import "github.com/god-jason/bucket/pkg/exception"
+
 type Or struct {
 	Compares []*Compare `json:"compares,omitempty"`
 }

pkg/vconn/vconn.go

@@ -1,6 +1,7 @@
 package vconn
 
 import (
+	"errors"
 	"io"
 	"net"
 	"time"
@@ -26,7 +27,7 @@ func (c *VConn) Close() error {
 	e1 := c.PipeWriter.Close()
 	e2 := c.PipeReader.Close()
 	if e1 != nil && e2 != nil {
-		return exception.Join(e1, e2)
+		return errors.Join(e1, e2)
 		//return errors.New(e1.Error() + " and " + e2.Error())
 	}
 	if e1 != nil {

web/export/import.go

@@ -5,6 +5,7 @@ import (
 	"encoding/json"
 	"github.com/gin-gonic/gin"
 	"github.com/god-jason/bucket/db"
+	"go.mongodb.org/mongo-driver/bson/primitive"
 	"io"
 )
 
@@ -29,7 +30,7 @@ func ApiImport(table string) gin.HandlerFunc {
 			return
 		}
 
-		var idss []any
+		var idss []primitive.ObjectID
 		//数据解析
 		for _, file := range reader.File {
 			if file.FileInfo().IsDir() {