Merge branch 'develop'

tryzealot · Sep 14, 2022 · 7434dce · 7434dce
2 parents 00542d1 + 985f49e
commit 7434dce
Show file tree

Hide file tree

Showing 12 changed files with 187 additions and 193 deletions.
diff --git a/.github/ISSUE_TEMPLATE/bug_report.yaml b/.github/ISSUE_TEMPLATE/bug_report.yaml
@@ -52,7 +52,7 @@ body:
   - type: textarea
     attributes:
       label: 描述 | Description
-      description: 请描述你的问题 | Please describe your bug
+      description: 请描述你的问题，尽可能提供[最小化重现](https://antfu.me/posts/why-reproductions-are-required-zh) | Please describe your bug and provide [minimal reproductions](https://antfu.me/posts/why-reproductions-are-required).
   - type: textarea
     id: logs
     attributes:

diff --git a/Dockerfile b/Dockerfile
@@ -61,7 +61,7 @@ ARG BUILD_DATE
 ARG VCS_REF
 ARG TAG
 
-ARG ZEALOT_VERSION="4.5.0"
+ARG ZEALOT_VERSION="4.5.1"
 ARG REPLACE_CHINA_MIRROR="true"
 ARG ORIGINAL_REPO_URL="dl-cdn.alpinelinux.org"
 ARG MIRROR_REPO_URL="mirrors.ustc.edu.cn"

diff --git a/Gemfile b/Gemfile
@@ -4,7 +4,7 @@ source 'https://rubygems.org'
 
 git_source(:github) { |repo_name| "https://github.com/#{repo_name}" }
 
-gem 'puma', '~> 5.6.4'
+gem 'puma', '~> 5.6.5'
 gem 'rails', '~> 7.0.3'
 gem 'rails-i18n', '~> 7.0.5'
 gem 'rake', '~> 13.0.4'
@@ -18,7 +18,7 @@ gem 'lograge', '~> 0.12.0'
 
 # API
 gem 'active_model_serializers', '~> 0.10.13'
-gem 'graphql', '~> 2.0.13'
+gem 'graphql', '~> 2.0.14'
 gem 'rack-cors', '~> 1.1.1'
 gem 'health_check', '~> 3.1.0'
 gem 'tiny_appstore_connect', '~> 0.1.7' #path: '/Users/icyleaf/Development/ruby/tiny_appstore_connect'
@@ -85,9 +85,9 @@ gem 'rqrcode'
 
 # 异步队列
 gem 'activejob-status'
-gem 'sidekiq', '~> 6.5.4'
+gem 'sidekiq', '~> 6.5.6'
 gem 'sidekiq-scheduler', '~> 4.0.2'
-gem 'sidekiq-failures', '~> 1.0.3'
+gem 'sidekiq-failures', '~> 1.0.4'
 
 # Assets
 ## jsbundling-rails, cssbundling-rails 仅生成配置文件到项目组，核心还是 package.json 中 build/build:css 部分。

diff --git a/Gemfile.lock b/Gemfile.lock
@@ -138,7 +138,7 @@ GEM
     dotenv-rails (2.8.1)
       dotenv (= 2.8.1)
       railties (>= 3.2)
-    erubi (1.10.0)
+    erubi (1.11.0)
     et-orbi (1.2.7)
       tzinfo
     faraday (2.5.2)
@@ -161,7 +161,7 @@ GEM
     graphiql-rails (1.8.0)
       railties
       sprockets-rails
-    graphql (2.0.13)
+    graphql (2.0.14)
     guard (2.18.0)
       formatador (>= 0.2.4)
       listen (>= 2.7, < 4.0)
@@ -255,7 +255,7 @@ GEM
     mini_magick (4.11.0)
     mini_mime (1.1.2)
     mini_portile2 (2.8.0)
-    minitest (5.16.2)
+    minitest (5.16.3)
     mixlib-shellout (3.2.7)
       chef-utils
     msgpack (1.5.4)
@@ -334,7 +334,7 @@ GEM
       interception (>= 0.5)
       pry (>= 0.12.0)
     public_suffix (4.0.7)
-    puma (5.6.4)
+    puma (5.6.5)
       nio4r (~> 2.0)
     pundit (2.2.0)
       activesupport (>= 3.0.0)
@@ -423,20 +423,20 @@ GEM
     rubyzip (2.3.2)
     rufus-scheduler (3.8.2)
       fugit (~> 1.1, >= 1.1.6)
-    sentry-rails (5.4.1)
+    sentry-rails (5.4.2)
       railties (>= 5.0)
-      sentry-ruby (~> 5.4.1)
+      sentry-ruby (~> 5.4.2)
     sentry-ruby (5.4.2)
       concurrent-ruby (~> 1.0, >= 1.0.2)
-    sentry-sidekiq (5.4.1)
-      sentry-ruby (~> 5.4.1)
+    sentry-sidekiq (5.4.2)
+      sentry-ruby (~> 5.4.2)
       sidekiq (>= 3.0)
     shellany (0.0.1)
-    sidekiq (6.5.4)
-      connection_pool (>= 2.2.2)
+    sidekiq (6.5.6)
+      connection_pool (>= 2.2.5)
       rack (~> 2.0)
-      redis (>= 4.5.0)
-    sidekiq-failures (1.0.3)
+      redis (>= 4.5.0, < 5)
+    sidekiq-failures (1.0.4)
       sidekiq (>= 4.0.0)
     sidekiq-scheduler (4.0.2)
       redis (>= 4.2.0)
@@ -523,7 +523,7 @@ DEPENDENCIES
   faraday (~> 2.5.2)
   friendly_id (~> 5.4.2)
   graphiql-rails
-  graphql (~> 2.0.13)
+  graphql (~> 2.0.14)
   guard (~> 2.18.0)
   guard-bundler
   guard-migrate
@@ -551,7 +551,7 @@ DEPENDENCIES
   propshaft (= 0.6.4)
   pry-rails
   pry-rescue
-  puma (~> 5.6.4)
+  puma (~> 5.6.5)
   pundit (~> 2.2.0)
   pyu-ruby-sasl (>= 0.0.3.3, < 0.1)
   rack-cors (~> 1.1.1)
@@ -567,8 +567,8 @@ DEPENDENCIES
   sentry-rails
   sentry-ruby
   sentry-sidekiq
-  sidekiq (~> 6.5.4)
-  sidekiq-failures (~> 1.0.3)
+  sidekiq (~> 6.5.6)
+  sidekiq-failures (~> 1.0.4)
   sidekiq-scheduler (~> 4.0.2)
   simple_form (~> 5.1)
   slim-rails (~> 3.5.1)

diff --git a/README.md b/README.md
@@ -4,7 +4,7 @@
   <h1>Zealot</h1>
 
   <h4>
-    开源自部署 iOS、Android 及 macOS 应用分发平台，提供 iOS、Android SDK、fastlane 等丰富组件库，打包分发流程、上传应用竟然如此简单、独立部署解决企业使用的烦恼。 En Taro Adun! 🖖
+    开源自部署持续集成一切跟应用有关事情，接入任意 CI 系统一切自动化处理，企业多年实战经验，独立部署提供企业打包分发流程、上传应用全套流程方案 En Taro Adun! 🖖
   </h4>
 
   <a href="https://github.com/tryzealot/zealot/blob/develop/CHANGELOG.md">
@@ -33,15 +33,15 @@
   </div>
 
   <div>
-    <a href="https://zealot.ews.im/#/en/deployment">自部署</a> •
-    <a href="https://zealot.ews.im/#/en/configuration">配置</a> •
-    <a href="https://zealot.ews.im/#/en/api">REST API</a> •
-    <a href="https://zealot.ews.im/#/en/modules">SDK</a> •
-    <a href="https://zealot.ews.im/#/en/screenshot">功能截图</a>
+    <a href="https://zealot.ews.im/#/deployment">自部署</a> •
+    <a href="https://zealot.ews.im/#/configuration">配置</a> •
+    <a href="https://zealot.ews.im/#/api">REST API</a> •
+    <a href="https://zealot.ews.im/#/modules">SDK</a> •
+    <a href="https://zealot.ews.im/#/screenshot">功能截图</a>
   </div>
 </div>
 
-![Zealot Showcase](https://zealot.ews.im/_media/showcase.png)
+![Zealot Showcase](https://zealot.ews.im/img/showcase.png)
 ## 特性
 
 - 🌏 **多平台应用支持**: macOS、iOS、甚至是 APK 和 AAB 格式的 Android 应用上传、安装（支持 ARM 的 macOS）和下载
@@ -57,7 +57,7 @@
 
 > **注意**: 数据每日都会重新初始化，不对用户上传的应用承担任何法律风险，后果自负！
 
-- 演示地址：https://tryzealot.herokuapp.com/
+- 演示地址：https://tryzealot.ews.im/
 - 登录账户: `admin@zealot.com`
 - 登录密码：`ze@l0t`
 
@@ -73,4 +73,4 @@
 [zealot-ios-sdk]: https://github.com/tryzealot/zealot-ios
 [android-android-sdk]: https://github.com/tryzealot/zealot-android
 [fastlane-plugin-zealot]: https://github.com/tryzealot/fastlane-plugin-zealot
-[mit-link]: https://github.com/tryzealot/zealot/blob/develop/CHANGELOG.md
+[mit-link]: https://github.com/tryzealot/zealot/blob/develop/CHANGELOG.md
diff --git a/app/controllers/admin/backups_controller.rb b/app/controllers/admin/backups_controller.rb
@@ -89,7 +89,7 @@ def parse_schedule
     end
 
     render json: {
-      error: t('.invaild_expression')
+      error: t('.invalid_expression')
     }, status: 409
   end
 

diff --git a/app/controllers/teardowns_controller.rb b/app/controllers/teardowns_controller.rb
@@ -46,6 +46,7 @@ def create
     render :new, status: :unprocessable_entity
   rescue => e
     logger.error "Teardown error: #{e}"
+    logger.error "Throws backtraces are: #{e.backtrace.join("\n")}"
     Sentry.capture_exception e
     flash[:error] = t('teardowns.messages.errors.unknown_parse', class: e.class, message: e.message)
     render :new, status: :unprocessable_entity
@@ -69,7 +70,7 @@ def parse_app
       raise ActionController::RoutingError, t('teardowns.messages.errors.choose_supported_file_type')
     end
 
-    metadata = TeardownService.new.call(file)
+    metadata = TeardownService.new(file).call
     metadata.update_attribute(:user_id, current_user.id) if current_user.present?
 
     redirect_to teardown_path(metadata)

diff --git a/app/javascript/controllers/admin/new_release_controller.js b/app/javascript/controllers/admin/new_release_controller.js
@@ -1,5 +1,5 @@
 import { Controller } from "@hotwired/stimulus"
-import compareVersion from "compare-versions"
+import { compare } from "compare-versions"
 
 const DEVELLOPMENT = "development"
 const PROJECT_URL = "https://github.com/tryzealot/zealot"
@@ -19,15 +19,13 @@ export default class extends Controller {
 
   check() {
     fetch(VERSION_URL, {
-      method: "GET",
       headers: {
-        "X-Requested-With": "XMLHttpRequest",
         "Accept": "application/vnd.github.v3+json"
       }
     }).then((response) => response.json())
       .then((json) => {
         const releaseVersion = json.tag_name
-        if (compareVersion(releaseVersion, this.versionValue) <= 0) { return }
+        if (compare(releaseVersion, this.versionValue, '<=')) { return }
         const releaseLink = json.html_url
         const title = this.titleValue + " " + releaseVersion
         this.render(title, releaseLink)

diff --git a/config/locales/zealot/zh-CN.yml b/config/locales/zealot/zh-CN.yml
@@ -231,7 +231,7 @@ zh-CN:
       destroy_archive:
         success: 备份文件成功删除
       parse_schedule:
-        invaild_expression: 表达式无法解析
+        invalid_expression: 表达式无法解析
 
     background_jobs:
       title: 后台任务

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "zealot",
-  "version": "4.5.0",
+  "version": "4.5.1",
   "private": true,
   "license": "MIT",
   "dependencies": {
@@ -9,9 +9,9 @@
     "@rails/actioncable": "^7.0.3",
     "admin-lte": "3.1.0",
     "clipboard": "^2.0.11",
-    "compare-versions": "^4.1.3",
-    "esbuild": "^0.15.5",
-    "sass": "^1.54.4",
+    "compare-versions": "^5.0.1",
+    "esbuild": "^0.15.7",
+    "sass": "^1.54.9",
     "ua-parser-js": "^1.0.2"
   },
   "scripts": {

diff --git a/render.yaml b/render.yaml
@@ -17,10 +17,10 @@ services:
   dockerfilePath: Dockerfile
   dockerContext: .
   autoDeploy: true
-  disk:
-    name: zealot-data
-    mountPath: /app/public/uploads
-    sizeGB: 10
+  # disk:
+  #   name: zealot-data
+  #   mountPath: /app/public/uploads
+  #   sizeGB: 10
   envVars:
   - key: ZEALOT_ADMIN_EMAIL
     sync: false
@@ -131,4 +131,4 @@ services:
   - key: WEB_CONCURRENCY
     value: 1
   - key: SECRET_TOKEN
-    generateValue: true
+    generateValue: true