Merge branch 'standalone_develop' into pre_trustie_server

app/controllers/accounts_controller.rb

@@ -153,6 +153,10 @@ class AccountsController < ApplicationController
         user.gitea_uid = gitea_user[:body]['id']
         if user.save!
           UserExtension.create!(user_id: user.id)
+          # 绑定授权账号
+          if ["qq", "wechat", "gitee", "github", "educoder"].include?(params[:type].to_s) && session[:unionid].present?
+            "OpenUsers::#{params[:type].to_s.capitalize}".constantize.create!(user: user, uid: session[:unionid])
+          end
           successful_authentication(user)
           render_ok
         end
@@ -394,7 +398,7 @@ class AccountsController < ApplicationController
   end
 
   def register_params
-    params.permit(:login, :namespace, :password, :password_confirmation, :code)
+    params.permit(:login, :namespace, :password, :password_confirmation, :code, :type)
   end
 
   def reset_password_params

app/controllers/bind_users_controller.rb

@@ -1,35 +1,18 @@
 class BindUsersController < ApplicationController
-  # before_action :require_login
 
   def create
-    # user = CreateBindUserService.call(create_params)
-    #
-    if params[:type] == "qq"
-      begin
-        user = CreateBindUserService.call(current_user, create_params)
-        successful_authentication(user) if user.id != current_user.id
-
-        render_ok
-      rescue ApplicationService::Error => ex
-        render_error(ex.message)
-      end
-    else
-      begin
-        tip_exception '系统错误' if session[:unionid].blank?
-
-        bind_user = User.try_to_login(params[:username], params[:password])
-        tip_exception '用户名或者密码错误' if bind_user.blank?
-        tip_exception '用户名或者密码错误' unless bind_user.check_password?(params[:password].to_s)
-        tip_exception '该账号已被绑定，请更换其他账号进行绑定' if bind_user.bind_open_user?(params[:type].to_s)
-
-        OpenUsers::Wechat.create!(user: bind_user, uid: session[:unionid])
-        successful_authentication(bind_user)
-
-        render_ok
-      rescue Exception => e
-        render_error(e.message)
-      end
-    end
+    Rails.logger.debug "--------------开始绑定用户------------"
+    Rails.logger.debug "--------------params: #{params.to_unsafe_h}"
+    tip_exception '系统错误' if session[:unionid].blank?
+
+    bind_user = User.try_to_login(params[:username], params[:password])
+    tip_exception '用户名或者密码错误' if bind_user.blank?
+    tip_exception '用户名或者密码错误' unless bind_user.check_password?(params[:password].to_s)
+    tip_exception '参数错误' unless ["qq", "wechat", "gitee", "github", "educoder"].include?(params[:type].to_s)
+    tip_exception '该账号已被绑定，请更换其他账号进行绑定' if bind_user.bind_open_user?(params[:type].to_s)
+
+    "OpenUsers::#{params[:type].to_s.capitalize}".constantize.create!(user: bind_user, uid: session[:unionid])
+    @user = bind_user
   end
 
   def new_user

app/controllers/oauth/callbacks_controller.rb

@@ -1,6 +1,6 @@
 class Oauth::CallbacksController < Oauth::BaseController
   def create
-    process_callback
+    process_callback_new
   rescue Exception => e
     Rails.logger.info "授权失败:#{e}"
     tip_exception("授权失败")
@@ -57,6 +57,28 @@ class Oauth::CallbacksController < Oauth::BaseController
     redirect_to root_path(new_user: new_user)
   end
 
+  def process_callback_new
+    Rails.logger.info("[OAuth2] omniauth.auth -> #{request.env['omniauth.auth'].inspect}")
+    if auth_hash.blank?
+      redirect_to("/login") && return
+    end
+    platform = auth_hash[:provider]
+    uid = auth_hash[:uid]
+    uid = auth_hash.info.unionid if platform == "wechat"
+
+    open_user = "OpenUsers::#{platform.to_s.capitalize}".constantize.find_by(uid: uid)
+    if open_user.present? && open_user.user.present?
+      successful_authentication(open_user.user)
+    else
+      if current_user.blank? || !current_user.logged?
+        session[:unionid] = uid
+      else
+        "OpenUsers::#{platform.to_s.capitalize}".constantize.create!(user: current_user, uid: uid)
+      end
+    end
+    redirect_to "/bindlogin/#{platform}"
+  end
+
   # gitee,github nickname=login,如果系统未占用保留原用户名
   def build_login_name(provider, nickname)
     if ["gitee", "github"].include?(provider) && User.find_by(login: nickname).blank?

app/controllers/organizations/organizations_controller.rb

@@ -46,6 +46,12 @@ class Organizations::OrganizationsController < Organizations::BaseController
       @organization.nickname = organization_params[:nickname] if organization_params[:nickname].present?
       @organization.save!
       sync_organization_extension!
+      # 更改组织可见性为私有，则需将该组织下的所有仓库同步更改为私有仓库
+      if organization_extension_params[:visibility] == "privacy"
+        Project.where(user_id: @organization.id).where(is_public: true).each do |project|
+          update_project_private(project)
+        end
+      end
       
       Gitea::Organization::UpdateService.call(current_user.gitea_token, login, @organization.reload)
       Util.write_file(@image, avatar_path(@organization)) if params[:image].present?
@@ -123,5 +129,20 @@ class Organizations::OrganizationsController < Organizations::BaseController
   def sync_organization_extension!
     @organization.organization_extension.update_attributes!(organization_extension_params)
   end
+
+  def update_project_private(project)
+    project.update_attributes!(is_public: false)
+    project.forked_projects.update_all(is_public: project.is_public)
+    gitea_params = {
+      private: true,
+      default_branch: project.default_branch,
+      website: project.website,
+      name: project.identifier
+    }
+    gitea_repo = Gitea::Repository::UpdateService.call(@organization, project&.repository&.identifier, gitea_params)
+    project.repository.update_attributes({hidden: gitea_repo["private"], identifier: gitea_repo["name"]})
+    # 更新对应所属分类下的项目数量（私有）
+    project.project_category.decrement!(:private_projects_count, 1) if project.project_category.present?
+  end
   
 end

app/controllers/projects_controller.rb

@@ -53,7 +53,7 @@ class ProjectsController < ApplicationController
     ActiveRecord::Base.transaction do
       Projects::CreateForm.new(project_params).validate!
       @project = Projects::CreateService.new(current_user, project_params).call
-
+      OpenProjectDevOpsJob.perform_later(@project&.id, current_user.id)
     end
   rescue Exception => e
     uid_logger_error(e.message)

app/helpers/admins/projects_helper.rb

@@ -6,7 +6,7 @@ module Admins::ProjectsHelper
     if owner.is_a?(User)
       link_to(project.owner&.real_name, "/#{project&.owner&.login}", target: '_blank')
     elsif owner.is_a?(Organization)
-      link_to(project.owner&.real_name, "/organize/#{project&.owner&.login}", target: '_blank')
+      link_to(project.owner&.real_name, "/#{project&.owner&.login}", target: '_blank')
     else
       ""
     end

app/jobs/migrate_remote_repository_job.rb

@@ -1,7 +1,7 @@
 class MigrateRemoteRepositoryJob < ApplicationJob
   queue_as :default
 
-  def perform(repo_id, token, params)
+  def perform(repo_id, token, user_id, params)
     repo = Repository.find_by(id: repo_id)
     return if repo.blank?
 
@@ -12,6 +12,10 @@ class MigrateRemoteRepositoryJob < ApplicationJob
     if gitea_repository[0]==201
       repo&.project&.update_columns(gpid: gitea_repository[2]["id"])
       repo&.mirror&.succeeded!
+      ## open jianmu devops
+      project_id = repo&.project&.id
+      puts "############ mirror project_id,user_id: #{project_id},#{user_id}  ############"
+      OpenProjectDevOpsJob.perform_later(project_id, user_id) if project_id.present? && user_id.present?
       puts "############ mirror status: #{repo.mirror.status} ############"
     else 
       repo&.mirror&.failed!

app/jobs/open_project_dev_ops_job.rb

@@ -0,0 +1,16 @@
+class OpenProjectDevOpsJob < ApplicationJob
+  include ProjectsHelper
+
+  queue_as :message
+
+  def perform(project_id, user_id)
+    project = Project.find_by(id: project_id)
+    user = User.find_by(id: user_id)
+    code = jianmu_devops_code(project, user)
+    uri = URI.parse("#{jianmu_devops_url}/oauth2/authorize?code=#{URI.encode_www_form_component(code)}")
+    response = Net::HTTP.get_response(uri)
+    puts "jianmu_devops_url response.code ===== #{response.code}"
+    SendTemplateMessageJob.perform_later('ProjectOpenDevOps', user_id, project_id)
+  end
+
+end

app/jobs/send_template_message_job.rb

@@ -217,6 +217,14 @@ class SendTemplateMessageJob < ApplicationJob
       receivers = project&.all_managers.where.not(id: operator&.id)
       receivers_string, content, notification_url = MessageTemplate::ProjectPraised.get_message_content(receivers, operator, project)
       Notice::Write::CreateService.call(receivers_string, content, notification_url, source, {operator_id: operator.id, project_id: project.id})
+    when 'ProjectOpenDevOps'
+      operator_id, project_id = args[0], args[1]
+      operator = User.find_by_id(operator_id)
+      project = Project.find_by_id(project_id)
+      return unless operator.present? && project.present?
+      receivers = User.where(id: operator.id)
+      receivers_string, content, notification_url = MessageTemplate::ProjectOpenDevOps.get_message_content(receivers, operator, project)
+      Notice::Write::CreateService.call(receivers_string, content, notification_url, source, {operator_id: operator.id, project_id: project.id})
     when 'ProjectPullRequest'
       operator_id, pull_request_id = args[0], args[1]
       operator = User.find_by_id(operator_id)

app/models/message_template.rb

@@ -52,6 +52,7 @@ class MessageTemplate < ApplicationRecord
     email_html = File.read("#{email_template_html_dir}/project_milestone_completed.html")
     self.create(type: 'MessageTemplate::ProjectMilestoneCompleted', sys_notice: '在 <b>{nickname}/{repository}</b> 仓库，里程碑 <b>{name}</b> 的完成度已达到100%', notification_url: '{baseurl}/{owner}/{identifier}/milestones/{id}', email: email_html, email_title: "#{PLATFORM}: 仓库 {nickname}/{repository} 有里程碑已完成")
     self.create(type: 'MessageTemplate::ProjectPraised', sys_notice: '<b>{nickname1}</b> 点赞了你管理的仓库 <b>{nickname2}/{repository}</b>', notification_url: '{baseurl}/{login}')
+    self.create(type: 'MessageTemplate::ProjectOpenDevOps', sys_notice: '您的仓库 <b>{repository}</b> 已成功开通引擎服务，可通过简单的节点编排完成自动化集成与部署。欢迎体验！', notification_url: '{baseurl}/{owner}/{identifier}/devops')
     email_html = File.read("#{email_template_html_dir}/project_pull_request.html")
     self.create(type: 'MessageTemplate::ProjectPullRequest', sys_notice: '{nickname1}在 <b>{nickname2}/{repository}</b> 提交了一个合并请求：<b>{title}</b>', notification_url: '{baseurl}/{owner}/{identifier}/pulls/{id}', email: email_html, email_title: "#{PLATFORM}: {nickname1} 在 {nickname2}/{repository} 提交了一个合并请求")
     email_html = File.read("#{email_template_html_dir}/project_role.html")

app/models/message_template/project_open_dev_ops.rb

@@ -0,0 +1,28 @@
+# == Schema Information
+#
+# 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
+#  notification_url :string(255)
+#  email_title      :string(255)
+#
+
+# 我管理的仓库项目设置被更改
+class MessageTemplate::ProjectOpenDevOps < MessageTemplate
+
+  # MessageTemplate::ProjectOpenDevOps.get_message_content(User.where(login: 'yystopf'))
+  def self.get_message_content(receivers, user, project)
+    return '', '', '' if receivers.blank?
+    content = sys_notice.gsub('{repository}', project&.name)
+    url = notification_url.gsub('{owner}', project&.owner&.login).gsub('{identifier}', project&.identifier)
+    return receivers_string(receivers), content, url
+  rescue => e
+    Rails.logger.info("MessageTemplate::ProjectOpenDevOps.get_message_content [ERROR] #{e}")
+    return '', '', ''
+  end
+end

app/queries/projects/list_query.rb

@@ -12,6 +12,10 @@ class Projects::ListQuery < ApplicationQuery
 
   def call
     collection = Project.visible
+    # 增加私有组织中项目过滤
+    collection = collection.joins("left join organization_extensions on organization_extensions.organization_id = projects.user_id")
+                           .where("organization_extensions.visibility is null or organization_extensions.visibility in (0,1)")
+                           .where("projects.user_id > 0")
     collection = filter_projects(collection)
 
     sort = params[:sort_by] || "updated_on"

app/services/admins/update_user_service.rb

@@ -15,13 +15,14 @@ class Admins::UpdateUserService < ApplicationService
     user.firstname = ''
     user.password = params[:password] if params[:password].present?
 
-    user.user_extension.assign_attributes(user_extension_attributes)
+    user.user_extension.assign_attributes(user_extension_attributes) if user.user_extension.present?
 
     old_login = user.login
     ActiveRecord::Base.transaction do
       user.save!
-      user.user_extension.save!
+      user.user_extension.save! if user.user_extension.present?
       update_gitea_user(old_login)
+      update_gitea_user_email(user.previous_changes[:mail])
     end
 
     user
@@ -65,4 +66,14 @@ class Admins::UpdateUserService < ApplicationService
     Util.logger_error(ex)
     raise Error, '保存失败'
   end
+
+  def update_gitea_user_email(change_options) 
+    return if change_options.blank?
+    return if user.gitea_uid.blank? || user.gitea_token.blank? 
+    $gitea_client.delete_user_emails({body: {emails: [change_options[0]]}.to_json, query: {access_token: user.gitea_token}})
+    $gitea_client.post_user_emails({body: {emails: [change_options[1]]}.to_json, query: {access_token: user.gitea_token}})
+  rescue Exception => ex
+    Util.logger_error(ex)
+    raise Error, '保存失败'
+  end
 end

app/services/repositories/migrate_service.rb

@@ -11,7 +11,7 @@ class Repositories::MigrateService < ApplicationService
     @repository = Repository.new(repository_params)
     if @repository.save!
       @repository.set_mirror!
-      MigrateRemoteRepositoryJob.perform_later(@repository.id, user.gitea_token, gitea_repository_params)
+      MigrateRemoteRepositoryJob.perform_later(@repository.id, user.gitea_token, user.id, gitea_repository_params)
     end
     @repository
   rescue => e

app/views/admins/users/edit.html.erb

@@ -68,12 +68,12 @@
           <%= f.label :identity, label: '职业' %>
           <%= select_tag('user[identity]', [], class: 'form-control identity-select optional', 'data-value': @user.user_extension&.identity, 'data-first-title': '请选择') %>
         </div>
-        <div class="form-group technical-title-select-wrapper optional col-md-1" style="<%= @user.user_extension.student? ? 'display:none;' : '' %>">
+        <div class="form-group technical-title-select-wrapper optional col-md-1" style="<%= @user&.user_extension&.student? ? 'display:none;' : '' %>">
           <%= f.label :technical_title, label: '职称' %>
           <%= select_tag('user[technical_title]', [], class: 'form-control technical-title-select optional', 'data-value': @user.technical_title) %>
         </div>
 
-        <%= f.input :student_id, as: :tel, label: '学号', wrapper_html: { class: 'col-md-2', style: @user.user_extension.student? ? '' : 'display:none;' }, input_html: { class: 'student-id-input' } %>
+        <%= f.input :student_id, as: :tel, label: '学号', wrapper_html: { class: 'col-md-2', style: @user&.user_extension&.student? ? '' : 'display:none;' }, input_html: { class: 'student-id-input' } %>
       </div>
 
       <div class="form-row">

app/views/admins/users/shared/_user_list.html.erb

@@ -27,7 +27,7 @@
           <td><%= user.identity %></td>
           <td><%= display_text(user.created_on&.strftime('%Y-%m-%d %H:%M')) %></td>
           <td><%= display_text(user.last_login_on&.strftime('%Y-%m-%d %H:%M')) %></td>
-          <td><%= link_to user.projects_count, "/users/#{user.login}/projects", target: "_blank" %></td>
+          <td><%= link_to user.projects_count, "/#{user.login}/projects", target: "_blank" %></td>
           <td class="action-container">
             <%= link_to '编辑', edit_admins_user_path(user), class: 'action' %>
 

app/views/bind_users/create.json.jbuilder

@@ -0,0 +1,8 @@
+json.username @user.full_name
+json.real_name @user.real_name
+json.login @user.login
+json.user_id @user.id
+json.image_url url_to_avatar(@user)
+json.admin @user.admin?
+json.user_identity @user.identity
+json.is_watch current_user&.watched?(@user)

app/views/user_mailer/bind_email.html.erb

@@ -0,0 +1,62 @@
+<html>
+<head>
+  <meta charset="utf-8">
+  <title>GitLink-验证码发送</title>
+  <style type="text/css">
+    /* 验证链接页面 */
+    body,h1,h2,h3,h4,h5,h6,hr,p,blockquote,dl,dt,dd,ul,ol,li,pre,form,fieldset,legend,button,input,textarea,th,td{ margin:0; padding:0;}
+    body,table,input,textarea,select,button { font-family: "微软雅黑","宋体"; font-size:12px;line-height:1.5; background:#eaebec;}
+    div,img,tr,td,table{ border:0;}
+    table,tr,td{border:0;}
+    ol,ul,li{ list-style-type:none}
+    .new_content{ background:#fff; width: 100%;}
+    .email-page-link{ }
+    .email-link-top{ }
+    .c_white{ color:#fff;}
+    .email-link-con{ }
+    .email-link-line{  }
+    .email-link-footer{ padding:15px; color:#333; line-height: 1.9; }
+    .c_grey02{ color: #888;}
+    .fb{ font-weight: normal;}
+    .f14{ }
+  </style>
+
+</head>
+
+<body style="background:#fff;">
+<div class="new_content">
+  <div style="width: 598px; background:#fff; margin:20px auto; font-size:14px; ">
+    <div style="height:50px; width: 578px; background:#46484c; padding:9px 10px 6px;border:1px solid #ddd; border-bottom:none;">
+      <a href="https://www.gitlink.org.cn">
+        <img width="100" style="float:left; margin-top: 8px;" src="https:///www.gitlink.org.cn/images/email_logo.png" alt="确实开源">
+      </a>
+      <div style="clear:both; overflow:hidden;"></div>
+    </div>
+    <div style="width: 558px; border-left:1px solid #ddd;border-right:1px solid #ddd; background:#fff; padding:30px 20px; color:#333; line-height: 1.9;">
+      <p style="color:#333; font-size:16px; margin-bottom:15px;font-weight: bold">
+        您好！
+      </p>
+      <p style="color:#333;">
+        您正在GitLink绑定邮箱，请在10分钟内输入此验证码，并进行下一步操作。
+        如非你本人操作，请忽略此邮件。
+      </p>
+      <div  style="text-align: center;">
+        <div style="display:block; height: 45px; line-height:45px;padding:0 30px; width:100px; font-size: 20px;  font-weight: bold; background:#ffd9d9; color:#e72c37; margin:30px auto;">
+          <p><%= @code %></p>
+        </div>
+        <span style="font-weight: normal;color:#666;">
+            此邮件为系统所发，请勿直接回复。<br/>
+    要解决问题或了解您的帐户详情，您可以访问 <a href="https:///www.gitlink.org.cn/forums/1168/detail" style="font-weight: normal; color:#ff7500;">帮助中心</a>。
+            </span>
+      </div>
+      <p style="color:#666; margin-top:30px;">
+        如果您并未发过此请求，则可能是因为其他用户误输了您的邮件地址，而使您收到了这封邮件，那么您可以放心的忽略此邮件，无需进一步采取任何操作。
+      </p>
+    </div>
+    <div style="padding:20px; color:#333; line-height: 1.9;background:#46484c;border:1px solid #ddd; border-top:none; width: 558px;">
+      <a href="https:///www.gitlink.org.cn"  style="font-weight: normal; color:#fff;">www.gitlink.org.cn</a>
+    </div>
+  </div>
+</div>
+</body>
+</html>

app/views/user_mailer/find_password.html.erb

@@ -0,0 +1,62 @@
+<html>
+<head>
+  <meta charset="utf-8">
+  <title>GitLink-验证码发送</title>
+  <style type="text/css">
+    /* 验证链接页面 */
+    body,h1,h2,h3,h4,h5,h6,hr,p,blockquote,dl,dt,dd,ul,ol,li,pre,form,fieldset,legend,button,input,textarea,th,td{ margin:0; padding:0;}
+    body,table,input,textarea,select,button { font-family: "微软雅黑","宋体"; font-size:12px;line-height:1.5; background:#eaebec;}
+    div,img,tr,td,table{ border:0;}
+    table,tr,td{border:0;}
+    ol,ul,li{ list-style-type:none}
+    .new_content{ background:#fff; width: 100%;}
+    .email-page-link{ }
+    .email-link-top{ }
+    .c_white{ color:#fff;}
+    .email-link-con{ }
+    .email-link-line{  }
+    .email-link-footer{ padding:15px; color:#333; line-height: 1.9; }
+    .c_grey02{ color: #888;}
+    .fb{ font-weight: normal;}
+    .f14{ }
+  </style>
+
+</head>
+
+<body style="background:#fff;">
+<div class="new_content">
+  <div style="width: 598px; background:#fff; margin:20px auto; font-size:14px; ">
+    <div style="height:50px; width: 578px; background:#46484c; padding:9px 10px 6px;border:1px solid #ddd; border-bottom:none;">
+      <a href="https://www.gitlink.org.cn">
+        <img width="100" style="float:left; margin-top: 8px;" src="https:///www.gitlink.org.cn/images/email_logo.png" alt="确实开源">
+      </a>
+      <div style="clear:both; overflow:hidden;"></div>
+    </div>
+    <div style="width: 558px; border-left:1px solid #ddd;border-right:1px solid #ddd; background:#fff; padding:30px 20px; color:#333; line-height: 1.9;">
+      <p style="color:#333; font-size:16px; margin-bottom:15px;font-weight: bold">
+        您好！
+      </p>
+      <p style="color:#333;">
+        您正在GitLink找回密码，请在10分钟内输入此验证码，并进行下一步操作。
+        如非你本人操作，请忽略此邮件。
+      </p>
+      <div  style="text-align: center;">
+        <div style="display:block; height: 45px; line-height:45px;padding:0 30px; width:100px; font-size: 20px;  font-weight: bold; background:#ffd9d9; color:#e72c37; margin:30px auto;">
+          <p><%= @code %></p>
+        </div>
+        <span style="font-weight: normal;color:#666;">
+            此邮件为系统所发，请勿直接回复。<br/>
+    要解决问题或了解您的帐户详情，您可以访问 <a href="https:///www.gitlink.org.cn/forums/1168/detail" style="font-weight: normal; color:#ff7500;">帮助中心</a>。
+            </span>
+      </div>
+      <p style="color:#666; margin-top:30px;">
+        如果您并未发过此请求，则可能是因为其他用户误输了您的邮件地址，而使您收到了这封邮件，那么您可以放心的忽略此邮件，无需进一步采取任何操作。
+      </p>
+    </div>
+    <div style="padding:20px; color:#333; line-height: 1.9;background:#46484c;border:1px solid #ddd; border-top:none; width: 558px;">
+      <a href="https:///www.gitlink.org.cn"  style="font-weight: normal; color:#fff;">www.gitlink.org.cn</a>
+    </div>
+  </div>
+</div>
+</body>
+</html>

config/initializers/omniauth.rb

@@ -14,7 +14,7 @@ OmniAuth.config.on_failure = Proc.new { |env|
 
 Rails.application.config.middleware.use OmniAuth::Builder do
   if config.dig("oauth", "qq")
-    provider :qq, config.dig("oauth", "qq", "appid"), config.dig("oauth", "github", "secret"), { provider_ignores_state: true }
+    provider :qq, config.dig("oauth", "qq", "appid"), config.dig("oauth", "qq", "secret"), { provider_ignores_state: true }
   end
   if config.dig("oauth", "github").present?
     provider :github, config.dig("oauth", "github", "appid"), config.dig("oauth", "github", "secret"), { provider_ignores_state: true, scope: "user:email" }