| 
					
				 | 
			
			
				@@ -17,10 +17,12 @@ import ( 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 var ( 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 	config Config 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 	db     *sqlx.DB 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-	err    error 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-	once   sync.Once 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+	//err    error 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+	once sync.Once 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				  
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 	defaultDB *DB 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+	errNoneConnect = errors.New(`数据库连接错误`) 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 ) 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				  
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 // DB define 
			 | 
		
	
	
		
			
				| 
					
				 | 
			
			
				@@ -86,6 +88,10 @@ func connect() (dbx *sqlx.DB, err error) { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 			err = db.Ping() 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 		} 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 	}) 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+	if db == nil { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+		err = errNoneConnect 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+		return 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+	} 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 	dbx = db 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 	return 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 } 
			 | 
		
	
	
		
			
				| 
					
				 | 
			
			
				@@ -103,7 +109,6 @@ func (d *DB) Connect() (err error) { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 	} 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				  
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 	d.conn, err = connect() 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				- 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 	return 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 } 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				  
			 | 
		
	
	
		
			
				| 
					
				 | 
			
			
				@@ -134,12 +139,12 @@ func (d *DB) BeginTrans() (err error) { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 } 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				  
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 // Commit commit 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-func (d *DB) Commit() error { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+func (d *DB) Commit() (err error) { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 	return d.tx.Commit() 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 } 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				  
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 // Rollback rollback 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-func (d *DB) Rollback() error { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+func (d *DB) Rollback() (err error) { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 	return d.tx.Rollback() 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 } 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				  
			 | 
		
	
	
		
			
				| 
					
				 | 
			
			
				@@ -169,7 +174,7 @@ func (d *DB) TransUpdate(query string, args interface{}) (reply Reply) { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 } 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				  
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 // TransRow trans get row 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-func (d *DB) TransRow(dest interface{}, query string, args interface{}) error { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+func (d *DB) TransRow(dest interface{}, query string, args interface{}) (err error) { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 	nstmt, err := d.tx.PrepareNamed(query) 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 	if err != nil { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 		return err 
			 |