Merge remote-tracking branch 'origin/standalone_develop' into standalone_develop

# Conflicts:
#	app/controllers/users_controller.rb
#	app/helpers/application_helper.rb

.gitignore

@@ -85,3 +85,4 @@ Dockerfile
 dump.rdb
 .tags*
 ceshi_user.xlsx
+public/trace_task_results

app/controllers/admins/import_users_controller.rb

@@ -2,7 +2,7 @@ class Admins::ImportUsersController < Admins::BaseController
   def create
     return render_error('请上传正确的文件') if params[:file].blank? || !params[:file].is_a?(ActionDispatch::Http::UploadedFile)
 
-    result = Admins::ImportUserService.call(params[:file].to_io)
+    result = Admins::ImportUserFromExcelService.call(params[:file].to_io)
     render_ok(result)
   rescue Admins::ImportUserService::Error => ex
     render_error(ex)

app/controllers/compare_controller.rb

@@ -9,6 +9,10 @@ class CompareController < ApplicationController
     load_compare_params
     compare
     @merge_status, @merge_message = get_merge_message
+    @page_size = page_size <= 0 ? 1 : page_size
+    @page_limit = page_limit <=0 ? 15 : page_limit
+    @page_offset = (@page_size -1) * @page_limit
+    Rails.logger.info("+========#{@page_size}-#{@page_limit}-#{@page_offset}")
   end
 
   private
@@ -53,4 +57,12 @@ class CompareController < ApplicationController
   def gitea_compare(base, head)
     Gitea::Repository::Commits::CompareService.call(@owner.login, @project.identifier, Addressable::URI.escape(base), Addressable::URI.escape(head), current_user.gitea_token)
   end
+
+  def page_size 
+    params.fetch(:page, 1).to_i
+  end
+
+  def page_limit
+    params.fetch(:limit, 15).to_i
+  end
 end

app/controllers/issues_controller.rb

@@ -109,7 +109,7 @@ class IssuesController < ApplicationController
 
   def create
     issue_params = issue_send_params(params)
-    Issues::CreateForm.new({subject:issue_params[:subject]}).validate!
+    Issues::CreateForm.new({subject: issue_params[:subject], description: issue_params[:description].blank? ? issue_params[:description] : issue_params[:description].b}).validate!
     @issue = Issue.new(issue_params)
     if @issue.save!
       SendTemplateMessageJob.perform_later('IssueAssigned', current_user.id, @issue&.id) if Site.has_notice_menu?
@@ -223,7 +223,7 @@ class IssuesController < ApplicationController
       normal_status(-1, "不允许修改为关闭状态")
     else
       issue_params = issue_send_params(params).except(:issue_classify, :author_id, :project_id)
-      Issues::UpdateForm.new({subject:issue_params[:subject]}).validate!
+      Issues::UpdateForm.new({subject: issue_params[:subject], description: issue_params[:description].blank? ? issue_params[:description] : issue_params[:description].b}).validate!
       if @issue.update_attributes(issue_params)
         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)) if Site.has_notice_menu?

app/controllers/journals_controller.rb

@@ -23,6 +23,7 @@ class JournalsController < ApplicationController
       normal_status(-1, "评论内容不能为空")
     else
       ActiveRecord::Base.transaction do
+        Journals::CreateForm.new({notes: notes.to_s.strip.blank? ? notes.to_s.strip : notes.to_s.strip.b}).validate!
         journal_params = {
           journalized_id: @issue.id ,
           journalized_type: "Issue",
@@ -53,6 +54,9 @@ class JournalsController < ApplicationController
         end
       end
     end
+  rescue Exception => exception
+    puts exception.message
+    normal_status(-1, exception.message)
   end
 
   def destroy
@@ -71,6 +75,7 @@ class JournalsController < ApplicationController
   def update
     content = params[:content]
     if content.present? 
+      Journals::UpdateForm.new({notes: notes.to_s.strip.blank? ? notes.to_s.strip : notes.to_s.strip.b}).validate!
       if @journal.update_attribute(:notes, content)
         normal_status(0, "更新成功")
       else
@@ -79,7 +84,9 @@ class JournalsController < ApplicationController
     else
       normal_status(-1, "评论的内容不能为空")
     end
-
+  rescue Exception => exception
+    puts exception.message
+    normal_status(-1, exception.message)
   end
 
   def get_children_journals

app/controllers/owners_controller.rb

@@ -12,7 +12,7 @@ class OwnersController < ApplicationController
 
   def show 
     @owner = Owner.find_by(login: params[:id]) || Owner.find_by(id: params[:id])
-    return render_ok(type: 'User') unless @owner.present?
+    return render_not_found unless @owner.present?
     # 组织
     if @owner.is_a?(Organization)
       return render_forbidden("没有查看组织的权限") if org_limited_condition || org_privacy_condition

app/controllers/projects_controller.rb

@@ -13,6 +13,8 @@ class ProjectsController < ApplicationController
   def menu_list
     menu = []
 
+    user_is_admin = current_user.admin? || @project.manager?(current_user)
+
     menu.append(menu_hash_by_name("home"))
     menu.append(menu_hash_by_name("code")) if @project.has_menu_permission("code")
     menu.append(menu_hash_by_name("issues")) if @project.has_menu_permission("issues")
@@ -20,9 +22,11 @@ class ProjectsController < ApplicationController
     menu.append(menu_hash_by_name("devops")) if @project.has_menu_permission("devops") && @project.forge?
     menu.append(menu_hash_by_name("versions")) if @project.has_menu_permission("versions")
     menu.append(menu_hash_by_name("wiki")) if @project.has_menu_permission("wiki") && @project.forge?
+    menu.append(menu_hash_by_name("services")) if @project.has_menu_permission("services") && @project.forge? && (current_user.admin? || @project.member?(current_user.id))
     menu.append(menu_hash_by_name("resources")) if @project.has_menu_permission("resources") && @project.forge?
     menu.append(menu_hash_by_name("activity"))
-    menu.append(menu_hash_by_name("settings")) if (current_user.admin? || @project.manager?(current_user)) && @project.forge?
+    menu.append(menu_hash_by_name("settings")) if user_is_admin && @project.forge?
+    menu.append(menu_hash_by_name("quit")) if !user_is_admin && @project.member(current_user.id) && @project.forge?
 
     render json: menu
   end
@@ -88,7 +92,7 @@ class ProjectsController < ApplicationController
     return @branches = [] unless @project.forge?
 
     # result = Gitea::Repository::Branches::ListService.call(@owner, @project.identifier)
-    result = Gitea::Repository::Branches::ListNameService.call(@owner, @project.identifier)
+    result = Gitea::Repository::Branches::ListNameService.call(@owner, @project.identifier, params[:name])
     @branches =  result.is_a?(Hash) ? (result.key?(:status) ? [] : result["branch_name"]) : result
   end
 
@@ -177,6 +181,22 @@ class ProjectsController < ApplicationController
     tip_exception(e.message)
   end
 
+  def quit
+    user_is_admin = current_user.admin? || @project.manager?(current_user)
+    if !user_is_admin && @project.member(current_user.id) && @project.forge? 
+      ActiveRecord::Base.transaction do
+        Projects::DeleteMemberInteractor.call(@project.owner, @project, current_user)
+        SendTemplateMessageJob.perform_later('ProjectMemberLeft', current_user.id, current_user.id, @project.id) if Site.has_notice_menu?
+        render_ok
+      end
+    else 
+      render_forbidden('你不能退出该仓库')
+    end
+  rescue Exception => e
+    uid_logger_error(e.message)
+    tip_exception(e.message)
+  end
+
   def watch_users
     watchers = @project.watchers.includes(:user).order("watchers.created_at desc").distinct
     @watchers_count = watchers.size
@@ -190,7 +210,7 @@ class ProjectsController < ApplicationController
   end
 
   def fork_users
-    fork_users = @project.fork_users.includes(:user, :project, :fork_project).order("fork_users.created_at desc").distinct
+    fork_users = @project.fork_users.includes(:owner, :project, :fork_project).order("fork_users.created_at desc").distinct
     @forks_count = fork_users.size
     @fork_users = paginate(fork_users)
   end

app/controllers/pull_requests_controller.rb

@@ -29,7 +29,7 @@ class PullRequestsController < ApplicationController
   end
 
   def new
-    @all_branches = Branches::ListService.call(@owner, @project)
+    @all_branches = Branches::ListService.call(@owner, @project, params[:branch_name])
     @is_fork = @project.forked_from_project_id.present?
     @projects_names = [{
       project_user_login: @owner.try(:login),
@@ -50,7 +50,7 @@ class PullRequestsController < ApplicationController
   end
 
   def get_branches
-    branch_result = Branches::ListService.call(@owner, @project)
+    branch_result = Branches::ListService.call(@owner, @project, params[:name])
     render json: branch_result
     # return json: branch_result
   end
@@ -58,6 +58,7 @@ class PullRequestsController < ApplicationController
   def create
     # return normal_status(-1, "您不是目标分支开发者，没有权限，请联系目标分支作者.") unless @project.operator?(current_user)
     ActiveRecord::Base.transaction do
+      Issues::CreateForm.new({subject: params[:title], description: params[:body].blank? ? params[:body] :  params[:body].b}).validate!
       @pull_request, @gitea_pull_request = PullRequests::CreateService.call(current_user, @owner, @project, params)
       if @gitea_pull_request[:status] == :success
         @pull_request.bind_gitea_pull_request!(@gitea_pull_request[:body]["number"], @gitea_pull_request[:body]["id"])
@@ -89,7 +90,7 @@ class PullRequestsController < ApplicationController
     else
       ActiveRecord::Base.transaction do
         begin
-          return normal_status(-1, "title不能超过255个字符") if params[:title].length > 255
+          Issues::UpdateForm.new({subject: params[:title], description: params[:body].blank? ? params[:body] : params[:body].b}).validate!
           merge_params
 
           @issue&.issue_tags_relates&.destroy_all if params[:issue_tag_ids].blank?

app/controllers/repositories_controller.rb

@@ -225,7 +225,8 @@ class RepositoriesController < ApplicationController
     @path = Gitea.gitea_config[:domain]+"/#{@owner.login}/#{@repository.identifier}/raw/branch/#{params[:ref]}/"
     @readme = result[:status] === :success ? result[:body] : nil
     @readme['content'] = decode64_content(@readme, @owner, @repository, params[:ref], @path)
-    render json: @readme.slice("type", "encoding", "size", "name", "path", "content", "sha")
+    @readme['replace_content'] = readme_decode64_content(@readme, @owner, @repository, params[:ref], @path)
+    render json: @readme.slice("type", "encoding", "size", "name", "path", "content", "sha", "replace_content")
   rescue 
     render json: nil
   end

app/controllers/traces/base_controller.rb

@@ -0,0 +1,18 @@
+class Traces::BaseController < ApplicationController
+
+  helper_method :observed_logged_user?, :observed_user
+
+
+  def observed_user
+    @_observed_user ||= (User.find_by_login(params[:user_id]) || User.find_by_id(params[:user_id]))
+  end
+
+  def observed_logged_user?
+    observed_user.id == User.current&.id
+  end
+
+  protected
+  def check_auth 
+    return render_forbidden unless current_user.admin? || observed_logged_user?
+  end
+end

app/controllers/traces/projects_controller.rb

@@ -0,0 +1,83 @@
+class Traces::ProjectsController < Traces::BaseController
+  include OperateProjectAbilityAble
+
+  before_action :require_login
+  before_action :load_project
+  before_action :authorizate_user_can_edit_project!, except: [:task_results]
+
+  def tasks 
+    branch_name = params[:branch_name]
+    return render_error("无可用检测次数") if @project.user_trace_tasks.size >= 5
+    return render_error("分支名不能为空！") if branch_name.blank?
+    @all_branches = Gitea::Repository::Branches::ListNameService.call(@project&.owner, @project.identifier)
+    return render_error("请输入正确的分支名！") unless @all_branches["branch_name"].include?(branch_name) 
+    code, data, error = Trace::CheckService.call(current_user.trace_token, @project, "1", branch_name)
+    if code == 200 
+      UserTraceTask.create!(
+        user_id: current_user.id,
+        project_id: @project.id, 
+        branch_tag: branch_name,
+        task_id: data["task_id"]
+      )
+      render_ok
+    else 
+      render_error("检测失败 Error:#{error}")
+    end
+  rescue Exception => exception
+    puts exception.message
+    normal_status(-1, exception.message)
+  end
+
+  def task_results
+    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
+    return render :json => {left_tasks_count: 5, data: []} if current_user.trace_user.nil?
+    code, data, error = Trace::CheckResultService.call(current_user.trace_token, @project, nil, page, limit)
+    if code == 200
+      render :json => {left_tasks_count: 5 - @project.user_trace_tasks.size, data: data}
+    else 
+      render_error("获取检测记录失败 Error:#{error}")
+    end
+  rescue Exception => exception 
+    puts exception.message
+    normal_status(-1, exception.message)
+  end
+
+  def reload_task 
+    return render_error("project_id错误") if params[:project_id].blank?
+    branch_name = params[:branch_name]
+    return render_error("分支名不能为空！") if branch_name.blank?
+    @all_branches = Gitea::Repository::Branches::ListNameService.call(@project&.owner, @project.identifier)
+    return render_error("请输入正确的分支名！") unless @all_branches["branch_name"].include?(branch_name) 
+    code, data, error = Trace::ReloadCheckService.call(current_user.trace_token, params[:project_id])
+    if code == 200 
+      UserTraceTask.create!(
+        user_id: current_user.id,
+        project_id: @project.id, 
+        branch_tag: branch_name,
+        task_id: data["task_id"]
+      )
+      render_ok 
+    else 
+      render_error("重新检测失败 Error:#{error}")
+    end
+  rescue Exception => exception 
+    puts exception.message
+    normal_status(-1, exception.message)
+  end
+
+
+  def task_pdf 
+    return render_error("task_id错误") if params[:task_id].blank?
+    result = Trace::PdfReportService.call(current_user.trace_token, params[:task_id])
+    if result.is_a?(Hash) && result[:code] == 200
+      redirect_to result[:download_url]
+    else 
+      render_error("下载报告失败！")
+    end
+  rescue Exception => exception 
+    puts exception.message
+    normal_status(-1, exception.message)
+  end
+end

app/controllers/traces/trace_users_controller.rb

@@ -0,0 +1,14 @@
+class Traces::TraceUsersController < Traces::BaseController
+  before_action :require_login
+
+  def create  
+    if current_user.trace_token.present?
+      render_ok
+    else
+      render_error(-1,  "代码溯源用户初始化失败")
+    end
+  rescue Exception => exception
+    puts exception.message
+    normal_status(-1, exception.message)
+  end
+end

app/controllers/users_controller.rb

@@ -98,6 +98,13 @@ class UsersController < ApplicationController
     render_error(-1, '头像修改失败！')
   end
 
+  def get_image
+    return render_not_found unless @user = User.find_by(login: params[:id]) || User.find_by_id(params[:id])
+    return render_forbidden unless User.current.logged? && (current_user&.admin? || current_user.id == @user.id)
+
+    redirect_to Rails.application.config_for(:configuration)['platform_url'] + "/" + url_to_avatar(@user).to_s
+  end
+
   def me
     @user = current_user
   end
@@ -307,6 +314,7 @@ class UsersController < ApplicationController
                                   :occupation, :technical_title,
                                   :school_id, :department_id, :province, :city,
                                   :custom_department, :identity, :student_id, :description,
+                                  :show_super_description, :super_description,
                                   :show_email, :show_location, :show_department]
                                 )
   end

app/controllers/version_releases_controller.rb

@@ -14,7 +14,7 @@ class VersionReleasesController < ApplicationController
   def new
     #获取所有的分支
     @all_branches = []
-    get_all_branches = Gitea::Repository::Branches::ListService.new(@user, @repository.try(:identifier)).call
+    get_all_branches = Gitea::Repository::Branches::ListService.new(@user, @repository.try(:identifier), params[:branch_name]).call
     if get_all_branches && get_all_branches.size > 0
       get_all_branches.each do |b|
         @all_branches.push(b["name"])

app/docs/slate/source/api.html.md

@@ -16,6 +16,7 @@ includes:
   - users
   - projects
   - repositories
+  - traces
   - pulls
   - issues
   - organizations

app/docs/slate/source/includes/_projects.md

@@ -280,7 +280,7 @@ repo             |是| |string |项目标识identifier
 ### 返回字段说明
 参数  | 类型 | 字段说明
 --------- | ----------- | -----------
-menu_name     |string|导航名称， home:主页,code:代码库,issues:疑修,pulls:合并请求,devops:工作流,versions:里程碑,activity:动态,setting:仓库设置
+menu_name     |string|导航名称， home:主页,code:代码库,issues:疑修,pulls:合并请求,devops:工作流,versions:里程碑,wiki:维基,services:服务,activity:动态,setting:仓库设置
 
 
 > 返回的JSON示例:
@@ -408,7 +408,7 @@ await octokit.request('POST /api/yystopf/ceshi/project_units')
 ### 请求参数
 参数    | 必选 | 默认 | 类型 | 字段说明
 --------- | ------- | ------- | -------- | ----------
-|unit_types |是| |array    | 项目模块内容， 支持以下参数:code:代码库,issues:疑修,pulls:合并请求,devops:工作流,versions:里程碑 |
+|unit_types |是| |array    | 项目模块内容， 支持以下参数:code:代码库,issues:疑修,pulls:合并请求,devops:工作流,versions:里程碑,wiki:维基,resources:资源库,services:服务 |
 
 
 ### 返回字段说明:

app/docs/slate/source/includes/_traces.md

@@ -0,0 +1,217 @@
+# Traces
+
+## 代码溯源初始化
+用户同意协议后请求的接口，创建代码溯源的账号
+
+> 示例:
+
+```shell
+curl -X POST \
+http://localhost:3000/api/traces/trace_users.json
+```
+
+```javascript
+await octokit.request('POST /api/traces/trace_users.json')
+```
+
+### HTTP 请求
+`POST api/traces/trace_users.json`
+
+
+> 返回的JSON示例:
+
+```json
+{
+    "status": 0,
+    "message": "success"
+}
+```
+<aside class="success">
+Success — a happy kitten is an authenticated kitten!
+</aside>
+
+## 代码分析结果列表
+查询项目下代码分析的结果
+
+> 示例:
+
+```shell
+curl -X GET \
+http://localhost:3000/api/traces/yystopf/many_branch/task_results.json
+```
+
+```javascript
+await octokit.request('GET /api/traces/:owner/:repo/task_results.json')
+```
+
+### HTTP 请求
+`GET api/traces/:owner/:repo/task_results.json`
+
+### 请求参数
+参数    | 必选 | 默认 | 类型 | 字段说明
+--------- | ------- | ------- | -------- | ----------
+owner|是|否|string | 项目所有者标识|
+repo|是 | 否|string | 项目标识 |
+page  |否| 1 | int |  页码   |
+limit |否| 15 | int | 每页数量 |
+
+### 返回字段说明（暂缺）
+<!-- 参数  | 类型 | 字段说明
+--------- | ----------- | -----------
+total_count              |int   |总数 |
+public_keys.id           |int   |ID|
+public_keys.name         |string|密钥标题|
+public_keys.content      |string|密钥内容|
+public_keys.fingerprint  |string|密钥标识|
+public_keys.created_time |string|密钥创建时间| -->
+
+> 返回的JSON示例:
+
+```json
+{
+    "data": [
+        {
+            "accuracy": "20",
+            "code_type": "C",
+            "depth": "2",
+            "detect_flag": "快速-组件级",
+            "detect_rule": "快速-组件级,2,20,,开源软件,50,10",
+            "detect_startdate": "2022-05-10 15:59:46 ",
+            "detect_status": "fail",
+            "detectflag": "快速-组件级",
+            "fail_reason": "Invalid package type",
+            "file_name": "many_branch.zip",
+            "license_process": "100",
+            "licenseparam": "开源软件",
+            "package_type": "",
+            "product_name": "84727546110",
+            "project_id": "6dbc3e42-5857-4ca4-a54d-58fd9dbf6dc5",
+            "sim_process": "100",
+            "similarity_process": "2",
+            "task_id": "15139171-091b-4316-98b1-6068970efa44",
+            "totalsize": 5,
+            "uid": "78",
+            "vuln_process": "",
+            "vulnlevel": ""
+        }
+    ]
+}
+```
+<aside class="success">
+Success — a happy kitten is an authenticated kitten!
+</aside>
+
+
+
+## 新建分析
+用户选择仓库分支进行代码分析的接口
+
+> 示例:
+
+```shell
+curl -X POST \
+http://localhost:3000/api/traces/yystopf/many_branch/tasks.json
+```
+
+```javascript
+await octokit.request('POST /api/traces/:owner/:repo/tasks.json')
+```
+
+### HTTP 请求
+`POST api/traces/:owner/:repo/tasks.json`
+
+### 请求参数
+参数    | 必选 | 默认 | 类型 | 字段说明
+--------- | ------- | ------- | -------- | ----------
+owner   |是 | 否 | string |  项目所有者标识   |
+repo |是 | 否 | string | 项目标识 |
+branch_name|是 | 否| string | 分支名称 |
+
+
+> 返回的JSON示例:
+
+```json
+{
+    "status": 0,
+    "message": "success"
+}
+```
+<aside class="success">
+Success — a happy kitten is an authenticated kitten!
+</aside>
+
+## 重新扫描
+对代码分析结果进行再次分析
+
+> 示例:
+
+```shell
+curl -X GET \
+http://localhost:3000/api/traces/yystopf/many_branch/reload_task.json
+```
+
+```javascript
+await octokit.request('GET /api/traces/:owner/:repo/reload_task.json')
+```
+
+### HTTP 请求
+`GET api/traces/:owner/:repo/reload_task.json`
+
+### 请求参数
+参数    | 必选 | 默认 | 类型 | 字段说明
+--------- | ------- | ------- | -------- | ----------
+owner   |是 | 否 | string |  项目所有者标识   |
+repo |是 | 否 | string | 项目标识 |
+project_id|是 | 否| string | 代码分析结果里的project_id |
+branch_name|是 | 否| string | 分支名称 |
+
+
+> 返回的JSON示例:
+
+```json
+{
+    "status": 0,
+    "message": "success"
+}
+```
+<aside class="success">
+Success — a happy kitten is an authenticated kitten!
+</aside>
+
+
+## 下载报告
+把代码分析的结果下载到本地
+
+> 示例:
+
+```shell
+curl -X GET \
+http://localhost:3000/api/traces/yystopf/many_branch/task_pdf.json
+```
+
+```javascript
+await octokit.request('GET /api/traces/:owner/:repo/task_pdf.json')
+```
+
+### HTTP 请求
+`GET api/traces/:owner/:repo/task_pdf.json`
+
+### 请求参数
+参数    | 必选 | 默认 | 类型 | 字段说明
+--------- | ------- | ------- | -------- | ----------
+owner   |是 | 否 | string |  项目所有者标识   |
+repo |是 | 否 | string | 项目标识 |
+task_id|是 | 否| string | 代码分析结果里的task_id |
+
+
+> 返回的JSON示例:
+
+```json
+{
+    "status": 0,
+    "message": "success"
+}
+```
+<aside class="success">
+Success — a happy kitten is an authenticated kitten!
+</aside>

app/forms/issues/create_form.rb

@@ -1,11 +1,11 @@
 class Issues::CreateForm
   include ActiveModel::Model
 
-  attr_accessor :subject
+  attr_accessor :subject, :description
 
   validates :subject, presence: { message: "不能为空" }
 
   validates :subject, length: { maximum: 200, too_long: "不能超过200个字符" }
 
-
+  validates :description, length: { maximum: 65535, too_long: "不能超过65535个字符"}
 end

app/forms/issues/update_form.rb

@@ -1,10 +1,12 @@
 class Issues::UpdateForm
   include ActiveModel::Model
 
-  attr_accessor :subject
+  attr_accessor :subject, :description
 
   validates :subject, presence: { message: "不能为空" }
 
   validates :subject, length: { maximum: 200, too_long: "不能超过200个字符" }
 
+  validates :description, length: { maximum: 65535, too_long: "不能超过65535个字符"}
+
 end

app/forms/journals/create_form.rb

@@ -0,0 +1,7 @@
+class Journals::CreateForm
+  include ActiveModel::Model
+  
+  attr_accessor :notes
+
+  validates :notes, length: { maximum: 65535, too_long: "不能超过65535个字符"}
+end

app/forms/journals/update_form.rb

@@ -0,0 +1,8 @@
+class Journals::UpdateForm
+  include ActiveModel::Model
+
+  attr_accessor :notes
+
+  validates :notes, length: { maximum: 65535, too_long: "不能超过65535个字符"}
+
+end

app/helpers/application_helper.rb

@@ -147,6 +147,15 @@ module ApplicationHelper
     end
   end
 
+  def url_to_avatar_with_platform_url(source)
+    platform_url = Rails.application.config_for(:configuration)['platform_url']
+    if platform_url
+      return Rails.application.config_for(:configuration)['platform_url'] + "/" + url_to_avatar(source).to_s
+    else
+      return url_to_avatar(source).to_s
+    end
+  end
+
   # 主页banner图
   def banner_img(source_type)
     if File.exist?(disk_filename(source_type, "banner"))

app/helpers/repositories_helper.rb

@@ -36,7 +36,6 @@ module RepositoriesHelper
   end
 
   def render_cache_commit_author(author_json)
-    Rails.logger.info author_json['Email'] 
     if author_json["name"].present? && author_json["email"].present?
       return find_user_in_redis_cache(author_json['name'], author_json['email']) 
     end
@@ -104,6 +103,46 @@ module RepositoriesHelper
     end
   end
 
+  # author hui.he
+  def new_readme_render_decode64_content(str, owner, repo, ref, readme_path, readme_name)
+    file_path = readme_path.include?('/') ? readme_path.gsub("/#{readme_name}", '') : readme_path.gsub("#{readme_name}", '')
+    return nil if str.blank?
+    content = Base64.decode64(str).force_encoding('UTF-8')
+    s_regex = /\[.*?\]\((.*?)\)/
+    src_regex = /src=\"(.*?)\"/
+    ss = content.to_s.scan(s_regex)
+    ss_src = content.to_s.scan(src_regex)
+    total_sources = ss + ss_src
+    total_sources.uniq! 
+    total_sources.each do |s|
+      begin
+        s_content = s[0]
+        # 链接直接跳过不做替换
+        next if s_content.starts_with?('http://') || s_content.starts_with?('https://') || s_content.starts_with?('mailto:') || s_content.blank?
+        ext = File.extname(s_content)[1..-1]
+
+        if image_type?(ext) || download_type(ext) 
+          s_content = File.expand_path(s_content, file_path)
+          s_content = s_content.split("#{Rails.root}/")[1]
+          # content = content.gsub(s[0], "/#{s_content}")
+          s_content = [base_url, "/api/#{owner&.login}/#{repo.identifier}/raw?filepath=#{s_content}&ref=#{ref}"].join
+          content = content.gsub(s[0], s_content)
+        else
+          path = [owner&.login, repo&.identifier, 'tree', ref, file_path].join("/")
+          s_content = File.expand_path(s_content, path)
+          s_content = s_content.split("#{Rails.root}/")[1]
+          content = content.gsub(s[0], "/#{s_content}")
+        end
+      rescue
+        next
+      end
+    end
+
+    return content
+  rescue
+    return str
+  end
+
   # unix_time values for example: 1604382982
   def render_format_time_with_unix(unix_time)
     Time.at(unix_time).strftime("%Y-%m-%d %H:%M")
@@ -114,12 +153,21 @@ module RepositoriesHelper
     date.to_time.strftime("%Y-%m-%d %H:%M")
   end
 
+  def readme_decode64_content(entry, owner, repo, ref, path=nil)
+    Rails.logger.info("entry===#{entry["type"]} #{entry["name"]}")
+    content = Gitea::Repository::Entries::GetService.call(owner, repo.identifier, URI.escape(entry['path']), ref: ref)['content']
+    Rails.logger.info("content===#{content}")
+    # readme_render_decode64_content(content, owner, repo, ref)
+    new_readme_render_decode64_content(content, owner, repo, ref, entry['path'], entry['name'])
+  end
+
   def decode64_content(entry, owner, repo, ref, path=nil)
     if is_readme?(entry['type'], entry['name'])
-      # content = Gitea::Repository::Entries::GetService.call(owner, repo.identifier, URI.escape(entry['path']), ref: ref)['content']
+      Rails.logger.info("entry===#{entry["type"]} #{entry["name"]}")
-      content = entry['content']
+      content = Gitea::Repository::Entries::GetService.call(owner, repo.identifier, URI.escape(entry['path']), ref: ref)['content']
-      path = URI.escape(entry['path']).to_s.downcase.gsub("/readme.md","")
+      Rails.logger.info("content===#{content}")
-      readme_render_decode64_content(content, owner, repo, ref, path)
+      # readme_render_decode64_content(content, owner, repo, ref)
+      return Base64.decode64(content).force_encoding('UTF-8')
     else
       file_type = File.extname(entry['name'].to_s)[1..-1]
       if image_type?(file_type)

app/imports/admins/new_import_user_from_excel.rb

@@ -0,0 +1,15 @@
+class Admins::NewImportUserFromExcel < BaseImportXlsx
+  UserData = Struct.new(:login, :email, :password, :nickname)
+
+  def read_each(&block)
+    sheet.each_row_streaming(pad_cells: true, offset: 1) do |row|
+      data = row.map(&method(:cell_value))[0..3]
+      block.call UserData.new(*data)
+    end
+  end
+
+  private 
+  def cell_value(obj)
+    obj&.cell_value 
+  end
+end

app/libs/custom_regexp.rb

@@ -1,7 +1,7 @@
 module CustomRegexp
   PHONE = /1\d{10}/
   EMAIL = /\A[a-zA-Z0-9]+([._\\]*[a-zA-Z0-9])*@([a-z0-9]+[-a-z0-9]*[a-z0-9]+.){1,63}[a-z0-9]+\z/
-  LOGIN = /^(?!_)(?!.*?_$)[a-zA-Z0-9_-]+$/ #只含有数字、字母、下划线不能以下划线开头和结尾
+  LOGIN = /^(?!_)(?!.*?_$)[a-zA-Z0-9_-]{4,15}\z/ #只含有数字、字母、下划线不能以下划线开头和结尾
   LASTNAME = /\A[a-zA-Z0-9\u4e00-\u9fa5]+\z/
   NICKNAME = /\A[\u4e00-\u9fa5_a-zA-Z0-9]+\z/
   PASSWORD = /\A[a-z_A-Z0-9\-\.!@#\$%\\\^&\*\)\(\+=\{\}\[\]\/",'_<>~\·`\?:;|]{8,16}\z/

app/models/fork_user.rb

@@ -17,7 +17,7 @@
 
 class ForkUser < ApplicationRecord
   belongs_to :project
-  belongs_to :user
+  belongs_to :owner, class_name: 'Owner', foreign_key: :user_id
   belongs_to :fork_project, class_name: 'Project', foreign_key: :fork_project_id
 
   after_create :incre_project_common, :incre_user_statistic, :incre_platform_statistic

app/models/journal.rb

@@ -6,7 +6,7 @@
 #  journalized_id   :integer          default("0"), not null
 #  journalized_type :string(30)       default(""), not null
 #  user_id          :integer          default("0"), not null
-#  notes            :text(65535)
+#  notes            :text(4294967295)
 #  created_on       :datetime         not null
 #  private_notes    :boolean          default("0"), not null
 #  parent_id        :integer

app/models/message_template/project_setting_changed.rb

@@ -141,6 +141,7 @@ class MessageTemplate::ProjectSettingChanged < MessageTemplate
       navbar.gsub!('devops', '工作流')
       navbar.gsub!('versions', '里程碑')
       navbar.gsub!('resources', '资源库')
+      navbar.gsub!('services', '服务')
       if change_count > 1
         content.sub!('{ifnavbar}', '<br/>') 
       else
@@ -290,6 +291,7 @@ class MessageTemplate::ProjectSettingChanged < MessageTemplate
         navbar.gsub!('devops', '工作流')
         navbar.gsub!('versions', '里程碑')
         navbar.gsub!('resources', '资源库')
+        navbar.gsub!('services', '服务')
         if change_count > 1
           content.sub!('{ifnavbar}', '<br/>') 
         else

app/models/organization.rb

@@ -83,6 +83,10 @@ class Organization < Owner
 
   after_save :reset_cache_data
 
+  def gitea_token 
+    team_users.joins(:team).where(teams: {authorize: "owner"}).take&.user&.gitea_token
+  end
+
   def reset_cache_data
     Cache::V2::OwnerCommonService.new(self.id).reset
   end

app/models/project.rb

@@ -124,6 +124,7 @@ class Project < ApplicationRecord
   has_many :pinned_projects, dependent: :destroy 
   has_many :has_pinned_users, through: :pinned_projects, source: :user
   has_many :webhooks, class_name: "Gitea::Webhook", primary_key: :gpid, foreign_key: :repo_id
+  has_many :user_trace_tasks, dependent: :destroy 
   after_create :incre_user_statistic, :incre_platform_statistic
   after_save :check_project_members
   before_save :set_invite_code, :reset_unmember_followed, :set_recommend_and_is_pinned, :reset_cache_data

app/models/project_unit.rb

@@ -16,7 +16,7 @@
 class ProjectUnit < ApplicationRecord
   belongs_to :project
 
-  enum unit_type: {code: 1, issues: 2, pulls: 3, wiki:4, devops: 5, versions: 6, resources: 7}
+  enum unit_type: {code: 1, issues: 2, pulls: 3, wiki:4, devops: 5, versions: 6, resources: 7, services: 8}
 
   validates :unit_type, uniqueness: { scope: :project_id}
 

app/models/pull_request.rb

@@ -3,8 +3,8 @@
 # Table name: pull_requests
 #
 #  id              :integer          not null, primary key
-#  pull_request_id :integer
+#  gitea_id        :integer
-#  gpid            :integer
+#  gitea_number    :integer
 #  user_id         :integer
 #  created_at      :datetime         not null
 #  updated_at      :datetime         not null
@@ -12,7 +12,7 @@
 #  project_id      :integer
 #  title           :string(255)
 #  milestone       :integer
-#  body            :text(65535)
+#  body            :text(4294967295)
 #  head            :string(255)
 #  base            :string(255)
 #  issue_id        :integer

app/models/user.rb

@@ -175,6 +175,7 @@ class User < Owner
   has_many :system_notification_histories
   has_many :system_notifications, through: :system_notification_histories
   has_one :trace_user, dependent: :destroy
+  has_many :user_trace_tasks, dependent: :destroy 
   
   # Groups and active users
   scope :active, lambda { where(status: [STATUS_ACTIVE, STATUS_EDIT_INFO]) }
@@ -188,7 +189,7 @@ class User < Owner
   attr_accessor :password, :password_confirmation
 
   delegate :description, :gender, :department_id, :school_id, :location, :location_city,
-           :show_email, :show_location, :show_department,
+           :show_email, :show_location, :show_department, :super_description, :show_super_description,
            :technical_title, :province, :city, :custom_department, to: :user_extension, allow_nil: true
 
   before_save :update_hashed_password, :set_lastname

app/models/user_extension.rb

@@ -22,15 +22,14 @@
 #  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)
 #  show_email             :boolean          default("0")
 #  show_location          :boolean          default("0")
 #  show_department        :boolean          default("0")
+#  super_description      :text(4294967295)
+#  show_super_description :boolean          default("0")
 #
 # Indexes
 #

app/models/user_trace_task.rb

@@ -0,0 +1,25 @@
+# == Schema Information
+#
+# Table name: user_trace_tasks
+#
+#  id         :integer          not null, primary key
+#  user_id    :integer
+#  project_id :integer
+#  branch_tag :string(255)
+#  task_id    :string(255)
+#  created_at :datetime         not null
+#  updated_at :datetime         not null
+#
+# Indexes
+#
+#  index_user_trace_tasks_on_project_id  (project_id)
+#  index_user_trace_tasks_on_user_id     (user_id)
+#
+
+class UserTraceTask < ApplicationRecord
+
+  belongs_to :user 
+  belongs_to :project
+
+  
+end

app/services/admins/import_user_from_excel_service.rb

@@ -0,0 +1,71 @@
+class Admins::ImportUserFromExcelService < ApplicationService 
+  Error = Class.new(StandardError)
+
+  attr_reader :file, :result
+
+  def initialize(file)
+    @file = file 
+    @result = { success: 0, fail: [] }
+  end
+
+  def call 
+    raise Error, '文件不存在' if file.blank?
+    excel = Admins::NewImportUserFromExcel.new(file)
+
+    excel.read_each(&method(:save_user))
+    result 
+  rescue ApplicationImport::Error => ex 
+    raise Error, ex.message
+  end
+
+  private 
+  def save_user(data)
+    user = find_user(data)
+    if user.blank? 
+      create_user(data)
+      result[:success] +=1
+    else 
+      fail_data = data.as_json
+      fail_data[:data] = fail_data.values.join(",")
+      fail_data[:message] = '用户已存在'
+      result[:fail] << fail_data  
+    end
+
+  rescue Exception => ex 
+    fail_data = data.as_json
+    fail_data[:data] = fail_data.values.join(",")
+    fail_data[:message] = ex.message
+    result[:fail] << fail_data  
+  end
+
+  def create_user(data)
+    ActiveRecord::Base.transaction do 
+      username = data.login&.gsub(/\s+/, "")
+      email = data.email&.gsub(/\s+/, "")
+      password = data.password
+      nickname = data.nickname&.gsub(/\s+/, "")
+      raise Error, "无法使用以下关键词：#{username}，请重新命名" if ReversedKeyword.check_exists?(data.login)
+      Register::RemoteForm.new({username: username, email: email, password: password, platform: 'forge'}).validate!
+      user = User.new(admin: false, login: username, mail: email, nickname: nickname, platform: 'forge' , type: "User")
+      user.password = password
+      user.activate
+      raise Error, user.errors.full_messages.join(",") unless user.valid?
+      interactor = Gitea::RegisterInteractor.call({username: username, email: email, password: password})
+      if interactor.success?
+        gitea_user = interactor.result
+        result = Gitea::User::GenerateTokenService.call(username, password)
+        user.gitea_token = result['sha1']
+        user.gitea_uid = gitea_user[:body]['id']
+        UserExtension.create!(user_id: user.id) if user.save! 
+      else 
+        raise interactor.error, 'gitea user create error' 
+      end
+
+      user
+    end
+  end
+
+  def find_user(data)
+    User.find_by(login: data.login)
+  end
+end

app/services/branches/list_service.rb

@@ -1,17 +1,18 @@
 class Branches::ListService < ApplicationService
 
-  attr_reader :user, :project
+  attr_reader :user, :project, :name
 
-  def initialize(user, project)
+  def initialize(user, project, name=nil)
     @user = user
     @project = project
+    @name = name
   end
 
   def call
     all_branches = []
     user_name = user.try(:show_real_name)
     identifier = project.repository.try(:identifier)
-    get_all_branches = Gitea::Repository::Branches::ListService.new(user, identifier).call
+    get_all_branches = Gitea::Repository::Branches::ListService.new(user, identifier, name).call
     all_branches = branch_lists(user_name,user.try(:login), identifier, get_all_branches) if get_all_branches && get_all_branches.size > 0
     return all_branches
   end

app/services/gitea/repository/branches/list_name_service.rb

@@ -1,9 +1,10 @@
 class Gitea::Repository::Branches::ListNameService < Gitea::ClientService
-  attr_reader :user, :repo
+  attr_reader :user, :repo, :name
 
-  def initialize(user, repo)
+  def initialize(user, repo, name=nil)
     @user = user
     @repo = repo
+    @name = name
   end
 
   def call
@@ -13,7 +14,7 @@ class Gitea::Repository::Branches::ListNameService < Gitea::ClientService
 
   private
   def params
-    Hash.new.merge(token: user.gitea_token)
+    Hash.new.merge(token: user.gitea_token, name: name)
   end
 
   def url

app/services/gitea/repository/branches/list_service.rb

@@ -1,9 +1,10 @@
 class Gitea::Repository::Branches::ListService < Gitea::ClientService
-  attr_reader :user, :repo
+  attr_reader :user, :repo, :name
 
-  def initialize(user, repo)
+  def initialize(user, repo, name=nil)
     @user = user
     @repo = repo
+    @name = name
   end
 
   def call
@@ -13,7 +14,7 @@ class Gitea::Repository::Branches::ListService < Gitea::ClientService
 
   private
   def params
-    Hash.new.merge(token: user.gitea_token)
+    Hash.new.merge(token: user.gitea_token, name: name)
   end
 
   def url

app/services/organizations/create_service.rb

@@ -47,7 +47,7 @@ class Organizations::CreateService < ApplicationService
   end
 
   def create_org_and_extension
-    @organization = Organization.build(params[:name], params[:nickname], user.gitea_token)
+    @organization = Organization.build(params[:name], params[:nickname])
     org_extension = OrganizationExtension.build(organization.id, description, website,
                                                 location, repo_admin_change_team_access,
                                                 visibility, max_repo_creation)

app/services/pull_requests/create_service.rb

@@ -157,7 +157,7 @@ class PullRequests::CreateService < ApplicationService
     raise "head参数不能为空" if @params[:head].blank?
     raise "base参数不能为空" if @params[:base].blank?
     raise "fork_project_id参数错误" if is_original && !@project.forked_projects.pluck(:id).include?(@params[:fork_project_id].to_i)
-    raise "merge_user_login参数错误" if is_original && @project.fork_users.joins(:user).where(users: {login: @params[:merge_user_login]}).blank?
+    raise "merge_user_login参数错误" if is_original && @project.fork_users.joins(:owner).where(users: {login: @params[:merge_user_login]}).blank?
     raise "分支内容相同，无需创建合并请求" if @params[:head] === @params[:base] && !is_original
     raise "合并请求已存在" if @project&.pull_requests.where(head: @params[:head], base: @params[:base], status: 0, is_original: is_original, fork_project_id: @params[:fork_project_id]).present?
     raise @pull_issue.errors.full_messages.join(", ") unless pull_issue.valid?

app/services/trace/check_result_service.rb

@@ -1,11 +1,11 @@
 # 代码溯源 查询检测结果
 class Trace::CheckResultService < Trace::ClientService
 
-  attr_accessor :token, :project_name, :file_name, :page_num, :page_size
+  attr_accessor :token, :project, :file_name, :page_num, :page_size
 
-  def initialize(token, project_name=nil, file_name=nil, page_num=1, page_size=15) 
+  def initialize(token, project, file_name=nil, page_num=1, page_size=15) 
     @token = token 
-    @project_name = project_name 
+    @project = project
     @file_name = file_name
     @page_num = page_num
     @page_size = page_size
@@ -19,7 +19,7 @@ class Trace::CheckResultService < Trace::ClientService
   private 
   def request_params 
     {
-      product_name: project_name, 
+      product_name: Digest::MD5.hexdigest(project&.id.to_s)[0...20], 
       file_name: file_name,
       pageNum: page_num,
       pageSize: page_size,

app/services/trace/check_service.rb

@@ -11,26 +11,25 @@ class Trace::CheckService < Trace::ClientService
   end
 
   def call
-    result = authed_post(token, url, {data: request_params})
+    result = http_authed_post(token, url, {data: request_params})
     reponse = render_response(result)
   end
 
   private 
   def request_params 
-   repo = Gitea::Repository::GetService.call(project&.owner&.login, project&.identifier)
+   repo = Gitea::Repository::GetService.call(project&.owner, project&.identifier)
     {
-      product_name: project&.name, 
+      product_name: Digest::MD5.hexdigest(project&.id.to_s)[0...20], 
-      product_type: project&.category&.name,
+      product_type: project&.project_category&.name || '其他',
-      code_type: project&.language&.name,
+      code_type: project&.project_language&.name || '其他',
       product_desc: project&.description,
       git_url: repo['clone_url'],
       if_branch: if_branch,
       branch_tag: branch_tag
-    }
+    }.compact
   end
 
   def url 
     "/user/check".freeze
   end
 end
-

app/services/trace/client_service.rb

@@ -12,6 +12,19 @@ class Trace::ClientService < ApplicationService
     conn.post(full_url(url), params[:data]) 
   end
 
+  def http_authed_post(token, url, params={})
+    puts "[trace][POST] request params: #{params}"
+    puts "[trace][POST] request token: #{token}"
+    url = URI("#{full_url(url)}")
+    http = Net::HTTP.new(url.host, url.port)
+    http.read_timeout = 1200
+    request = Net::HTTP::Post.new(url)
+    request["Authorization"] = token
+    form_data = params[:data].stringify_keys.to_a
+    request.set_form form_data, 'multipart/form-data'
+    http.request(request)
+  end
+
   def get(url, params={})
     puts "[trace][GET] request params: #{params}"
     conn.get do |req|
@@ -100,6 +113,7 @@ class Trace::ClientService < ApplicationService
   end
 
   def render_response(response)
+    if response.is_a?(Faraday::Response) 
       status = response.status
       body = JSON.parse(response&.body)
 
@@ -107,4 +121,14 @@ class Trace::ClientService < ApplicationService
 
       return [body["code"], body["data"], body["error"]]
     end
+     
+    if response.is_a?(Net::HTTPOK)
+      status = 200
+      body = JSON.parse(response&.body)
+  
+      log_error(status, body)
+  
+      return [body["code"], body["data"], body["error"]]
+    end 
+  end
 end

app/services/trace/pdf_report_service.rb

@@ -1,4 +1,7 @@
 # 代码溯源 导出pdf
+require 'open-uri'
+require 'fileutils'
+
 class Trace::PdfReportService < Trace::ClientService
   
   attr_accessor :token, :task_id 
@@ -9,15 +12,23 @@ class Trace::PdfReportService < Trace::ClientService
   end
 
   def call 
-    result = authed_get(token, url, request_params)
+    content = open("#{domain}#{base_url}#{url}?task_id=#{task_id}", "Authorization" => token)
-    response = render_response(result)
+    if content.is_a?(Tempfile)
+      check_file_path
+      IO.copy_stream(content, "#{save_path}/#{task_id}.pdf")
+      return {code: 200, download_url: "/trace_task_results/#{task_id}.pdf"}
+    else 
+      return {code: 404}
+    end
   end
 
   private 
-  def request_params 
+  def check_file_path 
-    {
+    FileUtils.mkdir_p save_path
-      task_id: task_id
+  end
-    }
+
+  def save_path 
+    "public/trace_task_results"
   end
 
   def url

app/views/admins/shared/_sidebar.html.erb

@@ -45,6 +45,11 @@
     <li>
       <%= sidebar_item_group('#setting-glcc', 'GLCC配置', icon: 'fire') do %>
         <li><%= sidebar_item(admins_topic_glcc_news_index_path, '新闻稿管理', icon: 'edit', controller: 'admins-topic-glcc_news') %></li>
+        <li>
+          <% if EduSetting.get("glcc_apply_informations_admin_url")%>
+            <%= sidebar_item(EduSetting.get("glcc_apply_informations_admin_url"), '报名列表', icon: 'user', controller: 'root') %>
+          <% end %>
+        </li>
       <% end %>
     </li>
     <li>

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

@@ -31,7 +31,9 @@
     <%= submit_tag('搜索', class: 'btn btn-primary ml-3', 'data-disable-with': '搜索中...') %>
   <% end %>
 
-  <%= javascript_void_link '导入用户', class: 'btn btn-secondary btn-sm', data: { toggle: 'modal', target: '.admin-import-user-modal'} %>
+  <%= link_to '下载导入模板', "/导入用户模板.xlsx", class: 'btn btn-secondary mr-3' %>
+
+  <%= javascript_void_link '导入用户', class: 'btn btn-secondary', data: { toggle: 'modal', target: '.admin-import-user-modal'} %>
   
 </div>
 

app/views/compare/show.json.jbuilder

@@ -1,7 +1,7 @@
-json.commits_count @compare_result['Commits']&.size
+json.commits_count @compare_result['CommitsCount']
 # json.commits @compare_result['Commits'], partial: 'pull_requests/commit', as: :commit
 json.commits do
-  json.array! @compare_result['Commits'] do |commit|
+  json.array! @compare_result['Commits'][@page_offset...(@page_offset + @page_limit)] do |commit|
     json.author do
       json.partial! 'repositories/commit_author', locals: { user: render_cache_commit_author(commit['Committer']), name: commit['Committer']['Name'] }
     end

app/views/projects/fork_users.json.jbuilder

@@ -1,7 +1,7 @@
 json.count @forks_count
 json.users do
   json.array! @fork_users.each do |f|
-    user = f.user.present? ? f.user : Organization.find_by(id: f.user_id)
+    user = f.owner.present? ? f.owner : Organization.find_by(id: f.user_id)
     json.id f.fork_project.id
     json.identifier f.fork_project.identifier
     json.name "#{user.try(:show_real_name)}/#{f.fork_project.try(:name)}"

app/views/repositories/_simple_entry.json.jbuilder

@@ -9,7 +9,10 @@ if @project.forge?
   json.path entry['path']
   json.type entry['type']
   json.size entry['size']
-
+  is_readme = is_readme?(entry['type'], entry['name'])
+  if is_readme 
+    json.replace_content readme_decode64_content(entry, @owner, @repository, @ref, @path)
+  end
   json.content (direct_download || image_type || is_dir) ? nil : decode64_content(entry, @owner, @repository, @ref, @path)
   json.target entry['target']
   
@@ -25,7 +28,7 @@ if @project.forge?
 
   json.direct_download direct_download
   json.image_type image_type
-  json.is_readme_file is_readme?(entry['type'], entry['name'])
+  json.is_readme_file is_readme
   json.commit do
     json.partial! 'last_commit', latest_commit: entry['latest_commit']
   end

app/views/users/get_user_info.json.jbuilder

@@ -22,5 +22,7 @@ json.province @user.province
 json.city @user.city
 json.custom_department @user.custom_department
 json.description @user.description
-json.(@user, :show_email, :show_department, :show_location)
+json.super_description @user.super_description
+json.(@user, :show_email, :show_department, :show_location, :show_super_description)
 json.message_unread_total @message_unread_total
+json.has_trace_user @user.trace_user.present?

app/views/users/show.json.jbuilder

@@ -13,4 +13,6 @@ 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.super_description @user.show_super_description ? @user.super_description : nil
+json.show_super_description @user.show_super_description
 json.description @user.description

config/locales/forms/create_issuse_form.zh-CN.yml

@@ -3,5 +3,11 @@
     attributes:
       issues/create_form:
         subject: 标题
+        description: 描述
       issues/update_form:
         subject: 标题
+        description: 描述
+      journals/create_form:
+        notes: 评论
+      journals/update_form:
+        notes: 评论

config/routes.rb

@@ -225,6 +225,7 @@ Rails.application.routes.draw do
         get :fan_users
         get :hovercard
         put :update_image
+        get :get_image
       end
       collection do
         post :following
@@ -426,6 +427,20 @@ Rails.application.routes.draw do
       end
     end
 
+    namespace :traces do 
+      resources :trace_users, only: [:create]
+      scope "/:owner/:repo" do 
+        resource :projects, path: '/', only: [:index] do
+          member do 
+            post :tasks
+            get :task_results
+            get :reload_task
+            get :task_pdf
+          end
+        end
+      end
+    end
+
     # Project Area START
     scope "/:owner/:repo" do
       scope do
@@ -446,6 +461,7 @@ Rails.application.routes.draw do
           get :stargazers, to: 'projects#praise_users'
           get :forks, to: 'projects#fork_users'
           match :about, :via => [:get, :put, :post]
+          post :quit
         end
       end
 

db/migrate/20220428015313_add_super_description_to_user_extensions.rb

@@ -0,0 +1,6 @@
+class AddSuperDescriptionToUserExtensions < ActiveRecord::Migration[5.2]
+  def change
+    add_column :user_extensions, :super_description, :text, :limit => 4294967295
+    add_column :user_extensions, :show_super_description, :boolean, default: false
+  end
+end

db/migrate/20220506083813_change_issues_description_and_journals_notes_column.rb

@@ -0,0 +1,7 @@
+class ChangeIssuesDescriptionAndJournalsNotesColumn < ActiveRecord::Migration[5.2]
+  def change
+    change_column :issues, :description, :text, :limit => 4294967295
+    change_column :journals, :notes, :text, :limit => 4294967295
+    change_column :pull_requests, :body, :text, :limit => 4294967295
+  end
+end

db/migrate/20220513061129_create_user_trace_tasks.rb

@@ -0,0 +1,12 @@
+class CreateUserTraceTasks < ActiveRecord::Migration[5.2]
+  def change
+    create_table :user_trace_tasks do |t|
+      t.references :user 
+      t.references :project
+      t.string :branch_tag
+      t.string :task_id
+      
+      t.timestamps
+    end
+  end
+end

public/docs/api.html

@@ -543,6 +543,26 @@
                   </li>
               </ul>
           </li>
+          <li>
+            <a href="#traces" class="toc-h1 toc-link" data-title="Traces">Traces</a>
+              <ul class="toc-list-h2">
+                  <li>
+                    <a href="#ca438fc3ca" class="toc-h2 toc-link" data-title="代码溯源初始化">代码溯源初始化</a>
+                  </li>
+                  <li>
+                    <a href="#bb16c601f1" class="toc-h2 toc-link" data-title="代码分析结果列表">代码分析结果列表</a>
+                  </li>
+                  <li>
+                    <a href="#32497859e0" class="toc-h2 toc-link" data-title="新建分析">新建分析</a>
+                  </li>
+                  <li>
+                    <a href="#7b3a48e274" class="toc-h2 toc-link" data-title="重新扫描">重新扫描</a>
+                  </li>
+                  <li>
+                    <a href="#87775b1430" class="toc-h2 toc-link" data-title="下载报告">下载报告</a>
+                  </li>
+              </ul>
+          </li>
           <li>
             <a href="#pulls" class="toc-h1 toc-link" data-title="Pulls">Pulls</a>
               <ul class="toc-list-h2">
@@ -4968,7 +4988,7 @@ http://localhost:3000/api/yystopf/ceshi/menu_list  | jq
 <tr>
 <td>menu_name</td>
 <td>string</td>
-<td>导航名称， home:主页,code:代码库,issues:疑修,pulls:合并请求,devops:工作流,versions:里程碑,activity:动态,setting:仓库设置</td>
+<td>导航名称， home:主页,code:代码库,issues:疑修,pulls:合并请求,devops:工作流,versions:里程碑,wiki:维基,services:服务,activity:动态,setting:仓库设置</td>
 </tr>
 </tbody></table>
 
@@ -5131,7 +5151,7 @@ http://localhost:3000/api/yystopf/ceshi/project_units.json
 <td>是</td>
 <td></td>
 <td>array</td>
-<td>项目模块内容， 支持以下参数:code:代码库,issues:疑修,pulls:合并请求,devops:工作流,versions:里程碑</td>
+<td>项目模块内容， 支持以下参数:code:代码库,issues:疑修,pulls:合并请求,devops:工作流,versions:里程碑,wiki:维基,resources:资源库,services:服务</td>
 </tr>
 </tbody></table>
 <h3 id='7447e4874e-2'>返回字段说明:</h3>
@@ -9302,6 +9322,289 @@ http://localhost:3000/api/yystopf/ceshi/webhooks/3/test.json
 <aside class="success">
   Success Data.
 </aside>
+<h1 id='traces'>Traces</h1><h2 id='ca438fc3ca'>代码溯源初始化</h2>
+<p>用户同意协议后请求的接口，创建代码溯源的账号</p>
+
+<blockquote>
+<p>示例:</p>
+</blockquote>
+<div class="highlight"><pre class="highlight shell tab-shell"><code>curl <span class="nt">-X</span> POST <span class="se">\</span>
+http://localhost:3000/api/traces/trace_users.json
+</code></pre></div><div class="highlight"><pre class="highlight javascript tab-javascript"><code><span class="k">await</span> <span class="nx">octokit</span><span class="p">.</span><span class="nx">request</span><span class="p">(</span><span class="dl">'</span><span class="s1">POST /api/traces/trace_users.json</span><span class="dl">'</span><span class="p">)</span>
+</code></pre></div><h3 id='http'>HTTP 请求</h3>
+<p><code>POST api/traces/trace_users.json</code></p>
+
+<blockquote>
+<p>返回的JSON示例:</p>
+</blockquote>
+<div class="highlight"><pre class="highlight json tab-json"><code><span class="p">{</span><span class="w">
+    </span><span class="nl">"status"</span><span class="p">:</span><span class="w"> </span><span class="mi">0</span><span class="p">,</span><span class="w">
+    </span><span class="nl">"message"</span><span class="p">:</span><span class="w"> </span><span class="s2">"success"</span><span class="w">
+</span><span class="p">}</span><span class="w">
+</span></code></pre></div>
+<aside class="success">
+Success — a happy kitten is an authenticated kitten!
+</aside>
+<h2 id='bb16c601f1'>代码分析结果列表</h2>
+<p>查询项目下代码分析的结果</p>
+
+<blockquote>
+<p>示例:</p>
+</blockquote>
+<div class="highlight"><pre class="highlight shell tab-shell"><code>curl <span class="nt">-X</span> GET <span class="se">\</span>
+http://localhost:3000/api/traces/yystopf/many_branch/task_results.json
+</code></pre></div><div class="highlight"><pre class="highlight javascript tab-javascript"><code><span class="k">await</span> <span class="nx">octokit</span><span class="p">.</span><span class="nx">request</span><span class="p">(</span><span class="dl">'</span><span class="s1">GET /api/traces/:owner/:repo/task_results.json</span><span class="dl">'</span><span class="p">)</span>
+</code></pre></div><h3 id='http-2'>HTTP 请求</h3>
+<p><code>GET api/traces/:owner/:repo/task_results.json</code></p>
+<h3 id='1f9ac54b15'>请求参数</h3>
+<table><thead>
+<tr>
+<th>参数</th>
+<th>必选</th>
+<th>默认</th>
+<th>类型</th>
+<th>字段说明</th>
+</tr>
+</thead><tbody>
+<tr>
+<td>owner</td>
+<td>是</td>
+<td>否</td>
+<td>string</td>
+<td>项目所有者标识</td>
+</tr>
+<tr>
+<td>repo</td>
+<td>是</td>
+<td>否</td>
+<td>string</td>
+<td>项目标识</td>
+</tr>
+<tr>
+<td>page</td>
+<td>否</td>
+<td>1</td>
+<td>int</td>
+<td>页码</td>
+</tr>
+<tr>
+<td>limit</td>
+<td>否</td>
+<td>15</td>
+<td>int</td>
+<td>每页数量</td>
+</tr>
+</tbody></table>
+<h3 id='90889036d2'>返回字段说明（暂缺）</h3>
+<!-- 参数  | 类型 | 字段说明
+--------- | ----------- | -----------
+total_count              |int   |总数 |
+public_keys.id           |int   |ID|
+public_keys.name         |string|密钥标题|
+public_keys.content      |string|密钥内容|
+public_keys.fingerprint  |string|密钥标识|
+public_keys.created_time |string|密钥创建时间| -->
+
+<blockquote>
+<p>返回的JSON示例:</p>
+</blockquote>
+<div class="highlight"><pre class="highlight json tab-json"><code><span class="p">{</span><span class="w">
+    </span><span class="nl">"data"</span><span class="p">:</span><span class="w"> </span><span class="p">[</span><span class="w">
+        </span><span class="p">{</span><span class="w">
+            </span><span class="nl">"accuracy"</span><span class="p">:</span><span class="w"> </span><span class="s2">"20"</span><span class="p">,</span><span class="w">
+            </span><span class="nl">"code_type"</span><span class="p">:</span><span class="w"> </span><span class="s2">"C"</span><span class="p">,</span><span class="w">
+            </span><span class="nl">"depth"</span><span class="p">:</span><span class="w"> </span><span class="s2">"2"</span><span class="p">,</span><span class="w">
+            </span><span class="nl">"detect_flag"</span><span class="p">:</span><span class="w"> </span><span class="s2">"快速-组件级"</span><span class="p">,</span><span class="w">
+            </span><span class="nl">"detect_rule"</span><span class="p">:</span><span class="w"> </span><span class="s2">"快速-组件级,2,20,,开源软件,50,10"</span><span class="p">,</span><span class="w">
+            </span><span class="nl">"detect_startdate"</span><span class="p">:</span><span class="w"> </span><span class="s2">"2022-05-10 15:59:46 "</span><span class="p">,</span><span class="w">
+            </span><span class="nl">"detect_status"</span><span class="p">:</span><span class="w"> </span><span class="s2">"fail"</span><span class="p">,</span><span class="w">
+            </span><span class="nl">"detectflag"</span><span class="p">:</span><span class="w"> </span><span class="s2">"快速-组件级"</span><span class="p">,</span><span class="w">
+            </span><span class="nl">"fail_reason"</span><span class="p">:</span><span class="w"> </span><span class="s2">"Invalid package type"</span><span class="p">,</span><span class="w">
+            </span><span class="nl">"file_name"</span><span class="p">:</span><span class="w"> </span><span class="s2">"many_branch.zip"</span><span class="p">,</span><span class="w">
+            </span><span class="nl">"license_process"</span><span class="p">:</span><span class="w"> </span><span class="s2">"100"</span><span class="p">,</span><span class="w">
+            </span><span class="nl">"licenseparam"</span><span class="p">:</span><span class="w"> </span><span class="s2">"开源软件"</span><span class="p">,</span><span class="w">
+            </span><span class="nl">"package_type"</span><span class="p">:</span><span class="w"> </span><span class="s2">""</span><span class="p">,</span><span class="w">
+            </span><span class="nl">"product_name"</span><span class="p">:</span><span class="w"> </span><span class="s2">"84727546110"</span><span class="p">,</span><span class="w">
+            </span><span class="nl">"project_id"</span><span class="p">:</span><span class="w"> </span><span class="s2">"6dbc3e42-5857-4ca4-a54d-58fd9dbf6dc5"</span><span class="p">,</span><span class="w">
+            </span><span class="nl">"sim_process"</span><span class="p">:</span><span class="w"> </span><span class="s2">"100"</span><span class="p">,</span><span class="w">
+            </span><span class="nl">"similarity_process"</span><span class="p">:</span><span class="w"> </span><span class="s2">"2"</span><span class="p">,</span><span class="w">
+            </span><span class="nl">"task_id"</span><span class="p">:</span><span class="w"> </span><span class="s2">"15139171-091b-4316-98b1-6068970efa44"</span><span class="p">,</span><span class="w">
+            </span><span class="nl">"totalsize"</span><span class="p">:</span><span class="w"> </span><span class="mi">5</span><span class="p">,</span><span class="w">
+            </span><span class="nl">"uid"</span><span class="p">:</span><span class="w"> </span><span class="s2">"78"</span><span class="p">,</span><span class="w">
+            </span><span class="nl">"vuln_process"</span><span class="p">:</span><span class="w"> </span><span class="s2">""</span><span class="p">,</span><span class="w">
+            </span><span class="nl">"vulnlevel"</span><span class="p">:</span><span class="w"> </span><span class="s2">""</span><span class="w">
+        </span><span class="p">}</span><span class="w">
+    </span><span class="p">]</span><span class="w">
+</span><span class="p">}</span><span class="w">
+</span></code></pre></div>
+<aside class="success">
+Success — a happy kitten is an authenticated kitten!
+</aside>
+<h2 id='32497859e0'>新建分析</h2>
+<p>用户选择仓库分支进行代码分析的接口</p>
+
+<blockquote>
+<p>示例:</p>
+</blockquote>
+<div class="highlight"><pre class="highlight shell tab-shell"><code>curl <span class="nt">-X</span> POST <span class="se">\</span>
+http://localhost:3000/api/traces/yystopf/many_branch/tasks.json
+</code></pre></div><div class="highlight"><pre class="highlight javascript tab-javascript"><code><span class="k">await</span> <span class="nx">octokit</span><span class="p">.</span><span class="nx">request</span><span class="p">(</span><span class="dl">'</span><span class="s1">POST /api/traces/:owner/:repo/tasks.json</span><span class="dl">'</span><span class="p">)</span>
+</code></pre></div><h3 id='http-3'>HTTP 请求</h3>
+<p><code>POST api/traces/:owner/:repo/tasks.json</code></p>
+<h3 id='1f9ac54b15-2'>请求参数</h3>
+<table><thead>
+<tr>
+<th>参数</th>
+<th>必选</th>
+<th>默认</th>
+<th>类型</th>
+<th>字段说明</th>
+</tr>
+</thead><tbody>
+<tr>
+<td>owner</td>
+<td>是</td>
+<td>否</td>
+<td>string</td>
+<td>项目所有者标识</td>
+</tr>
+<tr>
+<td>repo</td>
+<td>是</td>
+<td>否</td>
+<td>string</td>
+<td>项目标识</td>
+</tr>
+<tr>
+<td>branch_name</td>
+<td>是</td>
+<td>否</td>
+<td>string</td>
+<td>分支名称</td>
+</tr>
+</tbody></table>
+
+<blockquote>
+<p>返回的JSON示例:</p>
+</blockquote>
+<div class="highlight"><pre class="highlight json tab-json"><code><span class="p">{</span><span class="w">
+    </span><span class="nl">"status"</span><span class="p">:</span><span class="w"> </span><span class="mi">0</span><span class="p">,</span><span class="w">
+    </span><span class="nl">"message"</span><span class="p">:</span><span class="w"> </span><span class="s2">"success"</span><span class="w">
+</span><span class="p">}</span><span class="w">
+</span></code></pre></div>
+<aside class="success">
+Success — a happy kitten is an authenticated kitten!
+</aside>
+<h2 id='7b3a48e274'>重新扫描</h2>
+<p>对代码分析结果进行再次分析</p>
+
+<blockquote>
+<p>示例:</p>
+</blockquote>
+<div class="highlight"><pre class="highlight shell tab-shell"><code>curl <span class="nt">-X</span> GET <span class="se">\</span>
+http://localhost:3000/api/traces/yystopf/many_branch/reload_task.json
+</code></pre></div><div class="highlight"><pre class="highlight javascript tab-javascript"><code><span class="k">await</span> <span class="nx">octokit</span><span class="p">.</span><span class="nx">request</span><span class="p">(</span><span class="dl">'</span><span class="s1">GET /api/traces/:owner/:repo/reload_task.json</span><span class="dl">'</span><span class="p">)</span>
+</code></pre></div><h3 id='http-4'>HTTP 请求</h3>
+<p><code>GET api/traces/:owner/:repo/reload_task.json</code></p>
+<h3 id='1f9ac54b15-3'>请求参数</h3>
+<table><thead>
+<tr>
+<th>参数</th>
+<th>必选</th>
+<th>默认</th>
+<th>类型</th>
+<th>字段说明</th>
+</tr>
+</thead><tbody>
+<tr>
+<td>owner</td>
+<td>是</td>
+<td>否</td>
+<td>string</td>
+<td>项目所有者标识</td>
+</tr>
+<tr>
+<td>repo</td>
+<td>是</td>
+<td>否</td>
+<td>string</td>
+<td>项目标识</td>
+</tr>
+<tr>
+<td>project_id</td>
+<td>是</td>
+<td>否</td>
+<td>string</td>
+<td>代码分析结果里的project_id</td>
+</tr>
+</tbody></table>
+
+<blockquote>
+<p>返回的JSON示例:</p>
+</blockquote>
+<div class="highlight"><pre class="highlight json tab-json"><code><span class="p">{</span><span class="w">
+    </span><span class="nl">"status"</span><span class="p">:</span><span class="w"> </span><span class="mi">0</span><span class="p">,</span><span class="w">
+    </span><span class="nl">"message"</span><span class="p">:</span><span class="w"> </span><span class="s2">"success"</span><span class="w">
+</span><span class="p">}</span><span class="w">
+</span></code></pre></div>
+<aside class="success">
+Success — a happy kitten is an authenticated kitten!
+</aside>
+<h2 id='87775b1430'>下载报告</h2>
+<p>把代码分析的结果下载到本地</p>
+
+<blockquote>
+<p>示例:</p>
+</blockquote>
+<div class="highlight"><pre class="highlight shell tab-shell"><code>curl <span class="nt">-X</span> GET <span class="se">\</span>
+http://localhost:3000/api/traces/yystopf/many_branch/task_pdf.json
+</code></pre></div><div class="highlight"><pre class="highlight javascript tab-javascript"><code><span class="k">await</span> <span class="nx">octokit</span><span class="p">.</span><span class="nx">request</span><span class="p">(</span><span class="dl">'</span><span class="s1">GET /api/traces/:owner/:repo/task_pdf.json</span><span class="dl">'</span><span class="p">)</span>
+</code></pre></div><h3 id='http-5'>HTTP 请求</h3>
+<p><code>GET api/traces/:owner/:repo/task_pdf.json</code></p>
+<h3 id='1f9ac54b15-4'>请求参数</h3>
+<table><thead>
+<tr>
+<th>参数</th>
+<th>必选</th>
+<th>默认</th>
+<th>类型</th>
+<th>字段说明</th>
+</tr>
+</thead><tbody>
+<tr>
+<td>owner</td>
+<td>是</td>
+<td>否</td>
+<td>string</td>
+<td>项目所有者标识</td>
+</tr>
+<tr>
+<td>repo</td>
+<td>是</td>
+<td>否</td>
+<td>string</td>
+<td>项目标识</td>
+</tr>
+<tr>
+<td>task_id</td>
+<td>是</td>
+<td>否</td>
+<td>string</td>
+<td>代码分析结果里的task_id</td>
+</tr>
+</tbody></table>
+
+<blockquote>
+<p>返回的JSON示例:</p>
+</blockquote>
+<div class="highlight"><pre class="highlight json tab-json"><code><span class="p">{</span><span class="w">
+    </span><span class="nl">"status"</span><span class="p">:</span><span class="w"> </span><span class="mi">0</span><span class="p">,</span><span class="w">
+    </span><span class="nl">"message"</span><span class="p">:</span><span class="w"> </span><span class="s2">"success"</span><span class="w">
+</span><span class="p">}</span><span class="w">
+</span></code></pre></div>
+<aside class="success">
+Success — a happy kitten is an authenticated kitten!
+</aside>
 <h1 id='pulls'>Pulls</h1><h2 id='get-a-pull-request'>Get a pull request</h2>
 <p>获取合并请求详情接口</p>
 

spec/models/user_trace_task_spec.rb

@@ -0,0 +1,5 @@
+require 'rails_helper'
+
+RSpec.describe UserTraceTask, type: :model do
+  pending "add some examples to (or delete) #{__FILE__}"
+end