From 479062bcbeb4fb671ffd8409fef19d8983de8617 Mon Sep 17 00:00:00 2001
From: cxt <853663049@qq.com>
Date: Fri, 6 Sep 2019 19:19:15 +0800
Subject: [PATCH 1/4] =?UTF-8?q?=E6=AF=95=E8=AE=BE=E9=80=89=E9=A2=98?=
 =?UTF-8?q?=E7=9A=84=E8=AE=BE=E4=B8=BA=E5=85=AC=E5=BC=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 db/migrate/20190906111746_gtopic_bank_is_public.rb | 5 +++++
 1 file changed, 5 insertions(+)
 create mode 100644 db/migrate/20190906111746_gtopic_bank_is_public.rb

diff --git a/db/migrate/20190906111746_gtopic_bank_is_public.rb b/db/migrate/20190906111746_gtopic_bank_is_public.rb
new file mode 100644
index 000000000..193824dc4
--- /dev/null
+++ b/db/migrate/20190906111746_gtopic_bank_is_public.rb
@@ -0,0 +1,5 @@
+class GtopicBankIsPublic < ActiveRecord::Migration[5.2]
+  def change
+    GtopicBank.where(is_public: nil).update_all(is_public: 0)
+  end
+end

From 2f82c863f99eafa1aa30f4b923fed60836300058 Mon Sep 17 00:00:00 2001
From: caicai8 <1149225589@qq.com>
Date: Fri, 6 Sep 2019 19:26:18 +0800
Subject: [PATCH 2/4] =?UTF-8?q?=E6=AF=95=E8=AE=BE=E4=BB=BB=E5=8A=A1?=
 =?UTF-8?q?=E5=88=97=E8=A1=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 public/react/src/modules/courses/css/Courses.css | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/public/react/src/modules/courses/css/Courses.css b/public/react/src/modules/courses/css/Courses.css
index 72ea16378..45c7f00af 100644
--- a/public/react/src/modules/courses/css/Courses.css
+++ b/public/react/src/modules/courses/css/Courses.css
@@ -1221,7 +1221,7 @@ samp {
   }
   
   /* 毕设任务 */
-  .graduationTaskMenu a{
+  .graduationTaskMenu>a{
       display: block;
       position: relative;
       line-height: 72px;
@@ -1229,7 +1229,7 @@ samp {
       margin-right: 30px;
       float: left;
   }
-  .graduationTaskMenu a.active:after{
+  .graduationTaskMenu>a.active:after{
       position: absolute;
       left: 0px;
       height: 2px;
@@ -1239,7 +1239,7 @@ samp {
       bottom: 0px;
       font-weight:400;
   }
-  .graduationTaskMenu a.active{
+  .graduationTaskMenu>a.active{
       color: #4CACFF!important;
   }
   

From c1e5f28702d6268770ffb6fd024ab7560994fdaf Mon Sep 17 00:00:00 2001
From: cxt <853663049@qq.com>
Date: Fri, 6 Sep 2019 19:29:03 +0800
Subject: [PATCH 3/4] =?UTF-8?q?=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controllers/task_banks_controller.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/controllers/task_banks_controller.rb b/app/controllers/task_banks_controller.rb
index b88768456..8d17c15f1 100644
--- a/app/controllers/task_banks_controller.rb
+++ b/app/controllers/task_banks_controller.rb
@@ -35,7 +35,7 @@ class TaskBanksController < ApplicationController
   def gtask_bank_params
     tip_exception("name参数不能为空") if params[:gtask_bank][:name].blank?
     tip_exception("description参数不能为空") if params[:gtask_bank][:description].blank?
-    if @bank.homework_type == 3
+    if @bank.task_type == 2
       tip_exception("base_on_project参数不能为空") if params[:gtask_bank][:base_on_project].nil?
       tip_exception("min_num参数不能为空") if params[:gtask_bank][:min_num].blank?
       tip_exception("max_num参数不能为空") if params[:gtask_bank][:max_num].blank?

From 43d8ef1e0f64a4b5c94f2fec63de4e6e7d2a7208 Mon Sep 17 00:00:00 2001
From: hjm <63528605@qq.com>
Date: Fri, 6 Sep 2019 19:37:40 +0800
Subject: [PATCH 4/4] images/educode

---
 public/react/src/App.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/public/react/src/App.js b/public/react/src/App.js
index f0c0fac5d..1205113df 100644
--- a/public/react/src/App.js
+++ b/public/react/src/App.js
@@ -324,7 +324,7 @@ class App extends Component {
 						title: 'EduCoder',
 						desc: '创新源于实践',
 						link: currentUrl,
-						imgUrl: currentUrl + '/images/educoder/index/subject/subject15.jpg'
+						imgUrl: (currentUrl.endsWith('/') ? currentUrl : currentUrl + '/') + 'images/educoder/index/subject/subject15.jpg'
 					};
 			
 					wx.onMenuShareAppMessage(shareData);//分享给好友