songtianlun/today_ai_weather
1
0
Fork 0
Code Issues Pull Requests Actions 3 Packages Projects Releases Wiki Activity

Merge branch 'dev'

Browse Source
This commit is contained in:
songtianlun 2025-03-16 00:19:28 +08:00
commit d4141c7639
8 changed files with 45 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/controllers/sitemaps_controller.rb
View File

@ -83,8 +83,8 @@ class SitemapsController < ApplicationController
def set_bucket_name
@bucket_name = Rails.env.production? ?
ENV.fetch("AWS_BUCKET", Rails.application.credentials.dig(:minio, :bucket)) :
ENV.fetch("AWS_DEV_BUCKET", Rails.application.credentials.dig(:minio_dev, :bucket))
ENV.fetch("AWS_BUCKET", Rails.application.credentials.dig(:s3, :bucket)) :
ENV.fetch("AWS_DEV_BUCKET", Rails.application.credentials.dig(:s3_dev, :bucket))
end
def s3_client

24
app/workers/refresh_sitemap_worker.rb
View File

@ -35,21 +35,21 @@ class RefreshSitemapWorker
if Rails.env.production?
SitemapGenerator::Sitemap.adapter = SitemapGenerator::AwsSdkAdapter.new(
ENV.fetch("AWS_BUCKET", Rails.application.credentials.dig(:minio, :bucket)),
aws_access_key_id: ENV.fetch("AWS_ACCESS_KEY_ID", Rails.application.credentials.dig(:minio, :access_key_id)),
aws_secret_access_key: ENV.fetch("AWS_SECRET_ACCESS_KEY_ID", Rails.application.credentials.dig(:minio, :secret_access_key)),
aws_region: ENV.fetch("AWS_REGION", Rails.application.credentials.dig(:minio, :region)),
force_path_style: ENV.fetch("AWS_FORCE_PATH_STYLE", Rails.application.credentials.dig(:minio, :force_path_style)),
endpoint: ENV.fetch("AWS_ENDPOINT", Rails.application.credentials.dig(:minio, :endpoint)),
ENV.fetch("AWS_BUCKET", Rails.application.credentials.dig(:s3, :bucket)),
aws_access_key_id: ENV.fetch("AWS_ACCESS_KEY_ID", Rails.application.credentials.dig(:s3, :access_key_id)),
aws_secret_access_key: ENV.fetch("AWS_SECRET_ACCESS_KEY_ID", Rails.application.credentials.dig(:s3, :secret_access_key)),
aws_region: ENV.fetch("AWS_REGION", Rails.application.credentials.dig(:s3, :region)),
force_path_style: ENV.fetch("AWS_FORCE_PATH_STYLE", Rails.application.credentials.dig(:s3, :force_path_style)),
endpoint: ENV.fetch("AWS_ENDPOINT", Rails.application.credentials.dig(:s3, :endpoint)),
)
else
SitemapGenerator::Sitemap.adapter = SitemapGenerator::AwsSdkAdapter.new(
ENV.fetch("AWS_DEV_BUCKET", Rails.application.credentials.dig(:minio_dev, :bucket)),
aws_access_key_id: ENV.fetch("AWS_DEV_ACCESS_KEY_ID", Rails.application.credentials.dig(:minio_dev, :access_key_id)),
aws_secret_access_key: ENV.fetch("AWS_DEV_SECRET_ACCESS_KEY_ID", Rails.application.credentials.dig(:minio_dev, :secret_access_key)),
aws_region: ENV.fetch("AWS_DEV_REGION", Rails.application.credentials.dig(:minio_dev, :region)),
force_path_style: ENV.fetch("AWS_FORCE_PATH_STYLE", Rails.application.credentials.dig(:minio_dev, :force_path_style)),
endpoint: ENV.fetch("AWS_DEV_ENDPOINT", Rails.application.credentials.dig(:minio_dev, :endpoint)),
ENV.fetch("AWS_DEV_BUCKET", Rails.application.credentials.dig(:s3_dev, :bucket)),
aws_access_key_id: ENV.fetch("AWS_DEV_ACCESS_KEY_ID", Rails.application.credentials.dig(:s3_dev, :access_key_id)),
aws_secret_access_key: ENV.fetch("AWS_DEV_SECRET_ACCESS_KEY_ID", Rails.application.credentials.dig(:s3_dev, :secret_access_key)),
aws_region: ENV.fetch("AWS_DEV_REGION", Rails.application.credentials.dig(:s3_dev, :region)),
force_path_style: ENV.fetch("AWS_FORCE_PATH_STYLE", Rails.application.credentials.dig(:s3_dev, :force_path_style)),
endpoint: ENV.fetch("AWS_DEV_ENDPOINT", Rails.application.credentials.dig(:s3_dev, :endpoint)),
)
end
SitemapGenerator::Sitemap.sitemaps_path = "sitemaps/"

2
config/credentials.yml.enc
View File

@ -1 +1 @@
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--X5EEAN17k1lkJcuO--lT7sC4JrxHcmrMt2aoiU9g==
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--ZZ90GpOw7JvzUeoL--MnYyQ8GuhjnE9BTdaviWTg==

2
config/environments/development.rb
View File

@ -40,6 +40,8 @@ Rails.application.configure do
# Store uploaded files on the local file system (see config/storage.yml for options).
# config.active_storage.service = :local
config.active_storage.service = :amazon_dev
# 使用代理模式，避免 Aliyun OSS Can not override response header on content-type 问题，
config.active_storage.resolve_model_to_route = :rails_storage_proxy
# Don't care if the mailer can't send.
config.action_mailer.raise_delivery_errors = false

2
config/environments/production.rb
View File

@ -23,6 +23,8 @@ Rails.application.configure do
# Store uploaded files on the local file system (see config/storage.yml for options).
config.active_storage.service = ENV["RAILS_BUILD"] ? :build : :amazon
# 使用代理模式，避免 Aliyun OSS Can not override response header on content-type 问题，
config.active_storage.resolve_model_to_route = :rails_storage_proxy
# Assume all access to the app is happening through a SSL-terminating reverse proxy.
config.assume_ssl = true

20
config/initializers/aws.rb
View File

@ -1,21 +1,21 @@
if Rails.env.production?
Aws.config.update({
region: ENV.fetch("AWS_REGION", Rails.application.credentials.dig(:minio, :region)),
region: ENV.fetch("AWS_REGION", Rails.application.credentials.dig(:s3, :region)),
credentials: Aws::Credentials.new(
ENV.fetch("AWS_ACCESS_KEY_ID", Rails.application.credentials.dig(:minio, :access_key_id)),
ENV.fetch("AWS_SECRET_ACCESS_KEY_ID", Rails.application.credentials.dig(:minio, :secret_access_key))
ENV.fetch("AWS_ACCESS_KEY_ID", Rails.application.credentials.dig(:s3, :access_key_id)),
ENV.fetch("AWS_SECRET_ACCESS_KEY_ID", Rails.application.credentials.dig(:s3, :secret_access_key))
),
force_path_style: ENV.fetch("AWS_FORCE_PATH_STYLE", Rails.application.credentials.dig(:minio_dev, :force_path_style)),
endpoint: ENV.fetch("AWS_ENDPOINT", Rails.application.credentials.dig(:minio, :endpoint))
force_path_style: ENV.fetch("AWS_FORCE_PATH_STYLE", Rails.application.credentials.dig(:s3_dev, :force_path_style)),
endpoint: ENV.fetch("AWS_ENDPOINT", Rails.application.credentials.dig(:s3, :endpoint))
})
else
Aws.config.update({
region: ENV.fetch("AWS_DEV_REGION", Rails.application.credentials.dig(:minio_dev, :region)),
region: ENV.fetch("AWS_DEV_REGION", Rails.application.credentials.dig(:s3_dev, :region)),
credentials: Aws::Credentials.new(
ENV.fetch("AWS_DEV_ACCESS_KEY_ID", Rails.application.credentials.dig(:minio_dev, :access_key_id)),
ENV.fetch("AWS_DEV_SECRET_ACCESS_KEY_ID", Rails.application.credentials.dig(:minio_dev, :secret_access_key))
ENV.fetch("AWS_DEV_ACCESS_KEY_ID", Rails.application.credentials.dig(:s3_dev, :access_key_id)),
ENV.fetch("AWS_DEV_SECRET_ACCESS_KEY_ID", Rails.application.credentials.dig(:s3_dev, :secret_access_key))
),
force_path_style: ENV.fetch("AWS_DEV_FORCE_PATH_STYLE", Rails.application.credentials.dig(:minio_dev, :force_path_style)),
endpoint: ENV.fetch("AWS_DEV_ENDPOINT", Rails.application.credentials.dig(:minio_dev, :endpoint))
force_path_style: ENV.fetch("AWS_DEV_FORCE_PATH_STYLE", Rails.application.credentials.dig(:s3_dev, :force_path_style)),
endpoint: ENV.fetch("AWS_DEV_ENDPOINT", Rails.application.credentials.dig(:s3_dev, :endpoint))
})
end

8
config/sitemap.rb
View File

@ -2,10 +2,10 @@
host = Rails.env.production? ? "https://todayaiweather.com" : "http://127.0.0.1:3000"
Rails.application.routes.default_url_options[:host] = host
SitemapGenerator::Sitemap.adapter = SitemapGenerator::AwsSdkAdapter.new(
Rails.application.credentials.dig(:minio, :bucket),
aws_access_key_id: Rails.application.credentials.dig(:minio, :access_key_id),
aws_secret_access_key: Rails.application.credentials.dig(:minio, :secret_access_key),
aws_region: Rails.application.credentials.dig(:minio, :region)
Rails.application.credentials.dig(:s3, :bucket),
aws_access_key_id: Rails.application.credentials.dig(:s3, :access_key_id),
aws_secret_access_key: Rails.application.credentials.dig(:s3, :secret_access_key),
aws_region: Rails.application.credentials.dig(:s3, :region)
)
SitemapGenerator::Sitemap.sitemaps_path = "sitemaps/"

24
config/storage.yml
View File

@ -19,21 +19,21 @@ build:
# bucket: your_own_bucket-<%= Rails.env %>
amazon_dev:
service: S3
access_key_id: <%= ENV.fetch("AWS_DEV_ACCESS_KEY_ID", Rails.application.credentials.dig(:minio_dev, :access_key_id)) %>
secret_access_key: <%= ENV.fetch("AWS_DEV_SECRET_ACCESS_KEY_ID", Rails.application.credentials.dig(:minio_dev, :secret_access_key)) %>
region: <%= ENV.fetch("AWS_DEV_REGION", Rails.application.credentials.dig(:minio_dev, :region)) %>
bucket: <%= ENV.fetch("AWS_DEV_BUCKET", Rails.application.credentials.dig(:minio_dev, :bucket)) %>
endpoint: <%= ENV.fetch("AWS_DEV_ENDPOINT", Rails.application.credentials.dig(:minio_dev, :endpoint)) %>
force_path_style: <%= ENV.fetch("AWS_DEV_FORCE_PATH_STYLE", Rails.application.credentials.dig(:minio_dev, :force_path_style)) %>
access_key_id: <%= ENV.fetch("AWS_DEV_ACCESS_KEY_ID", Rails.application.credentials.dig(:s3_dev, :access_key_id)) %>
secret_access_key: <%= ENV.fetch("AWS_DEV_SECRET_ACCESS_KEY_ID", Rails.application.credentials.dig(:s3_dev, :secret_access_key)) %>
region: <%= ENV.fetch("AWS_DEV_REGION", Rails.application.credentials.dig(:s3_dev, :region)) %>
bucket: <%= ENV.fetch("AWS_DEV_BUCKET", Rails.application.credentials.dig(:s3_dev, :bucket)) %>
endpoint: <%= ENV.fetch("AWS_DEV_ENDPOINT", Rails.application.credentials.dig(:s3_dev, :endpoint)) %>
force_path_style: <%= ENV.fetch("AWS_DEV_FORCE_PATH_STYLE", Rails.application.credentials.dig(:s3_dev, :force_path_style)) %>
amazon:
service: S3
access_key_id: <%= ENV.fetch("AWS_ACCESS_KEY_ID", Rails.application.credentials.dig(:minio, :access_key_id)) %>
secret_access_key: <%= ENV.fetch("AWS_SECRET_ACCESS_KEY_ID", Rails.application.credentials.dig(:minio, :secret_access_key)) %>
region: <%= ENV.fetch("AWS_REGION", Rails.application.credentials.dig(:minio, :region)) %>
bucket: <%= ENV.fetch("AWS_BUCKET", Rails.application.credentials.dig(:minio, :bucket)) %>
endpoint: <%= ENV.fetch("AWS_ENDPOINT", Rails.application.credentials.dig(:minio, :endpoint)) %>
force_path_style: <%= ENV.fetch("AWS_DEV_FORCE_PATH_STYLE", Rails.application.credentials.dig(:minio, :force_path_style)) %>
access_key_id: <%= ENV.fetch("AWS_ACCESS_KEY_ID", Rails.application.credentials.dig(:s3, :access_key_id)) %>
secret_access_key: <%= ENV.fetch("AWS_SECRET_ACCESS_KEY_ID", Rails.application.credentials.dig(:s3, :secret_access_key)) %>
region: <%= ENV.fetch("AWS_REGION", Rails.application.credentials.dig(:s3, :region)) %>
bucket: <%= ENV.fetch("AWS_BUCKET", Rails.application.credentials.dig(:s3, :bucket)) %>
endpoint: <%= ENV.fetch("AWS_ENDPOINT", Rails.application.credentials.dig(:s3, :endpoint)) %>
force_path_style: <%= ENV.fetch("AWS_DEV_FORCE_PATH_STYLE", Rails.application.credentials.dig(:s3, :force_path_style)) %>
# Remember not to checkin your GCS keyfile to a repository
# google: