Browse Source

修改代码

fuyu 6 years ago
parent
commit
32ef42691a

+ 0 - 35
conf.d/dcm.conf

@@ -1,35 +0,0 @@
-server {
-	listen       9999;
-  access_log  /data/logs/nginx/dcm/access.log;
-  error_log   /data/logs/nginx/dcm/error.log;
-	root html;
-  index index.html index.htm;
-  #ssl_certificate     /data/sslkey/dcm/dcm.pem;
-  #ssl_certificate_key /data/sslkey/dcm/dcm.key;
-  #ssl_session_timeout 5m;
-  #ssl_ciphers ECDHE-RSA-AES128-GCM-SHA256:ECDHE:ECDH:AES:HIGH:!NULL:!aNULL:!MD5:!ADH:!RC4;
-  #ssl_protocols TLSv1 TLSv1.1 TLSv1.2;
-  #ssl_prefer_server_ciphers on;
-  #add_header 'Access-Control-Allow-Origin' 'http://127.0.0.1:3456';
-  location ~/group[0-9]/M00 {
-      add_header 'Access-Control-Allow-Origin' '*';
-      #add_header 'Access-Control-Allow-Origin' 'http://demo.pacsonline.cn';
-      #add_header 'Access-Control-Allow-Origin' 'http://wechat.pacsonline.cn';
-      #add_header 'Access-Control-Allow-Origin' 'http://local.pacsonline.cn';
-      ngx_fastdfs_module;
-  }
-
-    location = /favicon.ico {
-        access_log    off;
-        log_not_found off;
-    }
-
-    error_page   500 502 503 504  /50x.html;
-    location = /50x.html {
-        root   /usr/share/nginx/html;
-    }
-
-    #if ($scheme ~ http) {
-    #    return https://$server_name$request_uri;
-    #}	
-}

+ 5 - 4
conf.d/api.conf → conf.d/new_ris_server.pacsonline.cn.conf

@@ -1,9 +1,10 @@
 server {
-    listen       9600;
+    server_name  new_ris_server.pacsonline.cn;
+    listen       80;
     access_log  /data/logs/nginx/api/access.log;
     error_log   /data/logs/nginx/api/error.log;
     index	index.html index.php;
-    root /data/gitcode/yuanchengpasc/public/;
+    root /data/gitcode/zskk_new_server/server/public;
 
     #add_header Access-Control-Allow-Origin '*';
     #add_header Access-Control-Allow-Headers 'X-Requested-With,Content-Type';
@@ -33,8 +34,8 @@ server {
         set $path_info  $2;
     }
 		fastcgi_read_timeout 120;
-		#fastcgi_pass 127.0.0.1:9000;
-    fastcgi_pass    unix:/usr/local/php/var/run/php-fpm.sock;
+		fastcgi_pass 127.0.0.1:9000;
+    # fastcgi_pass    unix:/usr/local/php/var/run/php-fpm.sock;
     fastcgi_index index.php;
 		#fastcgi_index   index.php?IF_REWRITE=1;
     fastcgi_param   PATH_INFO       $path_info;

+ 0 - 9
conf.d/pacsview.conf

@@ -1,9 +0,0 @@
-server {
-  listen       9603;
-  #client_header_buffer_size 16M;
-  #large_client_header_buffers 4 16M;
-  access_log  /data/logs/nginx/pacsview/access.log;
-  error_log   /data/logs/nginx/pacsview/error.log;
-	index	index.html index.htm;
-	root /data/www/pacsview;
-}

+ 3 - 2
conf.d/html.conf → conf.d/ris_new_client.pacsonline.cn.conf

@@ -1,7 +1,8 @@
 server {
-  listen       9602;
+  listen       80;
+  server_name  ris_new_client.pacsonline.cn;
   access_log  /data/logs/nginx/html/access.log;
   error_log   /data/logs/nginx/html/error.log;
 	index	index.html index.htm;
-	root /data/www/ris;
+	root /data/www/client;
 }

+ 2 - 3
mkdir.sh

@@ -1,4 +1,3 @@
+mkdir -p /data/logs/nginx
 mkdir -p /data/logs/nginx/html
-mkdir -p /data/logs/nginx/pacsview
-mkdir -p /data/logs/nginx/api
-mkdir -p /data/logs/nginx/dcm
+mkdir -p /data/logs/nginx/api

+ 2 - 2
nginx.conf

@@ -13,8 +13,8 @@ http {
     default_type  application/octet-stream;
 
     log_format  main  '$remote_addr - $remote_user [$time_local] "$request" '
-                      '$status $body_bytes_sent "$http_referer" '
-                      '"$http_user_agent" "$http_x_forwarded_for"';
+                    '$status $body_bytes_sent "$http_referer" '
+                    '"$http_user_agent" "$http_x_forwarded_for"';
 
     access_log /data/logs/nginx/access.log  main;
     client_max_body_size 200m;