From 232cab080647152de06755fbac3d4170629d5b3c Mon Sep 17 00:00:00 2001
From: 叶松 <2217086471@qq.com>
Date: 星期二, 26 九月 2023 10:25:58 +0800
Subject: [PATCH] Merge branch 'master' of http://111.30.93.211:10101/r/supipe

---
 hd/pipe/gateway/src/main/resources/application-pro.yml |   88 +++----------------------------------------
 1 files changed, 7 insertions(+), 81 deletions(-)

diff --git a/hd/pipe/gateway/src/main/resources/application-pro.yml b/hd/pipe/gateway/src/main/resources/application-pro.yml
index 745a726..bf4520a 100644
--- a/hd/pipe/gateway/src/main/resources/application-pro.yml
+++ b/hd/pipe/gateway/src/main/resources/application-pro.yml
@@ -1,90 +1,16 @@
-server:
-  port: 8880
 spring:
   cloud:
     nacos:
-      server-addr: 111.30.93.212:8848
+      server-addr: 111.30.93.215:8848
       discovery:
-        server-addr: ${spring.cloud.nacos.server-addr}
         heart-beat-interval: 3000
         heart-beat-timeout: 15000
-        group: pipe
-    gateway:
-      filter:
-        strip-prefix:
-          enabled: true
-  application:
-    name: gateway
+        group: supipe
+      config:
+        file-extension: yml
+        group: sunacos
   config:
     activate:
       on-profile: pro
-redisson:
-  enable: true
-  address: redis://111.30.93.215:6379
-  password: Thhy@123
-  timeout: 10000
-  connectTimeout: 20000
-  connectionPoolSize: 100
-  connectionMinimumIdleSize: 10
-  retryAttempts: 5
-  retryInterval: 3000
-  redissonCacheDefault: 86400000
-global:
-  keyPrefix: pipe
-  dataSnap: false   #日志快照功能
-  baseDirName: D:\\file\\
-excludeurls:
-  - "/login"
-  - "/sysUser/findList"
-  - "/platUser/export"
-  - "/depart/export"
-  - "/group/export"
-  - "/group/groupUserExport"
-  - "/dorm/viewcode"
-  - "/spare/export"
-  - "/city/cities"
-  - "/rsbMaterialPlan/export"
-  - "/file/upload"
-  - "/file/down"
-  - "/file/preview"
-  - "/projectInfo/export"
-  - "/pipeInfo/export"
-  - "/steelPrint/test"
-  - "/hardware/outMod"
-  - "/secureGood/viewcode"
-  - "/rsbMaterialPlan/statExport"
-  - "/mixingstationstorage/statExport"
-  - "/platUser/register"
-  - "/company/pulldown"
-  - "/company/findAll"
-  - "/position/findall"
-  - "/mpLogin"
-  - "/mpLogin/getOpenId"
-  - "/platUser/checkuser"
-  - "/exam/examRecordDown"
-  - "/pl/prolisten"
-  - "/screen/display"
-  - "/prolistenserver/"
-  - "/mixMaterial/export"
-  - "/bigDevice/bigDeviceInfo"
-  - "/pipeInfo/h5PipeList"
-  - "/pipeInfo/checkHistory"
-  - "/waterCultivated/getH5WaterRecord"
-  - "/modcheck/getH5MouldInfo"
-  - "/steelProduce/getH5SteelProduce"
-  - "/steel/steelThingJsList"
-  - "/record/recordThingJsList"
-  - "/project/projectSizeThingJsList"
-  - "/pipecreen/pipeThingJsInfo"
-  - "/platUser/doorlis"
-  - "/pipecreen/pipePlanProduct"
-  - "/platUser/isuplis"
-  - "/video/videoList"
-  - "/video/videoListPath"
-  - "/platUser/faceRecord"
-  - "/pl/agv"
-  - "/pipecreen/materialRecord"
-  - "/pl/monthProductRingByPro"
-  - "/steelProduce/produceLoopingThingJs"
-  - "/platUser/doorlisWithPic"
-  - "/steel/restDataByOne"
\ No newline at end of file
+    import:
+      - optional:nacos:${spring.application.name}-${spring.config.activate.on-profile}.${spring.cloud.nacos.config.file-extension}
\ No newline at end of file

--
Gitblit v1.9.3