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

dev_cs
杨树明 5 years ago
commit 8e8bcbf503

@ -19,6 +19,10 @@ class GitsController < ApplicationController
result = false result = false
if request.env["HTTP_AUTHORIZATION"] && request.env["HTTP_AUTHORIZATION"].split(" ").length == 2 if request.env["HTTP_AUTHORIZATION"] && request.env["HTTP_AUTHORIZATION"].split(" ").length == 2
username_password = Base64.decode64(request.env["HTTP_AUTHORIZATION"].split(" ")[1]) username_password = Base64.decode64(request.env["HTTP_AUTHORIZATION"].split(" ")[1])
if username_password.split(":")[0].nil? || username_password.split(":")[1].nil?
result = false
else
input_username = username_password.split(":")[0].strip() input_username = username_password.split(":")[0].strip()
input_password = username_password.split(":")[1].strip() input_password = username_password.split(":")[1].strip()
uid_logger("git start auth: input_username is #{input_username}") uid_logger("git start auth: input_username is #{input_username}")
@ -60,6 +64,7 @@ class GitsController < ApplicationController
end end
end end
end end
end
authenticate_or_request_with_http_basic do |username, password| authenticate_or_request_with_http_basic do |username, password|
result result

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

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

Loading…
Cancel
Save