From e6a149ea753350d3bebbd76ce40315a8b6016b4e Mon Sep 17 00:00:00 2001
From: bingbing <zhaobingliang@aliyun.com>
Date: Thu, 23 Jul 2020 13:04:47 +0800
Subject: [PATCH] Merge branch 'dev' of http://192.168.2.240:7070/r/kidgrow-microservices-platform into dev

---
 kidgrow-springcloud/kidgrow-springcloud-zuul/src/main/resources/application.yml |   13 ++++++++++++-
 1 files changed, 12 insertions(+), 1 deletions(-)

diff --git a/kidgrow-springcloud/kidgrow-springcloud-zuul/src/main/resources/application.yml b/kidgrow-springcloud/kidgrow-springcloud-zuul/src/main/resources/application.yml
index c6a4a69..1049a52 100644
--- a/kidgrow-springcloud/kidgrow-springcloud-zuul/src/main/resources/application.yml
+++ b/kidgrow-springcloud/kidgrow-springcloud-zuul/src/main/resources/application.yml
@@ -23,6 +23,7 @@
     prefer-ip-address: true
   client:
     serviceUrl:
+#      defaultZone: http://192.168.2.240:9001/eureka/
       defaultZone: ${kidgrow.eureka.client.serviceUrl.defaultZone}
 
 zuul:
@@ -169,6 +170,12 @@
       strip-prefix: true
       sensitive-headers: '*'
       custom-sensitive-headers: true
+    api-smartbox:
+      path: /api-smart/**
+      service-id: smartbox-server
+      strip-prefix: true
+      sensitive-headers: '*'
+      custom-sensitive-headers: true
   ssl-hostname-validation-enabled: false
 
 
@@ -215,6 +222,8 @@
       - /api-user/users/isRegUser
       - /api-user/users/passwordByPhone
       - /api-evaluation/evaluationxrayinfo/appUpload
+      - /api-evaluation/evaluationxrayinfo/appSave
+      - /api-file/baseUplaod
 #      - /api-user/syshospital/findAllByMap
 #      - /api-user/sysdictionaries/findAll
 #      - /api-user/sysdepartment/findListByHospitalId
@@ -244,7 +253,9 @@
         /api-file/files-upload,
         /api-user/users/isRegUser,
         /api-user/users/passwordByPhone,
-        /api-evaluation/evaluationxrayinfo/appUpload
+        /api-evaluation/evaluationxrayinfo/appUpload,
+        /api-evaluation/evaluationxrayinfo/appSave,
+        /api-file/baseUplaod
 #        /api-user/syshospital/findAllByMap,
 #        /api-user/sysdictionaries/findAll,
 #        /api-user/sysdepartment/findListByHospitalId

--
Gitblit v1.8.0