From e84df331a8ee600d369eeac4172b750db563926d Mon Sep 17 00:00:00 2001
From: houruijun <411269194@kidgrow.com>
Date: Sun, 09 Aug 2020 15:16:37 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev

---
 kidgrow-springcloud/kidgrow-springcloud-zuul/src/main/resources/application.yml |   10 +++++++++-
 1 files changed, 9 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 8299439..59f972e 100644
--- a/kidgrow-springcloud/kidgrow-springcloud-zuul/src/main/resources/application.yml
+++ b/kidgrow-springcloud/kidgrow-springcloud-zuul/src/main/resources/application.yml
@@ -170,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
 
 
@@ -218,6 +224,7 @@
       - /api-evaluation/evaluationxrayinfo/appUpload
       - /api-evaluation/evaluationxrayinfo/appSave
       - /api-file/baseUplaod
+      - /api-user/users/python
 #      - /api-user/syshospital/findAllByMap
 #      - /api-user/sysdictionaries/findAll
 #      - /api-user/sysdepartment/findListByHospitalId
@@ -249,7 +256,8 @@
         /api-user/users/passwordByPhone,
         /api-evaluation/evaluationxrayinfo/appUpload,
         /api-evaluation/evaluationxrayinfo/appSave,
-        /api-file/baseUplaod
+        /api-file/baseUplaod,
+        /api-user/users/python
 #        /api-user/syshospital/findAllByMap,
 #        /api-user/sysdictionaries/findAll,
 #        /api-user/sysdepartment/findListByHospitalId

--
Gitblit v1.8.0