mirror of
				https://github.com/TeaOSLab/EdgeAdmin.git
				synced 2025-11-04 13:10:26 +08:00 
			
		
		
		
	检测本地数据库时,主机地址增加尝试localhost、172.20.0.2
This commit is contained in:
		@@ -26,40 +26,44 @@ func (this *DetectDBAction) RunPost(params struct{}) {
 | 
				
			|||||||
	var localPassword = ""
 | 
						var localPassword = ""
 | 
				
			||||||
 | 
					
 | 
				
			||||||
	// 本地的3306端口是否可以连接
 | 
						// 本地的3306端口是否可以连接
 | 
				
			||||||
	conn, err := net.DialTimeout("tcp", "127.0.0.1:3306", 3*time.Second)
 | 
						for _, tryingHost := range []string{"127.0.0.1", "localhost", "172.20.0.2"} {
 | 
				
			||||||
	if err == nil {
 | 
							conn, dialErr := net.DialTimeout("tcp", tryingHost+":3306", 3*time.Second)
 | 
				
			||||||
		_ = conn.Close()
 | 
							if dialErr == nil {
 | 
				
			||||||
		localHost = "127.0.0.1"
 | 
								_ = conn.Close()
 | 
				
			||||||
		localPort = "3306"
 | 
								localHost = tryingHost
 | 
				
			||||||
 | 
								localPort = "3306"
 | 
				
			||||||
 | 
					
 | 
				
			||||||
		var username = "root"
 | 
								var username = "root"
 | 
				
			||||||
		var passwords = []string{"", "123456", "654321", "Aa_123456", "111111"}
 | 
								var passwords = []string{"", "123456", "654321", "Aa_123456", "111111"}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
		// 使用 foolish-mysql 安装的MySQL
 | 
								// 使用 foolish-mysql 安装的MySQL
 | 
				
			||||||
		localGeneratedPasswordData, err := os.ReadFile("/usr/local/mysql/generated-password.txt")
 | 
								localGeneratedPasswordData, err := os.ReadFile("/usr/local/mysql/generated-password.txt")
 | 
				
			||||||
		if err == nil {
 | 
					 | 
				
			||||||
			var localGeneratedPassword = strings.TrimSpace(string(localGeneratedPasswordData))
 | 
					 | 
				
			||||||
			if len(localGeneratedPassword) > 0 {
 | 
					 | 
				
			||||||
				passwords = append(passwords, localGeneratedPassword)
 | 
					 | 
				
			||||||
			}
 | 
					 | 
				
			||||||
		}
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
		for _, pass := range passwords {
 | 
					 | 
				
			||||||
			db, err := dbs.NewInstanceFromConfig(&dbs.DBConfig{
 | 
					 | 
				
			||||||
				Driver: "mysql",
 | 
					 | 
				
			||||||
				Dsn:    username + ":" + pass + "@tcp(" + configutils.QuoteIP(localHost) + ":" + localPort + ")/edges",
 | 
					 | 
				
			||||||
				Prefix: "",
 | 
					 | 
				
			||||||
			})
 | 
					 | 
				
			||||||
			if err == nil {
 | 
								if err == nil {
 | 
				
			||||||
				err = db.Raw().Ping()
 | 
									var localGeneratedPassword = strings.TrimSpace(string(localGeneratedPasswordData))
 | 
				
			||||||
				_ = db.Close()
 | 
									if len(localGeneratedPassword) > 0 {
 | 
				
			||||||
 | 
										passwords = append(passwords, localGeneratedPassword)
 | 
				
			||||||
				if err == nil || strings.Contains(err.Error(), "Error 1049") {
 | 
					 | 
				
			||||||
					localUsername = username
 | 
					 | 
				
			||||||
					localPassword = pass
 | 
					 | 
				
			||||||
					break
 | 
					 | 
				
			||||||
				}
 | 
									}
 | 
				
			||||||
			}
 | 
								}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
								for _, pass := range passwords {
 | 
				
			||||||
 | 
									db, err := dbs.NewInstanceFromConfig(&dbs.DBConfig{
 | 
				
			||||||
 | 
										Driver: "mysql",
 | 
				
			||||||
 | 
										Dsn:    username + ":" + pass + "@tcp(" + configutils.QuoteIP(localHost) + ":" + localPort + ")/edges",
 | 
				
			||||||
 | 
										Prefix: "",
 | 
				
			||||||
 | 
									})
 | 
				
			||||||
 | 
									if err == nil {
 | 
				
			||||||
 | 
										err = db.Raw().Ping()
 | 
				
			||||||
 | 
										_ = db.Close()
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
										if err == nil || strings.Contains(err.Error(), "Error 1049") {
 | 
				
			||||||
 | 
											localUsername = username
 | 
				
			||||||
 | 
											localPassword = pass
 | 
				
			||||||
 | 
											break
 | 
				
			||||||
 | 
										}
 | 
				
			||||||
 | 
									}
 | 
				
			||||||
 | 
								}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
								break
 | 
				
			||||||
		}
 | 
							}
 | 
				
			||||||
	}
 | 
						}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 
 | 
				
			|||||||
		Reference in New Issue
	
	Block a user