Merge branch 'master' of http://10.68.0.122:3000/mengqingchuang/k8swebapi

# Conflicts:
#	k8swebapi-nginx/tcp.d/sharetransmit.jixiang.cn.conf

k8swebapi-nginx/tcp.d/sharetransmit.jixiang.cn.conf

@@ -1,3 +1,4 @@
+<<<<<<< HEAD
 stream {
     upstream sharetransmit-svc {
        hash $remote_addr consistent;
@@ -9,4 +10,17 @@ stream {
        proxy_timeout 300s;
        proxy_pass sharetransmit-svc;
     }
+=======
+stream {
+    upstream sharetransmit-svc {
+       hash $remote_addr consistent;
+       server sharetransmit-svc:8006;
+    }
+    server {
+       listen 8006;
+       proxy_connect_timeout 60s;
+       proxy_timeout 300s;
+       proxy_pass sharetransmit-svc;
+    }
+>>>>>>> c1161a822a5137afdc678386fd5579ef133514cf
 }