diff --git a/Plugins/Oracle.go b/Plugins/Oracle.go
index e956f26..8a4cf7f 100644
--- a/Plugins/Oracle.go
+++ b/Plugins/Oracle.go
@@ -10,49 +10,71 @@ import (
 	"time"
 )
 
+// OracleScan 执行Oracle服务扫描
 func OracleScan(info *Config.HostInfo) (tmperr error) {
 	if Common.IsBrute {
 		return
 	}
+
 	starttime := time.Now().Unix()
+
+	// 尝试用户名密码组合
 	for _, user := range Common.Userdict["oracle"] {
 		for _, pass := range Common.Passwords {
+			// 替换密码中的用户名占位符
 			pass = strings.Replace(pass, "{user}", user, -1)
+
 			flag, err := OracleConn(info, user, pass)
-			if flag == true && err == nil {
+			if flag && err == nil {
+				return err
+			}
+
+			// 记录错误信息
+			errlog := fmt.Sprintf("[-] Oracle %v:%v %v %v %v", info.Host, info.Ports, user, pass, err)
+			Common.LogError(errlog)
+			tmperr = err
+
+			if Common.CheckErrs(err) {
+				return err
+			}
+
+			// 超时检查
+			if time.Now().Unix()-starttime > (int64(len(Common.Userdict["oracle"])*len(Common.Passwords)) * Common.Timeout) {
 				return err
-			} else {
-				errlog := fmt.Sprintf("[-] oracle %v:%v %v %v %v", info.Host, info.Ports, user, pass, err)
-				Common.LogError(errlog)
-				tmperr = err
-				if Common.CheckErrs(err) {
-					return err
-				}
-				if time.Now().Unix()-starttime > (int64(len(Common.Userdict["oracle"])*len(Common.Passwords)) * Common.Timeout) {
-					return err
-				}
 			}
 		}
 	}
 	return tmperr
 }
 
-func OracleConn(info *Config.HostInfo, user string, pass string) (flag bool, err error) {
-	flag = false
-	Host, Port, Username, Password := info.Host, info.Ports, user, pass
-	dataSourceName := fmt.Sprintf("oracle://%s:%s@%s:%s/orcl", Username, Password, Host, Port)
-	db, err := sql.Open("oracle", dataSourceName)
-	if err == nil {
-		db.SetConnMaxLifetime(time.Duration(Common.Timeout) * time.Second)
-		db.SetConnMaxIdleTime(time.Duration(Common.Timeout) * time.Second)
-		db.SetMaxIdleConns(0)
-		defer db.Close()
-		err = db.Ping()
-		if err == nil {
-			result := fmt.Sprintf("[+] oracle %v:%v:%v %v", Host, Port, Username, Password)
-			Common.LogSuccess(result)
-			flag = true
-		}
+// OracleConn 尝试Oracle连接
+func OracleConn(info *Config.HostInfo, user string, pass string) (bool, error) {
+	host, port, username, password := info.Host, info.Ports, user, pass
+	timeout := time.Duration(Common.Timeout) * time.Second
+
+	// 构造连接字符串
+	connStr := fmt.Sprintf("oracle://%s:%s@%s:%s/orcl",
+		username, password, host, port)
+
+	// 建立数据库连接
+	db, err := sql.Open("oracle", connStr)
+	if err != nil {
+		return false, err
 	}
-	return flag, err
+	defer db.Close()
+
+	// 设置连接参数
+	db.SetConnMaxLifetime(timeout)
+	db.SetConnMaxIdleTime(timeout)
+	db.SetMaxIdleConns(0)
+
+	// 测试连接
+	if err = db.Ping(); err != nil {
+		return false, err
+	}
+
+	// 连接成功
+	result := fmt.Sprintf("[+] Oracle %v:%v:%v %v", host, port, username, password)
+	Common.LogSuccess(result)
+	return true, nil
 }