Merge branch 'pre_trustie_server' into trustie_server

config/configuration.yml.example

@@ -75,6 +75,9 @@ default: &default
   forum:
     domain: ''
     base_url: '/api'
+  # 区块链相关配置
+  blockchain:
+    api_url: 'blockchain service url'
 
 production:
   <<: *default

config/routes.rb

@@ -123,6 +123,20 @@ Rails.application.routes.draw do
     put    'commons/unhidden',    to: 'commons#unhidden'
     delete 'commons/delete',      to: 'commons#delete'
 
+    # blockchain related routes
+    get 'users/blockchain/balance', to: 'users#blockchain_balance'
+    post 'users/blockchain/balance_project', to: 'users#blockchain_balance_one_project'
+    post 'users/blockchain/transfer', to: 'users#blockchain_transfer'
+    post 'users/blockchain/exchange', to: 'users#blockchain_exchange'
+    post 'users/blockchain/create_trade', to: 'users#blockchain_create_trade'
+    get '/users/blockchain/get_trades', to: 'users#blockchain_get_trades'
+    post '/users/blockchain/trade', to: 'users#blockchain_trade'
+    get '/users/blockchain/get_verify_trades', to: 'users#blockchain_get_verify_trades'
+    post '/users/blockchain/verify_trade', to: 'users#blockchain_verify_trade'
+    get '/users/blockchain/get_history_trades', to: 'users#blockchain_get_history_trades'
+    post '/blockchain/issue/get_token_num', to: 'users#blockchain_get_issue_token_num'
+    get '/projects/blockchain/get_unclosed_issue_list', to: 'users#blockchain_get_unclosed_issue_list'
+
     resources :owners, only: [:index, :show]
 
     scope module: :organizations do
@@ -243,6 +257,8 @@ Rails.application.routes.draw do
         get :watch_users
         get :fan_users
         get :hovercard
+        get :hovercard4proj # author: zxh, 获取用户对项目的贡献情况
+        get :contribution_perc
         put :update_image
         get :get_image
       end

config/routes/api.rb

@@ -27,9 +27,31 @@ defaults format: :json do
             end
           end
 
+          resources :issues, param: :index, except: [:new, :edit] do 
+            collection do 
+              patch :batch_update
+              delete :batch_destroy
+            end
+
+            member do 
+              resources :journals, module: :issues, only: [:index, :create, :update, :destroy] do 
+                member do
+                  get :children_journals 
+                end
+              end
+            end
+          end
+          scope module: :issues do 
+            resources :issue_tags, except: [:new, :edit]
+            resources :milestones, except: [:new, :edit]
+            resources :issue_statues, only: [:index], controller: '/api/v1/issues/statues'
+            resources :issue_authors, only: [:index], controller: '/api/v1/issues/authors'
+            resources :issue_assigners, only: [:index], controller: '/api/v1/issues/assigners'
+            resources :issue_priorities, only: [:index]
+          end
+
           # projects文件夹下的
           scope module: :projects do 
-            resources :issues
             resources :pulls, module: 'pulls' do 
               resources :versions, only: [:index] do 
                 member do 
@@ -39,8 +61,7 @@ defaults format: :json do
               resources :journals, except: [:show, :edit]
               resources :reviews, only: [:index, :create] 
             end
-
-            resources :versions 
+            resources :collaborators, only: [:index]
             resources :release_versions
             resources :webhooks do 
               member do