From b7edb0f3526d5ca32016d5f332ddf957d74c01c2 Mon Sep 17 00:00:00 2001
From: jiazx0107@163.com <jiazx0107@163.com>
Date: 星期日, 24 十二月 2023 01:24:53 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/igds-api-gateway' into igds-api-gateway

---
 src/main/resources/application-dev.yml |   40 +++++++++++++---------------------------
 1 files changed, 13 insertions(+), 27 deletions(-)

diff --git a/src/main/resources/application-dev.yml b/src/main/resources/application-dev.yml
index e1c3216..eb50cd5 100644
--- a/src/main/resources/application-dev.yml
+++ b/src/main/resources/application-dev.yml
@@ -5,7 +5,7 @@
   datasource:
     #涓绘暟鎹簮
     primary:
-      url: jdbc:mysql://127.0.0.1:3306/igds_api?useUnicode=true&useSSL=false&characterEncoding=utf-8
+      url: jdbc:mysql://127.0.0.1:3306/igds_api_5012?useUnicode=true&useSSL=false&characterEncoding=utf-8
       #      url: jdbc:mysql://127.0.0.1:3306/igds_api_5016?useUnicode=true&useSSL=false&characterEncoding=utf-8     #澶ф咕鍖�
       #      url: jdbc:mysql://127.0.0.1:3306/igds_api_5303?useUnicode=true&useSSL=false&characterEncoding=utf-8     #涓婃捣鍢夊畾
       #      url: jdbc:mysql://127.0.0.1:3306/igds_api_5311?useUnicode=true&useSSL=false&characterEncoding=utf-8     #骞挎境
@@ -32,7 +32,7 @@
       driver-class-name: com.mysql.jdbc.Driver
     #娆℃暟鎹簮
     secondary:
-      url: jdbc:mysql://127.0.0.1:3306/igds_v40?useUnicode=true&useSSL=false&characterEncoding=utf-8
+      url: jdbc:mysql://127.0.0.1:3306/igds_5012?useUnicode=true&useSSL=false&characterEncoding=utf-8
       #      url: jdbc:mysql://127.0.0.1:3306/igds_3.5_5016?useUnicode=true&useSSL=false&characterEncoding=utf-8  #澶ф咕鍖�
       #      url: jdbc:mysql://127.0.0.1:3306/igds_3.5_5303?useUnicode=true&useSSL=false&characterEncoding=utf-8  #涓婃捣鍢夊畾
       #      url: jdbc:mysql://127.0.0.1:3306/igds_3.5_5311?useUnicode=true&useSSL=false&characterEncoding=utf-8  #骞挎境
@@ -75,6 +75,7 @@
       max-idle: 10
       min-idle: 0
       timeout: 6000
+
   kafka:
     bootstrap-servers: 103.203.217.42:9092
     security-protocol: SASL_PLAINTEXT
@@ -82,33 +83,18 @@
     sasl-jaas-config: org.apache.kafka.common.security.scram.ScramLoginModule required username=\"{username}\" password=\"{password}\";"
     sasl-username: sc001
     sasl-password: wCV0ISwmoKwbx1lpBKMW
-    producer: # producer 鐢熶骇鑰�
-      retries: 0 # 閲嶈瘯娆℃暟
-      acks: 1 # 搴旂瓟绾у埆:澶氬皯涓垎鍖哄壇鏈浠藉畬鎴愭椂鍚戠敓浜ц�呭彂閫乤ck纭(鍙��0銆�1銆乤ll/-1)
-      batch-size: 16384 # 鎵归噺澶у皬
-      buffer-memory: 33554432 # 鐢熶骇绔紦鍐插尯澶у皬
+    enabled: false
+    producer:
+      retries: 0
+      acks: 1
+      batch-size: 16384
+      buffer-memory: 33554432
       key-serializer: org.apache.kafka.common.serialization.StringSerializer
       value-serializer: org.apache.kafka.common.serialization.StringSerializer
-    consumer: # consumer娑堣垂鑰�
-      group-id: fzzygroup # 榛樿鐨勬秷璐圭粍ID
-      enable-auto-commit: true # 鏄惁鑷姩鎻愪氦offset
-      auto-commit-interval: 100  # 鎻愪氦offset寤舵椂(鎺ユ敹鍒版秷鎭悗澶氫箙鎻愪氦offset)
-
-      # earliest:褰撳悇鍒嗗尯涓嬫湁宸叉彁浜ょ殑offset鏃讹紝浠庢彁浜ょ殑offset寮�濮嬫秷璐癸紱鏃犳彁浜ょ殑offset鏃讹紝浠庡ご寮�濮嬫秷璐�
-      # latest:褰撳悇鍒嗗尯涓嬫湁宸叉彁浜ょ殑offset鏃讹紝浠庢彁浜ょ殑offset寮�濮嬫秷璐癸紱鏃犳彁浜ょ殑offset鏃讹紝娑堣垂鏂颁骇鐢熺殑璇ュ垎鍖轰笅鐨勬暟鎹�
-      # none:topic鍚勫垎鍖洪兘瀛樺湪宸叉彁浜ょ殑offset鏃讹紝浠巓ffset鍚庡紑濮嬫秷璐癸紱鍙鏈変竴涓垎鍖轰笉瀛樺湪宸叉彁浜ょ殑offset锛屽垯鎶涘嚭寮傚父
+    consumer:
+      group-id: fzzygroup
+      enable-auto-commit: true
+      auto-commit-interval: 100
       auto-offset-reset: latest
       key-deserializer: org.apache.kafka.common.serialization.StringDeserializer
       value-deserializer: org.apache.kafka.common.serialization.StringDeserializer
-
-mqtt:
-  host: tcp://10.13.4.84:11883
-  client-id:
-  client-username:
-  client-password:
-  client-timeout: 10
-  client-alive-time: 20
-  client-max-connect-times: 5
-  client-topics:
-  client-qos: 0
-  isOpen: false

--
Gitblit v1.9.3