Merge remote-tracking branch 'origin/dev_aliyun' into dev_aliyun

app/controllers/gits_controller.rb

@@ -19,43 +19,48 @@ class GitsController < ApplicationController
     result = false
     if request.env["HTTP_AUTHORIZATION"] && request.env["HTTP_AUTHORIZATION"].split(" ").length == 2
       username_password = Base64.decode64(request.env["HTTP_AUTHORIZATION"].split(" ")[1])
-      input_username = username_password.split(":")[0].strip()
-      input_password = username_password.split(":")[1].strip()
-      uid_logger("git start auth: input_username is #{input_username}")
 
-
+      if username_password.split(":")[0].nil? || username_password.split(":")[1].nil?
-      # Git 超级权限用户
+        result = false
-      if input_username.strip == gituser.strip && input_password.strip == gitpassword.strip
-        result = true
       else
-        # 用户是否对对象拥有权限
+        input_username = username_password.split(":")[0].strip()
-        system_user = User.find_by_login(input_username) || User.find_by_mail(input_username) || User.find_by_phone(input_username)
+        input_password = username_password.split(":")[1].strip()
+        uid_logger("git start auth: input_username is #{input_username}")
+
 
-        # 如果用户名密码错误
+        # Git 超级权限用户
-        if system_user && !system_user.check_password?(input_password)
+        if input_username.strip == gituser.strip && input_password.strip == gitpassword.strip
-          uid_logger_error("git start: password is wrong")
+          result = true
-          result = false
         else
-          git_url = params["url"]
+          # 用户是否对对象拥有权限
-          username = git_url.split("/")[0]
+          system_user = User.find_by_login(input_username) || User.find_by_mail(input_username) || User.find_by_phone(input_username)
-          shixunname = git_url.split("/")[1].split(".")[0]
-          repo_name = username + "/" + shixunname
-          uid_logger("git start: repo_name is #{repo_name}")
-          shixun = Shixun.select([:id, :user_id, :repo_name, :identifier]).where(repo_name: repo_name).first
-          uid_logger("git start auth: shixun identifier is #{shixun.try(:identifier)}")
-          uid_logger("git start auth: systemuser is #{system_user.try(:login)}")
 
-          if shixun.present?
+          # 如果用户名密码错误
-            if system_user.present? && system_user.manager_of_shixun?(shixun)
+          if system_user && !system_user.check_password?(input_password)
-              result = true
+            uid_logger_error("git start: password is wrong")
+            result = false
+          else
+            git_url = params["url"]
+            username = git_url.split("/")[0]
+            shixunname = git_url.split("/")[1].split(".")[0]
+            repo_name = username + "/" + shixunname
+            uid_logger("git start: repo_name is #{repo_name}")
+            shixun = Shixun.select([:id, :user_id, :repo_name, :identifier]).where(repo_name: repo_name).first
+            uid_logger("git start auth: shixun identifier is #{shixun.try(:identifier)}")
+            uid_logger("git start auth: systemuser is #{system_user.try(:login)}")
+
+            if shixun.present?
+              if system_user.present? && system_user.manager_of_shixun?(shixun)
+                result = true
+              else
+                uid_logger_error("gituser is not shixun manager")
+                result = false
+              end
             else
-              uid_logger_error("gituser is not shixun manager")
+              uid_logger_error("shixun is not exist")
-              result = false
+              # result = false
+              result = true # 为了测试跳出
             end
-          else
-            uid_logger_error("shixun is not exist")
-            # result = false
-            result = true # 为了测试跳出
           end
         end
       end

public/react/src/modules/paths/PathDetail/DetailCards.js

@@ -336,7 +336,7 @@ class DetailCards extends Component{
       showparagraphindex
     }=this.state;
 		const antIcon = <Icon type="loading" style={{ fontSize: 24 }} spin />;
-
+   // console.log("zzz"+this.props.MenuItemsindextype)
     return(
       <div>
 				{AccountProfiletype===true?<AccountProfile

public/react/src/modules/paths/PathDetail/PathDetailIndex.js

@@ -86,7 +86,7 @@ class PathDetailIndex extends Component{
 			pathtopskey:1,
 			dataquerys:{},
 			MenuItemsindex:1,
-			MenuItemsindextype:2
+			MenuItemsindextype:0
 		}
 		this.onDragEnd = this.onDragEnd.bind(this);