From 72d8af8d7b0338b80802c71ed2bcf19730f46a43 Mon Sep 17 00:00:00 2001
From: Jasder <2053003901@@qq.com>
Date: Mon, 28 Dec 2020 13:42:59 +0800
Subject: [PATCH 1/3] FIX update deploy file

---
 deploy.md | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

diff --git a/deploy.md b/deploy.md
index ae644121..6bdd2362 100644
--- a/deploy.md
+++ b/deploy.md
@@ -69,23 +69,29 @@ bundle exec rake sync_table_structure:import_csv
 rails db:migrate RAILS_ENV=development
 ```
 
-### 8. 启动redis(此处已mac系统为例)
+### 8. clone前端代码
+**将前端代码克隆到public/react目录下，目录结构应该是: public/react/build**
+```bash
+git clone https://git.trustie.net/jasder/build.git
+```
+
+### 9. 启动redis(此处已mac系统为例)
 ```bash
 redis-server&
 ```
 
-### 9. 启动sidekiq
+### 10. 启动sidekiq
 **开发环境为development， 生成环境为production**
 ```bash
 bundle exec sidekiq -C config/sidekiq.yml -e production -d
 ```
 
-### 10. 启动rails服务
+### 1`. 启动rails服务
 ```bash
 rails s
 ```
 
-### 11. 浏览器访问
+### 12. 浏览器访问
 在浏览器中输入如下地址访问：
 ```bash
 http://localhost:3000/

From 1420a47a5c0298a11b52e7bba35221af5a142b67 Mon Sep 17 00:00:00 2001
From: Jasder <2053003901@@qq.com>
Date: Mon, 28 Dec 2020 13:44:03 +0800
Subject: [PATCH 2/3] FIX bug

---
 deploy.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/deploy.md b/deploy.md
index 6bdd2362..d9c992d2 100644
--- a/deploy.md
+++ b/deploy.md
@@ -72,7 +72,7 @@ rails db:migrate RAILS_ENV=development
 ### 8. clone前端代码
 **将前端代码克隆到public/react目录下，目录结构应该是: public/react/build**
 ```bash
-git clone https://git.trustie.net/jasder/build.git
+git clone -b dev_trustie https://git.trustie.net/jasder/build.git
 ```
 
 ### 9. 启动redis(此处已mac系统为例)

From 50021a278bca1535f670f9205c4da477c801b9cd Mon Sep 17 00:00:00 2001
From: Jasder <2053003901@@qq.com>
Date: Tue, 29 Dec 2020 18:18:17 +0800
Subject: [PATCH 3/3] FIX generate token bug for regitster api

---
 app/controllers/concerns/register_helper.rb    |  2 +-
 .../gitea/user/generate_token_service.rb       | 18 +++++++++++++-----
 2 files changed, 14 insertions(+), 6 deletions(-)

diff --git a/app/controllers/concerns/register_helper.rb b/app/controllers/concerns/register_helper.rb
index a229ef42..e8ef1209 100644
--- a/app/controllers/concerns/register_helper.rb
+++ b/app/controllers/concerns/register_helper.rb
@@ -12,7 +12,7 @@ module RegisterHelper
     interactor = Gitea::RegisterInteractor.call({username: username, email: email, password: password})
     if interactor.success?
       gitea_user = interactor.result
-      result = Gitea::User::GenerateTokenService.new(username, password).call
+      result = Gitea::User::GenerateTokenService.call(username, password)
       user.gitea_token = result['sha1']
       user.gitea_uid = gitea_user['id']
       if user.save!
diff --git a/app/services/gitea/user/generate_token_service.rb b/app/services/gitea/user/generate_token_service.rb
index 4508d741..946bd68c 100644
--- a/app/services/gitea/user/generate_token_service.rb
+++ b/app/services/gitea/user/generate_token_service.rb
@@ -9,14 +9,18 @@ class Gitea::User::GenerateTokenService < Gitea::ClientService
 
 
   def call
-    params = {}
-    url = "/users/#{username}/tokens".freeze
-    params = params.merge(token: token_params, data: request_params)
-    post(url, params)
+    params = Hash.new.merge(token: token_params, data: request_params)
+    response = post(url, params)
 
+    render_200_response(response)
   end
 
   private
+
+  def url
+    "/users/#{@username}/tokens".freeze
+  end
+
   def token_params
     {
       username: username,
@@ -25,6 +29,10 @@ class Gitea::User::GenerateTokenService < Gitea::ClientService
   end
 
   def request_params
-    { name: username }
+    { name: "#{@username}-#{token_name}" }
+  end
+
+  def token_name
+    SecureRandom.hex(6)
   end
 end