From cde9b4b4495f1a5b9e7b76a05f597225b43340f7 Mon Sep 17 00:00:00 2001
From: "limin.zhang" <limin.zhang@eveus.com>
Date: Mon, 13 Mar 2023 17:19:22 +0800
Subject: [PATCH] =?UTF-8?q?2023.03.13=20=E6=9B=B4=E6=96=B0dev=E7=8E=AF?=
 =?UTF-8?q?=E5=A2=83fms-notification=E9=85=8D=E7=BD=AE=E6=96=87=E4=BB=B6?=
 =?UTF-8?q?=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 config/dev/fms-notification/config.yaml | 72 -------------------------
 config/dev/fms-notification/dev.yaml    | 64 ++++++++++++++++++++++
 2 files changed, 64 insertions(+), 72 deletions(-)
 delete mode 100644 config/dev/fms-notification/config.yaml
 create mode 100644 config/dev/fms-notification/dev.yaml

diff --git a/config/dev/fms-notification/config.yaml b/config/dev/fms-notification/config.yaml
deleted file mode 100644
index 06739eb..0000000
--- a/config/dev/fms-notification/config.yaml
+++ /dev/null
@@ -1,72 +0,0 @@
-kafka:
-  consumerID: fms-pusher-prod
-  topic: 
-    gps: fleet-api-gps
-    general: fleet-api-notification
-  group:
-    gps: fms-pusher-prod-group
-    general: fms-pusher-prod-group
-  brokers:
-    - 192.168.2.239:9092
-  minBytes: 1e3
-  maxBytes: 2e6
-  maxWait: 5000
-  maxDealRoutineNum: 10
-  setOffset:
-    generalType: false
-    generalValue:
-    gpsType: false
-    gpsValue:
-  commitInterval:
-    gps: 1000
-    general: 0
-
-  # Type: false/offset/timestamp
-
-aws:
-  config:
-    region: ap-southeast-1
-    credentialsID: AKIAVZFGACWSM44VD4G6
-    credentialsSecret: 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
-  kafka:
-    topicArn: arn:aws:sns:ap-southeast-1:397632607652:wtest-sns-forward
-  cloudWatch:
-    namespace: FleetAPIWtest/ServiceMetrics
-    serviceStatus: DealNotificationPushStatusProd
-    timeDiff: fms_kafka_process_latency
-    sampleInterval:
-      gps: 10
-      general: 1
-
-gin:
-  maxTime: 12
-  port: :8060
-
-postGre:
-  maxIdleConns: 2
-  maxOpenConns: 5
-  host: 192.168.2.239
-  port: 5432
-  user: postgres
-  dbname: fms_notification
-  password: password
-
-
-redis:
-  index: 9
-  network: tcp
-#  address: fleet-dev.hreonp.ng.0001.use1.cache.amazonaws.com:6379
-  address: 192.168.2.239:6379
-
-
-sendgrid:
-  apiKey: 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
-  senderName: fms-pusher-mk
-  senderAddress: fms-pusher-mk@waylens.com
-  midEndName: mk-notification
-  midEndEmail: limin.zhang@eveus.com
-
-gps:
-  biasTime: 5
-
-fmsGpsServerAddress: http://192.168.2.164:9004
diff --git a/config/dev/fms-notification/dev.yaml b/config/dev/fms-notification/dev.yaml
new file mode 100644
index 0000000..261afc5
--- /dev/null
+++ b/config/dev/fms-notification/dev.yaml
@@ -0,0 +1,64 @@
+kafka:
+  consumerID: fleet_notification
+  topic: 
+    gps: fleet-api-gps
+    general: fleet-api-notification
+    sns: fleet-api-sns
+    mail: fleet-api-mail
+  group: 
+    gps: fms-notificaiton-group
+    general: fms-notification-group
+  brokers:
+    - 192.168.2.239:9092
+  minBytes: 1e3
+  maxBytes: 2e6
+  maxWait: 5000
+  maxDealRoutineNum: 10
+  setOffset:
+    generalType: false
+    generalValue:
+    gpsType: false
+    gpsValue:
+  commitInterval:
+    gps: 1000
+    general: 0
+  version: 2.6.3    
+
+# aws:
+#   config:
+#     region: us-east-1
+#     credentialsID: AKIAITM3NWTL6U5ZLS4Q
+#     credentialsSecret: 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
+#   topicArn: arn:aws:sns:us-east-1:955954582473:fleet_sns_forward
+
+gin:
+  maxTime: 12
+  port: :8060
+
+postGre:
+  maxIdleConns: 5
+  maxOpenConns: 15
+  host: 192.168.2.239
+  port: 5432
+  user: postgres
+  dbname: fms_notification
+  password: password
+
+redis:
+  index: 9
+  network: tcp
+  address: 192.168.2.239:6379
+
+
+# sendgrid:
+#   apiKey: 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
+#   senderName: no-reply
+#   senderAddress: no-reply@waylens.com
+#   midEndName: dev
+#   midEndEmail: yu.shi@waylens.com
+#  midEndEmail: midend@waylens.com
+
+gps:
+  biasTime: 5
+
+fmsGpsServerAddress: http://192.168.2.239:9004