Merge branch 'develop'

uidocker/conf.d/default.conf

@@ -67,6 +67,21 @@ server {
         proxy_read_timeout 300s;
     }
 
+    location ~ ^/api/v1.0/org_gateway {
+        proxy_pass http://rpmanage;
+
+        proxy_http_version 1.1;
+        proxy_set_header Upgrade $http_upgrade;
+        proxy_set_header Connection "upgrade";
+
+        proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
+
+        proxy_set_header Host $host;
+        proxy_set_header Real-IP $remote_addr;
+
+        proxy_read_timeout 300s;
+    }
+
 
     location ~ ^/api/v1.0/((alipay\w*)|(customs)|(rpay)|(yeepay)|(card_payment_view)|(lakala_pay)|(cb_bankpay)|(bestpay)|(hf)|(\w*gateway)|(micropay)|(retail_qrcode)|(share_code)|(payment)|(h5_payment))/ {
         proxy_pass http://rppaycenter;