From c33bb4709cb96dbba9bbde565b97e63c1bd5d084 Mon Sep 17 00:00:00 2001
From: yuanke <249218296@qq.com>
Date: Fri, 8 Jul 2016 21:01:10 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E5=BE=AE=E4=BF=A1=E6=AD=A3=E5=BC=8F?=
 =?UTF-8?q?=E7=89=88=E9=85=8D=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 config/menu.yml   |  2 +-
 config/wechat.yml | 14 +++++++-------
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/config/menu.yml b/config/menu.yml
index 053343094..1817ab44d 100644
--- a/config/menu.yml
+++ b/config/menu.yml
@@ -2,7 +2,7 @@ button:
  -
   type: "view"
   name: "我的动态"
-  url: "https://open.weixin.qq.com/connect/oauth2/authorize?appid=wxc09454f171153c2d&redirect_uri=https://test.forge.trustie.net/wechat/user_activities&response_type=code&scope=snsapi_base&state=123#wechat_redirect"
+  url: "https://open.weixin.qq.com/connect/oauth2/authorize?appid=wx8e1ab05163a28e37&redirect_uri=https://www.trustie.net/wechat/user_activities&response_type=code&scope=snsapi_base&state=123#wechat_redirect"
  -
   name: "我的课程"
   sub_button:
diff --git a/config/wechat.yml b/config/wechat.yml
index 3d679c4ce..d9a091db9 100644
--- a/config/wechat.yml
+++ b/config/wechat.yml
@@ -3,19 +3,19 @@ default: &default
 #  corpsecret: "corpsecret"
 #  agentid:  1
 # Or if using public account, only need above two line
-  appid: "wxc09454f171153c2d"
-  secret: "dff5b606e34dcafe24163ec82c2715f8"
+  appid: "wx8e1ab05163a28e37"
+  secret: "beb4d3bc4b32b3557811680835357841"
   token:    "123456"
   access_token: "1234567"
   encrypt_mode: false # if true must fill encoding_aes_key
-  encoding_aes_key:  "QyocNOkRmrT5HzBpCG54EVPUQjk86nJapXNVDQm6Yy6"
+  encoding_aes_key:  "QGfP13YP4BbQGkkrlYuxpn4ZIDXpBJww4fxl8CObvNw"
   jsapi_ticket: "C:/Users/[user_name]/wechat_jsapi_ticket"
 
   #template
-  binding_succ_notice: "n4KLwcWNrIMYkKxWL2hUwzunm5RTT54EbWem2MIUapU"
-  journal_notice: "XpHHYkqSGkwuF9vHthRdmPQLvCFRQ4_NbRBP12T7ciE"
-  homework_message_notice: "Kom0TsYYKsNKCS6luweYVRo9z-mH0wRPr24b1clGCPQ"
-  class_notice: "8LVu33l6bP-56SDomVgHn-yJc57YpCwwJ81rAJgRONk"
+  binding_succ_notice: "jjpDrgFErnmkrE9tf2M3o0t31ZrJ7mr0YtuE_wyLaMc"
+  journal_notice: "uC1zAw4F2q6HTA3Pcj8VUO6wKKKiYFwnPJB4iXxpdoM"
+  homework_message_notice: "tCf7teCVqc2vl2LZ_hppIdWmpg8yLcrI8XifxYePjps"
+  class_notice: "MQ_mFupbXP-9jWbeHT3C5xqNBvPo8EIlNv4ULakSpJA"
 
 production:
   <<: *default

From f77bad34ad0a681c62125a025c997495ec4c37f1 Mon Sep 17 00:00:00 2001
From: huang <huang.jingquan@163.com>
Date: Fri, 8 Jul 2016 21:29:47 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E7=BC=A9=E7=9F=AD=E6=97=B6=E9=97=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controllers/quality_analysis_controller.rb | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/app/controllers/quality_analysis_controller.rb b/app/controllers/quality_analysis_controller.rb
index db5fac9c7..73672d11a 100644
--- a/app/controllers/quality_analysis_controller.rb
+++ b/app/controllers/quality_analysis_controller.rb
@@ -71,12 +71,12 @@ class QualityAnalysisController < ApplicationController
 
         # 判断调用sonar分析是否成功
         # 等待启动时间处理, 最长时间为30分钟
-        for i in 0..60 do
-          sleep(30)
+        for i in 0..360 do
+          sleep(5)
           @current_build_status = @client.job.get_current_build_status("#{job_name}")
           if (@current_build_status == "success" || @current_build_status == "failure")
             break
-            if i == 60
+            if i == 360
               @build_console_result = false
               break
             end