Merge branch 'develop' of http://bdgit.educoder.net/Hjqreturn/pgfqe6ch8 into educoder

app/controllers/ecloud_controller.rb

@@ -33,10 +33,18 @@ class EcloudController < ApplicationController
   def trustie_login
   end
 
-  CLIENT_ID = '1022'
+  # 测试环境
-  CLIENT_SECRET = '2112037a-6d7a-432b-9081-feb1153d8668'
+  # CLIENT_ID = '1022'
-  ROOT_URl = 'http://localhost:3000'
+  # CLIENT_SECRET = '2112037a-6d7a-432b-9081-feb1153d8668'
-  SERVER_URL = "https://221.176.54.92:9081/restful/services/"
+  # SERVER_URL = "https://221.176.54.92:9081/restful/services/"
+  #
+
+  # 正式环境
+  CLIENT_ID = '1056'
+  CLIENT_SECRET = '2e84256a-3de4-4713-9e02-10ee88a14592'
+  SERVER_URL = "https://221.176.53.130:44390/services/"
+
+
 
   ## 签名
   def sign(timestamp)