From 65bd77f0ff25298ce5039a4b547c47346e47f099 Mon Sep 17 00:00:00 2001
From: yuanke <249218296@qq.com>
Date: Sun, 18 Sep 2016 10:50:40 +0800
Subject: [PATCH] =?UTF-8?q?=E5=BE=AE=E4=BF=A1=E4=BA=8C=E7=BB=B4=E7=A0=81?=
 =?UTF-8?q?=E8=BF=87=E6=9C=9F=E9=97=AE=E9=A2=98=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/models/course.rb                                         | 3 ++-
 app/models/project.rb                                        | 3 ++-
 .../20160918024056_add_qrcode_expiretime_to_courses.rb       | 5 +++++
 .../20160918024214_add_qrcode_expiretime_to_projects.rb      | 5 +++++
 4 files changed, 14 insertions(+), 2 deletions(-)
 create mode 100644 db/migrate/20160918024056_add_qrcode_expiretime_to_courses.rb
 create mode 100644 db/migrate/20160918024214_add_qrcode_expiretime_to_projects.rb

diff --git a/app/models/course.rb b/app/models/course.rb
index 659f9fcec..cc80a1b4b 100644
--- a/app/models/course.rb
+++ b/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
diff --git a/app/models/project.rb b/app/models/project.rb
index 0d297bb3c..e80306036 100644
--- a/app/models/project.rb
+++ b/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
diff --git a/db/migrate/20160918024056_add_qrcode_expiretime_to_courses.rb b/db/migrate/20160918024056_add_qrcode_expiretime_to_courses.rb
new file mode 100644
index 000000000..17d8548cc
--- /dev/null
+++ b/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
diff --git a/db/migrate/20160918024214_add_qrcode_expiretime_to_projects.rb b/db/migrate/20160918024214_add_qrcode_expiretime_to_projects.rb
new file mode 100644
index 000000000..870917443
--- /dev/null
+++ b/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