Merge branch 'master' of http://gogs.ywtinfo.com/ywt_rebuild_group/ywt-gateway

# Conflicts:
#	src/main/resources/application-biz-qa.yml
#	src/main/resources/application-routes-m-qa.yml

src/main/resources/application-biz-qa.yml

@@ -1,13 +1,13 @@
 # 公共变量
 servers-mapping:
-  web-static: 172.18.82.224:9998
-  marketing-api: 172.18.226.68:11320
-  alipay-mp-api: 172.18.82.224:8097
-  external-api-service: 172.18.82.224:7777
-  dong-hua-rest-service: 172.18.82.224:7668
-  nfyybyfy-rest-service: 172.18.82.224:7670
-  wx-ins-pay-rest-service: 172.18.82.224:7669
-  his-esb-api-service: 172.18.82.224:13900
+  web-static: http://172.18.82.224:9998
+  marketing-api: http://172.18.226.68:11320
+  alipay-mp-api: http://172.18.82.224:8097
+  external-api-service: http://172.18.82.224:7777
+  dong-hua-rest-service: http://172.18.82.224:7668
+  nfyybyfy-rest-service: http://172.18.82.224:7670
+  wx-ins-pay-rest-service: http://172.18.82.224:7669
+  his-esb-api-service: http://172.18.82.224:13900
 
 lb-servers:
   internethospital-web: lb://internethospital-web
@@ -17,6 +17,8 @@ lb-servers:
   prescription-web: lb://prescription-web
   nutrimeal-rest: lb:ywt-nutrimeal-rest
   glasses-web: lb://glasses-front-service
+  download-service-api-service: lb://com.ywt.DownloadServiceApiService
+
 host-name:
   m-qa: m-qa.ywtinfo.com
   api-qa: api-qa.ywtinfo.com
@@ -26,6 +28,7 @@ host-name:
   nutrimeal-qa: nutrimeal-qa.ywtinfo.com
   cloudfilm-qa: cloudfilm-qa.ywtinfo.com
   glasses-qa: glasses-qa.ywtinfo.com
+  mgapi-qa: mgapi-qa.ywtinfo.com
 
 auths-name:
   nfth-qt: 'nfth-qt'

src/main/resources/application-routes-m-qa.yml

@@ -312,6 +312,7 @@ spring:
           predicates:
             - Host=${host-name.m-qa}
             - Path=/lepu/notify
+
         # 乐普回调 end
 
         # 流调 start

src/main/resources/application-routes-mg-qa.yml

@@ -3,7 +3,7 @@ spring:
   cloud:
     gateway:
       routes:
-        - id: INTERNET-HOSP-WEB-TEST
+        - id: INTERNET-HOSP-WEB-TEST2
           uri: ${lb-servers.internethospital-web}
           predicates:
             - Path=/taihe/user/checkCardNo
@@ -103,6 +103,27 @@ spring:
               args:
                 authResponse401: true
                 auth: ${auths-name.ywt-mg}
+        # 下载服务
+        - id: mg-qa-downloadService
+          uri: ${lb-servers.download-service-api-service}
+          predicates:
+            - Host=${host-name.mg-qa}
+            - Path=/downloadService
+          filters:
+            - StripPrefix=1
+            - name: Auth
+              args:
+                authResponse401: true
+                timeout: 300
+                auth: ${auths-name.ywt-mg}
+        # 日志相关接口
+        - id: mg-qa-drapi-dev-opLog
+          uri: ${lb-servers.internethospital-web}
+          predicates:
+            - Host=${host-name.mg-qa}
+            - Path=/drapi/dev/opLog,/nfyybyfydocapi/dev/opLog,/thnetdocapi/dev/opLog,/marketingapi/dev/opLog,/nfthapi/dev/opLog,/api/dev/opLog
+          filters:
+            - StripPrefix=1
         # 管理后台 end
 
 

src/main/resources/application-routes-mgapi-qa.yml

@@ -0,0 +1,107 @@
+
+spring:
+  cloud:
+    gateway:
+      routes:
+        - id: INTERNET-HOSP-WEB-TEST2
+          uri: ${lb-servers.internethospital-web}
+          predicates:
+            - Path=/taihe/user/checkCardNo
+          filters:
+            - name: Auth
+              args:
+                auth: ${auths-name.external-api}
+                authResponse401: true
+                #设置需要刷新的授权，当 auth 不为空，以 auth 的配置为主
+                refreshAuth: ''
+                setHeaders: [ ]
+        # 后台api服务 start
+        # 药品后台
+        - id: mgapi-qa-drug
+          uri: ${lb-servers.prescription-web}
+          predicates:
+            - Host=${host-name.mgapi-qa}
+            - Path=/drug
+          filters:
+            - StripPrefix=1
+            - name: Auth
+              args:
+                log: true
+                authResponse401: true
+                refreshAuth: ${auths-name.ywt-mg-api}
+        # 药房客户端excel下载
+        - id: mgapi-qa-downloadListFile
+          uri: ${lb-servers.prescription-web}
+          predicates:
+            - Host=${host-name.mgapi-qa}
+            - Path=/drug/pharmacy/prescription/downloadPrescriptionListFile,/drug/pharmacyPrescription/downloadPrescriptionListFile,/drug/pharmacyPrescription/downloadDrugServiceConditionFile,/drug/pharmacyPrescription/downloadPrescriptionDrugListFile,/drug/consumable/downloadConsumableConditionFile,/drug/pharmacy/prescription/downloadBaiyunAndTaihePrescriptionListFile,/drug/pharmacy/prescription/downloadPrescriptionInfoListForBill,/drug/consumable/downloadMedicalOrderListForPharmacy,/drug/adverseReaction/downloadAdverseReactionFeedbackListFile,/drug/bill/third/downloadBillThirdFile,/drug/pharmacy/prescription/downloadOrderListForBill
+          filters:
+            - StripPrefix=1
+        # 登录接口
+        - id: mgapi-qa-auth-dgcli-login
+          uri: ${lb-servers.ywt-mgcenter-web}
+          predicates:
+            - Host=${host-name.mgapi-qa}
+            - Path=/auth/dgcli/login,/auth/updateClientMsgSetting,/auth/tollCollectorLogin
+        # 根目录
+        - id: mgapi-qa
+          uri: ${lb-servers.ywt-mgcenter-web}
+          predicates:
+            - Host=${host-name.mgapi-qa}
+            - Path=/
+          filters:
+            - name: Auth
+              args:
+                authResponse401: true
+                auth: ${auths-name.ywt-mg-api}
+        # 下载服务下载
+        - id: mgapi-qa-downloadService-pharmacy-downloadFile
+          uri: ${lb-servers.download-service-api-service}
+          predicates:
+            - Host=${host-name.mgapi-qa}
+            - Path=/downloadService/pharmacy/downloadFile
+          filters:
+            - StripPrefix=1
+        # 药品后台接口
+        - id: mgapi-qa-auth-imtoken
+          uri: ${lb-servers.prescription-web}
+          predicates:
+            - Host=${host-name.mgapi-qa}
+            - Path=/drug/auth/imtoken,/drug/sys/verifycode,/drug/decode/addDispenserMobile,/drug/file/image/upload,/drug/bill/third/downloadCheckListFile,/drug/pharmacy/drugs/downloadDrugListFile,/drug/bill/third/downloadMonthBillListFile
+          filters:
+            - StripPrefix=1
+        # mg后台接口
+        - id: mgapi-qa-sys-verifycode
+          uri: ${lb-servers.wt-mgcenter-web}
+          predicates:
+            - Host=${host-name.mgapi-qa}
+            - Path=/drug/sys/verifycode,/drug/decode/addDispenserMobile
+          filters:
+            - StripPrefix=1
+        # 眼镜店接口
+        - id: mgapi-qa-glasses
+          uri: ${lb-servers.glasses-web}
+          predicates:
+            - Host=${host-name.mgapi-qa}
+            - Path=/glasses
+          filters:
+            - StripPrefix=1
+        # 下载服务
+        - id: mgapi-qa-downloadService
+          uri: ${lb-servers.download-service-api-service}
+          predicates:
+            - Host=${host-name.mgapi-qa}
+            - Path=/downloadService
+          filters:
+            - StripPrefix=1
+        # 日志相关接口
+        - id: mgapi-qa-dev-opLog
+          uri: ${lb-servers.internethospital-web}
+          predicates:
+            - Host=${host-name.mgapi-qa}
+            - Path=/dev/opLog
+        # 后台api服务 end
+
+
+
+