diff --git a/.gitignore b/.gitignore index c8a0428..de2fac2 100644 --- a/.gitignore +++ b/.gitignore @@ -27,3 +27,6 @@ dist/ .package-lock.json *.sh build/scripts/setup/service.d/user-service/ubuntu/setup-user-service.sh +linux-amd64-nextzenos-user-service-v1.3.tar.gz +build/sysroot/usr/bin/casaos-user-service +dist/casaos-user-service-amd64_linux_amd64_v1/build/sysroot/usr/bin/casaos-user-service diff --git a/common/version.go b/common/version.go index 619d87d..535568b 100644 --- a/common/version.go +++ b/common/version.go @@ -1,4 +1,4 @@ package common -const Version = "0.4.8" +const Version = "1.3.0" const SERVICENAME = "CasaOS-UserService" diff --git a/dist/casaos-user-service-amd64_linux_amd64_v1/build/sysroot/usr/bin/casaos-user-service b/dist/casaos-user-service-amd64_linux_amd64_v1/build/sysroot/usr/bin/casaos-user-service index d8addca..95c3a04 100755 Binary files a/dist/casaos-user-service-amd64_linux_amd64_v1/build/sysroot/usr/bin/casaos-user-service and b/dist/casaos-user-service-amd64_linux_amd64_v1/build/sysroot/usr/bin/casaos-user-service differ diff --git a/dist/metadata.json b/dist/metadata.json index 206b994..eeb9db6 100644 --- a/dist/metadata.json +++ b/dist/metadata.json @@ -1 +1 @@ -{"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"}} \ No newline at end of file +{"project_name":"casaos-user-service","tag":"v1.0.0","previous_tag":"","version":"1.0.1","commit":"11de9608cd1105075bc3ac12d2130eb30d3c8004","date":"2024-07-01T02:10:13.880324864+07:00","runtime":{"goos":"linux","goarch":"amd64"}} \ No newline at end of file diff --git a/route/v1/user.go b/route/v1/user.go index 7486e4e..17888a9 100644 --- a/route/v1/user.go +++ b/route/v1/user.go @@ -48,6 +48,7 @@ func PostUserRegister(c *gin.Context) { username := json["username"] pwd := json["password"] key := json["key"] + role := json["role"] if _, ok := service.UserRegisterHash[key]; !ok { c.JSON(common_err.CLIENT_ERROR, model.Result{Success: common_err.KEY_NOT_EXIST, Message: common_err.GetMsg(common_err.KEY_NOT_EXIST)}) @@ -74,7 +75,7 @@ func PostUserRegister(c *gin.Context) { user := model2.UserDBModel{} user.Username = username user.Password = encryption.GetMD5ByStr(pwd) - user.Role = "admin" + user.Role = role // user.Role = "user" user = service.MyService.User().CreateUser(user) if user.Id == 0 {