diff --git a/.github/workflows/docker-dev.yml b/.github/workflows/docker-dev.yml index 33d0838..ff8481f 100644 --- a/.github/workflows/docker-dev.yml +++ b/.github/workflows/docker-dev.yml @@ -1,4 +1,4 @@ -name: Docker +name: Docker Dev on: push: @@ -45,4 +45,4 @@ jobs: context: . push: ${{ github.event_name != 'pull_request' }} tags: | - ${{ env.REGISTRY }}/${{github.actor}}/${{ github.event.repository.name }}:dev \ No newline at end of file + ${{ env.REGISTRY }}/${{github.actor}}/${{ github.event.repository.name }}_dev:dev \ No newline at end of file diff --git a/.github/workflows/docker-main.yml b/.github/workflows/docker-main.yml index 4146b84..df3e9b6 100644 --- a/.github/workflows/docker-main.yml +++ b/.github/workflows/docker-main.yml @@ -1,4 +1,4 @@ -name: Docker +name: Docker Main on: push: diff --git a/db/seeds.rb b/db/seeds.rb index 6f24725..bfe12e5 100644 --- a/db/seeds.rb +++ b/db/seeds.rb @@ -10,11 +10,6 @@ # AdminUser.create!(email: 'admin@example.com', password: 'password', password_confirmation: 'password') if Rails.env.development? AdminUser.create!(email: 'admin@example.com', password: 'password', password_confirmation: 'password') -# WeatherArt.delete_all -# City.delete_all -# Country.delete_all -# Region.delete_all - # 创建区域 regions = Region.create!([ { @@ -22,46 +17,14 @@ regions = Region.create!([ code: 'AS' # }, # { - # name: 'Southeast Asia', - # code: 'SEA' - # }, - # { - # name: 'East Asia', - # code: 'EA' - # }, - # { - # name: 'Middle East', - # code: 'ME' - # }, - # { # name: 'Africa', # code: 'AF' # }, # { - # name: 'North Africa', - # code: 'NA' - # }, - # { - # name: 'Sub-Saharan Africa', - # code: 'SSA' - # }, - # { # name: 'Europe', # code: 'EU' # }, # { - # name: 'North America', - # code: 'NAM' - # }, - # { - # name: 'South America', - # code: 'SAM' - # }, - # { - # name: 'Central America', - # code: 'CAM' - # }, - # { # name: 'Oceania', # code: 'OC' } @@ -133,9 +96,6 @@ Country.create!([ ]) # 创建城市 -# Dir[Rails.root.join('db/seeds/cities/*.rb')].sort.each do |file| -# require file -# end china = Country.find_by code: 'CN' City.create!([ { diff --git a/db/seeds/cities/australia.rb b/db/seeds/cities/australia.rb deleted file mode 100644 index 7c1939c..0000000 --- a/db/seeds/cities/australia.rb +++ /dev/null @@ -1,22 +0,0 @@ -australia = Country.find_by code: 'AU' - -City.create!([ - { - name: 'Sydney', - latitude: -33.8688, - longitude: 151.2093, - country: australia, - timezone: 'Australia/Sydney', - active: true, - priority: 80 - }, - { - name: 'Melbourne', - latitude: -37.8136, - longitude: 144.9631, - country: australia, - timezone: 'Australia/Melbourne', - active: true, - priority: 75 - } -]) diff --git a/db/seeds/cities/bangladesh.rb b/db/seeds/cities/bangladesh.rb deleted file mode 100644 index a69854c..0000000 --- a/db/seeds/cities/bangladesh.rb +++ /dev/null @@ -1,13 +0,0 @@ -bangladesh = Country.find_by code: 'BD' - -City.create!([ - { - name: 'Dhaka', - latitude: 23.8103, - longitude: 90.4125, - country: bangladesh, - timezone: 'Asia/Dhaka', - active: true, - priority: 85 - } -]) diff --git a/db/seeds/cities/brazil.rb b/db/seeds/cities/brazil.rb deleted file mode 100644 index 9afa326..0000000 --- a/db/seeds/cities/brazil.rb +++ /dev/null @@ -1,13 +0,0 @@ -brazil = Country.find_by code: 'BR' - -City.create!([ - { - name: 'Rio de Janeiro', - latitude: -22.9068, - longitude: -43.1729, - country: brazil, - timezone: 'America/Sao_Paulo', - active: true, - priority: 80 - } -]) diff --git a/db/seeds/cities/canada.rb b/db/seeds/cities/canada.rb deleted file mode 100644 index a2a5db4..0000000 --- a/db/seeds/cities/canada.rb +++ /dev/null @@ -1,10 +0,0 @@ -canada = Country.find_by code: 'CA' -City.create!( - name: 'Toronto', - latitude: 43.6532, - longitude: -79.3832, - priority: 50, - country: canada, - timezone: 'America/Toronto', - active: true -) diff --git a/db/seeds/cities/china.rb b/db/seeds/cities/china.rb deleted file mode 100644 index 1a0819c..0000000 --- a/db/seeds/cities/china.rb +++ /dev/null @@ -1,346 +0,0 @@ -china = Country.find_by code: 'CN' - -City.create!([ - { - name: 'Shanghai', - latitude: 31.2304, - longitude: 121.4737, - country: china, - timezone: 'Asia/Shanghai', - active: true, - priority: 100 - }, - { - name: 'Beijing', - latitude: 39.9042, - longitude: 116.4074, - country: china, - timezone: 'Asia/Shanghai', - active: true, - priority: 100 - }, - { - name: 'Shenzhen', - latitude: 22.5431, - longitude: 114.0579, - country: china, - timezone: 'Asia/Shanghai', - active: true, - priority: 100 - }, - { - name: 'Guangzhou', - latitude: 23.1291, - longitude: 113.2644, - country: china, - timezone: 'Asia/Shanghai', - active: true, - priority: 100 - }, - { - name: 'Chengdu', - latitude: 30.5728, - longitude: 104.0668, - country: china, - timezone: 'Asia/Shanghai', - active: true, - priority: 100 - }, - { - name: 'Tianjin', - latitude: 39.3434, - longitude: 117.3616, - country: china, - timezone: 'Asia/Shanghai', - active: true, - priority: 100 - }, - { - name: 'Wuhan', - latitude: 30.5928, - longitude: 114.3055, - country: china, - timezone: 'Asia/Shanghai', - active: true, - priority: 100 - }, - { - name: 'Dongguan', - latitude: 23.0208, - longitude: 113.7518, - country: china, - timezone: 'Asia/Shanghai', - active: true, - priority: 100 - }, - { - name: 'Chongqing', - latitude: 29.4316, - longitude: 106.9123, - country: china, - timezone: 'Asia/Shanghai', - active: true, - priority: 100 - }, - { - name: "Xi'an", - latitude: 34.3416, - longitude: 108.9398, - country: china, - timezone: 'Asia/Shanghai', - active: true, - priority: 100 - }, - { - name: 'Hangzhou', - latitude: 30.2741, - longitude: 120.1551, - country: china, - timezone: 'Asia/Shanghai', - active: true, - priority: 100 - }, - { - name: 'Foshan', - latitude: 23.0219, - longitude: 113.1216, - country: china, - timezone: 'Asia/Shanghai', - active: true, - priority: 100 - }, - { - name: 'Nanjing', - latitude: 32.0603, - longitude: 118.7969, - country: china, - timezone: 'Asia/Shanghai', - active: true, - priority: 100 - }, - { - name: 'Hong Kong', - latitude: 22.3193, - longitude: 114.1694, - country: china, - timezone: 'Asia/Hong_Kong', - active: true, - priority: 100 - }, - { - name: 'Shenyang', - latitude: 41.8057, - longitude: 123.4315, - country: china, - timezone: 'Asia/Shanghai', - active: true, - priority: 100 - }, - { - name: 'Zhengzhou', - latitude: 34.7472, - longitude: 113.6249, - country: china, - timezone: 'Asia/Shanghai', - active: true, - priority: 100 - }, - { - name: 'Qingdao', - latitude: 36.0671, - longitude: 120.3826, - country: china, - timezone: 'Asia/Shanghai', - active: true, - priority: 100 - }, - { - name: 'Suzhou', - latitude: 31.2990, - longitude: 120.5853, - country: china, - timezone: 'Asia/Shanghai', - active: true, - priority: 100 - }, - { - name: 'Changsha', - latitude: 28.2282, - longitude: 112.9388, - country: china, - timezone: 'Asia/Shanghai', - active: true, - priority: 100 - }, - { - name: 'Jinan', - latitude: 36.6512, - longitude: 117.1201, - country: china, - timezone: 'Asia/Shanghai', - active: true, - priority: 100 - }, - { - name: 'Kunming', - latitude: 25.0389, - longitude: 102.7183, - country: china, - timezone: 'Asia/Shanghai', - active: true, - priority: 100 - }, - { - name: 'Harbin', - latitude: 45.8038, - longitude: 126.5340, - country: china, - timezone: 'Asia/Shanghai', - active: true, - priority: 100 - }, - { - name: 'Shijiazhuang', - latitude: 38.0428, - longitude: 114.5149, - country: china, - timezone: 'Asia/Shanghai', - active: true, - priority: 100 - }, - { - name: 'Hefei', - latitude: 31.8206, - longitude: 117.2272, - country: china, - timezone: 'Asia/Shanghai', - active: true, - priority: 100 - }, - { - name: 'Dalian', - latitude: 38.9140, - longitude: 121.6147, - country: china, - timezone: 'Asia/Shanghai', - active: true, - priority: 100 - }, - { - name: 'Xiamen', - latitude: 24.4798, - longitude: 118.0819, - country: china, - timezone: 'Asia/Shanghai', - active: true, - priority: 100 - }, - { - name: 'Nanning', - latitude: 22.8170, - longitude: 108.3665, - country: china, - timezone: 'Asia/Shanghai', - active: true, - priority: 100 - }, - { - name: 'Changchun', - latitude: 43.8171, - longitude: 125.3235, - country: china, - timezone: 'Asia/Shanghai', - active: true, - priority: 100 - }, - { - name: 'Taiyuan', - latitude: 37.8706, - longitude: 112.5489, - country: china, - timezone: 'Asia/Shanghai', - active: true, - priority: 100 - }, - { - name: 'New Taipei City', - latitude: 25.0120, - longitude: 121.4657, - country: china, - timezone: 'Asia/Taipei', - active: true, - priority: 100 - }, - { - name: 'Guiyang', - latitude: 26.6470, - longitude: 106.6302, - country: china, - timezone: 'Asia/Shanghai', - active: true, - priority: 100 - }, - { - name: 'Wuxi', - latitude: 31.4914, - longitude: 120.3119, - country: china, - timezone: 'Asia/Shanghai', - active: true, - priority: 100 - }, - { - name: 'Shantou', - latitude: 23.3535, - longitude: 116.6822, - country: china, - timezone: 'Asia/Shanghai', - active: true, - priority: 100 - }, - { - name: 'Ürümqi', - latitude: 43.8256, - longitude: 87.6168, - country: china, - timezone: 'Asia/Shanghai', - active: true, - priority: 100 - }, - { - name: 'Zhongshan', - latitude: 22.5415, - longitude: 113.3926, - country: china, - timezone: 'Asia/Shanghai', - active: true, - priority: 100 - }, - { - name: 'Ningbo', - latitude: 29.8683, - longitude: 121.5440, - country: china, - timezone: 'Asia/Shanghai', - active: true, - priority: 100 - }, - { - name: 'Fuzhou', - latitude: 26.0745, - longitude: 119.2965, - country: china, - timezone: 'Asia/Shanghai', - active: true, - priority: 100 - }, - { - name: 'Nanchang', - latitude: 28.6820, - longitude: 115.8579, - country: china, - timezone: 'Asia/Shanghai', - active: true, - priority: 100 - } -]) diff --git a/db/seeds/cities/egypt.rb b/db/seeds/cities/egypt.rb deleted file mode 100644 index 5cbc23e..0000000 --- a/db/seeds/cities/egypt.rb +++ /dev/null @@ -1,13 +0,0 @@ -egypt = Country.find_by code: 'EG' - -City.create!([ - { - name: 'Alexandria', - latitude: 31.2001, - longitude: 29.9187, - country: egypt, - timezone: 'Africa/Cairo', - active: true, - priority: 100 - } -]) diff --git a/db/seeds/cities/france.rb b/db/seeds/cities/france.rb deleted file mode 100644 index ccedd84..0000000 --- a/db/seeds/cities/france.rb +++ /dev/null @@ -1,13 +0,0 @@ -france = Country.find_by code: 'FRA' - -City.create!([ - { - name: 'Paris', - latitude: 48.8566, - longitude: 2.3522, - country: france, - timezone: 'Europe/Paris', - active: true, - priority: 100 - } -]) diff --git a/db/seeds/cities/germany.rb b/db/seeds/cities/germany.rb deleted file mode 100644 index 3e939f0..0000000 --- a/db/seeds/cities/germany.rb +++ /dev/null @@ -1,22 +0,0 @@ -germany = Country.find_by code: 'DE' - -City.create!([ - { - name: 'Frankfurt', - latitude: 50.1109, - longitude: 8.6821, - country: germany, - timezone: 'Europe/Berlin', - active: true, - priority: 100 - }, - { - name: 'Berlin', - latitude: 52.5200, - longitude: 13.4050, - country: germany, - timezone: 'Europe/Berlin', - active: true, - priority: 100 - } -]) diff --git a/db/seeds/cities/india.rb b/db/seeds/cities/india.rb deleted file mode 100644 index 2517865..0000000 --- a/db/seeds/cities/india.rb +++ /dev/null @@ -1,22 +0,0 @@ -india = Country.find_by code: 'IN' - -City.create!([ - { - name: 'Mumbai', - latitude: 19.0760, - longitude: 72.8777, - country: india, - timezone: 'Asia/Kolkata', - active: true, - priority: 100 - }, - { - name: 'Bengaluru', - latitude: 12.9716, - longitude: 77.5946, - country: india, - timezone: 'Asia/Kolkata', - active: true, - priority: 100 - } -]) diff --git a/db/seeds/cities/japan.rb b/db/seeds/cities/japan.rb deleted file mode 100644 index d29613e..0000000 --- a/db/seeds/cities/japan.rb +++ /dev/null @@ -1,22 +0,0 @@ -japan = Country.find_by code: 'JP' - -City.create!([ - { - name: 'Tokyo', - latitude: 35.6762, - longitude: 139.6503, - country: japan, - timezone: 'Asia/Tokyo', - active: true, - priority: 100 - }, - { - name: 'Yokohama', - latitude: 35.4437, - longitude: 139.6380, - country: japan, - timezone: 'Asia/Tokyo', - active: true, - priority: 100 - } -]) diff --git a/db/seeds/cities/mexico.rb b/db/seeds/cities/mexico.rb deleted file mode 100644 index 31295aa..0000000 --- a/db/seeds/cities/mexico.rb +++ /dev/null @@ -1,13 +0,0 @@ -mexico = Country.find_by code: 'MX' - -City.create!([ - { - name: 'Mexico City', - latitude: 19.4326, - longitude: -99.1332, - country: mexico, - timezone: 'America/Mexico_City', - active: true, - priority: 100 - } -]) diff --git a/db/seeds/cities/nigeria.rb b/db/seeds/cities/nigeria.rb deleted file mode 100644 index b6b5025..0000000 --- a/db/seeds/cities/nigeria.rb +++ /dev/null @@ -1,13 +0,0 @@ -nigeria = Country.find_by code: 'NG' - -City.create!([ - { - name: 'Lagos', - latitude: 6.5244, - longitude: 3.3792, - country: nigeria, - timezone: 'Africa/Lagos', - active: true, - priority: 100 - } -]) diff --git a/db/seeds/cities/pakistan.rb b/db/seeds/cities/pakistan.rb deleted file mode 100644 index fe2f944..0000000 --- a/db/seeds/cities/pakistan.rb +++ /dev/null @@ -1,13 +0,0 @@ -pakistan = Country.find_by code: 'PK' - -City.create!([ - { - name: 'Lahore', - latitude: 31.5204, - longitude: 74.3587, - country: pakistan, - timezone: 'Asia/Karachi', - active: true, - priority: 100 - } -]) diff --git a/db/seeds/cities/russia.rb b/db/seeds/cities/russia.rb deleted file mode 100644 index 937c2b0..0000000 --- a/db/seeds/cities/russia.rb +++ /dev/null @@ -1,22 +0,0 @@ -russia = Country.find_by code: 'RU' - -City.create!([ - { - name: 'Moscow', - latitude: 55.7558, - longitude: 37.6173, - country: russia, - timezone: 'Europe/Moscow', - active: true, - priority: 100 - }, - { - name: 'Sankt Petersburg', - latitude: 59.9311, - longitude: 30.3609, - country: russia, - timezone: 'Europe/Moscow', - active: true, - priority: 100 - } -]) diff --git a/db/seeds/cities/saudi_arabia.rb b/db/seeds/cities/saudi_arabia.rb deleted file mode 100644 index 92f7b14..0000000 --- a/db/seeds/cities/saudi_arabia.rb +++ /dev/null @@ -1,13 +0,0 @@ -saudi_arabia = Country.find_by code: 'CA' - -City.create!([ - { - name: 'Riyadh', - latitude: 24.7136, - longitude: 46.6753, - country: saudi_arabia, - timezone: 'Asia/Riyadh', - active: true, - priority: 100 - } -]) diff --git a/db/seeds/cities/singapore.rb b/db/seeds/cities/singapore.rb deleted file mode 100644 index 89bd55a..0000000 --- a/db/seeds/cities/singapore.rb +++ /dev/null @@ -1,13 +0,0 @@ -singapore = Country.find_by code: 'SG' - -City.create!([ - { - name: 'Singapore', - latitude: 1.3521, - longitude: 103.8198, - country: singapore, - timezone: 'Asia/Singapore', - active: true, - priority: 100 - } -]) diff --git a/db/seeds/cities/south_korea.rb b/db/seeds/cities/south_korea.rb deleted file mode 100644 index 949df75..0000000 --- a/db/seeds/cities/south_korea.rb +++ /dev/null @@ -1,13 +0,0 @@ -south_korea = Country.find_by code: 'KR' - -City.create!([ - { - name: 'Seoul', - latitude: 37.5665, - longitude: 126.9780, - country: south_korea, - timezone: 'Asia/Seoul', - active: true, - priority: 100 - } -]) diff --git a/db/seeds/cities/thailand.rb b/db/seeds/cities/thailand.rb deleted file mode 100644 index a080338..0000000 --- a/db/seeds/cities/thailand.rb +++ /dev/null @@ -1,13 +0,0 @@ -thailand = Country.find_by code: 'TH' - -City.create!([ - { - name: 'Bangkok', - latitude: 13.7563, - longitude: 100.5018, - country: thailand, - timezone: 'Asia/Bangkok', - active: true, - priority: 100 - } -]) diff --git a/db/seeds/cities/turkey.rb b/db/seeds/cities/turkey.rb deleted file mode 100644 index 7632978..0000000 --- a/db/seeds/cities/turkey.rb +++ /dev/null @@ -1,22 +0,0 @@ -turkey = Country.find_by code: 'TR' - -City.create!([ - { - name: 'İstanbul', - latitude: 41.0082, - longitude: 28.9784, - country: turkey, - timezone: 'Europe/Istanbul', - active: true, - priority: 100 - }, - { - name: 'Ankara', - latitude: 39.9334, - longitude: 32.8597, - country: turkey, - timezone: 'Europe/Istanbul', - active: true, - priority: 100 - } -]) diff --git a/db/seeds/cities/uk.rb b/db/seeds/cities/uk.rb deleted file mode 100644 index 8bcc574..0000000 --- a/db/seeds/cities/uk.rb +++ /dev/null @@ -1,13 +0,0 @@ -uk = Country.find_by code: 'GB' - -City.create!([ - { - name: 'London', - latitude: 51.5074, - longitude: -0.1278, - country: uk, - timezone: 'Europe/London', - active: true, - priority: 100 - } -]) diff --git a/db/seeds/cities/usa.rb b/db/seeds/cities/usa.rb deleted file mode 100644 index f0764ac..0000000 --- a/db/seeds/cities/usa.rb +++ /dev/null @@ -1,40 +0,0 @@ -usa = Country.find_by code: 'US' - -City.create!([ - { - name: 'San Francisco', - latitude: 37.7749, - longitude: -122.4194, - country: usa, - timezone: 'America/Los_Angeles', - active: true, - priority: 100 - }, - { - name: 'Chicago', - latitude: 41.8781, - longitude: -87.6298, - country: usa, - timezone: 'America/Chicago', - active: true, - priority: 100 - }, - { - name: 'New York City', - latitude: 40.7128, - longitude: -74.0060, - country: usa, - timezone: 'America/New_York', - active: true, - priority: 100 - }, - { - name: 'Los Angeles', - latitude: 34.0522, - longitude: -118.2437, - country: usa, - timezone: 'America/Los_Angeles', - active: true, - priority: 100 - } -]) diff --git a/db/seeds/cities/vietnam.rb b/db/seeds/cities/vietnam.rb deleted file mode 100644 index 058cc91..0000000 --- a/db/seeds/cities/vietnam.rb +++ /dev/null @@ -1,22 +0,0 @@ -vietnam = Country.find_by code: 'VN' - -City.create!([ - { - name: 'Ho Chi Minh City', - latitude: 10.8231, - longitude: 106.6297, - country: vietnam, - timezone: 'Asia/Ho_Chi_Minh', - active: true, - priority: 100 - }, - { - name: 'Hanoi', - latitude: 21.0285, - longitude: 105.8542, - country: vietnam, - timezone: 'Asia/Ho_Chi_Minh', - active: true, - priority: 100 - } -])