KJZH001/nezha-2024
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #156 from AkkiaS7/master [skip ci]

Browse Source 
fix some typo
This commit is contained in:
naiba 2022-04-10 20:37:59 +08:00 committed by GitHub
commit d7748dc756
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cmd/agent/main.go
View File

@ -561,7 +561,7 @@ func editAgentConfig() {
panic(err) panic(err)
} }
fmt.Println("修改自定义配置成功，重启 Agnet 后生效") fmt.Println("修改自定义配置成功，重启 Agent 后生效")
} }
func println(v ...interface{}) { func println(v ...interface{}) {

2
cmd/agent/monitor/monitor.go
View File

@ -41,7 +41,7 @@ func GetHost(agentConfig *model.AgentConfig) *model.Host {
hi, _ := host.Info() hi, _ := host.Info()
var cpuType string var cpuType string
if hi.VirtualizationSystem != "" { if hi.VirtualizationSystem != "" {
cpuType = "Vrtual" cpuType = "Virtual"
} else { } else {
cpuType = "Physical" cpuType = "Physical"
} }

6
cmd/dashboard/controller/oauth2.go
View File

@ -50,11 +50,11 @@ func (oa *oauth2controller) getCommonOauth2Config(c *gin.Context) *oauth2.Config
} }
func (oa *oauth2controller) getRedirectURL(c *gin.Context) string { func (oa *oauth2controller) getRedirectURL(c *gin.Context) string {
schame := "http://" scheme := "http://"
if strings.HasPrefix(c.Request.Referer(), "https://") { if strings.HasPrefix(c.Request.Referer(), "https://") {
schame = "https://" scheme = "https://"
} }
return schame + c.Request.Host + "/oauth2/callback" return scheme + c.Request.Host + "/oauth2/callback"
} }
func (oa *oauth2controller) login(c *gin.Context) { func (oa *oauth2controller) login(c *gin.Context) {

2
model/cron.go
View File

@ -24,7 +24,7 @@ type Cron struct {
LastResult bool // 最后一次执行结果 LastResult bool // 最后一次执行结果
Cover uint8 Cover uint8
CronJobID cron.EntryID `gorn:"-"` CronJobID cron.EntryID `gorm:"-"`
ServersRaw string ServersRaw string
} }