Merge branch 'dev-yhq'

configuration/nginx/ai.api.conf

@@ -13,8 +13,8 @@ server {
         proxy_pass http://127.0.0.1:48080;
         proxy_http_version 1.1;
         proxy_connect_timeout 4s;                # 配置点1
-        proxy_read_timeout 60s;                  # 配置点2，如果没效，可以考虑这个时间配置长一点
-        proxy_send_timeout 12s;                  # 配置点3
+        proxy_read_timeout 120s;                 # 配置点2，如果没效，可以考虑这个时间配置长一点
+        proxy_send_timeout 120s;                 # 配置点3
         proxy_set_header Upgrade $http_upgrade;  # 支持wss
         proxy_set_header Connection "upgrade";   # 支持wss
 

configuration/nginx/ai.manage.conf

@@ -21,8 +21,8 @@ server {
         proxy_pass http://127.0.0.1:8088;
         proxy_http_version 1.1;
         proxy_connect_timeout 4s;                # 配置点1
-        proxy_read_timeout 60s;                  # 配置点2，如果没效，可以考虑这个时间配置长一点
-        proxy_send_timeout 12s;                  # 配置点3
+        proxy_read_timeout 120s;                 # 配置点2，如果没效，可以考虑这个时间配置长一点
+        proxy_send_timeout 120s;                 # 配置点3
         proxy_set_header Upgrade $http_upgrade;  # 支持wss
         proxy_set_header Connection "upgrade";   # 支持wss
 

configuration/nginx/nginx.conf

@@ -0,0 +1,106 @@
+user www-data;
+worker_processes auto;
+pid /run/nginx.pid;
+include /etc/nginx/modules-enabled/*.conf;
+
+events {
+	worker_connections 768;
+	# multi_accept on;
+}
+
+http {
+
+	##
+	# Basic Settings
+	##
+
+	sendfile on;
+	tcp_nopush on;
+	types_hash_max_size 2048;
+	# server_tokens off;
+
+	# server_names_hash_bucket_size 64;
+	# server_name_in_redirect off;
+
+	include /etc/nginx/mime.types;
+	default_type application/octet-stream;
+
+	##
+	# SSL Settings
+	##
+
+	ssl_protocols TLSv1 TLSv1.1 TLSv1.2 TLSv1.3; # Dropping SSLv3, ref: POODLE
+	ssl_prefer_server_ciphers on;
+
+	##
+	# Logging Settings
+	##
+
+	access_log /var/log/nginx/access.log;
+	error_log /var/log/nginx/error.log;
+
+	##
+	# Gzip Settings
+	##
+
+	gzip on;
+	
+	client_max_body_size 0;
+
+	server {
+        listen       80;
+        server_name  daoguyujia.com www.daoguyujia.com;
+
+
+        # rewrite ^/(.*) https://$server_name$1 permanent;
+        location / {
+            add_header  Access-Control-Allow-Headers '*';
+            add_header  Access-Control-Allow-Origin '*';
+            add_header  Access-Control-Allow-Methods 'GET,POST,OPTIONS';
+            add_header  Access-Control-Allow-Credentials 'true';
+            # proxy_pass http://127.0.0.1:81/;
+            proxy_redirect off; #
+            proxy_set_header Host $http_host;
+            proxy_set_header X-Real-IP $remote_addr;
+            proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
+            # proxy_set_header X-NginX-Proxy true;
+        }
+
+    }
+
+	# gzip_vary on;
+	# gzip_proxied any;
+	# gzip_comp_level 6;
+	# gzip_buffers 16 8k;
+	# gzip_http_version 1.1;
+	# gzip_types text/plain text/css application/json application/javascript text/xml application/xml application/xml+rss text/javascript;
+
+	##
+	# Virtual Host Configs
+	##
+
+	include /etc/nginx/conf.d/*.conf;
+	include /etc/nginx/sites-enabled/*;
+}
+
+
+#mail {
+#	# See sample authentication script at:
+#	# http://wiki.nginx.org/ImapAuthenticateWithApachePhpScript
+#
+#	# auth_http localhost/auth.php;
+#	# pop3_capabilities "TOP" "USER";
+#	# imap_capabilities "IMAP4rev1" "UIDPLUS";
+#
+#	server {
+#		listen     localhost:110;
+#		protocol   pop3;
+#		proxy      on;
+#	}
+#
+#	server {
+#		listen     localhost:143;
+#		protocol   imap;
+#		proxy      on;
+#	}
+#}