From 6fb14149d62199cfcc0448c82eb2f51f9c5181de Mon Sep 17 00:00:00 2001
From: luliqiang <kidgrow>
Date: Thu, 31 Dec 2020 16:55:30 +0800
Subject: [PATCH] Merge branch 'dev' of http://192.168.2.240:7070/r/kidgrow-microservices-platform into parter
---
kidgrow-springcloud/kidgrow-springcloud-zuul/src/main/resources/application.yml | 20 ++++++++++++++++----
1 files changed, 16 insertions(+), 4 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 4f1cefb..a6da7f1 100644
--- a/kidgrow-springcloud/kidgrow-springcloud-zuul/src/main/resources/application.yml
+++ b/kidgrow-springcloud/kidgrow-springcloud-zuul/src/main/resources/application.yml
@@ -226,10 +226,16 @@
- /api-evaluation/evaluationxrayinfo/appUpload
- /api-evaluation/evaluationxrayinfo/appSave
- /api-file/baseUplaod
+ - /api-file/feignUploadHosIdAndDepId
- /api-user/users/python
- /api-evaluation/evaluationxrayinfo/checkQRCode
- - /api-record/wxController/callback
- - /api-record/alipay/return
+ - /api-opration/wxController/callback
+ - /api-opration/alipay/notify
+ - /api-opration/alipay/return
+ - /api-record/DiagnosticUnfinishedFegin/equipmentList
+ - /api-record/DiagnosticUnfinishedFegin/equipmentUpload
+ - /api-opration/wxController/getOpenId
+ - /api-record/DiagnosticUnfinishedFegin/recordChildInterworking
# - /api-user/syshospital/findAllByMap
# - /api-user/sysdictionaries/findAll
# - /api-user/sysdepartment/findListByHospitalId
@@ -257,6 +263,7 @@
/api-file/smsChangLan/send,
/api-user/users/doctorUserReg,
/api-file/files-upload,
+ /api-file/feignUploadHosIdAndDepId,
/api-user/users/isRegUser,
/api-user/users/passwordByPhone,
/api-evaluation/evaluationxrayinfo/appUpload,
@@ -264,8 +271,13 @@
/api-file/baseUplaod,
/api-user/users/python,
/api-evaluation/evaluationxrayinfo/checkQRCode,
- /api-record/wxController/callback,
- /api-record/alipay/return
+ /api-opration/wxController/callback,
+ /api-opration/alipay/return,
+ /api-opration/alipay/notify,
+ /api-record/DiagnosticUnfinishedFegin/equipmentList,
+ /api-record/DiagnosticUnfinishedFegin/equipmentUpload,
+ /api-opration/wxController/getOpenId,
+ /api-record/DiagnosticUnfinishedFegin/recordChildInterworking
# /api-user/syshospital/findAllByMap,
# /api-user/sysdictionaries/findAll,
# /api-user/sysdepartment/findListByHospitalId
--
Gitblit v1.8.0