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

LocalReadMe.md

@@ -5,7 +5,7 @@
     3. 链接mysql，执行导入数据库：source /Users/jingquanhuang/eduplus2/db/structure.sql
     3.1 mac电脑 pwd 获取本地目录
     4. 导入基础数据： source /Users/jingquanhuang/eduplus2/db/init.sql
-    4. 初始化种子数据 bundle exec rake db:seed 
+    4. 初始化种子数据 bundle exec rake db:seed
     5、启动服务用 bundle exec rails s 
     5.1、 出现db:migrate 错误 执行bundle exec rake db:migrate
     5.2、*** 前端改动了app/assets/里面样式或者js的话，提交代码的时候要先删除 public/assets/ 下的文件 

app/controllers/initialization_data_controller.rb

@@ -67,6 +67,7 @@ class InitializationDataController < ApplicationController
     logger.info("#########test_sets: #{@test_sets.map(&:id)}")
     logger.info("#########challenge_chooses: #{@challenge_chooses.map(&:id)}")
     logger.info("#########challenge_questions: #{@challenge_questions.map(&:id)}")
+    logger.info("#########attachments: #{@att_ids.count}")
     connect_to_origin_date database
     logger.info("#########subjects: #{@subjects.count}")
     logger.info("#########stage: #{@stages.count}")
@@ -82,6 +83,7 @@ class InitializationDataController < ApplicationController
     logger.info("#########test_sets: #{@test_sets.count}")
     logger.info("#########challenge_chooses: #{@challenge_chooses.count}")
     logger.info("#########challenge_questions: #{@challenge_questions.count}")
+    logger.info("#########attachments: #{@att_ids}")
     ActiveRecord::Base.transaction do
        copy_subject_data
        copy_stages_data
@@ -105,14 +107,23 @@ class InitializationDataController < ApplicationController
 
   # 链接库
   def connect_to_origin_date database
+    # ActiveRecord::Base.establish_connection(
+    #     adapter: "mysql2",
+    #     host: "rm-bp13v5020p7828r5r.mysql.rds.aliyuncs.com",
+    #     username: "testeducoder",
+    #     password: "TEST@123",
+    #     database: "#{database}",
+    #     encoding: "utf8"
+    # )
     ActiveRecord::Base.establish_connection(
         adapter: "mysql2",
-        host: "rm-bp13v5020p7828r5r.mysql.rds.aliyuncs.com",
-        username: "testeducoder",
-        password: "TEST@123",
+        host: "127.0.0.1",
+        username: "root",
+        password: "123456",
         database: "#{database}",
         encoding: "utf8"
     )
+
   end
 
   # 获取需要的路径

db/seeds.rb

@@ -12,7 +12,7 @@ user_params = [
         id: 1,
         login: 'educoder',
         hashed_password: '6763c9a6d5c201903feed5950a2c4459cef8d3ec',
-        lastname: '社区导师',
+        lastname: '指导老师',
         mail: '721773699@qq.com',
         admin: 1,
         status: 1,