diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb index 3587b71d..69b92cef 100644 --- a/app/controllers/users_controller.rb +++ b/app/controllers/users_controller.rb @@ -360,6 +360,7 @@ class UsersController < ApplicationController phone = user_info["phone"] real_name = user_info["username"] department_name = user_info["school"] + password = "12345678" # 没有用户时,新建用户并登录 user = User.where("login = ? or phone = ? or mail = ? ", "#{login}", phone, email).first @@ -371,13 +372,13 @@ class UsersController < ApplicationController email = "#{login}@gitlink.org.cn" if email.blank? user_params = { status: 1, type: 'User', login: "#{login}", lastname: "#{real_name}", mail: "#{email}", nickname: "#{real_name}", professional_certification: 0, certification: 0, grade: 0, - password: "12345678", phone: "#{phone}", profile_completed: 1 } + password: "#{password}", phone: "#{phone}", profile_completed: 1 } user = User.create!(user_params) UserExtension.create!(user_id: user.id, gender: 1, custom_department: "#{department_name}") - interactor = Gitea::RegisterInteractor.call({username: login, email: email, password: "12345678"}) + interactor = Gitea::RegisterInteractor.call({username: login, email: email, password: password}) if interactor.success? gitea_user = interactor.result - result = Gitea::User::GenerateTokenService.call(username, password) + result = Gitea::User::GenerateTokenService.call(login, password) user.gitea_token = result['sha1'] user.gitea_uid = gitea_user[:body]['id'] user.save!