From d2d44b380350aa6416d54e6f590815183b368742 Mon Sep 17 00:00:00 2001 From: "limin.zhang" Date: Mon, 13 Mar 2023 10:33:28 +0800 Subject: [PATCH] =?UTF-8?q?2023.03.13=20=E5=A2=9E=E5=8A=A0dev=E7=8E=AF?= =?UTF-8?q?=E5=A2=83=E7=9A=84=E9=85=8D=E7=BD=AE=E6=96=87=E4=BB=B6=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- config/dev/fms-core/dev.conf | 25 ++ config/dev/fms-core/dev_actor.conf | 17 + config/dev/fms-core/dev_core.conf | 297 ++++++++++++++++++ .../fms-core/wtest_fleet_private_key.pem | 0 config/dev/fms-gps/dev.conf | 6 + config/dev/fms-gps/dev_application.conf | 72 +++++ config/dev/fms-master/dev1.conf | 28 ++ config/dev/fms-master/dev2.conf | 28 ++ config/{ => dev}/fms-master/logback.xml | 0 config/dev/fms-notification/config.yaml | 72 +++++ config/{ => dev}/fms-sns/config.conf | 0 config/{ => wtest}/fms-core/wtest.conf | 0 config/{ => wtest}/fms-core/wtest_actor.conf | 0 config/{ => wtest}/fms-core/wtest_core.conf | 0 .../fms-core/wtest_fleet_private_key.pem | 27 ++ config/{ => wtest}/fms-gps/wtest.conf | 0 .../fms-gps/wtest_application.conf | 0 config/{ => wtest}/fms-master/dev.conf | 0 config/wtest/fms-master/logback.xml | 64 ++++ config/{ => wtest}/fms-master/master1.conf | 0 config/{ => wtest}/fms-master/master2.conf | 0 .../{ => wtest}/fms-notification/config.yaml | 0 config/wtest/fms-sns/config.conf | 24 ++ 23 files changed, 660 insertions(+) create mode 100644 config/dev/fms-core/dev.conf create mode 100644 config/dev/fms-core/dev_actor.conf create mode 100644 config/dev/fms-core/dev_core.conf rename config/{ => dev}/fms-core/wtest_fleet_private_key.pem (100%) create mode 100644 config/dev/fms-gps/dev.conf create mode 100644 config/dev/fms-gps/dev_application.conf create mode 100644 config/dev/fms-master/dev1.conf create mode 100644 config/dev/fms-master/dev2.conf rename config/{ => dev}/fms-master/logback.xml (100%) create mode 100644 config/dev/fms-notification/config.yaml rename config/{ => dev}/fms-sns/config.conf (100%) rename config/{ => wtest}/fms-core/wtest.conf (100%) rename config/{ => wtest}/fms-core/wtest_actor.conf (100%) rename config/{ => wtest}/fms-core/wtest_core.conf (100%) create mode 100644 config/wtest/fms-core/wtest_fleet_private_key.pem rename config/{ => wtest}/fms-gps/wtest.conf (100%) rename config/{ => wtest}/fms-gps/wtest_application.conf (100%) rename config/{ => wtest}/fms-master/dev.conf (100%) create mode 100644 config/wtest/fms-master/logback.xml rename config/{ => wtest}/fms-master/master1.conf (100%) rename config/{ => wtest}/fms-master/master2.conf (100%) rename config/{ => wtest}/fms-notification/config.yaml (100%) create mode 100644 config/wtest/fms-sns/config.conf diff --git a/config/dev/fms-core/dev.conf b/config/dev/fms-core/dev.conf new file mode 100644 index 0000000..ccd620f --- /dev/null +++ b/config/dev/fms-core/dev.conf @@ -0,0 +1,25 @@ +# This is the configuration file for the gpst prod1 +include "dev_core.conf" +include "dev_actor.conf" + +slick { + dbs { + default { + db { + numThreads = 10 // evolutions is 20 + maxConnections = 10 // evolutions is 5*numThread + } + } + } +} + + +provider.kafka.producerClientID=fleet_api_prod1 + +akka.http.server.idle-timeout = 45 seconds +play.server.http.idleTimeout = 45 seconds + + +s360.workerID = 1 +s360.dataCenterID = 1 + diff --git a/config/dev/fms-core/dev_actor.conf b/config/dev/fms-core/dev_actor.conf new file mode 100644 index 0000000..7d41527 --- /dev/null +++ b/config/dev/fms-core/dev_actor.conf @@ -0,0 +1,17 @@ +contact-points = [ + "akka.tcp://ClusterSystem@192.168.2.164:2551", + "akka.tcp://ClusterSystem@192.168.2.164:2552" +] + +play.akka.actor-system = "mkfleet-4g-actor-system" + +akka { + remote.netty.tcp.port=45000 + remote.netty.tcp.hostname=192.168.2.164 + + remote.netty.tcp.bind-port=45000 + remote.netty.tcp.bind-hostname=0.0.0.0 + + actor.provider = "akka.cluster.ClusterActorRefProvider" + extensions = ["akka.cluster.client.ClusterClientReceptionist"] +} diff --git a/config/dev/fms-core/dev_core.conf b/config/dev/fms-core/dev_core.conf new file mode 100644 index 0000000..890f36c --- /dev/null +++ b/config/dev/fms-core/dev_core.conf @@ -0,0 +1,297 @@ +# This is the main configuration file for the application. +# ~~~~~ + +# Secret key +# ~~~~~ +# The secret key is used to secure cryptographics functions. +# If you deploy your application to several instances be sure to use the same key! +play.crypto.secret = "]plvsqIOx02py7>9aoiugbDZejiGPDEE[bQL5z@/NAKbtnQ5E@KZwKGUf3kJqLgT" + +# The application languages +# ~~~~~ +play.i18n.langs = ["en"] + +# The application DI modules +play.modules { + enabled += "modules.AppModule" + enabled += "modules.ActorModule" + #enabled += "play.modules.swagger.SwaggerModule" +} + +# Evolutions +# ~~~~~ +# You can disable evolutions if needed +# evolutionplugin=disabled +play.evolutions.enabled = true +play.evolutions.autoApply = true + +# Logger +# ~~~~~ +# You can also configure logback (http://logback.qos.ch/), +# by providing an application-logger.xml file in the conf directory. + +# Root logger: +logger.root = ERROR + +# Logger used by the framework: +logger.play = INFO + +# Logger provided to your application: +logger.application = DEBUG + + +# WS +play.ws.timeout { + connection = 6s // evolutions.evolutions is 120 + idle = 30s // evolutions.evolutions is 120 + request = 6s //evolutions.evolutions is 120 +} + +play.http { + forwarded.trustedProxies = [ "0.0.0.0/0" ] + parser.maxDiskBuffer=209715200 //200M default + parser.maxMemoryBuffer=2M +} + +# Filter +play.filters.enabled += "play.filters.cors.CORSFilter" +play.filters.cors { + pathPrefixes = ["/"] + allowedHttpMethods = ["POST", "GET", "PUT", "DELETE", "OPTIONS"] + allowedHttpHeaders = ["Origin", "X-Requested-With", "Content-Type", "Accept", "Referer", "User-Agent", "X-Auth-Token"] + supportsCredentials = false +} + + +# Global object class +# ~~~~~ +# Define the Global object class for this application. +# Default to Global in the root package. +# application.global=Global + +# Router +# ~~~~~ +# Define the Router object to use for this application. +# This router will be looked up first when the application is starting up, +# so make sure this is the entry point. +# Furthermore, it's assumed your route file is named properly. +# So for an application router like `my.application.Router`, +# you may need to define a router file `conf/my.application.routes`. +# Default to Routes in the root package (and conf/routes) +# application.router=my.application.Routes + +# Database configuration +# ~~~~~ +# You can declare as many datasources as you want. +# By convention, the evolutions.evolutions datasource is named `evolutions.evolutions` +# +# db.evolutions.evolutions.driver=org.h2.Driver +# db.evolutions.evolutions.url="jdbc:h2:mem:play" +# db.evolutions.evolutions.user=sa +# db.evolutions.evolutions.password="" +slick { + dbs { + default { + profile = "slick.jdbc.PostgresProfile$" + db { + driver = "org.postgresql.Driver" + url = "jdbc:postgresql://192.168.2.239/fms_api" + user = "postgres" + password = "password" + connectionTimeout = "10000" + numThreads = 3 // evolutions is 20 + maxConnections = 3 // evolutions is 5*numThread + + } + } + } +} + +# Redis +jedis { + hosts = ["192.168.2.239:6379"] + maxIdle = 80 + maxTotal = 80 + timeout = 3000 + maxWaitMillis = 3000 + isCluster = false + database = 8 + testOnBorrow = true + testOnReturn = true +} + +# Kafka +provider.kafka.producerNum=6 +provider.kafka.producerClientID=fleet_api_prod +#kafka.server.address="b-1.mkfleet.k48ako.c2.kafka.ap-southeast-1.amazonaws.com:9092,b-2.mkfleet.k48ako.c2.kafka.ap-southeast-1.amazonaws.com:9092" +kafka.server.address="192.168.2.239:9092" + +kafka.gps.topic=fleet-api-gps +kafka.notification.topic=fleet-api-notification + +# fms_gps Server (waylens-fms-clip) +fms_gps.server.address = "http://192.168.2.164:9004" +# notification push server (waylens-fms-notification) +provider.waylens.notificationPusher.endpoint="http://192.168.2.164:8060/fmsKafka" + + +# mptool server +internal { + # mptool which provides camera information + mp { + server = "https://horn.vidit.com.cn" + getMPSyncInfoApi = "/api/mp/v1.0/cameras/" + } +} + +# att +provider.att { + endpoint = "https://api-iotdevice.att.com/rws/api/v1" + licensekey { + default = "todo" + } + customer { + default = "todo" + } + username { + default = "todo" + } + custom { + default = "todo" + } + defaultDataPlan { + default = "todo" + } + overageLimitOverride { + default = "PERMANENT_OVERRIDE" + } + billingDay = 19 +} + +# clip server (waylens-fms-clip) +provider.backend { + endpoint="http://192.168.2.167:36458/v.1.0" + key="dqy0S3MAdDLOp50R" + endpointForRemuxMp4 ="http://192.168.2.167:16587/v.1.0" +} + +# AWS +provider.aws { + key = "AKIAVZFGACWSFXGVXCNA" + secret = "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" + region = "ap-southeast-1" + + sns { + region = "ap-southeast-1" + fleetArn = "arn:aws:sns:ap-southeast-1:397632607652:wtest-sns-forward" + protocol = "https" + } + + cloudFront { + keyPairId = "K19X44RTV6O2RC" + keyPairFile = "../wtest_fleet_private_key.pem" + } +} + +# Wowza parameters +provider.wowza { + defaultPublishServer = "rtmp://54.255.235.62" + appName = "live_fleet" + publishUsername = "publishfleet" + publishPassword = "E54d22d793" + playSecret = "Sh4Tgsl2l43lB" + playParam = "fleet" + playProtocol = "rtmp" + playProtocolCN = "rtmp" + audio{ + host="54.255.235.62" + port=1935 + appName="live_audio", + publishUsername = "fleet_audio" + publishPassword = "waylensfleet2019" + } + privateIPMap { + #"18.116.56.97": "172.31.34.99" + } + + domainMap { + "172.20.24.171": "54.255.235.62" + } +} + +# Sendgrid Mail +mail { + midend.recipient = "midend@waylens.com" + internal.from = "fleet@waylens.com" +} + +sendgrid { + apikey="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" +} + + +# clip storage & cloudfront +clip.storage.bucket = "/wtestfleet/clip/" +clip.storage.address { + default = "https://cdn.fleet.eveus.com/clip/" +} + +# streaming storage & cloudfront +streaming.storage.bucket = "/wtestfleet/live_video/" +streaming.storage.address { + default = "https://cdn.fleet.eveus.com/live_video/" +} + +# firmware storage & cloudfront +firmware.storage.bucket= "/wtestfleet/firmware" +firmware.storage.address { + default = "https://cdn.fleet.eveus.com/firmware/" +} + +# gpsReport.storage cloudfront +gpsReport.storage.address { + default = "https://cdn.fleet.eveus.com/gps_data_report/" +} + +# fleetReport.storage cloudfront +fleetReport.storage.address { + default = "https://cdn.fleet.eveus.com/fleet_report/" +} + +# log storage cloudfront +log.storage.address = "https://cdn.fleet.eveus.com/log/" + +# audio storage & cloudfront +audio.storage.bucket="wtestfleet" +audio.storage.address="https://cdn.fleet.eveus.com/audio/" + + +clip.request.pendingTimeout = 604800 +clip.storage.maxAge { + default = 15811200 +} +clip.uploading.supportResume = true + + + +provider.backend.useDomain=true + +# log autoupload parameters +log.autoUpload.enable=true +log.autoUpload.periodInDay=30 +log.autoUpload.minIntervalInMinute=720 + +# test update parameters +test.UpdateOldUnfinishedTrip=true +test.UpdateLastSysTimeDurationInMs=3000 + +# some other parameters +dataUsage.cacheTime = 21600 +ota.firstTime.delayInDays = 0 +server.waylensPricing = false +# Camera automatically activated after register +server.autoActivated = true +# Disalbe iccid check +server.checkIccid = false +api.version="v3.05" +server.env="MK" diff --git a/config/fms-core/wtest_fleet_private_key.pem b/config/dev/fms-core/wtest_fleet_private_key.pem similarity index 100% rename from config/fms-core/wtest_fleet_private_key.pem rename to config/dev/fms-core/wtest_fleet_private_key.pem diff --git a/config/dev/fms-gps/dev.conf b/config/dev/fms-gps/dev.conf new file mode 100644 index 0000000..b3bfbda --- /dev/null +++ b/config/dev/fms-gps/dev.conf @@ -0,0 +1,6 @@ +include "dev_application" + +compress.devices { + count = 1 + currentValue = 0 +} diff --git a/config/dev/fms-gps/dev_application.conf b/config/dev/fms-gps/dev_application.conf new file mode 100644 index 0000000..be7af12 --- /dev/null +++ b/config/dev/fms-gps/dev_application.conf @@ -0,0 +1,72 @@ + +play.http.secret.key="qrzrCr;PbI5tzSmTZ:BT3OCiSpG=pF7T0<;TDB^wKo8M]I_UdyeEbNm?lPFILJVG" +play.i18n.langs=[ "en" ] + + +play.modules { + enabled += "modules.AppModule" + enabled += "tasks.TrackTasksModule" + enabled += "tasks.GpsWritingTasksModule" + enabled += "tasks.TableTasksModule" +} + +play.evolutions { + enabled = true + autoApply = true +} + +slick { + dbs { + default { + profile = "slick.jdbc.PostgresProfile$" + db { + driver = "org.postgresql.Driver" + url = "jdbc:postgresql://192.168.2.239:5432/fms_gps" + user = "postgres" + password = "password" + connectionTimeout = "10000" + numThreads = 10 // evolutions is 20 + maxConnections = 10 // evolutions is 5*numThread + + } + } + } +} + +# Filter +play.filters { + enabled += "play.filters.cors.CORSFilter" + enabled += "play.filters.hosts.AllowedHostsFilter" + cors { + pathPrefixes = ["/"] + allowedHttpMethods = ["POST", "GET", "PUT", "DELETE", "OPTIONS"] + allowedHttpHeaders = ["Origin", "X-Requested-With", "Content-Type", "Accept", "Referer", "User-Agent", "X-Auth-Token"] + supportsCredentials = false + } + hosts { + allowed = ["."] + } +} + +play.http { + forwarded.trustedProxies = ["0.0.0.0/0"] + parser.maxDiskBuffer = 209715200 //200M default + parser.maxMemoryBuffer = 2M +} + +kafka { + server.address="192.168.2.239:9092" + gps { + topic = "fleet-api-gps" + insert.timeout = 300 + batchReceive = 100 + consumer.groupID = "fleet-gps-api-consumer-write2db" + } +} + +kafka.gps.insert.timeout = 300 + +compress.devices { + count = 1 + currentValue = 0 +} diff --git a/config/dev/fms-master/dev1.conf b/config/dev/fms-master/dev1.conf new file mode 100644 index 0000000..ad4e6dc --- /dev/null +++ b/config/dev/fms-master/dev1.conf @@ -0,0 +1,28 @@ +akka { + + actor.provider = "akka.cluster.ClusterActorRefProvider" + + remote { + netty { + tcp { + hostname = 192.168.2.164 + port = 2551 + } + } + } + + cluster { + seed-nodes = [ + "akka.tcp://ClusterSystem@192.168.2.164:2551", + "akka.tcp://ClusterSystem@192.168.2.164:2552"] + + # auto-down-unreachable-after = 10s + } + + extensions = ["akka.cluster.client.ClusterClientReceptionist"] + + loggers = ["akka.event.slf4j.Slf4jLogger"] + loglevel = "DEBUG" + logging-filter = "akka.event.slf4j.Slf4jLoggingFilter" +} +redis.host = "192.168.2.239" diff --git a/config/dev/fms-master/dev2.conf b/config/dev/fms-master/dev2.conf new file mode 100644 index 0000000..53c8eb6 --- /dev/null +++ b/config/dev/fms-master/dev2.conf @@ -0,0 +1,28 @@ +akka { + + actor.provider = "akka.cluster.ClusterActorRefProvider" + + remote { + netty { + tcp { + hostname = 192.168.2.164 + port = 2552 + } + } + } + + cluster { + seed-nodes = [ + "akka.tcp://ClusterSystem@192.168.2.164:2551", + "akka.tcp://ClusterSystem@192.168.2.164:2552"] + + # auto-down-unreachable-after = 10s + } + + extensions = ["akka.cluster.client.ClusterClientReceptionist"] + + loggers = ["akka.event.slf4j.Slf4jLogger"] + loglevel = "DEBUG" + logging-filter = "akka.event.slf4j.Slf4jLoggingFilter" +} +redis.host = "192.168.2.239" diff --git a/config/fms-master/logback.xml b/config/dev/fms-master/logback.xml similarity index 100% rename from config/fms-master/logback.xml rename to config/dev/fms-master/logback.xml diff --git a/config/dev/fms-notification/config.yaml b/config/dev/fms-notification/config.yaml new file mode 100644 index 0000000..06739eb --- /dev/null +++ b/config/dev/fms-notification/config.yaml @@ -0,0 +1,72 @@ +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/fms-sns/config.conf b/config/dev/fms-sns/config.conf similarity index 100% rename from config/fms-sns/config.conf rename to config/dev/fms-sns/config.conf diff --git a/config/fms-core/wtest.conf b/config/wtest/fms-core/wtest.conf similarity index 100% rename from config/fms-core/wtest.conf rename to config/wtest/fms-core/wtest.conf diff --git a/config/fms-core/wtest_actor.conf b/config/wtest/fms-core/wtest_actor.conf similarity index 100% rename from config/fms-core/wtest_actor.conf rename to config/wtest/fms-core/wtest_actor.conf diff --git a/config/fms-core/wtest_core.conf b/config/wtest/fms-core/wtest_core.conf similarity index 100% rename from config/fms-core/wtest_core.conf rename to config/wtest/fms-core/wtest_core.conf diff --git a/config/wtest/fms-core/wtest_fleet_private_key.pem b/config/wtest/fms-core/wtest_fleet_private_key.pem new file mode 100644 index 0000000..0115977 --- /dev/null +++ b/config/wtest/fms-core/wtest_fleet_private_key.pem @@ -0,0 +1,27 @@ +-----BEGIN RSA PRIVATE KEY----- +MIIEpAIBAAKCAQEA42RCX28xcStNe9qYxmOEWU0VFn61RHMEjvKniIN6ajto/tT5 +RLAFBvBGjsEm1QSosaELRPNrFZacb0rfCioD1fI23VBLRWWaf/j4mTI4SJOH4ZNw +HSTaxfkUOY4Vr0A4JHDXqh5a842hiHqPxTMNGqbP/NLqACeJBHHAWlrHdyt0UNXE +m8qqvqZQFOZrnbEcZXnGrnRNnVxGjvHFp/rUh3UocWEnnaZv+BdzqkkKATvWXcOE +W9ZyvnoTQgSbSDInwX5cw7t+W7CjvJ8QLWZAsw/Ndn624BtxgdudLoICFrEK/74p +9eEZ5Wzm7x5kbSr+qbcjL2xFO/lhAiFtDqjsbQIDAQABAoIBAGPlLL9uQuM7qcuK +aell2MO+eFAslAehG9SMx4rSb9nxhZvGBkflqB+3ONgIBL46UL3QSPoekeGnC8xc +sQVvFcZMpUuutZKkIy6rOtNaW52Oqngv5GX5Rd8JIJh0UhRuevuPUz9aHIy4oMkr +RrPUTKJzvBWOttwggjIgoudO0CgKa/yFgst6pXmYlkvLkVTqktE5yqiiQ4GowPVu +5uTwA1VLzn29VLmdJsagdDPtBXSgSmKjLrNO1xvimSvT+cK5ezPrdM1eHHI8lhVF +5HaBxSRzZI0YzM8YPoQ4q2DPSCuu9XxzTWlZ5nviUOgJ6HGYS6OyJPPn+xvjYGFo +uXenj8UCgYEA95ruyadc9WtbWi9nb/egzbAZawG8sN81lRQbShuaxn8vKxAAedwi +tkcs9pHs3execykBo39ksWx+AX5YFFkSt8ueqp6Ks9O9HrgfscNuSK8g3+pcLo8f +kTz553cLfsNwTjPJYOdmWRY+qg1ki/mnYpEJb1WYHSpfVr2sTqs+NjMCgYEA6xni +eCrXdRJvuoFwdjdNEQvsJ2faGhAIPiKtnRSLBFZwVXKO1My6YQQ2CKWBH2DhxWEv +F3pvgsCFAmwknyGHCzAHQeO41daSMoxxRNsRjaIsbnsqnahDlz8eRAF4p/NGavH8 +3DifjGCGjT3RkG7iRLNFXu9dbQrm5/upFSxXct8CgYEA4F6yAWO6ld3p0whfyBNx +0NHBxri1PuWVTXkB3Z60GylHGdOPSt3TSq+mq+zB4rv9PoerJ3gaS7iPWlUeBZpN +nuVR6zRtZdT6bCrW9aOtfQnNVXque7ZQGbFSl4/Fh+IcE5FT647krNe+gyRNt5XM +O0JIdW3vwIYUDKslx8ffQQcCgYEArjiSYSauX+13qqh9ZL16eOVy7YjCUYoL8a/V +JJCyrFY6DLhGLGBCxd5PBH1RgKVU6eYo9acft69fYfot8VbxMlM3LZbJxH2r/ZWh +4rrM+T5y2rSfUhH9dLmrfg3xEdTwHBSTo8a6RVbKnyRuhjAFsY+AGugbPdFUaBlQ +pYYkj9UCgYBwUc6HaoSzuFocxn2hHXz99SxO3QZcILXuG3CC0lZn3n+tKJNOugYF +RpqgQno3ieZIbYvYtXBJZYIy2JwFFIgrIBuhi5x0Dfn3qNEbghTyjurHCjD5Zwts +HbyLHCAM6KUVPvXEeIKQiuRtitoErzV9y5dw+ihwttO7OcBT3cAN6Q== +-----END RSA PRIVATE KEY----- diff --git a/config/fms-gps/wtest.conf b/config/wtest/fms-gps/wtest.conf similarity index 100% rename from config/fms-gps/wtest.conf rename to config/wtest/fms-gps/wtest.conf diff --git a/config/fms-gps/wtest_application.conf b/config/wtest/fms-gps/wtest_application.conf similarity index 100% rename from config/fms-gps/wtest_application.conf rename to config/wtest/fms-gps/wtest_application.conf diff --git a/config/fms-master/dev.conf b/config/wtest/fms-master/dev.conf similarity index 100% rename from config/fms-master/dev.conf rename to config/wtest/fms-master/dev.conf diff --git a/config/wtest/fms-master/logback.xml b/config/wtest/fms-master/logback.xml new file mode 100644 index 0000000..bf0e726 --- /dev/null +++ b/config/wtest/fms-master/logback.xml @@ -0,0 +1,64 @@ + + + + + + + + + + [%d{yyyy-MM-dd HH:mm:ss.SSS}][%-5level][%logger{128}][%thread] %message%n%xException{5} + + + + + + ${log.txtfile}_%d{yyyy-MM-dd}.log + + + + [%d{yyyy-MM-dd HH:mm:ss.SSS}][%-5level][%logger{128}][%thread] %message%n%xException{5} + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/config/fms-master/master1.conf b/config/wtest/fms-master/master1.conf similarity index 100% rename from config/fms-master/master1.conf rename to config/wtest/fms-master/master1.conf diff --git a/config/fms-master/master2.conf b/config/wtest/fms-master/master2.conf similarity index 100% rename from config/fms-master/master2.conf rename to config/wtest/fms-master/master2.conf diff --git a/config/fms-notification/config.yaml b/config/wtest/fms-notification/config.yaml similarity index 100% rename from config/fms-notification/config.yaml rename to config/wtest/fms-notification/config.yaml diff --git a/config/wtest/fms-sns/config.conf b/config/wtest/fms-sns/config.conf new file mode 100644 index 0000000..c794912 --- /dev/null +++ b/config/wtest/fms-sns/config.conf @@ -0,0 +1,24 @@ +//ronglian +RLbaseUrl=https://app.cloopen.com:8883 +RLaccountSid=8a48b5514fba2f87014fc228cc0f1312 +RLappId=8aaf070863399ed901634dceea3c0f94 +RLauthToken=85cd39af239441f89437583a2fbb6584 + + +//sendgrid Email +senderName=no-reply +senderAddress=no-reply@waylens.com +SENDGRID_API_KEY=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 + +phoneList=+8613818522209,+8618821216962,+8618001708850 +emailList=midend@waylens.com,vincent.sun@waylens.com,Farshid@waylens.com,npodila@fleetup.com,baddison@insightmobiledata.com +recoverEmailList=yu.shi@waylens.com + +//ali +aliAccessKeyId=LTAI4G39Lr3MdMWfji59HxzG +aliAccessSecret=V2kL0kSSUjKnkNsY5tqseTC1ZCWSQy +ttsCode=TTS_203197230 +aliPhoneList=+8613818522209 + + +