Merge branch 'dev_military_server_local' into dev_military_server

fixed 手机号注册失败
2021-12-25 20:23:21 +08:00 · 2021-12-25 20:22:46 +08:00 · 2021-12-20 16:35:09 +08:00 · 2021-12-20 16:34:52 +08:00 · 2021-12-20 16:05:46 +08:00 · 2021-12-20 16:04:58 +08:00
204 changed files with 201333 additions and 1149 deletions
--- a/api_document.md
+++ b/api_document.md
@ -284,6 +284,7 @@ http://localhost:3000/api/licenses/  | jq
 |licenses|array |返回数据|
 |-- id             |int   |id |
 |-- name           |string|开源许可证名称|
+|-- is_secret           |string|是否为特殊许可证|


 返回值
@ -292,23 +293,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
    }
  ]
 }
@ -554,6 +565,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: 否  |
+


 返回值
@ -566,7 +579,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
 }
 ```
 ---
@ -1146,6 +1160,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|项目创建者|
@ -1156,6 +1171,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':审核通过|
+


 返回值
@ -1171,6 +1190,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": {
@ -1184,7 +1204,13 @@ http://localhost:3000/api/projects  | jq
      "language": {
        "id": 2,
        "name": "C"
-      }
+      },
+      "user_apply_signatures":[
+        {
+          "id": 1,
+          "status": "waiting"
+        }
+      ]
    },
    {
      "id": 2,
@ -1194,6 +1220,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": {
@ -1207,7 +1234,8 @@ http://localhost:3000/api/projects  | jq
      "language": {
        "id": 2,
        "name": "C"
-      }
+      },
+      "user_apply_signatures":[]
    },
    {
      "id": 3,
@ -1217,6 +1245,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": {
@ -1230,7 +1259,8 @@ http://localhost:3000/api/projects  | jq
      "language": {
        "id": 2,
        "name": "C"
-      }
+      },
+      "user_apply_signatures":[]
    },
    {
      "id": 5,
@ -1240,6 +1270,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": {
@ -1253,7 +1284,8 @@ http://localhost:3000/api/projects  | jq
      "language": {
        "id": 2,
        "name": "C"
-      }
+      },
+      "user_apply_signatures":[]
    },
    {
      "id": 7,
@ -1263,6 +1295,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": {
@ -1276,7 +1309,8 @@ http://localhost:3000/api/projects  | jq
      "language": {
        "id": 2,
        "name": "C"
-      }
+      },
+      "user_apply_signatures":[]
    }
  ]
 }
@ -5016,6 +5050,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|项目创建者|
@ -5026,7 +5061,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
@ -5041,6 +5078,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": {
@ -5054,9 +5092,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"
+}
+```
+---
--- a/app/assets/javascripts/admin.js
+++ b/app/assets/javascripts/admin.js
@ -71,6 +71,23 @@ $(document).on('turbolinks:load', function(){
      $('.admin-alert-container .alert.alert-danger').alert('close');
    }, 5000);
  }
+
+  $('.logo-item-left').on("change", 'input[type="file"]', function () {
+    var $fileInput = $(this);
+    var file = this.files[0];
+    var imageType = /image.*/;
+    if (file && file.type.match(imageType)) {
+      var reader = new FileReader();
+      reader.onload = function () {
+        var $box = $fileInput.parent();
+        $box.find('img').attr('src', reader.result).css('display', 'block');
+        $box.addClass('has-img');
+      };
+      reader.readAsDataURL(file);
+    } else {
+    }
+  });
+
 });

 $(document).on("turbolinks:before-cache", function () {
--- a/app/assets/stylesheets/admin.scss
+++ b/app/assets/stylesheets/admin.scss
@ -58,3 +58,75 @@ input.form-control {
  position: absolute;
 }

+.logo-item {
+  display: flex;
+
+  &-img {
+    display: block;
+    width: 80px;
+    height: 80px;
+    background: #e9ecef;
+  }
+
+  &-upload {
+    cursor: pointer;
+    position: absolute;
+    top: 0;
+    width: 80px;
+    height: 80px;
+    background: #e9ecef;
+    border: 1px solid #ced4da;
+
+    &::before {
+      content: '';
+      position: absolute;
+      top: 27px;
+      left: 39px;
+      width: 2px;
+      height: 26px;
+      background: #495057;
+    }
+
+    &::after {
+      content: '';
+      position: absolute;
+      top: 39px;
+      left: 27px;
+      width: 26px;
+      height: 2px;
+      background: #495057;
+    }
+  }
+
+  &-left {
+    position: relative;
+    width: 80px;
+    height: 80px;
+
+    &.has-img {
+      .logo-item-upload {
+        display: none;
+      }
+
+      &:hover {
+        .logo-item-upload {
+          display: block;
+          background: rgba(145, 145, 145, 0.8);
+        }
+      }
+    }
+  }
+
+  &-right {
+    display: flex;
+    flex-direction: column;
+    justify-content: space-between;
+    color: #777777;
+    font-size: 0.8rem;
+  }
+
+  &-title {
+    color: #23272B;
+    font-size: 1rem;
+  }
+}
--- a/app/controllers/accounts_controller.rb
+++ b/app/controllers/accounts_controller.rb
@ -10,12 +10,15 @@ class AccountsController < ApplicationController
  def remote_register
    username = params[:username]&.gsub(/\s+/, "")
    email = params[:email]&.gsub(/\s+/, "")
+    phone = params[:phone]&.gsub(/\s+/, "")
    password = params[:password]
    platform = (params[:platform] || 'forge')&.gsub(/\s+/, "")

    ActiveRecord::Base.transaction do
-      result = autologin_register(username, email, password, platform)
+      return render_error("该手机号已注册") if phone.present? && User.where(phone: phone).exists?
+      result = autologin_register(username, email, password, platform, phone)
      if result[:message].blank?
+        PlatformStatistic.data.increment!(:users_count)
        render_ok({user: result[:user]})
      else
        render_error(result[:message])
@ -242,9 +245,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,
--- a/app/controllers/admins/apply_signatures_controller.rb
+++ b/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
--- a/app/controllers/admins/phenglei_users_controller.rb
+++ b/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
--- a/app/controllers/admins/platform_communicates_controller.rb
+++ b/app/controllers/admins/platform_communicates_controller.rb
@ -0,0 +1,59 @@
+class Admins::PlatformCommunicatesController < Admins::BaseController 
+  before_action :get_communicate, only: [:edit, :update, :destroy]
+  def index
+    sort_by = PlatformCommunicate.column_names.include?(params[:sort_by]) ? params[:sort_by] : 'order_index'
+    sort_direction = %w(desc asc).include?(params[:sort_direction]) ? params[:sort_direction] : 'desc'
+    q = PlatformCommunicate.ransack(title_cont: params[:search])
+    communicates = q.result(distinct: true).order("#{sort_by} #{sort_direction}")
+    @communicates = kaminari_paginate(communicates)
+  end
+
+  def new 
+    @communicate = PlatformCommunicate.new
+  end
+
+  def create
+    @communicate = PlatformCommunicate.new(communicate_params)
+    if @communicate.save 
+      redirect_to admins_platform_communicates_path 
+      flash[:success] = '创建社区动态成功'
+    else
+      redirect_to admins_platform_communicates_path 
+      flash[:danger] = "创建社区动态失败"
+    end
+  end
+
+  def edit 
+
+  end
+
+  def update 
+    @communicate.attributes = communicate_params
+    if @communicate.save
+      redirect_to admins_platform_communicates_path
+      flash[:success] = '更新社区动态成功'
+    else 
+      redirect_to admins_platform_communicates_path
+      flash[:danger] = '更新社区动态失败'
+    end
+  end
+
+  def destroy 
+    if @communicate.destroy 
+      redirect_to admins_platform_communicates_path
+      flash[:success] = '删除社区动态成功'
+    else
+      redirect_to admins_platform_communicates_path
+      flash[:danger] = '删除社区动态失败'
+    end
+  end
+
+  private 
+  def get_communicate 
+    @communicate = PlatformCommunicate.find_by_id(params[:id])
+  end
+
+  def communicate_params 
+    params.require(:platform_communicate).permit!
+  end
+end
--- a/app/controllers/admins/platform_people_controller.rb
+++ b/app/controllers/admins/platform_people_controller.rb
@ -0,0 +1,69 @@
+class Admins::PlatformPeopleController < Admins::BaseController 
+  before_action :get_person, only: [:edit, :update, :destroy]
+  def index
+    sort_by = PlatformPerson.column_names.include?(params[:sort_by]) ? params[:sort_by] : 'created_at'
+    sort_direction = %w(desc asc).include?(params[:sort_direction]) ? params[:sort_direction] : 'desc'
+    q = PlatformPerson.ransack(name_cont: params[:search])
+    people = q.result(distinct: true).order("#{sort_by} #{sort_direction}")
+    @people = kaminari_paginate(people)
+  end
+
+  def new 
+    @person = PlatformPerson.new
+  end
+
+  def create
+    @person = PlatformPerson.new(person_params)
+    if @person.save 
+      save_image_file(params[:image], @person)
+      redirect_to admins_platform_people_path 
+      flash[:success] = '创建论坛动态成功'
+    else
+      redirect_to admins_platform_people_path 
+      flash[:danger] = "创建论坛动态失败"
+    end
+  end
+
+  def edit 
+
+  end
+
+  def update 
+    @person.attributes = person_params
+    if @person.save
+      save_image_file(params[:image], @person)
+      redirect_to admins_platform_people_path
+      flash[:success] = '更新论坛动态成功'
+    else 
+      redirect_to admins_platform_people_path
+      flash[:danger] = '更新论坛动态失败'
+    end
+  end
+
+  def destroy 
+    if @person.destroy 
+      redirect_to admins_platform_people_path
+      flash[:success] = '删除论坛动态成功'
+    else
+      redirect_to admins_platform_people_path
+      flash[:danger] = '删除论坛动态失败'
+    end
+  end
+
+  private 
+  def get_person 
+    @person = PlatformPerson.find_by_id(params[:id])
+  end
+
+  def person_params 
+    params.require(:platform_person).permit!
+  end
+
+  def save_image_file(file, topic)
+    return unless file.present? && file.is_a?(ActionDispatch::Http::UploadedFile)
+
+    file_path = Util::FileManage.source_disk_filename(topic, 'image')
+    File.delete(file_path) if File.exist?(file_path) # 删除之前的文件
+    Util.write_file(file, file_path)
+  end
+end
--- a/app/controllers/admins/projects_controller.rb
+++ b/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
--- a/app/controllers/admins/users_controller.rb
+++ b/app/controllers/admins/users_controller.rb
@ -1,4 +1,6 @@
 class Admins::UsersController < Admins::BaseController
+  before_action :finder_user, except: [:index]
+
  def index
    params[:sort_by] = params[:sort_by].presence || 'created_on'
    params[:sort_direction] = params[:sort_direction].presence || 'desc'
@ -8,12 +10,9 @@ class Admins::UsersController < Admins::BaseController
  end

  def edit
-    @user = User.find(params[:id])
  end

  def update
-    @user = User.find(params[:id])
-
    Admins::UpdateUserService.call(@user, update_params)
    flash[:success] = '保存成功'
    redirect_to edit_admins_user_path(@user)
@ -26,43 +25,94 @@ class Admins::UsersController < Admins::BaseController
  end

  def destroy
-    User.find(params[:id]).destroy!
+    @user.destroy!
+    Gitea::User::DeleteService.call(@user.login)

    render_delete_success
  end

  def lock
-    User.find(params[:id]).lock!
+    @user.lock!

    render_ok
  end

  def unlock
-    User.find(params[:id]).activate!
+    @user.activate!

    render_ok
  end

  def reward_grade
-    user = User.find(params[:user_id])
    return render_unprocessable_entity('金币数量必须大于0') if params[:grade].to_i <= 0

-    RewardGradeService.call(user, container_id: user.id, container_type: 'Feedback', score: params[:grade].to_i, not_unique: true)
+    RewardGradeService.call(@user, container_id: @user.id, container_type: 'Feedback', score: params[:grade].to_i, not_unique: true)

-    render_ok(grade: user.grade)
+    render_ok(grade: @user.grade)
  end

  def reset_login_times
-    User.find(params[:id]).reset_login_times!
+    @user.reset_login_times!

    render_ok
  end

+  def new
+    @user = User.new
+  end
+  
+  def create
+    Users::AdminCreateUserForm.new(validate_create_params).validate!
+
+    user  = User.new(create_params)
+    login = User.generate_login("p")
+
+    user.type  = 'User'
+    user.login = login
+    user.mail  = "#{login}@example.org"
+    ActiveRecord::Base.transaction do
+      if user.save!
+        UserExtension.create!(user_id: user.id)
+        interactor = Gitea::RegisterInteractor.call({username: user.login, email: user.mail, password: create_params[:password]})
+        if interactor.success?
+          gitea_user = interactor.result
+          result = Gitea::User::GenerateTokenService.call(user.login, create_params[:password])
+          user.gitea_token = result['sha1']
+          user.gitea_uid = gitea_user[:body]['id']
+          user.save!
+        end
+      end
+    end
+
+    flash[:success] = '保存成功'
+    redirect_to admins_users_path
+  rescue ActiveRecord::RecordInvalid => e
+    logger.info "------------ #{e.message}"
+    puts e.message
+    flash.now[:danger] = e.message
+    render 'new'
+  rescue Exception => ex
+    flash.now[:danger] = ex.message
+    render 'new'
+  end
+
+
  private
+  def finder_user
+    @user = User.find(params[:id])
+  end

  def update_params
    params.require(:user).permit(%i[lastname nickname gender identity technical_title student_id is_shixun_marker
                                    mail phone location location_city school_id department_id admin business is_test
-                                    password professional_certification authentication])
+                                    password professional_certification authentication login])
+  end
+
+  def create_params
+    params.require(:user).permit(%i[nickname gender mail phone location location_city password professional_certification])
+  end
+
+  def validate_create_params
+    create_params.slice(:phone, :password)
  end
 end
--- a/app/controllers/application_controller.rb
+++ b/app/controllers/application_controller.rb
@ -28,7 +28,7 @@ class ApplicationController < ActionController::Base
 	DCODES = %W(2 3 4 5 6 7 8 9 a b c f e f g h i j k l m n o p q r s t u v w x y z)
 	OPENKEY = "79e33abd4b6588941ab7622aed1e67e8"

-	helper_method :current_user
+	helper_method :current_user, :base_url

 	# 所有请求必须合法签名
 	def check_sign
@ -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
@ -770,6 +770,10 @@ class ApplicationController < ActionController::Base
 		@repository ||= load_project&.repository
 	end

+	def base_url
+		Rails.application.config_for(:configuration)['platform_url'] || request.base_url
+	end
+
  private
 	def object_not_found
 		uid_logger("Missing template or cant't find record, responding with 404")
--- a/app/controllers/apply_signatures_controller.rb
+++ b/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 
--- a/app/controllers/attachments_controller.rb
+++ b/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
--- a/app/controllers/concerns/laboratory_helper.rb
+++ b/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
--- a/app/controllers/concerns/login_helper.rb
+++ b/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,
--- a/app/controllers/concerns/register_helper.rb
+++ b/app/controllers/concerns/register_helper.rb
@ -1,12 +1,17 @@
 module RegisterHelper
  extend ActiveSupport::Concern

-  def autologin_register(username, email, password, platform= 'forge')
+  def autologin_register(username, email, password, platform = 'forge', phone = nil)
    result = {message: nil, user: nil}
+    email =  email.blank? ? "#{username}@example.org" : email
+
+    user = User.find_by(login: username)
+    user = User.find_by(phone: phone) if user.blank? && phone.present?
+    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.phone = phone if phone.present?
    user.activate
    
    return unless user.valid?
@ -18,7 +23,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
--- a/app/controllers/home/competitions_controller.rb
+++ b/app/controllers/home/competitions_controller.rb
@ -0,0 +1,6 @@
+class Home::CompetitionsController < ApplicationController
+
+  def index
+    @competitions = Competition.active.order(start_time: :desc).limit(3)
+  end
+end
--- a/app/controllers/home/platform_communicates_controller.rb
+++ b/app/controllers/home/platform_communicates_controller.rb
@ -0,0 +1,7 @@
+class Home::PlatformCommunicatesController < ApplicationController
+
+  def index
+    scope = PlatformCommunicate.order(order_index: :desc)
+    @communicates = kaminari_paginate(scope)
+  end
+end
--- a/app/controllers/home/platform_people_controller.rb
+++ b/app/controllers/home/platform_people_controller.rb
@ -0,0 +1,7 @@
+class Home::PlatformPeopleController < ApplicationController
+
+  def index
+    scope = PlatformPerson.order(created_at: :desc)
+    @people = kaminari_paginate(scope)
+  end
+end
--- a/app/controllers/home/platform_statistics_controller.rb
+++ b/app/controllers/home/platform_statistics_controller.rb
@ -0,0 +1,10 @@
+class Home::PlatformStatisticsController < ApplicationController
+
+  def index
+    @platform_statistic = PlatformStatistic.data 
+    @project_statistic = ProjectStatistic.data
+    @platform_statistic.increment!(:visits)
+    @tasks_count = ActiveRecord::Base.connection.exec_query("SELECT COUNT(*) FROM tasks").rows[0][0]
+    @memos_count = ActiveRecord::Base.connection.exec_query("SELECT COUNT(*) FROM memos").rows[0][0]
+  end
+end
--- a/app/controllers/issues_controller.rb
+++ b/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
--- a/app/controllers/journals_controller.rb
+++ b/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, "评论的内容不能为空")
--- a/app/controllers/members_controller.rb
+++ b/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
--- a/app/controllers/oauth/educoder_controller.rb
+++ b/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"
--- a/app/controllers/project_categories_controller.rb
+++ b/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
--- a/app/controllers/projects_controller.rb
+++ b/app/controllers/projects_controller.rb
@ -3,18 +3,19 @@ class ProjectsController < ApplicationController
  include OperateProjectAbilityAble
  include ProjectsHelper
  before_action :require_login, except: %i[index branches group_type_list simple show fork_users praise_users watch_users recommend about]
-  before_action :load_project, except: %i[index group_type_list migrate create recommend]
+  before_action :load_repository, except: %i[index group_type_list migrate create recommend]
  before_action :authorizate_user_can_edit_project!, only: %i[update]
  before_action :project_public?, only: %i[fork_users praise_users watch_users]

  def index
+    PlatformStatistic.data.increment!(:visits)
    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,33 +49,24 @@ 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
    ActiveRecord::Base.transaction do
      # Projects::CreateForm.new(project_params).validate!
-      private = params[:private]
+      private = params[:private] || @project.is_public
      gitea_params = {
        private: private,
        default_branch: params[:default_branch]
-      }
+      }.compact
      if [true, false].include? private
        new_project_params = project_params.except(:private).merge(is_public: !private)
        Gitea::Repository::UpdateService.call(@owner, @project.identifier, gitea_params)
@ -147,7 +139,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,
--- a/app/controllers/pull_requests_controller.rb
+++ b/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)
@ -180,7 +182,12 @@ class PullRequestsController < ApplicationController
          message: "在这些分支之间的合并请求已存在：<a href='/projects/#{@owner.login}/#{@project.identifier}/pulls/#{can_merge.first.id}/Messagecount''>#{can_merge.first.try(:title)}</a>",
        }
      else
-        normal_status(0, "可以合并")
+        compare_result = Repositories::CompareService.call(@owner, @project, params)
+        if compare_result['Diff'].blank?
+          normal_status(0, "可以合并")
+        else
+          normal_status(-2, "分支内容相同，无需创建合并请求")
+        end
      end
    end
  end
--- a/app/controllers/repositories_controller.rb
+++ b/app/controllers/repositories_controller.rb
@ -5,9 +5,9 @@ class RepositoriesController < ApplicationController

  before_action :require_login, only: %i[edit update create_file update_file delete_file sync_mirror]
  before_action :load_repository
-  before_action :authorizate!, except: [:sync_mirror, :tags, :commit]
+  before_action :authorizate!, except: [:sync_mirror, :tags, :commit, :archive]
  before_action :authorizate_user_can_edit_repo!, only: %i[sync_mirror]
-  before_action :get_ref, only: %i[entries sub_entries top_counts]
+  before_action :get_ref, only: %i[entries sub_entries top_counts file archive]
  before_action :get_latest_commit, only: %i[entries sub_entries top_counts]
  before_action :get_statistics, only: %i[top_counts]

@ -157,6 +157,19 @@ class RepositoriesController < ApplicationController
    render json: languages_precentagable
  end

+  def archive
+    domain  = Gitea.gitea_config[:domain]
+    api_url = Gitea.gitea_config[:base_url]
+    archive_url = "/repos/#{@owner.login}/#{@repository.identifier}/archive/#{params[:archive]}"
+
+    file_path = [domain, api_url, archive_url].join
+    file_path = [file_path, "access_token=#{current_user&.gitea_token}"].join("?") if @repository.hidden?
+
+    return render_not_found if !request.format.zip? && !request.format.gzip?
+
+    redirect_to file_path
+  end
+
  private

  def find_project
@ -231,7 +244,7 @@ class RepositoriesController < ApplicationController

    # uploadPushInfo
  end
-
+  
  def create_new_pr(params)
    if params[:new_branch].present? && params[:new_branch] != params[:branch]
      local_params = {
--- a/app/controllers/settings_controller.rb
+++ b/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
--- a/app/controllers/sync_forge_controller.rb
+++ b/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"
--- a/app/controllers/users_controller.rb
+++ b/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
--- a/app/controllers/versions_controller.rb
+++ b/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
--- a/app/forms/contents/create_form.rb
+++ b/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
--- a/app/forms/users/admin_create_user_form.rb
+++ b/app/forms/users/admin_create_user_form.rb
@ -0,0 +1,11 @@
+class Users::AdminCreateUserForm
+  include ActiveModel::Model
+
+  
+  attr_accessor :phone, :password
+
+  validates :phone, presence: true, format: { with: CustomRegexp::PHONE, message: "手机号格式错误" }
+  validates :password, presence: true, length: { minimum: 8, maximum: 16 }, format: { with: CustomRegexp::PASSWORD, message: "8~16位密码，支持字母数字和符号" }
+
+end
+
--- a/app/helpers/application_helper.rb
+++ b/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")
--- a/app/helpers/projects_helper.rb
+++ b/app/helpers/projects_helper.rb
@ -8,12 +8,12 @@ module ProjectsHelper
    end
  end

-  def render_zip_url(project, archive_name)
-    [gitea_domain, project.owner.login, project.identifier, "archive", "#{archive_name}.zip"].join('/')
+  def render_zip_url(owner, repository, archive)
+    [base_url, archive_repositories_path(owner&.login, repository, "#{archive}.zip")].join
  end

-  def render_tar_url(project, archive_name)
-    [gitea_domain, project.owner.login, project.identifier, "archive", "#{archive_name}.tar.gz"].join('/')
+  def render_tar_url(owner, repository, archive)
+    [base_url, archive_repositories_path(owner&.login, repository, "#{archive}.tar.gz")].join
  end

  def render_http_url(project)
@ -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
--- a/app/interactors/gitea/create_file_interactor.rb
+++ b/app/interactors/gitea/create_file_interactor.rb
@ -24,8 +24,14 @@ module Gitea

    def run
      Contents::CreateForm.new(valid_params).validate!
-      response = Gitea::Repository::Entries::CreateService.new(token, owner, @params[:identifier], @params[:filepath], file_params).call
-      render_result(response)
+      result = Gitea::Repository::Entries::CreateService.call(token, 
+        owner, @params[:identifier], @params[:filepath], file_params)
+
+      if result[:status] == :success
+        @result = result[:body]
+      else
+        fail!(result[:message])
+      end
    rescue Exception => exception
      Rails.logger.info "Exception ===========> #{exception.message}"
      fail!(exception.message)
@ -48,7 +54,8 @@ module Gitea
      {
        filepath: @params[:filepath],
        branch: @params[:branch],
-        new_branch: @params[:new_branch]
+        new_branch: @params[:new_branch],
+        content: @params[:content]
      }
    end

@ -56,7 +63,7 @@ module Gitea
      file_params = {}
      file_params = file_params.merge(branch: @params[:branch]) unless @params[:branch].blank?
      file_params = file_params.merge(new_branch: @params[:new_branch]) unless @params[:new_branch].blank?
-      file_params = file_params.merge(content: Base64.encode64(@params[:content]))
+      file_params = file_params.merge(content: Base64.encode64(@params[:content] || ""))
      file_params = file_params.merge(message: @params[:message]) unless @params[:message].blank?
      file_params = file_params.merge(committer: @params[:committer])
      file_params
--- a/app/interactors/projects/add_member_interactor.rb
+++ b/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
--- a/app/jobs/sync_forge_project_job.rb
+++ b/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
--- a/app/jobs/sync_mirrored_repository_job.rb
+++ b/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
--- a/app/jobs/sync_phenglei_user_job.rb
+++ b/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
--- a/app/libs/dun_check/image_check.rb
+++ b/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
--- a/app/libs/dun_check/public_params.rb
+++ b/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
+
+
--- a/app/libs/dun_check/text_check.rb
+++ b/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
--- a/app/models/apply_signature.rb
+++ b/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
--- a/app/models/attachment.rb
+++ b/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
--- a/app/models/competition.rb
+++ b/app/models/competition.rb
@ -0,0 +1,30 @@
+# == Schema Information
+#
+# Table name: competitions
+#
+#  id                      :integer          not null, primary key
+#  title                   :string(255)
+#  start_time              :datetime
+#  end_time                :datetime
+#  identifier              :string(255)
+#  available               :boolean          default("0")
+#  online_time             :datetime
+#  visits                  :integer          default("0")
+#  competition_lists_count :integer          default("0")
+#  min_num                 :integer          default("1")
+#  max_num                 :integer          default("1")
+#  enroll_end_time         :datetime
+#  created_at              :datetime         not null
+#  updated_at              :datetime         not null
+#  status                  :integer          default("0")
+#  subtitle                :string(255)
+#  team_members_count      :integer          default("0")
+#  limit_type              :integer          default("0")
+#  show_top                :integer          default("0")
+#  content                 :text(65535)
+#
+
+class Competition < ApplicationRecord
+
+  enum status: {archived: 0, active: 1}
+end
--- a/app/models/compose.rb
+++ b/app/models/compose.rb
@ -20,7 +20,6 @@

 class Compose < ApplicationRecord
  #组织
-  belongs_to :user
  has_many :compose_projects
  has_many :compose_users

--- a/app/models/concerns/dun_check_able.rb
+++ b/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
--- a/app/models/concerns/dun_check_image_able.rb
+++ b/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
--- a/app/models/concerns/matchable.rb
+++ b/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
--- a/app/models/concerns/project_ability.rb
+++ b/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
--- a/app/models/concerns/project_operable.rb
+++ b/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

--- a/app/models/issue.rb
+++ b/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
--- a/app/models/journal.rb
+++ b/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
--- a/app/models/laboratory.rb
+++ b/app/models/laboratory.rb
@ -36,9 +36,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
--- a/app/models/license.rb
+++ b/app/models/license.rb
@ -12,4 +12,6 @@

 class License < ApplicationRecord
  include Projectable
+  has_many :attachments, as: :container, dependent: :destroy
+
 end
--- a/app/models/phenglei_user.rb
+++ b/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
--- a/app/models/platform_communicate.rb
+++ b/app/models/platform_communicate.rb
@ -0,0 +1,16 @@
+# == Schema Information
+#
+# Table name: platform_communicates
+#
+#  id          :integer          not null, primary key
+#  title       :string(255)
+#  content     :text(65535)
+#  tag_field   :text(65535)
+#  fake_id     :integer
+#  created_at  :datetime         not null
+#  updated_at  :datetime         not null
+#  order_index :integer          default("0")
+#
+
+class PlatformCommunicate < ApplicationRecord
+end
--- a/app/models/platform_person.rb
+++ b/app/models/platform_person.rb
@ -0,0 +1,26 @@
+# == Schema Information
+#
+# Table name: platform_people
+#
+#  id           :integer          not null, primary key
+#  name         :string(255)
+#  announcement :string(255)
+#  content      :text(65535)
+#  created_at   :datetime         not null
+#  updated_at   :datetime         not null
+#  fake_login   :string(255)
+#
+
+class PlatformPerson < ApplicationRecord
+
+  def image
+    image_url('image')
+  end
+
+  private
+
+  def image_url(type)
+    return nil unless Util::FileManage.exists?(self, type)
+    Util::FileManage.source_disk_file_url(self, type)
+  end
+end
--- a/app/models/platform_statistic.rb
+++ b/app/models/platform_statistic.rb
@ -0,0 +1,22 @@
+# == Schema Information
+#
+# Table name: platform_statistics
+#
+#  id          :integer          not null, primary key
+#  visits      :integer          default("0")
+#  users_count :integer          default("0")
+#  created_at  :datetime         not null
+#  updated_at  :datetime         not null
+#
+
+class PlatformStatistic < ApplicationRecord
+
+  def self.data
+    data = self.last
+    if data.present?
+      return data 
+    else
+      return PlatformStatistic.create(users_count: User.count)
+    end
+  end
+end
--- a/app/models/project.rb
+++ b/app/models/project.rb
@ -109,6 +109,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
@ -116,6 +117,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)
--- a/app/models/project_category.rb
+++ b/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
--- a/app/models/project_statistic.rb
+++ b/app/models/project_statistic.rb
@ -12,4 +12,17 @@
 #

 class ProjectStatistic < ApplicationRecord
+
+  def self.data
+    data = self.last 
+    if data.present?
+      return data
+    else 
+      common_projects_count = Project.common.count
+      mirror_projects_count = Project.mirror.count
+      sync_mirror_projects_count = Project.sync_mirror.count
+      return ProjectStatistic.create(common_projects_count: common_projects_count, mirror_projects_count: mirror_projects_count, sync_mirror_projects_count: sync_mirror_projects_count)
+  
+    end
+  end
 end
--- a/app/models/pull_request.rb
+++ b/app/models/pull_request.rb
@ -24,6 +24,7 @@
 #

 class PullRequest < ApplicationRecord
+  include DunCheckAble
  #status 0 默认未合并， 1表示合并, 2表示请求拒绝(或已关闭)
  OPEN   = 0
  MERGED  = 1
--- a/app/models/token.rb
+++ b/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
--- a/app/models/user.rb
+++ b/app/models/user.rb
@ -112,10 +112,8 @@ class User < Owner
  enumerize :platform, in: [:forge, :educoder, :trustie, :military], default: :forge, scope: :shallow

  belongs_to :laboratory, optional: true
-  has_many :composes, dependent: :destroy
-  has_many :compose_users, dependent: :destroy
  has_one :user_extension, dependent: :destroy
-  has_many :open_users, dependent: :destroy
+  # has_many :open_users, dependent: :destroy
  has_one :wechat_open_user, class_name: 'OpenUsers::Wechat'
  has_one :qq_open_user, class_name: 'OpenUsers::QQ'
  accepts_nested_attributes_for :user_extension, update_only: true
@ -156,6 +154,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 +162,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 +190,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)
@ -392,6 +391,7 @@ class User < Owner

  def activate!
    update_attribute(:status, STATUS_ACTIVE)
+    prohibit_gitea_user_login!(false)
  end

  def register!
@ -400,6 +400,12 @@ class User < Owner

  def lock!
    update_attribute(:status, STATUS_LOCKED)
+    prohibit_gitea_user_login!
+  end
+
+  def prohibit_gitea_user_login!(prohibit_login = true)
+    Gitea::User::UpdateInteractor.call(self.login, 
+      {email: self.mail, prohibit_login: prohibit_login})
  end

  # 课程用户身份
@ -577,8 +583,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 +748,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?

--- a/app/models/version.rb
+++ b/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
--- a/app/queries/admins/user_query.rb
+++ b/app/queries/admins/user_query.rb
@ -30,7 +30,7 @@ class Admins::UserQuery < ApplicationQuery
    # 关键字检索
    keyword = params[:keyword].to_s.strip.presence
    if keyword
-      sql = 'CONCAT(lastname, firstname) LIKE :keyword OR login LIKE :keyword OR mail LIKE :keyword OR phone LIKE :keyword'
+      sql = 'CONCAT(lastname, firstname) LIKE :keyword OR login LIKE :keyword OR mail LIKE :keyword OR phone LIKE :keyword OR nickname LIKE :keyword '
      users = users.where(sql, keyword: "%#{keyword}%")
    end

--- a/app/queries/projects/list_my_query.rb
+++ b/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"
--- a/app/queries/projects/list_query.rb
+++ b/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"
--- a/app/services/admins/update_user_service.rb
+++ b/app/services/admins/update_user_service.rb
@ -15,19 +15,13 @@ class Admins::UpdateUserService < ApplicationService
    user.firstname = ''
    user.password = params[:password] if params[:password].present?

-    if params[:identity].to_s == 'student'
-      params[:technical_title] = nil
-    else
-      params[:student_id] = nil
-    end
    user.user_extension.assign_attributes(user_extension_attributes)

+    old_login = user.login
    ActiveRecord::Base.transaction do
      user.save!
      user.user_extension.save!
-      user.update!(is_shixun_marker: true) if user.is_certification_teacher
-
-      update_gitlab_password if params[:password].present?
+      update_gitea_user(old_login)
    end

    user
@ -36,7 +30,7 @@ class Admins::UpdateUserService < ApplicationService
  private

  def user_attributes
-    params.slice(*%i[lastname nickname mail phone admin business is_test
+    params.slice(*%i[lastname nickname mail phone admin business is_test login
                     professional_certification authentication is_shixun_marker])
  end

@ -44,10 +38,29 @@ class Admins::UpdateUserService < ApplicationService
    params.slice(*%i[gender identity technical_title student_id location location_city school_id department_id])
  end

-  def update_gitlab_password
-    return if user.gid.blank?
-    # 同步修改gitlab密码
-    Gitlab.client.edit_user(user.gid, password: params[:password])
+  def gitea_user_params
+    hash = {
+      password: params[:password].to_s.presence,
+      email: user.mail,
+      login_name: params[:login].to_s.presence,
+      admin: boolean_admin
+    }.compact
+
+    hash.delete_if {|_,v| v.to_s.strip == ''}
+  end
+
+  def boolean_admin
+    admin = params[:admin].to_s.presence
+    case admin
+    when "0" then false
+    when "1" then true
+    end
+  end
+
+  def update_gitea_user(old_login)
+    return if user.gitea_uid.blank?
+
+    Gitea::User::UpdateInteractor.call(old_login, gitea_user_params)
  rescue Exception => ex
    Util.logger_error(ex)
    raise Error, '保存失败'
--- a/app/services/gitea/client_service.rb
+++ b/app/services/gitea/client_service.rb
@ -195,6 +195,14 @@ class Gitea::ClientService < ApplicationService
    [body, message]
  end

+  def json_parse!(body)
+    return nil unless body.present?
+
+    body = JSON.parse(body)
+    body, message = fix_body(body)
+    body
+  end
+
  def log_error(status, body)
    puts "[gitea] status:  #{status}"
    puts "[gitea] body:    #{body&.force_encoding('UTF-8')}"
--- a/app/services/gitea/repository/archive_service.rb
+++ b/app/services/gitea/repository/archive_service.rb
@ -0,0 +1,40 @@
+class Gitea::Repository::ArchiveService < Gitea::ClientService
+  attr_reader :owner, :repo, :archive, :token
+
+  def initialize(owner, repo, archive, token=nil)
+    @owner   = owner
+    @repo    = repo
+    @archive = archive
+    @token   = token
+  end
+
+  def call
+    response = get(url, params)
+    response_payload(response)
+  end
+
+  private
+  def params
+    Hash.new.merge(token: token)
+  end
+
+  def url
+    "/repos/#{owner}/#{repo}/archive/#{archive}".freeze
+  end
+
+  def response_payload(response)
+    status = response.status
+    body = response&.body
+
+    log_error(status, body)
+    status_payload(status, body)
+  end
+
+  def status_payload(status, body)
+    case status
+    when 200 then success
+    when 404 then error("你操作的链接不存在!")
+    else error("系统错误!")
+    end
+  end
+end
--- a/app/services/gitea/repository/entries/create_service.rb
+++ b/app/services/gitea/repository/entries/create_service.rb
@ -30,8 +30,7 @@ class Gitea::Repository::Entries::CreateService < Gitea::ClientService

  def call
    response = post(url, params)
-
-    render_201_response(response)
+    response_payload(response)
  end

  private
@ -43,4 +42,21 @@ class Gitea::Repository::Entries::CreateService < Gitea::ClientService
    "/repos/#{owner}/#{repo_name}/contents/#{filepath}".freeze
  end

+  def response_payload(response)
+    status = response.status
+    body = response&.body
+
+    log_error(status, body)
+    status_payload(status, body)
+  end
+
+  def status_payload(status, body)
+    case status
+    when 201 then success(json_parse!(body))
+    when 403 then error("你没有权限操作!")
+    when 404 then error("你操作的链接不存在!")
+    when 422 then error("#{filepath}文件已存在，不能重复创建!")
+    else error("系统错误!")
+    end
+  end
 end
--- a/app/services/projects/create_service.rb
+++ b/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
--- a/app/services/repositories/compare_service.rb
+++ b/app/services/repositories/compare_service.rb
@ -0,0 +1,35 @@
+class Repositories::CompareService < ApplicationService
+  attr_reader :owner, :project, :params
+
+  def initialize(owner, project, params)
+    @owner = owner
+    @project = project
+    @params  = params
+  end
+
+  def call
+    compare!
+  rescue => e
+    raise Error, e.message
+  end
+
+  private
+
+  def compare!
+    base, head = compare_params
+
+    # TODO: 处理fork的项目向源项目发送PR的base、head参数问题
+    head.include?(":") ? gitea_compare(base, head) : gitea_compare(head, base)
+  end
+
+  def compare_params
+    base = Addressable::URI.unescape(params[:base])
+    head = params[:head].include?('json') ? params[:head]&.split('.json')[0] : params[:head]
+
+    [base, head]
+  end
+
+  def gitea_compare(base, head)
+    Gitea::Repository::Commits::CompareService.call(@owner.login, @project.identifier, base, head)
+  end
+end
--- a/app/tasks/sync_forge_projects_rake.rb
+++ b/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
--- a/app/views/admins/apply_signatures/index.html.erb
+++ b/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>
--- a/app/views/admins/apply_signatures/index.js.erb
+++ b/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 } ) %>");
--- a/app/views/admins/apply_signatures/shared/_list.html.erb
+++ b/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&.owner&.real_name}/#{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 } %>
--- a/app/views/admins/laboratories/index.html.erb
+++ b/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' %>
--- a/app/views/admins/laboratories/shared/_laboratory_item.html.erb
+++ b/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>
--- a/app/views/admins/laboratory_settings/show.html.erb
+++ b/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>
--- a/app/views/admins/phenglei_users/index.html.erb
+++ b/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>
--- a/app/views/admins/phenglei_users/index.js.erb
+++ b/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 } ) %>");
--- a/app/views/admins/phenglei_users/new.js.erb
+++ b/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');
--- a/app/views/admins/phenglei_users/shared/_create_form_modal.html.erb
+++ b/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>
--- a/app/views/admins/phenglei_users/shared/_list.html.erb
+++ b/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 } %>
--- a/app/views/admins/platform_communicates/_form_modal.html.erb
+++ b/app/views/admins/platform_communicates/_form_modal.html.erb
@ -0,0 +1,50 @@
+<div class="modal fade platform-communicate-change-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"><%= type == "create" ? "新增" : "编辑" %></h5>
+        <button type="button" class="close" data-dismiss="modal" aria-label="Close">
+          <span aria-hidden="true">&times;</span>
+        </button>
+      </div>
+       <%= form_for @communicate, url: {controller: "platform_communicates", action: "#{type}"} do |p| %>
+        <div class="modal-body">
+          <div class="form-group">
+            <label>
+              标题 <span class="ml10 color-orange mr20">*</span>
+            </label>
+            <%= p.text_field :title,class: "form-control input-lg",required: true%>
+          </div>
+          <div class="form-group">
+            <label>
+              内容 <span class="ml10 color-orange mr20">*</span>
+            </label>
+            <%= p.text_area :content,class: "form-control input-lg",required: true%>
+          </div>
+          <div class="form-group">
+            <label>
+              标签（多个请用,隔开） <span class="ml10 color-orange mr20">*</span>
+            </label>
+            <%= p.text_field :tag_field,class: "form-control input-lg",required: true%>
+          </div>
+          <div class="form-group">
+            <label>
+              帖子ID <span class="ml10 color-orange mr20">*</span>
+            </label>
+            <%= p.number_field :fake_id,class: "form-control input-lg",required: true%>
+          </div>
+          <div class="form-group">
+            <label>
+              排序等级 <span class="ml10 color-orange mr20">*</span>
+            </label>
+            <%= p.number_field :order_index,class: "form-control input-lg",required: true%>
+          </div>
+        </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>
--- a/app/views/admins/platform_communicates/_list.html.erb
+++ b/app/views/admins/platform_communicates/_list.html.erb
@ -0,0 +1,35 @@
+<table class="table table-hover text-center subject-list-table">
+  <thead class="thead-light">
+  <tr>
+    <th width="5%">序号</th>
+    <th width="20%">标题</th>
+    <th width="20%">内容</th>
+    <th width="10%">帖子ID</th>
+    <th width="20%">标签</th>
+    <th width="20%">排序等级</th>
+    <th width="25%">操作</th>
+  </tr>
+  </thead>
+  <tbody>
+  <% if communicates.present? %>
+    <% communicates.each_with_index do |c, index| %>
+      <tr class="platform-communicate-item-<%= c.id %>">
+        <td><%= list_index_no((params[:page] || 1).to_i, index) %></td>
+        <td><%= c.title %></td>
+        <td><%= c.content.truncate(50) %></td>
+        <td><%= c.fake_id %></td>
+        <td><%= c.tag_field %></td>
+        <td><%= c.order_index %></td>
+        <td class="action-container">
+          <%= link_to "编辑", edit_admins_platform_communicate_path(c), remote: true, class: "action" %>
+          <%= link_to "删除", admins_platform_communicate_path(c), method: :delete, data:{confirm: "确认删除的吗？"}, class: "action" %>
+        </td>
+      </tr>
+    <% end %>
+  <% else %>
+    <%= render 'admins/shared/no_data_for_table' %>
+  <% end %>
+  </tbody>
+</table>
+
+<%= render partial: 'admins/shared/paginate', locals: { objects: communicates } %>
--- a/app/views/admins/platform_communicates/edit.js.erb
+++ b/app/views/admins/platform_communicates/edit.js.erb
@ -0,0 +1,2 @@
+$("#platform-communicate-modals").html("<%= j render(partial: 'admins/platform_communicates/form_modal', locals: {type: 'update'}) %>")
+$(".platform-communicate-change-modal").modal('show');
--- a/app/views/admins/platform_communicates/index.html.erb
+++ b/app/views/admins/platform_communicates/index.html.erb
@ -0,0 +1,18 @@
+<% define_admin_breadcrumbs do %>
+  <% add_admin_breadcrumb('社区动态管理') %>
+<% end %>
+
+<div class="box search-form-container platform-communicate-list-form">
+  <%= form_tag(admins_platform_communicates_path, method: :get, class: 'form-inline search-form flex-1', remote: true) do %>
+    <%= text_field_tag(:search, params[:search], class: 'form-control col-12 col-md-2 mr-3', placeholder: '标题检索') %>
+    <%= submit_tag('搜索', class: 'btn btn-primary ml-3', 'data-disable-with': '搜索中...') %>
+    <input type="reset" class="btn btn-secondary clear-btn" value="清空"/>
+  <% end %>
+ <%= link_to "新增", new_admins_platform_communicate_path, remote: true, class: "btn btn-primary pull-right", "data-disabled-with":"...新增" %> 
+</div>
+
+<div class="box admin-list-container platform-communicate-list-container">
+  <%= render partial: 'admins/platform_communicates/list', locals: { communicates: @communicates } %>
+</div>
+<div id="platform-communicate-modals">
+</div>
--- a/app/views/admins/platform_communicates/index.js.erb
+++ b/app/views/admins/platform_communicates/index.js.erb
@ -0,0 +1 @@
+$('.platform-communicate-list-container').html("<%= j( render partial: 'admins/platform_communicates/list', locals: { communicates: @communicates } ) %>");
--- a/app/views/admins/platform_communicates/new.js.erb
+++ b/app/views/admins/platform_communicates/new.js.erb
@ -0,0 +1,2 @@
+$("#platform-communicate-modals").html("<%= j render(partial: 'admins/platform_communicates/form_modal', locals: {type: 'create'}) %>")
+$(".platform-communicate-change-modal").modal('show');
--- a/app/views/admins/platform_people/_form_modal.html.erb
+++ b/app/views/admins/platform_people/_form_modal.html.erb
@ -0,0 +1,57 @@
+<div class="modal fade platform-person-change-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"><%= type == "create" ? "新增" : "编辑" %></h5>
+        <button type="button" class="close" data-dismiss="modal" aria-label="Close">
+          <span aria-hidden="true">&times;</span>
+        </button>
+      </div>
+       <%= form_for @person, url: {controller: "platform_people", action: "#{type}"}, html: { enctype: 'multipart/form-data' } do |p| %>
+        <div class="modal-body">
+          <div class="form-group">
+            <label>
+              标题 <span class="ml10 color-orange mr20">*</span>
+            </label>
+            <%= p.text_field :name,class: "form-control input-lg",required: true%>
+          </div>
+          <div class="logo-item">
+            <% logo_img = @person.image %>
+            <div class="logo-item-left mr-3 <%= logo_img ? 'has-img' : '' %>">
+              <img class="logo-item-img nav-logo-img" src="<%= logo_img %>" style="<%= logo_img.present? ? '' : 'display: none' %>"/>
+              <%= file_field_tag(:image, accept: 'image/png,image/jpg,image/jpeg',style: "display: none", value: params[:image]) %>
+              <label for="image" class="logo-item-upload" data-toggle="tooltip" data-title="选择图片"></label>
+            </div>
+            <div class="logo-item-right">
+              <div class="logo-item-title flex-1">logo</div>
+              <div>格式：PNG、JPG</div>
+              <div>尺寸：高度38px以内，宽等比例缩放</div>
+            </div>
+          </div>
+          <div class="form-group">
+            <label>
+              个人宣言 <span class="ml10 color-orange mr20">*</span>
+            </label>
+            <%= p.text_field :announcement,class: "form-control input-lg",required: true%>
+          </div>
+          <div class="form-group">
+            <label>
+              内容 <span class="ml10 color-orange mr20">*</span>
+            </label>
+            <%= p.text_area :content,class: "form-control input-lg",required: true%>
+          </div>
+          <div class="form-group">
+            <label>
+              用户标识 <span class="ml10 color-orange mr20">*</span>
+            </label>
+            <%= p.text_field :fake_login,class: "form-control input-lg",required: true%>
+          </div>
+        </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>
--- a/app/views/admins/platform_people/_list.html.erb
+++ b/app/views/admins/platform_people/_list.html.erb
@ -0,0 +1,35 @@
+<table class="table table-hover text-center subject-list-table">
+  <thead class="thead-light">
+  <tr>
+    <th width="5%">序号</th>
+    <th width="20%">名称</th>
+    <th width="20%">头像</th>
+    <th width="20%">个人宣言</th>
+    <th width="20%">内容</th>
+    <th width="10%">用户标识</th>
+    <th width="25%">操作</th>
+  </tr>
+  </thead>
+  <tbody>
+  <% if people.present? %>
+    <% people.each_with_index do |p, index| %>
+      <tr class="platform-person-item-<%= p.id %>">
+        <td><%= list_index_no((params[:page] || 1).to_i, index) %></td>
+        <td><%= p.name %></td>
+        <td><img style="width:150px" src="<%= p.image %>" /></td>
+        <td><%= p.announcement %></td>
+        <td><%= p.content.truncate(50) %></td>
+        <td><%= p.fake_login %></td>
+        <td class="action-container">
+          <%= link_to "编辑", edit_admins_platform_person_path(p), remote: true, class: "action" %>
+          <%= link_to "删除", admins_platform_person_path(p), method: :delete, data:{confirm: "确认删除的吗？"}, class: "action" %>
+        </td>
+      </tr>
+    <% end %>
+  <% else %>
+    <%= render 'admins/shared/no_data_for_table' %>
+  <% end %>
+  </tbody>
+</table>
+
+<%= render partial: 'admins/shared/paginate', locals: { objects: people } %>
--- a/app/views/admins/platform_people/edit.js.erb
+++ b/app/views/admins/platform_people/edit.js.erb
@ -0,0 +1,18 @@
+$("#platform-person-modals").html("<%= j render(partial: 'admins/platform_people/form_modal', locals: {type: 'update'}) %>")
+$(".platform-person-change-modal").modal('show');
+
+$('.logo-item-left').on("change", 'input[type="file"]', function () {
+  var $fileInput = $(this);
+  var file = this.files[0];
+  var imageType = /image.*/;
+  if (file && file.type.match(imageType)) {
+    var reader = new FileReader();
+    reader.onload = function () {
+      var $box = $fileInput.parent();
+      $box.find('img').attr('src', reader.result).css('display', 'block');
+      $box.addClass('has-img');
+    };
+    reader.readAsDataURL(file);
+  } else {
+  }
+});
--- a/app/views/admins/platform_people/index.html.erb
+++ b/app/views/admins/platform_people/index.html.erb
@ -0,0 +1,18 @@
+<% define_admin_breadcrumbs do %>
+  <% add_admin_breadcrumb('论坛交流管理') %>
+<% end %>
+
+<div class="box search-form-container platform-person-list-form">
+  <%= form_tag(admins_platform_people_path, method: :get, class: 'form-inline search-form flex-1', remote: true) do %>
+    <%= text_field_tag(:search, params[:search], class: 'form-control col-12 col-md-2 mr-3', placeholder: '名称检索') %>
+    <%= submit_tag('搜索', class: 'btn btn-primary ml-3', 'data-disable-with': '搜索中...') %>
+    <input type="reset" class="btn btn-secondary clear-btn" value="清空"/>
+  <% end %>
+ <%= link_to "新增", new_admins_platform_person_path, remote: true, class: "btn btn-primary pull-right", "data-disabled-with":"...新增" %> 
+</div>
+
+<div class="box admin-list-container platform-person-list-container">
+  <%= render partial: 'admins/platform_people/list', locals: { people: @people } %>
+</div>
+<div id="platform-person-modals">
+</div>
--- a/app/views/admins/platform_people/index.js.erb
+++ b/app/views/admins/platform_people/index.js.erb
@ -0,0 +1 @@
+$('.platform-person-list-container').html("<%= j( render partial: 'admins/platform_people/list', locals: { people: @people } ) %>");
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
xiaoxiaoqiong	74cbca2421	Merge branch 'dev_military_server_local' into dev_military_server	2021-12-25 20:23:21 +08:00
xiaoxiaoqiong	01bf13ddd9	fixed 手机号注册失败	2021-12-25 20:22:46 +08:00
xiaoxiaoqiong	ea2de5910a	Merge branch 'dev_military_server_local' into dev_military_server	2021-12-20 16:35:09 +08:00
xiaoxiaoqiong	a5d4799a21	增加首页项目统计基数	2021-12-20 16:34:52 +08:00
xiaoxiaoqiong	335d24bc8b	Merge branch 'dev_military_server_local' into dev_military_server	2021-12-20 16:05:46 +08:00
xiaoxiaoqiong	e97eacbbf6	增加首页项目统计基数	2021-12-20 16:04:58 +08:00
xiaoxiaoqiong	2c17ae096e	用户管理搜索优化	2021-12-20 11:16:42 +08:00
xiaoxiaoqiong	399f6c2a17	Merge branch 'dev_military_server_local' into dev_military_server	2021-12-17 14:26:01 +08:00
xiaoxiaoqiong	fb335162fc	reset gem lock file	2021-12-14 15:48:15 +08:00
xiaoxiaoqiong	c7b40c1230	重复手机注册	2021-12-14 15:46:40 +08:00
xiaoxiaoqiong	293121ab91	其他平台用户注册	2021-12-14 14:41:59 +08:00
yystopf	43cccc5429	fix: admins navbar and platform communicates order index and competitions filter	2021-12-09 14:04:03 +08:00
yystopf	fcc5429bbd	fix: api platform people	2021-12-07 09:26:32 +08:00
yystopf	1f8f2abcf6	Merge pull request '红山开源首页后台管理' (#280 ) from yystopf/forgeplus:dev_military_server_local into dev_military_server_local	2021-12-07 09:13:40 +08:00
yystopf	a2140574cd	fix	2021-12-06 16:59:07 +08:00
yystopf	ab47dd0524	add: js compile	2021-12-06 16:57:20 +08:00
yystopf	4310cc9f26	add: platform person admin	2021-12-06 16:41:12 +08:00
yystopf	9648afb0bb	add: platform communicate admin	2021-12-06 14:29:05 +08:00
yystopf	557b6ccc13	fix	2021-12-02 17:56:19 +08:00
viletyy	d94b3ff2f4	add: platform person	2021-12-02 17:46:25 +08:00
viletyy	4a7878d16e	add: platform communicate	2021-12-02 16:59:55 +08:00
viletyy	0a00a4bc0e	add: competitions	2021-12-02 15:18:10 +08:00
viletyy	b81d92af46	add: platform statistic	2021-12-02 14:39:53 +08:00
jasder	ef6f2c7b42	FIX 删除后台管理不存在的功能入口	2021-11-16 15:44:51 +08:00
jasder	689b24da8f	FIX 修改设置默认分支出错的bug	2021-11-10 16:35:26 +08:00
jasder	369877da5f	FIX 修改设置默认分支出错的bug	2021-11-10 16:34:38 +08:00
jasder	96c67d359e	FIX 发送pr时，分支对比功能添加gitea 接口支持(pr_merge api)（bug）	2021-11-10 11:20:14 +08:00
jasder	3e633ea6cc	FIX 发送pr时，分支对比功能添加gitea 接口支持(pr_merge api)	2021-11-10 11:16:17 +08:00
jasder	4fe3f88de6	FIX 版本库在线创建文件去掉敏感词过滤功能	2021-11-10 10:20:19 +08:00
jasder	a5fd87a475	FIX 前端调用api地址从后端获取[更改数据结构]	2021-11-09 17:26:42 +08:00
jasder	e8bbc7d856	ADD 前端调用api地址从后端获取[bug]	2021-11-09 16:54:10 +08:00
jasder	9a0d7aa02a	ADD 前端调用api地址从后端获取	2021-11-09 16:30:03 +08:00
jasder	25e1bf1565	FIX 后台管理修改用户信息支持同步到gitea	2021-11-05 18:54:14 +08:00
jasder	574f6561d1	ADD 后台管理特殊协议列表添加项目名称区分信息	2021-07-26 11:20:21 +08:00
jasder	eaddf52cbd	FIX 解决标签列表和发行版列表中下周zip包、tar包导致的404问题	2021-06-30 14:30:48 +08:00
jasder	ef0a0e5ddd	FIX [bug]cherry pick ce85273^..0bfed83	2021-06-23 17:56:04 +08:00
jasder	ef81d61a0d	FIX cherry pick ce85273^..0bfed83	2021-06-23 17:48:14 +08:00
jasder	071f913123	FIX code bug	2021-06-23 17:32:48 +08:00
jasder	6096fdd7bf	FIX 解决在线创建文件错误提示信息不准确的问题	2021-06-23 17:31:45 +08:00
jasder	9ba297ccf6	FIX 后台管理系统添加用户时，自动为用户生成邮箱	2021-06-08 09:27:41 +08:00
jasder	66fd6a71e5	FIX 后台管理系统添加用户时，自动为用户生产登录名	2021-06-07 17:09:23 +08:00
jasder	89bc20e540	FIX 去掉User模型中的open_users关联	2021-06-07 16:44:17 +08:00
jasder	184a6bf1bf	FIX 去掉User模型中的compose关联	2021-06-07 16:42:40 +08:00
jasder	8ee089b82d	ADD 后台管理系统添加新增用户功能	2021-06-04 18:01:03 +08:00
jasder	abc21413ac	Merge branch 'dev_military' of https://git.trustie.net/jasder/forgeplus into dev_military	2021-06-04 11:35:18 +08:00
vilet.yy	ce89ce5169	fix:use concat_ws	2021-04-02 11:39:55 +08:00
vilet.yy	b8a4c467fe	fix	2021-04-02 11:29:30 +08:00
vilet.yy	300658f8dd	fix: apply_signature filter	2021-04-02 11:18:28 +08:00
vilet.yy	9553740960	add: project order index	2021-03-17 15:47:01 +08:00
vilet.yy	1a8d9bb0ce	[ADD]add police picture	2021-03-11 10:54:01 +08:00
vilet.yy	8c43f74b69	[ADD]job use model data	2021-03-10 14:11:56 +08:00
vilet.yy	3e7ae82258	[ADD]phenglei user list and cron job	2021-03-10 14:02:41 +08:00
vilet.yy	0aa75e077e	[ADD]sync phenglei user job	2021-03-05 17:04:06 +08:00
vilet.yy	8aefcad510	[ADD]create project member rake	2021-03-05 17:04:06 +08:00
vilet.yy	622dcbaf4f	Merge branch 'dev_military' of https://git.trustie.net/jasder/forgeplus into dev_military	2021-03-05 17:03:01 +08:00
jasder	6570125a36	Merge branch 'develop' of https://git.trustie.net/jasder/forgeplus into dev_military	2021-03-05 15:50:40 +08:00
jasder	d91e8dcbfe	Merge branch 'dev_military' of https://git.trustie.net/jasder/forgeplus into dev_military	2021-03-05 15:38:06 +08:00
jasder	0c2507b1e9	FIX valid user before register action	2021-03-05 15:37:41 +08:00
vilet.yy	8d29c2bd50	[FIX]org visit phenglei project	2021-03-05 09:50:03 +08:00
vilet.yy	774f632d9a	Merge branch 'develop' into dev_military	2021-03-04 13:42:45 +08:00
vilet.yy	2969afd333	[FIX]project category correct projects_count	2021-03-01 16:23:29 +08:00
vilet.yy	cc978c8dea	[FIX]merge from develop	2021-03-01 13:59:30 +08:00
vilet.yy	ce105b4c07	[FIX]project category not include private repo	2021-02-26 16:20:26 +08:00
vilet.yy	b5870b1020	[FIX]lose role_name	2021-02-26 15:00:40 +08:00
vilet.yy	1edb3ce7ad	[FIX]search projects error	2021-02-25 12:11:32 +08:00
jasder	59257b1caa	FIX repo setting api for forbidden	2021-02-09 11:50:12 +08:00
Jasder	b552e29aa3	ADD forge host and main web host for setting api	2021-02-04 11:43:11 +08:00
Jasder	21424a23f2	FIX change host	2021-02-04 11:12:51 +08:00
Jasder	a82af669bd	Merge branch 'dev_military' of http://git.trustie.net/jasder/forgeplus into dev_military	2021-01-28 15:22:53 +08:00
Jasder	0f01abd45f	Merge branch 'develop' into dev_military	2021-01-28 15:21:43 +08:00
viletyy	80002be670	[FIX]项目列表total_count	2021-01-28 14:45:33 +08:00
Jasder	f7e19cb3a4	Merge branch 'develop' into dev_military	2021-01-14 18:39:31 +08:00
Jasder	5cd6620413	Merge branch 'develop' into dev_military	2021-01-14 18:26:04 +08:00
Jasder	f3a9124bdd	Merge branch 'develop' into dev_military	2021-01-14 18:23:26 +08:00
Jasder	d97a39a3a2	Merge branch 'develop' into dev_military	2021-01-14 17:05:50 +08:00
Jasder	987ff74690	FIX merge	2021-01-13 14:42:26 +08:00
Jasder	37be604e82	FIX [api] get pull files and commits bug	2021-01-13 14:40:23 +08:00
viletyy	83e2c1f889	[FIX]merge	2021-01-13 14:38:02 +08:00
viletyy	46a1c8877b	[FIX]pull_request bug	2021-01-13 11:26:21 +08:00
Jasder	0aa39efe9b	FIX code bug	2021-01-12 18:25:50 +08:00
Jasder	15d562d7b1	FIX delete batch import users with admin managerment	2021-01-12 18:15:01 +08:00
Jasder	5b261d6e81	FIX merge develop branch	2021-01-12 17:42:44 +08:00
viletyy	4693e77e02	[FIX]	2021-01-11 18:43:22 +08:00
viletyy	fbf22ff0df	[FIX]增加是否为成员参数	2021-01-11 17:52:58 +08:00
Jasder	0794f77a87	Merge branch 'develop' into dev_military	2021-01-06 14:00:51 +08:00
Jasder	e5a46a242f	FIX register with validate email	2021-01-06 11:03:00 +08:00
Jasder	4902237bd7	Merge branch 'dev_military_license' of http://git.trustie.net/jasder/forgeplus into dev_military_license	2021-01-06 10:44:37 +08:00
Jasder	4ddc60a1c3	FIX user register bug	2021-01-06 10:44:20 +08:00
viletyy	cfa14fff9d	[FIX]	2021-01-04 17:52:05 +08:00
viletyy	ef327f2994	[FIX]	2021-01-04 16:19:11 +08:00
viletyy	bf91c5e382	[FIX]	2021-01-04 15:32:44 +08:00
viletyy	9b687f7885	[FIX]	2021-01-04 15:22:03 +08:00
viletyy	a072162324	[ADD]项目创建者审核申请	2021-01-04 12:27:12 +08:00
viletyy	8f1e0f39ea	Merge branch 'dev_military_license' of https://git.trustie.net/jasder/forgeplus into dev_military_license	2020-12-31 14:03:06 +08:00
viletyy	aaa6483958	[FIX]几处bug修复	2020-12-31 14:02:37 +08:00
Jasder	bf730ca18f	Merge branch 'dev_military_license' of http://git.trustie.net/jasder/forgeplus into dev_military_license	2020-12-29 18:20:46 +08:00
Jasder	132af875bc	Merge branch 'master' into dev_military_license	2020-12-29 18:19:07 +08:00
viletyy	a862d994ab	[FIX]只有审核成功才添加成员	2020-12-29 18:08:10 +08:00
Jasder	604da93c5c	FIX when add members to project, permission set to readable	2020-12-29 17:17:36 +08:00
Jasder	3f525f5779	FIX update model schema	2020-12-29 14:25:40 +08:00
viletyy	05d1e66ea9	[FIX]	2020-12-28 20:29:56 +08:00
viletyy	10c1cccf2c	[FIX]	2020-12-28 19:42:59 +08:00
viletyy	27ec7ec7dd	[ADD]simple去除访问限制，并加入字段	2020-12-28 18:41:28 +08:00
Jasder	43b4907565	Merge branch 'dev_military_license' of http://git.trustie.net/jasder/forgeplus into dev_military_license	2020-12-28 14:53:52 +08:00
Jasder	cb90e1a13f	FIX get branches bug	2020-12-28 14:53:30 +08:00
viletyy	749cd058c4	[FIX]	2020-12-28 12:57:58 +08:00
viletyy	47cc70f2c5	[ADD]增加下载文件接口	2020-12-28 12:31:05 +08:00
viletyy	5447d54d30	[FIX]	2020-12-28 10:26:50 +08:00
viletyy	6c436dd631	[ADD]后台审核特殊许可申请	2020-12-27 18:44:03 +08:00
viletyy	9eb7219b9a	[FIX]	2020-12-25 18:58:03 +08:00
viletyy	ad5fcb25c4	[ADD]接口文档	2020-12-25 17:51:42 +08:00
viletyy	d42053ce0c	[FIX]merge	2020-12-25 16:33:16 +08:00
viletyy	36bae71947	[ADD]增加特殊许可的验证	2020-12-25 16:17:46 +08:00
Jasder	837aa1ea9e	FIX Merge master branch	2020-12-25 15:10:50 +08:00
Sylor-huang	c283c7ed58	add: dun_check text and image	2020-11-30 19:36:30 +08:00
sylor_huang@126.com	4cf8588343	Reset Issue Closed_count	2020-09-27 11:17:22 +08:00
sylor_huang@126.com	e75fad98f8	change admin projects	2020-09-18 13:41:44 +08:00
sylor_huang@126.com	bc37c59f00	Change Header4	2020-09-16 15:08:35 +08:00
sylor_huang@126.com	a6a745da93	Change Header1	2020-09-16 14:58:12 +08:00
sylor_huang@126.com	5bef80ee58	Change Index Category	2020-09-11 18:32:42 +08:00
sylor_huang@126.com	f9bcc7e02b	Close DunCheck	2020-09-07 16:33:26 +08:00
sylor_huang@126.com	d35faf3935	Fix:Issues	2020-08-21 11:30:47 +08:00
sylor_huang@126.com	8d7dc9cb60	Test Push	2020-08-21 09:52:31 +08:00
sylor_huang@126.com	248d78d8c1	Merge branch 'dev_trustie' into dev_military	2020-08-20 18:10:07 +08:00
sylor_huang@126.com	f632424f13	Change Like	2020-08-20 11:00:19 +08:00
sylor_huang@126.com	95ede63220	Change	2020-08-19 17:58:04 +08:00
sylor_huang@126.com	8fac294d04	Add UserAction Ip	2020-08-18 18:16:58 +08:00
sylor_huang@126.com	d67c12beba	Ignore migrate files	2020-08-18 18:10:05 +08:00
sylor_huang@126.com	a7e4b85352	Change Confilct	2020-08-18 17:54:35 +08:00
Jasder	2ac2920399	FIX merge dev_trustie branch	2020-08-18 17:39:37 +08:00
Jasder	230b934de4	Update remote register forr military platform	2020-08-18 17:33:12 +08:00
sylor_huang@126.com	e0bedf175f	Change Dun Check	2020-08-18 11:02:09 +08:00
sylor_huang@126.com	c9a263e03c	Add Dun Check For Project	2020-08-18 10:36:13 +08:00
Jasder	2bd15d9746	Merge branch 'dev_trustie' into dev_military	2020-08-17 18:52:00 +08:00
sylor_huang@126.com	fc9588fb63	Add Dun Check	2020-08-17 18:49:18 +08:00
sylor_huang@126.com	e611b519ab	Fix: Admins page remove .educoer.net words	2020-08-13 14:21:13 +08:00
sylor_huang@126.com	3dd3944ebd	Fix: Unknow attribute private for project	2020-08-13 13:50:07 +08:00
sylor_huang@126.com	f417bf3308	Change User Defautl Picture	2020-08-13 10:01:13 +08:00
sylor_huang@126.com	9c7c914d12	Change	2020-08-12 18:07:43 +08:00
sylor_huang@126.com	b088befae7	Change	2020-08-12 16:39:10 +08:00
sylor_huang@126.com	d3636e686b	CHange	2020-08-12 16:27:42 +08:00
sylor_huang@126.com	88d98f0ac4	Change	2020-08-12 16:24:30 +08:00
sylor_huang@126.com	db6aa954b1	Change	2020-08-12 16:18:16 +08:00
sylor_huang@126.com	04a611a4aa	Change	2020-08-12 16:01:42 +08:00
sylor_huang@126.com	9ecea83506	Change	2020-08-12 15:43:55 +08:00
sylor_huang@126.com	82a9907fdc	change	2020-08-12 15:31:56 +08:00
sylor_huang@126.com	c56c98fd6e	Change	2020-08-12 15:30:39 +08:00
sylor_huang@126.com	2948ad2033	Change	2020-08-12 15:28:09 +08:00
sylor_huang@126.com	fc611140cf	change	2020-08-12 15:25:16 +08:00
sylor_huang@126.com	fcb5f58b69	change	2020-08-12 15:15:44 +08:00
sylor_huang@126.com	0f38a130f3	Change	2020-08-12 15:12:26 +08:00
sylor_huang@126.com	fc54632a08	Change	2020-08-12 14:45:45 +08:00
sylor_huang@126.com	5963af5c7b	Change Sidekiq	2020-08-12 14:41:53 +08:00
sylor_huang@126.com	c1f2f7f6e2	Build	2020-08-12 14:06:32 +08:00
sylor_huang@126.com	271699daf1	Change	2020-08-12 11:54:20 +08:00
sylor_huang@126.com	98da7ea34d	Change	2020-08-12 11:49:55 +08:00
sylor_huang@126.com	645e4a3586	Change	2020-08-12 11:45:57 +08:00
sylor_huang@126.com	7beca24a05	Change	2020-08-12 11:42:22 +08:00
sylor_huang@126.com	d1368c7612	Change	2020-08-12 11:14:37 +08:00
sylor_huang@126.com	28e762810e	Set	2020-08-12 10:45:54 +08:00
sylor_huang@126.com	0f60d0adc9	Change	2020-08-11 17:13:42 +08:00
sylor_huang@126.com	e634317675	CHnage	2020-08-11 17:11:56 +08:00
sylor_huang@126.com	6b1a0a96c6	CHange	2020-08-11 17:09:48 +08:00
sylor_huang@126.com	298859bd10	Change	2020-08-11 17:07:15 +08:00
sylor_huang@126.com	d4d412ab40	Change	2020-08-11 17:00:56 +08:00
sylor_huang@126.com	57d1a1474e	Change	2020-08-11 16:21:43 +08:00
sylor_huang@126.com	055b7dbac5	Change	2020-08-11 15:56:37 +08:00
sylor_huang@126.com	30aad87e5a	Change	2020-08-11 15:49:03 +08:00
sylor_huang@126.com	aecd68fe9a	Chnage	2020-08-11 15:44:10 +08:00
sylor_huang@126.com	998a6828d9	change	2020-08-11 15:34:50 +08:00
sylor_huang@126.com	12c04d02e5	Change	2020-08-11 15:30:12 +08:00
sylor_huang@126.com	d6ef3d8aa3	Change	2020-08-11 15:23:49 +08:00
sylor_huang@126.com	c7a89d1660	Change	2020-08-11 14:49:53 +08:00
sylor_huang@126.com	1939c0d33f	Set Auto Login	2020-08-11 11:28:49 +08:00
Jasder	561b9efd92	FIX change manager main site url	2020-08-10 12:08:00 +08:00
Jasder	6c0b87fdd1	FIX bug	2020-08-10 11:26:15 +08:00
Jasder	5d309d1dc4	FIX bug	2020-08-10 11:24:59 +08:00
Jasder	89c230c362	FIX 处理顶部导航错误的问题	2020-08-10 11:23:01 +08:00
Jasder	d4156a5582	Delete some url with setting api	2020-08-09 22:07:16 +08:00
Jasder	ee8cbb8553	FIX 调整云上实验配置	2020-08-07 14:34:26 +08:00
				`@ -0,0 +1 @@`
				`$('.apply_signatures-list-container').html("<%= j( render partial: 'admins/apply_signatures/shared/list', locals: { apply_signatures: @apply_signatures } ) %>");`
				`@ -0,0 +1 @@`
				`$('.phenglei-users-list-container').html("<%= j( render partial: 'admins/phenglei_users/shared/list', locals: { phenglei_users: @phenglei_users } ) %>");`
				`@ -0,0 +1 @@`
				`$('.platform-communicate-list-container').html("<%= j( render partial: 'admins/platform_communicates/list', locals: { communicates: @communicates } ) %>");`
				`@ -0,0 +1 @@`
				`$('.platform-person-list-container').html("<%= j( render partial: 'admins/platform_people/list', locals: { people: @people } ) %>");`