Merge upstream/master into develop
Sync upstream changes from perfect-panel/server Includes updates from v1.0.1 to v1.2.5: - Currency configuration support - Subscribe improvements (short token, inventory check, etc.) - Node management enhancements - Database migrations - Bug fixes and optimizations
This commit is contained in:
+3
-3
@@ -32,15 +32,15 @@ func (l *GormLogger) LogMode(logger.LogLevel) logger.Interface {
|
||||
}
|
||||
|
||||
func (l *GormLogger) Info(ctx context.Context, str string, args ...interface{}) {
|
||||
WithContext(ctx).WithCallerSkip(6).Infof("%s Info: %s", TAG, str, args)
|
||||
WithContext(ctx).WithCallerSkip(2).Infof("%s Info: %s", TAG, str, args)
|
||||
}
|
||||
|
||||
func (l *GormLogger) Warn(ctx context.Context, str string, args ...interface{}) {
|
||||
WithContext(ctx).WithCallerSkip(6).Infof("%s Warn: %s", TAG, str, args)
|
||||
WithContext(ctx).WithCallerSkip(2).Infof("%s Warn: %s", TAG, str, args)
|
||||
}
|
||||
|
||||
func (l *GormLogger) Error(ctx context.Context, str string, args ...interface{}) {
|
||||
WithContext(ctx).WithCallerSkip(6).Errorf("%s Error: %s", TAG, str, args)
|
||||
WithContext(ctx).WithCallerSkip(2).Errorf("%s Error: %s", TAG, str, args)
|
||||
}
|
||||
|
||||
func (l *GormLogger) Trace(ctx context.Context, begin time.Time, fc func() (sql string, rowsAffected int64), err error) {
|
||||
|
||||
@@ -71,6 +71,7 @@ const (
|
||||
SubscribeIsUsedError uint32 = 60004
|
||||
SingleSubscribeModeExceedsLimit uint32 = 60005
|
||||
SubscribeQuotaLimit uint32 = 60006
|
||||
SubscribeOutOfStock uint32 = 60007
|
||||
)
|
||||
|
||||
// Auth error
|
||||
|
||||
@@ -56,6 +56,7 @@ func init() {
|
||||
SubscribeIsUsedError: "Subscribe is used",
|
||||
SingleSubscribeModeExceedsLimit: "Single subscribe mode exceeds limit",
|
||||
SubscribeQuotaLimit: "Subscribe quota limit",
|
||||
SubscribeOutOfStock: "Subscribe out of stock",
|
||||
|
||||
// auth error
|
||||
VerifyCodeError: "Verify code error",
|
||||
|
||||
Reference in New Issue
Block a user