Merge branch 'dev_aliyun' of https://bdgit.educoder.net/Hjqreturn/educoder into dev_aliyun

* 'dev_aliyun' of https://bdgit.educoder.net/Hjqreturn/educoder:
  完善后台统计功能--取消测试代码
  完善后台统计功能
  get
  get请求

app/controllers/admins/dashboards_controller.rb

@@ -9,7 +9,7 @@ class Admins::DashboardsController < Admins::BaseController
     shixun_tomcat = edu_setting('cloud_bridge')
 
     uri = "#{shixun_tomcat}/bridge/monitor/getPodsInfo"
-    res = interface_post uri, params, 502, "数据接口延迟"
+    res = interface_get uri, 502, "数据接口延迟"
     if res['code'] == 0
       @pod_num = res['sum'] || 0
     end

app/controllers/application_controller.rb

@@ -448,6 +448,25 @@ class ApplicationController < ActionController::Base
 		end
 	end
 
+	#　无参类型处理
+	def interface_get(uri, status, message)
+		begin
+			uid_logger_dubug("--uri_exec: url is #{uri}")
+			uri = URI.parse(URI.encode(uri.strip))
+			res = Net::HTTP.get(uri)
+			uid_logger_dubug("--uri_exec: .....res is #{res}")
+			res = JSON.parse(res)
+			if (res && res['code'] != 0)
+				tip_exception(status, message)
+			else
+				res
+			end
+		rescue Exception => e
+			uid_logger("--uri_exec: exception #{e.message}")
+			raise Educoder::TipException.new(message)
+		end
+	end
+
 	# json格式请求
 	def interface_json_post(uri, params, status, message)
 		begin

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

@@ -65,33 +65,35 @@
           </div>
         </div>
 
-
         <div class="col-xl-3 col-lg-6">
           <div class="card card-stats mb-4 mb-xl-0">
             <div class="card-body">
               <div class="row">
                 <div class="col">
-                  <h5 class="card-title text-uppercase text-muted mb-0">当前在线用户数</h5>
-                  <span class="h2 font-weight-bold mb-0"><%= UserOnline.count %></span>
+                  <h5 class="card-title text-uppercase text-muted mb-0">30天内新增用户数</h5>
+                  <span class="h2 font-weight-bold mb-0"><%= @new_user_count %></span>
                 </div>
                 <div class="col-auto">
                   <div class="icon icon-shape rounded-circle shadow">
-                    <i class="fa fa-users"></i>
+                    <i class="fa fa-user-plus"></i>
                   </div>
                 </div>
               </div>
-
+<!--              <p class="mt-3 mb-0 text-muted text-sm">-->
+<!--                <span class="text-success mr-2"><i class="fas fa-arrow-up"></i> 12%</span>-->
+<!--                <span class="text-nowrap">Since last month</span>-->
+<!--              </p>-->
             </div>
           </div>
         </div>
 
-        <div class="col-xl-3 col-lg-6">
+        <div class="col-xl-3 col-lg-6" style="padding-top: 15px;">
           <div class="card card-stats mb-4 mb-xl-0">
             <div class="card-body">
               <div class="row">
                 <div class="col">
-                  <h5 class="card-title text-uppercase text-muted mb-0">当前Pod总数</h5>
-                  <span class="h2 font-weight-bold mb-0"><%= @pod_num.to_i %></span>
+                  <h5 class="card-title text-uppercase text-muted mb-0">当前在线用户数</h5>
+                  <span class="h2 font-weight-bold mb-0"><%= UserOnline.count %></span>
                 </div>
                 <div class="col-auto">
                   <div class="icon icon-shape rounded-circle shadow">
@@ -104,27 +106,25 @@
           </div>
         </div>
 
-        <div class="col-xl-3 col-lg-6">
+        <div class="col-xl-3 col-lg-6" style="padding-top: 15px;">
           <div class="card card-stats mb-4 mb-xl-0">
             <div class="card-body">
               <div class="row">
                 <div class="col">
-                  <h5 class="card-title text-uppercase text-muted mb-0">30天内新增用户数</h5>
-                  <span class="h2 font-weight-bold mb-0"><%= @new_user_count %></span>
+                  <h5 class="card-title text-uppercase text-muted mb-0">当前Pod总数</h5>
+                  <span class="h2 font-weight-bold mb-0"><%= @pod_num.to_i %></span>
                 </div>
                 <div class="col-auto">
                   <div class="icon icon-shape rounded-circle shadow">
-                    <i class="fa fa-user-plus"></i>
+                    <i class="fa fa-users"></i>
                   </div>
                 </div>
               </div>
-<!--              <p class="mt-3 mb-0 text-muted text-sm">-->
-<!--                <span class="text-success mr-2"><i class="fas fa-arrow-up"></i> 12%</span>-->
-<!--                <span class="text-nowrap">Since last month</span>-->
-<!--              </p>-->
+
             </div>
           </div>
         </div>
+
       </div>
     </div>
   </div>