From 877006e4947d88ecbc1e0258b0e72127e9160ab2 Mon Sep 17 00:00:00 2001 From: "limin.zhang" Date: Mon, 20 Mar 2023 15:47:57 +0800 Subject: [PATCH] =?UTF-8?q?2023.03.20=20=E6=95=B4=E7=90=86dev=E7=8E=AF?= =?UTF-8?q?=E5=A2=83=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 --- dev/config/fms-core/dev_core.conf | 4 +- .../fms-core/wtest_fleet_private_key.pem | 27 -------- dev/config/fms-gps/logback.xml | 64 +++++++++++++++++++ .../fms-notification/{ => config}/dev.yaml | 0 .../fms-sns/config/{config.yaml => dev.yaml} | 0 dev/config/fms-sns/configure/config.conf | 24 ------- dev/service/fms-core.service | 14 ++++ dev/service/fms-gps.service | 14 ++++ dev/service/fms-master.service | 14 ++++ dev/service/fms-notification.service | 18 ++++++ dev/service/fms-sns.service | 18 ++++++ 11 files changed, 145 insertions(+), 52 deletions(-) delete mode 100644 dev/config/fms-core/wtest_fleet_private_key.pem create mode 100644 dev/config/fms-gps/logback.xml rename dev/config/fms-notification/{ => config}/dev.yaml (100%) rename dev/config/fms-sns/config/{config.yaml => dev.yaml} (100%) delete mode 100644 dev/config/fms-sns/configure/config.conf create mode 100644 dev/service/fms-core.service create mode 100644 dev/service/fms-gps.service create mode 100644 dev/service/fms-master.service create mode 100644 dev/service/fms-notification.service create mode 100644 dev/service/fms-sns.service diff --git a/dev/config/fms-core/dev_core.conf b/dev/config/fms-core/dev_core.conf index 30e2c84..0d6ad58 100644 --- a/dev/config/fms-core/dev_core.conf +++ b/dev/config/fms-core/dev_core.conf @@ -128,8 +128,10 @@ kafka.server.address="192.168.2.239:9092" kafka.gps.topic=fleet-api-gps kafka.notification.topic=fleet-api-notification +kafka.sns.topic=fleet-api-sns +kafka.notification-mail.topic=fleet-api-mail -# fms_gps Server (waylens-fms-clip) +# fms_gps Server (waylens-fms-gps) 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" diff --git a/dev/config/fms-core/wtest_fleet_private_key.pem b/dev/config/fms-core/wtest_fleet_private_key.pem deleted file mode 100644 index 0115977..0000000 --- a/dev/config/fms-core/wtest_fleet_private_key.pem +++ /dev/null @@ -1,27 +0,0 @@ ------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/dev/config/fms-gps/logback.xml b/dev/config/fms-gps/logback.xml new file mode 100644 index 0000000..85c1cb1 --- /dev/null +++ b/dev/config/fms-gps/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/dev/config/fms-notification/dev.yaml b/dev/config/fms-notification/config/dev.yaml similarity index 100% rename from dev/config/fms-notification/dev.yaml rename to dev/config/fms-notification/config/dev.yaml diff --git a/dev/config/fms-sns/config/config.yaml b/dev/config/fms-sns/config/dev.yaml similarity index 100% rename from dev/config/fms-sns/config/config.yaml rename to dev/config/fms-sns/config/dev.yaml diff --git a/dev/config/fms-sns/configure/config.conf b/dev/config/fms-sns/configure/config.conf deleted file mode 100644 index c794912..0000000 --- a/dev/config/fms-sns/configure/config.conf +++ /dev/null @@ -1,24 +0,0 @@ -//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 - - - diff --git a/dev/service/fms-core.service b/dev/service/fms-core.service new file mode 100644 index 0000000..e578b9f --- /dev/null +++ b/dev/service/fms-core.service @@ -0,0 +1,14 @@ +[Unit] +Description=fms-core +After=multi-user.target + +[Service] +Environment="TZ=Asia/Shanghai" +Environment="JAVA_HOME=/usr/local/jdk1.8.0" +User=ubuntu +WorkingDirectory=/opt/cap/fms-core/fms-core +ExecStart=/opt/cap/fms-core/fms-core/bin/fms -Dconfig.file=../dev.conf -Dlogger.file=../logback.xml +SuccessExitStatus=143 + +[Install] +WantedBy=graphical.target diff --git a/dev/service/fms-gps.service b/dev/service/fms-gps.service new file mode 100644 index 0000000..07a22bb --- /dev/null +++ b/dev/service/fms-gps.service @@ -0,0 +1,14 @@ +[Unit] +Description=fms-gps +After=multi-user.target + +[Service] +Environment="TZ=Asia/Shanghai" +Environment="JAVA_HOME=/usr/local/jdk1.8.0" +User=ubuntu +WorkingDirectory=/opt/cap/fms-gps/fms-gps +ExecStart=/opt/cap/fms-gps/fms-gps/bin/fms_gps -Dconfig.file=../dev.conf -Dhttp.port=9004 +SuccessExitStatus=143 + +[Install] +WantedBy=graphical.target diff --git a/dev/service/fms-master.service b/dev/service/fms-master.service new file mode 100644 index 0000000..067accd --- /dev/null +++ b/dev/service/fms-master.service @@ -0,0 +1,14 @@ +[Unit] +Description=fms-master +After=multi-user.target + +[Service] +Environment="TZ=Asia/Shanghai" +Environment="JAVA_HOME=/usr/local/jdk1.8.0" +User=ubuntu +WorkingDirectory=/opt/cap/fms-master +ExecStart=/usr/local/jdk1.8.0/bin/java -Dconfig.file=dev1.conf -Dlogback.configurationFile=/opt/cap/fms-master/logback.xml -jar app/fms-master.jar 2551 +SuccessExitStatus=143 + +[Install] +WantedBy=graphical.target diff --git a/dev/service/fms-notification.service b/dev/service/fms-notification.service new file mode 100644 index 0000000..5e1d7b1 --- /dev/null +++ b/dev/service/fms-notification.service @@ -0,0 +1,18 @@ +[Unit] +Description=fms-notification +After=multi-user.target + +[Service] +Environment="TZ=Asia/Shanghai" +Environment="JAVA_HOME=/usr/local/jdk1.8.0" +Environment="ENV_CLUSTER=dev" +Environment="APP_NAME=fms" +Environment="SERVICE_NAME=notification" +Environment="POD_NAME=linux" +User=ubuntu +WorkingDirectory=/opt/cap/fms-notification +ExecStart=/opt/cap/fms-notification/fms-notification +SuccessExitStatus=143 + +[Install] +WantedBy=graphical.target diff --git a/dev/service/fms-sns.service b/dev/service/fms-sns.service new file mode 100644 index 0000000..367cc90 --- /dev/null +++ b/dev/service/fms-sns.service @@ -0,0 +1,18 @@ +[Unit] +Description=fms-sns +After=multi-user.target + +[Service] +Environment="TZ=Asia/Shanghai" +Environment="JAVA_HOME=/usr/local/jdk1.8.0" +Environment="ENV_CLUSTER=dev" +Environment="APP_NAME=fms" +Environment="SERVICE_NAME=sns" +Environment="POD_NAME=linux" +User=ubuntu +WorkingDirectory=/opt/cap/fms-sns +ExecStart=/opt/cap/fms-sns/fms-sns +SuccessExitStatus=143 + +[Install] +WantedBy=graphical.target