fuyu vor 6 Jahren
Ursprung
Commit
c3b64f6a4a
2 geänderte Dateien mit 14 neuen und 7 gelöschten Zeilen
  1. 2 1
      application/common.php
  2. 12 6
      application/inter/controller/Dcquery.php

+ 2 - 1
application/common.php

@@ -10,7 +10,8 @@
 // +----------------------------------------------------------------------
 
 // 应用公共文件
-define('LC_IPS',json_encode(array('11.17.9.158','60.208.94.155')));
+define('LC_WAN_IPS',json_encode(array('11.17.9.158','60.208.94.155')));
+define('LC_LAN_IPS',json_encode(array('192.168.2.54')));
 define('STATUS_LOCAL',0b01);
 define('STATUS_REMOTE',0b10);
 define('REMOTE_FLAG','remote');

+ 12 - 6
application/inter/controller/Dcquery.php

@@ -289,18 +289,24 @@ class Dcquery extends Controller
         }else{
             //获取ip
             $ip = $this->getIpbyAddress($address);
-            if(in_array($ip,json_decode(LC_IPS,TRUE))) {
+            if(in_array($ip,json_decode(LC_WAN_IPS,TRUE))) {
                 //浪潮政务云访问
                 return "dicomweb://$address/$remote_url";
             }
-            if($status & STATUS_LOCAL) {
+            if(in_array($ip,json_decode(LC_LAN_IPS,TRUE))) {
+                if($status & STATUS_LOCAL) {
                 //内网url有效
-                return "dicomweb://$address/$local_url";
+                    return "dicomweb://$address/$local_url";
+                }
+                if($status & STATUS_REMOTE) {
+                    //外网url有效
+                    return "dicomweb://$address/".REMOTE_FLAG."/$remote_url";
+                }
             }
-            if($status & STATUS_REMOTE) {
-                //外网url有效
-                return "dicomweb://$address/".REMOTE_FLAG."/$remote_url";
+            if($status & (STATUS_LOCAL | STATUS_REMOTE)) {
+                 return "dicomweb://$address/$url";
             }
+            //浪潮政务云访问
             return  null;
         }
     }