From f4857f73fc663ef76639881a93d2c87a9a75a02a Mon Sep 17 00:00:00 2001 From: songtianlun Date: Sat, 18 Jan 2025 14:38:30 +0800 Subject: [PATCH] fix: update default smtp username - Change default SMTP username in ApplicationMailer to 'noreply@mail.frytea.com' - Comment out previous username in credentials to avoid confusion - Ensure updated username is reflected in production environment settings This update improves email configuration organization, making it clearer and reducing the risk of misconfiguration, as the hardcoded value in the mailer takes precedence. --- app/mailers/application_mailer.rb | 2 +- config/credentials.yml.enc | 2 +- config/environments/production.rb | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/app/mailers/application_mailer.rb b/app/mailers/application_mailer.rb index e4e3ecc..57086a6 100644 --- a/app/mailers/application_mailer.rb +++ b/app/mailers/application_mailer.rb @@ -1,4 +1,4 @@ class ApplicationMailer < ActionMailer::Base - default from: ENV.fetch("RAILS_SMTP_USERNAME", Rails.application.credentials.smtp.user_name) + default from: ENV.fetch("RAILS_SMTP_USERNAME", "noreply@mail.frytea.com") layout "mailer" end diff --git a/config/credentials.yml.enc b/config/credentials.yml.enc index acdeb43..7ff8cd6 100644 --- a/config/credentials.yml.enc +++ b/config/credentials.yml.enc @@ -1 +1 @@ -dgDsEM/BhJ8nlqaADJ1VqQ5CjT912nF8qUittT7HfKXjTGrIYZJax1FC/uEzEZFbt3Xz+XkERU3vWveMquIbKus6u5bwmXTk5ztiXZQRKy5Tc/XDa+aaMVMIUAAUaRP4Q5KQCBHHWgwMYr6JxG9Xb+PekvYrlc2uazM/C+IBeAaC1m4OBe+6tY/3luk4i5ymphFhH8gvp9iiXHTMO36hHMy/9GKatDLuhP3K4epN5WWMwsDz3Y62qqLF6Vi6huNZNKley4UUdeSRY4qQiNggjMvLHAnDUx/fAf5cRPeDuj9Tv94iEGAU/h4btxvqZteylxLS1YVrAfJlaXoHwB3G4FzTkrOPO8U3lNvh0XrlWYf4tT71nVLeBB9GcaWliNFaIb7D6oaDgl9tFg1Yt28YtdncIfN+TfvgIe/up7C1nc2rnaeAZLaJMu5oXvqjMqnmtbea7GlW0BP+8/OCbQPZxkoanouRNYkMRUTjX/IGeN77jFOuEJ4c3tDgJYmE/8K/enzwGC/yq1mGg6ZSaGkEvHGHhN/7Jz/LFVkXUiyWdQ6AWSarftB7ZFVZEfteT3CwlWl2c1fT5X3PXydLYessyuVnn+heejMU9Lwy3Q9BJitM6WJvEPUu1IZBedZN3rOeOoYuOb/2O11WXFvvbiNxZQsNJOqZsF1wN2UYffuuyr/hIoF0N7LyD6/oMrDqW2SoZJtGKx08FZ9bqFgGNXxUzI6YVQbg1jXWqy47dUdizu5UgmxeDg6k/Ws9NMGt3Co/c6TX4FFmR+jwZ7BRbuRThS8gBXu7azbbao+1ZoQwZ1rCRqyKjVcnXHxeHug1q+N4dP4Q44Ou+wUNFfHE+/jc9i7gGBFWaYW8nSGzZD47CXFiL0RzVWI+0YXtBdmV3rEk12Vq4UBFk/RuxM94VnDyJqRS6zpmuYnazFuNZdebCF3i11+LhmHc85Jf569tYUJjR8buAzEL9bo6vw4GJeBhEYWJkCbHDjGZCq4W4YcqJ6VCSGMGrx+4n/vpAPOOT6wUgxUNHzEUV4Vx8DPuGfoCloaNHgsgFBG/GkZ2SNAaspvl7aCRh7Y3wWBa2vsLdbzor0ByGAp9SpY3wVo+JoB7vHNJ12Q6IgM7E6PHr2rhAhX51Er3wBmhQCWdsdN/eqNjiucuG0qemeu/pSTYRoYj4arLjzpnzyTzgUIe7P9gqk/Oo3eog67CcAUNWLdVH5Ze8J0DZXNjUcDQdFOPzfggWzhAjGUkK5DcenCX6EH1rCG/EYoVho25CqIInChGpAc9eXVEwsNB6XHuX2OxgrjgIGkTEYgsqxmuQmPf7V8JOvZ8vz1Z55FOAGJ1wdMtXg==--FYvXI/bn4ZCWSjzY--NMCnEtV8n9BnQql6lwqMXg== \ No newline at end of file +cqs9ydKMwuEzuVqY7X0nwYDXnlpzUkOStSZDIjFJDoi60dKo+Jp4vSVMsHNYpqyUqIsauxpQ1rc+HdWLGu49DlCc4OCZ3JAAQ2a19woyhAC/FH+ytKAD76bMFtKLAMa5GJdh2Wa6YLh0dh/8uVlU58yfj7fnGRLmP0IpxM2CjlqzztnUZwxNR2TnvuV9L+P6pAobKsAVE2VQMDY9f5LxJKdJHHtS87Be4O6Y6K+9bhJp2JaexWXV/pN+M/nF8tMUBmlE+oR7Vi53lS3crM0t/LqJYs49hUuCpCwsDCFdF6rIXj3n9jJcL3OOm4SpGo/Zhj2XWP7XKjYs7z6RAuM2d2WqAhkHBXet1pJv+BpVU1czSCazQTExp9sd1dM5UKx7oJv9m64kN2qzpKNDmGcyHxUusrIKpFhPvbJPGAbd3LAvz0puoWfeTM3xT/2bdIfxF8zzBUUN5KsdT08zYKavunQng66ndWcJmpxfGcbTMDQXU4GPhSlQvFA0rWLcGqMdaob0PVRzgArgLpYEowE+jiEsGsDAdVC/CpWgqaL8gmE3bWLC5RrT6OxXXy5psaezox/x/+W6rL9i6O5ldf3x+W5TeqEN1lzkfDNZkGVHI8rzY46fe0wYbeQV8RAz00xa6sEFdQMY4xYHS39m5c6e5TB6Av9YaTPVR0yFDfisTBV1X6AlJz/F2ahFYPEF0aFs/VPmlbJOE/jRooz+s812Td/YT+iC1YYAGywYlhgWZY0ka9Mr8DjLhVksK4sSFTR6tH//MU/O1R/Pieb/NyoglKVrW0h5SjAcAUouC8C0PlEFOsaWJME4iCU2UXHHRuxWnLM0tzXkmDjeRLrkKjGYC5N84GP+31pK6yCal8uKKzDPZfd/1vlIkoJmlYcQSB/yIQ1LmB5HHDxnu0tk9nomk54PXUPoxr5HPIJkVe0q+O0CryFxQRy8VtVtsuVK/uXPxxqQpul2Yogao//Xo+Zhm0d+SJIe/VckdSiGl2nEsaeeNiHWh2jFwO5qMxnBJ3Ag1I4FPCkaHd37oVxKCE+qvMnUjVo4A/6iwezvqXH2kIa0aVJxig4P9dXFVf9otzEOTy9ZliQRS9mTos5s/HZ+2EvWMfzc5gu39xRkna/syjPtej1+ufK+YWKjBk/X0aoxU/8GdtGe/t5YQCxlgGY7DORG6iqIdMGAi86WwJhuhFkmNjSaJuJi/TtRXk0WFSgZFz/i7zWzNTVvrdKxzMPTHfXiKZcCzNaTedB/tkTUa+12UIsn/RQ/1DWCUfM6CKL4DPuVJ9fYK025WYt6DU9LZwUdcjqEqe+cToTh7M4XImAdkMAFPlLAB0ybHnaN2b4=--ShCCU2t4yvuvLbVA--f/kJmPKywHAaXzLJUi35VQ== \ No newline at end of file diff --git a/config/environments/production.rb b/config/environments/production.rb index e5b0d03..9b4c21c 100644 --- a/config/environments/production.rb +++ b/config/environments/production.rb @@ -66,7 +66,7 @@ Rails.application.configure do config.action_mailer.smtp_settings = { address: ENV.fetch("RAILS_SMTP_HOST", Rails.application.credentials.smtp.address), port: ENV.fetch("RAILS_SMTP_PORT", 465), - user_name: ENV.fetch("RAILS_SMTP_USERNAME", Rails.application.credentials.smtp.user_name), + user_name: ENV.fetch("RAILS_SMTP_USERNAME", "noreply@mail.frytea.com"), password: ENV.fetch("RAILS_SMTP_PASSWORD", Rails.application.credentials.smtp.password), ssl: ENV.fetch("RAILS_SMTP_SSL", true), authentication: "plain",