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

app/controllers/ecloud_controller.rb

@@ -43,7 +43,7 @@ class EcloudController < ApplicationController
   CLIENT_ID = '1056'
   CLIENT_SECRET = '2e84256a-3de4-4713-9e02-10ee88a14592'
   SERVER_URL = "https://221.176.53.130:44390/services/"
-
+q
 
 
   ## 签名

app/models/user.rb

@@ -1693,6 +1693,11 @@ class User < Principal
   end
 
   def self.create_with_ecoder!(info)
+    user = User.find_by_phone(info["mobile"])
+
+    # 如果手机号存在，则直接绑定用户
+    # 因为手机号可以取回密码，所以可以视为同一用户
+    unless user 
       user = User.new
       user.admin = false
       user.login = "ecoder_" + info["mobile"]
@@ -1718,6 +1723,7 @@ class User < Principal
       ue = user.user_extensions ||= UserExtensions.new
       ue.user_id = user.id
       ue.save!
+    end
 
     user
   end