Merge branch 'rmaster' of 39.97.239.116:gyfl/xyzshop into rmaster

docker/conf/nginx/nginx-xyz-https.conf

@@ -134,6 +134,12 @@ http
     server {
         listen       443 ssl;
         server_name xyzshops.cn;
-        return 301 https://www.xyzshops.cn;
+        return 301 https://www.xyzshops.cn$request_uri;
+    }
+
+    server {
+        listen       80;
+        server_name xyzshops.cn 121.89.223.81;
+        return 301 https://www.xyzshops.cn$request_uri;
     }
 }