fix 无法创建PR

.gitignore

@@ -75,7 +75,7 @@ vendor/bundle/
 /public/admin
 /mysql_data
 /public/repo/
-
+/coverage
 
 .generators
 .rakeTasks
@@ -86,4 +86,4 @@ redis_data/
 Dockerfile
 dump.rdb
 .tags*
-ceshi_user.xlsx
+ceshi_user.xlsx

Gemfile

@@ -59,6 +59,7 @@ gem 'ransack'
 
 group :development, :test do
   gem 'rspec-rails', '~> 3.8'
+  gem 'rails-controller-testing'
 end
 
 group :development do
@@ -77,6 +78,7 @@ group :test do
   gem 'capybara', '>= 2.15', '< 4.0'
   gem 'selenium-webdriver'
   gem 'chromedriver-helper'
+  gem 'simplecov', '~>0.12.0', require: false
 end
 
 gem 'tzinfo-data', platforms: [:mingw, :mswin, :x64_mingw, :jruby]
@@ -100,6 +102,7 @@ gem 'rails-i18n', '~> 5.1'
 # job
 gem 'sidekiq'
 gem 'sinatra'
+gem 'whenever'
 gem "sidekiq-cron", "~> 1.1"
 
 # batch insert
@@ -127,4 +130,7 @@ gem 'harmonious_dictionary', '~> 0.0.1'
 
 gem 'parallel', '~> 1.19', '>= 1.19.1'
 
+# log
+gem 'multi_logger'
+
 gem 'letter_avatar'

Gemfile.lock

@@ -98,6 +98,7 @@ GEM
     chromedriver-helper (2.1.1)
       archive-zip (~> 0.10)
       nokogiri (~> 1.8)
+    chronic (0.10.2)
     chunky_png (1.3.11)
     concurrent-ruby (1.1.6)
     connection_pool (2.2.2)
@@ -106,6 +107,7 @@ GEM
       activerecord (>= 3.1.0, < 7)
     diff-lcs (1.3)
     diffy (3.3.0)
+    docile (1.1.5)
     e2mmap (0.1.0)
     elasticsearch (7.5.0)
       elasticsearch-api (= 7.5.0)
@@ -149,6 +151,7 @@ GEM
       rails-dom-testing (>= 1, < 3)
       railties (>= 4.2.0)
       thor (>= 0.14, < 2.0)
+    json (2.6.0)
     jwt (2.2.1)
     kaminari (1.2.0)
       activesupport (>= 4.1.0)
@@ -184,6 +187,8 @@ GEM
     minitest (5.14.0)
     msgpack (1.3.3)
     multi_json (1.14.1)
+    multi_logger (0.2.0)
+      railties
     multi_xml (0.6.0)
     multipart-post (2.1.1)
     mustermann (1.1.1)
@@ -242,6 +247,10 @@ GEM
       bundler (>= 1.3.0)
       railties (= 5.2.4.1)
       sprockets-rails (>= 2.0.0)
+    rails-controller-testing (1.0.5)
+      actionpack (>= 5.0.1.rc1)
+      actionview (>= 5.0.1.rc1)
+      activesupport (>= 5.0.1.rc1)
     rails-dom-testing (2.0.3)
       activesupport (>= 4.2.0)
       nokogiri (>= 1.6)
@@ -371,6 +380,11 @@ GEM
     simple_xlsx_reader (1.0.4)
       nokogiri
       rubyzip
+    simplecov (0.12.0)
+      docile (~> 1.1.0)
+      json (>= 1.8, < 3)
+      simplecov-html (~> 0.10.0)
+    simplecov-html (0.10.2)
     sinatra (2.0.8.1)
       mustermann (~> 1.0)
       rack (~> 2.0)
@@ -423,6 +437,8 @@ GEM
     websocket-driver (0.7.1)
       websocket-extensions (>= 0.1.0)
     websocket-extensions (0.1.4)
+    whenever (1.0.0)
+      chronic (>= 0.6.3)
     wkhtmltopdf-binary (0.12.5.4)
     xpath (3.2.0)
       nokogiri (~> 1.8)
@@ -461,6 +477,7 @@ DEPENDENCIES
   kaminari (~> 1.1, >= 1.1.1)
   letter_avatar
   listen (>= 3.0.5, < 3.2)
+  multi_logger
   mysql2 (>= 0.4.4, < 0.6.0)
   oauth2
   omniauth (~> 1.9.0)
@@ -473,6 +490,7 @@ DEPENDENCIES
   rack-cors
   rack-mini-profiler
   rails (~> 5.2.0)
+  rails-controller-testing
   rails-i18n (~> 5.1)
   ransack
   rchardet (~> 1.8)
@@ -493,6 +511,7 @@ DEPENDENCIES
   sidekiq-cron (~> 1.1)
   simple_form
   simple_xlsx_reader
+  simplecov (~> 0.12.0)
   sinatra
   solargraph (~> 0.38.0)
   spreadsheet
@@ -502,6 +521,7 @@ DEPENDENCIES
   tzinfo-data
   uglifier (>= 1.3.0)
   web-console (>= 3.3.0)
+  whenever
   wkhtmltopdf-binary
 
 BUNDLED WITH

app/assets/javascripts/log.js

@@ -0,0 +1,2 @@
+// Place all the behaviors and hooks related to the matching controller here.
+// All this logic will automatically be available in application.js.

app/assets/javascripts/sponsor_tiers.js

@@ -0,0 +1,2 @@
+// Place all the behaviors and hooks related to the matching controller here.
+// All this logic will automatically be available in application.js.

app/assets/javascripts/sponsorships.js

@@ -0,0 +1,2 @@
+// Place all the behaviors and hooks related to the matching controller here.
+// All this logic will automatically be available in application.js.

app/assets/javascripts/wallets.js

@@ -0,0 +1,2 @@
+// Place all the behaviors and hooks related to the matching controller here.
+// All this logic will automatically be available in application.js.

app/assets/stylesheets/log.scss

@@ -0,0 +1,3 @@
+// Place all the styles related to the log controller here.
+// They will automatically be included in application.css.
+// You can use Sass (SCSS) here: http://sass-lang.com/

app/assets/stylesheets/scaffolds.scss

@@ -0,0 +1,84 @@
+body {
+  background-color: #fff;
+  color: #333;
+  margin: 33px;
+  font-family: verdana, arial, helvetica, sans-serif;
+  font-size: 13px;
+  line-height: 18px;
+}
+
+p, ol, ul, td {
+  font-family: verdana, arial, helvetica, sans-serif;
+  font-size: 13px;
+  line-height: 18px;
+}
+
+pre {
+  background-color: #eee;
+  padding: 10px;
+  font-size: 11px;
+}
+
+a {
+  color: #000;
+
+  &:visited {
+    color: #666;
+  }
+
+  &:hover {
+    color: #fff;
+    background-color: #000;
+  }
+}
+
+th {
+  padding-bottom: 5px;
+}
+
+td {
+  padding: 0 5px 7px;
+}
+
+div {
+  &.field, &.actions {
+    margin-bottom: 10px;
+  }
+}
+
+#notice {
+  color: green;
+}
+
+.field_with_errors {
+  padding: 2px;
+  background-color: red;
+  display: table;
+}
+
+#error_explanation {
+  width: 450px;
+  border: 2px solid red;
+  padding: 7px 7px 0;
+  margin-bottom: 20px;
+  background-color: #f0f0f0;
+
+  h2 {
+    text-align: left;
+    font-weight: bold;
+    padding: 5px 5px 5px 15px;
+    font-size: 12px;
+    margin: -7px -7px 0;
+    background-color: #c00;
+    color: #fff;
+  }
+
+  ul li {
+    font-size: 12px;
+    list-style: square;
+  }
+}
+
+label {
+  display: block;
+}

app/assets/stylesheets/sponsor_tiers.scss

@@ -0,0 +1,3 @@
+// Place all the styles related to the SponsorTiers controller here.
+// They will automatically be included in application.css.
+// You can use Sass (SCSS) here: http://sass-lang.com/

app/assets/stylesheets/sponsorships.scss

@@ -0,0 +1,3 @@
+// Place all the styles related to the Sponsorships controller here.
+// They will automatically be included in application.css.
+// You can use Sass (SCSS) here: http://sass-lang.com/

app/assets/stylesheets/wallets.scss

@@ -0,0 +1,3 @@
+// Place all the styles related to the Wallets controller here.
+// They will automatically be included in application.css.
+// You can use Sass (SCSS) here: http://sass-lang.com/

app/controllers/accounts_controller.rb

@@ -146,6 +146,7 @@ class AccountsController < ApplicationController
       @user.password = params[:password]
       # 现在因为是验证码，所以在注册的时候就可以激活
       @user.activate
+      @user.profile_completed = true
       # 必须要用save操作，密码的保存是在users中
 
       interactor = Gitea::RegisterInteractor.call({username: login, email: email, password: params[:password]})
@@ -255,6 +256,7 @@ class AccountsController < ApplicationController
 
     set_autologin_cookie(user)
     UserAction.create(:action_id => user.try(:id), :action_type => "Login", :user_id => user.try(:id), :ip => request.remote_ip)
+    # user.daily_reward
     user.update_column(:last_login_on, Time.now)
     session[:"#{default_yun_session}"] = user.id
     Rails.logger.info("#########_____session_default_yun_session__________###############{default_yun_session}")

app/controllers/application_controller.rb

@@ -1,6 +1,7 @@
 require 'oauth2'
 
 class ApplicationController < ActionController::Base
+
 	include CodeExample
 	include RenderExpand
 	include RenderHelper
@@ -10,12 +11,14 @@ class ApplicationController < ActionController::Base
 	include LoggerHelper
 	include LoginHelper
 	include RegisterHelper
+	include UpdateHelper
 
 	protect_from_forgery prepend: true, unless: -> { request.format.json? }
 
 	before_action :check_sign
 	before_action :user_setup
 	#before_action :check_account
+  after_action :user_trace_log
 
 	# TODO
 	# check sql query time
@@ -337,7 +340,6 @@ class ApplicationController < ActionController::Base
 				User.current = user
 			end
 		end
-
 		# if !User.current.logged? && Rails.env.development?
 		# 	User.current = User.find 1
 		# end
@@ -352,7 +354,8 @@ class ApplicationController < ActionController::Base
 				User.current = User.find 8686
 			elsif params[:debug] == 'admin'
 				logger.info "@@@@@@@@@@@@@@@@@@@@@@ debug mode....."
-				user =  User.find 36480
+				# user =  User.find 36480
+				user = User.find 5
 				User.current = user
 				cookies.signed[:user_id] = user.id
 			end
@@ -375,7 +378,19 @@ class ApplicationController < ActionController::Base
 			# RSS key authentication does not start a session
 			User.find_by_rss_key(params[:key])
 		end
-	end
+  end
+
+  def user_trace_log
+    user = current_user
+    # print("*********************url:", request.url, "****routes", request.request_method)
+    Rails.logger.user_trace.info("{id: #{user.id}, login: #{user.login}, url: #{request.url}, method: #{request.method}, params: #{params}, response_code: #{response.code}, time: #{Time.now}}")
+  end
+
+  def user_trace_update_log(old_value_hash)
+    user = current_user
+    str = "{id: #{user.id}, login: #{user.login}, url: #{request.url}, method: #{request.method}, params: #{params.merge(old_value: old_value_hash)}, response_code: #{response.code}, time: #{Time.now}}"
+    Rails.logger.user_trace.info(str)
+  end
 
 	def try_to_autologin
 		if cookies[autologin_cookie_name]
@@ -401,226 +416,226 @@ class ApplicationController < ActionController::Base
 		respond_to do |format|
       format.json
     end
-	end
+  end
 
-	## 输出错误信息
-	def error_status(message = nil)
-		@status = -1
-		@message = message
-	end
+  ## 输出错误信息
+  def error_status(message = nil)
+    @status = -1
+    @message = message
+  end
 
-	# 实训等对应的仓库地址
-	def repo_ip_url(repo_path)
-		"#{edu_setting('git_address_ip')}/#{repo_path}"
-	end
+  # 实训等对应的仓库地址
+  def repo_ip_url(repo_path)
+    "#{edu_setting('git_address_ip')}/#{repo_path}"
+  end
 
-	def repo_url(repo_path)
-		"#{edu_setting('git_address_domain')}/#{repo_path}"
-	end
+  def repo_url(repo_path)
+    "#{edu_setting('git_address_domain')}/#{repo_path}"
+  end
 
-	# 通关后，把最后一次成功的代码存到数据库
-	# type 0 创始内容， 1 最新内容
-	# def game_passed_code(path, myshixun, game_id)
-	# 	# 如果代码窗口是隐藏的，则不用保存代码
-	# 	return if myshixun.shixun.hide_code || myshixun.shixun.vnc
-	# 	file_content = git_fle_content myshixun.repo_path, path
-	# 	#unless file_content.present?
-	# 	#	raise("获取文件代码异常")
-	# 	#end
-	# 	logger.info("#######game_id:#{game_id}, file_content:#{file_content}")
-	# 	game_code = GameCode.where(:game_id => game_id, :path => path).first
-	# 	if game_code.nil?
-	# 		GameCode.create!(:game_id => game_id, :new_code => file_content, :path => path)
-	# 	else
-	# 		game_code.update_attributes!(:new_code => file_content)
-	# 	end
+  # 通关后，把最后一次成功的代码存到数据库
+  # type 0 创始内容， 1 最新内容
+  # def game_passed_code(path, myshixun, game_id)
+  # 	# 如果代码窗口是隐藏的，则不用保存代码
+  # 	return if myshixun.shixun.hide_code || myshixun.shixun.vnc
+  # 	file_content = git_fle_content myshixun.repo_path, path
+  # 	#unless file_content.present?
+  # 	#	raise("获取文件代码异常")
+  # 	#end
+  # 	logger.info("#######game_id:#{game_id}, file_content:#{file_content}")
+  # 	game_code = GameCode.where(:game_id => game_id, :path => path).first
+  # 	if game_code.nil?
+  # 		GameCode.create!(:game_id => game_id, :new_code => file_content, :path => path)
+  # 	else
+  # 		game_code.update_attributes!(:new_code => file_content)
+  # 	end
   # end
 
-	# Post请求
-	def uri_post(uri, params)
-		begin
-			uid_logger_dubug("--uri_exec: params is #{params}, url is #{uri}")
-			uri = URI.parse(URI.encode(uri.strip))
-			res = Net::HTTP.post_form(uri, params).body
-			uid_logger_dubug("--uri_exec: .....res is #{res}")
-			JSON.parse(res)
-		rescue Exception => e
-			uid_logger_error("--uri_exec: exception #{e.message}")
-			raise Educoder::TipException.new("实训平台繁忙（繁忙等级：84）")
-		end
-	end
+  # Post请求
+  def uri_post(uri, params)
+    begin
+      uid_logger_dubug("--uri_exec: params is #{params}, url is #{uri}")
+      uri = URI.parse(URI.encode(uri.strip))
+      res = Net::HTTP.post_form(uri, params).body
+      uid_logger_dubug("--uri_exec: .....res is #{res}")
+      JSON.parse(res)
+    rescue Exception => e
+      uid_logger_error("--uri_exec: exception #{e.message}")
+      raise Educoder::TipException.new("实训平台繁忙（繁忙等级：84）")
+    end
+  end
 
-	#　处理返回非０就报错的请求
-	def interface_post(uri, params, status, message)
-		begin
-			uid_logger_dubug("--uri_exec: params is #{params}, url is #{uri}")
-			uri = URI.parse(URI.encode(uri.strip))
-			res = Net::HTTP.post_form(uri, params).body
-			uid_logger_dubug("--uri_exec: .....res is #{res}")
-			res = JSON.parse(res)
-			if (res && res['code'] != 0)
-				tip_exception(status, message)
-			else
-				res
-			end
-		rescue Exception => e
-			uid_logger("--uri_exec: exception #{e.message}")
-			raise Educoder::TipException.new(message)
-		end
-	end
+  #　处理返回非０就报错的请求
+  def interface_post(uri, params, status, message)
+    begin
+      uid_logger_dubug("--uri_exec: params is #{params}, url is #{uri}")
+      uri = URI.parse(URI.encode(uri.strip))
+      res = Net::HTTP.post_form(uri, params).body
+      uid_logger_dubug("--uri_exec: .....res is #{res}")
+      res = JSON.parse(res)
+      if (res && res['code'] != 0)
+        tip_exception(status, message)
+      else
+        res
+      end
+    rescue Exception => e
+      uid_logger("--uri_exec: exception #{e.message}")
+      raise Educoder::TipException.new(message)
+    end
+  end
 
-	# json格式请求
-	def interface_json_post(uri, params, status, message)
-		begin
-			uid_logger_dubug("--uri_exec: params is #{params}, url is #{uri}")
-			uri = URI.parse(URI.encode(uri.strip))
-			res = Net::HTTP.start(uri.host, uri.port) do |http|
-				req = Net::HTTP::Post.new(uri)
-				req['Content-Type'] = 'application/json'
-				req.body = params.to_json
-				http.request(req)
-			end
-			uid_logger_dubug("--uri_exec: .....res is #{res.body}")
-			res = JSON.parse(res.body)
-			if (res && res['code'] != 0)
-				tip_exception(status, message)
-			else
-				res
-			end
-		rescue Exception => e
-			uid_logger("--uri_exec: exception #{e.message}")
-			raise Educoder::TipException.new("服务器繁忙")
-		end
-	end
+  # json格式请求
+  def interface_json_post(uri, params, status, message)
+    begin
+      uid_logger_dubug("--uri_exec: params is #{params}, url is #{uri}")
+      uri = URI.parse(URI.encode(uri.strip))
+      res = Net::HTTP.start(uri.host, uri.port) do |http|
+        req = Net::HTTP::Post.new(uri)
+        req['Content-Type'] = 'application/json'
+        req.body = params.to_json
+        http.request(req)
+      end
+      uid_logger_dubug("--uri_exec: .....res is #{res.body}")
+      res = JSON.parse(res.body)
+      if (res && res['code'] != 0)
+        tip_exception(status, message)
+      else
+        res
+      end
+    rescue Exception => e
+      uid_logger("--uri_exec: exception #{e.message}")
+      raise Educoder::TipException.new("服务器繁忙")
+    end
+  end
 
 
-	# 适用与已经用url_safe编码后，回调字符串形式
-	def tran_base64_decode64(str)
-		s_size = str.size % 4
-		if s_size != 0
-			str += "=" * (4 - s_size)
-		end
-		if str.blank?
-			str
-		else
-			Base64.decode64(str.tr("-_", "+/")).force_encoding("utf-8")
-		end
-	end
+  # 适用与已经用url_safe编码后，回调字符串形式
+  def tran_base64_decode64(str)
+    s_size = str.size % 4
+    if s_size != 0
+      str += "=" * (4 - s_size)
+    end
+    if str.blank?
+      str
+    else
+      Base64.decode64(str.tr("-_", "+/")).force_encoding("utf-8")
+    end
+  end
 
-	def sucess_status(message = 'success')
-		render :json => { status: 1, message: message }
-	end
+  def sucess_status(message = 'success')
+    render :json => { status: 1, message: message }
+  end
 
-	# 随机生成字符
-	def generate_identifier(container, num, pre='')
-		code = DCODES.sample(num).join
-		if container == User
-			while container.exists?(login: pre+code) do
-				code = DCODES.sample(num).join
-			end
-		else
-			while container.exists?(identifier: code) do
-				code = DCODES.sample(num).join
-			end
-		end
-		code
-	end
+  # 随机生成字符
+  def generate_identifier(container, num, pre='')
+    code = DCODES.sample(num).join
+    if container == User
+      while container.exists?(login: pre+code) do
+        code = DCODES.sample(num).join
+      end
+    else
+      while container.exists?(identifier: code) do
+        code = DCODES.sample(num).join
+      end
+    end
+    code
+  end
 
 
-	# 实训主类别列表，自带描述
-	def shixun_main_type
-		list = []
-		mirrors = MirrorRepository.select([:id, :type_name, :description, :name]).published_main_mirror
-		mirrors.try(:each) do |mirror|
-			list << {id: mirror.id, type_name: mirror.type_name, description: mirror.try(:description), mirror_name: mirror.name}
-		end
-		list
-	end
+  # 实训主类别列表，自带描述
+  def shixun_main_type
+    list = []
+    mirrors = MirrorRepository.select([:id, :type_name, :description, :name]).published_main_mirror
+    mirrors.try(:each) do |mirror|
+      list << {id: mirror.id, type_name: mirror.type_name, description: mirror.try(:description), mirror_name: mirror.name}
+    end
+    list
+  end
 
-	# 小类别列表
-	def shixun_small_type
-		list = []
-		mirrors = MirrorRepository.select([:id, :type_name, :description, :name]).published_small_mirror
-		mirrors.try(:each) do |mirror|
-			list << {id: mirror.id, type_name: mirror.type_name, description: mirror.description, mirror_name: mirror.name}
-		end
-		list
-	end
+  # 小类别列表
+  def shixun_small_type
+    list = []
+    mirrors = MirrorRepository.select([:id, :type_name, :description, :name]).published_small_mirror
+    mirrors.try(:each) do |mirror|
+      list << {id: mirror.id, type_name: mirror.type_name, description: mirror.description, mirror_name: mirror.name}
+    end
+    list
+  end
 
-	def container_limit(mirror_repositories)
-		container = []
-		mirror_repositories.each do |mr|
-			if mr.name.present?
-				container << {:image => mr.name, :cpuLimit => mr.cpu_limit, :memoryLimit =>  "#{mr.memory_limit}M", :type => mr.try(:main_type) == "1" ? "main" : "sub"}
-			end
-		end
-		container.to_json
-	end
+  def container_limit(mirror_repositories)
+    container = []
+    mirror_repositories.each do |mr|
+      if mr.name.present?
+        container << {:image => mr.name, :cpuLimit => mr.cpu_limit, :memoryLimit =>  "#{mr.memory_limit}M", :type => mr.try(:main_type) == "1" ? "main" : "sub"}
+      end
+    end
+    container.to_json
+  end
 
-	# 实训中间层pod配置
-	def shixun_container_limit shixun
-		container = []
-		shixun.shixun_service_configs.each do |config|
-			mirror = config.mirror_repository
-			if mirror.name.present?
-				# 资源限制没有就传默认值。
-				cpu_limit = config.cpu_limit.presence || 1
-				cpu_request = config.lower_cpu_limit.presence || 0.1
-				memory_limit = config.memory_limit.presence || 1024
-				request_limit = config.request_limit.presence || 10
-				resource_limit = config.resource_limit.presence || 10000
-				container << {:image => mirror.name,
-											:cpuLimit => cpu_limit,
-											:cpuRequest => cpu_request,
-											:memoryLimit => "#{memory_limit}M",
-											:memoryRequest => "#{request_limit}M",
-											:resourceLimit => "#{resource_limit}K",
-											:type => mirror.try(:main_type) == "1" ? "main" : "sub"}
-			end
-		end
-		container.to_json
-	end
+  # 实训中间层pod配置
+  def shixun_container_limit shixun
+    container = []
+    shixun.shixun_service_configs.each do |config|
+      mirror = config.mirror_repository
+      if mirror.name.present?
+        # 资源限制没有就传默认值。
+        cpu_limit = config.cpu_limit.presence || 1
+        cpu_request = config.lower_cpu_limit.presence || 0.1
+        memory_limit = config.memory_limit.presence || 1024
+        request_limit = config.request_limit.presence || 10
+        resource_limit = config.resource_limit.presence || 10000
+        container << {:image => mirror.name,
+                      :cpuLimit => cpu_limit,
+                      :cpuRequest => cpu_request,
+                      :memoryLimit => "#{memory_limit}M",
+                      :memoryRequest => "#{request_limit}M",
+                      :resourceLimit => "#{resource_limit}K",
+                      :type => mirror.try(:main_type) == "1" ? "main" : "sub"}
+      end
+    end
+    container.to_json
+  end
 
-	# 毕设任务列表的赛选
-	def course_work(task, **option)
-		logger.info("#############{option}")
-		course = task.course
-		work_list = task.graduation_works.includes(user: [:user_extension])
-		# 教师评阅搜索 0: 未评， 1 已评
-		if option[:teacher_comment]
-			graduation_work_ids = GraduationWorkScore.where(graduation_work_id: work_list.map(&:id)).pluck(:graduation_work_id)
-			if option[:teacher_comment].zero?
-				work_list  = work_list.where.not(id: graduation_work_ids)
-			elsif option[:teacher_comment] == 1
-				work_list = work_list.where(id: graduation_work_ids).where.not(work_status: 0)
-			end
-		end
+  # 毕设任务列表的赛选
+  def course_work(task, **option)
+    logger.info("#############{option}")
+    course = task.course
+    work_list = task.graduation_works.includes(user: [:user_extension])
+    # 教师评阅搜索 0: 未评， 1 已评
+    if option[:teacher_comment]
+      graduation_work_ids = GraduationWorkScore.where(graduation_work_id: work_list.map(&:id)).pluck(:graduation_work_id)
+      if option[:teacher_comment].zero?
+        work_list  = work_list.where.not(id: graduation_work_ids)
+      elsif option[:teacher_comment] == 1
+        work_list = work_list.where(id: graduation_work_ids).where.not(work_status: 0)
+      end
+    end
 
-		# 作品状态 0： 未提交， 1 按时提交， 2 延迟提交
-		if option[:task_status]
-			work_list = work_list.where(work_status: option[:task_status])
-		end
+    # 作品状态 0： 未提交， 1 按时提交， 2 延迟提交
+    if option[:task_status]
+      work_list = work_list.where(work_status: option[:task_status])
+    end
 
-		# 分班情况
-		if option[:course_group]
-			group_user_ids = course.course_members.where(course_group_id: option[:course_group]).pluck(:user_id)
-			# 有分组只可能是老师身份查看列表
-			work_list = work_list.where(user_id: group_user_ids)
-		end
+    # 分班情况
+    if option[:course_group]
+      group_user_ids = course.course_members.where(course_group_id: option[:course_group]).pluck(:user_id)
+      # 有分组只可能是老师身份查看列表
+      work_list = work_list.where(user_id: group_user_ids)
+    end
 
-		# 只看我的交叉评阅
-		if option[:cross_comment]
-			graduation_work_id = task.graduation_work_comment_assignations.where(:user_id => current_user.id)
-															 .pluck(:graduation_work_id).uniq if task.graduation_work_comment_assignations
-			work_list = work_list.where(id: graduation_work_id)
-		end
+    # 只看我的交叉评阅
+    if option[:cross_comment]
+      graduation_work_id = task.graduation_work_comment_assignations.where(:user_id => current_user.id)
+                               .pluck(:graduation_work_id).uniq if task.graduation_work_comment_assignations
+      work_list = work_list.where(id: graduation_work_id)
+    end
 
-		# 输入姓名和学号搜索
-		# TODO user_extension 如果修改 请调整
-		if option[:search]
-			work_list = work_list.joins(user: :user_extension).where("concat(lastname, firstname) like ?
+    # 输入姓名和学号搜索
+    # TODO user_extension 如果修改 请调整
+    if option[:search]
+      work_list = work_list.joins(user: :user_extension).where("concat(lastname, firstname) like ?
                          or student_id like ?", "%#{option[:search]}%", "%#{option[:search]}%")
-		end
+    end
 
 		# 排序
 		rorder = UserExtension.column_names.include?(option[:order]) ? option[:order] : "updated_at"
@@ -650,42 +665,59 @@ class ApplicationController < ActionController::Base
 		ss
 	end
 
-	# Returns a string that can be used as filename value in Content-Disposition header
-	def filename_for_content_disposition(name)
-		request.env['HTTP_USER_AGENT'] =~ %r{MSIE|Trident|Edge} ? ERB::Util.url_encode(name) : name
-	end
+  def strip_html(text, len=0, endss="...")
+    ss = ""
+    if !text.nil? && text.length>0
+      ss=text.gsub(/<\/?.*?>/, '').strip
+      ss = ss.gsub(/&nbsp;*/, '')
+      ss = ss.gsub(/\r\n/,'')  #新增
+      ss = ss.gsub(/\n/,'')  #新增
+      if len > 0 && ss.length > len
+        ss = ss[0, len] + endss
+      elsif len > 0 && ss.length <= len
+        ss = ss
+        #ss = truncate(ss, :length => len)
+      end
+    end
+    ss
+  end
 
-	def format_time(time)
-		time.blank? ? '' : time.strftime("%Y-%m-%d %H:%M")
-	end
+  # Returns a string that can be used as filename value in Content-Disposition header
+  def filename_for_content_disposition(name)
+    request.env['HTTP_USER_AGENT'] =~ %r{MSIE|Trident|Edge} ? ERB::Util.url_encode(name) : name
+  end
 
-	# 获取Oauth Client
-	def get_client(site)
-		client_id = Rails.configuration.educoder['client_id']
-		client_secret = Rails.configuration.educoder['client_secret']
+  def format_time(time)
+    time.blank? ? '' : time.strftime("%Y-%m-%d %H:%M")
+  end
 
-		OAuth2::Client.new(client_id, client_secret, site: site)
-	end
+  # 获取Oauth Client
+  def get_client(site)
+    client_id = Rails.configuration.educoder['client_id']
+    client_secret = Rails.configuration.educoder['client_secret']
 
-	def paginate(relation)
-		limit = params[:limit] || params[:per_page]
-		limit  = (limit.to_i.zero? || limit.to_i > 20) ? 20 : limit.to_i
-		page   = params[:page].to_i.zero? ? 1 : params[:page].to_i
-		offset = (page - 1) * limit
+    OAuth2::Client.new(client_id, client_secret, site: site)
+  end
 
-		if relation.is_a?(Array)
-			relation[offset, limit]
-		else
-			relation.limit(limit).offset(offset)
-		end
-	end
+  def paginate(relation)
+    limit = params[:limit] || params[:per_page]
+    limit  = (limit.to_i.zero? || limit.to_i > 20) ? 20 : limit.to_i
+    page   = params[:page].to_i.zero? ? 1 : params[:page].to_i
+    offset = (page - 1) * limit
 
-	def kaminari_paginate(relation)
-		limit = params[:limit] || params[:per_page]
-		limit = (limit.to_i.zero? || limit.to_i > 15) ? 15 : limit.to_i
-		page  = params[:page].to_i.zero? ? 1 : params[:page].to_i
+    if relation.is_a?(Array)
+      relation[offset, limit]
+    else
+      relation.limit(limit).offset(offset)
+    end
+  end
 
-		relation.page(page).per(limit)
+  def kaminari_paginate(relation)
+    limit = params[:limit] || params[:per_page]
+    limit = (limit.to_i.zero? || limit.to_i > 15) ? 15 : limit.to_i
+    page  = params[:page].to_i.zero? ? 1 : params[:page].to_i
+
+    relation.page(page).per(limit)
 	end
 
 	def kaminari_array_paginate(relation)
@@ -700,29 +732,30 @@ class ApplicationController < ActionController::Base
 		time.blank? ? '' : time.strftime("%Y-%m-%d %H:%M:%S")
 	end
 
-	def strf_date(date)
-		date.blank? ? '' : date.to_date.strftime("%Y-%m-%d")
-	end
+  def strf_date(date)
+    date.blank? ? '' : date.to_date.strftime("%Y-%m-%d")
+  end
 
-	def logger_error(error)
-		Rails.logger.error(error.message)
-		error.backtrace.each { |msg| Rails.logger.error(msg) }
-	end
+  def logger_error(error)
+    Rails.logger.error(error.message)
+    error.backtrace.each { |msg| Rails.logger.error(msg) }
+  end
 
-	def find_user
-		@user = User.find_by_login params[:login]
+  def find_user
+    @user = User.find_by_login params[:login]
     render_not_found("未找到’#{params[:login]}’相关的用户") unless @user
-	end
+  end
 
-	def find_user_with_id
-		@user = User.find_by_id params[:user_id]
+  def find_user_with_id
+    @user = User.find_by_id params[:user_id]
     # render_not_found("未找到’#{params[:login]}’相关的用户") unless @user
-		render_error("未找到相关的用户") unless @user
-	end
+    render_error("未找到相关的用户") unless @user
+  end
 
-	def find_repository
-		@repo = @user.repositories.find_by_identifier params[:repo_identifier]
+  def find_repository
+    @repo = @user.repositories.find_by_identifier params[:repo_identifier]
     render_not_found("未找到’#{params[:repo_identifier]}’相关的项目") unless @repo
+
 	end
 
 	def find_repository_by_id
@@ -804,55 +837,55 @@ class ApplicationController < ActionController::Base
   end
 
   private
-	def object_not_found
-		uid_logger("Missing template or cant't find record, responding with 404")
-		render json: {message: "您访问的页面不存在或已被删除", status: 404}
-		false
-	end
+  def object_not_found
+    uid_logger("Missing template or cant't find record, responding with 404")
+    render json: {message: "您访问的页面不存在或已被删除", status: 404}
+    false
+  end
 
-	def tip_show(exception)
-		uid_logger("Tip show status is #{exception.status}, message is #{exception.message}")
-		render json: exception.tip_json
-	end
+  def tip_show(exception)
+    uid_logger("Tip show status is #{exception.status}, message is #{exception.message}")
+    render json: exception.tip_json
+  end
 
-	def render_parameter_missing
-		render json: { status: -1, message: '参数缺失' }
-	end
+  def render_parameter_missing
+    render json: { status: -1, message: '参数缺失' }
+  end
 
-	def set_export_cookies
-		cookies[:fileDownload] = true
-	end
+  def set_export_cookies
+    cookies[:fileDownload] = true
+  end
 
-	# 149课程的评审用户数据创建（包含创建课堂学生）
-	def open_class_user
-		user = User.find_by(login: "OpenClassUser")
-		unless user
-			ActiveRecord::Base.transaction do
-				user_params = {status: 1, login: "OpenClassUser", lastname: "开放课程",
-											 nickname: "开放课程", professional_certification: 1, certification: 1, grade: 0,
-											 password: "12345678", phone: "11122223333", profile_completed: 1}
-				user = User.create!(user_params)
+  # 149课程的评审用户数据创建（包含创建课堂学生）
+  def open_class_user
+    user = User.find_by(login: "OpenClassUser")
+    unless user
+      ActiveRecord::Base.transaction do
+        user_params = {status: 1, login: "OpenClassUser", lastname: "开放课程",
+                       nickname: "开放课程", professional_certification: 1, certification: 1, grade: 0,
+                       password: "12345678", phone: "11122223333", profile_completed: 1}
+        user = User.create!(user_params)
 
-				UserExtension.create!(user_id: user.id, gender: 0, school_id: 3396, :identity => 1, :student_id => "openclassuser") # 3396
+        UserExtension.create!(user_id: user.id, gender: 0, school_id: 3396, :identity => 1, :student_id => "openclassuser") # 3396
 
-				subject = Subject.find_by(id: 149)
-				if subject
-					subject.courses.each do |course|
-						CourseMember.create!(course_id: course.id, role: 3, user_id: user.id) if !course.course_members.exists?(user_id: user.id)
-					end
-				end
-			end
-		end
-		user
-	end
+        subject = Subject.find_by(id: 149)
+        if subject
+          subject.courses.each do |course|
+            CourseMember.create!(course_id: course.id, role: 3, user_id: user.id) if !course.course_members.exists?(user_id: user.id)
+          end
+        end
+      end
+    end
+    user
+  end
 
-	# 记录热门搜索关键字
-	def record_search_keyword
-		keyword = params[:keyword].to_s.strip
-		return if keyword.blank? || keyword.size <= 1
-		return unless HotSearchKeyword.available?
+  # 记录热门搜索关键字
+  def record_search_keyword
+    keyword = params[:keyword].to_s.strip
+    return if keyword.blank? || keyword.size <= 1
+    return unless HotSearchKeyword.available?
 
-		HotSearchKeyword.add(keyword)
-	end
+    HotSearchKeyword.add(keyword)
+  end
 
-end
+end

app/controllers/compare_controller.rb

@@ -25,9 +25,12 @@ class CompareController < ApplicationController
       end
       if @exist_pullrequest.present?
         return -2, "在这些分支之间的合并请求已存在：<a href='/projects/#{@owner.login}/#{@project.identifier}/pulls/#{@exist_pullrequest.id}/Messagecount'>#{@exist_pullrequest.try(:title)}</a>"
-      else 
-        if @compare_result["Commits"].blank? && @compare_result["Diff"].blank?
-          return -2, "分支内容相同，无需创建合并请求"
+      else
+        # if @compare_result["Commits"].blank? && @compare_result["Diff"].blank?
+        #   return -2, "分支内容相同，无需创建合并请求"
+        # end
+        if @base == @head
+          return -2, "请选择不同分支"
         end
       end
     end

app/controllers/concerns/login_helper.rb

@@ -44,6 +44,7 @@ module LoginHelper
     set_autologin_cookie(user)
 
     UserAction.create(action_id: user&.id, action_type: 'Login', user_id: user&.id, ip: request.remote_ip)
+    # user.daily_reward
     user.update_column(:last_login_on, Time.now)
     # 注册完成后有一天的试用申请(先去掉)
     # UserDayCertification.create(user_id: user.id, status: 1)

app/controllers/concerns/register_helper.rb

@@ -1,13 +1,17 @@
 module RegisterHelper
   extend ActiveSupport::Concern
 
-  def autologin_register(username, email, password, platform= 'forge')
+  def autologin_register(username, email, password, platform= 'forge', need_edit_info = false)
     result = {message: nil, user: nil}
 
     user = User.new(admin: false, login: username, mail: email, type: "User")
     user.password = password
     user.platform = platform
-    user.activate
+    if need_edit_info
+      user.need_edit_info
+    else 
+      user.activate
+    end
     
     return unless user.valid?
 
@@ -27,4 +31,30 @@ module RegisterHelper
     result
   end
 
+  def autosync_register_trustie(username, password, email)
+    config = Rails.application.config_for(:configuration).symbolize_keys!
+
+    api_host = config[:sync_url]
+
+    return if api_host.blank?
+
+    url = "#{api_host}/api/v1/users/common"
+    sync_json = {
+      "mail": email,
+      "password": password,
+      "login": username
+    }
+    uri = URI.parse(url)
+
+    if api_host
+      http = Net::HTTP.new(uri.hostname, uri.port)
+
+      if api_host.include?("https://")
+        http.use_ssl = true
+      end
+
+      http.send_request('POST', uri.path, sync_json.to_json, {'Content-Type' => 'application/json'})
+    end
+  end
+
 end

app/controllers/forks_controller.rb

@@ -3,9 +3,12 @@ class ForksController < ApplicationController
   before_action :require_profile_completed, only: [:create]
   before_action :load_project
   before_action :authenticate_project!, :authenticate_user!
+  skip_after_action :user_trace_log, only: [:create]
 
   def create
     @new_project = Projects::ForkService.new(current_user, @project, params[:organization]).call
+    user = current_user
+    Rails.logger.user_trace.info("{id: #{user.id}, login: #{user.login}, url: #{request.url}, method: #{request.method}, params: #{params.merge(forkee: @new_project.id)}, response_code: #{response.code}, time: #{Time.now}}")
   end
 
   private

app/controllers/issues_controller.rb

@@ -11,6 +11,8 @@ class IssuesController < ApplicationController
   before_action :set_issue, only: [:edit, :update, :destroy, :show, :copy, :close_issue, :lock_issue]
   before_action :check_token_enough, only: [:create, :update]
 
+  skip_after_action :user_trace_log, only: [:update]
+
   include ApplicationHelper
   include TagChosenHelper
 
@@ -197,6 +199,7 @@ class IssuesController < ApplicationController
       #     end
       #   end
       # end
+    issue_hash = old_value_to_hash(@issue, params)
 
     if @issue.issue_type.to_s == "2" &&  params[:status_id].to_i == 5 && @issue.author_id != current_user.try(:id)
       normal_status(-1, "不允许修改为关闭状态")
@@ -204,6 +207,9 @@ class IssuesController < ApplicationController
       issue_params = issue_send_params(params).except(:issue_classify, :author_id, :project_id)
       Issues::UpdateForm.new({subject:issue_params[:subject]}).validate!
       if @issue.update_attributes(issue_params)
+
+        user_trace_update_log(issue_hash)
+
         if @issue&.pull_request.present?
           SendTemplateMessageJob.perform_later('PullRequestChanged', current_user.id, @issue&.pull_request&.id, @issue.previous_changes.slice(:assigned_to_id, :priority_id, :fixed_version_id, :issue_tags_value))
           SendTemplateMessageJob.perform_later('PullRequestAssigned', current_user.id, @issue&.pull_request&.id ) if @issue.previous_changes[:assigned_to_id].present?

app/controllers/journals_controller.rb

@@ -4,6 +4,7 @@ class JournalsController < ApplicationController
   before_action :set_issue
   before_action :check_issue_permission
   before_action :set_journal, only: [:destroy, :edit, :update]
+  skip_after_action :user_trace_log, only: [:update]
 
   def index
     @page  = params[:page]  || 1
@@ -68,7 +69,9 @@ class JournalsController < ApplicationController
   def update
     content = params[:content]
     if content.present?
+      old_value = old_value_to_hash(@journal, params)
       if @journal.update_attribute(:notes, content)
+        user_trace_update_log(old_value)
         normal_status(0, "更新成功")
       else
         normal_status(-1, "更新失败")

app/controllers/log_controller.rb

@@ -0,0 +1,19 @@
+class LogController < ApplicationController
+  def list
+    path = "#{Rails.root}/log"
+    @file_list = []
+    Dir.foreach(path) do |file|
+      @file_list << file
+    end
+    @file_list = @file_list.sort
+  end
+
+  def download
+    path = "#{Rails.root}/log/#{params[:filename]}"
+    if params[:filename] && File.exist?(path) && File.file?(path)
+      send_file(path, filename: params[:filename])
+    else
+      render json: { message: 'no such file!' }
+    end
+  end
+end

app/controllers/members_controller.rb

@@ -6,6 +6,7 @@ class MembersController < ApplicationController
   before_action :operate!, except: %i[index]
   before_action :check_member_exists!, only: %i[create]
   before_action :check_member_not_exists!, only: %i[remove change_role]
+  skip_after_action :user_trace_log, only: [:change_role]
 
   def create
     interactor = Projects::AddMemberInteractor.call(@project.owner, @project, @user)
@@ -39,8 +40,13 @@ class MembersController < ApplicationController
   end
 
   def change_role
+    old_value = @project.members.where(user_id: params[:user_id])[0].roles.last.name
     interactor = Projects::ChangeMemberRoleInteractor.call(@project.owner, @project, @user, params[:role])
+
+    user_trace_update_log(old_value)
+
     SendTemplateMessageJob.perform_later('ProjectRole', current_user.id, @user.id, @project.id, message_role_name)
+
     render_response(interactor)
   rescue Exception => e
     uid_logger_error(e.message)

app/controllers/oauth/base_controller.rb

@@ -2,6 +2,7 @@ class Oauth::BaseController < ActionController::Base
   include RenderHelper
   include LoginHelper
   include ControllerRescueHandler
+  include LoggerHelper
   # include LaboratoryHelper
 
   skip_before_action :verify_authenticity_token
@@ -11,6 +12,18 @@ class Oauth::BaseController < ActionController::Base
   end
 
   private
+  def tip_exception(status = -1, message)
+		raise Educoder::TipException.new(status, message)
+  end
+  
+  def tip_show_exception(status = -2, message)
+		raise Educoder::TipException.new(status, message)
+  end
+  
+  def tip_show(exception)
+		uid_logger("Tip show status is #{exception.status}, message is #{exception.message}")
+		render json: exception.tip_json
+	end
 
   def session_user_id
     # session[:user_id]
@@ -48,4 +61,13 @@ class Oauth::BaseController < ActionController::Base
     Rails.logger.info("[wechat] set session unionid: #{unionid}")
     session[:unionid] = unionid
   end
+
+  def session_edulogin
+    session[:edulogin]
+  end
+
+  def set_session_edulogin(login)
+    Rails.logger.info("[educoder] set sesstion edulogin: #{login}")
+    session[:edulogin] = login
+  end
 end

app/controllers/oauth/educoder_controller.rb

@@ -1,4 +1,6 @@
 class Oauth::EducoderController < Oauth::BaseController
+  include RegisterHelper
+
   def bind
     begin
       login = params[:login]
@@ -32,4 +34,41 @@ class Oauth::EducoderController < Oauth::BaseController
       render_error(ex.message)
     end
   end
+
+  # 需要educoder那边设置回调地址
+  def create
+    begin
+      code = params['code'].to_s.strip
+      tip_exception("code不能为空") if code.blank?
+
+      new_user = false
+      result = EducoderOauth::Service.access_token(code)
+      result = EducoderOauth::Service.user_info(result[:access_token])
+
+      # 存在该用户
+      open_user = OpenUsers::Educoder.find_by(uid: result['login'])
+      if open_user.present? && open_user.user.present?
+        successful_authentication(open_user.user)
+      else
+        if current_user.blank? || !current_user.logged?
+          new_user = true
+          login = User.generate_login('E')
+          reg_result = autologin_register(login,"#{login}@forge.com", "Ec#{login}2021#", 'educoder', true)
+          if reg_result[:message].blank?
+            open_user = OpenUsers::Educoder.create!(user_id: reg_result[:user][:id], uid: result['login'], extra: result)
+            autosync_register_trustie(login, "Ec#{login}2021#", "#{login}@forge.com")
+            successful_authentication(open_user.user)
+          else
+            render_error(reg_result[:message])
+          end
+        else
+          OpenUsers::Educoder.create!(user: current_user, uid: result['login'], extra: result)
+        end
+      end
+
+      redirect_to root_path(new_user: new_user)
+    rescue Exception => ex
+      render_error(ex.message)
+    end
+  end
 end

app/controllers/pull_requests_controller.rb

@@ -1,10 +1,13 @@
 class PullRequestsController < ApplicationController
+
   before_action :require_login, except: [:index, :show, :files, :commits]
   before_action :require_profile_completed, only: [:create]
   before_action :load_repository
   before_action :check_menu_authorize
   before_action :find_pull_request, except: [:index, :new, :create, :check_can_merge,:get_branches,:create_merge_infos, :files, :commits]
   before_action :load_pull_request, only: [:files, :commits]
+
+  skip_after_action :user_trace_log, only: [:update]
   include TagChosenHelper
   include ApplicationHelper
 
@@ -92,8 +95,14 @@ class PullRequestsController < ApplicationController
             end
           end
 
+          old_issue_value = old_value_to_hash(@issue, @issue_params)
+          old_pr_value = old_value_to_hash(@pull_request, @local_params.compact)
+          old_value = {issue: old_issue_value, pull_request: old_pr_value}
+
           if @issue.update_attributes(@issue_params)
             if @pull_request.update_attributes(@local_params.compact)
+
+              user_trace_update_log(old_value)
               gitea_pull = Gitea::PullRequest::UpdateService.call(@owner.login, @repository.identifier,
                   @pull_request.gitea_number, @requests_params, current_user.gitea_token)
 

app/controllers/settings_controller.rb

@@ -1,10 +1,11 @@
 class SettingsController < ApplicationController
   def show
     @old_projects_url = nil
+    @old_projects_url = "https://www.trustie.net/users/#{current_user.try(:login)}/projects"  if User.current.logged?
     get_add_menu
     get_common_menu
     get_personal_menu
-
+    get_third_party
   end
 
   private
@@ -40,6 +41,14 @@ class SettingsController < ApplicationController
       end
     end
 
+    def get_third_party
+      @third_party = []
+      @third_party << {
+        name: 'educoder',
+        url: EducoderOauth.oauth_url
+      }
+    end
+
     def get_site_url(key, value)
       key.to_s === "url" ? append_http(reset_site_url(value)) : reset_site_url(value)
     end

app/controllers/sponsor_tiers_controller.rb

@@ -0,0 +1,90 @@
+class SponsorTiersController < ApplicationController
+  before_action :set_sponsor_tier, only: [:show, :edit, :update, :destroy]
+  before_action :check_sponsor, only: [:show]
+  before_action :require_login, only: [:create, :update, :destroy]
+
+  # GET /sponsor_tiers
+  # GET /sponsor_tiers.json
+  def index
+    # @sponsor_tiers = SponsorTier.all
+    user = User.find_by_login(params[:login])
+    @sponsor_tiers = user.sponsor_tier
+  end
+
+  # GET /sponsor_tiers/1
+  # GET /sponsor_tiers/1.json
+  def show
+
+  end
+
+  # POST /sponsor_tiers
+  # POST /sponsor_tiers.json
+  def create
+    # print("------------\n", sponsor_tier_params, "\n------------\n")
+    @check_sponsorship = nil
+    @sponsor_tier = SponsorTier.new(sponsor_tier_params)
+    respond_to do |format|
+      if @sponsor_tier.user_id == User.current.id && @sponsor_tier.save
+        format.html { redirect_to @sponsor_tier, notice: 'Sponsor tier was successfully created.' }
+        format.json { render :show, status: :created, location: @sponsor_tier }
+        # render json: {status: 1, message: '创建成功' }
+      else
+        format.html { render :new }
+        format.json { render json: @sponsor_tier.errors, status: :unprocessable_entity }
+      end
+    end
+  end
+
+  # PATCH/PUT /sponsor_tiers/1
+  # PATCH/PUT /sponsor_tiers/1.json
+  def update
+    @check_sponsorship = nil
+    old_value = old_value_to_hash(@sponsor_tier, params)
+    respond_to do |format|
+      if User.current.id == @sponsor_tier.user_id && @sponsor_tier.update(sponsor_tier_update_params)
+        user_trace_update_log(old_value)
+        format.html { redirect_to @sponsor_tier, notice: 'Sponsor tier was successfully updated.' }
+        format.json { render :show, status: :ok, location: @sponsor_tier }
+        # render json: {status: 1, message: '修改成功' }
+      else
+        format.html { render :edit }
+        format.json { render json: @sponsor_tier.errors, status: :unprocessable_entity }
+        # format.json { render status: :unprocessable_entity }
+        # render json: {status: -1, message: '修改失败' }
+      end
+    end
+  end
+
+  # DELETE /sponsor_tiers/1
+  # DELETE /sponsor_tiers/1.json
+  def destroy
+    if User.current.id == @sponsor_tier.user_id
+      @sponsor_tier.destroy
+      respond_to do |format|
+        format.html { redirect_to sponsor_tiers_url, notice: 'Sponsor tier was successfully destroyed.' }
+        format.json { head :no_content }
+      end
+    else
+      format.json { render json: @sponsor_tier.errors, status: :unprocessable_entity }
+    end
+  end
+
+  private
+    # Use callbacks to share common setup or constraints between actions.
+    def check_sponsor
+      @check_sponsorship = Sponsorship.where("sponsor_id=? AND developer_id=?", current_user.id, @sponsor_tier.user.id)
+    end
+
+    def set_sponsor_tier
+      @sponsor_tier = SponsorTier.find(params[:id])
+    end
+
+    def sponsor_tier_update_params
+      params.require(:sponsor_tier).permit(:tier, :description)
+    end
+
+    # Only allow a list of trusted parameters through.
+    def sponsor_tier_params
+      params.require(:sponsor_tier).permit(:tier, :user_id, :description)
+    end
+end

app/controllers/sponsorships_controller.rb

@@ -0,0 +1,212 @@
+class SponsorshipsController < ApplicationController
+  before_action :set_sponsorship, only: [:show, :edit, :update, :destroy]
+  # before_action :require_login, except: [:index, :stopped, :sponsored, :sponsoring, :stopped_sponsored, :stopped_sponsoring]
+  before_action :require_login, only: [:create, :edit, :update, :destroy]
+  skip_after_action :user_trace_log, only: [:update]
+  
+  # GET /sponsorships
+  # GET /sponsorships.json
+  def index
+    @sponsorships = Sponsorship.all
+  end
+
+  def stopped
+    @stopped_sponsorships = StoppedSponsorship.all
+  end
+
+  def sponsored
+    if User.current.id == Integer(params[:id])
+      @sponsorships = Sponsorship.where('developer_id=?', params[:id])
+    else
+      @sponsorships = Sponsorship.where('developer_id=? AND visible=1', params[:id])
+    end
+    sort = params[:sort_by] || 'created_at'
+    sort_direction = params[:sort_direction] || 'desc'
+    @sponsorships = @sponsorships.reorder("#{sort} #{sort_direction}")
+    @total = @sponsorships.length
+    @sponsorships = kaminari_paginate(@sponsorships)
+  end
+
+  def sponsoring
+    if User.current.id == Integer(params[:id])
+      @sponsorships = Sponsorship.where('sponsor_id=?', params[:id])
+    else
+      @sponsorships = Sponsorship.where('sponsor_id=? AND visible=1', params[:id])
+    end
+    sort = params[:sort_by] || 'created_at'
+    sort_direction = params[:sort_direction] || 'desc'
+    @sponsorships = @sponsorships.reorder("#{sort} #{sort_direction}")
+    @total = @sponsorships.length
+    @sponsorships = kaminari_paginate(@sponsorships)
+  end
+
+  def stopped_sponsored
+    if User.current.id == Integer(params[:id])
+      @stopped_sponsorships = StoppedSponsorship.where('developer_id=?', params[:id])
+    else
+      @stopped_sponsorships = StoppedSponsorship.where('developer_id=? AND visible=1', params[:id])
+    end
+    sort = params[:sort_by] || 'created_at'
+    sort_direction = params[:sort_direction] || 'desc'
+    @stopped_sponsorships = @stopped_sponsorships.reorder("#{sort} #{sort_direction}")
+    @total = @stopped_sponsorships.length
+    @stopped_sponsorships = kaminari_paginate(@stopped_sponsorships)
+  end
+
+  def stopped_sponsoring
+    if User.current.id == Integer(params[:id])
+      @stopped_sponsorships = StoppedSponsorship.where('sponsor_id=?', params[:id])
+    else
+      @stopped_sponsorships = StoppedSponsorship.where('sponsor_id=? AND visible=1', params[:id])
+    end
+    sort = params[:sort_by] || 'created_at'
+    sort_direction = params[:sort_direction] || 'desc'
+    @stopped_sponsorships = @stopped_sponsorships.reorder("#{sort} #{sort_direction}")
+    @total = @stopped_sponsorships.length
+    @stopped_sponsorships = kaminari_paginate(@stopped_sponsorships)
+  end
+
+  # GET /sponsorships/1
+  # GET /sponsorships/1.json
+  def show; end
+
+  # POST /sponsorships
+  # POST /sponsorships.json
+  def create
+    sponsor_id = User.current.id
+    check_sponsorship = Sponsorship.where('sponsor_id=? AND developer_id=?', sponsor_id, params[:developer_id])
+
+    @sponsorship = Sponsorship.new(sponsorship_params.merge({sponsor_id: sponsor_id}))
+
+    unless check_sponsorship.length.zero?
+      return render json: {status: -1, message: '您已经赞助了TA' }
+    end
+    if @sponsorship.pay && @sponsorship.save
+      if params[:single] && @sponsorship.stop
+        return render json: { status: 1, message: '赞助成功' }
+      elsif !params[:single]
+        User.current.update(sponsor_num: User.current.sponsor_num+1)
+        @sponsorship.developer.update(sponsored_num: @sponsorship.developer.sponsored_num + 1)
+        return render json: { status: 1, message: '赞助成功' }
+      else
+        return render json: { status: -1, message: '赞助失败' }
+      end
+    else
+      return render json: { status: -1, message: '赞助失败' }
+    end
+    # return render_result message: '赞助成功' if @sponsorship.save
+    # respond_to do |format|
+    #   if check_sponsorship.length.zero? && @sponsorship.save
+    #     format.html { redirect_to @sponsorship, notice: 'Sponsorship was successfully created.' }
+    #     format.json { render :show, status: :created, location: @sponsorship }
+    #     # render_result status=0, message="赞助成功"
+    #   else
+    #     format.html { render :new }
+    #     format.json { render json: @sponsorship.errors, status: :unprocessable_entity }
+    #   end
+    # end
+  end
+
+  # PATCH/PUT /sponsorships/1
+  # PATCH/PUT /sponsorships/1.json
+  def update
+    # respond_to do |format|
+    #   if @sponsorship.update(sponsorship_params)
+    #     format.html { redirect_to @sponsorship, notice: 'Sponsorship was successfully updated.' }
+    #     format.json { render :show, status: :ok, location: @sponsorship }
+    #   else
+    #     format.html { render :edit }
+    #     format.json { render json: @sponsorship.errors, status: :unprocessable_entity }
+    #   end
+    # end
+
+    if @sponsorship.sponsor.id != current_user.id
+      return render json: {status: 401, message: '没有权限' }
+    end
+    old_value = old_value_to_hash(@sponsorship, params)
+
+    if @sponsorship.update(sponsorship_params)
+      user_trace_update_log(old_value)
+      render json: {status: 1, message: '修改成功' }
+    else
+      render json: {status: -1, message: '修改失败' }
+    end
+  end
+
+  # DELETE /sponsorships/1
+  # DELETE /sponsorships/1.json
+  def destroy
+    # @sponsorship.destroy
+    # respond_to do |format|
+    #   format.html { redirect_to sponsorships_url, notice: 'Sponsorship was successfully destroyed.' }
+    #   format.json { head :no_content }
+    # end
+    developer = @sponsorship.developer
+    sponsor = @sponsorship.sponsor
+    if (User.current.id == developer.id || User.current.id == sponsor.id) && developer.update(sponsored_num: developer.sponsored_num-1) && sponsor.update(sponsor_num: sponsor.sponsor_num-1) && @sponsorship.stop
+      render json: {status: 1, message: '终止成功'}
+    else
+      render json: {status: -1, message: '失败'}
+    end
+  end
+
+  def community_data
+    @sponsorships = Sponsorship.all
+    t1 = Time.now
+    t2 = Time.new(t1.year, t1.month, t1.day - 6)
+    @stopped_sponsorships = StoppedSponsorship.where('created_at >= ?', t2)
+    @community_data_array = to_array(@sponsorships, @stopped_sponsorships)
+  end
+
+  private
+
+  # Use callbacks to share common setup or constraints between actions.
+  def set_sponsorship
+    @sponsorship = Sponsorship.find(params[:id])
+  end
+
+  # Only allow a list of trusted parameters through.
+  def sponsorship_params
+    params.require(:sponsorship).permit(:amount, :visible, :sponsor_id, :developer_id, :single, :page, :limit, :sort_by, :search)
+  end
+
+  def to_array(sponsorships, stopped_sponsorships)
+    t1 = Time.now
+    start_time = Time.new(t1.year, t1.month, t1.day - 6)
+
+    sponsor = Array.new(7)
+    sponsored = Array.new(7)
+    date = Array.new(7)
+    # date[0] = Time.new(start_time.year, start_time.month, start_time.day)
+    index = 0
+
+    (0..6).each do |i|
+      # 更新日期，date[i]表示第i天0点
+      date[i] = Time.new(start_time.year, start_time.month, start_time.day + i)
+      end_time = Time.new(start_time.year, start_time.month, start_time.day + i+1)
+
+      sponsor_set = Set.new
+      sponsored_set = Set.new
+
+      # 所有创建时间早于今天23:59的sponsorship
+      today_sponsor = sponsorships.where('created_at < ?', end_time)
+      # 所有结束时间晚于今天0:00的stopped_sponsorship
+      today_stopped_sponsor = stopped_sponsorships.where('created_at <= ?', date[i])
+      today_sponsor.each do |s|
+        sponsor_set.add s.sponsor_id
+        sponsored_set.add s.developer_id
+      end
+
+      today_stopped_sponsor.each do |s|
+        sponsor_set.add s.sponsor_id
+        sponsored_set.add s.developer_id
+      end
+
+      sponsor[i] = sponsor_set.size
+      sponsored[i] = sponsored_set.size
+
+    end
+
+    Array[sponsor, sponsored, date]
+  end
+end

app/controllers/users_controller.rb

@@ -99,6 +99,10 @@ class UsersController < ApplicationController
       end
       # TODO 等消息上线再打开注释
       #@tidding_count = unviewed_tiddings(current_user) if current_user.present?
+      #
+      if(@user.logged?)
+        @user.daily_reward
+      end
     rescue Exception => e
       uid_logger_error(e.message)
       missing_template
@@ -260,6 +264,21 @@ class UsersController < ApplicationController
     render_ok
   end
 
+  def update_sponsor_description
+    @user = User.find params[:id]
+    if @user.id == User.current.id
+      # @user.update(description: params[:description])
+      @user.sponsor_description = params[:sponsor_description]
+      if @user.save!
+        render_ok
+      else
+        render_error
+      end
+    else
+      render_error
+    end
+  end
+
   def sync_user_info
     user = User.find_by_login params[:login]
     return render_forbidden unless user === current_user
@@ -273,7 +292,7 @@ class UsersController < ApplicationController
 
     interactor = Gitea::User::UpdateInteractor.call(user.login, sync_params)
     if interactor.success?
-      user.update!(password: params[:password], mail: params[:email], status: User::STATUS_EDIT_INFO)
+      user.update!(password: params[:password], mail: params[:email], status: User::STATUS_ACTIVE)
       render_ok
     else
       render_error(interactor.error)
@@ -291,7 +310,7 @@ class UsersController < ApplicationController
                                   :gender, :location, :location_city,
                                   :occupation, :technical_title,
                                   :school_id, :department_id, :province, :city,
-                                  :custom_department, :identity, :student_id, :description,
+                                  :custom_department, :identity, :student_id, :description, :sponsor_description,
                                   :show_email, :show_location, :show_department]
                                 )
   end

app/controllers/version_releases_controller.rb

@@ -3,6 +3,7 @@ class VersionReleasesController < ApplicationController
   before_action :set_user
   before_action :require_login, except: [:index]
   before_action :find_version , only: [:edit, :update, :destroy]
+  skip_after_action :user_trace_log, only: [:update]
 
   def index
     version_releases = Gitea::Versions::ListService.new(@user.gitea_token, @user.try(:login), @repository.try(:identifier)).call
@@ -78,14 +79,14 @@ class VersionReleasesController < ApplicationController
       ActiveRecord::Base.transaction do
         begin
           version_params = releases_params
-
+          old_value = old_value_to_hash(@version, version_params)
           if @version.update_attributes!(version_params)
             create_attachments(params[:attachment_ids], @version) if params[:attachment_ids].present?
             git_version_release = Gitea::Versions::UpdateService.new(@user.gitea_token, @user.try(:login), @repository.try(:identifier), version_params, @version.try(:version_gid)).call
             unless git_version_release
               raise Error, "更新失败"
             end
-
+            user_trace_update_log(old_value)
             normal_status(0, "更新成功")
           else
             normal_status(-1, "更新失败")

app/controllers/wallets_controller.rb

@@ -0,0 +1,113 @@
+class WalletsController < ApplicationController
+  before_action :require_login, except: :community_data
+
+  def balance
+    user = User.find_by_id(params[:id])
+    @wallet = user.get_wallet
+  end
+
+  def coin_changes
+    user = User.find_by_id(params[:id])
+    @wallet = user.get_wallet
+    if params[:category] == 'all'
+      scope = CoinChange.where('to_wallet_id = ? OR from_wallet_id = ?', @wallet.id, @wallet.id)
+    elsif params[:category] == 'income'
+      # @coin_changes = CoinChange.where('to_wallet_id = ?', @wallet.id).limit(100)
+      scope = @wallet.income
+    elsif params[:category] == 'outcome'
+      scope = @wallet.outcome
+    end
+
+    sort = params[:sort_by] || "created_at"
+    sort_direction = params[:sort_direction] || "desc"
+    scope = scope.reorder("#{sort} #{sort_direction}") unless scope.nil?
+
+    @total = 0
+    @total = scope.length unless scope.nil?
+    @coin_changes = kaminari_paginate(scope) unless scope.nil?
+  end
+
+  def balance_chart
+    user = User.find_by_id(params[:id])
+    @wallet = user.get_wallet
+    scope = CoinChange.where('to_wallet_id = ? OR from_wallet_id = ?', @wallet.id, @wallet.id)
+    t1 = Time.now
+    t2 = Time.new(t1.year, t1.month, t1.day - 6)
+    @balance_chart_data = scope.where('created_at > ? AND created_at < ?', t2, t1)
+    @balance_chart_array = to_array(@balance_chart_data, @wallet.id)
+  end
+
+  def community_data
+    t1 = Time.now
+    t2 = Time.new(t1.year, t1.month, t1.day - 6)
+    coin_changes = CoinChange.where('created_at >= ?', t2)
+    @community_data_array = community_data_to_array(coin_changes)
+  end
+
+  private
+  def to_array(data, id)
+    t1 = Time.now
+    start_time = Time.new(t1.year, t1.month, t1.day - 6)
+    end_time = Time.new(start_time.year, start_time.month, start_time.day + 1)
+
+    income = Array.new(7, 0) # 收入、支出
+    outcome = Array.new(7, 0)
+    date = Array.new(7)
+    date[0] = Time.new(start_time.year, start_time.month, start_time.day)
+    index = 0
+
+    data.each do |i|
+      # 更新日期
+      until (i.created_at >= start_time) && (i.created_at < end_time)
+        index += 1
+        start_time = end_time
+        end_time = Time.new(start_time.year, start_time.month, start_time.day + 1)
+        date[index] = Time.new(start_time.year, start_time.month, start_time.day)
+      end
+
+      if i.from_wallet_id == id
+        outcome[index] += i.amount
+      else
+        next if params[:sponsor] == true && i.from_wallet_id.nil?
+        income[index] += i.amount
+      end
+
+    end
+
+    until end_time >= Time.now
+      index += 1
+      start_time = end_time
+      end_time = Time.new(start_time.year, start_time.month, start_time.day + 1)
+      date[index] = Time.new(start_time.year, start_time.month, start_time.day)
+    end
+
+    Array[income, outcome, date]
+  end
+
+  def community_data_to_array(coin_changes)
+    t1 = Time.now
+    start_time = Time.new(t1.year, t1.month, t1.day - 6)
+
+    nums = Array.new(7, 0)
+    date = Array.new(7)
+    end_time = Array.new(7)
+    # date[0] = Time.new(start_time.year, start_time.month, start_time.day)
+    index = 0
+
+    (0..6).each do |i|
+      # 更新日期，date[i]表示第i天0点
+      date[i] = Time.new(start_time.year, start_time.month, start_time.day + i)
+      end_time[i] = Time.new(start_time.year, start_time.month, start_time.day + i+1)
+    end
+
+    coin_changes.each do |cc|
+      (0..6).each do |i|
+        if !cc.from_wallet_id.nil? && cc.created_at>=date[i] && cc.created_at<end_time[i]
+          nums[i] += 1
+        end
+      end
+    end
+
+    Array[nums, date]
+  end
+end

app/helpers/log_helper.rb

@@ -0,0 +1,2 @@
+module LogHelper
+end

app/helpers/sponsor_tiers_helper.rb

@@ -0,0 +1,2 @@
+module SponsorTiersHelper
+end

app/helpers/sponsorships_helper.rb

@@ -0,0 +1,2 @@
+module SponsorshipsHelper
+end

app/helpers/update_helper.rb

@@ -0,0 +1,6 @@
+module UpdateHelper
+  def old_value_to_hash(old_value, params)
+    params = params.dup.stringify_keys
+    old_value.attributes.select { |key, value| params.key?(key) }
+  end
+end

app/helpers/wallets_helper.rb

@@ -0,0 +1,2 @@
+module WalletsHelper
+end

app/jobs/monthly_payment_worker.rb

@@ -0,0 +1,15 @@
+class MonthlyPaymentWorker
+  include Sidekiq::Worker
+  include Sidetiq::Schedulable
+
+  recurrence do
+    minutely(2)
+    # monthly.day_of_month(12) #每月的12号0点执行
+    # monthly.day_of_month(23).hour_of_day(20)      #每月的12号1点执行
+  end
+
+  def perform(*args)
+    Sponsorship.monthly_payment
+    puts Time.now, 'sponsor payment done'
+  end
+end

app/libs/educoder_oauth.rb

@@ -0,0 +1,18 @@
+module EducoderOauth
+  class << self
+    attr_accessor :client_id, :client_secret, :base_url, :redirect_uri
+
+    def logger
+      @_logger ||= STDOUT
+    end
+
+    def logger=(l)
+      @_logger = l
+    end
+
+    def oauth_url
+      "#{base_url}/oauth2?call_url=/oauth/authorize?client_id=#{client_id}&redirect_uri=#{URI.encode_www_form_component(redirect_uri)}&response_type=code"
+    end
+    
+  end
+end

app/libs/educoder_oauth/service.rb

@@ -0,0 +1,37 @@
+require 'oauth2'
+
+module EducoderOauth::Service
+  module_function
+
+  def request(method, url, params)
+    begin 
+      Rails.logger.info("[EducoderOauth] [#{method.to_s.upcase}] #{url} || #{params}")
+
+      client = Faraday.new(url: EducoderOauth.base_url)
+      response = client.public_send(method, url, params)
+      result = JSON.parse(response.body)
+
+      Rails.logger.info("[EducoderOauth] [#{response.status}] #{result}")
+
+      result
+    rescue Exception => e
+      raise Educoder::TipException.new(e.message)
+    end
+  end
+
+  def access_token(code)
+    begin
+      Rails.logger.info("[EducoderOauth] [code] #{code} ")
+      Rails.logger.info("[EducoderOauth] [redirect_uri] #{EducoderOauth.redirect_uri} ")
+      client = OAuth2::Client.new(EducoderOauth.client_id, EducoderOauth.client_secret, site: EducoderOauth.base_url)
+      result = client.auth_code.get_token(code, redirect_uri: EducoderOauth.redirect_uri).to_hash
+      return result
+    rescue Exception => e
+      raise Educoder::TipException.new(e.message)
+    end
+  end
+
+  def user_info(access_token)
+    request(:get, '/api/users/info.json', {access_token: access_token})
+  end
+end

app/models/attachment.rb

@@ -17,7 +17,7 @@
 #  disk_directory            :string(255)
 #  attachtype                :integer          default("1")
 #  is_public                 :integer          default("1")
-#  copy_from                 :string(255)
+#  copy_from                 :integer
 #  quotes                    :integer          default("0")
 #  is_publish                :integer          default("1")
 #  publish_time              :datetime
@@ -26,15 +26,15 @@
 #  cloud_url                 :string(255)      default("")
 #  course_second_category_id :integer          default("0")
 #  delay_publish             :boolean          default("0")
-#  link                      :string(255)
-#  clone_id                  :integer
 #
 # Indexes
 #
 #  index_attachments_on_author_id                        (author_id)
-#  index_attachments_on_clone_id                         (clone_id)
 #  index_attachments_on_container_id_and_container_type  (container_id,container_type)
+#  index_attachments_on_course_second_category_id        (course_second_category_id)
 #  index_attachments_on_created_on                       (created_on)
+#  index_attachments_on_is_public                        (is_public)
+#  index_attachments_on_quotes                           (quotes)
 #
 
 

app/models/ci/user.rb

@@ -39,15 +39,18 @@
 #  business                   :boolean          default("0")
 #  profile_completed          :boolean          default("0")
 #  laboratory_id              :integer
-#  is_shixun_marker           :boolean          default("0")
-#  admin_visitable            :boolean          default("0")
-#  collaborator               :boolean          default("0")
+#  platform                   :string(255)      default("0")
+#  gitea_token                :string(255)
 #  gitea_uid                  :integer
+#  is_shixun_marker           :boolean          default("0")
 #  is_sync_pwd                :boolean          default("1")
 #  watchers_count             :integer          default("0")
+#  sponsor_certification      :integer          default("0")
+#  sponsor_num                :integer          default("0")
+#  sponsored_num              :integer          default("0")
+#  sponsor_description        :text(65535)
 #  devops_step                :integer          default("0")
-#  gitea_token                :string(255)
-#  platform                   :string(255)
+#  award_time                 :datetime
 #
 # Indexes
 #
@@ -55,9 +58,8 @@
 #  index_users_on_homepage_engineer  (homepage_engineer)
 #  index_users_on_homepage_teacher   (homepage_teacher)
 #  index_users_on_laboratory_id      (laboratory_id)
-#  index_users_on_login              (login) UNIQUE
-#  index_users_on_mail               (mail) UNIQUE
-#  index_users_on_phone              (phone) UNIQUE
+#  index_users_on_login              (login)
+#  index_users_on_mail               (mail)
 #  index_users_on_type               (type)
 #
 

app/models/coin_change.rb

@@ -0,0 +1,19 @@
+# == Schema Information
+#
+# Table name: coin_changes
+#
+#  id             :integer          not null, primary key
+#  amount         :integer
+#  description    :string(255)
+#  reason         :string(255)
+#  to_wallet_id   :integer
+#  from_wallet_id :integer
+#  created_at     :datetime         not null
+#  updated_at     :datetime         not null
+#
+
+class CoinChange < ApplicationRecord
+  belongs_to :to_wallet, class_name: 'Wallet'
+  belongs_to :from_wallet, class_name: 'Wallet', optional: true
+  validates :amount, presence: true
+end

app/models/edu_setting.rb

@@ -1,18 +1,19 @@
-# == Schema Information
-#
-# Table name: edu_settings
-#
-#  id          :integer          not null, primary key
-#  name        :string(255)
-#  value       :string(255)
-#  created_at  :datetime         not null
-#  updated_at  :datetime         not null
-#  description :string(255)
-#
-# Indexes
-#
-#  index_edu_settings_on_name  (name) UNIQUE
-#
+# == Schema Information
+#
+# Table name: edu_settings
+#
+#  id          :integer          not null, primary key
+#  name        :string(255)
+#  value       :string(255)
+#  created_at  :datetime         not null
+#  updated_at  :datetime         not null
+#  description :string(255)
+#
+# Indexes
+#
+#  index_edu_settings_on_name  (name) UNIQUE
+#
+
 
 class EduSetting < ApplicationRecord
   after_commit :expire_value_cache

app/models/gitea/public_key.rb

@@ -1,3 +1,24 @@
+# == Schema Information
+#
+# Table name: public_key
+#
+#  id              :integer          not null, primary key
+#  owner_id        :integer          not null
+#  name            :string(255)      not null
+#  fingerprint     :string(255)      not null
+#  content         :text(65535)      not null
+#  mode            :integer          default("2"), not null
+#  type            :integer          default("1"), not null
+#  login_source_id :integer          default("0"), not null
+#  created_unix    :integer
+#  updated_unix    :integer
+#
+# Indexes
+#
+#  IDX_public_key_fingerprint  (fingerprint)
+#  IDX_public_key_owner_id     (owner_id)
+#
+
 class Gitea::PublicKey < Gitea::Base
   self.inheritance_column = nil # FIX  The single-table inheritance mechanism failed
   # establish_connection :gitea_db

app/models/gitea/webhook.rb

@@ -1,3 +1,34 @@
+# == Schema Information
+#
+# Table name: webhook
+#
+#  id                :integer          not null, primary key
+#  repo_id           :integer
+#  org_id            :integer
+#  url               :text(65535)
+#  signature         :text(65535)
+#  http_method       :string(255)
+#  content_type      :integer
+#  secret            :text(65535)
+#  events            :text(65535)
+#  is_ssl            :boolean
+#  is_active         :boolean
+#  hook_task_type    :integer
+#  meta              :text(65535)
+#  last_status       :integer
+#  created_unix      :integer
+#  updated_unix      :integer
+#  is_system_webhook :boolean          default("0"), not null
+#
+# Indexes
+#
+#  IDX_webhook_created_unix  (created_unix)
+#  IDX_webhook_is_active     (is_active)
+#  IDX_webhook_org_id        (org_id)
+#  IDX_webhook_repo_id       (repo_id)
+#  IDX_webhook_updated_unix  (updated_unix)
+#
+
 class Gitea::Webhook < Gitea::Base 
   serialize :events, JSON
   self.inheritance_column = nil
@@ -10,4 +41,4 @@ class Gitea::Webhook < Gitea::Base
   enum hook_task_type: {gogs: 1, slack: 2, gitea: 3, discord: 4, dingtalk: 5, telegram: 6, msteams: 7, feishu: 8, matrix: 9}
   enum last_status: {waiting: 0, succeed: 1, fail: 2}
   enum content_type: {json: 1, form: 2}
-end
+end

app/models/gitea/webhook_task.rb

@@ -1,3 +1,30 @@
+# == Schema Information
+#
+# Table name: hook_task
+#
+#  id               :integer          not null, primary key
+#  repo_id          :integer
+#  hook_id          :integer
+#  uuid             :string(255)
+#  type             :integer
+#  url              :text(65535)
+#  signature        :text(65535)
+#  payload_content  :text(65535)
+#  http_method      :string(255)
+#  content_type     :integer
+#  event_type       :string(255)
+#  is_ssl           :boolean
+#  is_delivered     :boolean
+#  delivered        :integer
+#  is_succeed       :boolean
+#  request_content  :text(65535)
+#  response_content :text(65535)
+#
+# Indexes
+#
+#  IDX_hook_task_repo_id  (repo_id)
+#
+
 class Gitea::WebhookTask < Gitea::Base 
   serialize :payload_content, JSON
   serialize :request_content, JSON
@@ -10,4 +37,4 @@ class Gitea::WebhookTask < Gitea::Base
   belongs_to :webhook, class_name: "Gitea::Webhook", foreign_key: :hook_id
 
   enum type: {gogs: 1, slack: 2, gitea: 3, discord: 4, dingtalk: 5, telegram: 6, msteams: 7, feishu: 8, matrix: 9}
-end
+end

app/models/laboratory.rb

@@ -10,7 +10,6 @@
 #  sync_course  :boolean          default("0")
 #  sync_subject :boolean          default("0")
 #  sync_shixun  :boolean          default("0")
-#  is_local     :boolean          default("0")
 #
 # Indexes
 #

app/models/message_template/pull_request_atme.rb

@@ -2,12 +2,13 @@
 #
 # Table name: message_templates
 #
-#  id         :integer          not null, primary key
-#  type       :string(255)
-#  sys_notice :text(65535)
-#  email      :text(65535)
-#  created_at :datetime         not null
-#  updated_at :datetime         not null
+#  id               :integer          not null, primary key
+#  type             :string(255)
+#  sys_notice       :text(65535)
+#  email            :text(65535)
+#  created_at       :datetime         not null
+#  updated_at       :datetime         not null
+#  notification_url :string(255)
 #
 
 # 在合并请求中@我
@@ -24,4 +25,4 @@ class MessageTemplate::PullRequestAtme < MessageTemplate
     Rails.logger.info("MessageTemplate::PullRequestAtme.get_message_content [ERROR] #{e}")
     return '', '', ''
   end
-end
+end

app/models/organization.rb

@@ -39,15 +39,18 @@
 #  business                   :boolean          default("0")
 #  profile_completed          :boolean          default("0")
 #  laboratory_id              :integer
-#  is_shixun_marker           :boolean          default("0")
-#  admin_visitable            :boolean          default("0")
-#  collaborator               :boolean          default("0")
+#  platform                   :string(255)      default("0")
+#  gitea_token                :string(255)
 #  gitea_uid                  :integer
+#  is_shixun_marker           :boolean          default("0")
 #  is_sync_pwd                :boolean          default("1")
 #  watchers_count             :integer          default("0")
+#  sponsor_certification      :integer          default("0")
+#  sponsor_num                :integer          default("0")
+#  sponsored_num              :integer          default("0")
+#  sponsor_description        :text(65535)
 #  devops_step                :integer          default("0")
-#  gitea_token                :string(255)
-#  platform                   :string(255)
+#  award_time                 :datetime
 #
 # Indexes
 #
@@ -55,9 +58,8 @@
 #  index_users_on_homepage_engineer  (homepage_engineer)
 #  index_users_on_homepage_teacher   (homepage_teacher)
 #  index_users_on_laboratory_id      (laboratory_id)
-#  index_users_on_login              (login) UNIQUE
-#  index_users_on_mail               (mail) UNIQUE
-#  index_users_on_phone              (phone) UNIQUE
+#  index_users_on_login              (login)
+#  index_users_on_mail               (mail)
 #  index_users_on_type               (type)
 #
 

app/models/passed_waitlist.rb

@@ -0,0 +1,16 @@
+# == Schema Information
+#
+# Table name: passed_waitlists
+#
+#  id           :integer          not null, primary key
+#  applicant_id :string(255)
+#  integer      :string(255)
+#  reviewer_id  :string(255)
+#  created_at   :datetime         not null
+#  updated_at   :datetime         not null
+#
+
+class PassedWaitlist < ApplicationRecord
+  belongs_to :applicant, class_name: 'User'
+  belongs_to :reviewer, class_name: 'User'
+end

app/models/project.rb

@@ -1,81 +1,80 @@
-
-# == Schema Information
-#
-# Table name: projects
-#
-#  id                     :integer          not null, primary key
-#  name                   :string(255)      default(""), not null
-#  description            :text(4294967295)
-#  homepage               :string(255)      default("")
-#  is_public              :boolean          default("1"), not null
-#  parent_id              :integer
-#  created_on             :datetime
-#  updated_on             :datetime
-#  identifier             :string(255)
-#  status                 :integer          default("1"), not null
-#  lft                    :integer
-#  rgt                    :integer
-#  inherit_members        :boolean          default("0"), not null
-#  project_type           :integer          default("0")
-#  hidden_repo            :boolean          default("0"), not null
-#  attachmenttype         :integer          default("1")
-#  user_id                :integer
-#  dts_test               :integer          default("0")
-#  enterprise_name        :string(255)
-#  organization_id        :integer
-#  project_new_type       :integer
-#  gpid                   :integer
-#  forked_from_project_id :integer
-#  forked_count           :integer          default("0")
-#  publish_resource       :integer          default("0")
-#  visits                 :integer          default("0")
-#  hot                    :integer          default("0")
-#  invite_code            :string(255)
-#  qrcode                 :string(255)
-#  qrcode_expiretime      :integer          default("0")
-#  script                 :text(65535)
-#  training_status        :integer          default("0")
-#  rep_identifier         :string(255)
-#  project_category_id    :integer
-#  project_language_id    :integer
-#  license_id             :integer
-#  ignore_id              :integer
-#  praises_count          :integer          default("0")
-#  watchers_count         :integer          default("0")
-#  issues_count           :integer          default("0")
-#  pull_requests_count    :integer          default("0")
-#  language               :string(255)
-#  versions_count         :integer          default("0")
-#  issue_tags_count       :integer          default("0")
-#  closed_issues_count    :integer          default("0")
-#  open_devops            :boolean          default("0")
-#  gitea_webhook_id       :integer
-#  open_devops_count      :integer          default("0")
-#  recommend              :boolean          default("0")
-#  platform               :integer          default("0")
-#  default_branch         :string(255)      default("master")
-#  website                :string(255)
-#  order_index            :integer          default("0")
-#  lesson_url             :string(255)
-#
-# Indexes
-#
-#  index_projects_on_forked_from_project_id  (forked_from_project_id)
-#  index_projects_on_identifier              (identifier)
-#  index_projects_on_invite_code             (invite_code)
-#  index_projects_on_is_public               (is_public)
-#  index_projects_on_lft                     (lft)
-#  index_projects_on_license_id              (license_id)
-#  index_projects_on_name                    (name)
-#  index_projects_on_platform                (platform)
-#  index_projects_on_project_category_id     (project_category_id)
-#  index_projects_on_project_language_id     (project_language_id)
-#  index_projects_on_project_type            (project_type)
-#  index_projects_on_recommend               (recommend)
-#  index_projects_on_rgt                     (rgt)
-#  index_projects_on_status                  (status)
-#  index_projects_on_updated_on              (updated_on)
-#
+# == Schema Information
+#
+# Table name: projects
+#
+#  id                     :integer          not null, primary key
+#  name                   :string(255)      default(""), not null
+#  description            :text(4294967295)
+#  homepage               :string(255)      default("")
+#  is_public              :boolean          default("1"), not null
+#  parent_id              :integer
+#  created_on             :datetime
+#  updated_on             :datetime
+#  identifier             :string(255)
+#  status                 :integer          default("1"), not null
+#  lft                    :integer
+#  rgt                    :integer
+#  inherit_members        :boolean          default("0"), not null
+#  project_type           :integer          default("0")
+#  hidden_repo            :boolean          default("0"), not null
+#  attachmenttype         :integer          default("1")
+#  user_id                :integer
+#  dts_test               :integer          default("0")
+#  enterprise_name        :string(255)
+#  organization_id        :integer
+#  project_new_type       :integer
+#  gpid                   :integer
+#  forked_from_project_id :integer
+#  forked_count           :integer          default("0")
+#  publish_resource       :integer          default("0")
+#  visits                 :integer          default("0")
+#  hot                    :integer          default("0")
+#  invite_code            :string(255)
+#  qrcode                 :string(255)
+#  qrcode_expiretime      :integer          default("0")
+#  script                 :text(65535)
+#  training_status        :integer          default("0")
+#  rep_identifier         :string(255)
+#  project_category_id    :integer
+#  project_language_id    :integer
+#  license_id             :integer
+#  ignore_id              :integer
+#  praises_count          :integer          default("0")
+#  watchers_count         :integer          default("0")
+#  issues_count           :integer          default("0")
+#  pull_requests_count    :integer          default("0")
+#  language               :string(255)
+#  versions_count         :integer          default("0")
+#  issue_tags_count       :integer          default("0")
+#  closed_issues_count    :integer          default("0")
+#  open_devops            :boolean          default("0")
+#  gitea_webhook_id       :integer
+#  open_devops_count      :integer          default("0")
+#  recommend              :boolean          default("0")
+#  platform               :integer          default("0")
+#  default_branch         :string(255)      default("master")
+#  website                :string(255)
+#  lesson_url             :string(255)
+#
+# Indexes
+#
+#  index_projects_on_forked_from_project_id  (forked_from_project_id)
+#  index_projects_on_identifier              (identifier)
+#  index_projects_on_invite_code             (invite_code)
+#  index_projects_on_is_public               (is_public)
+#  index_projects_on_lft                     (lft)
+#  index_projects_on_license_id              (license_id)
+#  index_projects_on_name                    (name)
+#  index_projects_on_platform                (platform)
+#  index_projects_on_project_category_id     (project_category_id)
+#  index_projects_on_project_language_id     (project_language_id)
+#  index_projects_on_project_type            (project_type)
+#  index_projects_on_recommend               (recommend)
+#  index_projects_on_rgt                     (rgt)
+#  index_projects_on_status                  (status)
+#  index_projects_on_updated_on              (updated_on)
+#
+
 
 
 

app/models/project_category.rb

@@ -8,6 +8,11 @@
 #  projects_count :integer          default("0")
 #  created_at     :datetime         not null
 #  updated_at     :datetime         not null
+#  ancestry       :string(255)
+#
+# Indexes
+#
+#  index_project_categories_on_ancestry  (ancestry)
 #
 
 class ProjectCategory < ApplicationRecord

app/models/pull_request.rb

@@ -3,8 +3,8 @@
 # Table name: pull_requests
 #
 #  id              :integer          not null, primary key
-#  pull_request_id :integer
-#  gpid            :integer
+#  gitea_id        :integer
+#  gitea_number    :integer
 #  user_id         :integer
 #  created_at      :datetime         not null
 #  updated_at      :datetime         not null

app/models/repository.rb

@@ -27,6 +27,7 @@
 #
 # Indexes
 #
+#  index_repositories_on_identifier  (identifier)
 #  index_repositories_on_project_id  (project_id)
 #  index_repositories_on_user_id     (user_id)
 #

app/models/site.rb

@@ -61,7 +61,7 @@ class Site < ApplicationRecord
       commons = [
         {name: '通知', key: 'notice', url: '/users/current_user/user_messages'},
         {name: '找回密码', key: 'lost_password', url: '/account/lost_password'},
-        {name: '注册', key: 'register', url: '/login?login=false'}
+        {name: '注册', key: 'register', url: '/register'}
       ]
 
       commons.each { |ele|

app/models/sponsor_tier.rb

@@ -0,0 +1,16 @@
+# == Schema Information
+#
+# Table name: sponsor_tiers
+#
+#  id          :integer          not null, primary key
+#  tier        :integer
+#  created_at  :datetime         not null
+#  updated_at  :datetime         not null
+#  description :string(255)      default("")
+#  user_id     :integer
+#
+
+class SponsorTier < ApplicationRecord
+  belongs_to :user
+
+end

app/models/sponsorship.rb

@@ -0,0 +1,49 @@
+# == Schema Information
+#
+# Table name: sponsorships
+#
+#  id           :integer          not null, primary key
+#  amount       :integer
+#  visible      :integer
+#  sponsor_id   :integer
+#  developer_id :integer
+#  created_at   :datetime         not null
+#  updated_at   :datetime         not null
+#  accumulate   :integer          default("0")
+#
+
+class Sponsorship < ApplicationRecord
+  belongs_to :sponsor, class_name: 'User'
+  belongs_to :developer, class_name: 'User'
+  validates :amount, presence: true
+
+  def stop
+    stopped_sponsorship = StoppedSponsorship.new(developer_id: developer_id, sponsor_id: sponsor_id, start_time: created_at, amount: amount, visible: visible, accumulate: accumulate)
+    stopped_sponsorship.save && destroy
+  end
+
+  def pay
+    sponsor_wallet = sponsor.get_wallet
+    developer_wallet = developer.get_wallet
+
+    success = false
+    Wallet.transaction do
+      success = sponsor_wallet.pay(amount)
+      if success
+        developer_wallet.receive(amount)
+        update(accumulate: self.accumulate += amount)
+        reason = "#{sponsor.full_name}向#{developer.full_name}的赞助支付。"
+        coinchange = CoinChange.new(amount: amount, reason: reason, to_wallet_id: developer_wallet.id, from_wallet_id: sponsor_wallet.id)
+        return true if coinchange.save
+      end
+    end
+    success
+  end
+
+  def self.monthly_payment
+    sponsorships = Sponsorship.all
+    sponsorships.each do |s|
+      s.stop unless s.pay
+    end
+  end
+end

app/models/statistic.rb

@@ -0,0 +1,24 @@
+# == Schema Information
+#
+# Table name: statistics
+#
+#  id         :integer          not null, primary key
+#  dau        :integer
+#  created_at :datetime         not null
+#  updated_at :datetime         not null
+#
+
+class Statistic < ApplicationRecord
+  def self.record
+    users = User.all
+    count = 0
+    t = Time.now - 1.day
+    # t = Time.now.at_beginning_of_day
+    users.each do |u|
+      if !u.last_login_on.nil? && u.last_login_on >= t
+        count += 1
+      end
+    end
+    Statistic.create(dau: count)
+  end
+end

app/models/stopped_sponsorship.rb

@@ -0,0 +1,20 @@
+# == Schema Information
+#
+# Table name: stopped_sponsorships
+#
+#  id           :integer          not null, primary key
+#  amount       :integer
+#  sponsor_id   :integer
+#  developer_id :integer
+#  created_at   :datetime         not null
+#  updated_at   :datetime         not null
+#  start_time   :datetime
+#  visible      :integer
+#  accumulate   :integer          default("0")
+#
+
+class StoppedSponsorship < ApplicationRecord
+  belongs_to :sponsor, class_name: 'User'
+  belongs_to :developer, class_name: 'User'
+  validates :amount, presence: true
+end

app/models/token.rb

@@ -14,6 +14,7 @@
 #  tokens_value             (value) UNIQUE
 #
 
+
 #
 # This program is free software; you can redistribute it and/or
 # modify it under the terms of the GNU General Public License
@@ -76,7 +77,7 @@ class Token < ActiveRecord::Base
   # Returns the active user who owns the key for the given action
   def self.find_active_user(action, key, validity_days=nil)
     user = find_user(action, key, validity_days)
-    if user && user.active?
+    if user && (user.active? || user.need_edit_info?)
       user
     end
   end

app/models/user.rb

@@ -39,15 +39,18 @@
 #  business                   :boolean          default("0")
 #  profile_completed          :boolean          default("0")
 #  laboratory_id              :integer
-#  is_shixun_marker           :boolean          default("0")
-#  admin_visitable            :boolean          default("0")
-#  collaborator               :boolean          default("0")
+#  platform                   :string(255)      default("0")
+#  gitea_token                :string(255)
 #  gitea_uid                  :integer
+#  is_shixun_marker           :boolean          default("0")
 #  is_sync_pwd                :boolean          default("1")
 #  watchers_count             :integer          default("0")
+#  sponsor_certification      :integer          default("0")
+#  sponsor_num                :integer          default("0")
+#  sponsored_num              :integer          default("0")
+#  sponsor_description        :text(65535)
 #  devops_step                :integer          default("0")
-#  gitea_token                :string(255)
-#  platform                   :string(255)
+#  award_time                 :datetime
 #
 # Indexes
 #
@@ -55,9 +58,8 @@
 #  index_users_on_homepage_engineer  (homepage_engineer)
 #  index_users_on_homepage_teacher   (homepage_teacher)
 #  index_users_on_laboratory_id      (laboratory_id)
-#  index_users_on_login              (login) UNIQUE
-#  index_users_on_mail               (mail) UNIQUE
-#  index_users_on_phone              (phone) UNIQUE
+#  index_users_on_login              (login)
+#  index_users_on_mail               (mail)
 #  index_users_on_type               (type)
 #
 
@@ -83,6 +85,7 @@ class User < Owner
   STATUS_ACTIVE     = 1
   STATUS_REGISTERED = 2
   STATUS_LOCKED     = 3
+  STATUS_EDIT_INFO   = 4
 
   # tpi tpm权限控制
   EDU_ADMIN = 1       # 超级管理员
@@ -162,6 +165,18 @@ class User < Owner
   has_many :project_trends, dependent: :destroy
   has_many :oauths , dependent: :destroy
 
+  # sponsor
+  has_many :as_sponsors, class_name: 'Sponsorship', foreign_key: 'sponsor_id', dependent: :destroy
+  has_many :as_sponsored, class_name: 'Sponsorship', foreign_key: 'developer_id', dependent: :destroy
+  has_many :stopped_sponsors, class_name: 'StoppedSponsorship', foreign_key: 'sponsor_id', dependent: :destroy
+  has_many :stopped_sponsored, class_name: 'StoppedSponsorship', foreign_key: 'developer_id', dependent: :destroy
+  has_many :sponsor_tier, dependent: :destroy
+  has_one :wallet, dependent: :destroy
+  has_many :waitlist, class_name: 'Waitlist', foreign_key: 'reviewer_id'
+  has_many :passed_waitlist, class_name: 'PassedWaitlist', foreign_key: 'reviewer_id' #as reviewer
+  has_one :application, class_name: 'Waitlist', foreign_key: 'applicant_id'
+  has_one :passed_application, class_name: 'PassedWaitlist', foreign_key: 'applicant_id'
+
   has_many :organization_users, dependent: :destroy
   has_many :organizations, through: :organization_users
   has_many :pinned_projects, dependent: :destroy
@@ -172,7 +187,7 @@ class User < Owner
   has_many :public_keys, class_name: "Gitea::PublicKey",primary_key: :gitea_uid, foreign_key: :owner_id, dependent: :destroy
 
   # Groups and active users
-  scope :active, lambda { where(status: STATUS_ACTIVE) }
+  scope :active, lambda { where(status: [STATUS_ACTIVE, STATUS_EDIT_INFO]) }
   scope :like, lambda { |keywords|
     sql = "CONCAT(lastname, firstname) LIKE :search OR nickname LIKE :search OR login LIKE :search OR mail LIKE :search OR nickname LIKE :search"
     where(sql, :search => "%#{keywords.split(" ").join('|')}%") unless keywords.blank?
@@ -410,6 +425,10 @@ class User < Owner
     status == STATUS_LOCKED
   end
 
+  def need_edit_info?
+    status == STATUS_EDIT_INFO
+  end
+
   def activate
     self.status = STATUS_ACTIVE
   end
@@ -422,6 +441,10 @@ class User < Owner
     self.status = STATUS_LOCKED
   end
 
+  def need_edit_info 
+    self.status = STATUS_EDIT_INFO
+  end
+
   def activate!
     update_attribute(:status, STATUS_ACTIVE)
   end
@@ -434,6 +457,10 @@ class User < Owner
     update_attribute(:status, STATUS_LOCKED)
   end
 
+  def need_edit_info!
+    update_attribute(:status, STATUS_EDIT_INFO)
+  end
+
   # 课程用户身份
   def course_identity(course)
     if !logged?
@@ -611,6 +638,7 @@ class User < Owner
   # Returns the user who matches the given autologin +key+ or nil
   def self.try_to_autologin(key)
     user = Token.find_active_user('autologin', key)
+    # user.daily_reward if user
     user.update(last_login_on: Time.now) if user
     user
   end
@@ -757,6 +785,36 @@ class User < Owner
     laboratory_id.present? && laboratory_id != 1
   end
 
+  def get_wallet
+    if wallet.nil?
+      Wallet.transaction(isolation: :serializable) do
+        if wallet.nil?
+          create_wallet(balance: 100)
+          reason = "系统初始赠送"
+          CoinChange.create(amount: 100, reason: reason, to_wallet_id: wallet.id)
+        end
+      end
+    end
+    wallet
+  end
+
+  def daily_reward
+    if !Rails.application.config_for(:configuration)["sponsor"]
+      return
+    end
+    t1 = Time.now
+    t2 = Time.new(t1.year, t1.month, t1.day)
+
+    if(award_time.nil? or t2 > award_time)
+      self.update_column(:award_time, Time.now)
+      amount = 2
+      user_wallet = get_wallet
+      user_wallet.receive(amount)
+      reason = "每日登录奖励"
+      CoinChange.create(amount: amount, reason: reason, to_wallet_id: user_wallet.id)
+    end
+  end
+
   def profile_is_completed?
     self.nickname.present? && self.gender.present? && self.mail.present? && self.custom_department.present?
   end

app/models/user_action.rb

@@ -12,9 +12,7 @@
 #
 # Indexes
 #
-#  index_user_actions_on_ip                       (ip)
-#  index_user_actions_on_user_id                  (user_id)
-#  index_user_actions_on_user_id_and_action_type  (user_id,action_type)
+#  index_user_actions_on_ip  (ip)
 #
 
 class UserAction < ApplicationRecord

app/models/user_agent.rb

@@ -10,13 +10,10 @@
 #  updated_at      :datetime         not null
 #  register_status :integer          default("0")
 #  action_status   :integer          default("0")
-#  is_delete       :boolean          default("0")
-#  user_id         :integer
 #
 # Indexes
 #
-#  index_user_agents_on_ip       (ip)
-#  index_user_agents_on_user_id  (user_id)
+#  index_user_agents_on_ip  (ip) UNIQUE
 #
 
 class UserAgent < ApplicationRecord

app/models/user_extension.rb

@@ -22,9 +22,6 @@
 #  school_id          :integer
 #  description        :string(255)      default("")
 #  department_id      :integer
-#  honor              :text(65535)
-#  edu_background     :integer
-#  edu_entry_year     :integer
 #  province           :string(255)
 #  city               :string(255)
 #  custom_department  :string(255)

app/models/waitlist.rb

@@ -0,0 +1,16 @@
+# == Schema Information
+#
+# Table name: waitlists
+#
+#  id           :integer          not null, primary key
+#  applicant_id :string(255)
+#  integer      :string(255)
+#  reviewer_id  :string(255)
+#  created_at   :datetime         not null
+#  updated_at   :datetime         not null
+#
+
+class Waitlist < ApplicationRecord
+  belongs_to :applicant, class_name: 'User'
+  belongs_to :reviewer, class_name: 'User', optional: true
+end

app/models/wallet.rb

@@ -0,0 +1,42 @@
+# == Schema Information
+#
+# Table name: wallets
+#
+#  id         :integer          not null, primary key
+#  balance    :integer
+#  user_id    :integer
+#  created_at :datetime         not null
+#  updated_at :datetime         not null
+#
+
+class Wallet < ApplicationRecord
+  belongs_to :user
+  has_many :outcome, class_name: 'CoinChange', foreign_key: 'from_wallet_id', dependent: :destroy
+  has_many :income, class_name: 'CoinChange', foreign_key: 'to_wallet_id', dependent: :destroy
+  validates :balance, presence: true
+  @@wallet_lock = Mutex.new
+
+  def receive(amount)
+    with_lock do
+      self.balance += amount
+      save!
+    end
+  end
+
+  def pay(amount)
+    with_lock do
+      if self.balance < amount
+        reload
+        return false
+      else
+        self.balance -= amount
+        save!
+      end
+    end
+    true
+  end
+
+  def self.wallet_lock
+    @@wallet_lock
+  end
+end

app/views/log/list.json.jbuilder

@@ -0,0 +1 @@
+json.array! @file_list

app/views/settings/show.json.jbuilder

@@ -56,4 +56,5 @@ json.setting do
   end
 
   json.common @common
+  json.third_party @third_party
 end

app/views/sponsor_tiers/_form.html.erb

@@ -0,0 +1,13 @@
+
+<%= simple_form_for(@sponsor_tier) do |f| %>
+  <%= f.error_notification %>
+  <%= f.error_notification message: f.object.errors[:base].to_sentence if f.object.errors[:base].present? %>
+
+  <div class="form-inputs">
+    <%= f.input :tier %>
+  </div>
+
+  <div class="form-actions">
+    <%= f.button :submit %>
+  </div>
+<% end %>

app/views/sponsor_tiers/_sponsor_tier.json.jbuilder

@@ -0,0 +1,2 @@
+json.extract! sponsor_tier, :id, :tier, :description, :created_at, :updated_at
+json.url sponsor_tier_url(sponsor_tier, format: :json)

app/views/sponsor_tiers/edit.html.erb

@@ -0,0 +1,6 @@
+<h1>Editing Sponsor Tier</h1>
+
+<%= render 'form', sponsor_tier: @sponsor_tier %>
+
+<%= link_to 'Show', @sponsor_tier %> |
+<%= link_to 'Back', sponsor_tiers_path %>

app/views/sponsor_tiers/index.json.jbuilder

@@ -0,0 +1 @@
+json.array! @sponsor_tiers, partial: "sponsor_tiers/sponsor_tier", as: :sponsor_tier

app/views/sponsor_tiers/new.html.erb

@@ -0,0 +1,5 @@
+<h1>New Sponsor Tier</h1>
+
+<%= render 'form', sponsor_tier: @sponsor_tier %>
+
+<%= link_to 'Back', sponsor_tiers_path %>

app/views/sponsor_tiers/show.html.erb

@@ -0,0 +1,9 @@
+<p id="notice"><%= notice %></p>
+
+<p>
+  <strong>Tier:</strong>
+  <%= @sponsor_tier.tier %>
+</p>
+
+<%= link_to 'Edit', edit_sponsor_tier_path(@sponsor_tier) %> |
+<%= link_to 'Back', sponsor_tiers_path %>

app/views/sponsor_tiers/show.json.jbuilder

@@ -0,0 +1,9 @@
+json.tier do
+  json.partial! "sponsor_tiers/sponsor_tier", sponsor_tier: @sponsor_tier
+end
+if @check_sponsorship.nil? || @check_sponsorship.length.zero?
+  json.is_sponsoring false
+else
+  json.is_sponsoring true
+  json.sponsorship_id @check_sponsorship[0].id
+end

app/views/sponsorships/_form.html.erb

@@ -0,0 +1,16 @@
+
+<%= simple_form_for(@sponsorship) do |f| %>
+  <%= f.error_notification %>
+  <%= f.error_notification message: f.object.errors[:base].to_sentence if f.object.errors[:base].present? %>
+
+  <div class="form-inputs">
+    <%= f.input :amount %>
+    <%= f.input :visible %>
+    <%= f.input :sponsor_id %>
+    <%= f.input :developer_id %>
+  </div>
+
+  <div class="form-actions">
+    <%= f.button :submit %>
+  </div>
+<% end %>

app/views/sponsorships/_sponsorship.json.jbuilder

@@ -0,0 +1,2 @@
+json.extract! sponsorship, :id, :amount, :visible, :sponsor_id, :developer_id, :created_at, :updated_at, :accumulate
+json.url sponsorship_url(sponsorship, format: :json)

app/views/sponsorships/community_data.json.jbuilder

@@ -0,0 +1,12 @@
+json.sponsor do
+  json.array! (0..6).each do |i|
+    json.y @community_data_array[0][i]
+    json.x @community_data_array[2][i].to_date
+  end
+end
+json.sponsored do
+  json.array! (0..6).each do |i|
+    json.y @community_data_array[1][i]
+    json.x @community_data_array[2][i].to_date
+  end
+end

app/views/sponsorships/edit.html.erb

@@ -0,0 +1,6 @@
+<h1>Editing Sponsorship</h1>
+
+<%= render 'form', sponsorship: @sponsorship %>
+
+<%= link_to 'Show', @sponsorship %> |
+<%= link_to 'Back', sponsorships_path %>

app/views/sponsorships/index.html.erb

@@ -0,0 +1,33 @@
+<p id="notice"><%= notice %></p>
+
+<h1>Sponsorships</h1>
+
+<table>
+  <thead>
+    <tr>
+      <th>Amount</th>
+      <th>Visible</th>
+      <th>Sponsor</th>
+      <th>Developer</th>
+      <th colspan="3"></th>
+    </tr>
+  </thead>
+
+  <tbody>
+    <% @sponsorships.each do |sponsorship| %>
+      <tr>
+        <td><%= sponsorship.amount %></td>
+        <td><%= sponsorship.visible %></td>
+        <td><%= sponsorship.sponsor_id %></td>
+        <td><%= sponsorship.developer_id %></td>
+        <td><%= link_to 'Show', sponsorship %></td>
+        <td><%= link_to 'Edit', edit_sponsorship_path(sponsorship) %></td>
+        <td><%= link_to 'Destroy', sponsorship, method: :delete, data: { confirm: 'Are you sure?' } %></td>
+      </tr>
+    <% end %>
+  </tbody>
+</table>
+
+<br>
+
+<%= link_to 'New Sponsorship', new_sponsorship_path %>

app/views/sponsorships/index.json.jbuilder

@@ -0,0 +1 @@
+json.array! @sponsorships, partial: "sponsorships/sponsorship", as: :sponsorship

app/views/sponsorships/new.html.erb

@@ -0,0 +1,5 @@
+<h1>New Sponsorship</h1>
+
+<%= render 'form', sponsorship: @sponsorship %>
+
+<%= link_to 'Back', sponsorships_path %>

app/views/sponsorships/show.html.erb

@@ -0,0 +1,24 @@
+<p id="notice"><%= notice %></p>
+
+<p>
+  <strong>Amount:</strong>
+  <%= @sponsorship.amount %>
+</p>
+
+<p>
+  <strong>Visible:</strong>
+  <%= @sponsorship.visible %>
+</p>
+
+<p>
+  <strong>Sponsor:</strong>
+  <%= @sponsorship.sponsor_id %>
+</p>
+
+<p>
+  <strong>Developer:</strong>
+  <%= @sponsorship.developer_id %>
+</p>
+
+<%= link_to 'Edit', edit_sponsorship_path(@sponsorship) %> |
+<%= link_to 'Back', sponsorships_path %>

app/views/sponsorships/show.json.jbuilder

@@ -0,0 +1 @@
+json.partial! "sponsorships/sponsorship", sponsorship: @sponsorship

app/views/sponsorships/sponsored.json.jbuilder

@@ -0,0 +1,21 @@
+json.count @total
+json.sponsorships do
+  json.array! @sponsorships do |sponsorship|
+    json.id sponsorship.id
+    json.start_time sponsorship.created_at.to_date
+    # json.stop_time '-'
+    if sponsorship.visible.zero?
+      json.visible false
+    else
+      json.visible true
+    end
+    json.amount sponsorship.amount
+    sponsor = sponsorship.sponsor
+    json.image_url url_to_avatar(sponsor)
+    json.username sponsor.full_name
+    json.user_id sponsor.id
+    json.login sponsor.login
+    json.accumulate sponsorship.accumulate
+    json.sponsor_id sponsorship.sponsor.id
+  end
+end

app/views/sponsorships/sponsoring.json.jbuilder

@@ -0,0 +1,21 @@
+json.count @total
+json.sponsorships do
+  json.array! @sponsorships do |sponsorship|
+    json.id sponsorship.id
+    json.start_time sponsorship.created_at.to_date
+    # json.stop_time '-'
+    if sponsorship.visible.zero?
+      json.visible false
+    else
+      json.visible true
+    end
+    json.amount sponsorship.amount
+    sponsor = sponsorship.developer
+    json.image_url url_to_avatar(sponsor)
+    json.username sponsor.full_name
+    json.user_id sponsor.id
+    json.login sponsor.login
+    json.accumulate sponsorship.accumulate
+    json.sponsor_id sponsorship.sponsor.id
+  end
+end

app/views/sponsorships/stopped.json.jbuilder

@@ -0,0 +1,11 @@
+json.array! @stopped_sponsorships do |sponsorship|
+  json.id sponsorship.id
+  json.amount sponsorship.amount
+  json.visible sponsorship.visible
+  json.sponsor_id sponsorship.sponsor_id
+  json.developer_id sponsorship.developer_id
+  json.start_time sponsorship.start_time
+  json.created_at sponsorship.created_at
+  json.updated_at sponsorship.updated_at
+  json.accumulate sponsorship.accumulate
+end

app/views/sponsorships/stopped_sponsored.json.jbuilder

@@ -0,0 +1,21 @@
+json.count @total
+json.sponsorships do
+  json.array! @stopped_sponsorships do |sponsorship|
+    json.id sponsorship.id
+    json.start_time sponsorship.start_time.to_date
+    json.stop_time sponsorship.created_at.to_date
+    if sponsorship.visible.zero?
+      json.visible false
+    else
+      json.visible true
+    end
+    json.amount sponsorship.amount
+    sponsor = sponsorship.sponsor
+    json.image_url url_to_avatar(sponsor)
+    json.username sponsor.full_name
+    json.user_id sponsor.id
+    json.login sponsor.login
+    json.accumulate sponsorship.accumulate
+    json.sponsor_id sponsorship.sponsor.id
+  end
+end

app/views/sponsorships/stopped_sponsoring.json.jbuilder

@@ -0,0 +1,21 @@
+json.count @total
+json.sponsorships do
+  json.array! @stopped_sponsorships do |sponsorship|
+    json.id sponsorship.id
+    json.start_time sponsorship.start_time.to_date
+    json.stop_time sponsorship.created_at.to_date
+    if sponsorship.visible.zero?
+      json.visible false
+    else
+      json.visible true
+    end
+    json.amount sponsorship.amount
+    sponsor = sponsorship.developer
+    json.image_url url_to_avatar(sponsor)
+    json.username sponsor.full_name
+    json.user_id sponsor.id
+    json.login sponsor.login
+    json.accumulate sponsorship.accumulate
+    json.sponsor_id sponsorship.sponsor.id
+  end
+end

app/views/users/get_user_info.json.jbuilder

@@ -10,10 +10,12 @@ json.is_teacher @user.user_extension&.teacher?
 json.user_identity @user.identity
 json.tidding_count 0
 json.user_phone_binded @user.phone.present?
+json.need_edit_info @user.need_edit_info?
 # json.phone @user.phone
 # json.email @user.mail
 json.profile_completed @user.profile_is_completed?
 json.professional_certification @user.professional_certification
+json.sponsor_description @user.sponsor_description
 json.devops_step @user.devops_step
 json.ci_certification @user.ci_certification?
 json.email @user.mail 
@@ -22,4 +24,4 @@ json.city @user.city
 json.custom_department @user.custom_department
 json.description @user.description
 json.(@user, :show_email, :show_department, :show_location)
-json.message_unread_total @message_unread_total
+json.message_unread_total @message_unread_total

app/views/users/show.json.jbuilder

@@ -13,4 +13,5 @@ json.email @user.show_email ? @user.mail : nil
 json.province @user.show_location ? @user.province : nil
 json.city @user.show_location ? @user.city : nil
 json.custom_department @user.show_department ? @user.custom_department : nil
-json.description @user.description
+json.description @user.description
+json.sponsor_description @user.sponsor_description

app/views/wallets/balance.html.erb

@@ -0,0 +1,2 @@
+<h1>Wallets#balance</h1>
+<p>Find me in app/views/wallets/balance.html.erb</p>

app/views/wallets/balance.json.jbuilder

@@ -0,0 +1 @@
+json.balance @wallet.balance

app/views/wallets/balance_chart.json.jbuilder

@@ -0,0 +1,12 @@
+json.income do
+  json.array! (0..6).each do |i|
+    json.y @balance_chart_array[0][i]
+    json.x @balance_chart_array[2][i].to_date
+  end
+end
+json.outcome do
+  json.array! (0..6).each do |i|
+    json.y @balance_chart_array[1][i]
+    json.x @balance_chart_array[2][i].to_date
+  end
+end

app/views/wallets/coin_changes.json.jbuilder

@@ -0,0 +1,25 @@
+json.balance @wallet.balance
+json.count @total
+json.coin_changes do
+  json.array! @coin_changes do |coin_change|
+    from_user = if coin_change.from_wallet.nil?
+                  nil
+                else
+                  coin_change.from_wallet.user
+                end
+    to_user = coin_change.to_wallet.user
+    json.amount coin_change.amount
+    if !from_user.nil?
+      json.from_user from_user.full_name
+      json.from_user_login from_user.login
+    else
+      json.from_user '系统'
+      json.from_user_login '-'
+    end
+    json.to_user to_user.full_name
+    json.to_user_login to_user.login
+    json.description coin_change.description
+    json.reason coin_change.reason
+    json.date coin_change.created_at.to_date
+  end
+end

app/views/wallets/community_data.json.jbuilder

@@ -0,0 +1,4 @@
+json.array! (0..6).each do |i|
+  json.y @community_data_array[0][i]
+  json.x @community_data_array[1][i].to_date
+end

config/cable.yml

@@ -1,12 +1,12 @@
-development:
-  adapter: redis
-  url: redis://localhost:6379
+#development:
+#  adapter: redis
+#  url: redis://localhost:6379
 
-test:
-  adapter: redis
-  url: redis://localhost:6379
+#test:
+#  adapter: redis
+#  url: redis://localhost:6379
 
-production:
-  adapter: redis
-  url: <%= ENV.fetch("REDIS_URL") { "redis://localhost:6379" } %>
-  channel_prefix: forgeplus_production
+#production:
+#  adapter: redis
+#  url: <%#= ENV.fetch("REDIS_URL") { "redis://localhost:6379" } %>
+#  channel_prefix: forgeplus_production

config/configuration.yml.example

@@ -44,6 +44,11 @@ default: &default
       cate_id: '-1'
       callback_url: 'callback_url'
       signature_key: 'test12345678'
+    educoder: 
+      client_id: 'e9ce4d5ba1698d6f7d01d8ee2959776c7a6d743ebe94da2341e288fd2fbf60aa'
+      client_secret: '6ff84dd75eddd859c5bd0e7a791b58bc5ad1ba4fbb30bc9db37cb0baf9f33012'
+      base_url: 'https://test-data.educoder.net'
+      redirect_uri: 'https://testforgeplus.trustie.net/api/auth/educoder/callback'
 
   gitea:
     access_key_id: ''

config/environments/development.rb

@@ -55,6 +55,9 @@ Rails.application.configure do
   # Suppress logger output for asset requests.
   config.assets.quiet = true
 
+  # config.logger = Logger.new("#{Rails.root}/log/#{Rails.env}#{Date.today.to_s}.log", "daily")
+  # config.logger.level = Logger::INFO
+
   # config.assets.prefix = '/dev-assets'
 
   # Raises error for missing translations

config/initializers/educoder_oauth_init.rb

@@ -0,0 +1,16 @@
+oauth_config = {}
+begin
+  config = Rails.application.config_for(:configuration)
+  oauth_config = config.dig('oauth', 'educoder')
+  raise 'oauth educoder config missing' if oauth_config.blank?
+rescue => ex
+  raise ex if Rails.env.production?
+
+  puts %Q{\033[33m [warning] wechat oauth config or configuration.yml missing,
+           please add it or execute 'cp config/configuration.yml.example config/configuration.yml' \033[0m}
+end
+
+EducoderOauth.client_id = oauth_config['client_id']
+EducoderOauth.client_secret = oauth_config['client_secret']
+EducoderOauth.base_url = oauth_config['base_url']
+EducoderOauth.redirect_uri = oauth_config['redirect_uri']