修改bug

app/jobs/sync_forge_job.rb

@@ -18,8 +18,8 @@ class SyncForgeJob < ApplicationJob
         ActiveRecord::Base.transaction do
           begin
             user_params = user_params["user"] if old_version_source.include?(platform)
-            Watcher&.where(user_id: user_params["id"]).update_all(user_id: new_user.id)
-            ProjectTrend&.where(user_id: user_params["id"]).update_all(user_id: new_user.id)
+            Watcher&.where(user_id: user_params["user_id"]).update_all(user_id: new_user.id)
+            ProjectTrend&.where(user_id: user_params["user_id"]).update_all(user_id: new_user.id)
             sync_roles(roles_params, platform)
             if all_target_params.present?
               all_target_params.each do |project|
@@ -35,7 +35,7 @@ class SyncForgeJob < ApplicationJob
                   watchers_params: project["watchers_params"],
                   praise_trends_params: project["praise_trends_params"]
                 }
-                sync_projects(new_user, user_params["id"],target_params, platform)
+                sync_projects(new_user, user_params["user_id"],target_params, platform)
               end
             end
           rescue Exception => e
@@ -73,34 +73,13 @@ class SyncForgeJob < ApplicationJob
             new_user = User.find_by(mail: owner_params["mail"])
           else
             new_user = User.new(owner_params.merge(platform: platform))
-            new_user.save(:validate => false)
-
             interactor = Gitea::RegisterInteractor.call({username: owner_params["login"], email: owner_params["mail"], password: user_password})
-
             if interactor.success?
               gitea_user = interactor.result
-              # gitea_uid =  gitea_user['id']
-              new_user.gitea_uid = gitea_user['id']
-            else
-              response = Gitea::User::GetTokenService.new("#{owner_params["login"]}").call
-              if response.status == 200
-                gitea_uid = JSON.parse(response.body)["id"]
-                new_user.gitea_uid = user_id
-              else
-                # gitea_uid =  ""
-                new_user.gitea_uid = ""
-              end
-            end
               result = Gitea::User::GenerateTokenService.new(owner_params["login"], user_password).call
-            if result != 401
-              # gitea_token = result.result['sha1']
-              new_user.gitea_token = result.result['sha1']
-            else
-              # gitea_token = ""
-              new_user.gitea_token = ""
+              new_user.gitea_token = result['sha1']
+              new_user.gitea_uid = gitea_user['id']
             end
-
-            # new_user.update_attributes!(gitea_uid: gitea_uid, gitea_token: gitea_token)
             if new_user.save(:validate => false)
               if owner_extension_params.present?
                 owner_extension_params = owner_extension_params["user_extensions"] if old_version_source.include?(platform)  #trustie上需要

app/services/gitea/user/generate_token_service.rb

@@ -12,9 +12,7 @@ class Gitea::User::GenerateTokenService < Gitea::ClientService
     params = {}
     url = "/users/#{username}/tokens".freeze
     params = params.merge(token: token_params, data: request_params)
-    response = post_token(url, params)
-
-    render_status(response)
+    post(url, params)
 
   end
 
@@ -29,27 +27,4 @@ class Gitea::User::GenerateTokenService < Gitea::ClientService
   def request_params
     { name: username }
   end
-
-  def post_token(url, params={})
-    puts "[gitea] request params: #{params}"
-    request_url = [api_url, url].join('').freeze
-    auth_token = authen_params(params[:token])
-    conn(auth_token).post do |req|
-      req.url "#{request_url}"
-      req.body = params[:data].to_json
-    end
-  end
-
-  def render_status(response)
-    case response.status
-    when 200
-      if response.body.size > 0
-        JSON.parse(response&.body)
-      else
-        401
-      end
-    else
-      401
-    end
-  end
 end

public/sync_failed_users.dic

@@ -0,0 +1 @@
+user_info---{"admin"=>false, "auth_source_id"=>nil, "excellent_student"=>0, "excellent_teacher"=>0, "firstname"=>"", "gid"=>nil, "hashed_password"=>"40d6620ee6cfad9cfa4e467c738bee3e1655ae1e", "identity_url"=>nil, "language"=>"zh", "last_login_on"=>"2018-06-01T15:58:18+08:00", "lastname"=>"陈鑫", "login"=>"chenxinnju", "mail"=>"chenxin@nju.edu.cn", "mail_notification"=>"all", "salt"=>"2b84bf37cc029b1b8851100e28ca6e50", "status"=>1, "visits"=>5},errors--undefined method `result' for #<Hash:0x00007f8e80fd6860>