Merge branch 'standalone_develop' into pre_trustie_server

# Conflicts: # app/controllers/api/v1/issues_controller.rb # app/models/identity_verification.rb # app/models/issue.rb # app/models/journal.rb # app/services/api/v1/issues/list_service.rb
2026-05-03 03:40:49 +08:00 · 2023-12-15 10:40:58 +08:00
parent 4b57e96914 d98ad8a3f4
commit d4b46dbf97
33 changed files with 298 additions and 103 deletions
--- a/app/models/attachment.rb
+++ b/app/models/attachment.rb
@@ -1,44 +1,45 @@
-# == Schema Information
-#
-# Table name: attachments
-#
-#  id                        :integer          not null, primary key
-#  container_id              :integer
-#  container_type            :string(30)
-#  filename                  :string(255)      default(""), not null
-#  disk_filename             :string(255)      default(""), not null
-#  filesize                  :integer          default("0"), not null
-#  content_type              :string(255)      default("")
-#  digest                    :string(60)       default(""), not null
-#  downloads                 :integer          default("0"), not null
-#  author_id                 :integer          default("0"), not null
-#  created_on                :datetime
-#  description               :text(65535)
-#  disk_directory            :string(255)
-#  attachtype                :integer          default("1")
-#  is_public                 :integer          default("1")
-#  copy_from                 :integer
-#  quotes                    :integer          default("0")
-#  is_publish                :integer          default("1")
-#  publish_time              :datetime
-#  resource_bank_id          :integer
-#  unified_setting           :boolean          default("1")
-#  cloud_url                 :string(255)      default("")
-#  course_second_category_id :integer          default("0")
-#  delay_publish             :boolean          default("0")
-#  memo_image                :boolean          default("0")
-#  extra_type                :integer          default("0")
-#
-# Indexes
-#
-#  index_attachments_on_author_id                        (author_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)
-#
-
+# == Schema Information
+#
+# Table name: attachments
+#
+#  id                        :integer          not null, primary key
+#  container_id              :integer
+#  container_type            :string(30)
+#  filename                  :string(255)      default(""), not null
+#  disk_filename             :string(255)      default(""), not null
+#  filesize                  :integer          default("0"), not null
+#  content_type              :string(255)      default("")
+#  digest                    :string(60)       default(""), not null
+#  downloads                 :integer          default("0"), not null
+#  author_id                 :integer          default("0"), not null
+#  created_on                :datetime
+#  description               :text(65535)
+#  disk_directory            :string(255)
+#  attachtype                :integer          default("1")
+#  is_public                 :integer          default("1")
+#  copy_from                 :integer
+#  quotes                    :integer          default("0")
+#  is_publish                :integer          default("1")
+#  publish_time              :datetime
+#  resource_bank_id          :integer
+#  unified_setting           :boolean          default("1")
+#  cloud_url                 :string(255)      default("")
+#  course_second_category_id :integer          default("0")
+#  delay_publish             :boolean          default("0")
+#  memo_image                :boolean          default("0")
+#  extra_type                :integer          default("0")
+#  uuid                      :string(255)
+#
+# Indexes
+#
+#  index_attachments_on_author_id                        (author_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)
+#
+



@@ -68,6 +69,7 @@ class Attachment < ApplicationRecord
  scope :simple_columns,                -> { select(:id, :filename, :filesize, :created_on, :cloud_url, :author_id, :content_type, :container_type, :container_id) }
  scope :search_by_container,           -> (ids) {where(container_id: ids)}
  scope :unified_setting, -> {where("unified_setting = ? ", 1)}
+  scope :where_id_or_uuid, -> (id) { (Float(id) rescue nil).present? ? where(id: id) : where(uuid: id) }

  validates_length_of :description, maximum: 100, message: "不能超过100个字符"

@@ -97,6 +99,11 @@ class Attachment < ApplicationRecord
    downloads
  end

+  def generate_uuid
+    self.uuid = uuid || SecureRandom.uuid
+    save!
+  end
+
  def quotes_count
    quotes.nil? ? 0 : quotes
  end
--- a/app/models/identity_verification.rb
+++ b/app/models/identity_verification.rb
@@ -6,10 +6,10 @@
 #  user_id         :integer          not null
 #  number          :string(255)      not null
 #  name            :string(255)      not null
-#  card_front      :integer
-#  card_back       :integer
-#  hold_card_front :integer
-#  hold_card_back  :integer
+#  card_front      :string(255)
+#  card_back       :string(255)
+#  hold_card_front :string(255)
+#  hold_card_back  :string(255)
 #  state           :integer          default("0")
 #  description     :string(255)
 #  created_at      :datetime         not null
@@ -24,9 +24,9 @@ class IdentityVerification < ApplicationRecord
    belongs_to :user
    enum state: { "待审核": 0, "已通过": 1, "已拒绝": 2}
    after_create do
-        Attachment.where(id:[card_front,card_back,hold_card_front,hold_card_back]).update_all(is_public:0)
+        Attachment.where(uuid:[card_front,card_back,hold_card_front,hold_card_back]).update_all(is_public:0)
    end
-    
+
    after_save do
        if state == "已通过"
            user.update(id_card_verify: true, website_permission: true)
@@ -34,18 +34,18 @@ class IdentityVerification < ApplicationRecord
    end

    def card_front_attachment
-        Attachment.find_by_id card_front
+        Attachment.where_id_or_uuid(card_front).first
    end
    
    def card_back_attachment
-        Attachment.find_by_id card_back
+        Attachment.where_id_or_uuid(card_back).first
    end

    def hold_card_front_attachment
-        Attachment.find_by_id hold_card_front
+        Attachment.where_id_or_uuid(hold_card_front).first
    end

    def hold_card_back_attachment
-        Attachment.find_by_id hold_card_back
+        Attachment.where_id_or_uuid(hold_card_back).first
    end
 end
--- a/app/models/issue.rb
+++ b/app/models/issue.rb
@@ -34,6 +34,8 @@
 #  ref_name             :string(255)
 #  branch_name          :string(255)
 #  blockchain_token_num :integer
+#  pm_project_id        :integer
+#  pm_sprint_id         :integer
 #
 # Indexes
 #
@@ -222,17 +224,27 @@ class Issue < ApplicationRecord

  # 关附件到功能
  def associate_attachment_container
+    return if self.project_id == 0
    att_ids = []
    # 附件的格式为（/api/attachments/ + 附件id）的形式，提取出id进行附件属性关联，做附件访问权限控制
    att_ids += self.description.to_s.scan(/\(\/api\/attachments\/.+\)/).map{|s|s.match(/\d+/)[0]}
    att_ids += self.description.to_s.scan(/\/api\/attachments\/.+\"/).map{|s|s.match(/\d+/)[0]}
    att_ids += self.description.to_s.scan(/\/api\/attachments\/\d+/).map{|s|s.match(/\d+/)[0]}
    if att_ids.present?
-      Attachment.where(id: att_ids).where("container_type IS NULL OR container_type = 'Issue'").update_all(container_id: self.project_id, container_type: "Project")
+      Attachment.where(id: att_ids).where("container_type IS NULL OR container_type = 'Issue'").update_all(container_id: self.project_id, container_type: 'Project')
+    end
+
+    att_ids2 = []
+    # uuid_regex= /[0-9a-fA-F]{8}-[0-9a-fA-F]{4}-[0-9a-fA-F]{4}-[0-9a-fA-F]{4}-[0-9a-fA-F]{12}/
+    # 附件的格式为（/api/attachments/ + uuid）的形式，提取出id进行附件属性关联，做附件访问权限控制
+    att_ids2 += self.description.to_s.scan(/\(\/api\/attachments\/[0-9a-fA-F]{8}-[0-9a-fA-F]{4}-[0-9a-fA-F]{4}-[0-9a-fA-F]{4}-[0-9a-fA-F]{12}\)/).map{|s|s.match(/[0-9a-fA-F]{8}-[0-9a-fA-F]{4}-[0-9a-fA-F]{4}-[0-9a-fA-F]{4}-[0-9a-fA-F]{12}/)[0]}
+    att_ids2 += self.description.to_s.scan(/\/api\/attachments\/[0-9a-fA-F]{8}-[0-9a-fA-F]{4}-[0-9a-fA-F]{4}-[0-9a-fA-F]{4}-[0-9a-fA-F]{12}/).map{|s|s.match(/[0-9a-fA-F]{8}-[0-9a-fA-F]{4}-[0-9a-fA-F]{4}-[0-9a-fA-F]{4}-[0-9a-fA-F]{12}/)[0]}
+    if att_ids2.present?
+      Attachment.where(uuid: att_ids2).where("container_type IS NULL OR container_type = 'Issue'").update_all(container_id: self.project_id, container_type: 'Project')
    end
  end

-  def to_builder 
+  def to_builder
    Jbuilder.new do |issue|
      issue.(self, :id, :project_issues_index, :subject, :description, :branch_name, :start_date, :due_date)
      issue.created_at self.created_on.strftime("%Y-%m-%d %H:%M")
--- a/app/models/issue_tag.rb
+++ b/app/models/issue_tag.rb
@@ -32,18 +32,7 @@ class IssueTag < ApplicationRecord
  validates :name, uniqueness: {scope: :project_id, message: "已存在" }

  def self.init_data(project_id)
-    data = [
-      ["缺陷", "表示存在意外问题或错误", "#d92d4c"],
-      ["功能", "表示新功能申请", "#ee955a"],
-      ["疑问", "表示存在疑惑", "#2d6ddc"],
-      ["支持", "表示特定功能或特定需求", "#019549"],
-      ["任务", "表示需要分配的任务", "#c1a30d"],
-      ["协助", "表示需要社区用户协助", "#2a0dc1"],
-      ["搁置", "表示此问题暂时不会继续处理", "#892794"],
-      ["文档", "表示文档材料补充", "#9ed600"],
-      ["测试", "表示需要测试的需求", "#2897b9"],
-      ["重复", "表示已存在类似的疑修", "#bb5332"]
-    ]
+    data = init_issue_tag_data
    data.each do |item| 
      next if IssueTag.exists?(project_id: project_id, name: item[0])
      IssueTag.create!(project_id: project_id, name: item[0], description: item[1], color: item[2])
@@ -57,6 +46,34 @@ class IssueTag < ApplicationRecord
  end


+  def  self.init_issue_tag_data
+    [
+      ["缺陷", "表示存在意外问题或错误", "#d92d4c"],
+      ["功能", "表示新功能申请", "#ee955a"],
+      ["疑问", "表示存在疑惑", "#2d6ddc"],
+      ["支持", "表示特定功能或特定需求", "#019549"],
+      ["任务", "表示需要分配的任务", "#c1a30d"],
+      ["协助", "表示需要社区用户协助", "#2a0dc1"],
+      ["搁置", "表示此问题暂时不会继续处理", "#892794"],
+      ["文档", "表示文档材料补充", "#9ed600"],
+      ["测试", "表示需要测试的需求", "#2897b9"],
+      ["重复", "表示已存在类似的疑修", "#bb5332"]
+    ]
+  end
+
+  def self.init_mp_issues_tags
+    data = {"total_count": 10,}
+    data["issue_tags"] = init_issue_tag_data.map{|item|
+      {
+        "name":  item[0],
+        "description": item[1],
+        "color": item[2],
+      }
+    }
+    data
+  end
+
+
  def to_builder 
    Jbuilder.new do |tag|
      tag.(self, :id, :name, :description)
--- a/app/models/journal.rb
+++ b/app/models/journal.rb
@@ -61,6 +61,7 @@ class Journal < ApplicationRecord

  # 关附件到功能
  def associate_attachment_container
+    return if self.issue&.project_id.to_i == 0
    att_ids = []
    # 附件的格式为（/api/attachments/ + 附件id）的形式，提取出id进行附件属性关联，做附件访问权限控制
    att_ids += self.notes.to_s.scan(/\(\/api\/attachments\/.+\)/).map{|s|s.match(/\d+/)[0]}
@@ -69,18 +70,27 @@ class Journal < ApplicationRecord
    if att_ids.present?
      Attachment.where(id: att_ids).where("container_type IS NULL OR container_type = 'Journal'").update_all(container_id: self.issue.project_id, container_type: "Project")
    end
+
+    att_ids2 = []
+    # uuid_regex= /[0-9a-fA-F]{8}-[0-9a-fA-F]{4}-[0-9a-fA-F]{4}-[0-9a-fA-F]{4}-[0-9a-fA-F]{12}/
+    # 附件的格式为（/api/attachments/ + uuid）的形式，提取出id进行附件属性关联，做附件访问权限控制
+    att_ids2 += self.notes.to_s.scan(/\(\/api\/attachments\/[0-9a-fA-F]{8}-[0-9a-fA-F]{4}-[0-9a-fA-F]{4}-[0-9a-fA-F]{4}-[0-9a-fA-F]{12}\)/).map{|s|s.match(/[0-9a-fA-F]{8}-[0-9a-fA-F]{4}-[0-9a-fA-F]{4}-[0-9a-fA-F]{4}-[0-9a-fA-F]{12}/)[0]}
+    att_ids2 += self.notes.to_s.scan(/\/api\/attachments\/[0-9a-fA-F]{8}-[0-9a-fA-F]{4}-[0-9a-fA-F]{4}-[0-9a-fA-F]{4}-[0-9a-fA-F]{12}/).map{|s|s.match(/[0-9a-fA-F]{8}-[0-9a-fA-F]{4}-[0-9a-fA-F]{4}-[0-9a-fA-F]{4}-[0-9a-fA-F]{12}/)[0]}
+    if att_ids2.present?
+      Attachment.where(uuid: att_ids).where("container_type IS NULL OR container_type = 'Journal'").update_all(container_id: self.issue.project_id, container_type: "Project")
+    end
  end

-  def operate_content 
+  def operate_content
    content = ""
    detail = self.journal_details.take
    case detail.property
    when 'issue'
      return "创建了<b>疑修</b>"
    when 'attachment'
-      old_value = Attachment.where(id: detail.old_value.split(",")).pluck(:filename).join("、")
-      new_value = Attachment.where(id: detail.value.split(",")).pluck(:filename).join("、")
-      if old_value.nil? || old_value.blank? 
+      old_value = Attachment.where("id in (?) or uuid in (?)", detail.old_value.to_s.split(","), detail.old_value.to_s.split(",")).pluck(:filename).join("、")
+      new_value = Attachment.where("id in (?) or uuid in (?)", detail.value.to_s.split(","), detail.value.to_s.split(",")).pluck(:filename).join("、")
+      if old_value.nil? || old_value.blank?
        content += "添加了<b>#{new_value}</b>附件"
      else 
        new_value = "无" if new_value.blank?
--- a/app/models/trace_user.rb
+++ b/app/models/trace_user.rb
@@ -43,8 +43,9 @@ class TraceUser < ApplicationRecord
  def build_token 
    return if username.blank? || password.blank? || unit.blank? || email.blank? || name.blank? 

-    response = Trace::AddUserService.call(username, password, unit, telnumber, email, name)
-    self.token = response[1]['token']
+    response1 = Trace::AddUserService.call(username, password, unit, telnumber, email, name)
+    response2 = Trace::LoginService.call(username, password)
+    self.token = response2[1]['token']
    self.expired_at = Time.now + 1.hours
  end