From 6261b92c7f75386c965757bd4e62cdc4142fa3a3 Mon Sep 17 00:00:00 2001
From: yuanke <249218296@qq.com>
Date: Mon, 14 Nov 2016 17:04:26 +0800
Subject: [PATCH 01/12] =?UTF-8?q?=E5=BF=BD=E7=95=A5oneapm?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .gitignore | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.gitignore b/.gitignore
index 9d33b264c..601f691a1 100644
--- a/.gitignore
+++ b/.gitignore
@@ -39,3 +39,4 @@ public/javascripts/wechat/node_modules/
 .access_token
 tmux*.log
 config/wechat.yml
+config/oneapm.yml

From e33146813d260db65ddfd1a985ed31562e43a283 Mon Sep 17 00:00:00 2001
From: yuanke <249218296@qq.com>
Date: Tue, 15 Nov 2016 09:25:58 +0800
Subject: [PATCH 02/12] =?UTF-8?q?=E5=8A=A0=E6=97=A5=E5=BF=97=E6=B5=8B?=
 =?UTF-8?q?=E8=AF=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/models/message.rb | 25 +++++++++++++++++++++++++
 1 file changed, 25 insertions(+)

diff --git a/app/models/message.rb b/app/models/message.rb
index 1d76c8ef6..6b2e29428 100644
--- a/app/models/message.rb
+++ b/app/models/message.rb
@@ -147,6 +147,7 @@ class Message < ActiveRecord::Base
 
   # 删除帖子的时候更新帖子总数, 删除回复的时候总数不减少
   def decrease_boards_count
+    tStarttime = Time.now
     if self.project && !project.project_score.nil?
       # 讨论区
       if self.parent_id.nil?
@@ -157,13 +158,22 @@ class Message < ActiveRecord::Base
         self.project.project_score.update_attribute(:board_message_num, count < 0 ? 0 : count)
       end
     end
+
+    tEndtime = Time.now
+    tUsedtime = (tEndtime.to_i-tStarttime.to_i)*1000+(tEndtime.usec - tStarttime.usec)/1000
+    logger.info "message_time decrease_boards_count! user wait time = #{tUsedtime} ms"
   end
 
   def reset_counters!
+    tStarttime = Time.now
     if parent && parent.id
       Message.update_all({:last_reply_id => parent.children.maximum(:id)}, {:id => parent.id})
     end
     board.reset_counters!
+
+    tEndtime = Time.now
+    tUsedtime = (tEndtime.to_i-tStarttime.to_i)*1000+(tEndtime.usec - tStarttime.usec)/1000
+    logger.info "message_time reset_counters! user wait time = #{tUsedtime} ms"
   end
 
   def sticky=(arg)
@@ -358,6 +368,7 @@ class Message < ActiveRecord::Base
 
   #减少用户分数
   def down_user_score
+    tStarttime = Time.now
     if self.parent_id.nil? && !self.board.project.nil?
       UserScore.joint(:delete_message, self.author,nil,self, { message_id: self.id })
       update_memo_number(User.current,1)
@@ -371,6 +382,10 @@ class Message < ActiveRecord::Base
         update_replay_for_memo(self.author,2,self.board.project)
       end
     end
+
+    tEndtime = Time.now
+    tUsedtime = (tEndtime.to_i-tStarttime.to_i)*1000+(tEndtime.usec - tStarttime.usec)/1000
+    logger.info "message_time down_user_score! user wait time = #{tUsedtime} ms"
   end
 
   def send_mail
@@ -381,7 +396,13 @@ class Message < ActiveRecord::Base
   # Author lizanle
   # Description 删除对应消息的图片资源
   def delete_kindeditor_assets
+    tStarttime = Time.now
+
     delete_kindeditor_assets_from_disk self.id,OwnerTypeHelper::MESSAGE
+
+    tEndtime = Time.now
+    tUsedtime = (tEndtime.to_i-tStarttime.to_i)*1000+(tEndtime.usec - tStarttime.usec)/1000
+    logger.info "message_time delete_kindeditor_assets! user wait time = #{tUsedtime} ms"
   end
 
   # 课程成员得分（活跃度）
@@ -399,6 +420,7 @@ class Message < ActiveRecord::Base
 
   # 删除帖子的时候更新课程帖子总数, 删除回复的时候减少总数
   def down_course_score
+    tStarttime = Time.now
     if self.course
       if self.parent_id.nil?  # 发帖
         down_course_score_num(self.course.id, self.author_id, "Message")
@@ -407,6 +429,9 @@ class Message < ActiveRecord::Base
         down_course_score_num(self.course.id, self.author_id, "MessageReply")
       end
     end
+    tEndtime = Time.now
+    tUsedtime = (tEndtime.to_i-tStarttime.to_i)*1000+(tEndtime.usec - tStarttime.usec)/1000
+    logger.info "message_time down_course_score! user wait time = #{tUsedtime} ms"
   end
 
   def delete_org_activities

From 85938bf3f1fb2ff069ea5ee24b44a2fa0e12e2a2 Mon Sep 17 00:00:00 2001
From: yuanke <249218296@qq.com>
Date: Tue, 15 Nov 2016 09:28:42 +0800
Subject: [PATCH 03/12] =?UTF-8?q?=E6=B5=8B=E8=AF=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/models/message.rb | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/app/models/message.rb b/app/models/message.rb
index 6b2e29428..0ae8d442b 100644
--- a/app/models/message.rb
+++ b/app/models/message.rb
@@ -147,6 +147,7 @@ class Message < ActiveRecord::Base
 
   # 删除帖子的时候更新帖子总数, 删除回复的时候总数不减少
   def decrease_boards_count
+    logger.info 'decrease_boards_count! start'
     tStarttime = Time.now
     if self.project && !project.project_score.nil?
       # 讨论区
@@ -165,6 +166,7 @@ class Message < ActiveRecord::Base
   end
 
   def reset_counters!
+    logger.info 'reset_counters! start'
     tStarttime = Time.now
     if parent && parent.id
       Message.update_all({:last_reply_id => parent.children.maximum(:id)}, {:id => parent.id})
@@ -368,6 +370,7 @@ class Message < ActiveRecord::Base
 
   #减少用户分数
   def down_user_score
+    logger.info 'down_user_score start'
     tStarttime = Time.now
     if self.parent_id.nil? && !self.board.project.nil?
       UserScore.joint(:delete_message, self.author,nil,self, { message_id: self.id })
@@ -396,6 +399,7 @@ class Message < ActiveRecord::Base
   # Author lizanle
   # Description 删除对应消息的图片资源
   def delete_kindeditor_assets
+    logger.info 'delete_kindeditor_assets start'
     tStarttime = Time.now
 
     delete_kindeditor_assets_from_disk self.id,OwnerTypeHelper::MESSAGE
@@ -420,6 +424,7 @@ class Message < ActiveRecord::Base
 
   # 删除帖子的时候更新课程帖子总数, 删除回复的时候减少总数
   def down_course_score
+    logger.info 'down_course_score start'
     tStarttime = Time.now
     if self.course
       if self.parent_id.nil?  # 发帖

From 19e2c349177e6334be556c63f35f7c0bf230fd49 Mon Sep 17 00:00:00 2001
From: yuanke <249218296@qq.com>
Date: Tue, 15 Nov 2016 10:33:28 +0800
Subject: [PATCH 04/12] =?UTF-8?q?=E6=B5=8B=E8=AF=95=E4=BB=A3=E7=A0=81?=
 =?UTF-8?q?=E8=BF=98=E5=8E=9F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/models/message.rb | 30 ------------------------------
 1 file changed, 30 deletions(-)

diff --git a/app/models/message.rb b/app/models/message.rb
index 0ae8d442b..1d76c8ef6 100644
--- a/app/models/message.rb
+++ b/app/models/message.rb
@@ -147,8 +147,6 @@ class Message < ActiveRecord::Base
 
   # 删除帖子的时候更新帖子总数, 删除回复的时候总数不减少
   def decrease_boards_count
-    logger.info 'decrease_boards_count! start'
-    tStarttime = Time.now
     if self.project && !project.project_score.nil?
       # 讨论区
       if self.parent_id.nil?
@@ -159,23 +157,13 @@ class Message < ActiveRecord::Base
         self.project.project_score.update_attribute(:board_message_num, count < 0 ? 0 : count)
       end
     end
-
-    tEndtime = Time.now
-    tUsedtime = (tEndtime.to_i-tStarttime.to_i)*1000+(tEndtime.usec - tStarttime.usec)/1000
-    logger.info "message_time decrease_boards_count! user wait time = #{tUsedtime} ms"
   end
 
   def reset_counters!
-    logger.info 'reset_counters! start'
-    tStarttime = Time.now
     if parent && parent.id
       Message.update_all({:last_reply_id => parent.children.maximum(:id)}, {:id => parent.id})
     end
     board.reset_counters!
-
-    tEndtime = Time.now
-    tUsedtime = (tEndtime.to_i-tStarttime.to_i)*1000+(tEndtime.usec - tStarttime.usec)/1000
-    logger.info "message_time reset_counters! user wait time = #{tUsedtime} ms"
   end
 
   def sticky=(arg)
@@ -370,8 +358,6 @@ class Message < ActiveRecord::Base
 
   #减少用户分数
   def down_user_score
-    logger.info 'down_user_score start'
-    tStarttime = Time.now
     if self.parent_id.nil? && !self.board.project.nil?
       UserScore.joint(:delete_message, self.author,nil,self, { message_id: self.id })
       update_memo_number(User.current,1)
@@ -385,10 +371,6 @@ class Message < ActiveRecord::Base
         update_replay_for_memo(self.author,2,self.board.project)
       end
     end
-
-    tEndtime = Time.now
-    tUsedtime = (tEndtime.to_i-tStarttime.to_i)*1000+(tEndtime.usec - tStarttime.usec)/1000
-    logger.info "message_time down_user_score! user wait time = #{tUsedtime} ms"
   end
 
   def send_mail
@@ -399,14 +381,7 @@ class Message < ActiveRecord::Base
   # Author lizanle
   # Description 删除对应消息的图片资源
   def delete_kindeditor_assets
-    logger.info 'delete_kindeditor_assets start'
-    tStarttime = Time.now
-
     delete_kindeditor_assets_from_disk self.id,OwnerTypeHelper::MESSAGE
-
-    tEndtime = Time.now
-    tUsedtime = (tEndtime.to_i-tStarttime.to_i)*1000+(tEndtime.usec - tStarttime.usec)/1000
-    logger.info "message_time delete_kindeditor_assets! user wait time = #{tUsedtime} ms"
   end
 
   # 课程成员得分（活跃度）
@@ -424,8 +399,6 @@ class Message < ActiveRecord::Base
 
   # 删除帖子的时候更新课程帖子总数, 删除回复的时候减少总数
   def down_course_score
-    logger.info 'down_course_score start'
-    tStarttime = Time.now
     if self.course
       if self.parent_id.nil?  # 发帖
         down_course_score_num(self.course.id, self.author_id, "Message")
@@ -434,9 +407,6 @@ class Message < ActiveRecord::Base
         down_course_score_num(self.course.id, self.author_id, "MessageReply")
       end
     end
-    tEndtime = Time.now
-    tUsedtime = (tEndtime.to_i-tStarttime.to_i)*1000+(tEndtime.usec - tStarttime.usec)/1000
-    logger.info "message_time down_course_score! user wait time = #{tUsedtime} ms"
   end
 
   def delete_org_activities

From 14552abd5611e6cc00c07946c67b67cbd856375c Mon Sep 17 00:00:00 2001
From: yuanke <249218296@qq.com>
Date: Mon, 21 Nov 2016 10:08:27 +0800
Subject: [PATCH 05/12] =?UTF-8?q?=E5=8D=9A=E5=AE=A2=E4=BA=BA=E6=B0=94?=
 =?UTF-8?q?=E6=8E=92=E5=BA=8F=E4=BF=AE=E6=94=B9=EF=BC=8C=E4=B8=AA=E4=BA=BA?=
 =?UTF-8?q?=E4=B8=BB=E9=A1=B5=E5=85=B3=E6=B3=A8BUG=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controllers/blogs_controller.rb      |  2 +-
 app/controllers/watchers_controller.rb   |  7 ++++++-
 app/views/layouts/new_base_user.html.erb |  2 +-
 app/views/users/_user_fans_item.html.erb | 12 +++++++++++-
 app/views/users/user_fanslist.html.erb   |  9 ---------
 app/views/watchers/_set_watcher.js.erb   |  4 +++-
 6 files changed, 22 insertions(+), 14 deletions(-)

diff --git a/app/controllers/blogs_controller.rb b/app/controllers/blogs_controller.rb
index eeea2d01a..8c6cc4f0c 100644
--- a/app/controllers/blogs_controller.rb
+++ b/app/controllers/blogs_controller.rb
@@ -26,7 +26,7 @@ class BlogsController < ApplicationController
         @type = 2
 
         @topics.each do |topic|
-          topic[:infocount] = get_praise_num(topic) + (topic.parent ? topic.parent.children.count : topic.children.count)
+          topic[:infocount] = get_praise_num(topic) + BlogComment.where("root_id = #{topic.id}").count
           if topic[:infocount] < 0
             topic[:infocount] = 0
           end
diff --git a/app/controllers/watchers_controller.rb b/app/controllers/watchers_controller.rb
index da0c5733a..6f0d96dfa 100644
--- a/app/controllers/watchers_controller.rb
+++ b/app/controllers/watchers_controller.rb
@@ -37,7 +37,9 @@ class WatchersController < ApplicationController
       @list = query.order("#{Watcher.table_name}.id desc").limit(limit).offset(@obj_pages.offset).all();
       @action = 'fans'
     else
-
+      if params[:target_id]
+        @user = User.find(params[:target_id])
+      end
     end
 
     if params[:object_type] == 'project'
@@ -78,6 +80,9 @@ class WatchersController < ApplicationController
       @list = query.order("#{Watcher.table_name}.id desc").limit(limit).offset(@obj_pages.offset).all();
       @action = 'fans'
     else
+      if params[:target_id]
+        @user = User.find(params[:target_id])
+      end
     end
     if params[:object_type] == 'project'
       @project = Project.find(params[:object_id])
diff --git a/app/views/layouts/new_base_user.html.erb b/app/views/layouts/new_base_user.html.erb
index 783aade75..b27f144e9 100644
--- a/app/views/layouts/new_base_user.html.erb
+++ b/app/views/layouts/new_base_user.html.erb
@@ -148,7 +148,7 @@
             <li>
               <a href="<%=user_fanslist_user_path(@user.id) %>">
                 <strong>粉丝</strong><br />
-                <span class="sy_cgrey"><%= @user.watcher_users.count %></span>
+                <span id="user_fans_number" class="sy_cgrey"><%= @user.watcher_users.count %></span>
               </a>
             </li>
           </ul>
diff --git a/app/views/users/_user_fans_item.html.erb b/app/views/users/_user_fans_item.html.erb
index b3fc7905c..8614e0b61 100644
--- a/app/views/users/_user_fans_item.html.erb
+++ b/app/views/users/_user_fans_item.html.erb
@@ -52,4 +52,14 @@
       <div class="cl"></div>
     </div>
 <% end %>
-<% end %>
\ No newline at end of file
+    <div style="text-align:center;">
+      <div class="pages" style="width:auto; display:inline-block;">
+        <ul  id="homework_pository_ref_pages">
+          <%= pagination_links_full @obj_pages, @obj_count, :per_page_links => false, :remote => true, :flag => true, :is_new => true%>
+        </ul>
+        <div class="cl"></div>
+      </div>
+    </div>
+<% else %>
+    <p id="nodata" class="nodata" style="display:<%= @list.count > 0 ? 'none' : 'block' %>;"><%= l(:label_no_data) %></p>
+<% end %>
diff --git a/app/views/users/user_fanslist.html.erb b/app/views/users/user_fanslist.html.erb
index 47bdc9126..77d85565e 100644
--- a/app/views/users/user_fanslist.html.erb
+++ b/app/views/users/user_fanslist.html.erb
@@ -26,16 +26,7 @@
       <%= render :partial => 'users/user_fans_item', :locals => {:list => @list,:target=>@user,:action_name=>@action,:page=>params[:page]} %>
     <%# end %>
     </div>
-    <p id="nodata" class="nodata" style="display:<%= @list.count > 0 ? 'none' : 'block' %>;"><%= l(:label_no_data) %></p>
 
-    <div style="text-align:center;">
-      <div class="pages" style="width:auto; display:inline-block;">
-        <ul  id="homework_pository_ref_pages">
-          <%= pagination_links_full @obj_pages, @obj_count, :per_page_links => false, :remote => false, :flag => true, :is_new => true%>
-        </ul>
-        <div class="cl"></div>
-      </div>
-    </div>
 
     <!--<ul class="wlist" style=" border:none;">-->
       <!--<%#= pagination_links_full @obj_pages, @obj_count, :per_page_links => false, :remote => false, :flag => true%>-->
diff --git a/app/views/watchers/_set_watcher.js.erb b/app/views/watchers/_set_watcher.js.erb
index fee58c15c..83358b049 100644
--- a/app/views/watchers/_set_watcher.js.erb
+++ b/app/views/watchers/_set_watcher.js.erb
@@ -1,7 +1,9 @@
 <% if( params[:object_type] == 'user') %>
   //点击头像下面的添加关注按钮
   <% if( params[:target_id] == params[:object_id] ) %>
-    $("#watch_user_btn_div").html("<%= escape_javascript render(:partial => "layouts/user_watch_btn", :locals => {:target => watched.first}) %>");
+    <% if @user %>
+        $("#watch_user_btn_div").html("<%= escape_javascript render(:partial => "layouts/user_watch_btn", :locals => {:target => watched.first}) %>");
+    <% end %>
     $("#user_fans_number").html("<%= watched.first.watcher_users.count.to_s%>");
     $(".add_cancel_watch_<%= watched.first.id %>").html("<%= escape_javascript (render :partial => 'users/watch_btn_for_picture', :locals => {:user => watched.first}) %>");
     $(".fans_count_<%= watched.first.id %>").text("<%= watched.first.watcher_users.count.to_s %>");

From 3099b37f5eeae84c6bdf5163e2adea3c82fd0082 Mon Sep 17 00:00:00 2001
From: yuanke <249218296@qq.com>
Date: Mon, 21 Nov 2016 12:07:14 +0800
Subject: [PATCH 06/12] =?UTF-8?q?=E4=B8=AA=E4=BA=BA=E4=B8=BB=E9=A1=B5?=
 =?UTF-8?q?=E5=85=B3=E6=B3=A8BUG=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/users/_user_fans_item.html.erb | 114 +++++++++++------------
 app/views/users/user_fanslist.html.erb   |  43 +++++----
 2 files changed, 78 insertions(+), 79 deletions(-)

diff --git a/app/views/users/_user_fans_item.html.erb b/app/views/users/_user_fans_item.html.erb
index 8614e0b61..36d1b1b73 100644
--- a/app/views/users/_user_fans_item.html.erb
+++ b/app/views/users/_user_fans_item.html.erb
@@ -1,65 +1,55 @@
 <% unless list.nil?%>
-<% for item in list %>
-    <div class="courses_list line" id="fans_item_<%=item.id%>">
-      <div class="courses_list_pic fl">
-        <a href="<%= user_path(item) %>">
-          <%= image_tag(url_to_avatar(item), :style=>"width:64px;height:64px;",:alt=>"头像") %>
-        </a>
-      </div>
-      <div class="courses_list_info fl ml10">
-        <a href="<%= user_path(item) %>" title="<%= item.show_name %>" class="courses_list_title  f14 fb c_blue02 fl"><%= item.show_name %></a>
-        <div class="cl"></div>
-        <div class="courses_list_table ">
-          <% if item.user_extensions && !item.user_extensions.brief_introduction.nil? && !item.user_extensions.brief_introduction.empty? %>
-          <p class="fans_sign" title="<%= item.user_extensions.brief_introduction %>">个性签名：<%= item.user_extensions.brief_introduction %></p>
+    <% for item in list %>
+        <div class="courses_list line" id="fans_item_<%=item.id%>">
+          <div class="courses_list_pic fl">
+            <a href="<%= user_path(item) %>">
+              <%= image_tag(url_to_avatar(item), :style=>"width:64px;height:64px;",:alt=>"头像") %>
+            </a>
+          </div>
+          <div class="courses_list_info fl ml10">
+            <a href="<%= user_path(item) %>" title="<%= item.show_name %>" class="courses_list_title  f14 fb c_blue02 fl"><%= item.show_name %></a>
+            <div class="cl"></div>
+            <div class="courses_list_table ">
+              <% if item.user_extensions && !item.user_extensions.brief_introduction.nil? && !item.user_extensions.brief_introduction.empty? %>
+                  <p class="fans_sign" title="<%= item.user_extensions.brief_introduction %>">个性签名：<%= item.user_extensions.brief_introduction %></p>
+              <% end %>
+              <table><tbody><tr>
+                <td class="td_w60 ">加入时间：</td>
+                <td class="td_w110 "><%= format_date(item.created_on) %></td>
+                <% if (item.user_extensions.identity == 0 || item.user_extensions.identity == 1) && !item.user_extensions.school.nil? %>
+                    <td class="td_w60 ">工作单位：</td>
+                    <td class="td_w110 ">
+                      <li style="overflow:hidden;white-space:nowrap;text-overflow:ellipsis;" title="<%= item.user_extensions.school.name %>">
+                        <a href="<%= url_for(:controller=>'welcome',:action => 'course', :school_id => item.user_extensions.school.id,:host=>Setting.host_course) %>"><%= item.user_extensions.school.name  %></a>
+                      </li>
+                    </td>
+                <% elsif item.user_extensions.identity == 3 && !item.user_extensions.occupation.nil? && !item.user_extensions.occupation.empty? %>
+                    <td class="td_w60 ">工作单位：</td>
+                    <td class="td_w110 ">
+                      <li style="overflow:hidden;white-space:nowrap;text-overflow:ellipsis;" title="<%= item.user_extensions.occupation %>">
+                        <%= item.user_extensions.occupation %>
+                      </li>
+                    </td>
+                <% elsif item.user_extensions.identity == 2 %>
+                    <td class="td_w60 ">工作单位：</td>
+                    <td class="td_w110 ">
+                      <li style="overflow:hidden;white-space:nowrap;text-overflow:ellipsis;" title="<%= item.show_name %>">
+                        <%= item.show_name %>
+                      </li>
+                    </td>
+                <% end %>
+              </tr></tbody></table>
+            </div>
+          </div>
+          <!-- 如果只有自己的关注页面才能关注人 取消关注操作，那么还要加 一句&& User.current.id == target.id-->
+          <% if(User.current.logged? && User.current != item )%>
+              <%if(item.watched_by?(User.current))%>
+                  <a href="<%= watch_path(:object_type=>'user',:object_id=>item.id,:target_id=>target.id,:action_name=>action_name,:page=>page) %>" class="grey_n_btn fr mt20" data-method="delete" data-remote="true"  title="取消关注">取消关注</a>
+              <% else %>
+                  <a href="<%= watch_path(:object_type=>'user',:object_id=>item.id,:target_id=>target.id,:action_name=>action_name,:page=>page) %>" class="blue_n_btn fr mt20" data-method="post" data-remote="true"  title="添加关注">添加关注</a>
+              <% end %>
           <% end %>
-          <table><tbody><tr>
-            <td class="td_w60 ">加入时间：</td>
-            <td class="td_w110 "><%= format_date(item.created_on) %></td>
-            <% if (item.user_extensions.identity == 0 || item.user_extensions.identity == 1) && !item.user_extensions.school.nil? %>
-              <td class="td_w60 ">工作单位：</td>
-              <td class="td_w110 ">
-                <li style="overflow:hidden;white-space:nowrap;text-overflow:ellipsis;" title="<%= item.user_extensions.school.name %>">
-                  <a href="<%= url_for(:controller=>'welcome',:action => 'course', :school_id => item.user_extensions.school.id,:host=>Setting.host_course) %>"><%= item.user_extensions.school.name  %></a>
-                </li>
-              </td>
-            <% elsif item.user_extensions.identity == 3 && !item.user_extensions.occupation.nil? && !item.user_extensions.occupation.empty? %>
-                <td class="td_w60 ">工作单位：</td>
-                <td class="td_w110 ">
-                  <li style="overflow:hidden;white-space:nowrap;text-overflow:ellipsis;" title="<%= item.user_extensions.occupation %>">
-                    <%= item.user_extensions.occupation %>
-                  </li>
-                </td>
-            <% elsif item.user_extensions.identity == 2 %>
-              <td class="td_w60 ">工作单位：</td>
-              <td class="td_w110 ">
-                <li style="overflow:hidden;white-space:nowrap;text-overflow:ellipsis;" title="<%= item.show_name %>">
-                  <%= item.show_name %>
-                </li>
-              </td>
-            <% end %>
-          </tr></tbody></table>
+          <div class="cl"></div>
         </div>
-      </div>
-      <!-- 如果只有自己的关注页面才能关注人 取消关注操作，那么还要加 一句&& User.current.id == target.id-->
-      <% if(User.current.logged? && User.current != item )%>
-        <%if(item.watched_by?(User.current))%>
-          <a href="<%= watch_path(:object_type=>'user',:object_id=>item.id,:target_id=>target.id,:action_name=>action_name,:page=>page) %>" class="grey_n_btn fr mt20" data-method="delete" data-remote="true"  title="取消关注">取消关注</a>
-        <% else %>
-          <a href="<%= watch_path(:object_type=>'user',:object_id=>item.id,:target_id=>target.id,:action_name=>action_name,:page=>page) %>" class="blue_n_btn fr mt20" data-method="post" data-remote="true"  title="添加关注">添加关注</a>
-        <% end %>
-      <% end %>
-      <div class="cl"></div>
-    </div>
-<% end %>
-    <div style="text-align:center;">
-      <div class="pages" style="width:auto; display:inline-block;">
-        <ul  id="homework_pository_ref_pages">
-          <%= pagination_links_full @obj_pages, @obj_count, :per_page_links => false, :remote => true, :flag => true, :is_new => true%>
-        </ul>
-        <div class="cl"></div>
-      </div>
-    </div>
-<% else %>
-    <p id="nodata" class="nodata" style="display:<%= @list.count > 0 ? 'none' : 'block' %>;"><%= l(:label_no_data) %></p>
-<% end %>
+    <% end %>
+<% end %>
\ No newline at end of file
diff --git a/app/views/users/user_fanslist.html.erb b/app/views/users/user_fanslist.html.erb
index 77d85565e..041dabd03 100644
--- a/app/views/users/user_fanslist.html.erb
+++ b/app/views/users/user_fanslist.html.erb
@@ -7,30 +7,39 @@
 
     }
 </script>
-  <div class="courses_box" id="RSide" style="margin-left:0; margin-bottom:0; width:728px;">
-    <div class="courses_top mb10" id="<%= (@action == 'fans' || @action == 'visitor' ) ? 'nh_fans_list' : 'nh_wacth_list' %>">
-      <% if @action == 'fans' %>
+<div class="courses_box" id="RSide" style="margin-left:0; margin-bottom:0; width:728px;">
+  <div class="courses_top mb10" id="<%= (@action == 'fans' || @action == 'visitor' ) ? 'nh_fans_list' : 'nh_wacth_list' %>">
+    <% if @action == 'fans' %>
         <h2 class="courses_h2 fl">粉丝</h2>
         <div class="courses_select fr">共有<span class="c_orange" nh_name="fans_count" id="fans_span"><%=@obj_count%></span>名粉丝</div>
-      <% elsif @action == 'visitor' %>
+    <% elsif @action == 'visitor' %>
         <h2 class="courses_h2 fl">访客</h2>
         <div class="courses_select fr">共有<span class="c_orange"><%=@obj_count%></span>访客</div>
-      <% else %>
+    <% else %>
         <h2 class="courses_h2 fl">关注</h2>
         <div class="courses_select fr">一共关注<span class="c_orange" nh_name="watcher_count" id="watch_span"><%=@obj_count%></span>人</div>
-      <% end %>
+    <% end %>
+    <div class="cl"></div>
+  </div>
+  <div id="users_list">
+    <%# for item in @list %>
+    <%= render :partial => 'users/user_fans_item', :locals => {:list => @list,:target=>@user,:action_name=>@action,:page=>params[:page]} %>
+    <%# end %>
+  </div>
+  <p id="nodata" class="nodata" style="display:<%= @list.count > 0 ? 'none' : 'block' %>;"><%= l(:label_no_data) %></p>
+
+  <div style="text-align:center;">
+    <div class="pages" style="width:auto; display:inline-block;">
+      <ul  id="homework_pository_ref_pages">
+        <%= pagination_links_full @obj_pages, @obj_count, :per_page_links => false, :remote => false, :flag => true, :is_new => true%>
+      </ul>
       <div class="cl"></div>
     </div>
-    <div id="users_list">
-    <%# for item in @list %>
-      <%= render :partial => 'users/user_fans_item', :locals => {:list => @list,:target=>@user,:action_name=>@action,:page=>params[:page]} %>
-    <%# end %>
-    </div>
-
-
-    <!--<ul class="wlist" style=" border:none;">-->
-      <!--<%#= pagination_links_full @obj_pages, @obj_count, :per_page_links => false, :remote => false, :flag => true%>-->
-    <!--</ul>-->
-    <!--<div class="cl"></div>-->
   </div>
+
+  <!--<ul class="wlist" style=" border:none;">-->
+  <!--<%#= pagination_links_full @obj_pages, @obj_count, :per_page_links => false, :remote => false, :flag => true%>-->
+  <!--</ul>-->
+  <!--<div class="cl"></div>-->
+</div>
 <!--</div>-->

From c40288b8c39ca307f3de3056260d96bebbbcabeb Mon Sep 17 00:00:00 2001
From: yuanke <249218296@qq.com>
Date: Mon, 21 Nov 2016 16:26:14 +0800
Subject: [PATCH 07/12] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=AF=86=E7=A0=81?=
 =?UTF-8?q?=EF=BC=8C=E8=BE=93=E5=85=A5=E5=8E=9F=E5=AF=86=E7=A0=81=E6=97=B6?=
 =?UTF-8?q?=E7=9A=84=E4=B8=8B=E6=8B=89=E6=A1=86=E8=A6=81=E5=8E=BB=E6=8E=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/my/account.html.erb | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/app/views/my/account.html.erb b/app/views/my/account.html.erb
index 2a4b3b480..fd7425aab 100644
--- a/app/views/my/account.html.erb
+++ b/app/views/my/account.html.erb
@@ -214,7 +214,8 @@
           <li>确认密码&nbsp;:&nbsp;</li>
         </ul>
         <ul class="setting_right ">
-          <li><input id="password" name="password" class="w210" type="password" required="true" nh_required="1"></li>
+          <input style="display:none;">
+          <li><input id="password" name="password" autocomplete="off" class="w210" type="password" required="true" nh_required="1"></li>
           <li><input id="new_password" name="new_password" class="w210" type="password" required="true" nh_required="1"><span class="c_red ml5">请输入8-12个字符</span></li>
           <li><input id="new_password_confirmation" name="new_password_confirmation" class="w210" type="password" required="true" nh_required="1"></li>
           <li class="ml2">

From f1ad70bb335fbf4e21695a9fe8d48fc62726b1ea Mon Sep 17 00:00:00 2001
From: yuanke <249218296@qq.com>
Date: Tue, 22 Nov 2016 08:52:19 +0800
Subject: [PATCH 08/12] =?UTF-8?q?=E5=85=B3=E6=B3=A8BUG=E4=BF=AE=E6=94=B9?=
 =?UTF-8?q?=EF=BC=8C=E4=BF=AE=E6=94=B9=E5=AF=86=E7=A0=81BUG=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/my/account.html.erb            |   3 +-
 app/views/users/_user_fans_item.html.erb | 114 +++++++++++------------
 app/views/users/user_fanslist.html.erb   |  43 +++++----
 3 files changed, 80 insertions(+), 80 deletions(-)

diff --git a/app/views/my/account.html.erb b/app/views/my/account.html.erb
index 2a4b3b480..fd7425aab 100644
--- a/app/views/my/account.html.erb
+++ b/app/views/my/account.html.erb
@@ -214,7 +214,8 @@
           <li>确认密码&nbsp;:&nbsp;</li>
         </ul>
         <ul class="setting_right ">
-          <li><input id="password" name="password" class="w210" type="password" required="true" nh_required="1"></li>
+          <input style="display:none;">
+          <li><input id="password" name="password" autocomplete="off" class="w210" type="password" required="true" nh_required="1"></li>
           <li><input id="new_password" name="new_password" class="w210" type="password" required="true" nh_required="1"><span class="c_red ml5">请输入8-12个字符</span></li>
           <li><input id="new_password_confirmation" name="new_password_confirmation" class="w210" type="password" required="true" nh_required="1"></li>
           <li class="ml2">
diff --git a/app/views/users/_user_fans_item.html.erb b/app/views/users/_user_fans_item.html.erb
index 8614e0b61..36d1b1b73 100644
--- a/app/views/users/_user_fans_item.html.erb
+++ b/app/views/users/_user_fans_item.html.erb
@@ -1,65 +1,55 @@
 <% unless list.nil?%>
-<% for item in list %>
-    <div class="courses_list line" id="fans_item_<%=item.id%>">
-      <div class="courses_list_pic fl">
-        <a href="<%= user_path(item) %>">
-          <%= image_tag(url_to_avatar(item), :style=>"width:64px;height:64px;",:alt=>"头像") %>
-        </a>
-      </div>
-      <div class="courses_list_info fl ml10">
-        <a href="<%= user_path(item) %>" title="<%= item.show_name %>" class="courses_list_title  f14 fb c_blue02 fl"><%= item.show_name %></a>
-        <div class="cl"></div>
-        <div class="courses_list_table ">
-          <% if item.user_extensions && !item.user_extensions.brief_introduction.nil? && !item.user_extensions.brief_introduction.empty? %>
-          <p class="fans_sign" title="<%= item.user_extensions.brief_introduction %>">个性签名：<%= item.user_extensions.brief_introduction %></p>
+    <% for item in list %>
+        <div class="courses_list line" id="fans_item_<%=item.id%>">
+          <div class="courses_list_pic fl">
+            <a href="<%= user_path(item) %>">
+              <%= image_tag(url_to_avatar(item), :style=>"width:64px;height:64px;",:alt=>"头像") %>
+            </a>
+          </div>
+          <div class="courses_list_info fl ml10">
+            <a href="<%= user_path(item) %>" title="<%= item.show_name %>" class="courses_list_title  f14 fb c_blue02 fl"><%= item.show_name %></a>
+            <div class="cl"></div>
+            <div class="courses_list_table ">
+              <% if item.user_extensions && !item.user_extensions.brief_introduction.nil? && !item.user_extensions.brief_introduction.empty? %>
+                  <p class="fans_sign" title="<%= item.user_extensions.brief_introduction %>">个性签名：<%= item.user_extensions.brief_introduction %></p>
+              <% end %>
+              <table><tbody><tr>
+                <td class="td_w60 ">加入时间：</td>
+                <td class="td_w110 "><%= format_date(item.created_on) %></td>
+                <% if (item.user_extensions.identity == 0 || item.user_extensions.identity == 1) && !item.user_extensions.school.nil? %>
+                    <td class="td_w60 ">工作单位：</td>
+                    <td class="td_w110 ">
+                      <li style="overflow:hidden;white-space:nowrap;text-overflow:ellipsis;" title="<%= item.user_extensions.school.name %>">
+                        <a href="<%= url_for(:controller=>'welcome',:action => 'course', :school_id => item.user_extensions.school.id,:host=>Setting.host_course) %>"><%= item.user_extensions.school.name  %></a>
+                      </li>
+                    </td>
+                <% elsif item.user_extensions.identity == 3 && !item.user_extensions.occupation.nil? && !item.user_extensions.occupation.empty? %>
+                    <td class="td_w60 ">工作单位：</td>
+                    <td class="td_w110 ">
+                      <li style="overflow:hidden;white-space:nowrap;text-overflow:ellipsis;" title="<%= item.user_extensions.occupation %>">
+                        <%= item.user_extensions.occupation %>
+                      </li>
+                    </td>
+                <% elsif item.user_extensions.identity == 2 %>
+                    <td class="td_w60 ">工作单位：</td>
+                    <td class="td_w110 ">
+                      <li style="overflow:hidden;white-space:nowrap;text-overflow:ellipsis;" title="<%= item.show_name %>">
+                        <%= item.show_name %>
+                      </li>
+                    </td>
+                <% end %>
+              </tr></tbody></table>
+            </div>
+          </div>
+          <!-- 如果只有自己的关注页面才能关注人 取消关注操作，那么还要加 一句&& User.current.id == target.id-->
+          <% if(User.current.logged? && User.current != item )%>
+              <%if(item.watched_by?(User.current))%>
+                  <a href="<%= watch_path(:object_type=>'user',:object_id=>item.id,:target_id=>target.id,:action_name=>action_name,:page=>page) %>" class="grey_n_btn fr mt20" data-method="delete" data-remote="true"  title="取消关注">取消关注</a>
+              <% else %>
+                  <a href="<%= watch_path(:object_type=>'user',:object_id=>item.id,:target_id=>target.id,:action_name=>action_name,:page=>page) %>" class="blue_n_btn fr mt20" data-method="post" data-remote="true"  title="添加关注">添加关注</a>
+              <% end %>
           <% end %>
-          <table><tbody><tr>
-            <td class="td_w60 ">加入时间：</td>
-            <td class="td_w110 "><%= format_date(item.created_on) %></td>
-            <% if (item.user_extensions.identity == 0 || item.user_extensions.identity == 1) && !item.user_extensions.school.nil? %>
-              <td class="td_w60 ">工作单位：</td>
-              <td class="td_w110 ">
-                <li style="overflow:hidden;white-space:nowrap;text-overflow:ellipsis;" title="<%= item.user_extensions.school.name %>">
-                  <a href="<%= url_for(:controller=>'welcome',:action => 'course', :school_id => item.user_extensions.school.id,:host=>Setting.host_course) %>"><%= item.user_extensions.school.name  %></a>
-                </li>
-              </td>
-            <% elsif item.user_extensions.identity == 3 && !item.user_extensions.occupation.nil? && !item.user_extensions.occupation.empty? %>
-                <td class="td_w60 ">工作单位：</td>
-                <td class="td_w110 ">
-                  <li style="overflow:hidden;white-space:nowrap;text-overflow:ellipsis;" title="<%= item.user_extensions.occupation %>">
-                    <%= item.user_extensions.occupation %>
-                  </li>
-                </td>
-            <% elsif item.user_extensions.identity == 2 %>
-              <td class="td_w60 ">工作单位：</td>
-              <td class="td_w110 ">
-                <li style="overflow:hidden;white-space:nowrap;text-overflow:ellipsis;" title="<%= item.show_name %>">
-                  <%= item.show_name %>
-                </li>
-              </td>
-            <% end %>
-          </tr></tbody></table>
+          <div class="cl"></div>
         </div>
-      </div>
-      <!-- 如果只有自己的关注页面才能关注人 取消关注操作，那么还要加 一句&& User.current.id == target.id-->
-      <% if(User.current.logged? && User.current != item )%>
-        <%if(item.watched_by?(User.current))%>
-          <a href="<%= watch_path(:object_type=>'user',:object_id=>item.id,:target_id=>target.id,:action_name=>action_name,:page=>page) %>" class="grey_n_btn fr mt20" data-method="delete" data-remote="true"  title="取消关注">取消关注</a>
-        <% else %>
-          <a href="<%= watch_path(:object_type=>'user',:object_id=>item.id,:target_id=>target.id,:action_name=>action_name,:page=>page) %>" class="blue_n_btn fr mt20" data-method="post" data-remote="true"  title="添加关注">添加关注</a>
-        <% end %>
-      <% end %>
-      <div class="cl"></div>
-    </div>
-<% end %>
-    <div style="text-align:center;">
-      <div class="pages" style="width:auto; display:inline-block;">
-        <ul  id="homework_pository_ref_pages">
-          <%= pagination_links_full @obj_pages, @obj_count, :per_page_links => false, :remote => true, :flag => true, :is_new => true%>
-        </ul>
-        <div class="cl"></div>
-      </div>
-    </div>
-<% else %>
-    <p id="nodata" class="nodata" style="display:<%= @list.count > 0 ? 'none' : 'block' %>;"><%= l(:label_no_data) %></p>
-<% end %>
+    <% end %>
+<% end %>
\ No newline at end of file
diff --git a/app/views/users/user_fanslist.html.erb b/app/views/users/user_fanslist.html.erb
index 77d85565e..041dabd03 100644
--- a/app/views/users/user_fanslist.html.erb
+++ b/app/views/users/user_fanslist.html.erb
@@ -7,30 +7,39 @@
 
     }
 </script>
-  <div class="courses_box" id="RSide" style="margin-left:0; margin-bottom:0; width:728px;">
-    <div class="courses_top mb10" id="<%= (@action == 'fans' || @action == 'visitor' ) ? 'nh_fans_list' : 'nh_wacth_list' %>">
-      <% if @action == 'fans' %>
+<div class="courses_box" id="RSide" style="margin-left:0; margin-bottom:0; width:728px;">
+  <div class="courses_top mb10" id="<%= (@action == 'fans' || @action == 'visitor' ) ? 'nh_fans_list' : 'nh_wacth_list' %>">
+    <% if @action == 'fans' %>
         <h2 class="courses_h2 fl">粉丝</h2>
         <div class="courses_select fr">共有<span class="c_orange" nh_name="fans_count" id="fans_span"><%=@obj_count%></span>名粉丝</div>
-      <% elsif @action == 'visitor' %>
+    <% elsif @action == 'visitor' %>
         <h2 class="courses_h2 fl">访客</h2>
         <div class="courses_select fr">共有<span class="c_orange"><%=@obj_count%></span>访客</div>
-      <% else %>
+    <% else %>
         <h2 class="courses_h2 fl">关注</h2>
         <div class="courses_select fr">一共关注<span class="c_orange" nh_name="watcher_count" id="watch_span"><%=@obj_count%></span>人</div>
-      <% end %>
+    <% end %>
+    <div class="cl"></div>
+  </div>
+  <div id="users_list">
+    <%# for item in @list %>
+    <%= render :partial => 'users/user_fans_item', :locals => {:list => @list,:target=>@user,:action_name=>@action,:page=>params[:page]} %>
+    <%# end %>
+  </div>
+  <p id="nodata" class="nodata" style="display:<%= @list.count > 0 ? 'none' : 'block' %>;"><%= l(:label_no_data) %></p>
+
+  <div style="text-align:center;">
+    <div class="pages" style="width:auto; display:inline-block;">
+      <ul  id="homework_pository_ref_pages">
+        <%= pagination_links_full @obj_pages, @obj_count, :per_page_links => false, :remote => false, :flag => true, :is_new => true%>
+      </ul>
       <div class="cl"></div>
     </div>
-    <div id="users_list">
-    <%# for item in @list %>
-      <%= render :partial => 'users/user_fans_item', :locals => {:list => @list,:target=>@user,:action_name=>@action,:page=>params[:page]} %>
-    <%# end %>
-    </div>
-
-
-    <!--<ul class="wlist" style=" border:none;">-->
-      <!--<%#= pagination_links_full @obj_pages, @obj_count, :per_page_links => false, :remote => false, :flag => true%>-->
-    <!--</ul>-->
-    <!--<div class="cl"></div>-->
   </div>
+
+  <!--<ul class="wlist" style=" border:none;">-->
+  <!--<%#= pagination_links_full @obj_pages, @obj_count, :per_page_links => false, :remote => false, :flag => true%>-->
+  <!--</ul>-->
+  <!--<div class="cl"></div>-->
+</div>
 <!--</div>-->

From 8d980b16dba84b107f6007f2714e7af814a967fb Mon Sep 17 00:00:00 2001
From: yuanke <249218296@qq.com>
Date: Tue, 22 Nov 2016 10:10:53 +0800
Subject: [PATCH 09/12] =?UTF-8?q?=E6=8D=A2=E8=A1=8C=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/projects/show.html.erb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/views/projects/show.html.erb b/app/views/projects/show.html.erb
index f9a88baf8..3467214c9 100644
--- a/app/views/projects/show.html.erb
+++ b/app/views/projects/show.html.erb
@@ -1,5 +1,5 @@
 <!--新版项目头部结束-->
-<div class="pro_new_info mb10 break_word" style="padding-bottom: 5px" >
+<div class="pro_new_info mb10" style="padding-bottom: 5px;word-break: normal;word-wrap: break-word" >
  <div id="project_invite_code"><%= render :partial => 'projects/invite_code' %></div>
   <div id="project_description_code" >
   <% if @project.description.blank? %>

From c571d195483065c15af0aaf02d3571d12c1357b4 Mon Sep 17 00:00:00 2001
From: yuanke <249218296@qq.com>
Date: Tue, 22 Nov 2016 10:16:09 +0800
Subject: [PATCH 10/12] =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E7=AE=80=E4=BB=8B?=
 =?UTF-8?q?=E5=8D=95=E8=AF=8D=E4=B8=8D=E6=8D=A2=E8=A1=8C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/projects/show.html.erb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/views/projects/show.html.erb b/app/views/projects/show.html.erb
index 09ed2216a..5a38e3b38 100644
--- a/app/views/projects/show.html.erb
+++ b/app/views/projects/show.html.erb
@@ -1,5 +1,5 @@
 <!--新版项目头部结束-->
-<div class="ke-block pro_new_info mb10 break_word" style="padding-bottom: 5px" >
+<div class="ke-block pro_new_info mb10 " style="padding-bottom: 5px;word-break: normal;word-wrap: break-word" >
  <div id="project_invite_code"><%= render :partial => 'projects/invite_code' %></div>
   <div id="project_description_code" style="padding: 0 15px 10px 15px;">
   <% if @project.description.blank? %>

From 9720f84fce12e57da1373718c1c6f0792e2b8313 Mon Sep 17 00:00:00 2001
From: yuanke <249218296@qq.com>
Date: Wed, 23 Nov 2016 13:29:02 +0800
Subject: [PATCH 11/12] =?UTF-8?q?js=E7=9A=84=E8=87=AA=E5=8A=A8=E8=BD=AC?=
 =?UTF-8?q?=E6=8D=A2URL=E5=87=BD=E6=95=B0autoUrl=E5=8A=A0=E4=B8=8A?=
 =?UTF-8?q?=E4=B8=AA=E5=BC=82=E5=B8=B8=E5=A4=84=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 public/javascripts/application.js | 17 +++++++++++++++--
 1 file changed, 15 insertions(+), 2 deletions(-)

diff --git a/public/javascripts/application.js b/public/javascripts/application.js
index 3f5a739f9..ac8dfcc44 100644
--- a/public/javascripts/application.js
+++ b/public/javascripts/application.js
@@ -1706,7 +1706,14 @@ function autoUrl(id){
                     }
                     return reStr ;
                 });
-                $(this).html(html);
+                try{
+                    $(this).html(html);
+                }
+                catch (e)
+                {
+                    console.log(e.name + ": " + e.message);
+                }
+
             }
         });
     }
@@ -1725,7 +1732,13 @@ function autoUrl(id){
             }
             return reStr ;
         });
-        $("#"+id).html(html);
+        try{
+            $("#"+id).html(html);
+        }
+        catch (e)
+        {
+            console.log(e.name + ": " + e.message);
+        }
     }
     if(!(!!window.ActiveXObject || "ActiveXObject" in window)){
         autoMedia(id);

From 2dc6171b480d55edef70cf73a11e51312c242476 Mon Sep 17 00:00:00 2001
From: yuanke <249218296@qq.com>
Date: Wed, 23 Nov 2016 16:40:31 +0800
Subject: [PATCH 12/12] =?UTF-8?q?=E5=BE=AE=E4=BF=A1=E5=8F=8D=E9=A6=88?=
 =?UTF-8?q?=E6=97=B6=E7=9A=84=E6=8F=90=E7=A4=BA=E8=AF=AD=E5=8A=A0=E5=85=A5?=
 =?UTF-8?q?www.trustie.net?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/app/controllers/wechats_controller.rb b/app/controllers/wechats_controller.rb
index a082d72ff..654f83855 100644
--- a/app/controllers/wechats_controller.rb
+++ b/app/controllers/wechats_controller.rb
@@ -137,7 +137,7 @@ class WechatsController < ActionController::Base
   on :fallback, respond: 'fallback message'
 
   on :click, with: 'FEEDBACK' do |request, key|
-    request.reply.text "如有问题反馈，请您：\n1、直接切换至输入框，发微信给我们。\n2、加入QQ群：373967360，直接互动。\n\n如您有合作事宜洽谈，请联系：\n王林春 老师\n手机：13467631747\nQQ：494496321"
+    request.reply.text "如有问题反馈，请您：\n1、直接切换至输入框，发微信给我们。\n2、加入QQ群：373967360，直接互动。\n3、登录网站：www.trustie.net，给我们留言。\n\n如您有合作事宜洽谈，请联系：\n王林春 老师\n手机：13467631747\nQQ：494496321"
   end
 
   on :click, with: 'MY_NEWS' do |request, key|