windows qr fix

diff --git a/F/api.go b/F/api.go
index af6b75c5413c38ae919fa22d89828dcda2c51e7f..47121b8c0de0882d3892d8625cacda0091a40721 100644 (file)
--- a/F/api.go
+++ b/F/api.go
@@ -1187,7 +1187,9 @@ func Get_cookie() (missKey []string) {
        //有新实例，退出
        if boot_Get_cookie.NeedExit(id) {return}
 
-       var server = new(http.Server)
+       var server = &http.Server{
+               Addr: p.Sys().GetIntranetIp()+":"+strconv.Itoa(p.Sys().GetFreePort()),
+       }
        {//生成二维码
                qr.WriteFile(img_url,qr.Medium,256,`qr.png`)
                if !p.Checkfile().IsExist(`qr.png`) {
@@ -1209,14 +1211,15 @@ func Get_cookie() (missKey []string) {
                defer server.Shutdown(context.Background())
 
                if c.K_v.LoadV(`扫码登录自动打开标签页`).(bool) {open.Run(`http://`+server.Addr+`/qr.png`)}
-               apilog.L(`W: `,`打开链接扫码登录：`,`http://`+server.Addr+`/qr.png`).Block(1000)
+               apilog.Block(1000)
                //show qr code in cmd
                qrterminal.GenerateWithConfig(img_url, qrterminal.Config{
                        Level: qrterminal.L,
                        Writer: os.Stdout,
-                       BlackChar: qrterminal.BLACK,
-                       WhiteChar: qrterminal.WHITE,
+                       BlackChar: `  `,
+                       WhiteChar: `OO`,
                })
+               apilog.L(`W: `,`打开链接扫码(命令行黑底)登录：`,`http://`+server.Addr+`/qr.png`)
                p.Sys().Timeoutf(1)
        }
        

diff --git a/Reply/F.go b/Reply/F.go
index ec43ab54d3daca097790cd0bfaa951cb4d7d7085..8e4e3ad45c50ff10bbf545b18dcf53996c752efc 100644 (file)
--- a/Reply/F.go
+++ b/Reply/F.go
@@ -684,7 +684,7 @@ func Savestreamf(){
                                        req_exit = s.Init()
                                )
 
-                               l.L(`T: `,`新建请求`,req.Id())
+                               l.L(`I: `,`新建请求`,req.Id())
 
                                //新建请求
                                go func(r *reqf.Req,rval reqf.Rval){
@@ -722,7 +722,7 @@ func Savestreamf(){
                                                close:req.Close,
                                                id:id_pool.Get(),
                                        }
-                               l.L(`T: `,`新建连接`,item.id.Id)
+                               l.L(`I: `,`新建连接`,item.id.Id)
 
                                //解析
                                go func(bc chan[]byte,item *link_stream,exit_chan *s.Signal){