Merge remote-tracking branch 'trustie/trustie_server'

# Conflicts: # Gemfile # Gemfile.lock # config/configuration.yml.example
2026-05-03 03:40:49 +08:00 · 2023-05-10 14:56:07 +08:00
parent 32a7ad97b4 4741a50b9e
commit f8dfad28d5
322 changed files with 8847 additions and 925 deletions
--- a/README.md
+++ b/README.md
@@ -111,6 +111,7 @@ gitea:
  access_key_secret: 'password'
  domain: 'http://www.gitea.example.com'
  base_url: '/api/v1'
+  hat_base_url: '/api/hat'
 ```

 （8）配置/config/database.yml文件(安装redis环境:请自行搜索各平台如何安装部署redis环境)