修复:cherry pick doorkeeper配置

app/controllers/api/v1/base_controller.rb

@@ -3,13 +3,22 @@ class Api::V1::BaseController < ApplicationController
   include Api::ProjectHelper
   include Api::UserHelper
 
-  before_action :doorkeeper_authorize!
-  skip_before_action :user_setup
+  # before_action :doorkeeper_authorize!
+  # skip_before_action :user_setup
 
   protected 
-  def current_user 
-    User.find(doorkeeper_token.resource_owner_id) if doorkeeper_token
-  end
+  # def current_user
+  #   #client方法对接，需要一直带着用户标识uid
+  #   Rails.logger.info doorkeeper_token
+  #   if doorkeeper_token && doorkeeper_token.resource_owner_id.blank?
+  #     # return User.anonymous if params[:uid].nil?
+  #     # tip_exception("2222")
+  #     # return render_error('缺少用户标识!')  if params[:uid].nil?
+  #     User.current = User.find(params[:uid])
+  #   else
+  #     User.find(doorkeeper_token.resource_owner_id) if doorkeeper_token
+  #   end
+  # end
 
   def require_manager_above
     @project = load_project