Merge branch 'yuanke_youhua' into 'develop'

上线问题合并

微信加网站地址，项目简介单词不换行，博客排序，个人主页关注BUG,autoUrl自动识别网址BUG修改，修改密码BUG修改等

See merge request !10

.gitignore

@@ -39,3 +39,4 @@ public/javascripts/wechat/node_modules/
 .access_token
 tmux*.log
 config/wechat.yml
+config/oneapm.yml

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

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])

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|

app/views/layouts/new_base_user.html.erb

@@ -148,7 +148,7 @@
             <li>
               <a href="<%=user_fanslist_user_path(@user) %>">
                 <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>

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">

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? %>

app/views/watchers/_set_watcher.js.erb

@@ -1,7 +1,9 @@
 <% if( params[:object_type] == 'user') %>
   //点击头像下面的添加关注按钮
   <% if( params[:target_id] == params[:object_id] ) %>
+    <% 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 %>");

public/javascripts/application.js

@@ -1706,8 +1706,15 @@ function autoUrl(id){
                     }
                     return reStr ;
                 });
+                try{
                     $(this).html(html);
                 }
+                catch (e)
+                {
+                    console.log(e.name + ": " + e.message);
+                }
+
+            }
         });
     }
     else{
@@ -1725,8 +1732,14 @@ function autoUrl(id){
             }
             return reStr ;
         });
+        try{
             $("#"+id).html(html);
         }
+        catch (e)
+        {
+            console.log(e.name + ": " + e.message);
+        }
+    }
     if(!(!!window.ActiveXObject || "ActiveXObject" in window)){
         autoMedia(id);
     }