update: goreleaser

.gitignore

@@ -20,7 +20,7 @@ target/
 dist/
 __debug_bin
 codegen/
-
+commit.txt
 node_modules/
 dist/
 .idea
@@ -42,3 +42,5 @@ dist/casaos-user-service-amd64_linux_amd64_v1/build/sysroot/usr/bin/casaos-user-
 dist/casaos-user-service-amd64_linux_amd64_v1/build/sysroot/usr/bin/casaos-user-service
 dist/casaos-user-service-amd64_linux_amd64_v1/build/sysroot/usr/bin/casaos-user-service
 
+.vscode/launch.json
+dist/metadata.json

.goreleaser.yaml

@@ -1,6 +1,6 @@
 # This is an example .goreleaser.yml file with some sensible defaults.
 # Make sure to check the documentation at https://goreleaser.com
-project_name: casaos-user-service
+project_name: nextzen-user-service
 before:
   hooks:
     - go generate
@@ -8,7 +8,7 @@ before:
     - go mod tidy
     - go test -race -v ./...
 builds:
-  - id: casaos-user-service-amd64
+  - id: nextzen-user-service-amd64
     binary: build/sysroot/usr/bin/casaos-user-service
     hooks:
       post:
@@ -29,7 +29,7 @@ builds:
       - linux
     goarch:
       - amd64
-  - id: casaos-user-service-arm64
+  - id: nextzen-user-service-arm64
     binary: build/sysroot/usr/bin/casaos-user-service
     # hooks:
     #   post:
@@ -50,7 +50,7 @@ builds:
       - linux
     goarch:
       - arm64
-  - id: casaos-user-service-arm-7
+  - id: nextzen-user-service-arm-7
     binary: build/sysroot/usr/bin/casaos-user-service
     hooks:
       post:
@@ -73,92 +73,92 @@ builds:
       - arm
     goarm:
       - "7"
-  - id: casaos-user-service-migration-tool-amd64
+  # - id: casaos-user-service-migration-tool-amd64
-    binary: build/sysroot/usr/bin/casaos-user-service-migration-tool
+  #   binary: build/sysroot/usr/bin/casaos-user-service-migration-tool
-    hooks:
+  #   hooks:
-      post:
+  #     post:
-        - upx --best --lzma -v --no-progress "{{ .Path }}"
+  #       - upx --best --lzma -v --no-progress "{{ .Path }}"
-    main: ./cmd/migration-tool
+  #   main: ./cmd/migration-tool
-    env:
+  #   env:
-      - CC=x86_64-linux-gnu-gcc
+  #     - CC=x86_64-linux-gnu-gcc
-    ldflags:
+  #   ldflags:
-      - -X main.commit={{.Commit}}
+  #     - -X main.commit={{.Commit}}
-      - -X main.date={{.Date}}
+  #     - -X main.date={{.Date}}
-      - -s
+  #     - -s
-      - -w
+  #     - -w
-      - -extldflags "-static"
+  #     - -extldflags "-static"
-    tags:
+  #   tags:
-      - musl
+  #     - musl
-      - netgo
+  #     - netgo
-      - osusergo
+  #     - osusergo
-    goos:
+  #   goos:
-      - linux
+  #     - linux
-    goarch:
+  #   goarch:
-      - amd64
+  #     - amd64
-  - id: casaos-user-service-migration-tool-arm64
+  # - id: casaos-user-service-migration-tool-arm64
-    binary: build/sysroot/usr/bin/casaos-user-service-migration-tool
+  #   binary: build/sysroot/usr/bin/casaos-user-service-migration-tool
-    # hooks:
+  #   # hooks:
-    #   post:
+  #   #   post:
-    #     - upx --best --lzma -v --no-progress "{{ .Path }}"
+  #   #     - upx --best --lzma -v --no-progress "{{ .Path }}"
-    main: ./cmd/migration-tool
+  #   main: ./cmd/migration-tool
-    env:
+  #   env:
-      - CC=aarch64-linux-gnu-gcc
+  #     - CC=aarch64-linux-gnu-gcc
-    ldflags:
+  #   ldflags:
-      - -X main.commit={{.Commit}}
+  #     - -X main.commit={{.Commit}}
-      - -X main.date={{.Date}}
+  #     - -X main.date={{.Date}}
-      - -s
+  #     - -s
-      - -w
+  #     - -w
-      - -extldflags "-static"
+  #     - -extldflags "-static"
-    tags:
+  #   tags:
-      - musl
+  #     - musl
-      - netgo
+  #     - netgo
-      - osusergo
+  #     - osusergo
-    goos:
+  #   goos:
-      - linux
+  #     - linux
-    goarch:
+  #   goarch:
-      - arm64
+  #     - arm64
-  - id: casaos-user-service-migration-tool-arm-7
+  # - id: casaos-user-service-migration-tool-arm-7
-    binary: build/sysroot/usr/bin/casaos-user-service-migration-tool
+  #   binary: build/sysroot/usr/bin/casaos-user-service-migration-tool
-    hooks:
+  #   hooks:
-      post:
+  #     post:
-        - upx --best --lzma -v --no-progress "{{ .Path }}"
+  #       - upx --best --lzma -v --no-progress "{{ .Path }}"
-    main: ./cmd/migration-tool
+  #   main: ./cmd/migration-tool
-    env:
+  #   env:
-      - CC=arm-linux-gnueabihf-gcc
+  #     - CC=arm-linux-gnueabihf-gcc
-    ldflags:
+  #   ldflags:
-      - -X main.commit={{.Commit}}
+  #     - -X main.commit={{.Commit}}
-      - -X main.date={{.Date}}
+  #     - -X main.date={{.Date}}
-      - -s
+  #     - -s
-      - -w
+  #     - -w
-      - -extldflags "-static"
+  #     - -extldflags "-static"
-    tags:
+  #   tags:
-      - musl
+  #     - musl
-      - netgo
+  #     - netgo
-      - osusergo
+  #     - osusergo
-    goos:
+  #   goos:
-      - linux
+  #     - linux
-    goarch:
+  #   goarch:
-      - arm
+  #     - arm
-    goarm:
+  #   goarm:
-      - "7"
+  #     - "7"
 archives:
   - name_template: >-
       {{ .Os }}-{{- if eq .Arch "arm" }}arm-7{{- else }}{{ .Arch }}{{- end }}-{{ .ProjectName }}-v{{ .Version }}
     builds:
-      - casaos-user-service-amd64
+      - nextzen-user-service-amd64
-      - casaos-user-service-arm64
+      - nextzen-user-service-arm64
-      - casaos-user-service-arm-7
+      - nextzen-user-service-arm-7
     files:
       - build/**/*
-  - name_template: >-
+  # - name_template: >-
-      {{ .Os }}-{{- if eq .Arch "arm" }}arm-7{{- else }}{{ .Arch }}{{- end }}-{{ .ProjectName }}-migration-tool-v{{ .Version }}
+  #     {{ .Os }}-{{- if eq .Arch "arm" }}arm-7{{- else }}{{ .Arch }}{{- end }}-{{ .ProjectName }}-migration-tool-v{{ .Version }}
-    id: casaos-user-service-migration-tool
+  #   id: casaos-user-service-migration-tool
-    builds:
+  #   builds:
-      - casaos-user-service-migration-tool-amd64
+  #     - casaos-user-service-migration-tool-amd64
-      - casaos-user-service-migration-tool-arm64
+  #     - casaos-user-service-migration-tool-arm64
-      - casaos-user-service-migration-tool-arm-7
+  #     - casaos-user-service-migration-tool-arm-7
-    files:
+  #   files:
-      - build/sysroot/etc/**/*
+  #     - build/sysroot/etc/**/*
 checksum:
   name_template: "checksums.txt"
 snapshot:
@@ -169,11 +169,12 @@ changelog:
     exclude:
       - "^docs:"
       - "^test:"
+      - "^update:"
 release:
   github:
-    owner: IceWhaleTech
+    owner: KaySar12
-    name: CasaOS-UserService
+    name: NextZen-UserService
   draft: true
   prerelease: auto
   mode: replace
-  name_template: "v{{ .Version }}"
+  name_template: "v{{ .Version }}"

.vscode/launch.json

@@ -6,7 +6,7 @@
             "type": "go",
             "debugAdapter": "dlv-dap",
             "request": "launch",
-            "port": 2346,
+            "port": 34933,
             "host": "127.0.0.1",
             "mode": "exec",
             "program": "${workspaceFolder}/dist/casaos-user-service-amd64_linux_amd64_v1/build/sysroot/usr/bin/casaos-user-service"

Makefile

@@ -0,0 +1,50 @@
+GORELEASER=goreleaser
+GORELEASERBUILD=$(GORELEASER) build
+GIT=git
+GIT_REMOTE?=origin
+SERVICE = casaos-user-service
+ARCHITECHTURE= amd64
+OS=linux
+VERSION=v1
+BIN_PATH=build/sysroot/usr/bin
+BUILD_PATH=build
+CUR_DIR=$(PWD)
+CUR_TAG ?= $(shell git describe --tags --match '*.*.*' | sort -V | tail -n1 | sed 's/-[0-9]*-g[0-9a-f]*//')
+PREV_TAG ?= $(shell git describe --tags --match '*.*.*' | sort -V | head -n2 | tail -n1 | sed 's/-[0-9]*-g[0-9a-f]*//')
+ARCHIVE_PATH=buildzip
+PACKAGE_NAME=$(OS)-$(ARCHITECHTURE)-nextzenos-user-service-$(TAG)
+COMMIT_MESSAGE ?="update"
+build_service:
+	$(GORELEASERBUILD) --clean --snapshot -f .goreleaser.debug.yaml --id $(SERVICE)-$(ARCHITECHTURE)
+
+package:
+	 cp -f $(CUR_DIR)/dist/$(SERVICE)-$(ARCHITECHTURE)_$(OS)_$(ARCHITECHTURE)_$(VERSION)/$(BIN_PATH)/$(SERVICE) $(CUR_DIR)/$(BIN_PATH) \
+	 && tar -czvf $(PACKAGE_NAME).tar.gz $(CUR_DIR)/$(BUILD_PATH)
+
+archive_package:
+	@mkdir -p $(CUR_DIR)/$(ARCHIVE_PATH)/$(CUR_TAG)
+	@mv $(PACKAGE_NAME).tar.gz $(CUR_DIR)/$(ARCHIVE_PATH)/$(CUR_TAG)/
+remove_package:
+	rm $(PACKAGE_NAME).tar.gz
+clear_archive:
+	@rm -rf $(CUR_DIR)/$(ARCHIVE_PATH)
+#make create_tag CUR_TAG=x.x TAG_MESSAGE="this is tag message"
+create_tag:
+	@${GIT} tag -a ${CUR_TAG} -m "${TAG_MESSAGE}" || { echo "Failed to create tag"; exit 1; }
+	@${GIT} push ${GIT_REMOTE} ${CUR_TAG} ||  { echo "Failed to push tag"; exit 1; }
+#make remove_tag CUR_TAG=x.x
+remove_tag:
+	@${GIT} tag -d ${CUR_TAG}
+	@${GIT} push ${GIT_REMOTE} -d ${CUR_TAG}	
+check_tag:
+	@echo "Previous tag: $(PREV_TAG)";
+	@echo "Current tag: $(CUR_TAG)";  
+push_release_all:
+	${GORELEASER} release --clean  -f .goreleaser.yaml
+push_release:
+	${GORELEASER} release --single-target
+push_git:
+	@${GIT} pull ${GIT_REMOTE}
+	@${GIT} add .
+	@${GIT} commit -m "${COMMIT_MESSAGE}"
+	@${GIT} push ${GIT_REMOTE}

build/sysroot/usr/lib/systemd/system/casaos-user-service.service

@@ -1,13 +0,0 @@
-[Unit]
-After=casaos-message-bus.service
-Description=CasaOS User Service
-
-[Service]
-ExecStartPre=/usr/bin/casaos-user-service -v
-ExecStart=/usr/bin/casaos-user-service -c /etc/casaos/user-service.conf
-PIDFile=/var/run/casaos/user-service.pid
-Restart=always
-Type=notify
-
-[Install]
-WantedBy=multi-user.target

cmd/migration-tool/main.go

@@ -6,9 +6,9 @@ import (
 	"fmt"
 	"os"
 
-	interfaces "github.com/IceWhaleTech/CasaOS-Common"
+	interfaces "github.com/KaySar12/NextZen-Common"
-	"github.com/IceWhaleTech/CasaOS-Common/utils/systemctl"
+	"github.com/KaySar12/NextZen-Common/utils/systemctl"
-	"github.com/IceWhaleTech/CasaOS-UserService/common"
+	"github.com/KaySar12/NextZen-UserService/common"
 )
 
 const (

cmd/migration-tool/migration_dummy.go

@@ -1,7 +1,7 @@
 package main
 
 import (
-	interfaces "github.com/IceWhaleTech/CasaOS-Common"
+	interfaces "github.com/KaySar12/NextZen-Common"
 )
 
 type migrationTool struct{}

common/version.go

@@ -1,4 +1,4 @@
 package common
 
-const Version = "1.3.0"
+const Version = "1.4.0"
 const SERVICENAME = "CasaOS-UserService"

dist/artifacts.json

@@ -1 +0,0 @@
-[{"name":"metadata.json","path":"dist/metadata.json","internal_type":30,"type":"Metadata"},{"name":"build/sysroot/usr/bin/casaos-user-service","path":"dist/casaos-user-service-amd64_linux_amd64_v1/build/sysroot/usr/bin/casaos-user-service","goos":"linux","goarch":"amd64","goamd64":"v1","internal_type":4,"type":"Binary","extra":{"Binary":"casaos-user-service","Ext":"","ID":"casaos-user-service-amd64"}}]

dist/config.yaml

@@ -1,134 +0,0 @@
-project_name: casaos-user-service
-release:
-  github:
-    owner: IceWhaleTech
-    name: CasaOS-UserService
-  draft: true
-  prerelease: auto
-  name_template: v{{ .Version }}
-  mode: replace
-builds:
-  - id: casaos-user-service-amd64
-    goos:
-      - linux
-    goarch:
-      - amd64
-    goarm:
-      - "6"
-    gomips:
-      - hardfloat
-    goamd64:
-      - v1
-    targets:
-      - linux_amd64_v1
-    dir: .
-    main: .
-    binary: build/sysroot/usr/bin/casaos-user-service
-    builder: go
-    gobinary: go
-    command: build
-    ldflags:
-      - -extldflags "-static"
-    tags:
-      - musl
-      - netgo
-      - osusergo
-    gcflags:
-      - all=-N -l
-    env:
-      - CC=x86_64-linux-gnu-gcc
-archives:
-  - id: casaos-user-service
-    builds:
-      - casaos-user-service-amd64
-      - casaos-user-service-arm64
-      - casaos-user-service-arm-7
-    name_template: '{{ .Os }}-{{ .Arch }}-{{ .ProjectName }}-v{{ .Version }}'
-    format: tar.gz
-    files:
-      - src: build/**/*
-  - id: casaos-user-service-migration-tool
-    builds:
-      - casaos-user-service-migration-tool-amd64
-      - casaos-user-service-migration-tool-arm64
-      - casaos-user-service-migration-tool-arm-7
-    name_template: '{{ .Os }}-{{ .Arch }}-{{ .ProjectName }}-migration-tool-v{{ .Version }}'
-    format: tar.gz
-    files:
-      - src: build/sysroot/etc/**/*
-snapshot:
-  name_template: '{{ incpatch .Version }}'
-checksum:
-  name_template: checksums.txt
-  algorithm: sha256
-changelog:
-  filters:
-    exclude:
-      - '^docs:'
-      - '^test:'
-  sort: asc
-  format: '{{ .SHA }}: {{ .Message }} ({{ with .AuthorUsername }}@{{ . }}{{ else }}{{ .AuthorName }} <{{ .AuthorEmail }}>{{ end }})'
-dist: dist
-env_files:
-  github_token: ~/.config/goreleaser/github_token
-  gitlab_token: ~/.config/goreleaser/gitlab_token
-  gitea_token: ~/.config/goreleaser/gitea_token
-before:
-  hooks:
-    - go generate
-    - go run github.com/google/go-licenses@latest check . --disallowed_types=restricted
-    - go mod tidy
-    - go test -race -v ./...
-source:
-  name_template: '{{ .ProjectName }}-{{ .Version }}'
-  format: tar.gz
-gomod:
-  gobinary: go
-announce:
-  twitter:
-    message_template: '{{ .ProjectName }} {{ .Tag }} is out! Check it out at {{ .ReleaseURL }}'
-  mastodon:
-    message_template: '{{ .ProjectName }} {{ .Tag }} is out! Check it out at {{ .ReleaseURL }}'
-    server: ""
-  reddit:
-    title_template: '{{ .ProjectName }} {{ .Tag }} is out!'
-    url_template: '{{ .ReleaseURL }}'
-  slack:
-    message_template: '{{ .ProjectName }} {{ .Tag }} is out! Check it out at {{ .ReleaseURL }}'
-    username: GoReleaser
-  discord:
-    message_template: '{{ .ProjectName }} {{ .Tag }} is out! Check it out at {{ .ReleaseURL }}'
-    author: GoReleaser
-    color: "3888754"
-    icon_url: https://goreleaser.com/static/avatar.png
-  teams:
-    title_template: '{{ .ProjectName }} {{ .Tag }} is out!'
-    message_template: '{{ .ProjectName }} {{ .Tag }} is out! Check it out at {{ .ReleaseURL }}'
-    color: '#2D313E'
-    icon_url: https://goreleaser.com/static/avatar.png
-  smtp:
-    subject_template: '{{ .ProjectName }} {{ .Tag }} is out!'
-    body_template: 'You can view details from: {{ .ReleaseURL }}'
-  mattermost:
-    message_template: '{{ .ProjectName }} {{ .Tag }} is out! Check it out at {{ .ReleaseURL }}'
-    title_template: '{{ .ProjectName }} {{ .Tag }} is out!'
-    username: GoReleaser
-  linkedin:
-    message_template: '{{ .ProjectName }} {{ .Tag }} is out! Check it out at {{ .ReleaseURL }}'
-  telegram:
-    message_template: '{{ mdv2escape .ProjectName }} {{ mdv2escape .Tag }} is out{{ mdv2escape "!" }} Check it out at {{ mdv2escape .ReleaseURL }}'
-    parse_mode: MarkdownV2
-  webhook:
-    message_template: '{ "message": "{{ .ProjectName }} {{ .Tag }} is out! Check it out at {{ .ReleaseURL }}"}'
-    content_type: application/json; charset=utf-8
-  opencollective:
-    title_template: '{{ .Tag }}'
-    message_template: '{{ .ProjectName }} {{ .Tag }} is out!<br/>Check it out at <a href="{{ .ReleaseURL }}">{{ .ReleaseURL }}</a>'
-  bluesky:
-    message_template: '{{ .ProjectName }} {{ .Tag }} is out! Check it out at {{ .ReleaseURL }}'
-git:
-  tag_sort: -version:refname
-github_urls:
-  download: https://github.com
-gitlab_urls:
-  download: https://gitlab.com

dist/metadata.json

@@ -1 +0,0 @@
-{"project_name":"casaos-user-service","tag":"v1.0.0","previous_tag":"","version":"1.0.1","commit":"87aab176d2716419944d8d34c9a5ee3d7bc63acd","date":"2024-09-07T11:45:04.418487229+07:00","runtime":{"goos":"linux","goarch":"amd64"}}

go.mod

@@ -1,25 +1,25 @@
-module github.com/IceWhaleTech/CasaOS-UserService
+module github.com/KaySar12/NextZen-UserService
 
 go 1.21
 
 toolchain go1.22.0
 
 require (
-	github.com/IceWhaleTech/CasaOS-Common v0.4.8-alpha12
+	github.com/KaySar12/NextZen-Common v1.0.0-alpha6
 	github.com/coreos/go-oidc/v3 v3.11.0
 	github.com/coreos/go-systemd v0.0.0-20191104093116-d3cd4ed1dbcf
 	github.com/deepmap/oapi-codegen v1.12.4
 	github.com/getkin/kin-openapi v0.117.0
 	github.com/gin-contrib/gzip v0.0.6
-	github.com/gin-gonic/gin v1.9.1
+	github.com/gin-gonic/gin v1.10.0
 	github.com/glebarez/sqlite v1.8.0
-	github.com/labstack/echo/v4 v4.10.2
+	github.com/labstack/echo/v4 v4.12.0
 	github.com/satori/go.uuid v1.2.0
-	github.com/tidwall/gjson v1.14.4
+	github.com/tidwall/gjson v1.17.0
 	go.uber.org/zap v1.24.0
 	golang.org/x/net v0.27.0
 	golang.org/x/oauth2 v0.21.0
-	golang.org/x/time v0.3.0
+	golang.org/x/time v0.5.0
 	gopkg.in/ini.v1 v1.67.0
 	gorm.io/gorm v1.25.8
 )
@@ -27,9 +27,10 @@ require (
 require (
 	github.com/apapsch/go-jsonmerge/v2 v2.0.0 // indirect
 	github.com/benbjohnson/clock v1.3.1 // indirect
-	github.com/bytedance/sonic v1.11.3 // indirect
+	github.com/bytedance/sonic v1.11.6 // indirect
-	github.com/chenzhuoyu/base64x v0.0.0-20230717121745-296ad89f973d // indirect
+	github.com/bytedance/sonic/loader v0.1.1 // indirect
-	github.com/chenzhuoyu/iasm v0.9.1 // indirect
+	github.com/cloudwego/base64x v0.1.4 // indirect
+	github.com/cloudwego/iasm v0.2.0 // indirect
 	github.com/coreos/go-systemd/v22 v22.5.0 // indirect
 	github.com/dustin/go-humanize v1.0.1 // indirect
 	github.com/gabriel-vasile/mimetype v1.4.3 // indirect
@@ -40,7 +41,7 @@ require (
 	github.com/go-openapi/swag v0.22.3 // indirect
 	github.com/go-playground/locales v0.14.1 // indirect
 	github.com/go-playground/universal-translator v0.18.1 // indirect
-	github.com/go-playground/validator/v10 v10.19.0 // indirect
+	github.com/go-playground/validator/v10 v10.20.0 // indirect
 	github.com/goccy/go-json v0.10.2 // indirect
 	github.com/godbus/dbus/v5 v5.1.0 // indirect
 	github.com/golang-jwt/jwt v3.2.2+incompatible // indirect
@@ -55,7 +56,7 @@ require (
 	github.com/json-iterator/go v1.1.12 // indirect
 	github.com/klauspost/cpuid/v2 v2.2.7 // indirect
 	github.com/kr/pretty v0.3.1 // indirect
-	github.com/labstack/gommon v0.4.0 // indirect
+	github.com/labstack/gommon v0.4.2 // indirect
 	github.com/leodido/go-urn v1.4.0 // indirect
 	github.com/mailru/easyjson v0.7.7 // indirect
 	github.com/mattn/go-colorable v0.1.13 // indirect
@@ -63,7 +64,7 @@ require (
 	github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
 	github.com/modern-go/reflect2 v1.0.2 // indirect
 	github.com/mohae/deepcopy v0.0.0-20170929034955-c48cc78d4826 // indirect
-	github.com/pelletier/go-toml/v2 v2.2.0 // indirect
+	github.com/pelletier/go-toml/v2 v2.2.2 // indirect
 	github.com/perimeterx/marshmallow v1.1.4 // indirect
 	github.com/remyoudompheng/bigfft v0.0.0-20230129092748-24d4a6f8daec // indirect
 	github.com/rogpeppe/go-internal v1.10.0 // indirect
@@ -76,12 +77,12 @@ require (
 	github.com/valyala/fasttemplate v1.2.2 // indirect
 	go.uber.org/atomic v1.10.0 // indirect
 	go.uber.org/multierr v1.11.0 // indirect
-	golang.org/x/arch v0.7.0 // indirect
+	golang.org/x/arch v0.8.0 // indirect
 	golang.org/x/crypto v0.25.0 // indirect
 	golang.org/x/exp v0.0.0-20230713183714-613f0c0eb8a1 // indirect
 	golang.org/x/sys v0.22.0 // indirect
 	golang.org/x/text v0.16.0 // indirect
-	google.golang.org/protobuf v1.33.0 // indirect
+	google.golang.org/protobuf v1.34.1 // indirect
 	gopkg.in/natefinch/lumberjack.v2 v2.2.1 // indirect
 	gopkg.in/yaml.v3 v3.0.1 // indirect
 	modernc.org/libc v1.22.4 // indirect

go.sum

@@ -1,22 +1,19 @@
-github.com/IceWhaleTech/CasaOS-Common v0.4.8-alpha12 h1:TikSpmsMOxKufqoq8Q4K3PLh8zIKFrRtLH4JDIG+910=
+github.com/KaySar12/NextZen-Common v1.0.0-alpha6 h1:QK0b4wNzriXQa20wm+yhkj28zB5SyD6UFH6vSPWu+dU=
-github.com/IceWhaleTech/CasaOS-Common v0.4.8-alpha12/go.mod h1:2IuYyy5qW1BE6jqC6M+tOU+WtUec1K565rLATBJ9p/0=
+github.com/KaySar12/NextZen-Common v1.0.0-alpha6/go.mod h1:r/zwQQg9ty2+A96HbMZbqvXlX/t9S2Fl3lGVjNB87ZI=
 github.com/RaveNoX/go-jsoncommentstrip v1.0.0/go.mod h1:78ihd09MekBnJnxpICcwzCMzGrKSKYe4AqU6PDYYpjk=
 github.com/apapsch/go-jsonmerge/v2 v2.0.0 h1:axGnT1gRIfimI7gJifB699GoE/oq+F2MU7Dml6nw9rQ=
 github.com/apapsch/go-jsonmerge/v2 v2.0.0/go.mod h1:lvDnEdqiQrp0O42VQGgmlKpxL1AP2+08jFMw88y4klk=
 github.com/benbjohnson/clock v1.3.1 h1:Heo0FGXzOxUHquZbraxt+tT7UXVDhesUQH5ISbsOkCQ=
 github.com/benbjohnson/clock v1.3.1/go.mod h1:J11/hYXuz8f4ySSvYwY0FKfm+ezbsZBKZxNJlLklBHA=
 github.com/bmatcuk/doublestar v1.1.1/go.mod h1:UD6OnuiIn0yFxxA2le/rnRU1G4RaI4UvFv1sNto9p6w=
-github.com/bytedance/sonic v1.5.0/go.mod h1:ED5hyg4y6t3/9Ku1R6dU/4KyJ48DZ4jPhfY1O2AihPM=
+github.com/bytedance/sonic v1.11.6 h1:oUp34TzMlL+OY1OUWxHqsdkgC/Zfc85zGqw9siXjrc0=
-github.com/bytedance/sonic v1.10.0-rc/go.mod h1:ElCzW+ufi8qKqNW0FY314xriJhyJhuoJ3gFZdAHF7NM=
+github.com/bytedance/sonic v1.11.6/go.mod h1:LysEHSvpvDySVdC2f87zGWf6CIKJcAvqab1ZaiQtds4=
-github.com/bytedance/sonic v1.11.3 h1:jRN+yEjakWh8aK5FzrciUHG8OFXK+4/KrAX/ysEtHAA=
+github.com/bytedance/sonic/loader v0.1.1 h1:c+e5Pt1k/cy5wMveRDyk2X4B9hF4g7an8N3zCYjJFNM=
-github.com/bytedance/sonic v1.11.3/go.mod h1:iZcSUejdk5aukTND/Eu/ivjQuEL0Cu9/rf50Hi0u/g4=
+github.com/bytedance/sonic/loader v0.1.1/go.mod h1:ncP89zfokxS5LZrJxl5z0UJcsk4M4yY2JpfqGeCtNLU=
-github.com/chenzhuoyu/base64x v0.0.0-20211019084208-fb5309c8db06/go.mod h1:DH46F32mSOjUmXrMHnKwZdA8wcEefY7UVqBKYGjpdQY=
+github.com/cloudwego/base64x v0.1.4 h1:jwCgWpFanWmN8xoIUHa2rtzmkd5J2plF/dnLS6Xd/0Y=
-github.com/chenzhuoyu/base64x v0.0.0-20221115062448-fe3a3abad311/go.mod h1:b583jCggY9gE99b6G5LEC39OIiVsWj+R97kbl5odCEk=
+github.com/cloudwego/base64x v0.1.4/go.mod h1:0zlkT4Wn5C6NdauXdJRhSKRlJvmclQ1hhJgA0rcu/8w=
-github.com/chenzhuoyu/base64x v0.0.0-20230717121745-296ad89f973d h1:77cEq6EriyTZ0g/qfRdp61a3Uu/AWrgIq2s0ClJV1g0=
+github.com/cloudwego/iasm v0.2.0 h1:1KNIy1I1H9hNNFEEH3DVnI4UujN+1zjpuk6gwHLTssg=
-github.com/chenzhuoyu/base64x v0.0.0-20230717121745-296ad89f973d/go.mod h1:8EPpVsBuRksnlj1mLy4AWzRNQYxauNi62uWcE3to6eA=
+github.com/cloudwego/iasm v0.2.0/go.mod h1:8rXZaNYT2n95jn+zTI1sDr+IgcD2GVs0nlbbQPiEFhY=
-github.com/chenzhuoyu/iasm v0.9.0/go.mod h1:Xjy2NpN3h7aUqeqM+woSuuvxmIe6+DDsiNLIrkAmYog=
-github.com/chenzhuoyu/iasm v0.9.1 h1:tUHQJXo3NhBqw6s33wkGn9SP3bvrWLdlVIJ3hQBL7P0=
-github.com/chenzhuoyu/iasm v0.9.1/go.mod h1:Xjy2NpN3h7aUqeqM+woSuuvxmIe6+DDsiNLIrkAmYog=
 github.com/coreos/go-oidc/v3 v3.11.0 h1:Ia3MxdwpSw702YW0xgfmP1GVCMA9aEFWu12XUZ3/OtI=
 github.com/coreos/go-oidc/v3 v3.11.0/go.mod h1:gE3LgjOgFoHi9a4ce4/tJczr0Ai2/BoDhf0r5lltWI0=
 github.com/coreos/go-systemd v0.0.0-20191104093116-d3cd4ed1dbcf h1:iW4rZ826su+pqaw19uhpSCzhj44qo35pNgKFGqzDKkU=
@@ -40,8 +37,8 @@ github.com/gin-contrib/gzip v0.0.6/go.mod h1:QOJlmV2xmayAjkNS2Y8NQsMneuRShOU/kjo
 github.com/gin-contrib/sse v0.1.0 h1:Y/yl/+YNO8GZSjAhjMsSuLt29uWRFHdHYUb5lYOV9qE=
 github.com/gin-contrib/sse v0.1.0/go.mod h1:RHrZQHXnP2xjPF+u1gW/2HnVO7nvIa9PG3Gm+fLHvGI=
 github.com/gin-gonic/gin v1.8.1/go.mod h1:ji8BvRH1azfM+SYow9zQ6SZMvR8qOMZHmsCuWR9tTTk=
-github.com/gin-gonic/gin v1.9.1 h1:4idEAncQnU5cB7BeOkPtxjfCSye0AAm1R0RVIqJ+Jmg=
+github.com/gin-gonic/gin v1.10.0 h1:nTuyha1TYqgedzytsKYqna+DfLos46nTv2ygFy86HFU=
-github.com/gin-gonic/gin v1.9.1/go.mod h1:hPrL7YrpYKXt5YId3A/Tnip5kqbEAP+KLuI3SUcPTeU=
+github.com/gin-gonic/gin v1.10.0/go.mod h1:4PMNQiOhvDRa013RKVbsiNwoyezlm2rm0uX/T7kzp5Y=
 github.com/glebarez/go-sqlite v1.21.1 h1:7MZyUPh2XTrHS7xNEHQbrhfMZuPSzhkm2A1qgg0y5NY=
 github.com/glebarez/go-sqlite v1.21.1/go.mod h1:ISs8MF6yk5cL4n/43rSOmVMGJJjHYr7L2MbZZ5Q4E2E=
 github.com/glebarez/sqlite v1.8.0 h1:02X12E2I/4C1n+v90yTqrjRa8yuo7c3KeHI3FRznCvc=
@@ -64,8 +61,8 @@ github.com/go-playground/universal-translator v0.18.0/go.mod h1:UvRDBj+xPUEGrFYl
 github.com/go-playground/universal-translator v0.18.1 h1:Bcnm0ZwsGyWbCzImXv+pAJnYK9S473LQFuzCbDbfSFY=
 github.com/go-playground/universal-translator v0.18.1/go.mod h1:xekY+UJKNuX9WP91TpwSH2VMlDf28Uj24BCp08ZFTUY=
 github.com/go-playground/validator/v10 v10.10.0/go.mod h1:74x4gJWsvQexRdW8Pn3dXSGrTK4nAUsbPlLADvpJkos=
-github.com/go-playground/validator/v10 v10.19.0 h1:ol+5Fu+cSq9JD7SoSqe04GMI92cbn0+wvQ3bZ8b/AU4=
+github.com/go-playground/validator/v10 v10.20.0 h1:K9ISHbSaI0lyB2eWMPJo+kOS/FBExVwjEviJTixqxL8=
-github.com/go-playground/validator/v10 v10.19.0/go.mod h1:dbuPbCMFw/DrkbEynArYaCwl3amGuJotoKCe95atGMM=
+github.com/go-playground/validator/v10 v10.20.0/go.mod h1:dbuPbCMFw/DrkbEynArYaCwl3amGuJotoKCe95atGMM=
 github.com/go-test/deep v1.0.8 h1:TDsG77qcSprGbC6vTN8OuXp5g+J+b5Pcguhf7Zt61VM=
 github.com/go-test/deep v1.0.8/go.mod h1:5C2ZWiW0ErCdrYzpqxLbTX7MG14M9iiw8DgHncVwcsE=
 github.com/goccy/go-json v0.9.7/go.mod h1:6MelG93GURQebXPDq3khkgXZkazVtN9CRI+MGFi0w8I=
@@ -114,10 +111,10 @@ github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ=
 github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI=
 github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY=
 github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE=
-github.com/labstack/echo/v4 v4.10.2 h1:n1jAhnq/elIFTHr1EYpiYtyKgx4RW9ccVgkqByZaN2M=
+github.com/labstack/echo/v4 v4.12.0 h1:IKpw49IMryVB2p1a4dzwlhP1O2Tf2E0Ir/450lH+kI0=
-github.com/labstack/echo/v4 v4.10.2/go.mod h1:OEyqf2//K1DFdE57vw2DRgWY0M7s65IVQO2FzvI4J5k=
+github.com/labstack/echo/v4 v4.12.0/go.mod h1:UP9Cr2DJXbOK3Kr9ONYzNowSh7HP0aG0ShAyycHSJvM=
-github.com/labstack/gommon v0.4.0 h1:y7cvthEAEbU0yHOf4axH8ZG2NH8knB9iNSoTO8dyIk8=
+github.com/labstack/gommon v0.4.2 h1:F8qTUNXgG1+6WQmqoUWnz8WiEU60mXVVw0P4ht1WRA0=
-github.com/labstack/gommon v0.4.0/go.mod h1:uW6kP17uPlLJsD3ijUYn3/M5bAxtlZhMI6m3MFxTMTM=
+github.com/labstack/gommon v0.4.2/go.mod h1:QlUFxVM+SNXhDL/Z7YhocGIBYOiwB0mXm1+1bAPHPyU=
 github.com/leodido/go-urn v1.2.1/go.mod h1:zt4jvISO2HfUBqxjfIshjdMTYS56ZS/qv49ictyFfxY=
 github.com/leodido/go-urn v1.4.0 h1:WT9HwE9SGECu3lg4d/dIA+jxlljEa1/ffXKmRjqdmIQ=
 github.com/leodido/go-urn v1.4.0/go.mod h1:bvxc+MVxLKB4z00jd1z+Dvzr47oO32F/QSNjSBOlFxI=
@@ -125,7 +122,6 @@ github.com/mailru/easyjson v0.0.0-20190614124828-94de47d64c63/go.mod h1:C1wdFJiN
 github.com/mailru/easyjson v0.0.0-20190626092158-b2ccc519800e/go.mod h1:C1wdFJiN94OJF2b5HbByQZoLdCWB1Yqtg26g4irojpc=
 github.com/mailru/easyjson v0.7.7 h1:UGYAvKxe3sBsEDzO8ZeWOSlIQfWFlxbzLZe7hwFURr0=
 github.com/mailru/easyjson v0.7.7/go.mod h1:xzfreul335JAWq5oZzymOObrkdz5UnU4kGfJJLY9Nlc=
-github.com/mattn/go-colorable v0.1.11/go.mod h1:u5H1YNBxpqRaxsYJYSkiCWKzEfiAb1Gb520KVy5xxl4=
 github.com/mattn/go-colorable v0.1.13 h1:fFA4WZxdEF4tXPZVKMLwD8oUnCTTo08duU7wxecdEvA=
 github.com/mattn/go-colorable v0.1.13/go.mod h1:7S9/ev0klgBDR4GtXTXX8a3vIGJpMovkB8vQcUbaXHg=
 github.com/mattn/go-isatty v0.0.14/go.mod h1:7GGIvUiUoEMVVmxf/4nioHXj79iQHKdU27kJ6hsGG94=
@@ -140,8 +136,8 @@ github.com/modern-go/reflect2 v1.0.2/go.mod h1:yWuevngMOJpCy52FWWMvUC8ws7m/LJsjY
 github.com/mohae/deepcopy v0.0.0-20170929034955-c48cc78d4826 h1:RWengNIwukTxcDr9M+97sNutRR1RKhG96O6jWumTTnw=
 github.com/mohae/deepcopy v0.0.0-20170929034955-c48cc78d4826/go.mod h1:TaXosZuwdSHYgviHp1DAtfrULt5eUgsSMsZf+YrPgl8=
 github.com/pelletier/go-toml/v2 v2.0.1/go.mod h1:r9LEWfGN8R5k0VXJ+0BkIe7MYkRdwZOjgMj2KwnJFUo=
-github.com/pelletier/go-toml/v2 v2.2.0 h1:QLgLl2yMN7N+ruc31VynXs1vhMZa7CeHHejIeBAsoHo=
+github.com/pelletier/go-toml/v2 v2.2.2 h1:aYUidT7k73Pcl9nb2gScu7NSrKCSHIDE89b3+6Wq+LM=
-github.com/pelletier/go-toml/v2 v2.2.0/go.mod h1:1t835xjRzz80PqgE6HHgN2JOsmgYu/h4qDAS4n929Rs=
+github.com/pelletier/go-toml/v2 v2.2.2/go.mod h1:1t835xjRzz80PqgE6HHgN2JOsmgYu/h4qDAS4n929Rs=
 github.com/perimeterx/marshmallow v1.1.4 h1:pZLDH9RjlLGGorbXhcaQLhfuV0pFMNfPO55FuFkxqLw=
 github.com/perimeterx/marshmallow v1.1.4/go.mod h1:dsXbUu8CRzfYP5a87xpp0xq9S3u0Vchtcl8we9tYaXw=
 github.com/pkg/diff v0.0.0-20210226163009-20ebb0f2a09e/go.mod h1:pJLUxLENpZxwdsKMEsNbx1VGcRFpLqf3715MtcvvzbA=
@@ -175,8 +171,8 @@ github.com/stretchr/testify v1.8.1/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o
 github.com/stretchr/testify v1.8.4/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo=
 github.com/stretchr/testify v1.9.0 h1:HtqpIVDClZ4nwg75+f6Lvsy/wHu+3BoSGCbBAcpTsTg=
 github.com/stretchr/testify v1.9.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY=
-github.com/tidwall/gjson v1.14.4 h1:uo0p8EbA09J7RQaflQ1aBRffTR7xedD2bcIVSYxLnkM=
+github.com/tidwall/gjson v1.17.0 h1:/Jocvlh98kcTfpN2+JzGQWQcqrPQwDrVEMApx/M5ZwM=
-github.com/tidwall/gjson v1.14.4/go.mod h1:/wbyibRr2FHMks5tjHJ5F8dMZh3AcwJEMf5vlfC0lxk=
+github.com/tidwall/gjson v1.17.0/go.mod h1:/wbyibRr2FHMks5tjHJ5F8dMZh3AcwJEMf5vlfC0lxk=
 github.com/tidwall/match v1.1.1 h1:+Ho715JplO36QYgwN9PGYNhgZvoUSc9X2c80KVTi+GA=
 github.com/tidwall/match v1.1.1/go.mod h1:eRSPERbgtNPcGhD8UCthc6PmLEQXEWd3PRB5JTxsfmM=
 github.com/tidwall/pretty v1.2.0/go.mod h1:ITEVvHYasfjBbM0u2Pg8T2nJnzm8xPwvNhhsoaGGjNU=
@@ -190,7 +186,6 @@ github.com/ugorji/go/codec v1.2.12 h1:9LC83zGrHhuUA9l16C9AHXAqEV/2wBQ4nkvumAE65E
 github.com/ugorji/go/codec v1.2.12/go.mod h1:UNopzCgEMSXjBc6AOMqYvWC1ktqTAfzJZUZgYf6w6lg=
 github.com/valyala/bytebufferpool v1.0.0 h1:GqA5TC/0021Y/b9FG4Oi9Mr3q7XYx6KllzawFIhcdPw=
 github.com/valyala/bytebufferpool v1.0.0/go.mod h1:6bBcMArwyJ5K/AmCkWv1jt77kVWyCJ6HpOuEn7z0Csc=
-github.com/valyala/fasttemplate v1.2.1/go.mod h1:KHLXt3tVN2HBp8eijSv/kGJopbvo7S+qRAEEKiv+SiQ=
 github.com/valyala/fasttemplate v1.2.2 h1:lxLXG0uE3Qnshl9QyaK6XJxMXlQZELvChBOCmQD0Loo=
 github.com/valyala/fasttemplate v1.2.2/go.mod h1:KHLXt3tVN2HBp8eijSv/kGJopbvo7S+qRAEEKiv+SiQ=
 go.uber.org/atomic v1.10.0 h1:9qC72Qh0+3MqyJbAn8YU5xVq1frD8bn3JtD2oXtafVQ=
@@ -202,8 +197,8 @@ go.uber.org/multierr v1.11.0/go.mod h1:20+QtiLqy0Nd6FdQB9TLXag12DsQkrbs3htMFfDN8
 go.uber.org/zap v1.24.0 h1:FiJd5l1UOLj0wCgbSE0rwwXHzEdAZS6hiiSnxJN/D60=
 go.uber.org/zap v1.24.0/go.mod h1:2kMP+WWQ8aoFoedH3T2sq6iJ2yDWpHbP0f6MQbS9Gkg=
 golang.org/x/arch v0.0.0-20210923205945-b76863e36670/go.mod h1:5om86z9Hs0C8fWVUuoMHwpExlXzs5Tkyp9hOrfG7pp8=
-golang.org/x/arch v0.7.0 h1:pskyeJh/3AmoQ8CPE95vxHLqp1G1GfGNXTmcl9NEKTc=
+golang.org/x/arch v0.8.0 h1:3wRIsP3pM4yUptoR96otTUOXI367OS0+c9eeRi9doIc=
-golang.org/x/arch v0.7.0/go.mod h1:FEVrYAQjsQXMVJ1nsMoVVXPZg6p2JE2mx8psSWTDQys=
+golang.org/x/arch v0.8.0/go.mod h1:FEVrYAQjsQXMVJ1nsMoVVXPZg6p2JE2mx8psSWTDQys=
 golang.org/x/crypto v0.0.0-20210711020723-a769d52b0f97/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc=
 golang.org/x/crypto v0.25.0 h1:ypSNr+bnYL2YhwoMt2zPxHFmbAN1KZs/njMG3hxUp30=
 golang.org/x/crypto v0.25.0/go.mod h1:T+wALwcMOSE0kXgUAnPAHqTLW+XHgcELELW8VaDgm/M=
@@ -218,8 +213,6 @@ golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7w
 golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20210630005230-0f9fa26af87c/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20210806184541-e5e7981a1069/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.0.0-20210927094055-39ccf1dd6fa6/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.0.0-20211103235746-7861aae1554b/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20220811171246-fbc7d0a398ab/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.5.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
@@ -230,14 +223,14 @@ golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
 golang.org/x/text v0.3.6/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
 golang.org/x/text v0.16.0 h1:a94ExnEXNtEwYLGJSIUxnWoxoRz/ZcCsV63ROupILh4=
 golang.org/x/text v0.16.0/go.mod h1:GhwF1Be+LQoKShO3cGOHzqOgRrGaYc9AvblQOmPVHnI=
-golang.org/x/time v0.3.0 h1:rg5rLMjNzMS1RkNLzCG38eapWhnYLFYXDXj2gOlr8j4=
+golang.org/x/time v0.5.0 h1:o7cqy6amK/52YcAKIPlM3a+Fpj35zvRj2TP+e1xFSfk=
-golang.org/x/time v0.3.0/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
+golang.org/x/time v0.5.0/go.mod h1:3BpzKBy/shNhVucY/MWOyx10tF3SFh9QdLuxbVysPQM=
 golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
 golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
 google.golang.org/protobuf v1.26.0-rc.1/go.mod h1:jlhhOSvTdKEhbULTjvd4ARK9grFBp09yW+WbY/TyQbw=
 google.golang.org/protobuf v1.28.0/go.mod h1:HV8QOd/L58Z+nl8r43ehVNZIU/HEI6OcFqwMG9pJV4I=
-google.golang.org/protobuf v1.33.0 h1:uNO2rsAINq/JlFpSdYEKIZ0uKD/R9cpdv0T+yoGwGmI=
+google.golang.org/protobuf v1.34.1 h1:9ddQBjfCyZPOHPUiPxpYESBLc+T8P3E+Vo4IbKZgFWg=
-google.golang.org/protobuf v1.33.0/go.mod h1:c6P6GXX6sHbq/GpV6MGZEdwhWPcYBgnhAHhKbcUYpos=
+google.golang.org/protobuf v1.34.1/go.mod h1:c6P6GXX6sHbq/GpV6MGZEdwhWPcYBgnhAHhKbcUYpos=
 gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
 gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
 gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c h1:Hei/4ADfdWqJk1ZMxUNpqntNwaWcugrBjAiHlqqRiVk=
@@ -256,8 +249,6 @@ gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=
 gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
 gorm.io/gorm v1.25.8 h1:WAGEZ/aEcznN4D03laj8DKnehe1e9gYQAjW8xyPRdeo=
 gorm.io/gorm v1.25.8/go.mod h1:hbnx/Oo0ChWMn1BIhpy1oYozzpM15i4YPuHDmfYtwg8=
-gotest.tools/v3 v3.4.0 h1:ZazjZUfuVeZGLAmlKKuyv3IKP5orXcwtOwDQH6YVr6o=
-gotest.tools/v3 v3.4.0/go.mod h1:CtbdzLSsqVhDgMtKsx03ird5YTGB3ar27v0u/yKBW5g=
 modernc.org/libc v1.22.4 h1:wymSbZb0AlrjdAVX3cjreCHTPCpPARbQXNz6BHPzdwQ=
 modernc.org/libc v1.22.4/go.mod h1:jj+Z7dTNX8fBScMVNRAYZ/jF91K8fdT2hYMThc3YjBY=
 modernc.org/mathutil v1.5.0 h1:rV0Ko/6SfM+8G+yKiyI830l3Wuz1zRutdslNoQ0kfiQ=

main.go

@@ -14,19 +14,19 @@ import (
 	"strings"
 	"time"
 
-	"github.com/IceWhaleTech/CasaOS-Common/external"
+	"github.com/KaySar12/NextZen-Common/external"
-	"github.com/IceWhaleTech/CasaOS-Common/model"
+	"github.com/KaySar12/NextZen-Common/model"
-	util_http "github.com/IceWhaleTech/CasaOS-Common/utils/http"
+	util_http "github.com/KaySar12/NextZen-Common/utils/http"
-	"github.com/IceWhaleTech/CasaOS-Common/utils/jwt"
+	"github.com/KaySar12/NextZen-Common/utils/jwt"
-	"github.com/IceWhaleTech/CasaOS-Common/utils/logger"
+	"github.com/KaySar12/NextZen-Common/utils/logger"
-	"github.com/IceWhaleTech/CasaOS-UserService/codegen/message_bus"
+	"github.com/KaySar12/NextZen-UserService/codegen/message_bus"
-	"github.com/IceWhaleTech/CasaOS-UserService/common"
+	"github.com/KaySar12/NextZen-UserService/common"
-	"github.com/IceWhaleTech/CasaOS-UserService/pkg/config"
+	"github.com/KaySar12/NextZen-UserService/pkg/config"
-	"github.com/IceWhaleTech/CasaOS-UserService/pkg/sqlite"
+	"github.com/KaySar12/NextZen-UserService/pkg/sqlite"
-	"github.com/IceWhaleTech/CasaOS-UserService/pkg/utils/encryption"
+	"github.com/KaySar12/NextZen-UserService/pkg/utils/encryption"
-	"github.com/IceWhaleTech/CasaOS-UserService/pkg/utils/random"
+	"github.com/KaySar12/NextZen-UserService/pkg/utils/random"
-	"github.com/IceWhaleTech/CasaOS-UserService/route"
+	"github.com/KaySar12/NextZen-UserService/route"
-	"github.com/IceWhaleTech/CasaOS-UserService/service"
+	"github.com/KaySar12/NextZen-UserService/service"
 	"github.com/coreos/go-systemd/daemon"
 	"go.uber.org/zap"
 )

model/sys_common.go

@@ -18,5 +18,5 @@ type APPModel struct {
 type Result struct {
 	Success int         `json:"success" example:"200"`
 	Message string      `json:"message" example:"ok"`
-	Data    interface{} `json:"data" example:"返回结果"`
+	Data    interface{} `json:"data" example:"Return result"`
 }

pkg/config/init.go

@@ -5,8 +5,8 @@ import (
 	"log"
 	"os"
 
-	"github.com/IceWhaleTech/CasaOS-Common/utils/constants"
+	"github.com/KaySar12/NextZen-Common/utils/constants"
-	"github.com/IceWhaleTech/CasaOS-UserService/model"
+	"github.com/KaySar12/NextZen-UserService/model"
 	"gopkg.in/ini.v1"
 )
 
@@ -23,8 +23,6 @@ var (
 		LogPath:      constants.DefaultLogPath,
 		LogSaveName:  "user",
 		LogFileExt:   "log",
-		OMVServer:    constants.DefaultOMVServer,
-		SecretKey:    constants.DefaultSecretKey,
 	}
 
 	Cfg            *ini.File

pkg/sqlite/db.go

@@ -12,10 +12,10 @@ package sqlite
 import (
 	"time"
 
-	"github.com/IceWhaleTech/CasaOS-Common/utils/logger"
+	"github.com/KaySar12/NextZen-Common/utils/logger"
-	"github.com/IceWhaleTech/CasaOS-UserService/model"
+	"github.com/KaySar12/NextZen-UserService/model"
-	"github.com/IceWhaleTech/CasaOS-UserService/pkg/utils/file"
+	"github.com/KaySar12/NextZen-UserService/pkg/utils/file"
-	model2 "github.com/IceWhaleTech/CasaOS-UserService/service/model"
+	model2 "github.com/KaySar12/NextZen-UserService/service/model"
 	"github.com/glebarez/sqlite"
 	"go.uber.org/zap"
 	"gorm.io/gorm"

pkg/utils/encryption/md5_helper.go

@@ -16,7 +16,7 @@ import (
 	"crypto/rand"
 	"encoding/hex"
 
-	"github.com/IceWhaleTech/CasaOS-UserService/pkg/config"
+	"github.com/KaySar12/NextZen-UserService/pkg/config"
 )
 
 var (

route/event_listen.go

@@ -7,12 +7,12 @@ import (
 	"strings"
 	"time"
 
-	"github.com/IceWhaleTech/CasaOS-Common/external"
+	"github.com/KaySar12/NextZen-Common/external"
-	"github.com/IceWhaleTech/CasaOS-Common/utils/logger"
+	"github.com/KaySar12/NextZen-Common/utils/logger"
-	message_bus "github.com/IceWhaleTech/CasaOS-UserService/codegen/message_bus"
+	message_bus "github.com/KaySar12/NextZen-UserService/codegen/message_bus"
-	"github.com/IceWhaleTech/CasaOS-UserService/model"
+	"github.com/KaySar12/NextZen-UserService/model"
-	"github.com/IceWhaleTech/CasaOS-UserService/pkg/config"
+	"github.com/KaySar12/NextZen-UserService/pkg/config"
-	"github.com/IceWhaleTech/CasaOS-UserService/service"
+	"github.com/KaySar12/NextZen-UserService/service"
 	"go.uber.org/zap"
 	"golang.org/x/net/websocket"
 )

route/v1.go

@@ -4,10 +4,10 @@ import (
 	"crypto/ecdsa"
 	"os"
 
-	"github.com/IceWhaleTech/CasaOS-Common/middleware"
+	"github.com/KaySar12/NextZen-Common/middleware"
-	"github.com/IceWhaleTech/CasaOS-Common/utils/jwt"
+	"github.com/KaySar12/NextZen-Common/utils/jwt"
-	v1 "github.com/IceWhaleTech/CasaOS-UserService/route/v1"
+	v1 "github.com/KaySar12/NextZen-UserService/route/v1"
-	"github.com/IceWhaleTech/CasaOS-UserService/service"
+	"github.com/KaySar12/NextZen-UserService/service"
 	"github.com/gin-contrib/gzip"
 	"github.com/gin-gonic/gin"
 )
@@ -40,6 +40,11 @@ func InitRouter() *gin.Engine {
 	r.GET("/v1/users/oidc/userinfo", v1.OIDCUserInfo)
 	r.POST("/v1/users/oidc/validateToken", v1.OIDCValidateToken)
 	r.POST("/v1/users/oidc/logout", v1.OIDCLogout)
+	r.GET("/v1/users/oidc/health", v1.OIDCHealthCheck)
+	r.GET("/v1/users/oidc/settings", v1.GetOIDCSettings)
+	r.POST("/v1/users/oidc/saveSettings", v1.SaveOIDCSettings)
+	r.GET("/v1/users/1panel/health", v1.OnePanelHealthCheck)
+	r.POST("/v1/users/1panel/login", v1.OnePanelLogin)
 	v1Group := r.Group("/v1")
 
 	v1Group.Use(jwt.JWT(

route/v1/user.go

@@ -23,18 +23,18 @@ import (
 	"strings"
 	"time"
 
-	"github.com/IceWhaleTech/CasaOS-Common/external"
+	"github.com/KaySar12/NextZen-Common/external"
-	"github.com/IceWhaleTech/CasaOS-Common/utils/common_err"
+	"github.com/KaySar12/NextZen-Common/utils/common_err"
-	"github.com/IceWhaleTech/CasaOS-Common/utils/jwt"
+	"github.com/KaySar12/NextZen-Common/utils/jwt"
-	"github.com/IceWhaleTech/CasaOS-Common/utils/logger"
+	"github.com/KaySar12/NextZen-Common/utils/logger"
-	"github.com/IceWhaleTech/CasaOS-UserService/common"
+	"github.com/KaySar12/NextZen-UserService/common"
-	"github.com/IceWhaleTech/CasaOS-UserService/model"
+	"github.com/KaySar12/NextZen-UserService/model"
-	"github.com/IceWhaleTech/CasaOS-UserService/model/system_model"
+	"github.com/KaySar12/NextZen-UserService/model/system_model"
-	"github.com/IceWhaleTech/CasaOS-UserService/pkg/config"
+	"github.com/KaySar12/NextZen-UserService/pkg/config"
-	"github.com/IceWhaleTech/CasaOS-UserService/pkg/utils/encryption"
+	"github.com/KaySar12/NextZen-UserService/pkg/utils/encryption"
-	"github.com/IceWhaleTech/CasaOS-UserService/pkg/utils/file"
+	"github.com/KaySar12/NextZen-UserService/pkg/utils/file"
-	"github.com/IceWhaleTech/CasaOS-UserService/service"
+	"github.com/KaySar12/NextZen-UserService/service"
-	model2 "github.com/IceWhaleTech/CasaOS-UserService/service/model"
+	model2 "github.com/KaySar12/NextZen-UserService/service/model"
 	"github.com/coreos/go-oidc/v3/oidc"
 	"github.com/gin-gonic/gin"
 	uuid "github.com/satori/go.uuid"
@@ -53,8 +53,21 @@ var (
 	//authURL      = "http://10.0.0.26:9000/application/o/nextzenos-oidc/"
 	callbackURL = "http://nextzenos.local/v1/users/oidc/callback"
 	//callbackURL = "http://172.20.60.244:8080/v1/users/oidc/callback"
+	onePanelServer   = "http://172.20.60.244:13000"
+	onePanelName     = "nextzen"
+	onePanelPassword = "Smartyourlife123@*"
 )
 
+type OIDCSetting struct {
+	Settings struct {
+		ClientID     string `json:"clientId"`
+		ClientSecret string `json:"clientSecret"`
+		Issuer       string `json:"issuer"`
+		AuthURL      string `json:"authUrl"`
+		CallbackURL  string `json:"callbackUrl"`
+	} `json:"settings"`
+}
+
 // @Summary register user
 // @Router /user/register/ [post]
 func PostUserRegister(c *gin.Context) {
@@ -112,6 +125,34 @@ var limiter = rate.NewLimiter(rate.Every(time.Minute), 5)
 // @Param pwd  query string true "password"
 // @Success 200 {string} string "ok"
 // @Router /user/login [post]
+func OnePanelLogin(c *gin.Context) {
+	var cred = model2.OnePanelCredentials{
+		Name:          onePanelName,
+		Password:      onePanelPassword,
+		IgnoreCaptcha: true,
+		Captcha:       "",
+		CaptchaID:     "",
+		AuthMethod:    "session",
+		Language:      "en",
+	}
+	response, cookies, err := service.MyService.OnePanel().Login(cred, "http://172.20.60.244:13000")
+	if err != nil {
+		c.JSON(common_err.SERVICE_ERROR,
+			model.Result{
+				Success: common_err.SERVICE_ERROR,
+				Message: common_err.GetMsg(common_err.SERVICE_ERROR),
+			})
+	}
+	for _, cookie := range cookies {
+		c.SetCookie(cookie.Name, cookie.Value, 3600, "/", "", false, true)
+	}
+	c.JSON(common_err.SUCCESS,
+		model.Result{
+			Success: common_err.SUCCESS,
+			Message: common_err.GetMsg(common_err.SUCCESS),
+			Data:    response,
+		})
+}
 func PostUserLogin(c *gin.Context) {
 	if !limiter.Allow() {
 		c.JSON(common_err.TOO_MANY_REQUEST,
@@ -246,7 +287,7 @@ func CheckOIDCInit() gin.HandlerFunc {
 	return func(c *gin.Context) {
 		if !oidcInit {
 			log.Println("Provider is Offline")
-			c.JSON(http.StatusServiceUnavailable, model.Result{Success: http.StatusServiceUnavailable, Message: "Authentik Server is Offline"})
+			c.JSON(http.StatusServiceUnavailable, model.Result{Success: common_err.OIDC_OFFLINE, Message: "Authentik Server is Offline"})
 			return
 		}
 		c.Next()
@@ -255,6 +296,14 @@ func CheckOIDCInit() gin.HandlerFunc {
 
 // Use an init function to initialize the oauth2Config variable.
 func OIDC() error {
+	authentik, err := service.MyService.Authentik().GetSettings()
+	if (authentik != model2.AuthentikCredentialsDBModel{} && err == nil) {
+		clientID = authentik.ClientID
+		clientSecret = authentik.ClientSecret
+		authServer = authentik.Issuer
+		authURL = authentik.AuthUrl
+		callbackURL = authentik.CallbackUrl
+	}
 	ctx := context.Background()
 	provider, err := oidc.NewProvider(ctx, authURL)
 	if err != nil {
@@ -265,19 +314,36 @@ func OIDC() error {
 		ClientSecret: clientSecret,
 		RedirectURL:  callbackURL,
 		Endpoint:     provider.Endpoint(),
-		Scopes:       []string{oidc.ScopeOpenID, "profile", "email", "goauthentik.io/api"},
+		Scopes:       []string{oidc.ScopeOpenID, "profile", "email", "offline_access", "goauthentik.io/api"},
 		//add offline access for refresh token
 	}
 	return nil
 }
+func GetOIDCSettings(c *gin.Context) {
+	authentik, err := service.MyService.Authentik().GetSettings()
+	if err != nil {
+		c.JSON(common_err.SERVICE_ERROR,
+			model.Result{
+				Success: common_err.SERVICE_ERROR,
+				Message: common_err.GetMsg(common_err.SERVICE_ERROR),
+			})
+		return
+	}
+	c.JSON(common_err.SUCCESS,
+		model.Result{
+			Success: common_err.SUCCESS,
+			Message: common_err.GetMsg(common_err.SUCCESS),
+			Data:    authentik,
+		})
+	return
+}
 func OIDCLogin(c *gin.Context) {
 	json := make(map[string]string)
 	c.ShouldBind(&json)
 	state := json["state"]
-	// w := c.Writer
+	callBackUrl := fmt.Sprintf("%s/%s", json["baseUrl"], "v1/users/oidc/callback")
-	// r := c.Request
+
-	// setCallbackCookie(w, r, "state", state)
+	oauth2Config.RedirectURL = callBackUrl
-	// c.Redirect(http.StatusFound, oauth2Config.AuthCodeURL(state))
 	c.JSON(common_err.SUCCESS,
 		model.Result{
 			Success: common_err.SUCCESS,
@@ -285,6 +351,30 @@ func OIDCLogin(c *gin.Context) {
 			Data:    oauth2Config.AuthCodeURL(state),
 		})
 }
+func SaveOIDCSettings(c *gin.Context) {
+	var oidcSetting OIDCSetting
+	var authentik model2.AuthentikCredentialsDBModel
+	c.ShouldBind(&oidcSetting)
+	authentik.ClientID = oidcSetting.Settings.ClientID
+	authentik.ClientSecret = oidcSetting.Settings.ClientSecret
+	authentik.Issuer = oidcSetting.Settings.Issuer
+	authentik.AuthUrl = oidcSetting.Settings.AuthURL
+	authentik.CallbackUrl = oidcSetting.Settings.CallbackURL
+	var result, err = service.MyService.Authentik().UpdateSettings(authentik)
+	if err != nil {
+		c.JSON(common_err.SERVICE_ERROR,
+			model.Result{
+				Success: common_err.SERVICE_ERROR,
+				Message: common_err.GetMsg(common_err.SERVICE_ERROR),
+			})
+	}
+	c.JSON(common_err.SUCCESS,
+		model.Result{
+			Success: common_err.SUCCESS,
+			Message: common_err.GetMsg(common_err.SUCCESS),
+			Data:    result,
+		})
+}
 func OIDCCallback(c *gin.Context) {
 	w := c.Writer
 	r := c.Request
@@ -304,14 +394,15 @@ func OIDCCallback(c *gin.Context) {
 		return
 	}
 	expiryDuration := time.Until(oauth2Token.Expiry)
-	c.SetCookie("accessToken", oauth2Token.AccessToken, int(expiryDuration.Seconds()), "/", "", false, true)
+	c.SetCookie("authentik_accessToken", oauth2Token.AccessToken, int(expiryDuration.Seconds()), "/", "", false, true)
-	// c.SetCookie("refreshToken", oauth2Token.RefreshToken, int(expiryDuration.Seconds()), "/", "", false, true)
+	// c.SetCookie("authentik_refreshToken", oauth2Token.RefreshToken, int(expiryDuration.Seconds()), "/", "", false, true)
 	c.Redirect(http.StatusFound, state)
 }
 func OIDCUserInfo(c *gin.Context) {
 	json := make(map[string]string)
 	c.ShouldBind(&json)
-	accessToken, err := c.Cookie("accessToken")
+	accessToken, err := c.Cookie("authentik_accessToken")
+
 	if err != nil {
 		c.Redirect(http.StatusFound, "/#/oidc")
 	}
@@ -327,13 +418,29 @@ func OIDCUserInfo(c *gin.Context) {
 			Data:    authentikUser,
 		})
 }
+func OIDCHealthCheck(c *gin.Context) {
+	var status string
+	status, err := service.MyService.Authentik().HealthCheck(authServer)
+	if err != nil {
+		c.JSON(http.StatusOK, model.Result{Success: common_err.OIDC_OFFLINE, Message: common_err.GetMsg(common_err.OIDC_OFFLINE), Data: "Offline"})
+		return
+	}
+	if status == "Starting" {
+		c.JSON(http.StatusOK, model.Result{Success: common_err.OIDC_STARTING, Message: common_err.GetMsg(common_err.OIDC_OFFLINE), Data: "Starting"})
+		return
+	}
+	c.JSON(http.StatusOK, model.Result{Success: common_err.OIDC_LIVE, Message: common_err.GetMsg(common_err.OIDC_LIVE), Data: "Live"})
+}
 func OIDCValidateToken(c *gin.Context) {
 
 	json := make(map[string]string)
 	c.ShouldBind(&json)
-	accessToken := json["authentikToken"]
+	accessToken, err := c.Cookie("authentik_accessToken")
+	if err != nil {
+		c.Redirect(http.StatusFound, "/#/oidc")
+	}
 	var validateToken model2.AuthentikToken
-	validateToken, err := service.MyService.Authentik().ValidateToken(clientID, clientSecret, accessToken, authServer)
+	validateToken, err = service.MyService.Authentik().ValidateToken(clientID, clientSecret, accessToken, authServer)
 	if err != nil {
 		c.JSON(http.StatusUnauthorized, model.Result{Success: common_err.ERROR_AUTH_TOKEN, Message: common_err.GetMsg(common_err.ERROR_AUTH_TOKEN)})
 		return
@@ -345,11 +452,8 @@ func OIDCValidateToken(c *gin.Context) {
 	c.JSON(http.StatusOK, model.Result{Success: common_err.ERROR_AUTH_TOKEN, Message: common_err.GetMsg(common_err.ERROR_AUTH_TOKEN)})
 }
 func OIDCLogout(c *gin.Context) {
-
 	json := make(map[string]string)
 	c.ShouldBind(&json)
-	accessToken := json["authentikToken"]
-	fmt.Println(accessToken)
 	flow := "/if/flow/default-authentication-flow/"
 	next := "/application/o/authorize/"
 
@@ -364,11 +468,11 @@ func OIDCLogout(c *gin.Context) {
 }
 func OIDCProfile(c *gin.Context) {
 	if !oidcInit {
-
+		c.Redirect(http.StatusFound, "/#/authentik-offline")
 	}
 	json := make(map[string]string)
 	c.ShouldBind(&json)
-	accessToken, err := c.Cookie("accessToken")
+	accessToken, err := c.Cookie("authentik_accessToken")
 	if err != nil {
 		c.Redirect(http.StatusFound, "/#/oidc")
 	}
@@ -394,6 +498,7 @@ func OIDCProfile(c *gin.Context) {
 		user = model2.UserDBModel{
 			Username: authentikUser.User.Username,
 			Password: hashPassword(),
+			Email:    authentikUser.User.Email,
 			Role:     determineUserRole(authentikUser.User.IsSuperuser),
 			Avatar:   authentikUser.User.Avatar,
 		}
@@ -428,6 +533,14 @@ func determineUserRole(isSuperuser bool) string {
 	}
 	return "user"
 }
+func OnePanelHealthCheck(c *gin.Context) {
+	status, err := service.MyService.OnePanel().HealthCheck(onePanelServer)
+	if err != nil || status == "Offline" {
+		c.JSON(http.StatusOK, model.Result{Success: common_err.OIDC_OFFLINE, Message: common_err.GetMsg(common_err.OIDC_OFFLINE), Data: "Offline"})
+		return
+	}
+	c.JSON(http.StatusOK, model.Result{Success: common_err.OIDC_LIVE, Message: common_err.GetMsg(common_err.OIDC_LIVE), Data: "Live"})
+}
 
 func hashPassword() string {
 	generatePassword, err := randString(16)

route/v2.go

@@ -7,10 +7,10 @@ import (
 	"strconv"
 	"strings"
 
-	"github.com/IceWhaleTech/CasaOS-Common/utils/jwt"
+	"github.com/KaySar12/NextZen-Common/utils/jwt"
-	codegen "github.com/IceWhaleTech/CasaOS-UserService/codegen/user_service"
+	codegen "github.com/KaySar12/NextZen-UserService/codegen/user_service"
-	v2 "github.com/IceWhaleTech/CasaOS-UserService/route/v2"
+	v2 "github.com/KaySar12/NextZen-UserService/route/v2"
-	"github.com/IceWhaleTech/CasaOS-UserService/service"
+	"github.com/KaySar12/NextZen-UserService/service"
 	"github.com/deepmap/oapi-codegen/pkg/middleware"
 	"github.com/getkin/kin-openapi/openapi3"
 	"github.com/getkin/kin-openapi/openapi3filter"

route/v2/api_route_event.go

@@ -3,8 +3,8 @@ package v2
 import (
 	"net/http"
 
-	codegen "github.com/IceWhaleTech/CasaOS-UserService/codegen/user_service"
+	codegen "github.com/KaySar12/NextZen-UserService/codegen/user_service"
-	"github.com/IceWhaleTech/CasaOS-UserService/service"
+	"github.com/KaySar12/NextZen-UserService/service"
 	"github.com/labstack/echo/v4"
 )
 

route/v2/route.go

@@ -1,6 +1,6 @@
 package v2
 
-import codegen "github.com/IceWhaleTech/CasaOS-UserService/codegen/user_service"
+import codegen "github.com/KaySar12/NextZen-UserService/codegen/user_service"
 
 type UserService struct{}
 

service/1panel.go

@@ -0,0 +1,93 @@
+package service
+
+import (
+	"bytes"
+	"encoding/json"
+	"fmt"
+	"log"
+	"net/http"
+
+	model2 "github.com/KaySar12/NextZen-UserService/service/model"
+)
+
+type OnePanelService interface {
+	Login(m model2.OnePanelCredentials, baseURL string) (model2.LoginResponse, []*http.Cookie, error)
+	Logout(m model2.OnePanelCredentials, baseURL string) (model2.LogoutResponse, error)
+	HealthCheck(baseURL string) (string, error)
+}
+
+var (
+	prefixV1 = "/api/v1"
+)
+
+type onePanelService struct {
+}
+
+func (o *onePanelService) Login(m model2.OnePanelCredentials, baseURL string) (model2.LoginResponse, []*http.Cookie, error) {
+	path := baseURL + prefixV1 + "/auth/login"
+
+	// Create the request body by marshaling the credentials into JSON
+	reqBody, err := json.Marshal(m)
+	if err != nil {
+		return model2.LoginResponse{}, []*http.Cookie{}, fmt.Errorf("error marshaling request body: %v", err)
+	}
+
+	req, err := http.NewRequest("POST", path, bytes.NewReader(reqBody))
+	if err != nil {
+		return model2.LoginResponse{}, []*http.Cookie{}, fmt.Errorf("error creating request: %v", err)
+	}
+	req.Header.Set("Content-Type", "application/json")
+	req.Header.Set("Accept", "application/json")
+
+	// Reuse the HTTP client (consider making it a field in onePanelService)
+	client := &http.Client{}
+	resp, err := client.Do(req)
+	cookies := resp.Cookies()
+	if err != nil {
+		return model2.LoginResponse{}, []*http.Cookie{}, fmt.Errorf("error making request: %v", err)
+	}
+	defer resp.Body.Close()
+
+	if resp.StatusCode < 200 || resp.StatusCode >= 300 {
+		return model2.LoginResponse{}, []*http.Cookie{}, fmt.Errorf("HTTP error: %s", resp.Status)
+	}
+
+	var result model2.LoginResponse
+	if err := json.NewDecoder(resp.Body).Decode(&result); err != nil {
+		return model2.LoginResponse{}, []*http.Cookie{}, fmt.Errorf("error decoding response: %v", err)
+	}
+
+	return result, cookies, nil
+}
+
+func (o *onePanelService) Logout(m model2.OnePanelCredentials, baseURL string) (model2.LogoutResponse, error) {
+	return model2.LogoutResponse{}, nil
+}
+
+func (o *onePanelService) HealthCheck(baseURL string) (string, error) {
+	path := baseURL + "/health"
+	req, err := http.NewRequest("GET", path, nil)
+	if err != nil {
+		log.Println("Error creating health/live request:", err)
+		return "Offline", err
+	}
+	client := &http.Client{
+		CheckRedirect: func(req *http.Request, via []*http.Request) error {
+			return nil // Always follow redirects
+		},
+	}
+	respLive, err := client.Do(req)
+	if err != nil {
+		log.Println("Error on health/live request:", err)
+		return "Offline", err // Exit if the request fails
+	}
+	defer respLive.Body.Close()
+	if respLive.StatusCode == http.StatusOK {
+		return "Live", nil
+	}
+	return "Offline", err
+}
+
+func NewOnePanelService() OnePanelService {
+	return &onePanelService{}
+}

service/authentik.go

@@ -9,17 +9,18 @@ import (
 	"net/url"
 	"strings"
 
-	model2 "github.com/IceWhaleTech/CasaOS-UserService/service/model"
+	model2 "github.com/KaySar12/NextZen-UserService/service/model"
 	"gorm.io/gorm"
 )
 
 type AuthentikService interface {
 	GetUserInfo(accessToken string, baseURL string) (model2.AuthentikUser, error)
 	GetUserApp(accessToken string, baseURL string) (model2.AuthentikApplication, error)
-	CreateCredential(m model2.AuthentikCredentialsDBModel) model2.AuthentikCredentialsDBModel
+	CreateSettings(m model2.AuthentikCredentialsDBModel) model2.AuthentikCredentialsDBModel
-	UpdateCredential(m model2.AuthentikCredentialsDBModel) model2.AuthentikCredentialsDBModel
+	UpdateSettings(m model2.AuthentikCredentialsDBModel) (model2.AuthentikCredentialsDBModel, error)
-	GetCredential(id int) model2.AuthentikCredentialsDBModel
+	GetSettings() (model2.AuthentikCredentialsDBModel, error)
 	ValidateToken(clientId string, clientSecret string, accessToken string, baseURL string) (model2.AuthentikToken, error)
+	HealthCheck(baseURL string) (string, error)
 }
 
 type authentikService struct {
@@ -30,18 +31,93 @@ var (
 	APICorePrefix = "/api/v3/core"
 )
 
-func (a *authentikService) CreateCredential(m model2.AuthentikCredentialsDBModel) model2.AuthentikCredentialsDBModel {
+func (a *authentikService) CreateSettings(m model2.AuthentikCredentialsDBModel) model2.AuthentikCredentialsDBModel {
 	a.db.Create(&m)
 	return m
 }
-func (a *authentikService) UpdateCredential(m model2.AuthentikCredentialsDBModel) model2.AuthentikCredentialsDBModel {
+func (a *authentikService) UpdateSettings(m model2.AuthentikCredentialsDBModel) (model2.AuthentikCredentialsDBModel, error) {
-	a.db.Model(&m).Where("id = ?", m.Id).Updates(m)
+	// Find the first matching record
-	return m
+	var existing model2.AuthentikCredentialsDBModel
+	result := a.db.First(&existing)
+	if result.Error != nil {
+		return existing, result.Error
+	}
+
+	// Update the existing record
+	existing.ClientID = m.ClientID
+	existing.ClientSecret = m.ClientSecret
+	existing.Issuer = m.Issuer
+	existing.AuthUrl = m.AuthUrl
+	existing.CallbackUrl = m.CallbackUrl
+
+	// Save the updated record
+	result = a.db.Save(&existing)
+	if result.Error != nil {
+		return existing, result.Error
+	}
+
+	return existing, nil
 }
-func (a *authentikService) GetCredential(id int) model2.AuthentikCredentialsDBModel {
+func (a *authentikService) GetSettings() (model2.AuthentikCredentialsDBModel, error) {
 	var m model2.AuthentikCredentialsDBModel
-	a.db.Limit(1).Where("id = ?", id).First(&m)
+	result := a.db.First(&m)
-	return m
+	if result.Error != nil {
+		return model2.AuthentikCredentialsDBModel{}, result.Error
+	}
+	return m, nil
+}
+
+func (a *authentikService) HealthCheck(baseURL string) (string, error) {
+	// Check health/live first
+	pathLive := baseURL + "/-/health/live/"
+	reqLive, err := http.NewRequest("GET", pathLive, nil)
+	if err != nil {
+		log.Println("Error creating health/live request:", err)
+		return "Offline", err
+	}
+
+	client := &http.Client{
+		CheckRedirect: func(req *http.Request, via []*http.Request) error {
+			return nil // Always follow redirects
+		},
+	}
+
+	respLive, err := client.Do(reqLive)
+	if err != nil {
+		log.Println("Error on health/live request:", err)
+		return "Offline", err // Exit if the request fails
+	}
+	defer respLive.Body.Close()
+
+	// Check if health/live is 204 before proceeding
+	if respLive.StatusCode == http.StatusNoContent {
+		// Now check health/ready
+		pathReady := baseURL + "/-/health/ready/"
+		reqReady, err := http.NewRequest("GET", pathReady, nil)
+		if err != nil {
+			log.Println("Error creating health/ready request:", err)
+			return "Offline", err
+		}
+
+		respReady, err := client.Do(reqReady)
+		if err != nil {
+			log.Println("Error on health/ready request:", err)
+			return "Offline", err
+		}
+		defer respReady.Body.Close()
+
+		if respReady.StatusCode != http.StatusNoContent {
+			log.Println("HTTP error on health/ready:", respReady.Status)
+			return "Starting", nil
+		} else {
+			log.Println("Authentik is fully healthy!")
+			return "Live", nil
+		}
+
+	} else {
+		log.Println("HTTP error on health/live:", respLive.Status)
+		return "Offline", err
+	}
 }
 func (a *authentikService) ValidateToken(clientId string, clientSecret string, accessToken string, baseURL string) (model2.AuthentikToken, error) {
 	auth := clientId + ":" + clientSecret
@@ -49,8 +125,8 @@ func (a *authentikService) ValidateToken(clientId string, clientSecret string, a
 	path := baseURL + "/application/o/introspect/"
 	formData := url.Values{}
 	formData.Set("token", accessToken)
-	responseBody := strings.NewReader(formData.Encode())
+	reqBody := strings.NewReader(formData.Encode())
-	req, err := http.NewRequest("POST", path, responseBody)
+	req, err := http.NewRequest("POST", path, reqBody)
 	if err != nil {
 		return model2.AuthentikToken{}, fmt.Errorf("error creating request: %v", err)
 	}

service/event.go

@@ -3,7 +3,7 @@ package service
 import (
 	"encoding/json"
 
-	"github.com/IceWhaleTech/CasaOS-UserService/model"
+	"github.com/KaySar12/NextZen-UserService/model"
 	"gorm.io/gorm"
 )
 

service/model/o_authentik_credetials.go

@@ -2,12 +2,14 @@ package model
 
 import "time"
 
-// Soon to be removed
+// TODO  Refreshtoken
 type AuthentikCredentialsDBModel struct {
 	Id           int       `gorm:"column:id;primary_key" json:"id"`
 	ClientID     string    `json:"clientId"`
 	ClientSecret string    `json:"clientSecret"`
-	Server       string    `json:"server"`
+	Issuer       string    `json:"issuer"`
+	AuthUrl      string    `json:"authUrl"`
+	CallbackUrl  string    `json:"callbackUrl"`
 	CreatedAt    time.Time `gorm:"<-:create;autoCreateTime" json:"created_at,omitempty"`
 	UpdatedAt    time.Time `gorm:"<-:create;<-:update;autoUpdateTime" json:"updated_at,omitempty"`
 }

service/model/o_one_panel_credentials.go

@@ -0,0 +1,28 @@
+package model
+
+type OnePanelCredentials struct {
+	Name          string `json:"name"`
+	Password      string `json:"password"`
+	IgnoreCaptcha bool   `json:"ignoreCaptcha"`
+	Captcha       string `json:"captcha"`
+	CaptchaID     string `json:"captchaID"`
+	AuthMethod    string `json:"authMethod"`
+	Language      string `json:"language"`
+}
+
+type LoginResponse struct {
+	Code    int    `json:"code"`
+	Message string `json:"message"`
+	Data    struct {
+		Name      string `json:"name"`
+		Token     string `json:"token"`
+		MfaStatus string `json:"mfaStatus"`
+	} `json:"data"`
+}
+
+type LogoutResponse struct {
+	Code    int    `json:"code"`
+	Message string `json:"message"`
+	Data    struct {
+	} `json:"data"`
+}

service/omv.go

@@ -9,8 +9,8 @@ import (
 	"net/http"
 	"os"
 
-	"github.com/IceWhaleTech/CasaOS-UserService/pkg/config"
+	"github.com/KaySar12/NextZen-UserService/pkg/config"
-	"github.com/IceWhaleTech/CasaOS-UserService/service/model"
+	"github.com/KaySar12/NextZen-UserService/service/model"
 )
 
 type OMVService interface {

service/service.go

@@ -1,9 +1,9 @@
 package service
 
 import (
-	"github.com/IceWhaleTech/CasaOS-Common/external"
+	"github.com/KaySar12/NextZen-Common/external"
-	"github.com/IceWhaleTech/CasaOS-UserService/codegen/message_bus"
+	"github.com/KaySar12/NextZen-UserService/codegen/message_bus"
-	"github.com/IceWhaleTech/CasaOS-UserService/pkg/config"
+	"github.com/KaySar12/NextZen-UserService/pkg/config"
 	"gorm.io/gorm"
 )
 
@@ -16,6 +16,7 @@ type Repository interface {
 	Event() EventService
 	OMV() OMVService
 	Authentik() AuthentikService
+	OnePanel() OnePanelService
 }
 
 func NewService(db *gorm.DB, RuntimePath string) Repository {
@@ -31,6 +32,7 @@ func NewService(db *gorm.DB, RuntimePath string) Repository {
 		event:     NewEventService(db),
 		omv:       NewOMVService(),
 		authentik: NewAuthentikService(db),
+		onePanel:  NewOnePanelService(),
 	}
 }
 
@@ -40,8 +42,12 @@ type store struct {
 	event     EventService
 	omv       OMVService
 	authentik AuthentikService
+	onePanel  OnePanelService
 }
 
+func (c *store) OnePanel() OnePanelService {
+	return c.onePanel
+}
 func (c *store) Event() EventService {
 	return c.event
 }

service/user.go

@@ -15,9 +15,9 @@ import (
 	"mime/multipart"
 	"os"
 
-	"github.com/IceWhaleTech/CasaOS-Common/utils/jwt"
+	"github.com/KaySar12/NextZen-Common/utils/jwt"
-	"github.com/IceWhaleTech/CasaOS-Common/utils/logger"
+	"github.com/KaySar12/NextZen-Common/utils/logger"
-	"github.com/IceWhaleTech/CasaOS-UserService/service/model"
+	"github.com/KaySar12/NextZen-UserService/service/model"
 	"go.uber.org/zap"
 	"gorm.io/gorm"
 )