Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop

.gitignore

@@ -6,8 +6,7 @@
 /config/database.yml
 /config/configuration.yml
 /config/additional_environment.rb
-/config/menu.yml
-/config/wechat.yml
+
 
 /files/*
 /log/*

config/menu.yml

@@ -2,7 +2,7 @@ button:
  -
   type: "view"
   name: "我的动态"
-  url: "https://open.weixin.qq.com/connect/oauth2/authorize?appid=wx8e1ab05163a28e37&redirect_uri=http://www.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=wxc09454f171153c2d&redirect_uri=https://test.forge.trustie.net/wechat/user_activities&response_type=code&scope=snsapi_base&state=123#wechat_redirect"
  -
   name: "我的课程"
   sub_button:

config/wechat.yml

@@ -3,25 +3,19 @@ default: &default
 #  corpsecret: "corpsecret"
 #  agentid:  1
 # Or if using public account, only need above two line
-
-  # guange test
-  #appid: "wxf694495398c7d470"
-  #secret: "743e038392f1d89540e95f8f7645849a"
-
-  appid: "wx8e1ab05163a28e37"
-  secret: "beb4d3bc4b32b3557811680835357841"
-
+  appid: "wxc09454f171153c2d"
+  secret: "dff5b606e34dcafe24163ec82c2715f8"
   token:    "123456"
-  access_token: ".access_token"
+  access_token: "1234567"
   encrypt_mode: false # if true must fill encoding_aes_key
-  encoding_aes_key:  "QGfP13YP4BbQGkkrlYuxpn4ZIDXpBJww4fxl8CObvNw"
-  jsapi_ticket: "tmp/wechat_jsapi_ticket"
+  encoding_aes_key:  "QyocNOkRmrT5HzBpCG54EVPUQjk86nJapXNVDQm6Yy6"
+  jsapi_ticket: "C:/Users/[user_name]/wechat_jsapi_ticket"
 
   #template
-  binding_succ_notice: "jjpDrgFErnmkrE9tf2M3o0t31ZrJ7mr0YtuE_wyLaMc"
-  journal_notice: "uC1zAw4F2q6HTA3Pcj8VUO6wKKKiYFwnPJB4iXxpdoM"
-  homework_message_notice: "tCf7teCVqc2vl2LZ_hppIdWmpg8yLcrI8XifxYePjps"
-  class_notice: "MQ_mFupbXP-9jWbeHT3C5xqNBvPo8EIlNv4ULakSpJA"
+  binding_succ_notice: "n4KLwcWNrIMYkKxWL2hUwzunm5RTT54EbWem2MIUapU"
+  journal_notice: "XpHHYkqSGkwuF9vHthRdmPQLvCFRQ4_NbRBP12T7ciE"
+  homework_message_notice: "Kom0TsYYKsNKCS6luweYVRo9z-mH0wRPr24b1clGCPQ"
+  class_notice: "8LVu33l6bP-56SDomVgHn-yJc57YpCwwJ81rAJgRONk"
 
 production:
   <<: *default