1Panel-dev/1Panel
1
1
Fork 0
mirror of https://github.com/1Panel-dev/1Panel.git synced 2025-09-13 01:56:22 +08:00
Code Issues Projects Releases Packages Wiki Activity Actions

feat: 格式化代码

Browse source
This commit is contained in:
zhengkunwang223 2022-11-18 18:02:14 +08:00 • committed by zhengkunwang223
parent 24f61b0a4e
commit 972d0995e1
6 changed files with 17 additions and 30 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
backend/app/service/app.go
View file

@ -305,10 +305,10 @@ func (a AppService) SyncInstalled(installId uint) error {
} }
func (a AppService) SyncAppList() error { func (a AppService) SyncAppList() error {
//if err := getAppFromOss(); err != nil { if err := getAppFromOss(); err != nil {
// global.LOG.Errorf("get app from oss error: %s", err.Error()) global.LOG.Errorf("get app from oss error: %s", err.Error())
// return err return err
//} }
appDir := constant.AppResourceDir appDir := constant.AppResourceDir
listFile := path.Join(appDir, "list.json") listFile := path.Join(appDir, "list.json")

9
backend/app/service/app_utils.go
View file

@ -138,15 +138,6 @@ func createLink(ctx context.Context, app model.App, appInstall *model.AppInstall
if err := mysqlRepo.Create(ctx, &database); err != nil { if err := mysqlRepo.Create(ctx, &database); err != nil {
return err return err
} }
//var database model.AppDatabase
//database.Dbname = dbConfig.DbName
//database.Username = dbConfig.DbUser
//database.Password = dbConfig.Password
//database.AppInstallId = dbInstall.ID
//database.Key = dbInstall.App.Key
//if err := dataBaseRepo.Create(ctx, &database); err != nil {
// return err
//}
var installResource model.AppInstallResource var installResource model.AppInstallResource
installResource.ResourceId = database.ID installResource.ResourceId = database.ID
installResource.AppInstallId = appInstall.ID installResource.AppInstallId = appInstall.ID

20
backend/app/service/website_utils.go
View file

@ -352,14 +352,14 @@ func createPemFile(websiteSSL model.WebSiteSSL) error {
func getParamArray(key string, param interface{}) []string { func getParamArray(key string, param interface{}) []string {
var res []string var res []string
switch param.(type) { switch p := param.(type) {
case string: case string:
if key == "index" { if key == "index" {
res = strings.Split(param.(string), "\n") res = strings.Split(p, "\n")
return res return res
} }
res = strings.Split(param.(string), " ") res = strings.Split(p, " ")
return res return res
} }
return res return res
@ -388,19 +388,15 @@ func handleParamMap(paramMap map[string]string, keys []string) []dto.NginxParam
func getNginxParams(params interface{}, keys []string) []dto.NginxParam { func getNginxParams(params interface{}, keys []string) []dto.NginxParam {
var nginxParams []dto.NginxParam var nginxParams []dto.NginxParam
switch params.(type) { switch p := params.(type) {
case map[string]interface{}: case map[string]interface{}:
return handleParamMap(toMapStr(params.(map[string]interface{})), keys) return handleParamMap(toMapStr(p), keys)
case []interface{}: case []interface{}:
for _, mA := range p {
if mArray, ok := params.([]interface{}); ok { if m, ok := mA.(map[string]interface{}); ok {
for _, mA := range mArray { nginxParams = append(nginxParams, handleParamMap(toMapStr(m), keys)...)
if m, ok := mA.(map[string]interface{}); ok {
nginxParams = append(nginxParams, handleParamMap(toMapStr(m), keys)...)
}
} }
} }
} }
return nginxParams return nginxParams
} }

4
backend/utils/cmd/cmd.go
View file

@ -12,7 +12,7 @@ func Exec(cmdStr string) (string, error) {
cmd.Stderr = &stderr cmd.Stderr = &stderr
err := cmd.Run() err := cmd.Run()
if err != nil { if err != nil {
return string(stderr.Bytes()), err return stderr.String(), err
} }
return string(stdout.Bytes()), nil return stdout.String(), nil
} }

4
backend/utils/files/file_op.go
View file

@ -422,9 +422,9 @@ func (f FileOp) Backup(srcFile string) (string, error) {
info, _ := f.Fs.Stat(backupPath) info, _ := f.Fs.Stat(backupPath)
if info != nil { if info != nil {
if info.IsDir() { if info.IsDir() {
f.DeleteDir(backupPath) _ = f.DeleteDir(backupPath)
} else { } else {
f.DeleteFile(backupPath) _ = f.DeleteFile(backupPath)
} }
} }
if err := f.Rename(srcFile, backupPath); err != nil { if err := f.Rename(srcFile, backupPath); err != nil {

2
backend/utils/websocket/client.go
View file

@ -70,7 +70,7 @@ func ProcessData(c *Client, msg *WsMsg) {
} }
process := &files.Process{} process := &files.Process{}
json.Unmarshal(value, process) _ = json.Unmarshal(value, process)
res = append(res, *process) res = append(res, *process)
} }
reByte, _ := json.Marshal(res) reByte, _ := json.Marshal(res)