From fb4c6920b092b6a4c87d0dee43d6567bec690c4b Mon Sep 17 00:00:00 2001 From: xiaomeng79 Date: Wed, 4 Jan 2023 10:50:54 +0800 Subject: [PATCH 1/6] git go --- .../6\346\263\250\346\204\217\347\202\271.md" | 22 ++++++++++++++++++- 1 file changed, 21 insertions(+), 1 deletion(-) diff --git "a/01\350\257\255\350\250\200/1go/6\346\263\250\346\204\217\347\202\271.md" "b/01\350\257\255\350\250\200/1go/6\346\263\250\346\204\217\347\202\271.md" index 2ea6c6d..04e4702 100644 --- "a/01\350\257\255\350\250\200/1go/6\346\263\250\346\204\217\347\202\271.md" +++ "b/01\350\257\255\350\250\200/1go/6\346\263\250\346\204\217\347\202\271.md" @@ -503,4 +503,24 @@ sn3:= struct { - 读已经关闭的chan能一直读到东西，但是读到的内容根据通道内关闭前是否有元素而不同。 - 如果chan关闭前，buffer内有元素还未读,会正确读到chan内的值，且返回的第二个bool值（是否读成功）为true。 - 如果chan关闭前，buffer内有元素已经被读完，chan内无值，接下来所有接收的值都会非阻塞直接成功，返回 channel 元素的零值，但是第二个bool值一直为false。 -- 写已经关闭的chan会panic \ No newline at end of file +- 写已经关闭的chan会panic + +### 私有仓库 + +```shell +# 设置私有仓库的git地址 +go env -w GOPRIVATE="git@git.xxx.cn" + +# 允许设置不安全访问，配置后可请求到 http 地址的仓库 +go env -w GOINSECURE="git.xxx.cn" + +# 设置请求该地址不需要代理，即GOPROXY +go env -w GONOPROXY="git.xxx.cn" + +# 设置不验证sum包的签名 +go env -w GONOSUMDB="git.xxx.cn" + +# 项目名称必须是仓库地址 +#拉取仓库go get git.xxx.cn/name/xxx@v1.0.2 + +``` \ No newline at end of file From 2523248d0e8777dd127687ba4595096e37029628 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AD=9F=E5=BA=86=E8=8A=B3?= Date: Fri, 6 Jan 2023 17:25:31 +0800 Subject: [PATCH 2/6] nginx --- .../nginx.conf" | 88 +++++++++++++++++++ 1 file changed, 88 insertions(+) create mode 100644 "17\345\237\272\347\241\200\350\256\276\346\226\275/nginx.conf" diff --git "a/17\345\237\272\347\241\200\350\256\276\346\226\275/nginx.conf" "b/17\345\237\272\347\241\200\350\256\276\346\226\275/nginx.conf" new file mode 100644 index 0000000..053eb7a --- /dev/null +++ "b/17\345\237\272\347\241\200\350\256\276\346\226\275/nginx.conf" @@ -0,0 +1,88 @@ +# Nginx多环境配置 + +```conf + +upstream 2879137 { + server 172.18.0.4:31233; +} + +upstream 3383230 { + server 172.18.0.4:22399; +} + +upstream main-latest { + server 172.18.0.4:27146; +} + + +server { + listen 80; + server_name ~^(?.+)\.test\.xxx\.cn$; + + location / { + set $path /root/web/$subdomain; + if (!-d /root/web/$subdomain) { + # 如果前端项目未部署代码，使用默认目录下的前端资源。 + set $path /root/web/backend-endpoint; + } + root $path; + index index.html; + if ($uri != "/") { + rewrite ^/(.*)/ /$1/index.html break; + } + } + + location /api { + proxy_redirect off; + proxy_http_version 1.1; + proxy_set_header Upgrade $http_upgrade; + proxy_set_header Connection "upgrade"; + proxy_set_header Host $host; + proxy_set_header X-Real-IP $remote_addr; + proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; + + proxy_pass http://$subdomain; + proxy_connect_timeout 1200s; + proxy_send_timeout 1200s; + proxy_read_timeout 1200s; + proxy_request_buffering off; + proxy_buffering off; + client_max_body_size 20m; + + proxy_next_upstream error timeout http_500 http_502; + + error_page 502 = @502; + } + + location @502 { + # 如果后端未部署对应的代码，则重定向到默认的 main-latest 服务。 + add_header 'Access-Control-Allow-Origin' * always; + add_header 'Access-Control-Allow-Credentials' true always; + add_header 'Access-Control-Allow-Methods' * always; + add_header 'Access-Control-Allow-Headers' 'Content-Type,*' always; + add_header 'Access-Control-Request-Headers' 'DNT,X-Mx-ReqToken,Keep-Alive,User-Agent,X-Requested-With,If-Modified-Since,Cache-Control,Content-Type,Authorization'; + + if ($request_method = 'OPTIONS') { + return 204; + } + + proxy_redirect off; + proxy_http_version 1.1; + proxy_set_header Upgrade $http_upgrade; + proxy_set_header Connection "upgrade"; + proxy_set_header Host $host; + proxy_set_header X-Real-IP $remote_addr; + proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; + + proxy_pass http://main-latest; + proxy_connect_timeout 1200s; + proxy_send_timeout 1200s; + proxy_read_timeout 1200s; + proxy_request_buffering off; + proxy_buffering off; + client_max_body_size 20m; + + proxy_next_upstream error timeout http_500 http_502; + } +} +``` \ No newline at end of file From 45dc6906198a6c9648ee4cabf4af76a1fe7b2785 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AD=9F=E5=BA=86=E8=8A=B3?= Date: Fri, 3 Feb 2023 15:42:30 +0800 Subject: [PATCH 3/6] go get --- .../6\346\263\250\346\204\217\347\202\271.md" | 23 +++++++++++++++++-- .../5Redis.md" | 5 ++++ ...70\350\247\201\351\227\256\351\242\230.md" | 4 ++++ .../2\350\265\204\346\226\231.md" | 2 ++ 4 files changed, 32 insertions(+), 2 deletions(-) create mode 100644 "06\345\267\245\345\205\267/1git/3\345\270\270\350\247\201\351\227\256\351\242\230.md" diff --git "a/01\350\257\255\350\250\200/1go/6\346\263\250\346\204\217\347\202\271.md" "b/01\350\257\255\350\250\200/1go/6\346\263\250\346\204\217\347\202\271.md" index 04e4702..eb37a30 100644 --- "a/01\350\257\255\350\250\200/1go/6\346\263\250\346\204\217\347\202\271.md" +++ "b/01\350\257\255\350\250\200/1go/6\346\263\250\346\204\217\347\202\271.md" @@ -508,8 +508,9 @@ sn3:= struct { ### 私有仓库 ```shell +# 报错:github.com/hashicorp/memberlist: git.****.cn/****/xxx/****-@v1.0.1: reading https://goproxy.cn/git.****.cn/****/xxx/****-.mod: 404 Not Found # 设置私有仓库的git地址 -go env -w GOPRIVATE="git@git.xxx.cn" +go env -w GOPRIVATE="git.xxx.cn" # 允许设置不安全访问，配置后可请求到 http 地址的仓库 go env -w GOINSECURE="git.xxx.cn" @@ -523,4 +524,22 @@ go env -w GONOSUMDB="git.xxx.cn" # 项目名称必须是仓库地址 #拉取仓库go get git.xxx.cn/name/xxx@v1.0.2 -``` \ No newline at end of file +``` + - 鉴权问题 + ```shell + fatal: could not read Username for 'https://git.****.cn': No such device or address + # cat >~/.netrc<~/.gitconfig< Date: Tue, 14 Feb 2023 16:07:01 +0800 Subject: [PATCH 4/6] =?UTF-8?q?=E7=BF=BB=E8=AF=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- "06\345\267\245\345\205\267/list.md" | 3 ++- .../0\347\233\256\345\275\225.md" | 1 - 2 files changed, 2 insertions(+), 2 deletions(-) diff --git "a/06\345\267\245\345\205\267/list.md" "b/06\345\267\245\345\205\267/list.md" index 03d0bee..7d2c2d7 100644 --- "a/06\345\267\245\345\205\267/list.md" +++ "b/06\345\267\245\345\205\267/list.md" @@ -3,4 +3,5 @@ 3. https://v2xtls.org/v2ray%e5%ae%a2%e6%88%b7%e7%ab%af/ 科学上网 https://freefq.com/ 4. https://natapp.cn 端口映射 xiaomeng79 mqf19890715_null 6. https://www.geogebra.org/ 数学画图工具 -7. https://www.yunpanjingling.com/ 云盘资料 \ No newline at end of file +7. https://www.yunpanjingling.com/ 云盘资料 +8. https://github.com/immersive-translate/immersive-translate 翻译 \ No newline at end of file diff --git "a/27\344\271\246\347\261\215\350\265\204\346\226\231/0\347\233\256\345\275\225.md" "b/27\344\271\246\347\261\215\350\265\204\346\226\231/0\347\233\256\345\275\225.md" index 328b70e..83d93f9 100644 --- "a/27\344\271\246\347\261\215\350\265\204\346\226\231/0\347\233\256\345\275\225.md" +++ "b/27\344\271\246\347\261\215\350\265\204\346\226\231/0\347\233\256\345\275\225.md" @@ -40,5 +40,4 @@ ## 免费获取书籍的方法 -- [pdf大全](https://www.pdfdaquan.com/) - [书行天下](https://www.sxpdf.com/) From 17585cf5c9c2631e92781cbf9ff332a8efc7247b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AD=9F=E5=BA=86=E8=8A=B3?= Date: Tue, 21 Feb 2023 10:15:52 +0800 Subject: [PATCH 5/6] book --- .../0\347\233\256\345\275\225.md" | 1 + 1 file changed, 1 insertion(+) diff --git "a/27\344\271\246\347\261\215\350\265\204\346\226\231/0\347\233\256\345\275\225.md" "b/27\344\271\246\347\261\215\350\265\204\346\226\231/0\347\233\256\345\275\225.md" index 83d93f9..89ead93 100644 --- "a/27\344\271\246\347\261\215\350\265\204\346\226\231/0\347\233\256\345\275\225.md" +++ "b/27\344\271\246\347\261\215\350\265\204\346\226\231/0\347\233\256\345\275\225.md" @@ -14,6 +14,7 @@ - 罗伯特 富爸爸穷爸爸（一起学习财富思路） - 历代经济变革得失(吴晓波) - [精益副业](http://r.ftqq.com/lean-side-bussiness) +- [如何不靠运气变得富有](https://github.com/fat-garage/how-to-get-rich-without-getting-lucky) ## 哲理 From 60792376168b1bed0044a1837dc2d0141d5abad9 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Sat, 25 Feb 2023 02:16:46 +0000 Subject: [PATCH 6/6] =?UTF-8?q?Bump=20golang.org/x/crypto=20in=20/20?= =?UTF-8?q?=E8=87=AA=E5=8A=A8=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Bumps [golang.org/x/crypto](https://github.com/golang/crypto) from 0.0.0-20200622213623-75b288015ac9 to 0.1.0. - [Release notes](https://github.com/golang/crypto/releases) - [Commits](https://github.com/golang/crypto/commits/v0.1.0) --- updated-dependencies: - dependency-name: golang.org/x/crypto dependency-type: indirect ... Signed-off-by: dependabot[bot] --- .../go.mod" | 3 +- .../go.sum" | 41 +++++++++++++++---- 2 files changed, 36 insertions(+), 8 deletions(-) diff --git "a/20\350\207\252\345\212\250\345\214\226/go.mod" "b/20\350\207\252\345\212\250\345\214\226/go.mod" index 50a85b5..e12ef41 100644 --- "a/20\350\207\252\345\212\250\345\214\226/go.mod" +++ "b/20\350\207\252\345\212\250\345\214\226/go.mod" @@ -4,9 +4,10 @@ go 1.13 require ( github.com/dgrijalva/jwt-go v3.2.0+incompatible // indirect + github.com/golang-jwt/jwt v3.2.2+incompatible // indirect github.com/labstack/echo v3.3.10+incompatible github.com/labstack/gommon v0.3.0 // indirect - golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9 // indirect + golang.org/x/crypto v0.1.0 // indirect ) replace github.com/dgrijalva/jwt-go v3.2.0+incompatible => github.com/golang-jwt/jwt v3.2.2+incompatible diff --git "a/20\350\207\252\345\212\250\345\214\226/go.sum" "b/20\350\207\252\345\212\250\345\214\226/go.sum" index 241b597..425ed54 100644 --- "a/20\350\207\252\345\212\250\345\214\226/go.sum" +++ "b/20\350\207\252\345\212\250\345\214\226/go.sum" @@ -1,3 +1,4 @@ +github.com/davecgh/go-spew v1.1.0 h1:ZDRjVQ15GmhC3fiQ8ni8+OwkZQO4DARzQgrnXU1Liz8= github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/golang-jwt/jwt v3.2.2+incompatible h1:IfV12K8xAKAnZqdXVzCZ+TOjboZ2keLg81eXfW3O+oY= github.com/golang-jwt/jwt v3.2.2+incompatible/go.mod h1:8pz2t5EyA70fFQQSrl6XZXzqecmYZeUEB8OUGHkxJ+I= @@ -10,24 +11,50 @@ github.com/mattn/go-colorable v0.1.2/go.mod h1:U0ppj6V5qS13XJ6of8GYAs25YV2eR4EVc github.com/mattn/go-isatty v0.0.8/go.mod h1:Iq45c/XA43vh69/j3iqttzPXn0bhXyGjM0Hdxcsrc5s= github.com/mattn/go-isatty v0.0.9 h1:d5US/mDsogSGW37IV293h//ZFaeajb69h+EHFsv2xGg= github.com/mattn/go-isatty v0.0.9/go.mod h1:YNRxwqDuOph6SZLI9vUUz6OYw3QyUt7WiY2yME+cCiQ= +github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM= github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= +github.com/stretchr/testify v1.4.0 h1:2E4SXV/wtOkTonXsotYi4li6zVWxYlZuYNCXe9XRJyk= github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81PSLYec5m4= github.com/valyala/bytebufferpool v1.0.0 h1:GqA5TC/0021Y/b9FG4Oi9Mr3q7XYx6KllzawFIhcdPw= github.com/valyala/bytebufferpool v1.0.0/go.mod h1:6bBcMArwyJ5K/AmCkWv1jt77kVWyCJ6HpOuEn7z0Csc= github.com/valyala/fasttemplate v1.0.1 h1:tY9CJiPnMXf1ERmG2EyK7gNUd+c6RKGD0IfU8WdUSz8= github.com/valyala/fasttemplate v1.0.1/go.mod h1:UQGH1tvbgY+Nz5t2n7tXsz52dQxojPUpymEIMZ47gx8= +github.com/yuin/goldmark v1.4.13/go.mod h1:6yULJ656Px+3vBD8DxQVa3kxgyrAnzto9xy5taEt/CY= golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= -golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9 h1:psW17arqaxU48Z5kZ0CQnkZWQJsqcURM6tKiBApRjXI= -golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= -golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3 h1:0GoQqolDA55aaLxZyTzK/Y2ePZzZTUrRacwib7cNsYQ= -golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= +golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc= +golang.org/x/crypto v0.1.0 h1:MDRAIl0xIo9Io2xV565hzXHw3zVseKrJKodhohM5CjU= +golang.org/x/crypto v0.1.0/go.mod h1:RecgLatLF4+eUMCP1PoPZQb+cVrJcOPbHkTkbkB9sbw= +golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4/go.mod h1:jJ57K6gSWd91VN4djpZkiMVwK6gcyfeH4XE8wZrZaV4= +golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= +golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg= +golang.org/x/net v0.0.0-20220722155237-a158d28d115b/go.mod h1:XRhObCWvk6IyKnWLug+ECip1KBveYUHfp+8e9klMJ9c= +golang.org/x/net v0.1.0 h1:hZ/3BUoy5aId7sCpA/Tc5lt8DkFgdVS2onTpJsZ/fl0= +golang.org/x/net v0.1.0/go.mod h1:Cx3nUiGt4eDBEyega/BKRp+/AlGL8hYe7U9odMt2Cco= +golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= +golang.org/x/sync v0.0.0-20220722155255-886fb9371eb4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20190222072716-a9d3bda3a223/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= -golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20190813064441-fde4db37ae7a h1:aYOabOQFp6Vj6W1F80affTUvO9UxmJRx8K0gsfABByQ= golang.org/x/sys v0.0.0-20190813064441-fde4db37ae7a/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/text v0.3.0 h1:g61tztE5qeGQ89tm6NTjjM9VPIm088od1l6aSorWRWg= +golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.0.0-20220520151302-bc2c85ada10a/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.0.0-20220722155257-8c9f86f7a55f/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.1.0 h1:kunALQeHf1/185U1i0GOB/fy1IPRDDpuoOOqRReG57U= +golang.org/x/sys v0.1.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= +golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8= +golang.org/x/term v0.1.0/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8= golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= +golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= +golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ= +golang.org/x/text v0.4.0 h1:BrVqGRd7+k1DiOgtnFvAkoQEWQvBc25ouMJM6429SFg= +golang.org/x/text v0.4.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8= +golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= +golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= +golang.org/x/tools v0.1.12/go.mod h1:hNGJHUnrk76NpqgfD5Aqm5Crs+Hm0VOH/i9J2+nxYbc= +golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= +gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405 h1:yhCVgyC4o1eVCa2tZl7eS0r+SDo693bJlVdllGtEeKM= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= +gopkg.in/yaml.v2 v2.2.2 h1:ZCJp+EgiOT7lHqUV2J862kp8Qj64Jo6az82+3Td9dZw= gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=