hoangvv/NextZen-UserService
1
0
Fork 0
mirror of https://github.com/KaySar12/NextZen-UserService.git synced 2025-10-06 19:59:42 +07:00
Code Issues Packages Projects Releases Wiki Activity

update

Browse Source
This commit is contained in:
Hoàng
2024-08-15 18:24:17 +07:00
parent bb2cbabc59
commit 0af7c28227
5 changed files with 24 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.gitignore
+1
View File
@@ -39,3 +39,4 @@ linux-amd64-nextzenos-user-service-v1.2.3.tar.gz
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
linux-amd64-nextzenos-user-service-v1.2.4.tar.gz linux-amd64-nextzenos-user-service-v1.2.4.tar.gz
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
dist/casaos-user-service-amd64_linux_amd64_v1/build/sysroot/usr/bin/casaos-user-service
build/scripts/migration/script.d/02-migrate-user-service.sh
+16 -16
View File
@@ -56,12 +56,12 @@ __is_migration_needed() {
__is_version_gt "${version2}" "${version1}" __is_version_gt "${version2}" "${version1}"
} }
__get_download_domain(){ __get_download_domain() {
local region local region
# Use ipconfig.io/country and https://ifconfig.io/country_code to get the country code # Use ipconfig.io/country and https://ifconfig.io/country_code to get the country code
region=$(curl --connect-timeout 2 -s ipconfig.io/country || echo "") region=$(curl --connect-timeout 2 -s ipconfig.io/country || echo "")
if [ "${region}" = "" ]; then if [ "${region}" = "" ]; then
region=$(curl --connect-timeout 2 -s https://ifconfig.io/country_code || echo "") region=$(curl --connect-timeout 2 -s https://ifconfig.io/country_code || echo "")
fi fi
if [[ "${region}" = "China" ]] || [[ "${region}" = "CN" ]]; then if [[ "${region}" = "China" ]] || [[ "${region}" = "CN" ]]; then
echo "https://casaos.oss-cn-shanghai.aliyuncs.com/" echo "https://casaos.oss-cn-shanghai.aliyuncs.com/"
@@ -95,7 +95,7 @@ readonly CURRENT_BIN_FILE_LEGACY
SOURCE_VERSION="$(${SOURCE_BIN_FILE} -v)" SOURCE_VERSION="$(${SOURCE_BIN_FILE} -v)"
readonly SOURCE_VERSION readonly SOURCE_VERSION
CURRENT_VERSION="$(${CURRENT_BIN_FILE} -v || ${CURRENT_BIN_FILE_LEGACY} -v || (stat "${CURRENT_BIN_FILE_LEGACY}" > /dev/null && echo LEGACY_WITHOUT_VERSION) || echo CURRENT_VERSION_NOT_FOUND)" CURRENT_VERSION="$(${CURRENT_BIN_FILE} -v || ${CURRENT_BIN_FILE_LEGACY} -v || (stat "${CURRENT_BIN_FILE_LEGACY}" >/dev/null && echo LEGACY_WITHOUT_VERSION) || echo CURRENT_VERSION_NOT_FOUND)"
readonly CURRENT_VERSION readonly CURRENT_VERSION
__info_done "CURRENT_VERSION: ${CURRENT_VERSION}" __info_done "CURRENT_VERSION: ${CURRENT_VERSION}"
@@ -112,18 +112,18 @@ fi
ARCH="unknown" ARCH="unknown"
case $(uname -m) in case $(uname -m) in
x86_64) x86_64)
ARCH="amd64" ARCH="amd64"
;; ;;
aarch64) aarch64)
ARCH="arm64" ARCH="arm64"
;; ;;
armv7l) armv7l)
ARCH="arm-7" ARCH="arm-7"
;; ;;
*) *)
__error "Unsupported architecture" __error "Unsupported architecture"
;; ;;
esac esac
__info "ARCH: ${ARCH}" __info "ARCH: ${ARCH}"
@@ -161,7 +161,7 @@ while read -r VERSION_PAIR; do
if [ "${CURRENT_VERSION_FOUND}" = "true" ]; then if [ "${CURRENT_VERSION_FOUND}" = "true" ]; then
MIGRATION_PATH+=("${URL// /}") MIGRATION_PATH+=("${URL// /}")
fi fi
done < "${MIGRATION_LIST_FILE}" done <"${MIGRATION_LIST_FILE}"
if [ ${#MIGRATION_PATH[@]} -eq 0 ]; then if [ ${#MIGRATION_PATH[@]} -eq 0 ]; then
__warning "No migration path found from ${CURRENT_VERSION} to ${SOURCE_VERSION}" __warning "No migration path found from ${CURRENT_VERSION} to ${SOURCE_VERSION}"
dist/casaos-user-service-amd64_linux_amd64_v1/build/sysroot/usr/bin/casaos-user-service
Vendored
BIN
View File
Binary file not shown.
dist/metadata.json
Vendored
+1 -1
View File
@@ -1 +1 @@
{"project_name":"casaos-user-service","tag":"v1.0.0","previous_tag":"","version":"1.0.1","commit":"c1242916f96bc8455ede5a75e224a4d4738d51b4","date":"2024-08-15T12:35:37.911933109+07:00","runtime":{"goos":"linux","goarch":"amd64"}} {"project_name":"casaos-user-service","tag":"v1.0.0","previous_tag":"","version":"1.0.1","commit":"bb2cbabc598c04de66f2652e8cd829c837ab0798","date":"2024-08-15T13:47:15.2430523+07:00","runtime":{"goos":"linux","goarch":"amd64"}}
route/v1/user.go
+6 -4
View File
@@ -45,12 +45,14 @@ import (
) )
var ( var (
authServer = "http://10.0.0.26:9000" //authServer = "http://10.0.0.26:9000"
authServer = "http://accessmanager.local"
clientID = "6KwKSxLCtaQ4r6HoAn3gdNMbNOAf75j3SejLIAx7" clientID = "6KwKSxLCtaQ4r6HoAn3gdNMbNOAf75j3SejLIAx7"
clientSecret = "PE05fcDP4qESUmyZ1TNYpZNBxRPq70VpFI81vehsoJ6WhGz5yPXMljrFrOdMRdRhrYmF03fHWTZHgO9ZdNENrLN13BzL8CAgtEkTsyjXfgx9GvISheIjYfpSfvo219fL" clientSecret = "PE05fcDP4qESUmyZ1TNYpZNBxRPq70VpFI81vehsoJ6WhGz5yPXMljrFrOdMRdRhrYmF03fHWTZHgO9ZdNENrLN13BzL8CAgtEkTsyjXfgx9GvISheIjYfpSfvo219fL"
authURL = "http://10.0.0.26:9000/application/o/nextzenos-oidc/" authURL = "http://accessmanager.local/application/o/nextzenos-oidc/"
// callbackURL = "http://nextzenos.local/v1/users/oidc/callback" //authURL = "http://10.0.0.26:9000/application/o/nextzenos-oidc/"
callbackURL = "http://172.26.157.79:8080/v1/users/oidc/callback" callbackURL = "http://nextzenos.local/v1/users/oidc/callback"
//callbackURL = "http://172.26.157.79:8080/v1/users/oidc/callback"
) )
// @Summary register user // @Summary register user