diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb
index f8bd50624..fb2d9b433 100644
--- a/app/controllers/application_controller.rb
+++ b/app/controllers/application_controller.rb
@@ -328,7 +328,8 @@ class ApplicationController < ActionController::Base
 
 	def current_user
 		# User.current
-		User.find_by_id 1
+		User.find_by_id 50207
+		# User.find_by_id 36390
 		# nil
 	end
 
diff --git a/app/services/gitea/labels/delete_service.rb b/app/services/gitea/labels/delete_service.rb
index 8cf043169..50a7c6da1 100644
--- a/app/services/gitea/labels/delete_service.rb
+++ b/app/services/gitea/labels/delete_service.rb
@@ -23,12 +23,17 @@ class Gitea::Labels::DeleteService < Gitea::ClientService
   end
 
   def render_result(response)
-    body = JSON.parse(response.body)
+    return_body = response.body
+    if return_body.present?
+      body = JSON.parse(response.body)
+    else
+      body = []
+    end
     case response.status
     when 204
       body
     else
-      {status: -1, message: "#{body['message']}"}
+      {status: -1, message: "#{body['message'] if body.present?}"}
     end
   end
 end
diff --git a/app/services/projects/create_service.rb b/app/services/projects/create_service.rb
index f091f8c6f..4b8660ac2 100644
--- a/app/services/projects/create_service.rb
+++ b/app/services/projects/create_service.rb
@@ -32,7 +32,8 @@ class Projects::CreateService < ApplicationService
       project_language_id: params[:project_language_id],
       is_public: get_is_public,
       ignore_id: params[:ignore_id],
-      license_id: params[:license_id]
+      license_id: params[:license_id],
+      identifier: params[:repository_name]  #新增,hs
     }
   end
 
diff --git a/app/views/projects/create.json.jbuilder b/app/views/projects/create.json.jbuilder
index 818eb0180..0a586a654 100644
--- a/app/views/projects/create.json.jbuilder
+++ b/app/views/projects/create.json.jbuilder
@@ -1 +1 @@
-json.extract! @project, :id, :name
+json.extract! @project, :id, :name,:identifier
diff --git a/db/migrate/20200212055807_add_values_to_issue_tags_and_trackers.rb b/db/migrate/20200212055807_add_values_to_issue_tags_and_trackers.rb
new file mode 100644
index 000000000..f296386bd
--- /dev/null
+++ b/db/migrate/20200212055807_add_values_to_issue_tags_and_trackers.rb
@@ -0,0 +1,17 @@
+class AddValuesToIssueTagsAndTrackers < ActiveRecord::Migration[5.2]
+  def change
+    issue_status = %w(新增 正在解决 已解决 反馈 关闭 拒绝)
+    trackers = %w(缺陷 功能 支持 任务 周报)
+    issue_status.each_with_index do |s, index|
+      unless IssueStatus.exists?(name: s)
+        IssueStatus.create!(name: s, is_closed: (index == 4)  , is_default: (index == 0), position: index+1)
+      end
+    end
+
+    trackers.each_with_index do |s, index|
+      unless Tracker.exists?(name: s)
+        Tracker.create!(name: s, is_in_chlog: (index == 0 || index == 1)  , is_in_roadmap: (index != 0 || index != 2), position: index+1)
+      end
+    end
+  end
+end