Skip to content

fix: update app config key format to use colon separator #300

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Jul 28, 2025
Merged

fix: update app config key format to use colon separator #300

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ba95b81
fix: update app config key format to use colon separator
lwnmengjing Jun 19, 2025
6582f0e
Fix: update AWS SDK and other dependencies
lwnmengjing Jul 28, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions apis/github.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,10 +63,10 @@ func (e *Github) GetLoginURL(c *gin.Context) {
api.Err(http.StatusUnprocessableEntity)
return
}
clientID, _ := center.GetAppConfig().GetAppConfig(c, "security.githubClientId")
clientSecret, _ := center.GetAppConfig().GetAppConfig(c, "security.githubClientSecret")
redirectURL, _ := center.GetAppConfig().GetAppConfig(c, "security.githubRedirectURL")
scopes, _ := center.GetAppConfig().GetAppConfig(c, "security.githubScope")
clientID, _ := center.GetAppConfig().GetAppConfig(c, "security:githubClientId")
clientSecret, _ := center.GetAppConfig().GetAppConfig(c, "security:githubClientSecret")
redirectURL, _ := center.GetAppConfig().GetAppConfig(c, "security:githubRedirectURL")
scopes, _ := center.GetAppConfig().GetAppConfig(c, "security:githubScope")
conf := &oauth2.Config{
ClientID: clientID,
ClientSecret: clientSecret,
Expand Down
22 changes: 11 additions & 11 deletions apis/user.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -385,31 +385,31 @@ func (e *User) FakeCaptcha(ctx *gin.Context) {
return
}
// setup 03 send email
smtpHost, ok := center.GetAppConfig().GetAppConfig(ctx, "email.smtpHost")
smtpHost, ok := center.GetAppConfig().GetAppConfig(ctx, "email:smtpHost")
if !ok {
api.AddError(errNotSupportEmail).
Err(http.StatusNotImplemented)
return
}
smtpPort, ok := center.GetAppConfig().GetAppConfig(ctx, "email.smtpPort")
smtpPort, ok := center.GetAppConfig().GetAppConfig(ctx, "email:smtpPort")
if !ok {
api.AddError(errNotSupportEmail).
Err(http.StatusNotImplemented)
return
}
username, ok := center.GetAppConfig().GetAppConfig(ctx, "email.username")
username, ok := center.GetAppConfig().GetAppConfig(ctx, "email:username")
if !ok {
api.AddError(errNotSupportEmail).
Err(http.StatusNotImplemented)
return
}
password, ok := center.GetAppConfig().GetAppConfig(ctx, "email.password")
password, ok := center.GetAppConfig().GetAppConfig(ctx, "email:password")
if !ok {
api.AddError(errNotSupportEmail).
Err(http.StatusNotImplemented)
return
}
organization, ok := center.GetAppConfig().GetAppConfig(ctx, "base.websiteName")
organization, ok := center.GetAppConfig().GetAppConfig(ctx, "base:websiteName")
if !ok || organization == "" {
organization = "mss-boot-io"
}
Expand Down Expand Up @@ -619,10 +619,10 @@ func (e *User) Callback(c *gin.Context) {

switch req.Provider {
case pkg.GithubLoginProvider:
clientID, _ := center.GetAppConfig().GetAppConfig(c, "security.githubClientId")
clientSecret, _ := center.GetAppConfig().GetAppConfig(c, "security.githubClientSecret")
redirectURL, _ := center.GetAppConfig().GetAppConfig(c, "security.githubRedirectUrl")
scopes, _ := center.GetAppConfig().GetAppConfig(c, "security.githubScope")
clientID, _ := center.GetAppConfig().GetAppConfig(c, "security:githubClientId")
clientSecret, _ := center.GetAppConfig().GetAppConfig(c, "security:githubClientSecret")
redirectURL, _ := center.GetAppConfig().GetAppConfig(c, "security:githubRedirectUrl")
scopes, _ := center.GetAppConfig().GetAppConfig(c, "security:githubScope")
conf := &oauth2.Config{
ClientID: clientID,
ClientSecret: clientSecret,
Expand Down Expand Up @@ -651,8 +651,8 @@ func (e *User) Callback(c *gin.Context) {
api.OK(result)
return
case pkg.LarkLoginProvider:
appID, _ := center.GetAppConfig().GetAppConfig(c, "security.larkAppId")
appSecret, _ := center.GetAppConfig().GetAppConfig(c, "security.larkAppSecret")
appID, _ := center.GetAppConfig().GetAppConfig(c, "security:larkAppId")
appSecret, _ := center.GetAppConfig().GetAppConfig(c, "security:larkAppSecret")
client := lark.NewClient(appID, appSecret)
r := larkauthen.NewCreateAccessTokenReqBuilder().
Body(larkauthen.NewCreateAccessTokenReqBodyBuilder().
Expand Down
94 changes: 47 additions & 47 deletions go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,10 @@ go 1.24.0

require (
github.com/appleboy/gin-jwt/v2 v2.10.3
github.com/aws/aws-sdk-go-v2 v1.36.3
github.com/aws/aws-sdk-go-v2/config v1.29.14
github.com/aws/aws-sdk-go-v2 v1.36.5
github.com/aws/aws-sdk-go-v2/config v1.29.17
github.com/aws/aws-sdk-go-v2/service/eks v1.65.0
github.com/aws/aws-sdk-go-v2/service/s3 v1.80.0
github.com/aws/aws-sdk-go-v2/service/s3 v1.81.0
github.com/aws/aws-sdk-go-v2/service/secretsmanager v1.35.4
github.com/common-nighthawk/go-figure v0.0.0-20210622060536-734e95fb86be
github.com/gin-contrib/cors v1.7.5
Expand All @@ -18,9 +18,9 @@ require (
github.com/gorilla/websocket v1.5.4-0.20250319132907-e064f32e3674
github.com/grafana/pyroscope-go v1.2.2
github.com/larksuite/oapi-sdk-go/v3 v3.4.18
github.com/mss-boot-io/mss-boot v0.5.1-0.20250528115525-6efc217f4f2b
github.com/mss-boot-io/mss-boot v0.5.1-0.20250623100005-98c71ab36ef5
github.com/nsqio/go-nsq v1.1.0
github.com/redis/go-redis/v9 v9.9.0
github.com/redis/go-redis/v9 v9.10.0
github.com/robfig/cron/v3 v3.0.1
github.com/shirou/gopsutil/v3 v3.24.5
github.com/spf13/cast v1.9.2
Expand All @@ -29,13 +29,13 @@ require (
github.com/swaggo/gin-swagger v1.6.0
github.com/swaggo/swag v1.16.4
github.com/zealic/xignore v0.3.3
golang.org/x/net v0.40.0
golang.org/x/net v0.41.0
golang.org/x/oauth2 v0.30.0
google.golang.org/grpc v1.72.2
google.golang.org/grpc v1.73.0
gorm.io/gorm v1.30.0
k8s.io/api v0.33.1
k8s.io/apimachinery v0.33.1
k8s.io/client-go v0.33.1
k8s.io/api v0.33.2
k8s.io/apimachinery v0.33.2
k8s.io/client-go v0.33.2
)

require (
Expand All @@ -55,28 +55,28 @@ require (
github.com/andygrunwald/go-jira v1.16.0 // indirect
github.com/armon/go-metrics v0.4.1 // indirect
github.com/aws/aws-msk-iam-sasl-signer-go v1.0.4 // indirect
github.com/aws/aws-sdk-go-v2/aws/protocol/eventstream v1.6.10 // indirect
github.com/aws/aws-sdk-go-v2/credentials v1.17.67 // indirect
github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.16.30 // indirect
github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.34 // indirect
github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.34 // indirect
github.com/aws/aws-sdk-go-v2/aws/protocol/eventstream v1.6.11 // indirect
github.com/aws/aws-sdk-go-v2/credentials v1.17.70 // indirect
github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.16.32 // indirect
github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.36 // indirect
github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.36 // indirect
github.com/aws/aws-sdk-go-v2/internal/ini v1.8.3 // indirect
github.com/aws/aws-sdk-go-v2/internal/v4a v1.3.34 // indirect
github.com/aws/aws-sdk-go-v2/service/appconfigdata v1.19.3 // indirect
github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding v1.12.3 // indirect
github.com/aws/aws-sdk-go-v2/service/internal/checksum v1.7.2 // indirect
github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.12.15 // indirect
github.com/aws/aws-sdk-go-v2/service/internal/s3shared v1.18.15 // indirect
github.com/aws/aws-sdk-go-v2/service/sso v1.25.3 // indirect
github.com/aws/aws-sdk-go-v2/service/ssooidc v1.30.1 // indirect
github.com/aws/aws-sdk-go-v2/service/sts v1.33.19 // indirect
github.com/aws/smithy-go v1.22.3 // indirect
github.com/aws/aws-sdk-go-v2/internal/v4a v1.3.36 // indirect
github.com/aws/aws-sdk-go-v2/service/appconfigdata v1.19.6 // indirect
github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding v1.12.4 // indirect
github.com/aws/aws-sdk-go-v2/service/internal/checksum v1.7.4 // indirect
github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.12.17 // indirect
github.com/aws/aws-sdk-go-v2/service/internal/s3shared v1.18.17 // indirect
github.com/aws/aws-sdk-go-v2/service/sso v1.25.5 // indirect
github.com/aws/aws-sdk-go-v2/service/ssooidc v1.30.3 // indirect
github.com/aws/aws-sdk-go-v2/service/sts v1.34.0 // indirect
github.com/aws/smithy-go v1.22.4 // indirect
github.com/beorn7/perks v1.0.1 // indirect
github.com/bmatcuk/doublestar/v4 v4.8.1 // indirect
github.com/bsm/redislock v0.9.4 // indirect
github.com/bytedance/sonic v1.13.2 // indirect
github.com/bytedance/sonic v1.13.3 // indirect
github.com/bytedance/sonic/loader v0.2.4 // indirect
github.com/casbin/casbin/v2 v2.105.0 // indirect
github.com/casbin/casbin/v2 v2.108.0 // indirect
github.com/casbin/gorm-adapter/v3 v3.32.0 // indirect
github.com/casbin/govaluate v1.7.0 // indirect
github.com/cespare/xxhash/v2 v2.3.0 // indirect
Expand Down Expand Up @@ -117,7 +117,7 @@ require (
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.26.0 // indirect
github.com/go-sql-driver/mysql v1.9.2 // indirect
github.com/go-sql-driver/mysql v1.9.3 // indirect
github.com/goccy/go-json v0.10.5 // indirect
github.com/gogo/protobuf v1.3.2 // indirect
github.com/golang-jwt/jwt/v4 v4.5.2 // indirect
Expand All @@ -129,7 +129,7 @@ require (
github.com/google/go-cmp v0.7.0 // indirect
github.com/google/go-querystring v1.1.0 // indirect
github.com/grafana/pyroscope-go/godeltaprof v0.1.8 // indirect
github.com/grpc-ecosystem/go-grpc-middleware/providers/prometheus v1.0.1 // indirect
github.com/grpc-ecosystem/go-grpc-middleware/providers/prometheus v1.1.0 // indirect
github.com/grpc-ecosystem/go-grpc-middleware/v2 v2.3.2 // indirect
github.com/hashicorp/consul/api v1.32.1 // indirect
github.com/hashicorp/errwrap v1.1.0 // indirect
Expand Down Expand Up @@ -192,7 +192,7 @@ require (
github.com/power-devops/perfstat v0.0.0-20240221224432-82ca36839d55 // indirect
github.com/prometheus/client_golang v1.22.0 // indirect
github.com/prometheus/client_model v0.6.2 // indirect
github.com/prometheus/common v0.64.0 // indirect
github.com/prometheus/common v0.65.0 // indirect
github.com/prometheus/procfs v0.16.1 // indirect
github.com/rcrowley/go-metrics v0.0.0-20250401214520-65e299d6c5c9 // indirect
github.com/remyoudompheng/bigfft v0.0.0-20230129092748-24d4a6f8daec // indirect
Expand All @@ -210,8 +210,8 @@ require (
github.com/trivago/tgo v1.0.7 // indirect
github.com/tsuyoshiwada/go-gitcmd v0.0.0-20180205145712-5f1f5f9475df // indirect
github.com/twitchyliquid64/golang-asm v0.15.1 // indirect
github.com/ugorji/go/codec v1.2.14 // indirect
github.com/urfave/cli/v2 v2.27.6 // indirect
github.com/ugorji/go/codec v1.3.0 // indirect
github.com/urfave/cli/v2 v2.27.7 // indirect
github.com/x448/float16 v0.8.4 // indirect
github.com/xanzy/ssh-agent v0.3.3 // indirect
github.com/xdg-go/pbkdf2 v1.0.0 // indirect
Expand All @@ -220,40 +220,40 @@ require (
github.com/xrash/smetrics v0.0.0-20240521201337-686a1a2994c1 // indirect
github.com/youmark/pkcs8 v0.0.0-20240726163527-a2c0da244d78 // indirect
github.com/yusufpapurcu/wmi v1.2.4 // indirect
go.mongodb.org/mongo-driver v1.17.3 // indirect
go.mongodb.org/mongo-driver v1.17.4 // indirect
go.opentelemetry.io/auto/sdk v1.1.0 // indirect
go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.61.0 // indirect
go.opentelemetry.io/otel v1.36.0 // indirect
go.opentelemetry.io/otel/metric v1.36.0 // indirect
go.opentelemetry.io/otel/trace v1.36.0 // indirect
golang.org/x/arch v0.17.0 // indirect
golang.org/x/crypto v0.38.0 // indirect
golang.org/x/exp v0.0.0-20250531010427-b6e5de432a8b // indirect
golang.org/x/mod v0.24.0 // indirect
golang.org/x/sync v0.14.0 // indirect
golang.org/x/arch v0.18.0 // indirect
golang.org/x/crypto v0.39.0 // indirect
golang.org/x/exp v0.0.0-20250620022241-b7579e27df2b // indirect
golang.org/x/mod v0.25.0 // indirect
golang.org/x/sync v0.15.0 // indirect
golang.org/x/sys v0.33.0 // indirect
golang.org/x/term v0.32.0 // indirect
golang.org/x/text v0.25.0 // indirect
golang.org/x/time v0.11.0 // indirect
golang.org/x/tools v0.33.0 // indirect
google.golang.org/genproto/googleapis/rpc v0.0.0-20250528174236-200df99c418a // indirect
golang.org/x/text v0.26.0 // indirect
golang.org/x/time v0.12.0 // indirect
golang.org/x/tools v0.34.0 // indirect
google.golang.org/genproto/googleapis/rpc v0.0.0-20250603155806-513f23925822 // indirect
google.golang.org/protobuf v1.36.6 // indirect
gopkg.in/evanphx/json-patch.v4 v4.12.0 // indirect
gopkg.in/inf.v0 v0.9.1 // indirect
gopkg.in/warnings.v0 v0.1.2 // indirect
gopkg.in/yaml.v2 v2.4.0 // indirect
gopkg.in/yaml.v3 v3.0.1 // indirect
gorm.io/driver/mysql v1.5.7 // indirect
gorm.io/driver/mysql v1.6.0 // indirect
gorm.io/driver/postgres v1.6.0 // indirect
gorm.io/driver/sqlserver v1.6.0 // indirect
gorm.io/plugin/dbresolver v1.6.0 // indirect
k8s.io/klog/v2 v2.130.1 // indirect
k8s.io/kube-openapi v0.0.0-20250318190949-c8a335a9a2ff // indirect
k8s.io/utils v0.0.0-20250502105355-0f33e8f1c979 // indirect
modernc.org/libc v1.65.8 // indirect
k8s.io/kube-openapi v0.0.0-20250610211856-8b98d1ed966a // indirect
k8s.io/utils v0.0.0-20250604170112-4c0f3b243397 // indirect
modernc.org/libc v1.66.0 // indirect
modernc.org/mathutil v1.7.1 // indirect
modernc.org/memory v1.11.0 // indirect
modernc.org/sqlite v1.37.1 // indirect
modernc.org/sqlite v1.38.0 // indirect
sigs.k8s.io/json v0.0.0-20241014173422-cfa47c3a1cc8 // indirect
sigs.k8s.io/randfill v1.0.0 // indirect
sigs.k8s.io/structured-merge-diff/v4 v4.7.0 // indirect
Expand Down
Loading