- <%= text_format(work.description) if work.description%>
+
<%= text_format(work.description) if work.description%>
+
diff --git a/db/schema.rb b/db/schema.rb
index e7d270225..6813ef6ed 100644
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -969,7 +969,6 @@ ActiveRecord::Schema.define(:version => 20151204062220) do
t.integer "course_group_id", :default => 0
end
- add_index "members", ["course_id"], :name => "index_members_on_course_id"
add_index "members", ["project_id"], :name => "index_members_on_project_id"
add_index "members", ["user_id", "project_id", "course_id"], :name => "index_members_on_user_id_and_project_id", :unique => true
add_index "members", ["user_id"], :name => "index_members_on_user_id"
@@ -1526,6 +1525,7 @@ ActiveRecord::Schema.define(:version => 20151204062220) do
end
add_index "student_works", ["homework_common_id", "user_id"], :name => "index_student_works_on_homework_common_id_and_user_id"
+ add_index "student_works", ["homework_common_id"], :name => "index"
create_table "student_works_evaluation_distributions", :force => true do |t|
t.integer "student_work_id"
diff --git a/lib/tasks/sync_check_members.rake b/lib/tasks/sync_check_members.rake
new file mode 100644
index 000000000..8c942c88c
--- /dev/null
+++ b/lib/tasks/sync_check_members.rake
@@ -0,0 +1,25 @@
+require 'trustie/gitlab/sync'
+
+namespace :gitlab do
+ namespace :check_members do
+ desc "check up projects' members "
+ task :projects => :environment do
+ s = Trustie::Gitlab::Sync.new
+ g = Gitlab.client
+ Project.all.each do |project|
+ unless project.gpid.nil?
+ begin
+ gmembers = g.team_members(project.gpid)
+ if gmembers.count != project.members.count
+ puts "gitlab' projects count #{gmembers.count}"
+ puts "project ID is #{project.id}"
+ s.only_members(project)
+ end
+ rescue
+ p "This project is wrong #{project.id}"
+ end
+ end
+ end
+ end
+ end
+end
diff --git a/lib/tasks/sync_gitlab_user.rake b/lib/tasks/sync_gitlab_user.rake
index fb84f5f08..9259353c0 100644
--- a/lib/tasks/sync_gitlab_user.rake
+++ b/lib/tasks/sync_gitlab_user.rake
@@ -6,32 +6,55 @@ namespace :gitlab do
users = User.find_by_sql("select * from users where gid is null")
s = Trustie::Gitlab::Sync.new
g = Gitlab.client
- logger = Logger.new('./log/add_gid.log', 'daily') #按天生成
+ logger_i = Logger.new('./log/task_add_gid.log', 'daily')
+ logger_e = Logger.new('./log/task_add_gid_error.log', 'daily')
+ NAMESPACE_REGEX_STR = '(?:[a-zA-Z0-9_\.][a-zA-Z0-9_\-\.]*[a-zA-Z0-9_\-]|[a-zA-Z0-9_])'.freeze
+ MAIL_REGEX_STR ='^[a-z0-9]+([._\\-]*[a-z0-9])*@([a-z0-9]+[-a-z0-9]*[a-z0-9]+.){1,63}[a-z0-9]+$'.freeze
+ error_cnt=0
+ success_cnt=0
+ p "同步Gitlab用户开始..."
users.each do |user|
+ info="userid=#{user.id},mail=#{user.mail},login(username)=#{user.login},name=#{user.show_name}"
+ # username不能有特殊字符,不能有保留字符,邮箱特殊字符(比如‘>’)导致search失败的，name不能为空串
+ if !(user.login =~ /\A#{NAMESPACE_REGEX_STR}\Z/.freeze)
+ logger_e.error("#{info}，error=校验失败：username特殊字符")
+ error_cnt+=1
+ next
+ elsif !(user.mail.downcase =~ /#{MAIL_REGEX_STR}/)
+ logger_e.error("#{info}，error=校验失败：邮箱特殊字符")
+ error_cnt+=1
+ next
+ elsif user.show_name.lstrip.rstrip.blank?
+ logger_e.error("#{info}，error=校验失败：name不正常")
+ error_cnt+=1
+ next
+ end
begin
us = g.get("/users?search=#{user.mail}")
- puts user.mail
if us.blank?
- puts "55555555555555555"
s.sync_user(user)
+ logger_i.info("sync_remote_user:id=#{user.id},mail=#{user.mail}")
+ success_cnt+=1
else
- # 解决查询的时候出现多值的情况，比如:123@163.com和g123@163.com
- puts "66666666666666666666"
- puts user.id
if Array === us
us.each do |u|
if u.email == user.mail
user.gid = u.id
- user.save
+ # !爆炸方法抛出异常
+ user.save!
+ logger_i.info("sync_local_user:#{info}")
+ success_cnt+=1
end
end
end
end
rescue => e
- logger.error("userid=#{user.id},mail=#{user.mail},login=#{user.login},error=#{e}")
+ logger_e.error("#{info},error=#{e}")
puts e
end
end
+ p "同步Gitlab用户结束..."
+ p "同步成功#{success_cnt}，未完成#{error_cnt}"
end
task :sync_members => :environment do
diff --git a/tag1.txt b/tag1.txt
new file mode 100644
index 000000000..391fb7fb3
--- /dev/null
+++ b/tag1.txt
@@ -0,0 +1 @@
+just test
\ No newline at end of file