refactor: 更新项目引用路径从perfect-panel/ppanel-server到perfect-panel/server
Build docker and publish / build (20.15.1) (push) Failing after 6m27s
Build docker and publish / build (20.15.1) (push) Failing after 6m27s
feat: 添加版本和构建时间变量 fix: 修正短信队列类型注释错误 style: 清理未使用的代码和测试文件 docs: 更新安装文档中的下载链接 chore: 迁移数据库脚本添加日志和订阅配置
This commit is contained in:
@@ -2,10 +2,14 @@ package tool
|
||||
|
||||
import (
|
||||
"context"
|
||||
"encoding/json"
|
||||
|
||||
"github.com/perfect-panel/ppanel-server/internal/svc"
|
||||
"github.com/perfect-panel/ppanel-server/internal/types"
|
||||
"github.com/perfect-panel/ppanel-server/pkg/logger"
|
||||
"github.com/perfect-panel/server/pkg/xerr"
|
||||
"github.com/pkg/errors"
|
||||
|
||||
"github.com/perfect-panel/server/internal/svc"
|
||||
"github.com/perfect-panel/server/internal/types"
|
||||
"github.com/perfect-panel/server/pkg/logger"
|
||||
)
|
||||
|
||||
type GetSystemLogLogic struct {
|
||||
@@ -14,7 +18,7 @@ type GetSystemLogLogic struct {
|
||||
svcCtx *svc.ServiceContext
|
||||
}
|
||||
|
||||
// Get System Log
|
||||
// NewGetSystemLogLogic Get System Log
|
||||
func NewGetSystemLogLogic(ctx context.Context, svcCtx *svc.ServiceContext) *GetSystemLogLogic {
|
||||
return &GetSystemLogLogic{
|
||||
Logger: logger.WithContext(ctx),
|
||||
@@ -24,17 +28,22 @@ func NewGetSystemLogLogic(ctx context.Context, svcCtx *svc.ServiceContext) *GetS
|
||||
}
|
||||
|
||||
func (l *GetSystemLogLogic) GetSystemLog() (resp *types.LogResponse, err error) {
|
||||
//if l.svcCtx.Config.Debug {
|
||||
// return nil, errors.Wrapf(xerr.NewErrCode(xerr.DebugModeError), "debug mode is enabled")
|
||||
//}
|
||||
//lines, err := logger.ReadLastNLines(l.svcCtx.Config.Logger.FilePath, 100)
|
||||
//if err != nil {
|
||||
// l.Errorw("[GetSystemLog]", logger.Field("error", "ReadLastNLines"), logger.Field(err))
|
||||
// return nil, err
|
||||
//}
|
||||
//logs := logger.ParseLog(lines)
|
||||
//return &types.LogResponse{
|
||||
// List: logs,
|
||||
//}, nil
|
||||
return nil, nil
|
||||
lines, err := logger.ReadLastNLines(l.svcCtx.Config.Logger.Path, 50)
|
||||
if err != nil {
|
||||
l.Error(err)
|
||||
return nil, errors.Wrapf(xerr.NewErrCode(xerr.ERROR), "get system log error: %v", err.Error())
|
||||
}
|
||||
var list []map[string]interface{}
|
||||
for _, line := range lines {
|
||||
var log map[string]interface{}
|
||||
if err = json.Unmarshal([]byte(line), &log); err != nil {
|
||||
l.Error(err)
|
||||
continue
|
||||
}
|
||||
list = append(list, log)
|
||||
}
|
||||
|
||||
return &types.LogResponse{
|
||||
List: list,
|
||||
}, nil
|
||||
}
|
||||
|
||||
@@ -0,0 +1,51 @@
|
||||
package tool
|
||||
|
||||
import (
|
||||
"context"
|
||||
"fmt"
|
||||
|
||||
"github.com/perfect-panel/server/internal/svc"
|
||||
"github.com/perfect-panel/server/internal/types"
|
||||
"github.com/perfect-panel/server/pkg/constant"
|
||||
"github.com/perfect-panel/server/pkg/logger"
|
||||
)
|
||||
|
||||
type GetVersionLogic struct {
|
||||
logger.Logger
|
||||
ctx context.Context
|
||||
svcCtx *svc.ServiceContext
|
||||
}
|
||||
|
||||
// NewGetVersionLogic Get Version
|
||||
func NewGetVersionLogic(ctx context.Context, svcCtx *svc.ServiceContext) *GetVersionLogic {
|
||||
return &GetVersionLogic{
|
||||
Logger: logger.WithContext(ctx),
|
||||
ctx: ctx,
|
||||
svcCtx: svcCtx,
|
||||
}
|
||||
}
|
||||
|
||||
func (l *GetVersionLogic) GetVersion() (resp *types.VersionResponse, err error) {
|
||||
version := constant.Version
|
||||
buildTime := constant.BuildTime
|
||||
|
||||
// Normalize unknown values
|
||||
if version == "unknown version" {
|
||||
version = "unknown"
|
||||
}
|
||||
if buildTime == "unknown time" {
|
||||
buildTime = "unknown"
|
||||
}
|
||||
|
||||
// Format version based on whether it starts with 'v'
|
||||
var formattedVersion string
|
||||
if len(version) > 0 && version[0] == 'v' {
|
||||
formattedVersion = fmt.Sprintf("%s(%s)", version[1:], buildTime)
|
||||
} else {
|
||||
formattedVersion = fmt.Sprintf("%s(%s) Develop", version, buildTime)
|
||||
}
|
||||
|
||||
return &types.VersionResponse{
|
||||
Version: formattedVersion,
|
||||
}, nil
|
||||
}
|
||||
@@ -3,8 +3,8 @@ package tool
|
||||
import (
|
||||
"context"
|
||||
|
||||
"github.com/perfect-panel/ppanel-server/internal/svc"
|
||||
"github.com/perfect-panel/ppanel-server/pkg/logger"
|
||||
"github.com/perfect-panel/server/internal/svc"
|
||||
"github.com/perfect-panel/server/pkg/logger"
|
||||
)
|
||||
|
||||
type RestartSystemLogic struct {
|
||||
|
||||
Reference in New Issue
Block a user