Merge branch 'educoder' into dev_aliyun

app/controllers/account_controller.rb

@@ -869,7 +869,7 @@ class AccountController < ApplicationController
         if ApplyUserAuthentication.where(:user_id => @user.id, :status => 0, :auth_type => 1).count == 0
           ApplyUserAuthentication.create(:user_id => @user.id, :status => 0, :auth_type => 1)
           begin
-            status = Trustie::Sms.send(mobile: '18711085785', send_type:'apply_auth' , name: '管理员')
+            status = Trustie::Sms.send(mobile: '15388083362', send_type:'apply_auth' , name: '管理员')
           rescue => e
             Rails.logger.error "发送验证码出错: #{e}"
           end
@@ -928,7 +928,7 @@ class AccountController < ApplicationController
           if ApplyUserAuthentication.where(:user_id => @user.id, :status => 0, :auth_type => 2).count == 0
             ApplyUserAuthentication.create(:user_id => @user.id, :status => 0, :auth_type => 2)
             begin
-              status = Trustie::Sms.send(mobile: '18711085785', send_type:'apply_pro_certification' , name: '管理员')
+              status = Trustie::Sms.send(mobile: '15388083362', send_type:'apply_pro_certification' , name: '管理员')
             rescue => e
               Rails.logger.error "发送验证码出错: #{e}"
             end
@@ -937,7 +937,7 @@ class AccountController < ApplicationController
           if File.exist?(diskfile2)
             ApplyUserAuthentication.create(:user_id => @user.id, :status => 0, :auth_type => 2)
             begin
-              status = Trustie::Sms.send(mobile: '18711085785', send_type:'apply_pro_certification' , name: '管理员')
+              status = Trustie::Sms.send(mobile: '15388083362', send_type:'apply_pro_certification' , name: '管理员')
             rescue => e
               Rails.logger.error "发送验证码出错: #{e}"
             end

app/controllers/shixuns_controller.rb

@@ -569,7 +569,7 @@ class ShixunsController < ApplicationController
         else
           ApplyAction.create(:container_type => "ApplyShixun", :container_id => @shixun.id, :user_id => User.current.id, :status => 0)
           begin
-            status = Trustie::Sms.send(mobile: '18711011226', send_type:'publish_shixun' , name: '管理员')
+            status = Trustie::Sms.send(mobile: '15388083362', send_type:'publish_shixun' , name: '管理员')
           rescue => e
             Rails.logger.error "发送验证码出错: #{e}"
           end

app/controllers/subjects_controller.rb

@@ -207,7 +207,7 @@ class SubjectsController < ApplicationController
         # notes = User.current.show_name.to_s + " 申请发布课程实训：<a href='#{subject_path(@subject)}'>#{@subject.name}</a>"
         # JournalsForMessage.create(:jour_id => 1, :jour_type => 'Principal', :user_id => User.current.id, :notes => notes, :private => 1, :reply_id => 0)
         begin
-          status = Trustie::Sms.send(mobile: '18711011226', send_type:'publish_subject' , name: '管理员')
+          status = Trustie::Sms.send(mobile: '15388083362', send_type:'publish_subject' , name: '管理员')
         rescue => e
           Rails.logger.error "发送验证码出错: #{e}"
         end

app/services/libraries/submit_service.rb

@@ -28,6 +28,6 @@ class Libraries::SubmitService
     Tiding.create!(user_id: 1, trigger_user_id: library.user_id,
                    container_id: library.id, container_type: 'Library',
                    tiding_type: 'Apply', status: 0)
-    Trustie::Sms.send(mobile: '18711011226', send_type:'publish_library' , name: '管理员') rescue nil
+    Trustie::Sms.send(mobile: '15388083362', send_type:'publish_library' , name: '管理员') rescue nil
   end
 end

app/views/managements/update_notice.html.erb

@@ -41,7 +41,7 @@
             formatTime:'H:i',
             formatDate:'Y-m-d',
             validateOnBlur:false,
-            step:10
+            step:1
         });
         $('#notice_end_time').datetimepicker({
             allowBlank:true,
@@ -50,7 +50,7 @@
             formatTime:'H:i',
             formatDate:'Y-m-d',
             validateOnBlur:false,
-            step:10
+            step:1
         });
     });
 

lib/trustie/gitlab/helper.rb

@@ -28,6 +28,9 @@ module Trustie
         begin
           u = find_user(user)
           unless u.present?
+            if user.hashed_password.blank?
+              user.salt_password("edu12345678")
+            end
             u = self.g.create_user(user.mail, user.hashed_password, name: user.show_name, username: user.login, confirm: "true")
             Rails.logger.warn("create gitlab log ##user.mail is #{user.mail}, name is #{user.show_name}, u id is#{u.id}")
             user.gid = u.id