From b1c00ede50ba51a46b1cfbcdf129f1e68b228e6c Mon Sep 17 00:00:00 2001
From: 邱宇豪 <qyh123230312>
Date: 星期一, 27 十一月 2023 11:16:32 +0800
Subject: [PATCH] 20231127_qiuyh_调整物料管理搅拌站入库记录

---
 hd/pipe/materialsManage/src/main/resources/application-dev.yml |   72 ++++++------------------------------
 1 files changed, 12 insertions(+), 60 deletions(-)

diff --git a/hd/pipe/materialsManage/src/main/resources/application-dev.yml b/hd/pipe/materialsManage/src/main/resources/application-dev.yml
index 53a1548..29ee1c0 100644
--- a/hd/pipe/materialsManage/src/main/resources/application-dev.yml
+++ b/hd/pipe/materialsManage/src/main/resources/application-dev.yml
@@ -1,70 +1,22 @@
-server:
-  port: 8892
 spring:
-  datasource:
-    master:
-      url: jdbc:mysql://111.30.93.215:7001/pipe_factories?nullCatalogMeansCurrent=true&allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&serverTimezone=GMT%2B8
-      driverClassName: com.mysql.cj.jdbc.Driver
-      username: javad
-      password: Thhy@123
-    slave:
-      url: jdbc:mysql://111.30.93.215:7002/pipe_factories?nullCatalogMeansCurrent=true&allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&serverTimezone=GMT%2B8
-      driverClassName: com.mysql.cj.jdbc.Driver
-      username: javad
-      password: Thhy@123
-    hikari:
-      maxLifeTime: 90000
-      maxPoolSize: 30
-      minIdle: 10
-      idleTimeOut: 170000
   config:
     activate:
       on-profile: dev
+    import:
+      - optional:nacos:${spring.application.name}-${spring.config.activate.on-profile}.${spring.cloud.nacos.config.file-extension}
+      - optional:nacos:pipe-common-${spring.config.activate.on-profile}.${spring.cloud.nacos.config.file-extension}
+      - optional:nacos:pipe-rocket-${spring.config.activate.on-profile}.${spring.cloud.nacos.config.file-extension}
   cloud:
     nacos:
       server-addr: 111.30.93.215:8848
       discovery:
         heart-beat-interval: 3000
         heart-beat-timeout: 15000
-        group: pipe
-mybatis:
-  mapper-locations: classpath*:/mapping/*.xml
-  configuration:
-    log-impl: org.apache.ibatis.logging.stdout.StdOutImpl
-    map-underscore-to-camel-case: true
-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\\
-  filePreKey: file
-feign:
-  enable: true
-rocketmq:
-  enable: true
-  consumer:
-    group: pipe
-    pull-batch-size: 10
-    access-key: rocketty
-    secret-key: Thhy@2023
-  name-server: 111.30.93.212:9876
-  producer:
-    group: pipe
-    sendMessageTimeout: 10000
-    retryTimesWhenSendFailed: 2
-    retryTimesWhenSendAsyncFailed: 2
-    maxMessageSize: 4096
-    compressMessageBodyThreshold: 4096
-    retryNextServer: false
-    access-key: rocketty
-    secret-key: Thhy@2023
\ No newline at end of file
+        group: supipe
+        namespace: suzhou
+      config:
+        file-extension: yml
+        group: sunacos
+        namespace: suzhou
+server:
+  port: ${${spring.application.name}port}
\ No newline at end of file

--
Gitblit v1.9.3