mirror of
https://github.com/KaySar12/NextZen-UserService.git
synced 2025-10-06 19:59:42 +07:00
update UserStatus function
This commit is contained in:
+3
-1
@@ -24,4 +24,6 @@ codegen/
|
|||||||
node_modules/
|
node_modules/
|
||||||
dist/
|
dist/
|
||||||
.idea
|
.idea
|
||||||
.package-lock.json
|
.package-lock.json
|
||||||
|
*.sh
|
||||||
|
build/scripts/setup/service.d/user-service/ubuntu/setup-user-service.sh
|
||||||
|
|||||||
@@ -118,8 +118,6 @@ archives:
|
|||||||
- casaos-user-service-amd64
|
- casaos-user-service-amd64
|
||||||
- casaos-user-service-arm64
|
- casaos-user-service-arm64
|
||||||
- casaos-user-service-arm-7
|
- casaos-user-service-arm-7
|
||||||
replacements:
|
|
||||||
arm: arm-7
|
|
||||||
files:
|
files:
|
||||||
- build/**/*
|
- build/**/*
|
||||||
- name_template: "{{ .Os }}-{{ .Arch }}-{{ .ProjectName }}-migration-tool-v{{ .Version }}"
|
- name_template: "{{ .Os }}-{{ .Arch }}-{{ .ProjectName }}-migration-tool-v{{ .Version }}"
|
||||||
@@ -128,8 +126,6 @@ archives:
|
|||||||
- 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
|
||||||
replacements:
|
|
||||||
arm: arm-7
|
|
||||||
files:
|
files:
|
||||||
- build/sysroot/etc/**/*
|
- build/sysroot/etc/**/*
|
||||||
checksum:
|
checksum:
|
||||||
|
|||||||
Vendored
+1
-1
@@ -6,7 +6,7 @@
|
|||||||
"type": "go",
|
"type": "go",
|
||||||
"debugAdapter": "dlv-dap",
|
"debugAdapter": "dlv-dap",
|
||||||
"request": "launch",
|
"request": "launch",
|
||||||
"port": 2345,
|
"port": 2346,
|
||||||
"host": "127.0.0.1",
|
"host": "127.0.0.1",
|
||||||
"mode": "exec",
|
"mode": "exec",
|
||||||
"program": "${workspaceFolder}/dist/casaos-user-service-amd64_linux_amd64_v1/build/sysroot/usr/bin/casaos-user-service"
|
"program": "${workspaceFolder}/dist/casaos-user-service-amd64_linux_amd64_v1/build/sysroot/usr/bin/casaos-user-service"
|
||||||
|
|||||||
Vendored
+1
-1
@@ -1 +1 @@
|
|||||||
[{"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"}}]
|
[{"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"}}]
|
||||||
BIN
Binary file not shown.
Vendored
+4
-1
@@ -67,6 +67,7 @@ changelog:
|
|||||||
- '^docs:'
|
- '^docs:'
|
||||||
- '^test:'
|
- '^test:'
|
||||||
sort: asc
|
sort: asc
|
||||||
|
format: '{{ .SHA }}: {{ .Message }} ({{ with .AuthorUsername }}@{{ . }}{{ else }}{{ .AuthorName }} <{{ .AuthorEmail }}>{{ end }})'
|
||||||
dist: dist
|
dist: dist
|
||||||
env_files:
|
env_files:
|
||||||
github_token: ~/.config/goreleaser/github_token
|
github_token: ~/.config/goreleaser/github_token
|
||||||
@@ -115,7 +116,7 @@ announce:
|
|||||||
linkedin:
|
linkedin:
|
||||||
message_template: '{{ .ProjectName }} {{ .Tag }} is out! Check it out at {{ .ReleaseURL }}'
|
message_template: '{{ .ProjectName }} {{ .Tag }} is out! Check it out at {{ .ReleaseURL }}'
|
||||||
telegram:
|
telegram:
|
||||||
message_template: '{{ .ProjectName }} {{ mdv2escape .Tag }} is out! Check it out at {{ mdv2escape .ReleaseURL }}'
|
message_template: '{{ mdv2escape .ProjectName }} {{ mdv2escape .Tag }} is out{{ mdv2escape "!" }} Check it out at {{ mdv2escape .ReleaseURL }}'
|
||||||
parse_mode: MarkdownV2
|
parse_mode: MarkdownV2
|
||||||
webhook:
|
webhook:
|
||||||
message_template: '{ "message": "{{ .ProjectName }} {{ .Tag }} is out! Check it out at {{ .ReleaseURL }}"}'
|
message_template: '{ "message": "{{ .ProjectName }} {{ .Tag }} is out! Check it out at {{ .ReleaseURL }}"}'
|
||||||
@@ -123,6 +124,8 @@ announce:
|
|||||||
opencollective:
|
opencollective:
|
||||||
title_template: '{{ .Tag }}'
|
title_template: '{{ .Tag }}'
|
||||||
message_template: '{{ .ProjectName }} {{ .Tag }} is out!<br/>Check it out at <a href="{{ .ReleaseURL }}">{{ .ReleaseURL }}</a>'
|
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:
|
git:
|
||||||
tag_sort: -version:refname
|
tag_sort: -version:refname
|
||||||
github_urls:
|
github_urls:
|
||||||
|
|||||||
Vendored
+1
-1
@@ -1 +1 @@
|
|||||||
{"project_name":"casaos-user-service","tag":"v1.0.1","previous_tag":"","version":"1.0.2","commit":"e002bab12a5ce37a0636709986e161f0e84f2eeb","date":"2024-02-21T12:02:47.525580972+07:00","runtime":{"goos":"linux","goarch":"amd64"}}
|
{"project_name":"casaos-user-service","tag":"v1.0.0","previous_tag":"","version":"1.0.1","commit":"cd28792c154027bebe695a5be5eef33d65dce067","date":"2024-06-29T11:38:52.713569836+07:00","runtime":{"goos":"linux","goarch":"amd64"}}
|
||||||
+30
-12
@@ -75,7 +75,7 @@ func PostUserRegister(c *gin.Context) {
|
|||||||
user.Username = username
|
user.Username = username
|
||||||
user.Password = encryption.GetMD5ByStr(pwd)
|
user.Password = encryption.GetMD5ByStr(pwd)
|
||||||
user.Role = "admin"
|
user.Role = "admin"
|
||||||
|
// user.Role = "user"
|
||||||
user = service.MyService.User().CreateUser(user)
|
user = service.MyService.User().CreateUser(user)
|
||||||
if user.Id == 0 {
|
if user.Id == 0 {
|
||||||
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.SERVICE_ERROR, model.Result{Success: common_err.SERVICE_ERROR, Message: common_err.GetMsg(common_err.SERVICE_ERROR)})
|
||||||
@@ -97,7 +97,6 @@ var limiter = rate.NewLimiter(rate.Every(time.Minute), 5)
|
|||||||
// @Success 200 {string} string "ok"
|
// @Success 200 {string} string "ok"
|
||||||
// @Router /user/login [post]
|
// @Router /user/login [post]
|
||||||
func PostUserLogin(c *gin.Context) {
|
func PostUserLogin(c *gin.Context) {
|
||||||
|
|
||||||
if !limiter.Allow() {
|
if !limiter.Allow() {
|
||||||
c.JSON(common_err.TOO_MANY_REQUEST,
|
c.JSON(common_err.TOO_MANY_REQUEST,
|
||||||
model.Result{
|
model.Result{
|
||||||
@@ -810,18 +809,37 @@ func DeleteUserAll(c *gin.Context) {
|
|||||||
// @Security ApiKeyAuth
|
// @Security ApiKeyAuth
|
||||||
// @Success 200 {string} string "ok"
|
// @Success 200 {string} string "ok"
|
||||||
// @Router /sys/init/check [get]
|
// @Router /sys/init/check [get]
|
||||||
|
// func GetUserStatus(c *gin.Context) {
|
||||||
|
// data := make(map[string]interface{}, 2)
|
||||||
|
|
||||||
|
// if service.MyService.User().GetUserCount() > 0 {
|
||||||
|
// data["initialized"] = true
|
||||||
|
// data["key"] = ""
|
||||||
|
// } else {
|
||||||
|
// key := uuid.NewV4().String()
|
||||||
|
// service.UserRegisterHash[key] = key
|
||||||
|
// data["key"] = key
|
||||||
|
// data["initialized"] = false
|
||||||
|
// }
|
||||||
|
// gpus, err := external.NvidiaGPUInfoList()
|
||||||
|
// if err != nil {
|
||||||
|
// logger.Error("NvidiaGPUInfoList error", zap.Error(err))
|
||||||
|
// }
|
||||||
|
// data["gpus"] = len(gpus)
|
||||||
|
// c.JSON(common_err.SUCCESS,
|
||||||
|
// model.Result{
|
||||||
|
// Success: common_err.SUCCESS,
|
||||||
|
// Message: common_err.GetMsg(common_err.SUCCESS),
|
||||||
|
// Data: data,
|
||||||
|
// })
|
||||||
|
// }
|
||||||
|
|
||||||
func GetUserStatus(c *gin.Context) {
|
func GetUserStatus(c *gin.Context) {
|
||||||
data := make(map[string]interface{}, 2)
|
data := make(map[string]interface{}, 2)
|
||||||
|
key := uuid.NewV4().String()
|
||||||
if service.MyService.User().GetUserCount() > 0 {
|
service.UserRegisterHash[key] = key
|
||||||
data["initialized"] = true
|
data["key"] = key
|
||||||
data["key"] = ""
|
data["initialized"] = true
|
||||||
} else {
|
|
||||||
key := uuid.NewV4().String()
|
|
||||||
service.UserRegisterHash[key] = key
|
|
||||||
data["key"] = key
|
|
||||||
data["initialized"] = false
|
|
||||||
}
|
|
||||||
gpus, err := external.NvidiaGPUInfoList()
|
gpus, err := external.NvidiaGPUInfoList()
|
||||||
if err != nil {
|
if err != nil {
|
||||||
logger.Error("NvidiaGPUInfoList error", zap.Error(err))
|
logger.Error("NvidiaGPUInfoList error", zap.Error(err))
|
||||||
|
|||||||
Reference in New Issue
Block a user