From 24d73f4eb6c3c399ba5abda73d040a7b8301b0c8 Mon Sep 17 00:00:00 2001
From: "sylor_huang@126.com" <sylor_huang@126.com>
Date: Wed, 22 Jul 2020 17:21:59 +0800
Subject: [PATCH 01/16] Fix admin project list

---
 app/tasks/sync_project_socre_rake.rb            | 5 +++++
 app/views/admins/projects/shared/_list.html.erb | 4 ++--
 2 files changed, 7 insertions(+), 2 deletions(-)
 create mode 100644 app/tasks/sync_project_socre_rake.rb

diff --git a/app/tasks/sync_project_socre_rake.rb b/app/tasks/sync_project_socre_rake.rb
new file mode 100644
index 000000000..c8a7348f7
--- /dev/null
+++ b/app/tasks/sync_project_socre_rake.rb
@@ -0,0 +1,5 @@
+class SyncProjectScoreRake
+   # 运行示例: 检查哪些用户的gitea不存在，bundle exec rails runner "SyncProjectScoreRake.new.call()"
+
+   
+end
\ No newline at end of file
diff --git a/app/views/admins/projects/shared/_list.html.erb b/app/views/admins/projects/shared/_list.html.erb
index d092134ca..47e5a64eb 100644
--- a/app/views/admins/projects/shared/_list.html.erb
+++ b/app/views/admins/projects/shared/_list.html.erb
@@ -28,8 +28,8 @@
       <td><%= project.is_public ? '√' : '' %></td>
       <td><%= project.issues.size %></td>
       <td><%= project.attachments.size %></td>
-      <td><%= project.project_score.try(:changeset_num).to_i %></td>
-      <td><%= project.project_score.try(:pull_request_num).to_i %></td>
+      <td><%= project&.project_score.try(:changeset_num).to_i %></td>
+      <td><%= project*.project_score.try(:pull_request_num).to_i %></td>
       <td><%= project.versions.size %></td>
       <td><%= project.members.size %></td>
       <td>

From 5465d61d5069f48df31004092ead0a31ee05c73d Mon Sep 17 00:00:00 2001
From: "sylor_huang@126.com" <sylor_huang@126.com>
Date: Wed, 22 Jul 2020 17:22:23 +0800
Subject: [PATCH 02/16] Fix bugs

---
 app/views/admins/projects/shared/_list.html.erb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/views/admins/projects/shared/_list.html.erb b/app/views/admins/projects/shared/_list.html.erb
index 47e5a64eb..bd6300283 100644
--- a/app/views/admins/projects/shared/_list.html.erb
+++ b/app/views/admins/projects/shared/_list.html.erb
@@ -29,7 +29,7 @@
       <td><%= project.issues.size %></td>
       <td><%= project.attachments.size %></td>
       <td><%= project&.project_score.try(:changeset_num).to_i %></td>
-      <td><%= project*.project_score.try(:pull_request_num).to_i %></td>
+      <td><%= project&.project_score.try(:pull_request_num).to_i %></td>
       <td><%= project.versions.size %></td>
       <td><%= project.members.size %></td>
       <td>

From 8ce7d8c9217c1f94b011bad4bc02cb915a87fd8a Mon Sep 17 00:00:00 2001
From: "sylor_huang@126.com" <sylor_huang@126.com>
Date: Wed, 22 Jul 2020 20:20:42 +0800
Subject: [PATCH 03/16] Fix bugs

---
 app/controllers/users_controller.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb
index 3c1fa0989..ac60f4d18 100644
--- a/app/controllers/users_controller.rb
+++ b/app/controllers/users_controller.rb
@@ -171,7 +171,7 @@ class UsersController < ApplicationController
       end
     end
     Rails.logger.info("==========projects_json========+########{projects_json}")
-    render json: { projects: projects_json }
+    render json: { projects: projects_json.present? ? projects_json : {} }
   end
 
   def trustie_projects

From 97f40f6d7661145915f67ab1015a2ada7a51742a Mon Sep 17 00:00:00 2001
From: "sylor_huang@126.com" <sylor_huang@126.com>
Date: Thu, 30 Jul 2020 09:53:10 +0800
Subject: [PATCH 04/16] Change Issue series Update

---
 app/controllers/issues_controller.rb | 14 +++++++++++++-
 app/jobs/sync_repository_job.rb      |  1 +
 2 files changed, 14 insertions(+), 1 deletion(-)

diff --git a/app/controllers/issues_controller.rb b/app/controllers/issues_controller.rb
index 8fdb06371..418ae4f81 100644
--- a/app/controllers/issues_controller.rb
+++ b/app/controllers/issues_controller.rb
@@ -248,7 +248,19 @@ class IssuesController < ApplicationController
     update_hash = {}
     update_hash.merge!(assigned_to_id: params[:assigned_to_id]) if params[:assigned_to_id].present?
     update_hash.merge!(fixed_version_id: params[:fixed_version_id]) if params[:fixed_version_id].present?
-    update_hash.merge!(status_id: params[:status_id]) if params[:status_id].present?
+    # update_hash.merge!(status_id: params[:status_id]) if params[:status_id].present?
+    if params[:status_id].present?
+      status_id = params[:status_id].to_i
+      update_hash.merge!(status_id: status_id)
+      done_ratio = nil
+      case status_id
+      when 1
+        done_ratio = 0
+      when 3
+        done_ratio = 100
+      end
+      update_hash.merge!(done_ratio: done_ratio) if done_ratio
+    end
     # update_hash = params[:issue]
     issue_ids = params[:ids]
     if issue_ids.present?
diff --git a/app/jobs/sync_repository_job.rb b/app/jobs/sync_repository_job.rb
index c59154d99..9edbae983 100644
--- a/app/jobs/sync_repository_job.rb
+++ b/app/jobs/sync_repository_job.rb
@@ -28,6 +28,7 @@ class SyncRepositoryJob < ApplicationJob
           SyncLog.sync_log("=============force_push_erros==#{path}/#{image_repo_name}++branch:#{branch}")
         else
           SyncLog.sync_log("=============force_push_success==#{path}/#{image_repo_name}++branch+++#{branch}")
+          system("rm -rf #{path}/#{image_repo_name}")
         end
       end
     else

From c63c916d9ded65cfff24e0e4a75a52d319dfe85c Mon Sep 17 00:00:00 2001
From: Jasder <2053003901@@qq.com>
Date: Thu, 6 Aug 2020 14:29:34 +0800
Subject: [PATCH 05/16] Update sync gitea user info

---
 app/controllers/accounts_controller.rb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/controllers/accounts_controller.rb b/app/controllers/accounts_controller.rb
index 46ea83a2e..23290d91c 100644
--- a/app/controllers/accounts_controller.rb
+++ b/app/controllers/accounts_controller.rb
@@ -66,8 +66,8 @@ class AccountsController < ApplicationController
 
         sync_params = {}
 
-        if (user_params["mail"] && user_params["mail"] != user_mail) || (user_params["login"] && user_params["login"] != params[:old_user_login])
-          sync_params = sync_params.merge(email: user_params["mail"], login_name: user_params["login"], full_name: user_params["login"])
+        if (user_params["mail"] && user_params["mail"] != user_mail)
+          sync_params = sync_params.merge(email: user_params["mail"])
         end
 
         if sync_params.present?

From eb0c69e802b9672eb359f759ca402c86c8c077ed Mon Sep 17 00:00:00 2001
From: "sylor_huang@126.com" <sylor_huang@126.com>
Date: Wed, 12 Aug 2020 10:38:45 +0800
Subject: [PATCH 06/16] Add Sync Project Military Job

---
 app/controllers/projects_controller.rb   |   1 +
 app/controllers/sync_forge_controller.rb | 575 ++++++++++++-----------
 app/jobs/sync_project_military_job.rb    |  22 +
 config/routes.rb                         |   1 +
 4 files changed, 317 insertions(+), 282 deletions(-)
 create mode 100644 app/jobs/sync_project_military_job.rb

diff --git a/app/controllers/projects_controller.rb b/app/controllers/projects_controller.rb
index eb6c79777..f36d9e8f0 100644
--- a/app/controllers/projects_controller.rb
+++ b/app/controllers/projects_controller.rb
@@ -104,6 +104,7 @@ class ProjectsController < ApplicationController
     json_response(project)
   end
 
+
   private
   def project_params
     params.permit(:user_id, :name, :description, :repository_name,
diff --git a/app/controllers/sync_forge_controller.rb b/app/controllers/sync_forge_controller.rb
index e5dbc211d..a6d266970 100644
--- a/app/controllers/sync_forge_controller.rb
+++ b/app/controllers/sync_forge_controller.rb
@@ -1,302 +1,313 @@
 class SyncForgeController < ApplicationController
   # before_action :check_token
 
-  def create 
-    ActiveRecord::Base.transaction do
-      params.permit!
-      sync_params = params[:sync_params]
-      project_user = User.where(login: sync_params[:owner_login])&.first 
-      #以前已同步的项目,那么肯定存在仓库
-      SyncLog.sync_log("=================begin_to_sync_forge: project_identifier: #{sync_params[:identifier]}========")
-      user_projects = Project.where(user_id: project_user.id)
-      if  user_projects.where(id: sync_params[:id], identifier: sync_params[:identifier]).present?
-        has_project = true
-        project = user_projects.where(id: sync_params[:id], identifier: sync_params[:identifier])&.first
-      elsif user_projects.where(id: sync_params[:id]).present?
-        has_project = true
-        project = user_projects.where(id: sync_params[:id])&.first
-      elsif user_projects.where(identifier: sync_params[:identifier]).present?
-        has_project = true
-        project = user_projects.where(identifier: sync_params[:identifier])&.first
-      else
-        has_project = false
-      end
+  def 
+    sync_counts = params[:sync_count] || 10
+    projects = Project.includes(:project_score, :repository)
+                      .where(is_public: true)
+                      .where.not(identifier: ["educoder","trustieforge", "gitlab"])
+                      .joins(:project_score).order("project_scores.changeset_num desc").limit(sync_counts.to_i)
+    projects.each do | project |
+      SyncProjectMilitaryJob.perform_later(project, project.repository, project.project_score)
+    end
+  end
 
-      if has_project
-        SyncLog.sync_log("=================begin_to_update_project========")
-        check_sync_project(project, sync_params)
-      else #新建项目
-        SyncLog.sync_log("=================begin_to_create_new_project========")
+  # def create 
+  #   ActiveRecord::Base.transaction do
+  #     params.permit!
+  #     sync_params = params[:sync_params]
+  #     project_user = User.where(login: sync_params[:owner_login])&.first 
+  #     #以前已同步的项目,那么肯定存在仓库
+  #     SyncLog.sync_log("=================begin_to_sync_forge: project_identifier: #{sync_params[:identifier]}========")
+  #     user_projects = Project.where(user_id: project_user.id)
+  #     if  user_projects.where(id: sync_params[:id], identifier: sync_params[:identifier]).present?
+  #       has_project = true
+  #       project = user_projects.where(id: sync_params[:id], identifier: sync_params[:identifier])&.first
+  #     elsif user_projects.where(id: sync_params[:id]).present?
+  #       has_project = true
+  #       project = user_projects.where(id: sync_params[:id])&.first
+  #     elsif user_projects.where(identifier: sync_params[:identifier]).present?
+  #       has_project = true
+  #       project = user_projects.where(identifier: sync_params[:identifier])&.first
+  #     else
+  #       has_project = false
+  #     end
+
+  #     if has_project
+  #       SyncLog.sync_log("=================begin_to_update_project========")
+  #       check_sync_project(project, sync_params)
+  #     else #新建项目
+  #       SyncLog.sync_log("=================begin_to_create_new_project========")
         
-        project_params = {
-          repository_name: sync_params[:identifier],
-          user_id: project_user.id,
-          private: !sync_params[:is_public],
-          name: sync_params[:name]
-        }
-        project = Projects::CreateService.new(project_user, project_params).call
-        if project.present?
-          if sync_params[:project_score].present?
-            sync_params.permit!
-            score_params = sync_params[:project_score].merge(project_id: project.id)
-            new_project_score = ProjectScore.create(score_params)
-            SyncLog.sync_log("=================new_project_score:#{new_project_score.try(:id)}========")
-          end
+  #       project_params = {
+  #         repository_name: sync_params[:identifier],
+  #         user_id: project_user.id,
+  #         private: !sync_params[:is_public],
+  #         name: sync_params[:name]
+  #       }
+  #       project = Projects::CreateService.new(project_user, project_params).call
+  #       if project.present?
+  #         if sync_params[:project_score].present?
+  #           sync_params.permit!
+  #           score_params = sync_params[:project_score].merge(project_id: project.id)
+  #           new_project_score = ProjectScore.create(score_params)
+  #           SyncLog.sync_log("=================new_project_score:#{new_project_score.try(:id)}========")
+  #         end
               
-          SyncRepositoryJob.perform_later(sync_params[:owner_login], sync_params[:identifier], sync_params[:repository], get_sudomain) if sync_params[:repository].present?
-          check_new_project(project, sync_params)
-        else
-          SyncLog.sync_project_log("=============new_project_create_failed, trustie_project_id==:#{params[:sync_params][:id]}")
-        end
-      end
-    end
-  rescue Exception => e
-    SyncLog.sync_project_log("=============sync_has_errors:==#{e.message}, project_id==:#{params[:sync_params][:id]}")
-  end
+  #         SyncRepositoryJob.perform_later(sync_params[:owner_login], sync_params[:identifier], sync_params[:repository], get_sudomain) if sync_params[:repository].present?
+  #         check_new_project(project, sync_params)
+  #       else
+  #         SyncLog.sync_project_log("=============new_project_create_failed, trustie_project_id==:#{params[:sync_params][:id]}")
+  #       end
+  #     end
+  #   end
+  # rescue Exception => e
+  #   SyncLog.sync_project_log("=============sync_has_errors:==#{e.message}, project_id==:#{params[:sync_params][:id]}")
+  # end
 
-  def sync_users
-    params.permit!
-    sync_params = params[:sync_params]
-    users_params = sync_params[:users]
+  # def sync_users
+  #   params.permit!
+  #   sync_params = params[:sync_params]
+  #   users_params = sync_params[:users]
 
-    users_params.each do |u|
-      if User.exists?(login: u[:user_params][:login])
-        SyncLog.sync_log("=================sync_to_user_been_exists====#{u[:user_params][:login]}")
-      else
-        # new_user = User.new(u[:user_params])
+  #   users_params.each do |u|
+  #     if User.exists?(login: u[:user_params][:login])
+  #       SyncLog.sync_log("=================sync_to_user_been_exists====#{u[:user_params][:login]}")
+  #     else
+  #       # new_user = User.new(u[:user_params])
 
-        if u[:user_params][:mail].blank?
-          u_mail = "#{u[:user_params][:login]}@example.com"
-        else
-          u_mail = u[:user_params][:mail]
-        end
+  #       if u[:user_params][:mail].blank?
+  #         u_mail = "#{u[:user_params][:login]}@example.com"
+  #       else
+  #         u_mail = u[:user_params][:mail]
+  #       end
 
-        new_user = User.new(u[:user_params].merge(mail: u_mail))
+  #       new_user = User.new(u[:user_params].merge(mail: u_mail))
 
-        username = new_user.login
-        password = "12345678"
-        # if new_user.save!
-        #   SyncLog.sync_log("=================sync_to_user_success==#{new_user.login}")
-        # else
-        #   SyncLog.sync_log("=================sync_to_user_failed,user_login==#{new_user.login}")
-        # end
-        ActiveRecord::Base.transaction do
-          interactor = Gitea::RegisterInteractor.call({username: username, email: new_user.mail, password: password})
-          if interactor.success?
-            gitea_user = interactor.result
-            result = Gitea::User::GenerateTokenService.new(username, password).call
-            new_user.gitea_token = result['sha1']
-            new_user.gitea_uid = gitea_user['id']
-            if new_user.save!
-              UserExtension.create!(u[:user_extensions][:user_extensions].merge(user_id: new_user.id)) if u[:user_extensions].present? && u[:user_extensions][:user_extensions].present?
-            else
-              SyncLog.sync_log("=================sync_to_user_failed,user_login==#{new_user.login}")
-            end
-          else
-            SyncLog.sync_log("=============sync_to_user_failed,user_login====#{new_user.login}")
-            SyncLog.sync_log("=================sync_to_user_failed,user_login====#{new_user.login}")
-          end
-        end
-      end
-    end
-    # normal_status(1, "completed_sync")
-  rescue Exception => e
-     SyncLog.sync_log("=================sync_user_failed====#{e}")
-  end
+  #       username = new_user.login
+  #       password = "12345678"
+  #       # if new_user.save!
+  #       #   SyncLog.sync_log("=================sync_to_user_success==#{new_user.login}")
+  #       # else
+  #       #   SyncLog.sync_log("=================sync_to_user_failed,user_login==#{new_user.login}")
+  #       # end
+  #       ActiveRecord::Base.transaction do
+  #         interactor = Gitea::RegisterInteractor.call({username: username, email: new_user.mail, password: password})
+  #         if interactor.success?
+  #           gitea_user = interactor.result
+  #           result = Gitea::User::GenerateTokenService.new(username, password).call
+  #           new_user.gitea_token = result['sha1']
+  #           new_user.gitea_uid = gitea_user['id']
+  #           if new_user.save!
+  #             UserExtension.create!(u[:user_extensions][:user_extensions].merge(user_id: new_user.id)) if u[:user_extensions].present? && u[:user_extensions][:user_extensions].present?
+  #           else
+  #             SyncLog.sync_log("=================sync_to_user_failed,user_login==#{new_user.login}")
+  #           end
+  #         else
+  #           SyncLog.sync_log("=============sync_to_user_failed,user_login====#{new_user.login}")
+  #           SyncLog.sync_log("=================sync_to_user_failed,user_login====#{new_user.login}")
+  #         end
+  #       end
+  #     end
+  #   end
+  #   # normal_status(1, "completed_sync")
+  # rescue Exception => e
+  #    SyncLog.sync_log("=================sync_user_failed====#{e}")
+  # end
 
-  private 
+  # private 
 
-  def check_sync_project(project,sync_params)
-    begin
-      gitea_main = "https://www.trustie.net/"
-      # if request.subdomain === 'testforgeplus'
-      #   gitea_main = "https://ucloudtest.trustie.net/"
-      # end
+  # def check_sync_project(project,sync_params)
+  #   begin
+  #     gitea_main = "https://www.trustie.net/"
+  #     # if request.subdomain === 'testforgeplus'
+  #     #   gitea_main = "https://ucloudtest.trustie.net/"
+  #     # end
 
-      SyncLog.sync_log("----begin_to_check_sync_project----project_id:#{project.id}---------------")
-      change_project_score(project, sync_params[:project_score], sync_params[:repository]) if sync_params[:repository].present?  #更新project_score 
-      change_project_issues(project, sync_params[:issues],project.id, gitea_main) 
-      change_project_members(project, sync_params[:members],gitea_main)
-      change_project_versions(project, sync_params[:project_versions],gitea_main)
-      change_project_watchers(project, sync_params[:project_watchers],gitea_main)
-      change_project_praises(project, sync_params[:praise_trends],gitea_main)
-    rescue => e
-      SyncLog.sync_log("=========check_sync_project_errors:#{e}===================")
-    end
+  #     SyncLog.sync_log("----begin_to_check_sync_project----project_id:#{project.id}---------------")
+  #     change_project_score(project, sync_params[:project_score], sync_params[:repository]) if sync_params[:repository].present?  #更新project_score 
+  #     change_project_issues(project, sync_params[:issues],project.id, gitea_main) 
+  #     change_project_members(project, sync_params[:members],gitea_main)
+  #     change_project_versions(project, sync_params[:project_versions],gitea_main)
+  #     change_project_watchers(project, sync_params[:project_watchers],gitea_main)
+  #     change_project_praises(project, sync_params[:praise_trends],gitea_main)
+  #   rescue => e
+  #     SyncLog.sync_log("=========check_sync_project_errors:#{e}===================")
+  #   end
     
-  end
+  # end
 
-  def check_new_project(project,sync_params)
-    SyncLog.sync_log("***8. begin_to_sync_new_project---------------")
-    sync_projects_params = {
-        type: "Project",
-        ids: sync_params[:id],
-        token: get_token,
-        sync_params: sync_params,
-        new_project_id: project.id
-      }
+  # def check_new_project(project,sync_params)
+  #   SyncLog.sync_log("***8. begin_to_sync_new_project---------------")
+  #   sync_projects_params = {
+  #       type: "Project",
+  #       ids: sync_params[:id],
+  #       token: get_token,
+  #       sync_params: sync_params,
+  #       new_project_id: project.id
+  #     }
 
-      gitea_main = "https://www.trustie.net/"
-      # if request.subdomain === 'testforgeplus'
-      #   gitea_main = "https://ucloudtest.trustie.net/"
-      # end
-      SyncProjectsJob.perform_later(sync_projects_params, gitea_main)
-      SyncLog.sync_log("***8. end_to_sync_new_project---------------")
-  end
+  #     gitea_main = "https://www.trustie.net/"
+  #     # if request.subdomain === 'testforgeplus'
+  #     #   gitea_main = "https://ucloudtest.trustie.net/"
+  #     # end
+  #     SyncProjectsJob.perform_later(sync_projects_params, gitea_main)
+  #     SyncLog.sync_log("***8. end_to_sync_new_project---------------")
+  # end
 
-  def change_project_praises(project, praises,gitea_main)
-    SyncLog.sync_log("***6. begin_to_sync_parises---------------")
-    forge_praises_ids = project&.praise_treads&.select(:id)&.pluck(:id)
-    diff_target_ids = praises[:ids] - forge_praises_ids
-    if diff_target_ids.size > 0
-      sync_projects_params = {
-        type: "PraiseTread",
-        ids: diff_target_ids,
-        token: get_token,
-        parent_id: project.id
-      }
-      SyncProjectsJob.perform_later(sync_projects_params,gitea_main)
+  # def change_project_praises(project, praises,gitea_main)
+  #   SyncLog.sync_log("***6. begin_to_sync_parises---------------")
+  #   forge_praises_ids = project&.praise_treads&.select(:id)&.pluck(:id)
+  #   diff_target_ids = praises[:ids] - forge_praises_ids
+  #   if diff_target_ids.size > 0
+  #     sync_projects_params = {
+  #       type: "PraiseTread",
+  #       ids: diff_target_ids,
+  #       token: get_token,
+  #       parent_id: project.id
+  #     }
+  #     SyncProjectsJob.perform_later(sync_projects_params,gitea_main)
       
-      SyncLog.sync_log("***6. end_to_sync_parises---------------")
-    end
-  end
+  #     SyncLog.sync_log("***6. end_to_sync_parises---------------")
+  #   end
+  # end
 
-  #检查repository和project_score
-  def change_project_score(project, project_scores, repository_params)
-    SyncLog.sync_log("***1. begin_to_sync_project_score---------------")
-    begin
-      pre_project_score = project.project_score
-      if pre_project_score.present?
-        change_num = 0
-        project_scores.each do |k,v|
-          unless pre_project_score.send("#{k}") == v
-            change_num += 1
-            pre_project_score[:"#{k}"] = v
-          end
-          if k == "changeset_num" && v.to_i > pre_project_score.changeset_num.to_i && repository_params[:url].present?
-            SyncRepositoryJob.perform_later(project.owner.try(:login), project.identifier, repository_params, get_sudomain)
-          end
-        end
-        pre_project_score.save! if change_num > 0   #如果 project_score有变化则更新
-      else 
-        ProjectScore.create!(project_scores.merge(project_id: project.id))
-      end
-      SyncLog.sync_log("***1. end_to_sync_project_score---------------")
-    rescue Exception => e
-      SyncLog.sync_log("=========change_project_score_errors:#{e}===================")
-    end
-  end
+  # #检查repository和project_score
+  # def change_project_score(project, project_scores, repository_params)
+  #   SyncLog.sync_log("***1. begin_to_sync_project_score---------------")
+  #   begin
+  #     pre_project_score = project.project_score
+  #     if pre_project_score.present?
+  #       change_num = 0
+  #       project_scores.each do |k,v|
+  #         unless pre_project_score.send("#{k}") == v
+  #           change_num += 1
+  #           pre_project_score[:"#{k}"] = v
+  #         end
+  #         if k == "changeset_num" && v.to_i > pre_project_score.changeset_num.to_i && repository_params[:url].present?
+  #           SyncRepositoryJob.perform_later(project.owner.try(:login), project.identifier, repository_params, get_sudomain)
+  #         end
+  #       end
+  #       pre_project_score.save! if change_num > 0   #如果 project_score有变化则更新
+  #     else 
+  #       ProjectScore.create!(project_scores.merge(project_id: project.id))
+  #     end
+  #     SyncLog.sync_log("***1. end_to_sync_project_score---------------")
+  #   rescue Exception => e
+  #     SyncLog.sync_log("=========change_project_score_errors:#{e}===================")
+  #   end
+  # end
 
-  def change_project_issues(project, old_issues_params,project_id, gitea_main)
-    SyncLog.sync_log("***2. begin_to_syncissues---------------")
-    begin
-      forge_issue_ids = project&.issues&.select(:id)&.pluck(:id)
-      sync_projects_params = {}
-      SyncLog.sync_log("***2--01. forge_issue_ids-#{forge_issue_ids.size.to_i}--------------")
-      if forge_issue_ids.size.to_i <= old_issues_params[:count].to_i
-        diff_issue_ids = old_issues_params[:ids] - forge_issue_ids
+  # def change_project_issues(project, old_issues_params,project_id, gitea_main)
+  #   SyncLog.sync_log("***2. begin_to_syncissues---------------")
+  #   begin
+  #     forge_issue_ids = project&.issues&.select(:id)&.pluck(:id)
+  #     sync_projects_params = {}
+  #     SyncLog.sync_log("***2--01. forge_issue_ids-#{forge_issue_ids.size.to_i}--------------")
+  #     if forge_issue_ids.size.to_i <= old_issues_params[:count].to_i
+  #       diff_issue_ids = old_issues_params[:ids] - forge_issue_ids
         
-        if diff_issue_ids.size == 0  #issue数量一样，判断评论是否有增减
-          forge_journal_ids = Journal.select([:id, :journalized_id, :journalized_type]).where(journalized_id: forge_issue_ids).pluck(:id)
-          diff_journal_ids = old_issues_params[:journals][:ids] - forge_journal_ids
-          unless diff_journal_ids.size == 0
-            sync_projects_params = {
-              type: "Journal",
-              ids: diff_journal_ids,
-              token: get_token,
-              parent_id: project_id
-            }
-            SyncLog.sync_log("***2--02. sync_projects_params-#{sync_projects_params}--------------")
-            SyncProjectsJob.perform_later(sync_projects_params, gitea_main)
-          end
-        else
-          new_diff_ids = diff_issue_ids.in_groups_of(200).map{|k| k.reject(&:blank?)}
-          diff_len = new_diff_ids.length
-          (1..diff_len).each do |len|
-            sync_projects_params = {
-              type: "Issue",
-              ids: new_diff_ids[len-1],
-              token: get_token,
-              parent_id: project_id
-            }
-            SyncLog.sync_log("***2--030#{len}. sync_projects_params_groups-#{sync_projects_params}--------------")
-            SyncProjectsJob.perform_later(sync_projects_params, gitea_main)
-          end
-          # sync_projects_params = {
-          #   type: "Issue",
-          #   ids: diff_issue_ids,
-          #   token: get_token,
-          #   parent_id: project_id
-          # }
-          # SyncLog.sync_log("***2--03. sync_projects_params_groups-#{sync_projects_params}--------------")
-          # SyncProjectsJob.perform_later(sync_projects_params, gitea_main)
+  #       if diff_issue_ids.size == 0  #issue数量一样，判断评论是否有增减
+  #         forge_journal_ids = Journal.select([:id, :journalized_id, :journalized_type]).where(journalized_id: forge_issue_ids).pluck(:id)
+  #         diff_journal_ids = old_issues_params[:journals][:ids] - forge_journal_ids
+  #         unless diff_journal_ids.size == 0
+  #           sync_projects_params = {
+  #             type: "Journal",
+  #             ids: diff_journal_ids,
+  #             token: get_token,
+  #             parent_id: project_id
+  #           }
+  #           SyncLog.sync_log("***2--02. sync_projects_params-#{sync_projects_params}--------------")
+  #           SyncProjectsJob.perform_later(sync_projects_params, gitea_main)
+  #         end
+  #       else
+  #         new_diff_ids = diff_issue_ids.in_groups_of(200).map{|k| k.reject(&:blank?)}
+  #         diff_len = new_diff_ids.length
+  #         (1..diff_len).each do |len|
+  #           sync_projects_params = {
+  #             type: "Issue",
+  #             ids: new_diff_ids[len-1],
+  #             token: get_token,
+  #             parent_id: project_id
+  #           }
+  #           SyncLog.sync_log("***2--030#{len}. sync_projects_params_groups-#{sync_projects_params}--------------")
+  #           SyncProjectsJob.perform_later(sync_projects_params, gitea_main)
+  #         end
+  #         # sync_projects_params = {
+  #         #   type: "Issue",
+  #         #   ids: diff_issue_ids,
+  #         #   token: get_token,
+  #         #   parent_id: project_id
+  #         # }
+  #         # SyncLog.sync_log("***2--03. sync_projects_params_groups-#{sync_projects_params}--------------")
+  #         # SyncProjectsJob.perform_later(sync_projects_params, gitea_main)
          
-        end
-      end
+  #       end
+  #     end
       
-      # SyncProjectsJob.perform_later(sync_projects_params, gitea_main) if sync_projects_params.present?
-      SyncLog.sync_log("***2. end_to_syncissues---------------")
-    rescue Exception => e
-      SyncLog.sync_log("=========change_project_issues_errors:#{e}===================")
-    end
-  end
+  #     # SyncProjectsJob.perform_later(sync_projects_params, gitea_main) if sync_projects_params.present?
+  #     SyncLog.sync_log("***2. end_to_syncissues---------------")
+  #   rescue Exception => e
+  #     SyncLog.sync_log("=========change_project_issues_errors:#{e}===================")
+  #   end
+  # end
 
-  def change_project_watchers(project, watchers,gitea_main)
-    SyncLog.sync_log("***5. begin_to_sync_watchers---------------")
-    forge_watchers_ids = project&.watchers&.select(:id)&.pluck(:id)
-    if forge_watchers_ids.size.to_i <= watchers[:count].to_i
-      diff_target_ids = watchers[:ids] - forge_watchers_ids
-      if diff_target_ids.size > 0
-        sync_projects_params = {
-          type: "Watcher",
-          ids: diff_target_ids,
-          token: get_token,
-          parent_id: project.id
-        }
-        SyncProjectsJob.perform_later(sync_projects_params,gitea_main)
+  # def change_project_watchers(project, watchers,gitea_main)
+  #   SyncLog.sync_log("***5. begin_to_sync_watchers---------------")
+  #   forge_watchers_ids = project&.watchers&.select(:id)&.pluck(:id)
+  #   if forge_watchers_ids.size.to_i <= watchers[:count].to_i
+  #     diff_target_ids = watchers[:ids] - forge_watchers_ids
+  #     if diff_target_ids.size > 0
+  #       sync_projects_params = {
+  #         type: "Watcher",
+  #         ids: diff_target_ids,
+  #         token: get_token,
+  #         parent_id: project.id
+  #       }
+  #       SyncProjectsJob.perform_later(sync_projects_params,gitea_main)
         
-      end
-    end
-    SyncLog.sync_log("***5. begin_to_sync_watchers---------------")
-  end
+  #     end
+  #   end
+  #   SyncLog.sync_log("***5. begin_to_sync_watchers---------------")
+  # end
 
-  def change_project_versions(project, versions,gitea_main)
-    SyncLog.sync_log("***4. begin_to_sync_versions---------------")
-    forge_version_ids = project&.versions&.select(:id)&.pluck(:id)
-    if forge_version_ids.size <= versions[:count].to_i
-      diff_version_ids = versions[:ids] - forge_version_ids
-      if diff_version_ids.size > 0
-        sync_projects_params = {
-          type: "Version",
-          ids: diff_version_ids,
-          token: get_token,
-          parent_id: project.id
-        }
-        SyncProjectsJob.perform_later(sync_projects_params,gitea_main)
-    end
+  # def change_project_versions(project, versions,gitea_main)
+  #   SyncLog.sync_log("***4. begin_to_sync_versions---------------")
+  #   forge_version_ids = project&.versions&.select(:id)&.pluck(:id)
+  #   if forge_version_ids.size <= versions[:count].to_i
+  #     diff_version_ids = versions[:ids] - forge_version_ids
+  #     if diff_version_ids.size > 0
+  #       sync_projects_params = {
+  #         type: "Version",
+  #         ids: diff_version_ids,
+  #         token: get_token,
+  #         parent_id: project.id
+  #       }
+  #       SyncProjectsJob.perform_later(sync_projects_params,gitea_main)
+  #   end
     
-      SyncLog.sync_log("***4. end_to_sync_versions---------------")
-    end
-  end
+  #     SyncLog.sync_log("***4. end_to_sync_versions---------------")
+  #   end
+  # end
 
-  def change_project_members(project, members,gitea_main)
-    SyncLog.sync_log("***3. begin_to_sync_members---------------")
-    forge_member_ids = project&.members&.select(:id)&.pluck(:id)
-    if forge_member_ids.size <= members[:count]
-      diff_member_ids = members[:ids] - forge_member_ids
-      if diff_member_ids.size > 0
-        sync_projects_params = {
-          type: "Member",
-          ids: diff_member_ids,
-          token: get_token,
-          parent_id: project.id
-        }
-        SyncProjectsJob.perform_later(sync_projects_params,gitea_main)
-    end
+  # def change_project_members(project, members,gitea_main)
+  #   SyncLog.sync_log("***3. begin_to_sync_members---------------")
+  #   forge_member_ids = project&.members&.select(:id)&.pluck(:id)
+  #   if forge_member_ids.size <= members[:count]
+  #     diff_member_ids = members[:ids] - forge_member_ids
+  #     if diff_member_ids.size > 0
+  #       sync_projects_params = {
+  #         type: "Member",
+  #         ids: diff_member_ids,
+  #         token: get_token,
+  #         parent_id: project.id
+  #       }
+  #       SyncProjectsJob.perform_later(sync_projects_params,gitea_main)
+  #   end
     
-      SyncLog.sync_log("***3. end_to_sync_members---------------")
-    end
-  end
+  #     SyncLog.sync_log("***3. end_to_sync_members---------------")
+  #   end
+  # end
 
   # def check_token 
   #   sync_params = params[:sync_params]
@@ -305,19 +316,19 @@ class SyncForgeController < ApplicationController
   #   end
   # end
 
-  def get_token
-    "34c82f51e0b699d9d16d70fd6497c9b1e4821d6ea3e872558a6537a091076b8e"
-  end
+  # def get_token
+  #   "34c82f51e0b699d9d16d70fd6497c9b1e4821d6ea3e872558a6537a091076b8e"
+  # end
 
-  def get_sudomain
-    SyncLog.sync_log("=================request.subdomain:#{request.subdomain}========")
-    gitea_main = "gitea.trustie.net"
-    if request.subdomain === 'testforgeplus'
-      gitea_main = "testgitea2.trustie.net"
-    # elsif request.subdomain === 'forgeplus'
-    #   gitea_main = "gitea.trustie.net"
-    end
-    return gitea_main
-  end
+  # def get_sudomain
+  #   SyncLog.sync_log("=================request.subdomain:#{request.subdomain}========")
+  #   gitea_main = "gitea.trustie.net"
+  #   if request.subdomain === 'testforgeplus'
+  #     gitea_main = "testgitea2.trustie.net"
+  #   # elsif request.subdomain === 'forgeplus'
+  #   #   gitea_main = "gitea.trustie.net"
+  #   end
+  #   return gitea_main
+  # end
 
 end
\ No newline at end of file
diff --git a/app/jobs/sync_project_military_job.rb b/app/jobs/sync_project_military_job.rb
new file mode 100644
index 000000000..0cf76f7a9
--- /dev/null
+++ b/app/jobs/sync_project_military_job.rb
@@ -0,0 +1,22 @@
+require 'uri'
+require 'net/http'
+
+class SyncProjectMilitaryJob < ApplicationJob
+  queue_as :default
+
+  def perform(project, repository, project_socre)
+    Rails.logger.info("============begin to sync project ===========")
+    project_except_params = %w(praises_count watchers_count issues_count pull_requests_count versions_count issue_tags_count closed_issues_count)
+    project_params = {
+      project: project.as_json(except: project_except_params),
+      repository: repository.as_json, 
+      project_socre: project_socre.as_json
+    }
+    url = "http://47.93.212.82:49999/sync_forges"  #trustie上的相关路由
+    uri = URI.parse(url)
+    http = Net::HTTP.new(uri.hostname, uri.port)
+    http.use_ssl = false
+    response = http.send_request('POST', uri.path, project_params.to_json, {'Content-Type' => 'application/json'})
+    Rails.logger.info("============end to sync project, status: #{response.code} ===========")
+  end
+end
diff --git a/config/routes.rb b/config/routes.rb
index 45ba48550..80ca95018 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -19,6 +19,7 @@ Rails.application.routes.draw do
     resources :sync_forge, only: [:create] do 
       collection do 
         post :sync_users
+        post :sync_range_projects
       end
     end
     resources :composes do

From 5ecd4532f2eb7a44247e30b4a31dfeaba35c6b2e Mon Sep 17 00:00:00 2001
From: "sylor_huang@126.com" <sylor_huang@126.com>
Date: Wed, 12 Aug 2020 10:42:19 +0800
Subject: [PATCH 07/16] Repair

---
 app/controllers/sync_forge_controller.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/controllers/sync_forge_controller.rb b/app/controllers/sync_forge_controller.rb
index a6d266970..db44a3b8c 100644
--- a/app/controllers/sync_forge_controller.rb
+++ b/app/controllers/sync_forge_controller.rb
@@ -1,7 +1,7 @@
 class SyncForgeController < ApplicationController
   # before_action :check_token
 
-  def 
+  def sync_range_projects
     sync_counts = params[:sync_count] || 10
     projects = Project.includes(:project_score, :repository)
                       .where(is_public: true)

From 0a321fd73edc5b6ec59cafac3d6ed2bcab478d59 Mon Sep 17 00:00:00 2001
From: "sylor_huang@126.com" <sylor_huang@126.com>
Date: Wed, 12 Aug 2020 10:52:20 +0800
Subject: [PATCH 08/16] Change

---
 app/views/users/projects/shared/_project.json.jbuilder | 4 ++--
 app/views/users/subjects/shared/_subject.json.jbuilder | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/app/views/users/projects/shared/_project.json.jbuilder b/app/views/users/projects/shared/_project.json.jbuilder
index 5cc985909..9d1bad441 100644
--- a/app/views/users/projects/shared/_project.json.jbuilder
+++ b/app/views/users/projects/shared/_project.json.jbuilder
@@ -5,8 +5,8 @@ json.members_count project.members.count
 json.issues_count project.issues.count
 json.changesets_count project.project_score&.changeset_num.to_i
 
-json.is_public project.is_public?
-json.can_visited project.can_visited?
+json.is_public project&.is_public
+json.can_visited project&.can_visited?
 
 json.owner do
   json.partial! 'users/shared/real_user', user: project.owner
diff --git a/app/views/users/subjects/shared/_subject.json.jbuilder b/app/views/users/subjects/shared/_subject.json.jbuilder
index 2059bc461..ad83b6ece 100644
--- a/app/views/users/subjects/shared/_subject.json.jbuilder
+++ b/app/views/users/subjects/shared/_subject.json.jbuilder
@@ -5,4 +5,4 @@ json.image_url url_to_avatar(subject)
 json.owner_id subject.user.id
 json.owner_name subject.user.full_name
 json.visits_count subject.visits
-json.can_visited subject.can_visited?
+json.can_visited subject&.can_visited?

From 3a0ec56564ca788c259c92de48b46f552819e3a7 Mon Sep 17 00:00:00 2001
From: "sylor_huang@126.com" <sylor_huang@126.com>
Date: Wed, 12 Aug 2020 11:12:04 +0800
Subject: [PATCH 09/16] Chnage

---
 app/jobs/sync_project_military_job.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/jobs/sync_project_military_job.rb b/app/jobs/sync_project_military_job.rb
index 0cf76f7a9..3afaf6b5b 100644
--- a/app/jobs/sync_project_military_job.rb
+++ b/app/jobs/sync_project_military_job.rb
@@ -12,7 +12,7 @@ class SyncProjectMilitaryJob < ApplicationJob
       repository: repository.as_json, 
       project_socre: project_socre.as_json
     }
-    url = "http://47.93.212.82:49999/sync_forges"  #trustie上的相关路由
+    url = "http://47.93.212.82:49999/sync_forge/sync_projects"  #trustie上的相关路由
     uri = URI.parse(url)
     http = Net::HTTP.new(uri.hostname, uri.port)
     http.use_ssl = false

From ccf2053ca4a2d0394a7bdaf6b9b893e418c2cc4c Mon Sep 17 00:00:00 2001
From: "sylor_huang@126.com" <sylor_huang@126.com>
Date: Wed, 12 Aug 2020 11:17:49 +0800
Subject: [PATCH 10/16] Change

---
 app/jobs/sync_project_military_job.rb | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/app/jobs/sync_project_military_job.rb b/app/jobs/sync_project_military_job.rb
index 3afaf6b5b..fc0e501d8 100644
--- a/app/jobs/sync_project_military_job.rb
+++ b/app/jobs/sync_project_military_job.rb
@@ -6,11 +6,11 @@ class SyncProjectMilitaryJob < ApplicationJob
 
   def perform(project, repository, project_socre)
     Rails.logger.info("============begin to sync project ===========")
-    project_except_params = %w(praises_count watchers_count issues_count pull_requests_count versions_count issue_tags_count closed_issues_count)
+    project_except_params = %w(id user_id praises_count watchers_count issues_count pull_requests_count versions_count issue_tags_count closed_issues_count)
     project_params = {
       project: project.as_json(except: project_except_params),
-      repository: repository.as_json, 
-      project_socre: project_socre.as_json
+      repository: repository.as_json(except: %w(id project_id login user_id)), 
+      project_socre: project_socre.as_json(except: %w(id project_id))
     }
     url = "http://47.93.212.82:49999/sync_forge/sync_projects"  #trustie上的相关路由
     uri = URI.parse(url)

From 97bec74589bd9444791e316e133d32adce095016 Mon Sep 17 00:00:00 2001
From: "sylor_huang@126.com" <sylor_huang@126.com>
Date: Wed, 12 Aug 2020 11:46:55 +0800
Subject: [PATCH 11/16] Change

---
 app/jobs/sync_project_military_job.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/jobs/sync_project_military_job.rb b/app/jobs/sync_project_military_job.rb
index fc0e501d8..e13a1503a 100644
--- a/app/jobs/sync_project_military_job.rb
+++ b/app/jobs/sync_project_military_job.rb
@@ -12,7 +12,7 @@ class SyncProjectMilitaryJob < ApplicationJob
       repository: repository.as_json(except: %w(id project_id login user_id)), 
       project_socre: project_socre.as_json(except: %w(id project_id))
     }
-    url = "http://47.93.212.82:49999/sync_forge/sync_projects"  #trustie上的相关路由
+    url = "http://47.93.212.82:49999/api/sync_forge/sync_projects"  #trustie上的相关路由
     uri = URI.parse(url)
     http = Net::HTTP.new(uri.hostname, uri.port)
     http.use_ssl = false

From 01be601ed4859e9b81deebf4410ac96934ce411e Mon Sep 17 00:00:00 2001
From: "sylor_huang@126.com" <sylor_huang@126.com>
Date: Wed, 12 Aug 2020 14:55:19 +0800
Subject: [PATCH 12/16] Change

---
 app/jobs/sync_project_military_job.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/jobs/sync_project_military_job.rb b/app/jobs/sync_project_military_job.rb
index e13a1503a..51f9b8348 100644
--- a/app/jobs/sync_project_military_job.rb
+++ b/app/jobs/sync_project_military_job.rb
@@ -12,7 +12,7 @@ class SyncProjectMilitaryJob < ApplicationJob
       repository: repository.as_json(except: %w(id project_id login user_id)), 
       project_socre: project_socre.as_json(except: %w(id project_id))
     }
-    url = "http://47.93.212.82:49999/api/sync_forge/sync_projects"  #trustie上的相关路由
+    url = "http://39.105.176.215:49999/api/sync_forge/sync_projects"  #trustie上的相关路由
     uri = URI.parse(url)
     http = Net::HTTP.new(uri.hostname, uri.port)
     http.use_ssl = false

From b5532c2e8a90f6800b107ca773bc73d861cf114d Mon Sep 17 00:00:00 2001
From: "sylor_huang@126.com" <sylor_huang@126.com>
Date: Wed, 12 Aug 2020 14:55:50 +0800
Subject: [PATCH 13/16] Change

---
 app/jobs/sync_project_military_job.rb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/jobs/sync_project_military_job.rb b/app/jobs/sync_project_military_job.rb
index 51f9b8348..4e62340e4 100644
--- a/app/jobs/sync_project_military_job.rb
+++ b/app/jobs/sync_project_military_job.rb
@@ -5,7 +5,7 @@ class SyncProjectMilitaryJob < ApplicationJob
   queue_as :default
 
   def perform(project, repository, project_socre)
-    Rails.logger.info("============begin to sync project ===========")
+    SyncLog.sync_log("============begin to sync project ===========")
     project_except_params = %w(id user_id praises_count watchers_count issues_count pull_requests_count versions_count issue_tags_count closed_issues_count)
     project_params = {
       project: project.as_json(except: project_except_params),
@@ -17,6 +17,6 @@ class SyncProjectMilitaryJob < ApplicationJob
     http = Net::HTTP.new(uri.hostname, uri.port)
     http.use_ssl = false
     response = http.send_request('POST', uri.path, project_params.to_json, {'Content-Type' => 'application/json'})
-    Rails.logger.info("============end to sync project, status: #{response.code} ===========")
+    SyncLog.sync_log("============end to sync project, status: #{response.code} ===========")
   end
 end

From 3596ddeee4eae8f6c6b45aaae3fb7741678cb095 Mon Sep 17 00:00:00 2001
From: "sylor_huang@126.com" <sylor_huang@126.com>
Date: Wed, 12 Aug 2020 15:03:14 +0800
Subject: [PATCH 14/16] Change

---
 app/views/admins/shared/_sidebar.html.erb | 2 +-
 config/routes.rb                          | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/app/views/admins/shared/_sidebar.html.erb b/app/views/admins/shared/_sidebar.html.erb
index 7287c0347..de56a5477 100644
--- a/app/views/admins/shared/_sidebar.html.erb
+++ b/app/views/admins/shared/_sidebar.html.erb
@@ -41,7 +41,7 @@
       <% end %>
     </li>
     <li>
-    <%= sidebar_item('/sidekiq', '定时任务', icon: 'bell', controller: 'root') %>
+    <%= sidebar_item('/admins/sidekiq', '定时任务', icon: 'bell', controller: 'root') %>
     </li>
     <li><%= sidebar_item('/', '返回主站', icon: 'sign-out', controller: 'root') %></li>
   </ul>
diff --git a/config/routes.rb b/config/routes.rb
index 80ca95018..4aa1652f0 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -3,7 +3,7 @@ Rails.application.routes.draw do
   require 'sidekiq/web'
   require 'admin_constraint'
 
-  mount Sidekiq::Web => '/sidekiq', :constraints => AdminConstraint.new
+  # mount Sidekiq::Web => '/sidekiq', :constraints => AdminConstraint.new
 
   # Serve websocket cable requests in-process
   mount ActionCable.server => '/cable'
@@ -414,6 +414,7 @@ Rails.application.routes.draw do
   end
 
   namespace :admins do
+    mount Sidekiq::Web => '/sidekiq'
     get '/', to: 'dashboards#index'
     resources :project_statistics, only: [:index] do
       collection do

From ae4161fa9bc7f43388f321b9eb2c41576bf0475f Mon Sep 17 00:00:00 2001
From: "sylor_huang@126.com" <sylor_huang@126.com>
Date: Wed, 12 Aug 2020 16:51:24 +0800
Subject: [PATCH 15/16] Change

---
 app/controllers/sync_forge_controller.rb | 2 +-
 app/jobs/sync_project_military_job.rb    | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/app/controllers/sync_forge_controller.rb b/app/controllers/sync_forge_controller.rb
index db44a3b8c..e4a593e14 100644
--- a/app/controllers/sync_forge_controller.rb
+++ b/app/controllers/sync_forge_controller.rb
@@ -5,7 +5,7 @@ class SyncForgeController < ApplicationController
     sync_counts = params[:sync_count] || 10
     projects = Project.includes(:project_score, :repository)
                       .where(is_public: true)
-                      .where.not(identifier: ["educoder","trustieforge", "gitlab"])
+                      .where.not(identifier: ["educoder","trustieforge", "gitlab", "rGDBbQmOK", "socialforge"])
                       .joins(:project_score).order("project_scores.changeset_num desc").limit(sync_counts.to_i)
     projects.each do | project |
       SyncProjectMilitaryJob.perform_later(project, project.repository, project.project_score)
diff --git a/app/jobs/sync_project_military_job.rb b/app/jobs/sync_project_military_job.rb
index 4e62340e4..8c52181e6 100644
--- a/app/jobs/sync_project_military_job.rb
+++ b/app/jobs/sync_project_military_job.rb
@@ -5,8 +5,8 @@ class SyncProjectMilitaryJob < ApplicationJob
   queue_as :default
 
   def perform(project, repository, project_socre)
-    SyncLog.sync_log("============begin to sync project ===========")
-    project_except_params = %w(id user_id praises_count watchers_count issues_count pull_requests_count versions_count issue_tags_count closed_issues_count)
+    SyncLog.sync_log("============begin to sync project, project_id: #{project.id} ===========")
+    project_except_params = %w(id user_id praises_count watchers_count issues_count pull_requests_count versions_count issue_tags_count closed_issues_count forked_from_project_id forked_count)
     project_params = {
       project: project.as_json(except: project_except_params),
       repository: repository.as_json(except: %w(id project_id login user_id)), 

From 5aff092a35fcfd1a6be5f6815988733e9075a246 Mon Sep 17 00:00:00 2001
From: "sylor_huang@126.com" <sylor_huang@126.com>
Date: Sat, 15 Aug 2020 12:35:56 +0800
Subject: [PATCH 16/16] Change

---
 app/controllers/pull_requests_controller.rb | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/app/controllers/pull_requests_controller.rb b/app/controllers/pull_requests_controller.rb
index bd4e0d8f8..37493d943 100644
--- a/app/controllers/pull_requests_controller.rb
+++ b/app/controllers/pull_requests_controller.rb
@@ -70,7 +70,11 @@ class PullRequestsController < ApplicationController
             if local_requests.save
               remote_pr_params = @local_params
               remote_pr_params = remote_pr_params.merge(head: "#{params[:merge_user_login]}:#{params[:head]}").compact if local_requests.is_original && params[:merge_user_login]
-              gitea_request = Gitea::PullRequest::CreateService.call(current_user.try(:gitea_token), @project.owner, @repository.try(:identifier), remote_pr_params.except(:milestone))
+              if @project.forked_from_project_id.present?
+                gitea_request = Gitea::PullRequest::CreateService.call(current_user.try(:gitea_token), @project.fork_project.owner, @repository.try(:identifier), remote_pr_params.except(:milestone))
+              else
+                gitea_request = Gitea::PullRequest::CreateService.call(current_user.try(:gitea_token), @project.owner, @repository.try(:identifier), remote_pr_params.except(:milestone))
+              end
               if gitea_request && local_requests.update_attributes(gpid: gitea_request["number"])
                 if params[:issue_tag_ids].present?
                   params[:issue_tag_ids].each do |tag|