fix:use concat_ws

api_document.md

@@ -286,6 +286,7 @@ http://localhost:3000/api/licenses/  | jq
 |licenses|array |返回数据|
 |-- id             |int   |id |
 |-- name           |string|开源许可证名称|
+|-- is_secret           |string|是否为特殊许可证|
 
 
 返回值
@@ -294,23 +295,33 @@ http://localhost:3000/api/licenses/  | jq
   "licenses": [
     {
       "id": 57,
-      "name": "AFL-1.2"
+      "name": "AFL-1.2",
+      "is_secret": false
     },
     {
       "id": 76,
-      "name": "AFL-3.0"
+      "name": "AFL-3.0",
+      "is_secret": false
     },
     {
       "id": 214,
-      "name": "AFL-1.1"
+      "name": "AFL-1.1",
+      "is_secret": false
     },
     {
       "id": 326,
-      "name": "AFL-2.1"
+      "name": "AFL-2.1",
+      "is_secret": false
     },
     {
       "id": 350,
-      "name": "AFL-2.0"
+      "name": "AFL-2.0",
+      "is_secret": false
+    },
+    {
+      "id": 359,
+      "name": "PHengLEI",
+      "is_secret": true
     }
   ]
 }
@@ -556,6 +567,8 @@ curl -X GET http://localhost:3000/api/repositories/:id/edit.json | jq
 |project_category_id  |int|项目类别id|
 |project_language_id  |int|项目语言id|
 |private              |boolean|项目是否私有, true：为私有，false: 公开  |
+|is_secret            |boolean|项目是否为特殊协议项目, true：是，false: 否  |
+
 
 
 返回值
@@ -568,7 +581,8 @@ curl -X GET http://localhost:3000/api/repositories/:id/edit.json | jq
   "project_description": "my first project mirror_demo",
   "project_category_id": 1,
   "project_language_id": 2,
-  "private": false
+  "private": false,
+  "is_secret": true
 }
 ```
 ---
@@ -1148,6 +1162,7 @@ http://localhost:3000/api/projects  | jq
 |forked_count    |int|被fork的数量|
 |praises_count   |int|star数量|
 |is_public       |boolean|是否公开， true:公开，false:未公开|
+|is_secret       |boolean|是否为特殊许可证项目， true:是，false:否|
 |mirror_url      |string|镜像url|
 |last_update_time|int|最后更新时间，为UNIX格式的时间戳|
 |author          |object|项目创建者|
@@ -1158,6 +1173,10 @@ http://localhost:3000/api/projects  | jq
 |language        |object|项目语言|
 |-- id           |int|项目语言id|
 |-- name         |string|项目语言名称|
+|user_apply_signatures        |object|用户创建的特殊许可申请|
+|-- id           |int|用户创建的特殊许可申请id|
+|-- status       |int|用户创建的特殊许可申请审核状态， 'unpassed': 审核未通过，'waiting': 等待审核 'passed':审核通过|
+
 
 
 返回值
@@ -1173,6 +1192,7 @@ http://localhost:3000/api/projects  | jq
       "praises_count": 0,
       "forked_count": 0,
       "is_public": true,
+      "is_secret": true,
       "mirror_url": null,
       "last_update_time": 1577697461,
       "author": {
@@ -1186,7 +1206,13 @@ http://localhost:3000/api/projects  | jq
       "language": {
         "id": 2,
         "name": "C"
-      }
+      },
+      "user_apply_signatures":[
+        {
+          "id": 1,
+          "status": "waiting"
+        }
+      ]
     },
     {
       "id": 2,
@@ -1196,6 +1222,7 @@ http://localhost:3000/api/projects  | jq
       "praises_count": 0,
       "forked_count": 0,
       "is_public": true,
+      "is_secret": false,
       "mirror_url": null,
       "last_update_time": 1577697403,
       "author": {
@@ -1209,7 +1236,8 @@ http://localhost:3000/api/projects  | jq
       "language": {
         "id": 2,
         "name": "C"
-      }
+      },
+      "user_apply_signatures":[]
     },
     {
       "id": 3,
@@ -1219,6 +1247,7 @@ http://localhost:3000/api/projects  | jq
       "praises_count": 0,
       "forked_count": 0,
       "is_public": true,
+      "is_secret": true,  
       "mirror_url": null,
       "last_update_time": 1577415173,
       "author": {
@@ -1232,7 +1261,8 @@ http://localhost:3000/api/projects  | jq
       "language": {
         "id": 2,
         "name": "C"
-      }
+      },
+      "user_apply_signatures":[]
     },
     {
       "id": 5,
@@ -1242,6 +1272,7 @@ http://localhost:3000/api/projects  | jq
       "praises_count": 0,
       "forked_count": 0,
       "is_public": false,
+      "is_secret": true,
       "mirror_url": "https://gitea.com/CasperVector/slew.git",
       "last_update_time": 1577346228,
       "author": {
@@ -1255,7 +1286,8 @@ http://localhost:3000/api/projects  | jq
       "language": {
         "id": 2,
         "name": "C"
-      }
+      },
+      "user_apply_signatures":[]
     },
     {
       "id": 7,
@@ -1265,6 +1297,7 @@ http://localhost:3000/api/projects  | jq
       "praises_count": 0,
       "forked_count": 0,
       "is_public": true,
+      "is_secret": true,
       "mirror_url": null,
       "last_update_time": 1577341572,
       "author": {
@@ -1278,7 +1311,8 @@ http://localhost:3000/api/projects  | jq
       "language": {
         "id": 2,
         "name": "C"
-      }
+      },
+      "user_apply_signatures":[]
     }
   ]
 }
@@ -4893,6 +4927,7 @@ http://localhost:3000/api/users/Jason/projects.json | jq
 |forked_count    |int|被fork的数量|
 |praises_count   |int|star数量|
 |is_public       |boolean|是否公开， true:公开，false:未公开|
+|is_secret       |boolean|是否为特殊许可证项目， true:是，false:否|
 |mirror_url      |string|镜像url|
 |last_update_time|int|最后更新时间，为UNIX格式的时间戳|
 |author          |object|项目创建者|
@@ -4903,7 +4938,9 @@ http://localhost:3000/api/users/Jason/projects.json | jq
 |language        |object|项目语言|
 |-- id           |int|项目语言id|
 |-- name         |string|项目语言名称|
-
+|user_apply_signatures        |object|用户创建的特殊许可申请|
+|-- id           |int|用户创建的特殊许可申请id|
+|-- status       |int|用户创建的特殊许可申请审核状态， 'unpassed': 审核未通过，'waiting': 等待审核 'passed':审核通过|
 
 返回值
 ```json
@@ -4918,6 +4955,7 @@ http://localhost:3000/api/users/Jason/projects.json | jq
       "praises_count": 0,
       "forked_count": 0,
       "is_public": true,
+      "is_secret": false,
       "mirror_url": null,
       "last_update_time": 1577697461,
       "author": {
@@ -4931,9 +4969,163 @@ http://localhost:3000/api/users/Jason/projects.json | jq
       "language": {
         "id": 2,
         "name": "C"
-      }
+      },
+      "user_apply_signatures":[
+        {
+          "id": 1,
+          "status": "waiting"
+        }
+      ]
     }
   ]
 }
 ```
 ---
+
+#### 特殊许可证项目申请列表
+```
+GET /api/apply_signatures
+```
+*示例*
+```bash
+curl -X GET \
+-d "project_id=36" \
+-d "page=1" \
+-d "limit=5" \
+-d "search=16895620" \
+-d "status=waiting" \
+http://localhost:3000/api/apply_signatures  | jq
+```
+*请求参数说明:*
+
+|参数名|必选|类型|说明|
+|-|-|-|-|
+|project_id    |是|int    |项目id  |
+|page          |否|string |页数，第几页  |
+|limit         |否|string |每页多少条数据，默认15条  |
+|search        |否|string |用户名、登录名匹配搜索  |
+|status        |否|string |状态匹配搜索，'unpassed': 审核未通过，'waiting': 等待审核 'passed':审核通过  |
+
+
+*返回参数说明:*
+
+|参数名|类型|说明|
+|-|-|-|
+|total_count       |int   |返回记录总条数 |
+|apply_signatures  |array|特殊许可证项目申请信息|
+|-- id             |int|特殊许可证项目申请id|
+|-- status         |int|特殊许可证项目申请状态，'unpassed': 审核未通过，'waiting': 等待审核 'passed':审核通过|
+|user              |object|用户|
+|-- id             |int|用户id|
+|-- name           |string|用户名称|
+|-- login          |string|用户登录名/标识|
+|-- image_url      |string|用户头像|
+|-- email          |string|用户邮箱|
+|-- is_owner       |boolean|是否是项目的拥有者，true:是， false:不是|
+|attachment        |object|上传附件|
+|--filename        |string|附件名称|
+|--path            |string|附件地址|
+
+
+返回值
+```json
+{
+    "total_count": 1,
+    "apply_signatures": [
+        {
+            "id": 18,
+            "status": "passed",
+            "user": {
+                "id": 3,
+                "name": "16895620",
+                "login": "16895620",
+                "image_url": "avatars/User/boy.jpg",
+                "email": "2456233122@qq.com",
+                "is_owner": false
+            },
+            "attachment": {
+                "filename": "PHengLEI软件开源协议.docx",
+                "path": "/api/attachments/23"
+            }
+        }
+    ]
+}
+```
+---
+#### 特殊许可证项目用户创建申请
+```
+POST  /api/apply_signatures
+```
+
+*示例*
+```bash
+curl -X POST \
+-d "project_id=8" \
+-d "attachment_id=4" \
+http://localhost:3000/api/apply_signatures.json | jq
+```
+
+*请求参数说明:*
+
+|参数名|必选|类型|说明|
+|-|-|-|-|
+|project_id          |是|int |项目id  |
+|attachment_id       |是|int |上传的文件id |
+
+*返回参数说明:*
+
+|参数名|类型|说明|
+|-|-|-|
+|id           |int|特殊许可证项目用户创建申请的id|
+|attachment   |object|上传的文件|
+|--filename   |string|上传的文件的文件名|
+
+返回值
+```json
+{
+    "id": 5,
+    "attachment": {
+        "filename": "timg.jpeg"
+    }
+}
+```
+---
+#### 特殊许可证项目申请修改
+```
+PATCH  /api/apply_signatures/:id
+```
+
+*示例*
+```bash
+curl -X POST \
+-d "id=18" \
+-d "status=passed" \
+-d "project_id=36" \
+http://localhost:3000/api/apply_signatures/18 | jq
+```
+
+*请求参数说明:*
+
+|参数名|必选|类型|说明|
+|-|-|-|-|
+|id                  |是|int |特殊许可证项目申请id  |
+|status              |是|string |特殊许可证项目申请状态 ，'unpassed': 审核未通过，'waiting': 等待审核 'passed':审核通过|
+|project_id          |是|int |项目id|
+
+
+*返回参数说明:*
+
+|参数名|类型|说明|
+|-|-|-|
+|status            |int   |0:添加成功， -1: 更改失败， 1: 表示已经是该状态了 |
+|message           |string|返回信息说明|
+
+
+返回值
+```json
+{
+  "status": 0,
+  "message": "success"
+}
+```
+---

app/controllers/accounts_controller.rb

@@ -242,9 +242,7 @@ class AccountsController < ApplicationController
   end
 
   def set_autologin_cookie(user)
-    token = Token.get_or_create_permanent_login_token(user, "autologin")
-    sync_user_token_to_trustie(user.login, token.value)
-
+    token = Token.get_or_create_permanent_login_token(user, autologin_cookie_name)
     cookie_options = {
                       :value => token.value,
                       :expires => 1.month.from_now,

app/controllers/admins/apply_signatures_controller.rb

@@ -0,0 +1,32 @@
+class Admins::ApplySignaturesController < Admins::BaseController
+
+    def index
+      sort_by = params[:sort_by] ||= 'created_on'
+      sort_direction = params[:sort_direction] ||= 'desc'
+
+      @apply_signatures = paginate ApplySignature.waiting.includes(:attachments)
+    end
+
+    def update
+      ActiveRecord::Base.transaction do
+        begin
+          apply_signature = ApplySignature.find_by!(id: params[:id])
+          apply_signature.update_attributes!(apply_signatures_params)
+          if apply_signature.status == "passed"
+            Projects::AddMemberInteractor.call(apply_signature.project.owner, apply_signature.project, apply_signature.user, "read", true)
+          end
+          redirect_to admins_apply_signatures_path
+          flash[:success] = "更新成功"
+        rescue => e
+          raise ActiveRecord::Rollback
+          redirect_to admins_apply_signatures_path
+          flash[:danger] = "更新失败"
+        end
+      end
+    end
+
+    private
+    def apply_signatures_params
+      params.permit(:status)
+    end
+  end

app/controllers/admins/phenglei_users_controller.rb

@@ -0,0 +1,36 @@
+class Admins::PhengleiUsersController < Admins::BaseController
+  before_action :phenglei_project, only: [:index]
+
+  def index 
+    if params[:keyword].present?
+      @phenglei_users = PhengleiUser.ransack(phone_cont: params[:keyword]).result
+    else
+      @phenglei_users = PhengleiUser 
+    end
+    @phenglei_users = @phenglei_users.page(page).per(per_page)
+  end
+
+  def new 
+    @phenglei_user = PhengleiUser.new
+  end
+
+  def create 
+    @phenglei_user = PhengleiUser.new(phenglei_user_params)
+    if @phenglei_user.save 
+      redirect_to admins_phenglei_users_path
+      flash[:success] = "创建成功"
+    else  
+      redirect_to admins_phenglei_users_path 
+      flash[:error] = "创建失败"
+    end
+  end
+
+  private 
+  def phenglei_project 
+    @phenglei_project = Project.find_by_id(EduSetting.get("sync_phenglei_user_project"))
+  end
+
+  def phenglei_user_params
+    params.require(:phenglei_user).permit(:phone)
+  end
+end

app/controllers/admins/projects_controller.rb

@@ -1,4 +1,5 @@
 class Admins::ProjectsController < Admins::BaseController
+  before_action :load_project, only: [:sync_phenglei_user]
 
   def index
     sort_by = params[:sort_by] ||= 'created_on'
@@ -6,7 +7,7 @@ class Admins::ProjectsController < Admins::BaseController
 
     search = params[:search].to_s.strip
     projects = Project.where("name like ?", "%#{search}%").order("#{sort_by} #{sort_direction}")
-    @projects = paginate projects.includes(:owner, :members, :issues, :versions, :attachments, :project_score)
+    @projects = paginate projects.includes(:owner, :members, :issues, :versions, :attachments, :project_score, :license)
   end
 
   def destroy
@@ -22,4 +23,20 @@ class Admins::ProjectsController < Admins::BaseController
       redirect_to admins_projects_path
       flash[:danger] = "删除失败"
   end
+
+  def sync_phenglei_user
+    if @project.is_secret
+      SyncPhengleiUserJob.perform_later(@project.id)
+      redirect_to admins_phenglei_users_path
+      flash[:success] = "已开启后台同步任务"
+    else
+      redirect_to admins_phenglei_users_path
+      flash[:danger] = "非风雷协议项目"
+    end
+  end
+
+  private
+  def load_project
+    @project = Project.find_by!(id: params[:id])
+  end
 end

app/controllers/application_controller.rb

@@ -374,7 +374,7 @@ class ApplicationController < ActionController::Base
 			# auto-login feature starts a new session
 			user = nil
 			Rails.logger.info("111111111111111111#{default_yun_session}, session is #{session[:"#{default_yun_session}"]} ")
-			user = User.try_to_autologin(cookies[autologin_cookie_name])
+			user = User.try_to_autologin(cookies[autologin_cookie_name], autologin_cookie_name)
 			# start_user_session(user) if user # TODO 解决sso退出不同步的问题
 			user
 		end

app/controllers/apply_signatures_controller.rb

@@ -0,0 +1,75 @@
+class ApplySignaturesController < ApplicationController
+  include ApplicationHelper
+  before_action :find_project, only: [:index, :create, :update]
+  before_action :require_owner, only: [:update]
+  before_action :find_apply_signature, only: [:update]
+
+  def index 
+    search = params[:search].to_s.downcase
+    @apply_signatures = @project.apply_signatures.with_status(status).includes(user: :user_extension)
+    @apply_signatures = @apply_signatures.joins(:user).where("LOWER(CONCAT_WS(users.lastname, users.firstname, users.login, users.mail, users.nickname)) LIKE ?", "%#{search.split(" ").join('|')}%") if search.present?
+    @apply_signatures = kaminari_paginate(@apply_signatures)
+  end
+
+  def template_file
+    license = License.find_by_name("PHengLEI")
+    file = license.attachments.take
+    normal_status(-1, "文件不存在") if file.blank?
+    send_file(absolute_path(local_path(file)), filename: file.title,stream:false, type: file.content_type.presence || 'application/octet-stream')
+  end
+
+  def create 
+    ActiveRecord::Base.transaction do
+      begin
+        @signature = current_user.apply_signatures.find_or_create_by!(project_id: params[:project_id])
+        @signature.status = 0
+        @signature.attachments = Attachment.none
+        @attachment = Attachment.find_by_id(params[:attachment_id])
+        @attachment.container = @signature
+        @signature.save!
+        @attachment.save!
+      rescue Exception => e
+        tip_exception("#{e}")
+        raise ActiveRecord::Rollback
+      end
+      render_json
+    end
+  end
+
+  def update
+    @apply_signature.update_attributes!(apply_signature_params)
+    if @apply_signature.status == "passed"
+      Projects::AddMemberInteractor.call(@apply_signature.project.owner, @apply_signature.project, @apply_signature.user, "read", true)
+    else
+      Projects::DeleteMemberInteractor.call(@apply_signature.project.owner, @apply_signature.project, @apply_signature.user)
+    end
+    render_ok
+  rescue Exception => e
+    uid_logger_error(e.message)
+    tip_exception(e.message)
+  end
+
+  private
+  def find_project
+    @project = Project.find_by_id(params[:project_id])
+    normal_status(-1, "项目不存在") unless @project.present?
+  end
+
+  def find_apply_signature
+    @apply_signature = ApplySignature.find_by_id(params[:id])
+    normal_status(-1, "特殊许可申请不存在") unless @apply_signature.present?
+    normal_status(1, "已经是该状态了") if @apply_signature.status == params[:status]
+  end
+
+  def apply_signature_params
+    params.permit(:status)
+  end
+
+  def status 
+    params.fetch(:status, "all")
+  end
+
+  def require_owner
+    normal_status(403, "") unless @project.owner?(current_user)
+  end
+end 

app/controllers/attachments_controller.rb

@@ -42,6 +42,7 @@ class AttachmentsController < ApplicationController
     # 2. 上传到云
     begin
       upload_file = params["file"] || params["#{params[:file_param_name]}"]# 这里的file_param_name是为了方便其他插件名称
+      dun_check_file = upload_file.dup
       uid_logger("#########################file_params####{params["#{params[:file_param_name]}"]}")
       raise "未上传文件" unless upload_file
 
@@ -79,8 +80,16 @@ class AttachmentsController < ApplicationController
         @attachment.digest = digest
         @attachment.author_id = current_user.id
         @attachment.disk_directory = month_folder
-        @attachment.cloud_url = remote_path
-        @attachment.save!
+        # @attachment.cloud_url = remote_path
+        # @attachment.save!
+        if @attachment.save!
+          check_result = Attachment.check_image_able(dun_check_file)
+          if check_result[:status].to_i == -1
+            @attachment.destroy
+            raise "上传失败，#{check_result[:message]}"
+            # return render json: {status: -1, message: "上传失败，#{check_result[:message]}" } 
+          end
+        end
       else
         logger.info "文件已存在，id = #{@attachment.id}, filename = #{@attachment.filename}"
       end

app/controllers/concerns/laboratory_helper.rb

@@ -8,6 +8,9 @@ module LaboratoryHelper
     helper_method :default_setting
     helper_method :default_yun_session
     helper_method :default_course_links
+    helper_method :manager_main_site_url
+    helper_method :main_web_site_url
+    helper_method :current_main_site_url
   end
 
   def current_laboratory
@@ -32,18 +35,29 @@ module LaboratoryHelper
   end
 
   def default_course_links
-    # my_projects: "/users/#{current_user.try(:login)}/projects",
-    #       my_projects: "https://www.trustie.net/users/#{current_user.try(:login)}/user_projectlist",
+
     {
-      new_syllabuses: "https://www.trustie.net/syllabuses/new",
-      new_course: "https://www.trustie.net/courses/new",
-      edit_account: "https://www.trustie.net/my/account",
-      my_courses: "https://www.trustie.net/users/#{current_user.try(:login)}/user_courselist",
-      my_projects: "/users/#{current_user.try(:login)}/projects",
-      my_organ: "https://www.trustie.net/users/#{current_user.try(:login)}/user_organizations",
-      default_url: "https://www.trustie.net/",
-      tiding_url: "https://www.trustie.net/users/#{current_user.try(:login)}/user_messages",
-      register_url: "https://www.trustie.net/login?login=false"
+      # new_syllabuses: "https://www.trustie.net/syllabuses/new",
+      # new_course: "https://www.trustie.net/courses/new",
+      # edit_account: "https://www.trustie.net/my/account",
+      # my_courses: "https://www.trustie.net/users/#{current_user.try(:login)}/user_courselist",
+      # my_projects: "/users/#{current_user.try(:login)}/projects",
+      # my_organ: "https://www.trustie.net/users/#{current_user.try(:login)}/user_organizations",
+      # default_url: "https://www.trustie.net/",
+      tiding_url: "#{main_web_site_url}/users/#{current_user.try(:login)}/user_tidings",
+      register_url: "#{main_web_site_url}/user_join"
     }
   end
+
+  def manager_main_site_url
+    {name: '管理', link: "#{main_web_site_url}/managements"}
+  end
+
+  def main_web_site_url
+    EduSetting.get('host_main_site')
+  end
+
+  def current_main_site_url
+    EduSetting.get('host_name')
+  end
 end

app/controllers/concerns/login_helper.rb

@@ -6,14 +6,12 @@ module LoginHelper
   end
 
   def autologin_cookie_name
-    edu_setting('autologin_cookie_name').presence || 'autologin'
+    edu_setting('autologin_cookie_name').presence || 'autologin_forge_military'
   end
 
   def set_autologin_cookie(user)
-    token = Token.get_or_create_permanent_login_token(user, "autologin")
-    sync_user_token_to_trustie(user.login, token.value)
-
-    Rails.logger.info "###### def set_autologin_cookie and get_or_create_permanent_login_token result: #{token&.value}"
+    Rails.logger.info("set_cookie_user_id is=======> #{user.id}")
+    token = Token.get_or_create_permanent_login_token(user, autologin_cookie_name)
     cookie_options = {
       :value => token.value,
       :expires => 1.month.from_now,

app/controllers/concerns/register_helper.rb

@@ -3,11 +3,16 @@ module RegisterHelper
 
   def autologin_register(username, email, password, platform= 'forge')
     result = {message: nil, user: nil}
+    email =  email.blank? ? "#{username}@example.org" : email
+
+    user = User.find_by(login: username)
+    user ||= User.new(admin: false, login: username, mail: email, type: "User")
 
-    user = User.new(admin: false, login: username, mail: email, type: "User")
     user.password = password
     user.platform = platform
     user.activate
+    
+    return unless user.valid?
 
     interactor = Gitea::RegisterInteractor.call({username: username, email: email, password: password})
     if interactor.success?
@@ -16,7 +21,7 @@ module RegisterHelper
       user.gitea_token = result['sha1']
       user.gitea_uid = gitea_user[:body]['id']
       if user.save!
-        UserExtension.create!(user_id: user.id)
+        UserExtension.create!(user_id: user.id) if user.user_extension.blank?
         result[:user] = {id: user.id, token: user.gitea_token}
       end
     else

app/controllers/issues_controller.rb

@@ -6,7 +6,6 @@ class IssuesController < ApplicationController
   before_action :check_project_public, only: [:index ,:show, :copy, :index_chosen, :close_issue]
 
   before_action :set_issue, only: [:edit, :update, :destroy, :show, :copy, :close_issue, :lock_issue]
-  before_action :check_token_enough, only: [:create, :update]
 
   include ApplicationHelper
   include TagChosenHelper
@@ -96,7 +95,8 @@ class IssuesController < ApplicationController
   end
 
   def new
-    @issue_chosen = get_associated_data(@project)
+    # @all_branches = get_branches
+    @issue_chosen = issue_left_chosen(@project, nil)
   end
 
   def create
@@ -132,15 +132,10 @@ class IssuesController < ApplicationController
                          tiding_type: 'issue', status: 0)
         end
 
-        #为悬赏任务时, 扣除当前用户的积分
-        if params[:issue_type].to_s == "2"
-          post_to_chain("minus", params[:token].to_i, current_user.try(:login))
-        end
-
         @issue.project_trends.create(user_id: current_user.id, project_id: @project.id, action_type: "create")
         render json: {status: 0, message: "创建成", id: @issue.id}
       else
-        normal_status(-1, "创建失败")
+        normal_status(-1, @issue.errors.messages.values[0][0])
       end
 
     end
@@ -149,13 +144,12 @@ class IssuesController < ApplicationController
 
   def edit
     # @issue_chosen = issue_left_chosen(@project, @issue.id)
-    @cannot_edit_tags = @issue.issue_type=="2" && @issue.status_id == 5  #悬赏任务已解决且关闭的状态下，不能修改
     @issue_attachments = @issue.attachments
   end
 
   def update
-    last_token = @issue.token
-    last_status_id = @issue.status_id
+    issue_params = issue_send_params(params).except(:issue_classify, :author_id, :project_id)
+    return normal_status(-1, "您没有权限修改token") if @issue.will_save_change_to_token? && @issue.user_id != current_user&.id
     if params[:issue_tag_ids].present? && !@issue&.issue_tags_relates.where(issue_tag_id: params[:issue_tag_ids]).exists?
       @issue&.issue_tags_relates&.destroy_all
       params[:issue_tag_ids].each do |tag|
@@ -163,22 +157,23 @@ class IssuesController < ApplicationController
       end
     end
 
-    issue_files = params[:attachment_ids]
-    change_files = false
-    issue_file_ids = []
+    if @issue.update_attributes(issue_params)
+      issue_files = params[:attachment_ids]
+      change_files = false
+      issue_file_ids = []
 
-    if issue_files.present?
-      change_files = true
-      issue_files.each do |id|
-        attachment = Attachment.select(:id, :container_id, :container_type)&.find_by_id(id)
-        unless attachment.blank?
-          attachment.container = @issue
-          attachment.author_id = current_user.id
-          attachment.description = ""
-          attachment.save
+      if issue_files.present?
+        change_files = true
+        issue_files.each do |id|
+          attachment = Attachment.select(:id, :container_id, :container_type)&.find_by_id(id)
+          unless attachment.blank?
+            attachment.container = @issue
+            attachment.author_id = current_user.id
+            attachment.description = ""
+            attachment.save
+          end
         end
       end
-    end
 
       # if params[:issue_tag_ids].present?
       #   issue_current_tags = @issue&.issue_tags&.select(:id)&.pluck(:id)
@@ -194,35 +189,15 @@ class IssuesController < ApplicationController
       #   end
       # end
 
-    if @issue.issue_type.to_s == "2" &&  params[:status_id].to_i == 5 && @issue.author_id != current_user.try(:id)
-      normal_status(-1, "不允许修改为关闭状态")
-    else
-      issue_params = issue_send_params(params).except(:issue_classify, :author_id, :project_id)
-
-      if @issue.update_attributes(issue_params)
-        if params[:status_id].to_i == 5  #任务由非关闭状态到关闭状态时
-          @issue.issue_times.update_all(end_time: Time.now)
-          @issue.update_closed_issues_count_in_project!
-          if @issue.issue_type.to_s == "2" && last_status_id != 5
-            if @issue.assigned_to_id.present? && last_status_id == 3 #只有当用户完成100%时，才给token
-              post_to_chain("add", @issue.token, @issue.get_assign_user.try(:login))
-            else
-              post_to_chain("add", @issue.token, @issue.user.try(:login))
-            end
-          end
-        end
-
-        if @issue.issue_type.to_s == "2" && @issue.status_id != 5 && @issue.saved_change_to_attribute("token")
-          #表示修改token值
-          change_token = last_token - @issue.token
-          change_type = change_token > 0 ? "add" : "minus"
-          post_to_chain(change_type, change_token.abs, current_user.try(:login))
-        end
-        @issue.create_journal_detail(change_files, issue_files, issue_file_ids, current_user&.id)
-        normal_status(0, "更新成功")
-      else
-        normal_status(-1, "更新失败")
+      if params[:status_id].to_i == 5
+        @issue.issue_times.update_all(end_time: Time.now)
+        #@issue.update_closed_issues_count_in_project!
       end
+
+      @issue.create_journal_detail(change_files, issue_files, issue_file_ids, current_user&.id)
+      normal_status(0, "更新成功")
+    else
+      normal_status(-1, @issue.errors.messages.values[0][0])
     end
   end
 
@@ -243,32 +218,17 @@ class IssuesController < ApplicationController
   end
 
   def destroy
-    begin
-      issue_type = @issue.issue_type
-      status_id = @issue.status_id
-      token = @issue.token
-      login =  @issue.user.try(:login)
-      if @issue.destroy
-        if issue_type == "2" && status_id != 5
-          post_to_chain("add", token, login)
-        end
-        normal_status(0, "删除成功")
-      else
-        normal_status(-1, "删除失败")
-      end
-    rescue => exception
-      Rails.logger.info("#########_______exception.message_________##########{exception.message}")
-      normal_status(-1, "删除失败")
+    if @issue.destroy
+      normal_status(0, "删除成功")
     else
+      normal_status(-1, "删除失败")
     end
-
   end
 
   def clean
-    #批量删除，暂时只能删除未悬赏的
     issue_ids = params[:ids]
     if issue_ids.present?
-      if Issue.where(id: issue_ids, issue_type: "1").destroy_all
+      if Issue.where(id: issue_ids).destroy_all
         normal_status(0, "删除成功")
       else
         normal_status(-1, "删除失败")
@@ -460,32 +420,4 @@ class IssuesController < ApplicationController
         project_id: @project.id
       }
   end
-
-  def post_to_chain(type, amount,login)
-    change_params = {
-      type: type,
-      chain_params: {
-        amount: amount,
-        reponame: @project.try(:identifier),
-        username: login
-      }
-    }
-    PostChainJob.perform_later(change_params)
-  end
-
-  def check_token_enough
-    if params[:issue_type].to_s == "2" && (@issue.blank? || (@issue.present? && @issue.author_id == current_user.try(:id)))
-      return normal_status(-1, "悬赏的奖金必须大于0") if params[:token].to_i == 0
-      query_params = {
-        type: "query",
-        chain_params: {
-          reponame: @project.try(:identifier),
-          username: current_user.try(:login)
-        }
-      }
-      response = Gitea::Chain::ChainGetService.new(query_params).call
-      return normal_status(-1, "获取token失败，请稍后重试") if response.status != 200
-      return normal_status(-1, "您的token值不足") if JSON.parse(response.body)["balance"].to_i < params[:token].to_i
-    end
-  end
 end

app/controllers/journals_controller.rb

@@ -46,7 +46,7 @@ class JournalsController < ApplicationController
         render :json => { status: 0, message: "评论成功", id:  journal.id}
         # normal_status(0, "评论成功")
       else
-        normal_status(-1, "评论失败")
+        normal_status(-1, journal.errors.messages.values[0][0])
       end
     end
   end
@@ -70,7 +70,7 @@ class JournalsController < ApplicationController
       if @journal.update_attribute(:notes, content)
         normal_status(0, "更新成功")
       else
-        normal_status(-1, "更新失败")
+        normal_status(-1, @journal.errors.messages.values[0][0])
       end
     else
       normal_status(-1, "评论的内容不能为空")

app/controllers/members_controller.rb

@@ -18,7 +18,7 @@ class MembersController < ApplicationController
     scope = @project.members.includes(:roles, user: :user_extension)
     search = params[:search].to_s.downcase
     role = params[:role].to_s
-    scope = scope.joins(:user).where("LOWER(concat(users.lastname, users.firstname, users.login, users.mail)) LIKE ?", "%#{search.split(" ").join('|')}%") if search.present?
+    scope = scope.joins(:user).where("LOWER(CONCAT_WS(users.lastname, users.firstname, users.login, users.mail, users.nickname)) LIKE ?", "%#{search.split(" ").join('|')}%") if search.present?
     scope = scope.joins(:roles).where("roles.name LIKE ?", "%#{role}%") if role.present?
 
     @total_count = scope.size

app/controllers/oauth/educoder_controller.rb

@@ -8,7 +8,7 @@ class Oauth::EducoderController < Oauth::BaseController
 
       ::OauthEducoderForm.new({login: login, token: token, callback_url: callback_url}).validate!
 
-      open_user= OpenUsers::Educoder.find_by(uid: login) || OpenUsers::Educoder.find_by(uid: mail)
+      open_user= OpenUsers::Educoder.find_by(uid: login)
 
       if open_user.present? && open_user.user.present? && open_user.user.email_binded?
         Rails.logger.info "######## open_user exist and open_user.user exsit and email is binded ok"

app/controllers/project_categories_controller.rb

@@ -7,7 +7,5 @@ class ProjectCategoriesController < ApplicationController
 
   def group_list
     @project_categories = ProjectCategory.where('projects_count > 0').order(projects_count: :desc)
-    # projects = Project.no_anomory_projects.visible
-    # @category_group_list = projects.joins(:project_category).group("project_categories.id", "project_categories.name").size
   end
 end

app/controllers/projects_controller.rb

@@ -11,10 +11,10 @@ class ProjectsController < ApplicationController
     scope = Projects::ListQuery.call(params)
 
     # @projects = kaminari_paginate(scope)
-    @projects = paginate scope.includes(:project_category, :project_language, :repository, :project_educoder, :owner)
+    @projects = kaminari_paginate scope.includes(:project_category, :project_language, :repository, :project_educoder, :apply_signatures, :members, :owner)
 
     category_id = params[:category_id]
-    @total_count =
+    @total_count = @projects.total_count
       if category_id.blank?
         ps = ProjectStatistic.first
         ps.common_projects_count + ps.mirror_projects_count unless ps.blank?
@@ -48,23 +48,14 @@ class ProjectsController < ApplicationController
   end
 
   def group_type_list
-    project_statics = ProjectStatistic.first
-
-    @project_statics_list = [
-      {
-        project_type: 'common',
-        name: '开源托管项目',
-        projects_count: project_statics&.common_projects_count || 0
-      },
-      {
-        project_type: 'mirror',
-        name: '开源镜像项目',
-        projects_count: project_statics&.mirror_projects_count || 0
-      }
-    ]
-
-    # projects = Project.no_anomory_projects.visible
-    # @project_group_list = projects.group(:project_type).size
+    # if current_user&.logged?
+    #   projects = Project.list_user_projects(current_user.id)
+    # else
+    #   projects = Project.visible
+    # end
+    projects = Project.no_anomory_projects.secret_and_visible
+    language_lists = projects.joins(:project_language).group("project_languages.name", "project_languages.id").size.keys.sort.to_h
+    @project_group_list = language_lists.delete_if { |k, v| k.blank? }
   end
 
   def update
@@ -147,7 +138,6 @@ class ProjectsController < ApplicationController
         end
         if @project_detail.save!
           attachment_ids = Array(params[:attachment_ids])
-          logger.info "=============> #{Array(params[:attachment_ids])}"
           @attachments =  Attachment.where(id: attachment_ids)
           @attachments.update_all(
             container_id: @project_detail.id,

app/controllers/pull_requests_controller.rb

@@ -104,8 +104,10 @@ class PullRequestsController < ApplicationController
                 normal_status(-1, "PullRequest更新失败")
               end
             else
-              normal_status(-1, "PullRequest更新失败")
+              normal_status(-1, @pull_request.errors.messages.values[0][0])
             end
+          else
+            normal_status(-1, @issue.errors.messages.values[0][0])
           end
         rescue => e
           normal_status(-1, e.message)

app/controllers/settings_controller.rb

@@ -1,6 +1,4 @@
 class SettingsController < ApplicationController
   def show
-    @old_projects_url = nil 
-    @old_projects_url = "https://www.trustie.net/users/#{current_user.try(:login)}/projects"  if User.current.logged?
   end
 end

app/controllers/sync_forge_controller.rb

@@ -309,12 +309,12 @@ class SyncForgeController < ApplicationController
   #   end
   # end
 
-  # def check_token
-  #   sync_params = params[:sync_params]
-  #   unless sync_params[:token] && sync_params[:token] == get_token
-  #     render json: {message: "token_errors"}
-  #   end
-  # end
+  # # def check_token
+  # #   sync_params = params[:sync_params]
+  # #   unless sync_params[:token] && sync_params[:token] == get_token
+  # #     render json: {message: "token_errors"}
+  # #   end
+  # # end
 
   # def get_token
   #   "34c82f51e0b699d9d16d70fd6497c9b1e4821d6ea3e872558a6537a091076b8e"

app/controllers/users_controller.rb

@@ -155,8 +155,7 @@ class UsersController < ApplicationController
   # 其他平台登录后，必须将token同步到forge平台，实现sso登录功能
   def sync_token
     return render_error('未找相关用户!')  unless @user
-
-    token = Token.get_or_create_permanent_login_token(@user, 'autologin')
+    token = Token.get_or_create_permanent_login_token(@user, autologin_cookie_name)
     token.update_column(:value, params[:token])
     render_ok
   end

app/controllers/versions_controller.rb

@@ -83,7 +83,7 @@ class VersionsController < ApplicationController
         if version.save
           normal_status(0, "里程碑创建成功")
         else
-          normal_status(-1, "里程碑创建失败")
+          normal_status(-1, version.errors.messages.values[0][0])
         end
       end
 
@@ -121,7 +121,7 @@ class VersionsController < ApplicationController
         if @version.update_attributes(tag_params)
           normal_status(0, "里程碑更新成功")
         else
-          normal_status(-1, "里程碑更新失败")
+          normal_status(-1, version.errors.messages.values[0][0])
         end
       end
     else

app/forms/contents/create_form.rb

@@ -1,13 +1,24 @@
 class Contents::CreateForm < BaseForm
-  attr_accessor :filepath, :branch, :new_branch
+  attr_accessor :filepath, :branch, :new_branch, :content
 
   validates :filepath, presence: true
 
   validate :check_branch
 
+  validate :dun_content_check
+
   def check_branch
     raise "branch和new_branch必须存在一个 " if branch.blank? && new_branch.blank?
     # raise "branch和new_branch只能存在一个" if !branch.blank? && !new_branch.blank?
   end
 
+  def dun_content_check
+    if content.present? 
+      check_result = DunCheck::TextCheck.new({title: "", content: content}).call
+      if check_result[:status].to_i == -1
+        raise "内容含有：#{check_result[:extra_params][:infos]}，请修改"
+      end
+    end
+  end
+
 end

app/helpers/application_helper.rb

@@ -149,7 +149,7 @@ module ApplicationHelper
         File.join("images/avatars", ["#{source.class}", "#{source.id}"]) + "?t=#{ctime}"
       end
     elsif source.class.to_s == 'User'
-      str = source.user_extension.try(:gender).to_i == 0 ? "b" : "g"
+      str = source.user_extension.try(:gender).to_i == 0 ? "boy.jpg" : "girl.jpg"
       File.join(relative_path, "#{source.class}", str)
     elsif source.class.to_s == 'Subject'
       File.join("images","educoder", "index", "subject", "subject#{rand(17)}.jpg")

app/helpers/projects_helper.rb

@@ -50,7 +50,10 @@ module ProjectsHelper
       repo_id: repo.id,
       open_devops: (user.blank? || user.is_a?(AnonymousUser)) ? false : project.open_devops?,
       type: project.numerical_for_project_type,
-      author: render_owner(project)
+      author: render_owner(project),
+      is_secret: project.is_secret,
+      is_member: project.member?(user.id),
+      user_apply_signatures: project.apply_signatures.with_user_id(user.id).collect{|s| {id: s.id, status: s.status}}
     }).compact
 
     render json: tmp_json

app/interactors/gitea/create_file_interactor.rb

@@ -48,7 +48,8 @@ module Gitea
       {
         filepath: @params[:filepath],
         branch: @params[:branch],
-        new_branch: @params[:new_branch]
+        new_branch: @params[:new_branch],
+        content: @params[:content]
       }
     end
 

app/interactors/projects/add_member_interactor.rb

@@ -1,18 +1,19 @@
 module Projects
   class AddMemberInteractor
-    def self.call(owner, project, collaborator, permission="write")
-      interactor = new(owner, project, collaborator, permission)
+    def self.call(owner, project, collaborator, permission="write", is_apply_signature=false)
+      interactor = new(owner, project, collaborator, permission, is_apply_signature)
       interactor.run
       interactor
     end
 
     attr_reader :error, :result
 
-    def initialize(owner, project, collaborator, permission)
-      @owner        = owner
-      @project      = project
-      @collaborator = collaborator
-      @permission   = permission
+    def initialize(owner, project, collaborator, permission, is_apply_signature)
+      @owner              = owner
+      @project            = project
+      @collaborator       = collaborator
+      @permission         = permission
+      @is_apply_signature = is_apply_signature
     end
 
     def success?
@@ -23,7 +24,7 @@ module Projects
       ActiveRecord::Base.transaction do
         gitea_result = Gitea::Repository::Members::AddService.new(owner, project.identifier, collaborator.login, permission).call
         if gitea_result.status == 204
-          project.add_member!(collaborator.id)
+          project.add_member!(collaborator.id, set_member_role, is_apply_signature)
         end
         fail!(nil)
       end
@@ -32,11 +33,20 @@ module Projects
     end
 
     private
-    attr_reader :owner, :project, :collaborator, :permission
+    attr_reader :owner, :project, :collaborator, :permission, :is_apply_signature
 
     def fail!(error)
       @error = error
     end
 
+    def set_member_role
+      @role ||=
+        case @permission
+        when "write" then "Developer"
+        when "read" then "Reporter"
+        else "Developer"
+        end
+    end
+
   end
 end

app/jobs/sync_forge_project_job.rb

@@ -0,0 +1,48 @@
+class SyncForgeProjectJob < ApplicationJob
+  queue_as :default
+
+  def perform(sync_parmas)
+    # sync_parmas.permit!
+    Rails.logger.info("=======begin to sync forge projects, and sync_parmas: #{sync_parmas}")
+    get_rand_user = rand_user
+    project_params = sync_parmas[:project]
+    repository_params = sync_parmas[:repository]
+    project_socre_params = sync_parmas[:project_socre]
+    begin
+      unless Project.select(:identifier).exists?(identifier: project_params[:identifier])
+        project_params = project_params.merge({user_id: get_rand_user.id })
+        project = Project.new(project_params)
+        if project.save 
+          repository_params = {
+            hidden: false,
+            identifier: repository_params[:identifier],
+            mirror_url: repository_params[:url].to_s.gsub("https://gitea.", "https://git."),
+            user_id: get_rand_user.id,
+            login: get_rand_user.login,
+            password: "",
+            is_mirror: false
+          }
+          Repositories::MigrateService.new(get_rand_user, project, repository_params).call
+          project_score = ProjectScore.new(project_socre_params.merge({project_id: project.id}))
+          project_score.save
+        end
+      end
+      Rails.logger.info("=======end to sync forge projects")
+    rescue => e
+      Rails.logger.info("=======sync forge projects has errors: #{e}")
+      raise ActiveRecord::Rollback
+    end
+  end
+
+  private 
+
+  def rand_user 
+    user_ids = User.select(:id, :type, :gitea_token, :gitea_uid).where("gitea_token is not null and gitea_uid is not null and type = ?", "User").pluck(:id)
+    range_user_id = user_ids[rand(user_ids.length-1)]
+    rand_sync_user = User.find_by_id(range_user_id)  #生成随机用户
+    unless rand_sync_user.present?
+      rand_user
+    end
+    rand_sync_user
+  end
+end

app/jobs/sync_mirrored_repository_job.rb

@@ -5,7 +5,7 @@ class SyncMirroredRepositoryJob < ApplicationJob
     repo = Repository.find_by(id: repo_id)
     current_user = User.find_by(id: user_id)
     return if repo.blank? || current_user.blank?
-    result = Gitea::Repository::SyncMirroredService.new(repo.owner.login, repo.identifier, token: current_user.gitea_token).call
-    repo&.mirror.set_status! if result[:status] === 200
+    result = Gitea::Repository::SyncMirroredService.new(repo.user.login, repo.identifier, token: current_user.gitea_token).call
+    repo&.mirror&.set_status! if result[:status] == 200 && repo.mirror.present?
   end
 end

app/jobs/sync_phenglei_user_job.rb

@@ -0,0 +1,36 @@
+class SyncPhengleiUserJob < ApplicationJob
+  queue_as :default
+
+  def perform(project_id=nil)
+    project_id ||= EduSetting.get("sync_phenglei_user_project")
+    project = Project.find_by_id(project_id)
+    return if project.nil?
+    member_count, success_count, error_count, not_exsit_count = 0, 0, 0, 0
+    Rails.logger.info("======begin to sync phenglei user to project#{project.owner.login + "/" + project.identifier}")
+    PhengleiUser.find_each do |i|
+      puts "======开始处理#{i.phone}"
+      user = User.find_by(phone: i.phone)
+      if user.present?
+        if project.member?(user.id)
+          puts "======#{i.phone}用户已经是外围贡献者了"
+          member_count += 1
+        else
+          interactor = Projects::AddMemberInteractor.call(project.owner, project, user, "read", true)
+          if interactor.error.nil?
+            puts "========用户#{i.phone}成功添加为项目的外围贡献者======="
+            success_count += 1
+          else
+            puts "========用户#{i.phone}添加失败"
+            error_count += 1
+          end
+        end
+      else
+        puts "=====#{i.phone}用户不存在"
+        not_exsit_count += 1
+        next
+      end
+    end
+    Rails.logger.info("======已存在外围贡献者数量#{member_count}, 成功添加用户数量#{success_count}, 添加失败用户数量#{error_count}, 找不到用户数量#{not_exsit_count}")
+    Rails.logger.info("======end to sync phenglei user to project#{project.owner.login + "/" + project.identifier}")
+  end
+end

app/libs/dun_check/image_check.rb

@@ -0,0 +1,167 @@
+class DunCheck::ImageCheck
+    
+  #检测结果，0：通过，1：嫌疑，2：不通过
+  # include ActionView::Helpers::LoopTextsHelper
+
+  require 'uri'
+  require 'net/http'
+  
+  def initialize(image_params)                                                                                                                                      
+    @image_params = image_params 
+  end 
+
+  def call
+    begin
+      Rails.logger.info("==========@image_params===========#{@image_params}")
+      dun_params = check_dun_params(@image_params)
+      
+      api_url = EduSetting.get("dun_image_api")
+
+      uri = URI.parse(api_url)
+
+      http = Net::HTTP.new(uri.hostname, uri.port)
+      if api_url.include?("https://")
+        http.use_ssl = true
+      end
+      dun_params_str = URI.encode_www_form(dun_params)
+     
+      header = {'content-type':'application/x-www-form-urlencoded'}
+      response = http.post(uri.path, dun_params_str, header)
+      
+      response_body = JSON.parse(response.body)
+      if response_body["code"].to_i == 200 
+        response_body_result = response_body["antispam"]
+        response_lables = response_body_result[0]["labels"]
+        return_sub_lable = ""
+        if response_lables.present?
+          return_sub_lable = get_sub_labels(response_lables)
+        end
+        render_status = response_body_result[0]["action"].to_i == 0 ? 1 : -1
+        tip_status(render_status, return_sub_lable.present? ? "图片含有: #{return_sub_lable}" : response_body["msg"] )
+      else
+        tip_status(-1, response_body["msg"])
+      end
+    rescue Exception => ex
+      Rails.logger.info "*** transaction abored!"
+      Rails.logger.info "*** errors: #{ex.message}"
+      tip_status(-1, "检测失败")
+    end
+
+  end
+
+  private
+
+  def check_dun_params(image_params)
+    
+    dun_public_params = DunCheck::PublicParams.new("image")
+    check_params = {
+      version: "v4",
+      images: image_params.to_json
+    }
+    check_params.merge!(dun_public_params.call)
+    dun_params = dun_public_params.generate_sign(check_params)
+    
+    return dun_params
+  end
+
+  def tip_status(status, message, msg_params={})
+    return {status: status, message: message, extra_params: msg_params}
+  end
+
+  def get_sub_labels(labels)
+    _sub_labels = []
+    labels.each do |label|
+      error_label = label["subLabels"].present? ? label["subLabels"][0]["subLabel"] : ""
+      if error_label.present?
+        _sub_labels.push(sub_lables[:"#{error_label.to_s}"])
+      end
+    end
+    return _sub_labels.present? ? _sub_labels.join(",") : ""
+  end
+
+  def sub_lables
+    {
+      "10000": "色情",
+      "10001": "女下体",
+      "10002": "女胸",
+      "10003": "男下体",
+      "10004": "性行为",
+      "10005": "臀部",
+      "10006": "口交",
+      "10007": "卡通色情",
+      "10008": "色情人物",
+      "10009": "儿童色情",
+      "11000": "性感低俗",
+      "11001": "亲吻",
+      "11002": "腿部特写",
+      "11003": "非漏点赤膊",
+      "11004": "胸部",
+      "100001": "色情文字-色情其他",
+      "100002":	"色情文字-色情传播",
+      "100003":	"色情文字-色情性器官",
+      "100004":	"色情文字-色情挑逗",
+      "100005":	"色情文字-色情低俗段子",
+      "100006":	"色情文字-色情性行为",
+      "100007":	"色情文字-色情舆情事件",
+      "100008":	"色情文字-色情交友类",
+      "20000":	"广告",
+      "20001":	"广告带文字",
+      "200009":	"广告文字-商业推广",
+      "200010":	"广告文字-广告法",
+      "200011":	"刷量行为",
+      "200012":	"广告其他",
+      "260052":	"广告文字-广告法-涉医疗用语",
+      "260053":	"广告文字-广告法-迷信用语",
+      "260054":	"广告文字-广告法-需要凭证",
+      "260055":	"广告文字-广告法-限时性用语",
+      "260056":	"广告文字-广告法-涉嫌诱导消费者",
+      "260057":	"广告文字-广告法-涉嫌欺诈消费者",
+      "260058":	"广告文字-广告法-法律风险较高",
+      "260059":	"广告文字-广告法-极限词",
+      "21000":	"二维码",
+      "30000":	"暴恐",
+      "30001":	"暴恐图集",
+      "30002":	"暴恐旗帜",
+      "30003":	"暴恐人物",
+      "30004":	"暴恐标识",
+      "30005":	"暴恐场景",
+      "300016":	"暴恐文字-暴恐其他",
+      "40000":	"违禁",
+      "40001":	"违禁图集",
+      "40002":	"违禁品",
+      "40003":	"特殊标识",
+      "40004":	"血腥模型",
+      "40005":	"公职服饰",
+      "40006":	"不文明",
+      "40007":	"违禁人物",
+      "40008":	"违禁场景",
+      "40009":	"火焰",
+      "40010":	"骷髅",
+      "40011":	"货币",
+      "40012":	"毒品",
+      "400017":	"违禁文字-违禁其他",
+      "600018":	"违禁文字-谩骂其他",
+      "50000":	"涉政",
+      "50001":	"涉政图集",
+      "50002":	"中国地图",
+      "50003":	"涉政人物",
+      "50004":	"涉政旗帜",
+      "50005":	"涉政标识",
+      "50006":	"涉政场景",
+      "500013":	"涉政文字-涉政其他",
+      "500014":	"涉政文字-敏感专项",
+      "500015":	"涉政文字-严格涉政",
+      "500039":	"涉政文字-时事报道",
+      "500040":	"涉政文字-领导人相关",
+      "500041":	"涉政文字-英雄烈士相关",
+      "500042":	"涉政文字-邪教迷信",
+      "500043":	"涉政文字-落马官员相关",
+      "500044":	"涉政文字-热点舆情",
+      "500045":	"涉政文字-涉政综合",
+      "90000":	"其他",
+      "90002":	"自定义用户名单",
+      "90003":	"自定义IP名单",
+      "900020":	"文字违规-其他"
+    }
+  end
+end

app/libs/dun_check/public_params.rb

@@ -0,0 +1,31 @@
+class DunCheck::PublicParams
+  def initialize(type)                                                                                                                                      
+    @type = type 
+  end 
+
+  def call
+   
+    public_params = {
+      secretId: EduSetting.get("dun_secret_id"), 
+      businessId: EduSetting.get("dun_#{@type}_businessId"),
+      timestamp: DateTime.current.strftime('%Q').to_i,
+      nonce: rand(10 ** 11).to_i
+    }
+    return public_params
+  end
+
+  def generate_sign(params)
+    secretkey = EduSetting.get("dun_secrect_key")
+    sort_params = params.sort.to_h 
+    sign_str = ""
+    sort_params.each do |k,v|
+      sign_str += "#{k.to_s}#{v.to_s}"
+    end
+    sign_str += secretkey
+    md5_sign = Digest::MD5.hexdigest(sign_str.to_s.force_encoding("UTF-8"))
+    return sort_params.merge!(signature: md5_sign)
+  end
+
+end
+
+

app/libs/dun_check/text_check.rb

@@ -0,0 +1,164 @@
+class DunCheck::TextCheck
+    
+  # include DunCheck::PublicParams
+  #text_params = {
+  #   content: "ccc", #内容
+  #   ip: "xxx", #用户ip
+  #   account: "xxx", #登录login
+  #   nickname: "xxx", #用户姓名
+  #   title: "xxx", #帖子的标题
+  # }
+
+  #检测结果，0：通过，1：嫌疑，2：不通过
+  # include ActionView::Helpers::LoopTextsHelper
+
+  require 'uri'
+  require 'net/http'
+  
+  def initialize(text_params)                                                                                                                                      
+    @text_params = text_params 
+  end 
+
+  def call
+    new_text_params = @text_params
+    text_long_array = []
+    check_content = new_text_params[:content]
+    format_text(check_content,text_long_array)
+    (1..text_long_array.size).each do |i|
+      new_text_params.merge!(content: text_long_array[i-1])
+      check_result = check_text(new_text_params)
+      if check_result[:status].to_i == -1
+        return check_result
+        break
+      else
+        if i == text_long_array.size
+          return check_result
+        else
+          next
+        end
+      end
+    end
+  end
+
+  def check_text(text_params)
+    begin
+      dun_params = check_dun_params(text_params)
+      
+      # api_url = Redmine::Configuration['dun']['text_api']
+      api_url = EduSetting.get("dun_text_api")
+      uri = URI.parse(api_url)
+
+      http = Net::HTTP.new(uri.hostname, uri.port)
+      if api_url.include?("https://")
+        http.use_ssl = true
+      end
+      dun_params_str = URI.encode_www_form(dun_params)
+      header = {'content-type':'application/x-www-form-urlencoded'}
+      response = http.post(uri.path, dun_params_str, header)
+      response_body = eval(response.body)
+      Rails.logger.info("======response========#{response_body}")
+      
+      if response_body[:code].to_i == 200 
+        response_body_result = response_body[:result]
+        response_body_labels = response_body_result[:labels].present? ? response_body_result[:labels][0] : []
+        extra_params = {
+          action: response_body_result[:action], 
+          taskId: response_body_result[:taskId],
+          infos: response_body_labels.present? ? sub_lables[:"#{response_body_labels[:subLabels][0][:subLabel]}"] : ""
+        }
+        render_status = response_body_result[:action].to_i == 0 ? 1 : -1
+        tip_status(render_status, response_body[:msg], extra_params)
+      else
+        tip_status(-1, response_body[:msg])
+      end
+    rescue Exception => ex
+      Rails.logger.info "*** transaction abored!"
+      Rails.logger.info "*** errors: #{ex.message}"
+      tip_status(-1, "检测失败")
+  end
+
+  end
+
+  private
+
+  def check_dun_params(text_params)
+    dun_public_params = DunCheck::PublicParams.new("text")
+    rand_data_id = random_dataId
+    check_params = {
+      dataId: rand_data_id,
+      version: "v3.1",
+      callback: rand_data_id
+    }.merge(text_params)
+
+    check_params.merge!(dun_public_params.call)
+    dun_params = dun_public_params.generate_sign(check_params)
+    return dun_params
+  end
+
+  def format_text(text_long, text_long_array)
+    slice_content = text_long.slice(0..4998)
+    last_slice_content =  text_long.slice(4999..-1)
+    text_long_array.push(slice_content)
+    if last_slice_content.present?
+      if last_slice_content.length > 4999
+        format_text(last_slice_content, text_long_array)
+      else
+        text_long_array.push(last_slice_content)
+      end
+    end
+  end
+
+  def random_dataId
+    Digest::MD5.hexdigest(rand(100000000).to_s)
+  end 
+
+  def check_labels
+    # 100：色情，200：广告，260：广告法，300：暴恐，400：违禁，500：涉政，600：谩骂，700：灌水
+    %w(100 200 260 300 400 500 600 700).join(",")
+  end
+
+  def tip_status(status, message, msg_params={})
+    return {status: status, message: message, extra_params: msg_params}
+  end
+
+  def sub_lables
+    {
+      "100001": "色情其他",
+      "100002":	"色情传播",
+      "100003":	"色情性器官",
+      "100004":	"色情挑逗",
+      "100005":	"色情低俗段子",
+      "100006":	"色情性行为",
+      "100007":	"色情舆情事件",
+      "100008":	"色情交友类",
+      "200009":	"商业推广",
+      "200010":	"广告法",
+      "200011":	"刷量行为",
+      "200012":	"广告其他",
+      "260052":	"广告法-涉医疗用语（非药品禁止宣传药效）",
+      "260053":	"广告法-迷信用语",
+      "260054":	"广告法-需要凭证（可以写但需要凭证证明）",
+      "260055":	"广告法-限时性用语（可以写但必须有具体时间）",
+      "260056":	"广告法-涉嫌诱导消费者",
+      "260057":	"广告法-涉嫌欺诈消费者",
+      "260058":	"广告法-法律风险较高",
+      "260059":	"广告法-极限词（用语绝对化）",
+      "300016":	"暴恐其他",
+      "400017":	"违禁其他",
+      "400021":	"违禁网监要求",
+      "500013":	"涉政其他",
+      "500014":	"敏感专项",
+      "500015":	"严格涉政",
+      "500039":	"时事报道",
+      "500040":	"领导人相关",
+      "500041":	"英雄烈士相关",
+      "500042":	"邪教迷信",
+      "500043":	"落马官员相关",
+      "500044":	"热点舆情",
+      "500045":	"涉政综合",
+      "600018":	"谩骂其他",
+      "700019":	"灌水其他",
+      "900020":	"其他",
+    }
+  end
+end

app/models/apply_signature.rb

@@ -0,0 +1,30 @@
+# == Schema Information
+#
+# Table name: apply_signatures
+#
+#  id         :integer          not null, primary key
+#  user_id    :integer
+#  project_id :integer
+#  status     :integer          default("0")
+#  created_at :datetime         not null
+#  updated_at :datetime         not null
+#
+# Indexes
+#
+#  index_apply_signatures_on_project_id  (project_id)
+#  index_apply_signatures_on_user_id     (user_id)
+#
+
+class ApplySignature < ApplicationRecord
+    belongs_to :user
+    belongs_to :project
+
+    has_many :attachments, as: :container, dependent: :destroy
+
+    scope :with_user_id, -> (user_id) {where(user_id: user_id)}
+    scope :with_status, -> (status) {where(status: status) if status.present? && status != "all"}
+
+    validates :project_id, uniqueness: {scope: :user_id}
+
+    enum status: {unpassed: -1, waiting: 0, passed: 1}
+end

app/models/attachment.rb

@@ -42,7 +42,7 @@ class Attachment < ApplicationRecord
   include Publicable
   include Publishable
   include Lockable
-
+  include DunCheckImageAble
   belongs_to :container, polymorphic: true, optional: true
   belongs_to :author, class_name: "User", foreign_key: :author_id
   # belongs_to :course, foreign_key: :container_id, optional: true

app/models/concerns/dun_check_able.rb

@@ -0,0 +1,50 @@
+module DunCheckAble
+  extend ActiveSupport::Concern
+
+  included do
+    validate :check_text_able
+  end
+
+  def check_text_able
+    dun_check_params = get_model    
+    if dun_check_params[:is_change]
+      dun_check_params.delete(:is_change)
+      check_result = DunCheck::TextCheck.new(dun_check_params).call
+      if check_result[:status].to_i == -1
+        errors.add(:base, "内容含有：#{check_result[:extra_params][:infos]}，请修改")
+        # raise ActiveRecord::RecordInvalid.new(self)
+      end
+    end
+  end
+
+  def get_model
+    dun_model = self.class.name
+    case dun_model
+    when "Issue"
+      check_params = {
+        title: self.subject,
+        content: self.description,
+        is_change: (self.subject_changed? || self.description_changed?) && self.subject.present? &&  self.description.present?
+      }
+    when "PullRequest"
+      check_params = {
+        title: "",
+        content: self.body,
+        is_change: self.body_changed? && self.body.present?
+      }
+    when "Journal"
+      check_params = {
+        title: "",
+        content: self.notes,
+        is_change: self.notes_changed? && self.notes.present?
+      }
+    when "Version"
+      check_params = {
+        title: self.name,
+        content: self.description,
+        is_change: (self.name_changed? || self.description_changed?) &&  self.name.present? &&  self.description.present?
+      }
+    end
+    return check_params
+  end
+end

app/models/concerns/dun_check_image_able.rb

@@ -0,0 +1,33 @@
+module DunCheckImageAble
+  extend ActiveSupport::Concern
+
+  included do
+    def self.check_image_able(file)
+      original_filename = file.original_filename
+      file_extention = original_filename.split(".").last
+      check_include = %w(jpg png bmp gif webp tiff jpeg)
+      
+      if file_extention && check_include.include?(file_extention)
+        base64_file = Base64.encode64(file.open.read.force_encoding(Encoding::UTF_8))
+        check_params = [
+          {
+            name: original_filename,
+            type: 2,
+            data: base64_file,
+          }
+        ]
+        check_result = DunCheck::ImageCheck.new(check_params).call
+        if check_result[:status].to_i == -1
+          return {status: -1, message: check_result[:message]}
+        else
+          return {status: 1}
+        end
+      else
+        return {status: 1}
+      end
+    end
+  end
+
+  
+
+end

app/models/concerns/matchable.rb

@@ -5,7 +5,7 @@ module Matchable
     scope :with_project_category, ->(category_id) { where(project_category_id: category_id) unless category_id.blank? }
     scope :with_project_language, ->(language_id) { where(project_language_id: language_id) unless language_id.blank? }
     scope :with_project_type,     ->(project_type) { where(project_type: project_type) if Project.project_types.include?(project_type) }
-    scope :by_name_or_identifier, ->(search) { where("name like :search or identifier LIKE :search", :search => "#{search.split(" ").join('|')}%") unless search.blank? }
+    scope :by_name_or_identifier, ->(search) { where("projects.name like :search or projects.identifier LIKE :search", :search => "#{search.split(" ").join('|')}%") unless search.blank? }
   end
 
 end

app/models/concerns/project_ability.rb

@@ -7,6 +7,7 @@ module ProjectAbility
 
   def can_read_project?(project)
     return true if self.admin?
+    return true if project.is_secret
     return false if !project.is_public? && !project.member?(self.id)
     true
   end

app/models/concerns/project_operable.rb

@@ -11,8 +11,8 @@ module ProjectOperable
     has_many :team_projects, dependent: :destroy
   end
 
-  def add_member!(user_id, role_name='Developer')
-    member = members.create!(user_id: user_id)
+  def add_member!(user_id, role_name='Developer', is_apply_signature=false)
+    member = members.create!(user_id: user_id, is_apply_signature: is_apply_signature)
     set_developer_role(member, role_name)
   end
 

app/models/issue.rb

@@ -50,6 +50,7 @@
 
 class Issue < ApplicationRecord
   #issue_type 1为普通，2为悬赏
+  include DunCheckAble
   belongs_to :project, :counter_cache => true
   belongs_to :tracker,optional: true
   has_many :project_trends, as: :trend, dependent: :destroy

app/models/journal.rb

@@ -22,6 +22,7 @@
 #
 
 class Journal < ApplicationRecord
+  include DunCheckAble
   belongs_to :user
   belongs_to :issue, foreign_key: :journalized_id, :touch => true
   has_many :journal_details, :dependent => :delete_all

app/models/laboratory.rb

@@ -41,9 +41,10 @@ class Laboratory < ApplicationRecord
 
   delegate :name, :navbar, :footer, :login_logo_url, :nav_logo_url, :tab_logo_url, :default_navbar, to: :laboratory_setting
 
+  # TODO 域名申请后更改
   def site
     rails_env = EduSetting.get('rails_env')
-    suffix = rails_env && rails_env != 'production' ? ".#{rails_env}.trustie.net" : '.trustie.net'
+    suffix = rails_env && rails_env != 'production' ? "39.105.176.215" : '39.105.176.215'
 
     identifier ? "#{identifier}#{suffix}" : ''
   end

app/models/license.rb

@@ -12,4 +12,6 @@
 
 class License < ApplicationRecord
   include Projectable
+  has_many :attachments, as: :container, dependent: :destroy
+
 end

app/models/phenglei_user.rb

@@ -0,0 +1,18 @@
+# == Schema Information
+#
+# Table name: phenglei_users
+#
+#  id         :integer          not null, primary key
+#  phone      :string(255)
+#  created_at :datetime         not null
+#  updated_at :datetime         not null
+#
+
+class PhengleiUser < ApplicationRecord
+
+  validates :phone, uniqueness: true
+
+  def register 
+    User.find_by(phone: self.phone)
+  end
+end

app/models/project.rb

@@ -108,6 +108,7 @@ class Project < ApplicationRecord
   has_many :praise_treads, as: :praise_tread_object, dependent: :destroy
   has_and_belongs_to_many :trackers, :order => "#{Tracker.table_name}.position"
   has_one :project_detail, dependent: :destroy
+  has_many :apply_signatures, dependent: :destroy
   has_many :team_projects, dependent: :destroy
 
   after_save :check_project_members
@@ -115,6 +116,9 @@ class Project < ApplicationRecord
   scope :no_anomory_projects, -> {where("projects.user_id is not null and projects.user_id != ?", 2)}
   scope :recommend,           -> { visible.project_statics_select.where(recommend: true) }
 
+  scope :secret_and_visible, -> {left_outer_joins(:license).where("licenses.is_secret = TRUE OR projects.is_public = TRUE")}
+
+  delegate :is_secret, to: :license, allow_nil: true
 
 
   def self.search_project(search)

app/models/project_category.rb

@@ -19,4 +19,12 @@ class ProjectCategory < ApplicationRecord
   include Projectable
   has_ancestry
 
+  def self.descendants
+    where.not(ancestry: [nil, ""])
+  end
+
+  def self.get_children(target_id)
+    where(ancestry: target_id).pluck(:id,:name)
+  end
+
 end

app/models/pull_request.rb

@@ -24,6 +24,7 @@
 #
 
 class PullRequest < ApplicationRecord
+  include DunCheckAble
   #status 0 默认未合并， 1表示合并, 2表示请求拒绝(或已关闭)
   OPEN   = 0
   MERGED  = 1

app/models/token.rb

@@ -70,7 +70,7 @@ class Token < ActiveRecord::Base
 
   # Delete all expired tokens
   def self.destroy_expired
-    Token.delete_all ["action NOT IN (?) AND created_on < ?", ['feeds', 'api', 'autologin'], Time.now - @@validity_time]
+    Token.delete_all ["action NOT IN (?) AND created_on < ?", ['feeds', 'api', 'autologin', 'autologin_forge_military'], Time.now - @@validity_time]
   end
 
   # Returns the active user who owns the key for the given action

app/models/user.rb

@@ -156,6 +156,7 @@ class User < Owner
   # has_many :libraries, dependent: :destroy
   has_many :project_trends, dependent: :destroy
   has_many :oauths , dependent: :destroy
+  has_many :apply_signatures, dependent: :destroy
 
   has_many :organization_users, dependent: :destroy
   has_many :organizations, through: :organization_users
@@ -163,7 +164,7 @@ class User < Owner
   # Groups and active users
   scope :active, lambda { where(status: STATUS_ACTIVE) }
   scope :like, lambda { |keywords|
-    where("LOWER(concat(lastname, firstname, login, mail)) LIKE ?", "%#{keywords.split(" ").join('|')}%") unless keywords.blank?
+    where("LOWER(concat(nickname, lastname, firstname, login, mail)) LIKE ?", "%#{keywords.split(" ").join('|')}%") unless keywords.blank?
   }
 
   scope :simple_select, -> {select(:id, :login, :lastname,:firstname, :nickname, :gitea_uid, :type)}
@@ -191,7 +192,7 @@ class User < Owner
 
   # 删除自动登录的token，一旦退出下次会提示需要登录
   def delete_autologin_token(value)
-    Token.where(:user_id => id, :action => 'autologin', :value => value).delete_all
+    Token.where(:user_id => id, :action => autologin_name, :value => value).delete_all
   end
 
   def delete_session_token(value)
@@ -577,8 +578,8 @@ class User < Owner
   end
 
   # Returns the user who matches the given autologin +key+ or nil
-  def self.try_to_autologin(key)
-    user = Token.find_active_user('autologin', key)
+  def self.try_to_autologin(key,type)
+    user = Token.find_active_user(type, key)
     user.update(last_login_on: Time.now) if user
     user
   end
@@ -742,6 +743,10 @@ class User < Owner
     raise("昵称包含敏感词汇，请重新输入") if nickname && !HarmoniousDictionary.clean?(nickname)
   end
 
+  def autologin_name 
+    EduSetting.get('autologin_cookie_name') || "autologin_forge_military"
+  end
+
   def set_laboratory
     return unless new_record?
 

app/models/version.rb

@@ -24,6 +24,7 @@
 #
 
 class Version < ApplicationRecord
+  include DunCheckAble
   belongs_to :project, counter_cache: true
   has_many :issues, class_name: "Issue", foreign_key: "fixed_version_id"
   belongs_to :user, optional: true

app/queries/projects/list_my_query.rb

@@ -51,7 +51,7 @@ class Projects::ListMyQuery < ApplicationQuery
       
     q = projects.ransack(name_or_identifier_cont: params[:search])
 
-    scope = q.result.includes(:project_category, :project_language,:owner, :repository)
+    scope = q.result.includes(:project_category, :project_language,:owner, :repository, :members)
 
     sort = params[:sort_by] || "updated_on"
     sort_direction = params[:sort_direction] || "desc"

app/queries/projects/list_query.rb

@@ -10,12 +10,12 @@ class Projects::ListQuery < ApplicationQuery
   end
 
   def call
-    q = Project.visible.by_name_or_identifier(params[:search])
+    q = Project.secret_and_visible.by_name_or_identifier(params[:search])
 
     scope = q
       .with_project_type(params[:project_type])
       .with_project_category(params[:category_id])
-      .with_project_language(params[:language_id])
+      .with_project_language(params[:language_id]).order(order_index: :desc)
 
     sort = params[:sort_by] || "updated_on"
     sort_direction = params[:sort_direction] || "desc"

app/services/projects/create_service.rb

@@ -53,6 +53,11 @@ class Projects::CreateService < ApplicationService
   # end
 
   def repo_is_public
-    params[:private].blank? ? true : !params[:private]
+    license = License.find_by_id(params[:license_id])
+    if license.is_secret 
+      false
+    else
+      params[:private].blank? ? true : !params[:private]
+    end
   end
 end

app/tasks/sync_forge_projects_rake.rb

@@ -0,0 +1,20 @@
+require 'uri'
+require 'net/http'
+
+class SyncForgeProjectsRake
+  # 运行示例: 检查哪些项目的repo不存在，bundle exec rails runner "SyncForgeProjectsRake.new.call(5)" -e production
+  
+    def call(count)
+     
+      url = "https://forgeplus.trustie.net/api/sync_forge/sync_range_projects"  #trustie上的相关路由
+      count_params = {
+        sync_count: count || 10
+      }
+      Rails.logger.info("============begin to sync project,count: #{count_params} ===========")
+      uri = URI.parse(url)
+      http = Net::HTTP.new(uri.hostname, uri.port)
+      http.use_ssl = true
+      response = http.send_request('POST', uri.path, count_params.to_json, {'Content-Type' => 'application/json'})
+      Rails.logger.info("============end to sync project, status: #{response.code} ===========")
+    end
+  end

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

@@ -0,0 +1,7 @@
+<% define_admin_breadcrumbs do %>
+  <% add_admin_breadcrumb('特殊许可申请列表') %>
+<% end %>
+
+<div class="box admin-list-container apply_signatures-list-container">
+  <%= render partial: 'admins/apply_signatures/shared/list', locals: { apply_signatures: @apply_signatures } %>
+</div>

app/views/admins/apply_signatures/index.js.erb

@@ -0,0 +1 @@
+$('.apply_signatures-list-container').html("<%= j( render partial: 'admins/apply_signatures/shared/list', locals: { apply_signatures: @apply_signatures } ) %>");

app/views/admins/apply_signatures/shared/_list.html.erb

@@ -0,0 +1,42 @@
+<table class="table table-hover text-center subject-list-table">
+  <thead class="thead-light">
+    <tr>
+      <th width="10%">序号</th>
+      <th width="20%" class="text-left">项目名称</th>
+      <th width="20%">申请人</th>
+      <th width="25%">申请材料</th>
+      <th width="25%">操作</th>
+    </tr>
+  </thead>
+  <tbody>
+    <% if apply_signatures.present? %>
+    <% apply_signatures.each_with_index do |signature, index| %>
+    <tr class="sinature-item-<%= signature.id %>">
+      <td><%= list_index_no((params[:page] || 1).to_i, index) %></td>
+      <td class="text-left">
+        <%= link_to(signature&.project&.name, "/projects/#{signature&.project&.owner&.login}/#{signature&.project&.identifier}", target: '_blank') %>
+      </td>
+      <td>
+        <%= link_to(signature&.user&.real_name, "/users/#{signature&.user&.login}", target: '_blank') %>
+      </td>
+      <td>
+        <% if signature.attachments.present? %>
+          <% signature.attachments.each do |attachment|%>
+            <%= link_to "#{attachment.try(:filename)}",attachment_path(attachment), target: "_blank"  %>
+          <% end %>
+        <% end %>
+        
+      </td>
+      <td class="action-container">
+        <%= link_to "同意", admins_apply_signature_path(signature.id, status: "passed"), method: :patch, class: "delete-project-action" %>
+        <%= link_to "拒绝", admins_apply_signature_path(signature.id, status: "unpassed"), method: :patch, class: "delete-project-action" %>
+      </td>
+    </tr>
+    <% end %>
+    <% else %>
+    <%= render 'admins/shared/no_data_for_table' %>
+    <% end %>
+  </tbody>
+</table>
+
+<%= render partial: 'admins/shared/paginate', locals: { objects: apply_signatures } %>

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

@@ -4,7 +4,7 @@
 
 <div class="box search-form-container laboratory-list-form">
   <%= form_tag(admins_laboratories_path(unsafe_params), method: :get, class: 'form-inline search-form flex-1', remote: true) do %>
-    <%= text_field_tag(:keyword, params[:keyword], class: 'form-control col-6 col-md-4 ml-3', placeholder: '学校名称/二级域名前缀检索') %>
+    <%= text_field_tag(:keyword, params[:keyword], class: 'form-control col-6 col-md-4 ml-3', placeholder: '二级域名前缀检索') %>
     <%= submit_tag('搜索', class: 'btn btn-primary ml-3', 'data-disable-with': '搜索中...') %>
   <% end %>
 
@@ -16,4 +16,4 @@
 </div>
 
 <%= render 'admins/laboratories/shared/create_laboratory_modal' %>
-<%= render 'admins/laboratories/shared/add_laboratory_user_modal' %>
+<%= render 'admins/laboratories/shared/add_laboratory_user_modal' %>

app/views/admins/laboratories/shared/_laboratory_item.html.erb

@@ -1,9 +1,9 @@
 <% school = laboratory&.school %>
 <td><%= list_index_no((params[:page] || 1).to_i, index) %></td>
-<td class="text-left"><%= school&.name || 'Trustie主站' %></td>
+<td class="text-left"><%= school&.name || '可控开源社区' %></td>
 <td class="text-left">
   <% if laboratory.identifier %>
-    <%= link_to laboratory.site, "https://#{laboratory.site}", target: '_blank'  %>
+    <%= link_to laboratory.site, "http://#{laboratory.site}", target: '_blank'  %>
   <% else %>
     --
   <% end %>
@@ -51,19 +51,5 @@
   <% if school.present? && laboratory.id != 1 %>
     <%= javascript_void_link '添加管理员', class: 'action', data: { laboratory_id: laboratory.id, toggle: 'modal', target: '.admin-add-laboratory-user-modal' } %>
     <%= link_to '同步用户', synchronize_user_admins_laboratory_path(laboratory), remote: true, data: { confirm: '确认同步该单位下的所有用户到云上实验室吗？' }, class: 'action' %>
-<% end %>
-
-  <div class="d-inline">
-    <%= javascript_void_link('更多', class: 'action dropdown-toggle', 'data-toggle': 'dropdown', 'aria-haspopup': true, 'aria-expanded': false) %>
-    <div class="dropdown-menu more-action-dropdown">
-      <%= link_to '轮播图', admins_laboratory_carousels_path(laboratory), class: 'dropdown-item' %>
-
-      <%= link_to '查看实训项目', admins_laboratory_laboratory_shixuns_path(laboratory), class: 'dropdown-item' %>
-      <%= link_to '查看实践课程', admins_laboratory_laboratory_subjects_path(laboratory), class: 'dropdown-item' %>
-
-      <% if school.present? && laboratory.id != 1 %>
-        <%= delete_link '删除', admins_laboratory_path(laboratory, element: ".laboratory-item-#{laboratory.id}"), class: 'dropdown-item delete-laboratory-action' %>
-      <% end %>
-    </div>
-  </div>
+    <% end %>
 </td>

app/views/admins/laboratory_settings/show.html.erb

@@ -19,10 +19,14 @@
                              maxlength: 15, class: 'form-control font-16',
                              'onKeyUp': 'value=value.replace(/[^\w\-\/]/ig,"").toLowerCase()',
                              style: 'text-transform:lowercase'%>
-          <div class="input-group-append">
+          <%
+=begin%>
+ <div class="input-group-append">
             <% rails_env = EduSetting.get('rails_env') %>
             <span class="input-group-text font-14" id="site-prefix"><%= rails_env && rails_env != 'production' ? ".#{rails_env}.educoder.net" : '.educoder.net' %></span>
           </div>
+<%
+=end%>
         </div>
         <%# if @laboratory.errors && @laboratory.errors.key?(:identifier) %>
 <!--          <span id="identifier-error" class="danger text-danger">二级域名已被使用</span>-->
@@ -144,7 +148,7 @@
 
     <div class="form-group px-2 setting-item">
       <div class="setting-item-head">
-      <h6>导航设置      
+      <h6>导航设置
       <%= link_to "<i class='fa fa-plus-circle'></i>".html_safe,new_admins_laboratory_laboratory_setting_path, remote: true,  class: "btn btn-primary btn-sm"%>
 </h6>
       </div>
@@ -195,8 +199,3 @@
     </div>
   <% end %>
 </div>
-<script>
-function destroy_tr(that) {
-  $(that).parent().parent("tr").remove()
-}
-</script>

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

@@ -0,0 +1,19 @@
+<% define_admin_breadcrumbs do %>
+  <% add_admin_breadcrumb('风雷意向用户管理', admins_phenglei_users_path) %>
+<% end %>
+
+<div class="box search-form-container user-list-form">
+  <%= form_tag(admins_phenglei_users_path, method: :get, class: 'form-inline search-form flex-1', remote: true) do %>
+    <%= text_field_tag(:keyword, params[:keyword], class: 'form-control col-sm-2 ml-3', placeholder: '手机号检索') %>
+
+    <%= submit_tag('搜索', class: 'btn btn-primary ml-3', 'data-disable-with': '搜索中...') %>
+    <%= link_to "同步", sync_phenglei_user_admins_project_path(@phenglei_project.id), method: :get, data: {confirm: "确认同步吗？"}, class: "btn btn-primary pull-right ml-3", "data-disabled-with":"...同步"  %>
+  <% end %>
+  <%= link_to "新增", new_admins_phenglei_user_path, remote: true, class: "btn btn-primary ml-3", "data-disabled-with":"...新增" %> 
+</div>
+
+<div class="box admin-list-container phenglei-users-list-container">
+  <%= render partial: 'admins/phenglei_users/shared/list', locals: { phenglei_users: @phenglei_users } %>
+</div>
+<div id="phenglei-users-modals">
+</div>

app/views/admins/phenglei_users/index.js.erb

@@ -0,0 +1 @@
+$('.phenglei-users-list-container').html("<%= j( render partial: 'admins/phenglei_users/shared/list', locals: { phenglei_users: @phenglei_users } ) %>");

app/views/admins/phenglei_users/new.js.erb

@@ -0,0 +1,2 @@
+$("#phenglei-users-modals").html("<%= j render(partial: 'admins/phenglei_users/shared/create_form_modal') %>")
+$(".phenglei-user-create-modal").modal('show');

app/views/admins/phenglei_users/shared/_create_form_modal.html.erb

@@ -0,0 +1,21 @@
+<div class="modal fade phenglei-user-create-modal" tabindex="-1" role="dialog" aria-hidden="true">
+  <div class="modal-dialog modal-dialog-centered" role="document">
+    <div class="modal-content">
+      <div class="modal-header">
+        <h5 class="modal-title">新增</h5>
+        <button type="button" class="close" data-dismiss="modal" aria-label="Close">
+          <span aria-hidden="true">&times;</span>
+        </button>
+      </div>
+       <%= form_for @phenglei_user, url: {controller: "phenglei_users", action: 'create'} do |p| %>
+        <div class="modal-body">
+          <%= p.text_field :phone, class: "form-control input-lg",placeholder: "手机号",required: true, maxlength: 64%>
+        </div>
+        <div class="modal-footer">
+          <button type="button" class="btn btn-secondary" data-dismiss="modal">取消</button>
+          <%= p.submit "确认", class: "btn btn-primary submit-btn" %>
+        </div>
+      <% end %>
+    </div>
+  </div>
+</div>

app/views/admins/phenglei_users/shared/_list.html.erb

@@ -0,0 +1,30 @@
+<table class="table table-hover users-list-table">
+  <thead class="thead-light">
+    <tr>
+      <th width="4%">序号</th>
+      <th width="10%">手机号码</th>
+      <th width="12%">状态</th>
+    </tr>
+  </thead>
+  <tbody>
+    <% if phenglei_users.present? %>
+      <% phenglei_users.each_with_index do |user, index| %>
+        <tr class="user-item-<%= user.id %>">
+          <td><%= list_index_no((params[:page] || 1).to_i, index) %></td>
+          <td><%= overflow_hidden_span display_text(user.phone), width: 100 %></td>
+          <td>
+            <% if user.register.present? %>
+              <%= @phenglei_project.member?(user.register.id) ? "已同步" : "未同步" %>
+            <% else %>
+              未注册
+            <% end %>
+          </td>
+        </tr>
+      <% end %>
+    <% else %>
+      <%= render 'admins/shared/no_data_for_table' %>
+    <% end %>
+  </tbody>
+</table>
+
+<%= render partial: 'admins/shared/paginate', locals: { objects: phenglei_users } %>

app/views/admins/projects/shared/_list.html.erb

@@ -5,6 +5,7 @@
       <th width="4%">ID</th>
       <th width="15%" class="text-left">项目名称</th>
       <th width="6%">公开</th>
+      <th width="6%">特殊协议</th>
       <th width="5%">issue</th>
       <th width="5%">资源</th>
       <th width="6%">版本库</th>
@@ -23,9 +24,10 @@
       <td><%= list_index_no((params[:page] || 1).to_i, index) %></td>
       <td><%= project.id %></td>
       <td class="text-left">
-        <%= link_to(project.name, "/projects/#{project.id}", target: '_blank') %>
+        <%= link_to(project.name, "/projects/#{project.owner&.login}/#{project.identifier}", target: '_blank') %>
       </td>
       <td><%= project.is_public ? '√' : '' %></td>
+      <td><%= project.is_secret ? '√' : '' %></td>
       <td><%= project.issues.size %></td>
       <td><%= project.attachments.size %></td>
       <td><%= project&.project_score.try(:changeset_num).to_i %></td>

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

@@ -17,6 +17,7 @@
     <li>
       <%= sidebar_item_group('#user-submenu', '用户', icon: 'user') do %>
         <li><%= sidebar_item(admins_users_path, '用户列表', icon: 'user', controller: 'admins-users') %></li>
+        <li><%= sidebar_item(admins_phenglei_users_path, '风雷意向用户列表', icon: 'user', controller: 'admins-phenglei_users') %></li>
       <% end %>
     </li>
     <li>
@@ -26,6 +27,8 @@
         <li><%= sidebar_item(admins_project_categories_path, '分类列表', icon: 'sitemap', controller: 'admins-project_categories') %></li>
         <li><%= sidebar_item(admins_project_licenses_path, '开源许可证', icon: 'file-text-o', controller: 'admins-project_licenses') %></li>
         <li><%= sidebar_item(admins_project_ignores_path, '忽略文件', icon: 'git', controller: 'admins-project_ignores') %></li>
+        <li><%= sidebar_item(admins_apply_signatures_path, '特殊许可申请列表', icon: 'git', controller: 'admins-apply_signatures') %></li>
+
       <% end %>
     </li>
 

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

@@ -25,16 +25,16 @@
     <%= text_field_tag(:keyword, params[:keyword], class: 'form-control col-sm-2 ml-3', placeholder: 'ID/姓名/邮箱/手机号检索') %>
     <%
 =begin%>
- <%= text_field_tag(:school_name, params[:school_name], class: 'form-control  col-sm-2', placeholder: '学校/单位检索') %> 
+ <%= text_field_tag(:school_name, params[:school_name], class: 'form-control  col-sm-2', placeholder: '学校/单位检索') %>
 <%
 =end%>
     <%= 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'} %>
+  <%#= javascript_void_link '导入用户', class: 'btn btn-secondary btn-sm', data: { toggle: 'modal', target: '.admin-import-user-modal'} %>
   <%
 =begin%>
- <%= javascript_void_link '导入课堂成员', class: 'btn btn-secondary btn-sm ml-2', data: { toggle: 'modal', target: '.admin-import-course-member-modal'} %> 
+ <%= javascript_void_link '导入课堂成员', class: 'btn btn-secondary btn-sm ml-2', data: { toggle: 'modal', target: '.admin-import-course-member-modal'} %>
 <%
 =end%>
 </div>
@@ -47,4 +47,4 @@
 <%= render partial: 'admins/users/shared/import_user_modal' %>
 
 <!-- TODO: move to course list page -->
-<%= render partial: 'admins/courses/shared/import_course_member_modal' %>
+<%= render partial: 'admins/courses/shared/import_course_member_modal' %>

app/views/apply_signatures/create.json.jbuilder

@@ -0,0 +1,4 @@
+json.id       @signature.id
+json.attachment do 
+    json.filename @attachment.filename
+end

app/views/apply_signatures/index.json.jbuilder

@@ -0,0 +1,19 @@
+json.total_count @apply_signatures.total_count
+json.apply_signatures @apply_signatures do |signature|
+  json.id signature.id 
+  json.status signature.status
+
+  if signature.user.present?
+    json.user do 
+      json.partial! 'members/member', user: signature.user
+      json.is_owner @project.owner?(signature.user)
+    end
+  end
+  if signature.attachments.present?
+    attachment = signature.attachments.take
+    json.attachment do 
+      json.filename attachment.filename
+      json.path attachment_path(attachment)
+    end
+  end
+end

app/views/attachments/create.json.jbuilder

@@ -1,2 +1,3 @@
+json.status 0
 json.id       @attachment.id
 json.filesize @attachment.filesize

app/views/licenses/index.json.jbuilder

@@ -1 +1 @@
-json.licenses @licenses, :id, :name
+json.licenses @licenses, :id, :name, :is_secret

app/views/members/index.json.jbuilder

@@ -5,5 +5,6 @@ json.members @members do |member|
     json.is_owner @project.owner?(member.user)
     json.role member.roles.last.name
     json.role_name t("roles.#{member.roles.last.name}")
+    json.is_apply_signature member.is_apply_signature
   end
 end

app/views/project_categories/group_list.json.jbuilder

@@ -1,5 +1,6 @@
 json.array! @project_categories do |category|
+  hidden_projects = category.projects.joins(:license).where(is_public: false, licenses: {is_secret: false})
   json.id category.id
   json.name category.name
-  json.projects_count category.projects_count
+  json.projects_count category.projects_count - hidden_projects.size
 end

app/views/projects/_project_detail.json.jbuilder

@@ -7,6 +7,7 @@ json.visits project.visits
 json.praises_count project.praises_count.to_i
 json.forked_count project.forked_count.to_i
 json.is_public project.is_public
+json.is_secret project.is_secret
 json.mirror_url project.repository&.mirror_url
 json.type project&.numerical_for_project_type
 json.last_update_time render_unix_time(project.updated_on)
@@ -46,3 +47,9 @@ json.language do
     json.name project.project_language.name
   end
 end
+json.is_member !project.members.where(user_id: current_user.id).blank?
+user_apply_signatures = project.apply_signatures.with_user_id(current_user.id)
+json.user_apply_signatures user_apply_signatures do |signature|
+  json.id signature.id
+  json.status signature.status
+end

app/views/projects/group_type_list.json.jbuilder

@@ -1,5 +1,10 @@
-json.array! @project_statics_list do |static|
-  json.project_type static[:project_type]
-  json.name static[:name]
-  json.projects_count static[:projects_count]
+# json.array! @project_group_list do |type,v|
+#   json.project_type type
+#   json.name render_zh_project_type(type)
+#   json.projects_count v
+# end
+
+json.array! @project_group_list do |k,v|
+  json.name k
+  json.id v
 end

app/views/projects/index.json.jbuilder

@@ -10,6 +10,7 @@ json.projects @projects do |project|
   json.praises_count project.praises_count.to_i
   json.forked_count project.forked_count.to_i
   json.is_public project.is_public
+  json.is_secret project.is_secret
   json.mirror_url project.repository&.mirror_url
   json.type project&.numerical_for_project_type
   json.last_update_time render_unix_time(project.updated_on)
@@ -47,4 +48,10 @@ json.projects @projects do |project|
       json.name project.project_language.name
     end
   end
+  json.is_member project.member?(current_user.id)
+  user_apply_signatures = project.apply_signatures.with_user_id(current_user.id)
+  json.user_apply_signatures user_apply_signatures do |signature|
+    json.id signature.id
+    json.status signature.status
+  end
 end

app/views/projects/show.json.jbuilder

@@ -1,6 +1,12 @@
 json.name @project.name
 json.identifier @project.identifier
 json.is_public @project.is_public
+json.is_secret @project.is_secret
 json.description @project.description
 json.repo_id @project.repository.id
 json.repo_identifier @project.repository.identifier
+user_apply_signatures = @project.apply_signatures.with_user_id(current_user.id)
+json.user_apply_signatures user_apply_signatures do |signature|
+  json.id signature.id
+  json.status signature.status
+end

app/views/pull_requests/index.json.jbuilder

@@ -21,8 +21,6 @@ json.issues do
     json.fork_project_id pr&.fork_project_id
     json.fork_project_identifier pr&.fork_project&.identifier
     json.fork_project_user pr&.fork_project&.owner.try(:login)
-
-    
     json.id issue.id
     json.name issue.subject
     json.pr_time time_from_now(pr.status == 1 ? pr.updated_at : issue.updated_on)

app/views/repositories/edit.json.jbuilder

@@ -5,3 +5,4 @@ json.project_description @project.description
 json.project_category_id @project.project_category_id
 json.project_language_id @project.project_language_id
 json.private !@project.is_public
+json.is_secret @project.is_secret

app/views/repositories/show.json.jbuilder

@@ -17,6 +17,12 @@ json.mirror_url @project&.repository.mirror_url
 json.mirror @project&.repository.mirror_url.present?
 json.type @project.numerical_for_project_type
 json.open_devops @project.open_devops?
+json.is_secret @project.is_secret
+user_apply_signatures = @project.apply_signatures.with_user_id(current_user.id)
+json.user_apply_signatures user_apply_signatures do |signature|
+  json.id signature.id
+  json.status signature.status
+end
 
 unless @project.common?
   json.mirror_status @repo.mirror_status

app/views/settings/show.json.jbuilder

@@ -19,15 +19,16 @@ json.setting do
   # end
 
   nav_bar = default_setting.navbar
-
   # if User.current.logged?
-  #   nav_bar[2]["link"] = "https://forgeplus.trustie.net/users/#{current_user.login}/projects"
+  #   nav_bar[2]["link"] = "/users/#{current_user.login}/projects"
   #   nav_bar[2]["hidden"] = false
   # else
   #   nav_bar[2]["link"] = ""
   #   nav_bar[2]["hidden"] = true
   # end
-
+  if current_user && current_user.admin?
+    nav_bar << manager_main_site_url
+  end
   json.name default_setting.name
   json.nav_logo_url default_setting.nav_logo_url&.[](1..-1)
   json.login_logo_url default_setting.login_logo_url&.[](1..-1)
@@ -42,10 +43,8 @@ json.setting do
   json.navbar nav_bar
 
   json.footer default_setting.footer
-
-  json.main_site current_laboratory.main_site?
   json.new_course default_course_links
-  json.old_projects_url @old_projects_url
-
-
+  json.main_site current_laboratory.main_site?
+  json.main_web_site_url main_web_site_url
+  json.current_main_site_url current_main_site_url
 end

config/routes.rb

@@ -94,6 +94,11 @@ Rails.application.routes.draw do
         delete :destroy_files
       end
     end
+    resources :apply_signatures, only: [:index, :create, :update] do 
+      collection do 
+        get :template_file
+      end
+    end
     get 'home/index'
     get 'home/search'
     get 'main/first_stamp'
@@ -642,6 +647,7 @@ Rails.application.routes.draw do
         post :reset_login_times
       end
     end
+    resources :phenglei_users, only: [:index, :new, :create]
     resource :import_disciplines, only: [:create]
     resource :import_users, only: [:create]
     resource :import_course_members, only: [:create]
@@ -819,7 +825,11 @@ Rails.application.routes.draw do
 
     resources :courses, only: [:index, :destroy, :update]
 
-    resources :projects, only: [:index, :destroy]
+    resources :projects, only: [:index, :destroy] do
+      member do
+        get :sync_phenglei_user
+      end
+    end
 
     resources :disciplines, only: [:index, :create, :edit, :update, :destroy] do
       post :adjust_position, on: :member
@@ -844,6 +854,7 @@ Rails.application.routes.draw do
     resources :salesman_customers, only: [:index, :create, :edit, :update, :destroy] do
       post :batch_add, on: :collection
     end
+    resources :apply_signatures, only: [:index, :update]
   end
 
 

config/sidekiq_cron.yml

@@ -2,3 +2,7 @@ sync_gitea_repo_update_time:
   cron: "0 0 * * *"
   class: "SyncRepoUpdateTimeJob"
   queue: default
+sync_phenglei_user: 
+  cron: "0 23 * * *"
+  class: "SyncPhengleiUserJob"
+  queue: default

db/migrate/20191218015959_create_project_categories.rb

@@ -1,17 +1,17 @@
 class CreateProjectCategories < ActiveRecord::Migration[5.2]
-  def change
-    # create_table :project_categories do |t|
-    #   t.string :name
-    #   t.integer :position
-    #   t.integer :projects_count, :default => 0
-    #
-    #   t.timestamps
-    # end
+  # def change
+  #   # create_table :project_categories do |t|
+  #   #   t.string :name
+  #   #   t.integer :position
+  #   #   t.integer :projects_count, :default => 0
+  #   #
+  #   #   t.timestamps
+  #   # end
 
-    names = %w(大数据 机器学习 深度学习 人工智能 量子计算 智慧医疗 自动驾驶 其他)
-    names.each do |name|
-      ProjectCategory.find_or_create_by!(name: name)
-    end
+  #   names = %w(大数据 机器学习 深度学习 人工智能 量子计算 智慧医疗 自动驾驶 其他)
+  #   names.each do |name|
+  #     ProjectCategory.find_or_create_by!(name: name)
+  #   end
 
   end
 end

db/migrate/20191218022602_sort_to_project_categories_with_position.rb

@@ -1,7 +1,7 @@
 class SortToProjectCategoriesWithPosition < ActiveRecord::Migration[5.2]
-  def change
-    ProjectCategory.order(:updated_at).each.with_index(1) do |pc, index|
-      pc.update_column :position, index
-    end
-  end
+  # def change
+  #   ProjectCategory.order(:updated_at).each.with_index(1) do |pc, index|
+  #     pc.update_column :position, index
+  #   end
+  # end
 end

db/migrate/20191218023731_create_project_languages.rb

@@ -1,17 +1,17 @@
 class CreateProjectLanguages < ActiveRecord::Migration[5.2]
   def change
-    create_table :project_languages do |t|
-      t.string :name
-      t.integer :position
-      t.integer :projects_count, :default => 0
+    # create_table :project_languages do |t|
+    #   t.string :name
+    #   t.integer :position
+    #   t.integer :projects_count, :default => 0
 
-      t.timestamps
-    end
+    #   t.timestamps
+    # end
 
-    names = %w(Ruby C C# C++ HTML Haml CSS JavaScript Python PHP Java JSON JSX Lex Shell Objective-C Cycript Clojure Go Grace Gradle GraphQL Dart Elixir Erlang Perl R Reason Sass Slice SVG)
-    names.each do |name|
-      ProjectLanguage.find_or_create_by!(name: name)
-    end
+    # names = %w(Ruby C C# C++ HTML Haml CSS JavaScript Python PHP Java JSON JSX Lex Shell Objective-C Cycript Clojure Go Grace Gradle GraphQL Dart Elixir Erlang Perl R Reason Sass Slice SVG)
+    # names.each do |name|
+    #   ProjectLanguage.find_or_create_by!(name: name)
+    # end
 
   end
 end

db/migrate/20191218092812_create_licenses.rb

@@ -1,14 +1,14 @@
 class CreateLicenses < ActiveRecord::Migration[5.2]
   def change
-    create_table :licenses do |t|
-      t.string :name
-      t.text :content
+    # create_table :licenses do |t|
+    #   t.string :name
+    #   t.text :content
 
-      t.timestamps
-    end
+    #   t.timestamps
+    # end
 
-    dir_url = File.join(Rails.root, "public", "options", "license")
-    GenerateDbService.call(dir_url, 'license')
+    # dir_url = File.join(Rails.root, "public", "options", "license")
+    # GenerateDbService.call(dir_url, 'license')
 
   end
 end

db/migrate/20191218105120_create_ignores.rb

@@ -1,14 +1,14 @@
 class CreateIgnores < ActiveRecord::Migration[5.2]
   def change
-    create_table :ignores do |t|
-      t.string :name
-      t.text :content
+    # create_table :ignores do |t|
+    #   t.string :name
+    #   t.text :content
 
-      t.timestamps
-    end
+    #   t.timestamps
+    # end
 
-    dir_url = File.join(Rails.root, "public", "options", "gitignore")
-    GenerateDbService.call(dir_url, 'ignore')
+    # dir_url = File.join(Rails.root, "public", "options", "gitignore")
+    # GenerateDbService.call(dir_url, 'ignore')
 
   end
 end

db/migrate/20191220092618_add_user_ref_to_repository.rb

@@ -3,8 +3,8 @@ class AddUserRefToRepository < ActiveRecord::Migration[5.2]
     # add_column :repositories, :user_id, :integer
     # add_index :repositories, :user_id
 
-    Project.joins(:repository).find_each do |project|
-      project&.repository&.update_column(:user_id, project&.user_id) unless project&.repository.blank?
-    end
+    # Project.joins(:repository).find_each do |project|
+    #   project&.repository&.update_column(:user_id, project&.user_id) unless project&.repository.blank?
+    # end
   end
 end

db/migrate/20191227013202_change_forked_count_default_from_projects.rb

@@ -1,11 +1,11 @@
 class ChangeForkedCountDefaultFromProjects < ActiveRecord::Migration[5.2]
   def change
-    change_column_default :projects, :forked_count, { from: nil, to: 0 }
-    change_column_default :projects, :project_type, { from: nil, to: 0 }
+    # change_column_default :projects, :forked_count, { from: nil, to: 0 }
+    # change_column_default :projects, :project_type, { from: nil, to: 0 }
 
-    Project.find_each do |project|
-      project.update_column('forked_count', 0) if project.forked_count.nil?
-      project.update_column('project_type', 0) if project.project_type.nil?
-    end
+    # Project.find_each do |project|
+    #   project.update_column('forked_count', 0) if project.forked_count.nil?
+    #   project.update_column('project_type', 0) if project.project_type.nil?
+    # end
   end
 end

db/migrate/20191227090611_add_issue_priority_to_model.rb

@@ -1,18 +1,18 @@
 class AddIssuePriorityToModel < ActiveRecord::Migration[5.2]
   def change
-    unless ActiveRecord::Base.connection.table_exists? 'IssuePriority'
-      create_table :issue_priorities do |t|
-        t.string :name
-        t.integer :position
-        t.timestamps
-      end
+    # unless ActiveRecord::Base.connection.table_exists? 'IssuePriority'
+    #   create_table :issue_priorities do |t|
+    #     t.string :name
+    #     t.integer :position
+    #     t.timestamps
+    #   end
 
-      add_index :issue_priorities, [:name]
+    #   add_index :issue_priorities, [:name]
 
-      pr_values = %w(低 正常 高 紧急 立刻)
-      pr_values.each_with_index do |v, index|
-        IssuePriority.create!(name: v, position: index+1)
-      end
-    end
+    #   pr_values = %w(低 正常 高 紧急 立刻)
+    #   pr_values.each_with_index do |v, index|
+    #     IssuePriority.create!(name: v, position: index+1)
+    #   end
+    # end
   end
 end

db/migrate/20200103062807_create_issue_depends.rb

@@ -1,12 +1,12 @@
 class CreateIssueDepends < ActiveRecord::Migration[5.2]
   def change
-    create_table :issue_depends do |t|
-      t.integer :user_id
-      t.integer :issue_id
-      t.integer :depend_issue_id
-      t.timestamps
-    end
+    # create_table :issue_depends do |t|
+    #   t.integer :user_id
+    #   t.integer :issue_id
+    #   t.integer :depend_issue_id
+    #   t.timestamps
+    # end
 
-    add_index :issue_depends, [:user_id, :issue_id, :depend_issue_id]
+    # add_index :issue_depends, [:user_id, :issue_id, :depend_issue_id]
   end
 end

db/migrate/20200106022157_create_project_trends.rb

@@ -1,12 +1,12 @@
 class CreateProjectTrends < ActiveRecord::Migration[5.2]
   def change
-    create_table :project_trends do |t|
-      t.integer :user_id
-      t.integer :project_id
-      t.references :trend, polymorphic: true, index: true
-      t.string :action_type
-      t.timestamps
-    end
-    add_index :project_trends, [:user_id, :project_id]
+    # create_table :project_trends do |t|
+    #   t.integer :user_id
+    #   t.integer :project_id
+    #   t.references :trend, polymorphic: true, index: true
+    #   t.string :action_type
+    #   t.timestamps
+    # end
+    # add_index :project_trends, [:user_id, :project_id]
   end
 end

db/migrate/20200210071320_migrate_defalut_to_tiding.rb

@@ -1,7 +1,7 @@
 class MigrateDefalutToTiding < ActiveRecord::Migration[5.2]
   def change
-    change_column_default :tidings, :status, from: nil, to: 0
+    # change_column_default :tidings, :status, from: nil, to: 0
 
-    Tiding.where(status: nil).update_all(status: 0)
+    # Tiding.where(status: nil).update_all(status: 0)
   end
 end

db/migrate/20200210074241_migrate_tiding_status.rb

@@ -1,9 +1,9 @@
 class MigrateTidingStatus < ActiveRecord::Migration[5.2]
   def change
-    Tiding.where(container_type: "JoinCourse", status: 0).each do |tiding|
-      unless CourseMessage.where(course_message_id: tiding.trigger_user_id, course_id: tiding.container_id, course_message_type: "JoinCourseRequest", status: 0).exists?
-        tiding.update!(status: 1)
-      end
-    end
+    # Tiding.where(container_type: "JoinCourse", status: 0).each do |tiding|
+    #   unless CourseMessage.where(course_message_id: tiding.trigger_user_id, course_id: tiding.container_id, course_message_type: "JoinCourseRequest", status: 0).exists?
+    #     tiding.update!(status: 1)
+    #   end
+    # end
   end
 end

db/migrate/20200212055807_add_values_to_issue_tags_and_trackers.rb

@@ -1,17 +1,17 @@
 class AddValuesToIssueTagsAndTrackers < ActiveRecord::Migration[5.2]
   def change
-    issue_status = %w(新增 正在解决 已解决 反馈 关闭 拒绝)
-    trackers = %w(缺陷 功能 支持 任务 周报)
-    issue_status.each_with_index do |s, index|
-      unless IssueStatus.exists?(name: s)
-        IssueStatus.create!(name: s, is_closed: (index == 4)  , is_default: (index == 0), position: index+1)
-      end
-    end
+    # issue_status = %w(新增 正在解决 已解决 反馈 关闭 拒绝)
+    # trackers = %w(缺陷 功能 支持 任务 周报)
+    # issue_status.each_with_index do |s, index|
+    #   unless IssueStatus.exists?(name: s)
+    #     IssueStatus.create!(name: s, is_closed: (index == 4)  , is_default: (index == 0), position: index+1)
+    #   end
+    # end
 
-    trackers.each_with_index do |s, index|
-      unless Tracker.exists?(name: s)
-        Tracker.create!(name: s, is_in_chlog: (index == 0 || index == 1)  , is_in_roadmap: (index != 0 || index != 2), position: index+1)
-      end
-    end
+    # trackers.each_with_index do |s, index|
+    #   unless Tracker.exists?(name: s)
+    #     Tracker.create!(name: s, is_in_chlog: (index == 0 || index == 1)  , is_in_roadmap: (index != 0 || index != 2), position: index+1)
+    #   end
+    # end
   end
 end

db/migrate/20200213094050_migrate_user_location.rb

@@ -1,11 +1,11 @@
 class MigrateUserLocation < ActiveRecord::Migration[5.2]
   def change
-    UserExtension.where("location like '%省'").each do |ue|
-      ue.update_column("location", ue.location.chop)
-    end
+    # UserExtension.where("location like '%省'").each do |ue|
+    #   ue.update_column("location", ue.location.chop)
+    # end
 
-    UserExtension.where("location_city like '%市'").each do |ue|
-      ue.update_column("location_city", ue.location_city.chop)
-    end
+    # UserExtension.where("location_city like '%市'").each do |ue|
+    #   ue.update_column("location_city", ue.location_city.chop)
+    # end
   end
 end

db/migrate/20200220075242_change_versions_descriptions.rb

@@ -1,6 +1,6 @@
 class ChangeVersionsDescriptions < ActiveRecord::Migration[5.2]
   def change
-    change_column_default :versions, :description, nil
-    change_column :versions, :description, :text
+    # change_column_default :versions, :description, nil
+    # change_column :versions, :description, :text
   end
 end