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

app/controllers/concerns/git_helper.rb

@@ -48,7 +48,7 @@ module GitHelper
   def project_fork(container, original_rep_path, username)
     raise Educoder::TipException.new("fork源路径为空,fork失败!") if original_rep_path.blank?
     # 将要生成的仓库名字
-    new_repo_name = "#{username}/#{container.try(:identifier)}#{ Time.now.strftime("%Y%m%d%H%M%S")}"
+    new_repo_name = "#{username.try(:strip)}/#{container.try(:identifier)}#{ Time.now.strftime("%Y%m%d%H%M%S")}"
     uid_logger("start fork container: repo_name is #{new_repo_name}")
     GitService.fork_repository(repo_path: original_rep_path, fork_repository_path: (new_repo_name + ".git"))
     container.update_attributes!(:repo_name => new_repo_name)

app/controllers/shixuns_controller.rb

@@ -716,7 +716,7 @@ class ShixunsController < ApplicationController
 			rescue Exception => e
 				if e.message != "ActiveRecord::RecordInvalid"
 					logger.error("##########project_fork error #{e.message}")
-					@current_task.destroy!
+					@myshixun.destroy!
 				end
 				raise "实训云平台繁忙（繁忙等级：81）"
 			end

app/services/concerns/elasticsearch_able.rb

@@ -22,6 +22,7 @@ module ElasticsearchAble
       fragment_size: EduSetting.get('es_highlight_fragment_size') || 30,
       tag: '<span class="highlight">',
       fields: {
+        name: { type: 'plain' },
         challenge_names: { type: 'plain' },
         challenge_tag_names: { type: 'plain' },
         description: { type: 'plain' },

db/migrate/20190729080935_modify_login_for_users.rb

@@ -0,0 +1,9 @@
+class ModifyLoginForUsers < ActiveRecord::Migration[5.2]
+  def change
+    users = User.where("created_on > '2019-07-26 19:00:00'")
+    users.find_each do |use|
+      use.update_attributes(login: use.login.strip, phone: use.phone.try(:strip))
+      use.user_extension.update_column(:student_id, use.user_extension.student_id.try(:strip))
+    end
+  end
+end

public/react/public/css/edu-all.css

@@ -11,10 +11,11 @@
     float: left;
     width: 97px;}
 .head-nav{
+    float: left;
     text-align: center;
     height: 60px;
     box-sizing: border-box;
-    min-width: 1000px;
+    min-width: 1200px;
     overflow: hidden;
     text-overflow: ellipsis;
     white-space: nowrap;

public/react/src/AppConfig.js

@@ -41,7 +41,7 @@ export function initAxiosInterceptors(props) {
         // proxy = "http://testbdweb.trustie.net"
         // proxy = "http://testbdweb.educoder.net"
         // proxy = "https://testeduplus2.educoder.net"
-        proxy="http://47.96.87.25:48080"
+        proxy="http://47.96.87.25:48080/"
 
 
     // 在这里使用requestMap控制，避免用户通过双击等操作发出重复的请求；

public/react/src/modules/tpm/NewHeader.js

@@ -713,6 +713,10 @@ submittojoinclass=(value)=>{
               ><a href={this.props.Headertop===undefined?"":this.props.Headertop.auth}>工程认证</a></li>
             </ul>
 
+
+          </div>
+				</div>
+
 				<style>
 					{
 						`
@@ -722,7 +726,7 @@ submittojoinclass=(value)=>{
 								top: -2px;
 								background: #fff;
 								z-index: 2;
-										right: -241px;
+								right: 185px;
 								}
 								`
 					}
@@ -771,10 +775,6 @@ submittojoinclass=(value)=>{
 					</div>
 				</div>
 
-          </div>
-				</div>
-
-
           {/*<span className="font-15 fr mt17">
 			      	<%= link_to '登录', signin_path, :className => "mr5" %>
 			      	<em className="vertical-line"></em>

public/react/src/modules/tpm/TPMIndex.css

@@ -205,3 +205,7 @@ body>.-task-title {
  height: 100%;
  display: block;
 }
+
+.ml18a{
+    margin-left:18%;
+}

public/react/src/modules/tpm/TPMIndexHOC.js

@@ -20,7 +20,7 @@ const versionNum = '0001';
 // let _url_origin = getUrl()
 let _url_origin='';
 if(window.location.port === "3007"){
-	_url_origin="https://newweb.educoder.net";
+	_url_origin="http://47.96.87.25:48080/";
 }
 
 // let _url_origin=`https://www.educoder.net`;

public/stylesheets/educoder/edu-all.css

@@ -11,10 +11,11 @@
     float: left;
     width: 97px;}
 .head-nav{
+    float: left;
     text-align: center;
     height: 60px;
     box-sizing: border-box;
-    min-width: 1000px;
+    min-width: 1200px;
     overflow: hidden;
     text-overflow: ellipsis;
     white-space: nowrap;