[add-description]：add server ping function

JancsiTech · Nov 28, 2022 · 00c6b88 · 00c6b88
1 parent aa0770d
commit 00c6b88
Show file tree

Hide file tree

Showing 8 changed files with 116 additions and 21 deletions.
diff --git a/platform/core/src/studies/index.js b/platform/core/src/studies/index.js
@@ -30,19 +30,19 @@ export const changeServe = (object) => {
         if (server) {
 
           let replaceStr = new ReplaceStr(JSON.parse(localStorage.getItem('serve')))
-          if (!replaceStr) {
+          if (JSON.stringify(replaceStr.serve) == "{}") {
             replaceStr = new ReplaceStr(JSON.parse(localStorage.getItem('defaultServe')))
           }
 
           serve = replaceStr.serve
+
           if (process.env.NODE_ENV === "development") {
             serve = replaceStr.devServe
           }
           // if (!serve || JSON.stringify(serve) !== "{}") {
           server = { ...server, ...serve }
 
           params = [server, ...params]
-          console.log('params: ', params);
           // }
         }
         return midFn(...params)

diff --git a/platform/core/src/studies/services/qido/instances.js b/platform/core/src/studies/services/qido/instances.js
@@ -79,7 +79,7 @@ export default function Instances(server, StudyInstanceUID) {
   // TODO: Are we using this function anywhere?? Can we remove it?
   let serve;
   let replaceStr = new ReplaceStr(JSON.parse(localStorage.getItem('serve')))
-  if (!replaceStr) {
+  if (JSON.stringify(replaceStr.serve) == "{}") {
     replaceStr = new ReplaceStr(JSON.parse(localStorage.getItem('defaultServe')))
   }
   serve = replaceStr.serve

diff --git a/platform/core/src/studies/services/qido/studies.js b/platform/core/src/studies/services/qido/studies.js
@@ -123,16 +123,20 @@ function resultDataToStudies(resultData) {
 function Studies(server, filter) {
   const { staticWado } = server;
   let replaceStr = new ReplaceStr(JSON.parse(localStorage.getItem('serve')))
-  if (!replaceStr) {
+  console.log('JSON.stringify(replaceStr): ', JSON.stringify(replaceStr), JSON.stringify(replaceStr) == "{}");
+  if (JSON.stringify(replaceStr.serve) == "{}") {
     replaceStr = new ReplaceStr(JSON.parse(localStorage.getItem('defaultServe')))
   }
   let serve = replaceStr.serve
+
   if (process.env.NODE_ENV === "development") {
     serve = replaceStr.devServe
+
   }
 
   if (serve !== undefined || serve !== {}) {
     server = { ...server, ...serve }
+
   }
 
   const config = {

diff --git a/platform/viewer/jest.config.js b/platform/viewer/jest.config.js
@@ -1,3 +1,8 @@
+/*
+ * @Description: 
+ * @Author: Deven
+ * @Date: 2022-11-21 21:21:43
+ */
 const base = require("../../jest.config.base.js");
 const pkg = require("./package");
 
@@ -12,3 +17,36 @@ module.exports = {
   //   "<rootDir>/platform/viewer/**/*.test.js"
   // ]
 };
+
+
+# 主进程叫master，负责管理子进程，子进程叫worker
+# worker_processes配置项表示开启几个业务进程，一般和cpu核数有关
+worker_processes  1;
+
+events {
+    worker_connections  1024;
+}
+
+http {
+        # include表示可以引入其他文件，此处表示引入http mime类型
+    include       mime.types;
+    default_type  application / octet - stream;
+    sendfile        on;
+    keepalive_timeout  65;
+
+        # 虚拟主机，可以配置多个
+    server {
+        listen       80;
+        server_name  localhost;
+
+    location / {
+                # 路径匹配之后，哪个目录下去匹配相应的网页, html是相对路径
+            root   / home / dechang / dist;
+            index  index.html index.htm;
+  }
+
+        error_page   500 502 503 504 / 50x.html;
+  location = /50x.html {
+            root   html;
+}
+        }
diff --git a/platform/viewer/public/config/docker_nginx-orthanc.js b/platform/viewer/public/config/docker_nginx-orthanc.js
@@ -12,12 +12,12 @@ window.config = {
     dicomWeb: [
       {
         name: 'Orthanc',
-        wadoUriRoot: '/10.10.99.88:8042/wado',
-        qidoRoot: '/10.10.99.88:8042/dicom-web',
-        wadoRoot: '/10.10.99.88:8042/dicom-web',
-        // wadoUriRoot: 'http://10.10.99.8:8042/wado',
-        // qidoRoot: 'http://10.10.99.8:8042/dicom-web',
-        // wadoRoot: 'http://10.10.99.8:8042/dicom-web',
+        // wadoUriRoot: '/10.10.99.88:8042/wado',
+        // qidoRoot: '/10.10.99.88:8042/dicom-web',
+        // wadoRoot: '/10.10.99.88:8042/dicom-web',
+        wadoUriRoot: 'http://10.10.99.88:8042/wado',
+        qidoRoot: 'http://10.10.99.88:8042/dicom-web',
+        wadoRoot: 'http://10.10.99.88:8042/dicom-web',
         qidoSupportsIncludeField: false,
         imageRendering: 'wadors',
         thumbnailRendering: 'wadors',

diff --git a/platform/viewer/src/components/Header/Header.js b/platform/viewer/src/components/Header/Header.js
@@ -34,7 +34,7 @@ function Header(props) {
         onClick: () =>
           show({
             content: AboutContent,
-            title: t('OHIF Viewer - About'),
+            title: t('JancsiTech Viewer - About'),
           }),
       },
       {

diff --git a/platform/viewer/src/components/Header/editServerContent.js b/platform/viewer/src/components/Header/editServerContent.js
@@ -1,6 +1,6 @@
 /*
  * @Description:
- * @Author: eleven
+ * @Author: devin
  * @Date: 2022-11-22 10:27:48
  */
 import React, { useState, useEffect } from 'react';
@@ -16,8 +16,7 @@ function EditServerContent(props) {
   } = props;
   const { t } = useTranslation('UserPreferencesModal');
   const { UINotificationService } = servicesManager.services;
-  const [serveForm, setServeForm] = useState({})
-  const [option, setOption] = useState();
+  // const [serveForm, setServeForm] = useState({})
   const [currentServer, setCurrentServer] = useState()
   const [serverList, setServerList] = useState([])
   const [addServerValue, setAddServerValue] = useState();
@@ -39,21 +38,46 @@ function EditServerContent(props) {
   }, [])
 
   const onChange = (value) => {
-
     setAddServerValue(value)
   }
 
   //save serve and change
   const onSave = () => {
-    let serve = new ReplaceStr(serveForm)
+    let serve = new ReplaceStr(currentServer)
 
-    localStorage.setItem('defaultServe', JSON.stringify(serve.ip))
+    localStorage.setItem('serve', JSON.stringify(serve.ip))
 
     onClose()
     history.push({ pathname: '/', search: '' })
     history.go(0)
   }
 
+  const pingServer = () => {
+    const start = (new Date()).getTime()
+    let server = process.env.NODE_ENV === "development" ? `/${addServerValue}` : `http://${addServerValue}`
+    fetch(server).then(() => {
+      const delta = (new Date()).getTime() - start
+      if (delta > 10000) {
+        UINotificationService.show({
+          title: 'Error Message Prompt',
+          message: 'Continuous connection timeout',
+          type: 'error',
+          autoClose: true,
+        });
+      } else {
+        addServerList()
+      }
+    }).catch((err) => {
+      console.log('err: ', err.message);
+      UINotificationService.show({
+        title: 'Error Message Prompt',
+        message: err.message ? err.message : 'Failed to fetch',
+        type: 'error',
+        autoClose: true,
+      });
+    })
+  }
+
 
   const handleRadioChange = (e, index) => {
     setCurrentServer(e.target.value)
@@ -109,7 +133,7 @@ function EditServerContent(props) {
 
       </div> */}
       <div className='current-server'>
-        <div className="wlColumn preset">Add server
+        <div className="wlColumn preset">Add Server
         </div>
         <div className="wlColumn add-server " >
           {/* <input
@@ -126,14 +150,14 @@ function EditServerContent(props) {
           />
           <button
             className="btn btn-primary add-button"
-            onClick={addServerList}
+            onClick={pingServer}
           >
             {t('Add Server')}
           </button>
         </div>
       </div>
       <div className='current-server'>
-        <div className="wlColumn preset">Current server
+        <div className="wlColumn preset">Current Server
         </div>
         <div className="wlColumn description">
           <input

diff --git a/platform/viewer/src/utils/replaceStr.js b/platform/viewer/src/utils/replaceStr.js
@@ -15,6 +15,7 @@ class ReplaceStr {
 
     serveAddStr = function (serve) {
         console.log('serve: ', serve);
+
         if (!serve) return {}
 
         if (typeof (serve) == 'string') {
@@ -24,7 +25,7 @@ class ReplaceStr {
                 wadoRoot: serve,
             }
         }
-        console.log('serve: ', serve);
+
         serve = {
             qidoRoot: serve.qidoRoot,
             wadoRoot: serve.qidoRoot,
@@ -41,6 +42,34 @@ class ReplaceStr {
         }
         return res
     }
+    serveAddStrDev = function (serve) {
+
+        if (!serve) return {}
+
+        if (typeof (serve) == 'string') {
+            serve = {
+                wadoUriRoot: serve,
+                qidoRoot: serve,
+                wadoRoot: serve,
+            }
+        }
+
+        serve = {
+            qidoRoot: serve.qidoRoot,
+            wadoRoot: serve.qidoRoot,
+            wadoUriRoot: serve.qidoRoot,
+        }
+        let res = {}
+        for (let item in serve) {
+            let isInclude = serve[item].includes('http') || serve[item].includes('https')
+            if (!isInclude) {
+                res[item] = item.includes('wadoUri') ? `http://${serve[item]}:8041/wado` : `http://${serve[item]}:8041/dicom-web`
+                continue;
+            }
+            res[item] = serve[item]
+        }
+        return res
+    }
 
     serveDeleteStr = function (serve) {
         if (!serve) return {}