瀏覽代碼

Actualizacion sendmail y driver

Francisco huezo 5 年之前
父節點
當前提交
095aabc12c
共有 4 個文件被更改,包括 84 次插入2 次删除
  1. 二進制
      drivers/chromedriver.exe
  2. 2 0
      sim/config.py
  3. 2 2
      sim/memsim.py
  4. 80 0
      sim/utils/mailsender.py

二進制
drivers/chromedriver.exe


+ 2 - 0
sim/config.py

@@ -23,5 +23,7 @@ class Configuration:
         self.SMTP_PORT=os.getenv("SMTP_PORT")
         self.AUTH_USER=os.getenv("AUTH_USER")
         self.AUTH_PASS=os.getenv("AUTH_PASS")
+        self.SB_URL='https://api.sendinblue.com/v3/smtp/email'
+        self.SB_API_KEY='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'
 
 

+ 2 - 2
sim/memsim.py

@@ -212,7 +212,7 @@ def download_files():
 
         
         if d > 0:
-            mail.send_success_email('robot@mercadoselectricos.com.sv','francisco.huezo@mercadoselectricos.com.sv',
+            mail.send_success_email_by_api('no-reply@grupomerelec.com','francisco.huezo@mercadoselectricos.com.sv',
                             "Proceso de Descarga finalizado","Descarga de archivos finalizada",
                             type='success', report_count= d)
 
@@ -225,7 +225,7 @@ def download_files():
         message = template.format(type(ex).__name__, ex.args)
         rootLogger.error(message, exc_info=True)
         driver.quit()
-        mail.send_warning_email('robot@mercadoselectricos.com.sv', 'francisco.huezo@mercadoselectricos.com.sv',
+        mail.send_warning_email_by_api('no-reply@grupomerelec.com', 'francisco.huezo@mercadoselectricos.com.sv',
                         "Proceso de Descarga finalizado", "Error en el proceso de descarga de archivos")
 
         return []

+ 80 - 0
sim/utils/mailsender.py

@@ -96,6 +96,86 @@ class Emailer():
         server.quit()
         self.logger.info("Correo electrónico enviado con éxito a la dirección {0}".format(to_address))
 
+    def send_success_email_by_api(self, from_address, to_address, alert_message, subject, type=None, report_count=0):
+
+        import requests
+
+        message_template = self.read_template(os.path.join(config.TEMPLATES_PATH,'success-message-inline.html'))
+
+        self.logger.info("Preparando para enviar correo electrónico")
+        head_color = "#6bab01"
+        message = message_template.substitute(fecha=datetime.datetime.now().strftime('%Y-%m-%d %H:%M:%S'),
+                                              alert_message=alert_message,
+                                              cuenta_reportes=report_count,
+                                              head_color=head_color)
+
+        url = config.SB_URL
+        api_key = config.SB_API_KEY
+        self.logger.debug("url: "+ url)
+        self.logger.debug("key: "+ api_key)
+
+        payload = {
+            "sender":
+                {
+                    "email":from_address,
+                    "name":"BOT DESCARGA DF"
+                },
+            "to":[{"email":to_address}],
+            "htmlContent":message,
+            "subject":subject
+        }
+        headers = {
+            'accept': "application/json",
+            'content-type': "application/json",
+            'api-key': api_key
+        }
+
+        self.logger.debug("Enviando correo electrónico")
+        
+        response = requests.request("POST", url, json=payload, headers=headers, verify=False)
+        
+        self.logger.debug("Correo Electrónico enviado")
+        self.logger.info("Correo electrónico enviado con éxito a la dirección {0}".format(to_address))
+
+    def send_warning_email_by_api(self, from_address, to_address, alert_message, subject):
+        
+        import requests
+
+        message_template = self.read_template(os.path.join(config.TEMPLATES_PATH, 'warning-message-inline.html'))
+
+        self.logger.info("Preparando para enviar correo electrónico")
+        head_color = "#ffaa00"
+        message = message_template.substitute(fecha=datetime.datetime.now().strftime('%Y-%m-%d %H:%M:%S'),
+                                              alert_message=alert_message,
+                                              head_color=head_color)
+
+        url = config.SB_URL
+        api_key = config.SB_API_KEY
+        self.logger.debug("url: "+ url)
+        self.logger.debug("key: "+ api_key)
+
+        payload = {
+            "sender":
+                {
+                    "email":from_address,
+                    "name":"BOT DESCARGA DF"
+                },
+            "to":[{"email":to_address}],
+            "htmlContent":message,
+            "subject":subject
+        }
+        headers = {
+            'accept': "application/json",
+            'content-type': "application/json",
+            'api-key': api_key
+        }
+
+        self.logger.debug("Enviando correo electrónico")
+        
+        response = requests.request("POST", url, json=payload, headers=headers, verify=False)
+        
+        self.logger.debug("Correo Electrónico enviado")
+        self.logger.info("Correo electrónico enviado con éxito a la dirección {0}".format(to_address))