From 37cd96ce9f96596c3c083833b8ae137c6185c964 Mon Sep 17 00:00:00 2001
From: p31729568 <winse.wang@foxmail.com>
Date: Fri, 18 Oct 2019 18:12:32 +0800
Subject: [PATCH 1/3] wechat oauth: fix bug

---
 app/models/open_users/wechat.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/models/open_users/wechat.rb b/app/models/open_users/wechat.rb
index aadc9e78c..9e7e032b4 100644
--- a/app/models/open_users/wechat.rb
+++ b/app/models/open_users/wechat.rb
@@ -4,6 +4,6 @@ class OpenUsers::Wechat < OpenUser
   end
 
   def en_type
-    'qq'
+    'wechat'
   end
 end
\ No newline at end of file

From 8abd7b546e314ace99cfe49ca67804a98c9ca67f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=A8=E6=A0=91=E6=98=8E?= <775174143@qq.com>
Date: Fri, 18 Oct 2019 22:14:52 +0800
Subject: [PATCH 2/3] =?UTF-8?q?=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 public/react/src/modules/user/AccountPage.js | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/public/react/src/modules/user/AccountPage.js b/public/react/src/modules/user/AccountPage.js
index 0b6182a1f..42a323dfd 100644
--- a/public/react/src/modules/user/AccountPage.js
+++ b/public/react/src/modules/user/AccountPage.js
@@ -104,17 +104,18 @@ class AccountPage extends Component {
               <AccountNav {...this.props} {...common}></AccountNav>
               <div className="basicFormWrap">
                 <Switch {...this.props}>
+									<Route  path="/account/profile/edit"
+													render={
+														(props) => (<AccountBasicEdit {...this.props} {...props} {...this.state} {...common} />)
+													}
+									></Route>
+
                   <Route  path="/account/profile"
                           render={
                             (props) => (<AccountBasic {...this.props} {...props} {...this.state} {...common} />)
                           }
                   ></Route>
-                  <Route  path="/account/profile/edit"
-                          render={
-                            (props) => (<AccountBasicEdit {...this.props} {...props} {...this.state} {...common} />)
-                          }
-                  ></Route>
-
+									
                   <Route  path="/account/certification"
                           render={
                             (props) => (<AccountCertification {...this.props} {...props} {...this.state} {...common} />)

From 46c13a1df5b561a388138a9916a85e5eb3dd3809 Mon Sep 17 00:00:00 2001
From: daiao <358551898@qq.com>
Date: Sat, 19 Oct 2019 20:41:18 +0800
Subject: [PATCH 3/3] =?UTF-8?q?vnc=E5=AE=9E=E8=AE=AD=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/app/controllers/games_controller.rb b/app/controllers/games_controller.rb
index 8a3999410..78f665b3d 100644
--- a/app/controllers/games_controller.rb
+++ b/app/controllers/games_controller.rb
@@ -55,7 +55,7 @@ class GamesController < ApplicationController
 
     # 选择题和编程题公共部分
     @base_date = {st: @st, discusses_count: discusses_count, game_count: game_count, myshixun: @myshixun,
-                  challenge: game_challenge.attributes.except("answer"), game: @game.try(:attributes), shixun: @shixun.try(:attributes),
+                  challenge: game_challenge.attributes.except("answer"), game: @game.try(:attributes), shixun: @shixun.attributes.except("vnc", "vnc_evaluate"),
                   record_onsume_time: record_onsume_time, prev_game: prev_game, next_game: next_game,
                   praise_count: praise_count, user_praise: user_praise, time_limit: time_limit,
                   tomcat_url: edu_setting('cloud_tomcat_php'), is_teacher: is_teacher,