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

app/models/course.rb

@@ -495,10 +495,11 @@ class Course < ActiveRecord::Base
 
   def generate_qrcode
     ticket = self.qrcode
-    if !ticket || ticket.size < 10
+    if !ticket || ticket.size < 10 || (Time.now.to_i > self.qrcode_expiretime)
       response = Wechat.api.qrcode_create_scene(invite_code, 2592000)
       logger.debug "response = #{response}"
       self.qrcode = response['ticket']
+      self.qrcode_expiretime = Time.now.to_i+response['expire_seconds']
       save! && reload
       ticket = qrcode
     end

app/models/project.rb

@@ -930,10 +930,11 @@ class Project < ActiveRecord::Base
 
   def generate_qrcode
     ticket = self.qrcode
-    if !ticket || ticket.size < 10
+    if !ticket || ticket.size < 10 || (Time.now.to_i > self.qrcode_expiretime)
       response = Wechat.api.qrcode_create_scene(invite_code, 2592000)
       logger.debug "response = #{response}"
       self.qrcode = response['ticket']
+      self.qrcode_expiretime = Time.now.to_i+response['expire_seconds']
       save!
       ticket = qrcode
     end

db/migrate/20160918024056_add_qrcode_expiretime_to_courses.rb

@@ -0,0 +1,5 @@
+class AddQrcodeExpiretimeToCourses < ActiveRecord::Migration
+  def change
+    add_column :courses, :qrcode_expiretime, :integer, :default => 0
+  end
+end

db/migrate/20160918024214_add_qrcode_expiretime_to_projects.rb

@@ -0,0 +1,5 @@
+class AddQrcodeExpiretimeToProjects < ActiveRecord::Migration
+  def change
+    add_column :projects, :qrcode_expiretime, :integer, :default => 0
+  end
+end