diff --git a/Gemfile b/Gemfile
index 1c1edfd35..80c0e1c2a 100644
--- a/Gemfile
+++ b/Gemfile
@@ -50,10 +50,10 @@ gem 'elasticsearch-model'
 gem 'elasticsearch-rails'
 
 #rails 3.2.22.2 bug
-gem "test-unit", "~>3.0"
+  gem "test-unit", "~>3.0"
 
 ### profile
-gem 'oneapm_rpm'
+  gem 'oneapm_rpm'
 
 group :development do
   gem 'grape-swagger'
diff --git a/app/api/mobile/apis/activities.rb b/app/api/mobile/apis/activities.rb
index b4fb90ea7..4d07c23f8 100644
--- a/app/api/mobile/apis/activities.rb
+++ b/app/api/mobile/apis/activities.rb
@@ -13,50 +13,55 @@ module Mobile
           requires :container_type, type: String
         end
         post do
-          authenticate!
+          begin
+            authenticate!
 
-          user = current_user
+            user = current_user
 
-          container_type = params[:container_type] ? params[:container_type] : "All"
+            container_type = params[:container_type] ? params[:container_type] : "All"
 
-          if container_type == "All" || container_type == "Project"
-            shield_project_ids = ShieldActivity.select("shield_id").where("container_type='User' and container_id=#{user.id} and shield_type='Project'").map(&:shield_id)
-            user_project_ids = (user.projects.where("status = 1").map{|project| project.id}-shield_project_ids).empty? ? "(-1)" : "(" + (user.projects.where("status = 1").map{|project| project.id}-shield_project_ids).join(",") + ")"
-            project_types = "('Message','Issue','Project')"
-          end
+            if container_type == "All" || container_type == "Project"
+              shield_project_ids = ShieldActivity.select("shield_id").where("container_type='User' and container_id=#{user.id} and shield_type='Project'").map(&:shield_id)
+              user_project_ids = (user.projects.where("status = 1").map{|project| project.id}-shield_project_ids).empty? ? "(-1)" : "(" + (user.projects.where("status = 1").map{|project| project.id}-shield_project_ids).join(",") + ")"
+              project_types = "('Message','Issue','Project')"
+            end
 
-          if container_type == "All" || container_type == "Course"
-            shield_course_ids = ShieldActivity.select("shield_id").where("container_type='User' and container_id=#{user.id} and shield_type='Course'").map(&:shield_id)
-            user_course_ids = (user.courses.where("is_delete = 0").map{|course| course.id}-shield_course_ids).empty? ? "(-1)" : "(" + (user.courses.where("is_delete = 0").map{|course| course.id}-shield_course_ids).join(",") + ")"
-            course_types = "('Message','News','HomeworkCommon','Poll','Course')"
-          end
+            if container_type == "All" || container_type == "Course"
+              shield_course_ids = ShieldActivity.select("shield_id").where("container_type='User' and container_id=#{user.id} and shield_type='Course'").map(&:shield_id)
+              user_course_ids = (user.courses.where("is_delete = 0").map{|course| course.id}-shield_course_ids).empty? ? "(-1)" : "(" + (user.courses.where("is_delete = 0").map{|course| course.id}-shield_course_ids).join(",") + ")"
+              course_types = "('Message','News','HomeworkCommon','Poll','Course')"
+            end
 
-          page = params[:page] ? params[:page] : 0
-          principal_types = "JournalsForMessage"
-          watched_user_ids = User.watched_by(user.id).count == 0 ? " " : ("," + User.watched_by(user.id).map{|u| u.id.to_s }.join(','))
-          user_ids = "(" + user.id.to_s + watched_user_ids + ")"
-          watched_user_blog_ids = Blog.select("id").where("author_id in #{user_ids}").count == 0 ? " " :Blog.select("id").where("author_id in #{user_ids}").map { |blog| blog.id}.join(",")
-          blog_ids = "(" + watched_user_blog_ids + ")"
+            page = params[:page] ? params[:page] : 0
+            principal_types = "JournalsForMessage"
+            watched_user_ids = User.watched_by(user.id).count == 0 ? " " : ("," + User.watched_by(user.id).map{|u| u.id.to_s }.join(','))
+            user_ids = "(" + user.id.to_s + watched_user_ids + ")"
+            watched_user_blog_ids = Blog.select("id").where("author_id in #{user_ids}").count == 0 ? " " :Blog.select("id").where("author_id in #{user_ids}").map { |blog| blog.id}.join(",")
+            blog_ids = "(" + watched_user_blog_ids + ")"
 
-          if container_type == "Course"
-            activities = UserActivity.where("(container_type = 'Course' and container_id in #{user_course_ids} and act_type in #{course_types})").order('updated_at desc')
-          elsif container_type == "Project"
-            activities = UserActivity.where("(container_type = 'Project' and container_id in #{user_project_ids} and act_type in #{project_types})").order('updated_at desc')
-          else
-            activities = UserActivity.where("(container_type = 'Project' and container_id in #{user_project_ids} and act_type in #{project_types})" +
-                                                      "or (container_type = 'Course' and container_id in #{user_course_ids} and act_type in #{course_types}) "+
-                                                      "or (container_type = 'Principal' and act_type= '#{principal_types}' and container_id = #{user.id}) " +
-                                                      "or (container_type = 'Blog' and act_type= 'BlogComment' and container_id in #{blog_ids})").order('updated_at desc')
+            if container_type == "Course"
+              activities = UserActivity.where("(container_type = 'Course' and container_id in #{user_course_ids} and act_type in #{course_types})").order('updated_at desc')
+            elsif container_type == "Project"
+              activities = UserActivity.where("(container_type = 'Project' and container_id in #{user_project_ids} and act_type in #{project_types})").order('updated_at desc')
+            else
+              activities = UserActivity.where("(container_type = 'Project' and container_id in #{user_project_ids} and act_type in #{project_types})" +
+                                                        "or (container_type = 'Course' and container_id in #{user_course_ids} and act_type in #{course_types}) "+
+                                                        "or (container_type = 'Principal' and act_type= '#{principal_types}' and container_id = #{user.id}) " +
+                                                        "or (container_type = 'Blog' and act_type= 'BlogComment' and container_id in #{blog_ids})").order('updated_at desc')
+            end
+            all_count = activities.count
+            activities = activities.limit(10).offset(page * 10)
+            count = activities.count
+            present :data, activities, with: Mobile::Entities::Activity,user: user
+            present :all_count, all_count
+            present :count, count
+            present :page, page
+            present :status, 0
+            present :container_type, container_type
+          rescue Exception=>e
+            present :status, -1
+            present :message, e.message
           end
-          all_count = activities.count
-          activities = activities.limit(10).offset(page * 10)
-          count = activities.count
-          present :data, activities, with: Mobile::Entities::Activity,user: user
-          present :all_count, all_count
-          present :count, count
-          present :page, page
-          present :status, 0
-          present :container_type, container_type
         end
       end
     end
diff --git a/app/api/mobile/apis/blog_comments.rb b/app/api/mobile/apis/blog_comments.rb
index 39b6a486a..ddfd65524 100644
--- a/app/api/mobile/apis/blog_comments.rb
+++ b/app/api/mobile/apis/blog_comments.rb
@@ -7,17 +7,22 @@ module Mobile
 
         desc "get special topic"
         post ':id' do
-          user = current_user
+          begin
+            user = current_user
 
-          #0一级回复的更多  1 二级回复的更多
-          type =  params[:type] || 0
-          page =  params[:page] || 0
+            #0一级回复的更多  1 二级回复的更多
+            type =  params[:type] || 0
+            page =  params[:page] || 0
 
-          blog = BlogComment.find params[:id]
-          present :data, blog, with: Mobile::Entities::BlogComment,user: user,type: type,page: page
-          present :type, type
-          present :page, page
-          present :status, 0
+            blog = BlogComment.find params[:id]
+            present :data, blog, with: Mobile::Entities::BlogComment,user: user,type: type,page: page
+            present :type, type
+            present :page, page
+            present :status, 0
+          rescue Exception=>e
+            present :status, -1
+            present :message, e.message
+          end
         end
       end
     end
diff --git a/app/api/mobile/apis/courses.rb b/app/api/mobile/apis/courses.rb
index eec6e8ead..369185ca2 100644
--- a/app/api/mobile/apis/courses.rb
+++ b/app/api/mobile/apis/courses.rb
@@ -100,15 +100,34 @@ module Mobile
         params do
           requires :token, type: String
           requires :invite_code, type: String, desc: '邀请码'
+          requires :teacher_flag, type: Boolean
+          requires :assistant_flag, type: Boolean
+          requires :student_flag, type: Boolean
         end
-        post "join" do
+        post "join_class" do
           authenticate!
-          cs = CoursesService.new
-          status = cs.join_course({role: "10", openid: params[:openid], invite_code: params[:invite_code]}, current_user)
-          {
-              status: status[:state],
-              message:CoursesService::JoinCourseError.message(status[:state])
-          }
+
+          roles_ids = []
+          if params[:teacher_flag]
+            roles_ids << "9"
+          elsif params[:assistant_flag]
+            roles_ids << "7"
+          end
+
+          if params[:student_flag]
+            roles_ids << "10"
+          end
+
+          if roles_ids.length <= 0
+            {status:-1,message:"请至少选择一个角色"}
+          else
+            cs = CoursesService.new
+            status = cs.join_course_roles({role: roles_ids, openid: params[:openid], invite_code: params[:invite_code]}, current_user)
+            {
+                status: status[:state],
+                message:CoursesService::JoinCourseError.message(status[:state])
+            }
+          end
         end
 
 
@@ -148,8 +167,20 @@ module Mobile
           requires :course_id, type: Integer, desc: "课程id"
         end
         get 'teachers' do
+
+          course = Course.find(params[:course_id])
+
           cs = CoursesService.new
           teachers = cs.course_teacher_or_student_list({role: '1'}, params[:course_id],current_user)
+
+          teachers.each do |m|
+            if m[:id] == course.tea_id
+              teachers.delete(m)
+              teachers.insert(0,m)
+              break
+            end
+          end
+
           present :data, teachers, with: Mobile::Entities::User
           present :status, 0
         end
@@ -166,7 +197,53 @@ module Mobile
           present :status, 0
         end
 
-        desc "设置教辅"
+        desc "课程未审核列表"
+        params do
+          requires :token, type: String
+          requires :course_id, type: Integer, desc: "课程id"
+        end
+        get 'reviewers' do
+          authenticate!
+          cs = CoursesService.new
+          reviewers = cs.reviewers_list(params[:course_id])
+          present :data, reviewers, with: Mobile::Entities::User
+          present :status, 0
+        end
+
+        desc "课程单个未审核用户信息"
+        params do
+          requires :token, type: String
+          requires :course_id, type: Integer, desc: "课程id"
+          requires :user_id, type: Integer, desc: "用户id"
+        end
+        post 'review_member_info' do
+          authenticate!
+
+          cs = CoursesService.new
+          result = cs.get_reviewer_info(params)
+
+          present :data, result[:reviewer], with: Mobile::Entities::User
+          present :status,result[:status]
+        end
+
+        desc "处理教师或助教的身份申请"
+        params do
+          requires :token, type: String
+          requires :course_id, type: Integer, desc: "课程id"
+          requires :user_id, type: Integer, desc: "用户id"
+          requires :type, type: Integer, desc: "同意或拒绝"
+        end
+        post 'deal_join_apply' do
+          authenticate!
+
+          cs = CoursesService.new
+          result = cs.deal_join_apply(params,current_user)
+
+          present :status, result[:status]
+          present :message, result[:message]
+        end
+
+        desc "设置助教"
         params do
         requires :token,type:String
         requires :user_id,type:Integer,desc: '用户id'
@@ -178,7 +255,7 @@ module Mobile
           present :status, 0
         end
 
-        desc "删除教辅"
+        desc "删除助教"
         params do
           requires :token,type:String
           requires :user_id,type:Integer,desc: '用户id'
@@ -448,20 +525,35 @@ module Mobile
           requires :id, type: Integer
           requires :token, type: String
           requires :user_id, type: Integer
-          requires :role_id, type: Integer
+          requires :teacher_flag, type: Boolean
+          requires :assistant_flag, type: Boolean
+          requires :student_flag, type: Boolean
         end
         post 'edit_member_role' do
           authenticate!
 
+          roles_id = []
+
+          if params[:teacher_flag]
+            roles_id << 9
+          elsif params[:assistant_flag]
+            roles_id << 7
+          end
+
+          if params[:student_flag]
+            roles_id << 10
+          end
+
+
           c = Course.find("#{params[:id]}")
 
           #7教辅 9教师 10学生
-          if c.tea_id == params[:user_id] || c.tea_id != current_user.id  || !(params[:role_id] == 7 || params[:role_id] == 9 || params[:role_id] == 10)
+          if c.tea_id == params[:user_id] || c.tea_id != current_user.id  || roles_id.length <= 0
             present :status, -1
           else
 
             cs = CoursesService.new
-            status = cs.modify_user_course_role params
+            status = cs.modify_user_course_role params,roles_id
             present :status, status
           end
         end
diff --git a/app/api/mobile/apis/issues.rb b/app/api/mobile/apis/issues.rb
index 36b558652..dfd5a3335 100644
--- a/app/api/mobile/apis/issues.rb
+++ b/app/api/mobile/apis/issues.rb
@@ -8,17 +8,25 @@ module Mobile
 
         desc "get special issuse"
         post ':id' do
-          authenticate!
-          user = current_user
+          begin
+            # authenticate!
+            user = current_user
 
-          #0一级回复的更多  1 二级回复的更多
-          type =  params[:type] || 0
-          page =  params[:page] || 0
-          issue = Issue.find params[:id]
-          present :data, issue, with: Mobile::Entities::Issue,user: user,type: type,page: page
-          present :type, type
-          present :page, page
-          present :status, 0
+            #is_public  true 公开 false 私有  1公开 0私有
+
+            #0一级回复的更多  1 二级回复的更多
+            type =  params[:type] || 0
+            page =  params[:page] || 0
+            issue = Issue.find params[:id]
+            present :data, issue, with: Mobile::Entities::Issue,user: user,type: type,page: page
+            present :type, type
+            present :page, page
+            present :is_public, issue.project.is_public
+            present :status, 0
+          rescue Exception=>e
+            present :status, -1
+            present :message, e.message
+          end
         end
       end
     end
diff --git a/app/api/mobile/apis/journal_for_messages.rb b/app/api/mobile/apis/journal_for_messages.rb
index 6ac484513..0ef875780 100644
--- a/app/api/mobile/apis/journal_for_messages.rb
+++ b/app/api/mobile/apis/journal_for_messages.rb
@@ -7,18 +7,33 @@ module Mobile
 
         desc "get special journal"
         post ':id' do
-          authenticate!
-          user = current_user
+          begin
+            # authenticate!
+            user = current_user
 
-          #0一级回复的更多  1 二级回复的更多
-          type =  params[:type] || 0
-          page =  params[:page] || 0
+            #0一级回复的更多  1 二级回复的更多
+            type =  params[:type] || 0
+            page =  params[:page] || 0
 
-          jour = JournalsForMessage.find params[:id]
-          present :data, jour, with: Mobile::Entities::Jours,user: user,type: type,page: page
-          present :type, type
-          present :page, page
-          present :status, 0
+            jour = JournalsForMessage.find params[:id]
+
+            is_public = 1
+
+            if jour.jour_type == "Project"
+              is_public = jour.project.is_public
+            elsif jour.jour_type == "Course"
+              is_public = jour.course.is_public
+            end
+
+            present :data, jour, with: Mobile::Entities::Jours,user: user,type: type,page: page
+            present :type, type
+            present :page, page
+            present :is_public, is_public
+            present :status, 0
+          rescue Exception=>e
+              present :status, -1
+              present :message, e.message
+          end
         end
       end
     end
diff --git a/app/api/mobile/apis/messages.rb b/app/api/mobile/apis/messages.rb
index ceda5058f..963d2f4ab 100644
--- a/app/api/mobile/apis/messages.rb
+++ b/app/api/mobile/apis/messages.rb
@@ -7,17 +7,36 @@ module Mobile
 
         desc "get special topic"
         post ':id' do
-          authenticate!
-          user = current_user
+          begin
+            # authenticate!
+            user = current_user
 
-          #0一级回复的更多  1 二级回复的更多
-          type =  params[:type] || 0
-          page =  params[:page] || 0
-          message = Message.find params[:id]
-          present :data, message, with: Mobile::Entities::Message,user: user,type: type,page: page
-          present :type, type
-          present :page, page
-          present :status, 0
+            #0一级回复的更多  1 二级回复的更多
+            type =  params[:type] || 0
+            page =  params[:page] || 0
+            message = Message.find params[:id]
+
+            is_public = 1
+            type_name = ""
+
+            if message.project
+              is_public = message.project.is_public
+              type_name = "project"
+            elsif message.course
+              is_public = message.course.is_public
+              type_name = "course"
+            end
+
+            present :data, message, with: Mobile::Entities::Message,user: user,type: type,page: page
+            present :type, type
+            present :page, page
+            present :is_public, is_public
+            present :type_name, type_name
+            present :status, 0
+          rescue Exception=>e
+            present :status, -1
+            present :message, e.message
+          end
         end
       end
     end
diff --git a/app/api/mobile/apis/new_comment.rb b/app/api/mobile/apis/new_comment.rb
index 5b7159301..6d46b2f59 100644
--- a/app/api/mobile/apis/new_comment.rb
+++ b/app/api/mobile/apis/new_comment.rb
@@ -11,69 +11,208 @@ module Mobile
         params do
           requires :type, type: String
           requires :content, type: String
-          requires :token, type: String
         end
         post ':id' do
+          unless current_user
+            #如果当前用户不存在 则需要根据微信昵称注册一个帐号
+            openid = session[:wechat_openid]
+            raise "无法获取到openid,请在微信中打开本页面" unless openid
+            us = UsersService.new
+
+            access_token = session[:access_token]
+            refresh_token = session[:refresh_token]
+						
+						if access_token.present? && refresh_token.present?
+              begin
+                refreshinfo = Wechat.api.web_refresh_access_token(refresh_token)
+              rescue
+                info = Wechat.api.web_access_token(session[:wechat_code])
+                openid =info["openid"]
+                access_token =info["access_token"]
+                if access_token
+                  session[:access_token] = access_token
+                end
+                refresh_token = info["refresh_token"]
+                if refresh_token
+                  session[:refresh_token] = refresh_token
+                end
+                refreshinfo = Wechat.api.web_refresh_access_token(refresh_token)
+              end
+
+							access_token = refreshinfo["access_token"]
+							refresh_token = refreshinfo["refresh_token"]
+							session[:access_token] = access_token
+							session[:refresh_token] = refresh_token
+
+							#获取用户信息
+							userinfo = Wechat.api.web_userinfo(access_token,openid)
+							Rails.logger.info "userinfo!!!!!!!!!"
+							Rails.logger.info userinfo
+							name = userinfo["nickname"]
+						else
+							name = openid[0..3]+"***"+openid.last
+						end
+
+            user = us.register ({:login=>openid, :mail=>"#{openid}@163.com",
+                                 :password=>"12345678", :password_confirmation=>"12345678",
+                                 :should_confirmation_password => true})
+            raise user.errors.full_messages.first if user.new_record?
+            user.update_attributes(:lastname=>name)
+            #自动激活
+            if Setting.self_registration != '3'
+              user.activate
+              user.last_login_on = Time.now
+              if user.save
+                UserStatus.create(:user_id => user.id, :changsets_count => 0, :watchers_count => 0)
+              end
+            end
+            UserWechat.create!(
+                openid: openid,
+                user: user,
+                bindtype: 1
+            )
+          end
+
           authenticate!
+
+          subscribe = 0 #默认未关注
+
+          #-------------------获取用户是否关注此公众号-----------------------------
+          openid = session[:wechat_openid]
+          raise "无法获取到openid,请在微信中打开本页面" unless openid
+          user_info = Wechat.api.user(openid)
+          Rails.logger.info "user_info!!!!!!!!!"
+          Rails.logger.info user_info
+          subscribe = user_info["subscribe"]
+
+          status = 0
+          tip = 0 #0班级1项目
           type = params[:type]
           result = 1
           if params[:content]!="" && current_user
             case type
               when "HomeworkCommon"
                 homework_common = HomeworkCommon.find(params[:id])
+
+                #如果是私有的 并且不是成员则不能回复
+                # is_public = homework_common.course.is_public
+                # if is_public == 0 && !current_user.member_of_course?(homework_common.course)
+                #   status = -1
+                #   tip = 0
+                # else
+                #   feedback = HomeworkCommon.add_homework_jour(current_user, params[:content], params[:id])
+                #   if (feedback.errors.empty?)
+                #     homework_common.update_column(:updated_at, Time.now)
+                #     result = 2
+                #   end
+                # end
                 feedback = HomeworkCommon.add_homework_jour(current_user, params[:content], params[:id])
                 if (feedback.errors.empty?)
                   homework_common.update_column(:updated_at, Time.now)
                   result = 2
                 end
+
               when "News"
                 news = News.find(params[:id])
-                comment = Comment.new
-                comment.comments = params[:content]
-                comment.author = current_user
-                if news.comments << comment
-                  result = 2
+
+                # if news.project
+                #   if news.project.is_public == false && !current_user.member_of?(news.project)
+                #     status = -1
+                #     tip = 1
+                #   end
+                # elsif news.course
+                #   if news.course.is_public == 0 && !current_user.member_of_course?(news.course)
+                #     status = -1
+                #     tip = 0
+                #   end
+                # end
+
+                if status == 0
+                  comment = Comment.new
+                  comment.comments = params[:content]
+                  comment.author = current_user
+                  if news.comments << comment
+                    result = 2
+                  end
                 end
               when "Message"
                 message = Message.find(params[:id])
                 board = Board.find(message.board_id)
-                topic = message.root
-                reply = Message.new
-                reply.author = current_user
-                reply.board = board
-                reply.content = params[:content]
-                reply.parent_id = params[:id]
-                reply.subject = "RE: #{topic.subject}"
-                if topic.children << reply
-                  result = 2
+
+                # if message.project
+                #   if message.project.is_public == false && !current_user.member_of?(message.project)
+                #     status = -1
+                #     tip = 1
+                #   end
+                # elsif message.course
+                #   if message.course.is_public == 0 && !current_user.member_of_course?(message.course)
+                #     status = -1
+                #     tip = 0
+                #   end
+                # end
+
+                if status == 0
+                  topic = message.root
+                  reply = Message.new
+                  reply.author = current_user
+                  reply.board = board
+                  reply.content = params[:content]
+                  reply.parent_id = params[:id]
+                  reply.subject = "RE: #{topic.subject}"
+                  if topic.children << reply
+                    result = 2
+                  end
                 end
               when "JournalsForMessage"
                 jour = JournalsForMessage.find params[:id]
-                parent_id = params[:id]
-                author_id = current_user.id
-                reply_user_id = jour.user_id
-                reply_id = params[:id]
-                content = params[:content]
-                options = {:user_id => author_id,
-                           :status => true,
-                           :m_parent_id => parent_id,
-                           :m_reply_id => reply_id,
-                           :reply_id => reply_user_id,
-                           :notes => content,
-                           :is_readed => false}
-                jfm = jour.user.add_jour(nil, nil, nil, options)
-                if jfm.errors.empty?
-                  (JournalsForMessage.find parent_id).update_attribute(:updated_on,Time.now)
-                  result = 2
+
+                # if jour.jour_type == "Project"
+                #   if jour.project.is_public == false && !current_user.member_of?(jour.project)
+                #     status = -1
+                #     tip = 1
+                #   end
+                # elsif jour.jour_type == "Course"
+                #   if jour.course.is_public == 0 && !current_user.member_of_course?(jour.course)
+                #     status = -1
+                #     tip = 0
+                #   end
+                # end
+
+                if status == 0
+                  parent_id = params[:id]
+                  author_id = current_user.id
+                  reply_user_id = jour.user_id
+                  reply_id = params[:id]
+                  content = params[:content]
+                  options = {:user_id => author_id,
+                             :status => true,
+                             :m_parent_id => parent_id,
+                             :m_reply_id => reply_id,
+                             :reply_id => reply_user_id,
+                             :notes => content,
+                             :is_readed => false}
+                  jfm = jour.user.add_jour(nil, nil, nil, options)
+                  if jfm.errors.empty?
+                    (JournalsForMessage.find parent_id).update_attribute(:updated_on,Time.now)
+                    result = 2
+                  end
                 end
               when 'Issue'
                 issue = Issue.find params[:id]
-                is_jour = Journal.new
-                is_jour.user_id = current_user.id
-                is_jour.notes = params[:content]
-                is_jour.journalized = issue
-                if is_jour.save
-                  result = 2
+
+                # if issue.project.is_public == false && !current_user.member_of?(issue.project)
+                #   status = -1
+                #   tip = 1
+                # end
+
+                if status == 0
+                  is_jour = Journal.new
+                  is_jour.user_id = current_user.id
+                  is_jour.notes = params[:content]
+                  is_jour.journalized = issue
+                  if is_jour.save
+                    result = 2
+                  end
                 end
               when 'BlogComment'
                 blog = BlogComment.find(params[:id]).root
@@ -97,7 +236,9 @@ module Mobile
             result = 3
           end
           present :result, result
-          present :status, 0
+          present :status, status
+          present :tip, tip
+          present :subscribe,subscribe
         end
       end
     end
diff --git a/app/api/mobile/apis/newss.rb b/app/api/mobile/apis/newss.rb
index 6e012ca4b..c2e2fcb5c 100644
--- a/app/api/mobile/apis/newss.rb
+++ b/app/api/mobile/apis/newss.rb
@@ -7,17 +7,32 @@ module Mobile
 
         desc "get special news"
         post ':id' do
-          authenticate!
-          user = current_user
+          begin
+            # authenticate!
+            user = current_user
 
-          #0一级回复的更多  1 二级回复的更多
-          type =  params[:type] || 0
-          page =  params[:page] || 0
-          news = News.find params[:id]
-          present :data, news, with: Mobile::Entities::News,user: user,type: type,page: page
-          present :type, type
-          present :page, page
-          present :status, 0
+            #0一级回复的更多  1 二级回复的更多
+            type =  params[:type] || 0
+            page =  params[:page] || 0
+            news = News.find params[:id]
+
+            is_public = 1
+
+            if news.project
+              is_public = news.project.is_public
+            elsif news.course
+              is_public = news.course.is_public
+            end
+
+            present :data, news, with: Mobile::Entities::News,user: user,type: type,page: page
+            present :type, type
+            present :page, page
+            present :is_public, is_public
+            present :status, 0
+          rescue Exception=>e
+            present :status, -1
+            present :message, e.message
+          end
         end
       end
     end
diff --git a/app/api/mobile/apis/projects.rb b/app/api/mobile/apis/projects.rb
index 5ab0878d0..05d4036f9 100644
--- a/app/api/mobile/apis/projects.rb
+++ b/app/api/mobile/apis/projects.rb
@@ -86,9 +86,24 @@ module Mobile
           develop_members = project.member_principals.includes(:roles, :principal).where("member_roles.role_id=4").all.sort
           report_members = project.member_principals.includes(:roles, :principal).where("member_roles.role_id=5").all.sort
 
+          review_master_members = []
+          review_develop_members = []
+
+          my_member = project.member_principals.where("users.id=#{current_user.id}").first
+          if my_member && my_member.roles[0] && my_member.roles[0].id == 3
+            ps = ProjectsService.new
+
+            user = current_user
+            review_master_members = ps.get_project_review_members(project,3,user)
+            review_develop_members = ps.get_project_review_members(project,4,user)
+
+          end
+
           present :master_members,master_members, with: Mobile::Entities::ProjectMember
           present :develop_members,develop_members, with: Mobile::Entities::ProjectMember
           present :report_members,report_members, with: Mobile::Entities::ProjectMember
+          present :review_master_members,review_master_members
+          present :review_develop_members,review_develop_members
           present :status, 0
         end
 
@@ -163,16 +178,55 @@ module Mobile
         params do
           requires :token, type: String
           requires :invite_code, type: String, desc: '邀请码'
+          requires :role_id, type: Integer, desc: '身份'
         end
-        post "join" do
+        post "join_project" do
           authenticate!
 
-          # ps = ProjectsService.new
-          # status = ps.join_project({role: "5", openid: params[:openid], invite_code: params[:invite_code]}, current_user)
-          #
-          # present :status, status
+          role_id = params[:role_id]
+
+          if role_id != 3 && role_id != 4 && role_id != 5
+            {status:-1,message:"请至少选择一个角色"}
+          else
+            ps = ProjectsService.new
+            status = ps.join_project({role: role_id, openid: params[:openid], invite_code: params[:invite_code]}, current_user)
+
+            {status:status, message:ProjectsService::JoinProjectError.message(status)}
+          end
+
+          # {status:-1, message: '该功能将在近日开放，敬请期待！' }
+        end
+
+        desc "项目单个未审核用户信息"
+        params do
+          requires :token, type: String
+          requires :project_id, type: Integer, desc: "项目id"
+          requires :user_id, type: Integer, desc: "用户id"
+        end
+        post 'review_member_info' do
+          authenticate!
+
+          ps = ProjectsService.new
+          result = ps.get_reviewer_info(params,current_user)
+          present :data, result[:reviewer], with: Mobile::Entities::User
+          present :status, result[:status]
+        end
+
+        desc "处理管理或开发的身份申请"
+        params do
+          requires :token, type: String
+          requires :project_id, type: Integer, desc: "项目id"
+          requires :user_id, type: Integer, desc: "用户id"
+          requires :type, type: Integer, desc: "同意或拒绝"
+        end
+        post 'deal_join_apply' do
+          authenticate!
+
+          ps = ProjectsService.new
+          result = ps.deal_join_apply(params,current_user)
 
-          {status:-1, message: '该功能将在近日开放，敬请期待！' }
+          present :status, result[:status]
+          present :message, result[:message]
         end
 
       end
diff --git a/app/api/mobile/apis/syllabuses.rb b/app/api/mobile/apis/syllabuses.rb
index 8538fae99..100760f8e 100644
--- a/app/api/mobile/apis/syllabuses.rb
+++ b/app/api/mobile/apis/syllabuses.rb
@@ -28,9 +28,10 @@ module Mobile
           ss  = SyllabusesService.new
 
           sy = ::Syllabus.find(params[:id])
-          sy.courses = sy.courses.not_deleted
 
-          present :data, sy, with: Mobile::Entities::Syllabus,user: current_user
+          result = {:title=>sy.title, :id=>sy.id , :user_id=>sy.user_id,:courses=>sy.courses.not_deleted}
+
+          present :data, result, with: Mobile::Entities::Syllabus,user: current_user
           present :status, 0
         end
 
diff --git a/app/api/mobile/apis/users.rb b/app/api/mobile/apis/users.rb
index 9b1be37c3..764dc957f 100644
--- a/app/api/mobile/apis/users.rb
+++ b/app/api/mobile/apis/users.rb
@@ -29,7 +29,7 @@ module Mobile
             logger.debug "openid ============== #{openid}"
             raise "无法获取到openid,请在微信中打开本页面" unless openid
             uw = UserWechat.where(openid: openid).first
-            raise "此微信号已绑定用户(#{uw.user.login}), 不能重复绑定" if uw
+            raise "此微信号已绑定用户(#{uw.user.login}), 不能重复绑定" if uw && uw.real?
 
             user, last_login_on = User.try_to_login(params[:login], params[:password])
             raise "用户名或密码错误,请重新输入" unless user
@@ -37,12 +37,17 @@ module Mobile
 
             raise "此用户已经绑定过公众号, 请换一个帐户试试" if user.user_wechat
 
-            UserWechat.create!(
+            if uw && !uw.real?
+              uw.migrate_user(user)
+            else
+              UserWechat.create!(
                 openid: openid,
                 user: user
-            )
+              )
+            end
+
             ws = WechatService.new
-            ws.binding_succ_notice(user.id, "您已成功绑定Trustie平台。", user.login, Time.now.strftime("%Y-%m-%d"))
+            ws.binding_succ_notice(user.id, "您已成功绑定Trustie平台。", user.show_name+"("+user.login+")", Time.now.strftime("%Y-%m-%d"))
             present status: 0, message: '您已成功绑定Trustie平台'
         end
 
@@ -53,22 +58,38 @@ module Mobile
           requires :password, type: String, desc: 'password'
         end
         post do
-
           openid = session[:wechat_openid]
           logger.debug "openid ============== #{openid}"
           raise "无法获取到openid,请在微信中打开本页面" unless openid
 
-
+          uw = UserWechat.where(openid: openid).first
+          raise "此微信号已绑定用户(#{uw.user.login}), 不能重复绑定" if uw && uw.real?
           us = UsersService.new
           user = us.register params.merge(:password_confirmation => params[:password],
                                           :should_confirmation_password => true)
           raise user.errors.full_messages.first if user.new_record?
-          UserWechat.create!(
+          #自动激活
+          if Setting.self_registration != '3'
+            # user = automatically_register(user)
+            user.activate
+            user.last_login_on = Time.now
+            if user.save
+              UserStatus.create(:user_id => user.id, :changsets_count => 0, :watchers_count => 0)
+            end
+          end
+
+          if uw && !uw.real?
+            user.update_attributes(:lastname=>uw.user[:lastname])
+            uw.migrate_user(user)
+          else
+            UserWechat.create!(
               openid: openid,
               user: user
-          )
+            )
+          end
+
           ws = WechatService.new
-          ws.binding_succ_notice(user.id, "您已成功绑定Trustie平台。", user.login, Time.now.strftime("%Y-%m-%d"))
+          ws.binding_succ_notice(user.id, "您已成功绑定Trustie平台。", user.show_name+"("+user.login+")", Time.now.strftime("%Y-%m-%d"))
           present :data, user, with: Mobile::Entities::User
           present :status, 0
         end
diff --git a/app/api/mobile/apis/whomeworks.rb b/app/api/mobile/apis/whomeworks.rb
index 9d03eed9f..572ce5e0b 100644
--- a/app/api/mobile/apis/whomeworks.rb
+++ b/app/api/mobile/apis/whomeworks.rb
@@ -7,23 +7,32 @@ module Mobile
 
         desc "get one homework"
         post ':id' do
-          authenticate!
-          user = current_user
+          begin
+            # authenticate!
+            user = current_user
 
-          #0一级回复的更多  1 二级回复的更多
-          type =  params[:type] || 0
-          page =  params[:page] || 0
+            #0一级回复的更多  1 二级回复的更多
+            type =  params[:type] || 0
+            page =  params[:page] || 0
 
-          if type == 0
-            homework = HomeworkCommon.find params[:id]
-            present :data, homework, with: Mobile::Entities::Whomework,user: user,type: type,page: page,comment_type: "homework"
-          else
-            jour = JournalsForMessage.find params[:id]
-            present :data, jour, with: Mobile::Entities::Jours,user: user,type: type,page: page,comment_type: "homework"
+            is_public = 1
+
+            if type == 0
+              homework = HomeworkCommon.find params[:id]
+              is_public = homework.course.is_public
+              present :data, homework, with: Mobile::Entities::Whomework,user: user,type: type,page: page,comment_type: "homework"
+            else
+              jour = JournalsForMessage.find params[:id]
+              present :data, jour, with: Mobile::Entities::Jours,user: user,type: type,page: page,comment_type: "homework"
+            end
+            present :type, type
+            present :page, page
+            present :is_public, is_public
+            present :status, 0
+          rescue Exception=>e
+            present :status, -1
+            present :message, e.message
           end
-          present :type, type
-          present :page, page
-          present :status, 0
         end
       end
     end
diff --git a/app/api/mobile/entities/blog_comment.rb b/app/api/mobile/entities/blog_comment.rb
index 726949bb5..14bc9decb 100644
--- a/app/api/mobile/entities/blog_comment.rb
+++ b/app/api/mobile/entities/blog_comment.rb
@@ -85,7 +85,7 @@ module Mobile
           #取二级回复的底楼层
           parents_reply = []
           parents_reply = get_reply_parents_no_root(parents_reply, c)
-          if parents_reply.count > 0 && parents_reply.count != 2 && !opt[:bottom]
+          if parents_reply.count > 0 && !opt[:bottom]
             if opt[:type] == 1
               # opt[:bottom] = true
               # parents_reply[opt[:page]..opt[:page]]
@@ -104,9 +104,9 @@ module Mobile
           #取二级回复的顶楼层
           parents_reply = []
           parents_reply = get_reply_parents_no_root(parents_reply, c)
-          if parents_reply.count >= 2 && !opt[:top]
+          if parents_reply.count > 2 && !opt[:top]
             if opt[:type] == 1
-              opt[:bottom] = true
+              opt[:top] = true
               tStart = (opt[:page]-1)*5+2
               tEnd = (opt[:page])*5+2 - 1
 
@@ -125,6 +125,10 @@ module Mobile
               parents_reply = parents_reply.reverse[0..1]
               parents_reply.reverse
             end
+          elsif parents_reply.count == 2 && !opt[:top]
+            opt[:top] = true
+            parents_reply = parents_reply.reverse[0..0]
+            parents_reply.reverse
           else
             []
           end
diff --git a/app/api/mobile/entities/course.rb b/app/api/mobile/entities/course.rb
index aaf5dd78b..fc78cc14e 100644
--- a/app/api/mobile/entities/course.rb
+++ b/app/api/mobile/entities/course.rb
@@ -65,9 +65,9 @@ module Mobile
         end
 
         member = course.members.where("user_id=#{current_user.id} and course_id=#{course.id}")[0]
-        roleName = member.roles[0].name if member
+        role_ids = member.role_ids if member
 
-        if roleName && (roleName == "TeachingAsistant" || roleName == "Teacher" )
+        if role_ids && (role_ids.include?(7) || role_ids.include?(9) )
           can_setting = true
         end
 
@@ -76,6 +76,15 @@ module Mobile
         end
         can_setting
       end
+      expose :is_member, if: lambda { |instance, options| options[:user] } do |instance, options|
+        current_user = options[:user]
+        if instance[:course]
+          course = instance[:course]
+        else
+          course = instance
+        end
+        current_user.member_of_course?(course)
+      end
       expose :teacher, using: Mobile::Entities::User do |c, opt|
         if c.is_a? ::Course
           c.teacher
diff --git a/app/api/mobile/entities/issue.rb b/app/api/mobile/entities/issue.rb
index dc4fd0567..9cbeb3459 100644
--- a/app/api/mobile/entities/issue.rb
+++ b/app/api/mobile/entities/issue.rb
@@ -34,6 +34,8 @@ module Mobile
                   'Issue'
                 when :act_id
                   issue.id
+                when :title
+                  issue.subject
               end
             end
           end
@@ -43,6 +45,7 @@ module Mobile
       expose :description
       expose :author, using: Mobile::Entities::User
       expose :done_ratio
+      issue_expose :title
       issue_expose :act_type
       issue_expose :act_id
       issue_expose :created_on
diff --git a/app/api/mobile/entities/jours.rb b/app/api/mobile/entities/jours.rb
index 0e4c699c2..6379e88e4 100644
--- a/app/api/mobile/entities/jours.rb
+++ b/app/api/mobile/entities/jours.rb
@@ -101,7 +101,7 @@ module Mobile
           elsif opt[:comment_type] == "homework"
             parents_reply = get_reply_parents(parents_reply, f)
           end
-          if parents_reply.count > 0 && parents_reply.count != 2 && !opt[:bottom]
+          if parents_reply.count > 0 && !opt[:bottom]
             if opt[:type] == 1
               # opt[:bottom] = true
               # parents_reply[opt[:page]..opt[:page]]
@@ -125,9 +125,9 @@ module Mobile
           elsif opt[:comment_type] == "homework"
             parents_reply = get_reply_parents(parents_reply, f)
           end
-          if parents_reply.count >= 2 && !opt[:top]
+          if parents_reply.count > 2 && !opt[:top]
             if opt[:type] == 1
-              opt[:bottom] = true
+              opt[:top] = true
               tStart = (opt[:page]-1)*5+2
               tEnd = (opt[:page])*5+2 - 1
 
@@ -146,6 +146,10 @@ module Mobile
               parents_reply = parents_reply.reverse[0..1]
               parents_reply.reverse
             end
+          elsif parents_reply.count == 2 && !opt[:top]
+              opt[:top] = true
+              parents_reply = parents_reply.reverse[0..0]
+              parents_reply.reverse
           else
             []
           end
diff --git a/app/api/mobile/entities/message.rb b/app/api/mobile/entities/message.rb
index c2744f63a..07c560a1f 100644
--- a/app/api/mobile/entities/message.rb
+++ b/app/api/mobile/entities/message.rb
@@ -33,6 +33,8 @@ module Mobile
                 when :comment_count
                   all_comments = []
                   get_all_children(all_comments, u).count
+                when :title
+                  u.subject
               end
             end
           end
@@ -50,6 +52,7 @@ module Mobile
       message_expose :course_project_name
       message_expose :board_id
       message_expose :subject
+      message_expose :title
       message_expose :content
       message_expose :comment_count
       message_expose :praise_count
@@ -92,7 +95,7 @@ module Mobile
           #取二级回复的底楼层
           parents_reply = []
           parents_reply = get_reply_parents_no_root(parents_reply, c)
-          if parents_reply.count > 0 && parents_reply.count != 2 && !opt[:bottom]
+          if parents_reply.count > 0 && !opt[:bottom]
             if opt[:type] == 1
               # opt[:bottom] = true
               # parents_reply[opt[:page]..opt[:page]]
@@ -111,9 +114,9 @@ module Mobile
           #取二级回复的顶楼层
           parents_reply = []
           parents_reply = get_reply_parents_no_root(parents_reply, c)
-          if parents_reply.count >= 2 && !opt[:top]
+          if parents_reply.count > 2 && !opt[:top]
             if opt[:type] == 1
-              opt[:bottom] = true
+              opt[:top] = true
               tStart = (opt[:page]-1)*5+2
               tEnd = (opt[:page])*5+2 - 1
 
@@ -132,6 +135,10 @@ module Mobile
               parents_reply = parents_reply.reverse[0..1]
               parents_reply.reverse
             end
+          elsif parents_reply.count == 2 && !opt[:top]
+            opt[:top] = true
+            parents_reply = parents_reply.reverse[0..0]
+            parents_reply.reverse
           else
             []
           end
diff --git a/app/api/mobile/entities/project.rb b/app/api/mobile/entities/project.rb
index 3e1899caa..8da151b42 100644
--- a/app/api/mobile/entities/project.rb
+++ b/app/api/mobile/entities/project.rb
@@ -4,8 +4,8 @@ module Mobile
       expose :name
       expose :id
       expose :user_id
-      # expose :invite_code
-      # expose :qrcode
+      expose :invite_code
+      expose :qrcode
       expose :can_setting, if: lambda { |instance, options| options[:user] } do |instance, options|
         current_user = options[:user]
 
@@ -23,6 +23,16 @@ module Mobile
         current_user.id == instance.user_id
       end
 
+      expose :is_member, if: lambda { |instance, options| options[:user] } do |instance, options|
+        current_user = options[:user]
+        if instance[:project]
+          project = instance[:project]
+        else
+          project = instance
+        end
+        current_user.member_of?(project)
+      end
+
 
       expose :member_count, if: lambda { |instance, options| options[:user] } do |instance, options|
         instance.members.count
diff --git a/app/api/mobile/entities/project_member.rb b/app/api/mobile/entities/project_member.rb
index 58edf7ea7..decd7dac3 100644
--- a/app/api/mobile/entities/project_member.rb
+++ b/app/api/mobile/entities/project_member.rb
@@ -14,11 +14,11 @@ module Mobile
             else
               case f
                 when :roles_id
-                  u.roles[0].id
+                  # u.roles[0].id
+                  u.roles.map {|r| r.id}
               end
             end
           end
-
         end
       end
 
diff --git a/app/api/mobile/entities/syllabus.rb b/app/api/mobile/entities/syllabus.rb
index e4dd2e07a..4e9f858c8 100644
--- a/app/api/mobile/entities/syllabus.rb
+++ b/app/api/mobile/entities/syllabus.rb
@@ -5,8 +5,8 @@ module Mobile
       expose :id
       expose :can_setting, if: lambda { |instance, options| options[:user] } do |instance, options|
         current_user = options[:user]
-        can_setting = instance.user_id == current_user.id ? true : false
-        can_setting = false if instance.id.nil?
+        can_setting = instance[:user_id] == current_user.id ? true : false
+        can_setting = false if instance[:id].nil?
         can_setting
       end
       expose :courses, using: Mobile::Entities::Course
diff --git a/app/api/mobile/entities/whomework.rb b/app/api/mobile/entities/whomework.rb
index 7178ff67d..9d141552a 100644
--- a/app/api/mobile/entities/whomework.rb
+++ b/app/api/mobile/entities/whomework.rb
@@ -34,6 +34,8 @@ module Mobile
                   'HomeworkCommon'
                 when :act_id
                   wh.id
+                when :title
+                  wh.name
               end
             end
           end
@@ -59,6 +61,7 @@ module Mobile
       expose :quotes
       expose :is_open
       expose :id
+      whomework_expose :title
       whomework_expose :act_type
       whomework_expose :act_id
       whomework_expose :course_name
diff --git a/app/assets/javascripts/pull_requests.js.coffee b/app/assets/javascripts/pull_requests.js.coffee
new file mode 100644
index 000000000..761567942
--- /dev/null
+++ b/app/assets/javascripts/pull_requests.js.coffee
@@ -0,0 +1,3 @@
+# Place all the behaviors and hooks related to the matching controller here.
+# All this logic will automatically be available in application.js.
+# You can use CoffeeScript in this file: http://jashkenas.github.com/coffee-script/
diff --git a/app/assets/stylesheets/pull_requests.css.scss b/app/assets/stylesheets/pull_requests.css.scss
new file mode 100644
index 000000000..f69ac413b
--- /dev/null
+++ b/app/assets/stylesheets/pull_requests.css.scss
@@ -0,0 +1,3 @@
+// Place all the styles related to the pull_requests controller here.
+// They will automatically be included in application.css.
+// You can use Sass (SCSS) here: http://sass-lang.com/
diff --git a/app/controllers/admin_controller.rb b/app/controllers/admin_controller.rb
index e6d913ffd..3c012fce7 100644
--- a/app/controllers/admin_controller.rb
+++ b/app/controllers/admin_controller.rb
@@ -61,8 +61,7 @@ class AdminController < ApplicationController
     if params[:syllabus_id] && params[:course_id]
       course = Course.where("id = #{params[:course_id].to_i}").first
       unless course.nil?
-        course.update_column('syllabus_id', params[:syllabus_id].to_i)
-        logger.error "update_syllabus_id: admin_controller/select_scourse_syllabus"
+        course.update_attribute(:syllabus_id, params[:syllabus_id].to_i)
         @flag = true
       end
     end
@@ -83,8 +82,7 @@ class AdminController < ApplicationController
         syllabus.update_attributes(:title => params[:title], :eng_name => params[:eng_name], :user_id => @user.id)
         syllabus.description = Message.where("id = 19412").first.nil? ? nil : Message.where("id = 19412").first.content
         if syllabus.save
-          course.update_column('syllabus_id', syllabus.id)
-          logger.error "update_syllabus_id: admin_controller/create_syllabus"
+          course.update_attribute(:syllabus_id, params[:syllabus_id].to_i)
           @flag = params[:flag].to_i
           @course = course
           respond_to do |format|
@@ -618,9 +616,14 @@ class AdminController < ApplicationController
   # 未审批tab页
   # status: 0 未审批； 1 已批阅； 2已更改； 3拒绝；
   def applied_schools
+    # 更新消息状态
+    if params[:flag]
+      applied_message = AppliedMessage.where(:id => params[:applied_message_id]).first
+      applied_message.update_attribute(:viewed, true)
+    end
+
     @name = params[:name] || ""
     condition = "#{@name.strip}".gsub(" ","")
-
     @apply_status = ApplyAddSchools.where("status = 0 and name like '%#{condition}%'").order('created_at desc')
     @apply_count = @apply_status.count
     @apply_pages = Paginator.new @apply_count, 30, params['page'] || 1
@@ -657,7 +660,7 @@ class AdminController < ApplicationController
     applied_school.update_column('status', 1) unless applied_school.nil?
     school = applied_school.school
     school.update_attribute("province", applied_school.province)
-    AppliedMessage.create(:user_id => applied_school.user_id, :status => 1, :viewed => true, :applied_id => applied_school.id, :applied_type => "ApplyAddSchools", :name => applied_school.name )
+    AppliedMessage.create(:user_id => applied_school.user_id, :status => 1, :viewed => 0, :applied_id => applied_school.id, :applied_type => "ApplyAddSchools", :name => applied_school.name )
    # School.create(:user_id => applied_school.user_id, :status => 1, :viewed => true, :applied_id => applied_school.id, :applied_type => "ApplyAddSchools", :name => applied_school.name )
     respond_to do |format|
       format.html{ redirect_to unapplied_schools_url }
@@ -665,8 +668,8 @@ class AdminController < ApplicationController
   end
 
   # 单位审核：更改
-  # REDO: 修改该字段
-  # REDO: 同步修改使用了改名称的用户单位
+  # 修改该字段
+  # 同步修改使用了改名称的用户单位
   def edit_applied_schools
     aas = ApplyAddSchools.find(params[:applied_id])
     # aas.update_attribute(:name, params[:name])
@@ -674,11 +677,9 @@ class AdminController < ApplicationController
     school = School.find params[:school_id]
     begin
       aas.update_attribute(:status, 2)
-      AppliedMessage.create(:user_id => aas.user_id, :status => 2, :viewed => true, :applied_id => aas.id, :applied_type => "ApplyAddSchools", :name => school[0].name )
+      AppliedMessage.create(:user_id => aas.user_id, :status => 2, :viewed => 0, :applied_id => aas.id, :applied_type => "ApplyAddSchools", :name => school[0].name )
       users = UserExtensions.where("school_id = #{aas.school_id}")
-      users.each do |user|
-        user.update_column("school_id", school[0].id)
-      end
+      users.update_all(:school_id => school[0].id)
       if aas.school_id != school[0].id.to_i
         aas.school.destroy
       end
@@ -711,23 +712,20 @@ class AdminController < ApplicationController
   end
 
   # 单位审核：删除
-  # REDO: destroy关联删除
-  # REDO: 删除确认提示，是否删除
-  # REDO: 给申请人发送消息
   def delete_applied_schools
     applied_school = ApplyAddSchools.find(params[:id])
     applied_school.update_attribute(:status, 3)
-    AppliedMessage.create(:user_id => applied_school.user_id, :status => 3, :viewed => true, :applied_id => applied_school.id, :applied_type => "ApplyAddSchools", :name => applied_school.name )
-    users = UserExtensions.where("school_id = #{applied_school.school_id}")
-    users.each do |user|
-      user.update_column("school_id", nil)
-    end
-    applied_school.school.destroy
-
-    # 跳转当前页面
+    # 未审批删除
     if params[:tip] == "unapplied"
+      AppliedMessage.create(:user_id => applied_school.user_id, :status => 3, :viewed => 0, :applied_id => applied_school.id, :applied_type => "ApplyAddSchools", :name => applied_school.name )
+      # 删除学校的用户
+      users = UserExtensions.where("school_id = #{applied_school.school_id}")
+      users.update_all(:school_id => nil)
+      applied_school.school.destroy
       redirect_to unapplied_schools_url
+    # 已审批删除
     elsif params[:tip] == "applied"
+      applied_school.destroy
       redirect_to applied_schools_url
     end
   end
diff --git a/app/controllers/applied_project_controller.rb b/app/controllers/applied_project_controller.rb
index 883fd1c68..30978367c 100644
--- a/app/controllers/applied_project_controller.rb
+++ b/app/controllers/applied_project_controller.rb
@@ -45,7 +45,7 @@ class AppliedProjectController < ApplicationController
   end
 
   # @flage:提示语标志（1：邀请码错误；2：已经是项目成员； 3：角色没有选择; 4：申请成功）
-  # role:成员角色 => 0（4：管理人员；5：开发人员；6：报告人员）
+  # role:成员角色 => 0（3：管理人员；4：开发人员；5：报告人员）
   # 申请成功则发送消息
   def applied_project_info
     if params[:project_id].nil?
@@ -53,7 +53,7 @@ class AppliedProjectController < ApplicationController
     else
       @project = Project.find(params[:project_id])
     end
-    if !@project || params[:invite_code].to_s != @project.invite_code
+    if !@project || params[:invite_code].strip.upcase.to_s != @project.invite_code
       @flag = 1
     elsif User.current.member_of?(@project)
       @flag = 2
@@ -61,6 +61,22 @@ class AppliedProjectController < ApplicationController
       @flag = 3
     elsif !AppliedProject.where(:project_id => @project.id, :user_id => User.current.id).first.nil?
       @flag = 5
+    elsif params[:member] == "member_reporter" && params[:invite_code].upcase.to_s == @project.invite_code
+      # 项目报告人员直接加入项目
+      @flag = 6
+      members = []
+      user_grades = []
+      project_info = []
+      members << Member.new(:role_ids => ["5"], :user_id => User.current.id)
+      user_grades << UserGrade.new(:user_id => User.current.id, :project_id => @project.id)
+      role = Role.find(5)
+      project_info << ProjectInfo.new(:project_id => @project.id, :user_id => User.current.id) if role.allowed_to?(:is_manager)
+      @project.members << members
+      @project.project_infos << project_info
+      @project.user_grades << user_grades unless user_grades.first.user_id.nil?
+
+      ps = ProjectsService.new
+      ps.send_wechat_join_project_notice User.current,@project,5,0
     else
       @flag = 4
       role = params[:member] == "member_manager" ? 3 : (params[:member] == "member_developer" ? 4 :5)
diff --git a/app/controllers/files_controller.rb b/app/controllers/files_controller.rb
index ed2b2ebfa..cd3870e9a 100644
--- a/app/controllers/files_controller.rb
+++ b/app/controllers/files_controller.rb
@@ -77,19 +77,25 @@ class FilesController < ApplicationController
       if params[:insite]
         if q == "%%"
           @result = []
-          @searched_attach = paginateHelper @result,10
+          # @searched_attach = paginateHelper @result,10
         else
           @result = find_public_attache q,sort
           @result = visable_attachemnts_insite @result,@course
-          @searched_attach = paginateHelper @result,10
+          # @searched_attach = paginateHelper @result,10
         end
       else
         @result = find_course_attache q,@course,sort
         @result = visable_attachemnts @result
-        @searched_attach = paginateHelper @result,10
-
+     # @searched_attach = paginateHelper @result,10
         @tag_list = get_course_tag_list @course
       end
+      @all_attachments = @result
+      @limit = 10
+      @feedback_count = @all_attachments.count
+      @feedback_pages = Paginator.new @feedback_count, @limit, params['page']
+      @offset ||= @feedback_pages.offset
+      #@curse_attachments_all = @all_attachments[@offset, @limit]
+      @obj_attachments = paginateHelper @all_attachments,10
     #rescue Exception => e
     #  #render 'stores'
     #  redirect_to search_course_files_url
@@ -144,18 +150,26 @@ class FilesController < ApplicationController
       if params[:insite]
         if q == "%%"
           @project_attachment_result = []
-          @searched_attach = paginateHelper @project_attachment_result, 10
+          # @searched_attach = paginateHelper @project_attachment_result, 10
         else
           @project_attachment_result = find_public_attache q,sort
           @project_attachment_result = visable_attachemnts_insite  @project_attachment_result, @project
-          @searched_attach = paginateHelper @project_attachment_result, 10
+          # @searched_attach = paginateHelper @project_attachment_result, 10
         end
       else
         @project_attachment_result = find_project_attache q, @project,sort
         @project_attachment_result = visable_attachemnts @project_attachment_result
-        @searched_attach = paginateHelper @project_attachment_result,10
+        # @searched_attach = paginateHelper @project_attachment_result,10
         @tag_list = get_project_tag_list @project
       end
+
+      @all_attachments = @project_attachment_result
+      @limit = 10
+      @feedback_count = @all_attachments.count
+      @feedback_pages = Paginator.new @feedback_count, @limit, params['page']
+      @offset ||= @feedback_pages.offset
+      #@curse_attachments_all = @all_attachments[@offset, @limit]
+      @obj_attachments = paginateHelper @all_attachments,10
       #rescue Exception => e
       #  #render 'stores'
       #  redirect_to search_course_files_url
@@ -867,7 +881,17 @@ class FilesController < ApplicationController
     else
       @result = @result.select{|attachment| attachment.tag_list.include?(@tag_name)} unless @tag_name.blank?
     end
-    @searched_attach = paginateHelper @result,10
+
+    @all_attachments = @result
+    @limit = 10
+    @feedback_count = @all_attachments.count
+    @feedback_pages = Paginator.new @feedback_count, @limit, params['page']
+    @offset ||= @feedback_pages.offset
+    #@curse_attachments_all = @all_attachments[@offset, @limit]
+    @obj_attachments = paginateHelper @all_attachments,10
+
+
+    # @searched_attach = paginateHelper @result,10
     if @project
       @tag_list = get_project_tag_list @project
       @result_search_project = @result
diff --git a/app/controllers/members_controller.rb b/app/controllers/members_controller.rb
index 0a76cfb78..d661350c6 100644
--- a/app/controllers/members_controller.rb
+++ b/app/controllers/members_controller.rb
@@ -75,13 +75,20 @@ class MembersController < ApplicationController
           project.members << members
           project.project_infos << project_info
           project.user_grades << user_grades unless user_grades.first.user_id.nil?
-          @applied_message.update_attribute(:status, 2)
+
+          # 添加成功后所有管理员收到的消息状态都要更新
+          applied_messages = AppliedMessage.where(:applied_id => @applied_message.applied_id, :project_id => @applied_message.project_id, :status => 1,
+                                                    :applied_type => "AppliedProject")
+          applied_messages.update_all(:status => 7, :viewed => true)
+          @applied_message = AppliedMessage.find(params[:applied_message_id])
           # 添加成功后，申请人收到消息
           AppliedMessage.create(:user_id => @applied_message.applied_user_id, :applied_type => "AppliedProject", :applied_id => applied_project.id ,
-                                  :status => 6, :viewed => true, :applied_user_id => @applied_message.user_id, :role => applied_project.role, :project_id => applied_project.project_id)
+                                  :status => 6, :viewed => false, :applied_user_id => @applied_message.user_id, :role => applied_project.role, :project_id => applied_project.project_id)
+          ps = ProjectsService.new
+          ps.send_wechat_join_project_notice user,project,ap_role,0
           # 添加成功后，批准人收到消息
-          AppliedMessage.create(:user_id => @applied_message.user_id, :applied_type => "AppliedProject", :applied_id => applied_project.id ,
-                                  :status => 7, :viewed => true, :applied_user_id => @applied_message.applied_user_id, :role => applied_project.role, :project_id => applied_project.project_id)
+          # AppliedMessage.create(:user_id => @applied_message.user_id, :applied_type => "AppliedProject", :applied_id => applied_project.id ,
+          #                         :status => 7, :viewed => true, :applied_user_id => @applied_message.applied_user_id, :role => applied_project.role, :project_id => applied_project.project_id)
         rescue Exception => e
           puts e
         end
@@ -95,14 +102,24 @@ class MembersController < ApplicationController
   # status(1：申请的消息；2：已操作过该消息（包括同意或者拒绝，消息状态更新）；3：拒绝消息；4:被拒人收到消息；5：拒绝者收到消息；6：同意后申请人收到消息；7：同意后批准人收到消息)
   def refused_allow_to_join_project
     @applied_message = AppliedMessage.find(params[:applied_message_id])
-    @applied_message.update_attribute(:status, 3)
+    # @applied_message.update_attribute(:status, 3)
     applied_project = @applied_message.applied
     # 发送消息给被拒者,user_id对应的收到信息的用户
     AppliedMessage.create(:user_id => @applied_message.applied_user_id, :applied_type => "AppliedProject", :applied_id => applied_project.id ,:status => 4,
-                            :viewed => true, :applied_user_id => @applied_message.user_id, :role => applied_project.role, :project_id => applied_project.project_id)
-    # 发送消息给拒绝者
-    AppliedMessage.create(:user_id => @applied_message.user_id, :applied_type => "AppliedProject", :applied_id => applied_project.id ,:status => 5,
-                            :viewed => true, :applied_user_id => @applied_message.applied_user_id, :role => applied_project.role, :project_id => applied_project.project_id)
+                            :viewed => false, :applied_user_id => @applied_message.user_id, :role => applied_project.role, :project_id => applied_project.project_id)
+
+    # 拒绝功后所有管理员收到的消息状态都要更新
+    applied_messages = AppliedMessage.where(:applied_id => @applied_message.applied_id, :project_id => @applied_message.project_id, :status => 1,
+                                              :applied_type => "AppliedProject")
+    applied_messages.update_all(:status => 5, :viewed => true)
+    @applied_message = AppliedMessage.find(params[:applied_message_id])
+    # AppliedMessage.create(:user_id => @applied_message.user_id, :applied_type => "AppliedProject", :applied_id => applied_project.id ,:status => 5,
+    #                         :viewed => true, :applied_user_id => @applied_message.applied_user_id, :role => applied_project.role, :project_id => applied_project.project_id)
+    ps = ProjectsService.new
+    user = User.find(@applied_message.applied_user_id)
+    ap_role = applied_project.try(:role)
+    ps.send_wechat_join_project_notice user,project,ap_role,1
+
     applied_project.delete
   end
 
diff --git a/app/controllers/my_controller.rb b/app/controllers/my_controller.rb
index 32c605516..05b93d302 100644
--- a/app/controllers/my_controller.rb
+++ b/app/controllers/my_controller.rb
@@ -108,6 +108,12 @@ class MyController < ApplicationController
 
   # Edit user's account
   def account
+    # 更新消息状态
+    if params[:flag]
+      applied_message = AppliedMessage.where(:id => params[:applied_message_id]).first
+      applied_message.update_attribute(:viewed, true)
+    end
+
     @user = User.current
 
     lg=@user.login
diff --git a/app/controllers/pull_requests_controller.rb b/app/controllers/pull_requests_controller.rb
new file mode 100644
index 000000000..5e21f9af0
--- /dev/null
+++ b/app/controllers/pull_requests_controller.rb
@@ -0,0 +1,250 @@
+
+class PullRequestsController < ApplicationController
+  before_filter :find_project_and_repository
+  before_filter :connect_gitlab, :only => [:index, :show, :create, :accept_pull_request, :pull_request_commits, :pull_request_changes, :new,
+                                              :update_pull_request, :pull_request_comments, :create_pull_request_comment]
+  layout "base_projects"
+  include PullRequestsHelper
+  include ApplicationHelper
+
+  # 返回json格式
+  def index
+    type = params[:type]
+    case type
+      when nil, "1"
+        @requests = @g.merge_requests(@project.gpid).select{|request| request.state == "opened" || request.state == "reopened"}
+      when "2"
+        @requests = @g.merge_requests(@project.gpid).select{|request| request.state == "merged"}
+      when "3"
+        @requests = @g.merge_requests(@project.gpid).select{|request| request.state == "closed"}
+    end
+    @requests_opened_count = @requests.count
+    @requests_merged_count = @g.merge_requests(@project.gpid).select{|request| request.state == "merged"}.count
+    @requests_closed_count = @g.merge_requests(@project.gpid).select{|request| request.state == "closed"}.count
+
+    @limit = 10
+    @is_remote = true
+    @count = type_count(type, @requests_opened_count, @requests_merged_count, @requests_closed_count)
+    @pages = Paginator.new @count, @limit, params['page'] || 1
+    @offset ||= @pages.offset
+    @requests = paginateHelper @requests, 10
+    respond_to do |format|
+      format.html
+      format.js
+    end
+  end
+
+  # 主要取源项目和目标项目分支及标识（用户名/版本库名）
+  def new
+    identifier = get_rep_identifier_by_project @project
+    @source_project_name = "#{get_user_name(@project.user_id)}/#{identifier}"
+    @source_rev = @g.branches(@project.gpid).map{|b| b.name}
+
+    # 获取forked源项目信息
+    if @project.forked_from_project_id
+      @forked_project = Project.find(@project.forked_from_project_id)
+      identifier = get_rep_identifier_by_project @forked_project
+      @forked_project_name = "#{get_user_name(@forked_project.user_id)}/#{identifier}"
+      @forked_rev = @g.branches(@forked_project.gpid).map{|b| b.name}
+    end
+  end
+
+  # Creates a merge request.
+  # If the operation is successful, 200 and the newly created merge request is returned. If an error occurs, an error number and a message explaining the reason is returned.
+  #
+  # @example
+  #   Gitlab.create_merge_request(5, 'New merge request',
+  #     :source_branch => 'source_branch', :target_branch => 'target_branch')
+  #   Gitlab.create_merge_request(5, 'New merge request',
+  #     :source_branch => 'source_branch', :target_branch => 'target_branch', :assignee_id => 42)
+  #
+  # @param  [Integer] project The ID of a project.
+  # @param  [String] title The title of a merge request.
+  # @param  [Hash] options A customizable set of options.
+  # @option options [String] :source_branch (required) The source branch name.
+  # @option options [String] :target_branch (required) The target branch name.
+  # @option options [Integer] :assignee_id (optional) The ID of a user to assign merge request.
+  # @return [Gitlab::ObjectifiedHash] Information about created merge request.
+  def create
+    title = params[:title]
+    description = params[:description]
+    source_branch = params[:source_branch]
+    target_branch = params[:target_branch]
+    begin
+      # 如果传送了目标项目ID，则PR请求发至目标项目
+      if params[:forked_project_id] && params[:source_project] == "forked_project_name"
+        target_project_id = params[:forked_project_id].to_i
+        request = @g.create_merge_request(@project.gpid, title, User.current.gid, :description => description, :source_branch => source_branch, :target_branch => target_branch, :target_project_id => target_project_id)
+        @fork_project_name = Project.find(@project.forked_from_project_id).try(:name)
+        @fork_pr_message = true if @fork_project_name
+      else
+        request = @g.create_merge_request(@project.gpid, title, User.current.gid, :description => description, :source_branch => source_branch, :target_branch => target_branch)
+        respond_to do |format|
+          format.js{redirect_to project_pull_request_path(request.id, :project_id => @project.id)}
+        end
+      end
+    rescue Exception => e
+      @message = e.message
+    end
+  end
+
+  def show
+    @type = params[:type]
+    @request = @g.merge_request(@project.gpid, params[:id])
+    @commits = @g.merge_request_commits(@project.gpid, params[:id].to_i)
+    @commits_count = @commits.count
+    @changes = @g.merge_request_changes(@project.gpid, params[:id]).try(:changes)
+    @changes_count = @changes.count
+    @comments = @g.merge_request_comments(@project.gpid, params[:id]).reverse
+    @comments_count = @comments.count
+
+    @limit = 10
+    @is_remote = true
+    @count = @comments_count
+    @pages = Paginator.new @count, @limit, params['page'] || 1
+    @offset ||= @pages.offset
+    @comments = paginateHelper @comments, 10
+  end
+
+  # Accept a merge request.
+  # If merge success you get 200 OK.
+  # Accept a merge request.
+  #
+  # @example
+  #   Gitlab.accept_pull_rquest(5, 1)
+  #
+  # @param  [Integer] project The ID of a project.
+  # @param  [Integer] id The ID of a merge request.
+  # @return [Gitlab::ObjectifiedHash]
+  def accept_pull_request
+    begin
+      status = @g.accept_merge_rquest(@project.gpid, params[:id], User.current.gid)
+      PullRequest.create(:pull_request_id => status.id, :user_id => User.current.id, :gpid => status.project_id)
+      respond_to do |format|
+        format.js{redirect_to project_pull_request_path(status.id, :project_id => @project.id)}
+      end
+    rescue Exception => e
+      @message = e.message
+    end
+  end
+
+  # Updates a merge request.
+  #
+  # @example
+  #   Gitlab.update_merge_request(5, 42, :title => 'New title')
+  #
+  # @param  [Integer] project The ID of a project.
+  # @param  [Integer] id The ID of a merge request.
+  # @param  [Hash] options A customizable set of options.
+  # @option options [String] :title The title of a merge request.
+  # @option options [String] :source_branch The source branch name.
+  # @option options [String] :target_branch The target branch name.
+  # @option options [Integer] :assignee_id The ID of a user to assign merge request.
+  # @option options [String] :state_event New state (close|reopen|merge).
+  # @return [Gitlab::ObjectifiedHash] Information about updated merge request.
+  def update_pull_request
+    begin
+      @g.update_merge_request(@project.gpid, params[:id], User.current.gid, :state_event => params[:state])
+      respond_to do |format|
+        format.html{redirect_to project_pull_request_path(params[:id], :project_id => @project.id)}
+      end
+    rescue Exception => e
+      @message = e.message
+    end
+  end
+
+  # Creates a merge request.
+  #
+  # @example
+  #   Gitlab.create_merge_request(5, 'New merge request',
+  #     :source_branch => 'source_branch', :target_branch => 'target_branch')
+  #   Gitlab.create_merge_request(5, 'New merge request',
+  #     :source_branch => 'source_branch', :target_branch => 'target_branch', :assignee_id => 42)
+  def create_pull_request_comment
+    content = params[:pull_request_comment]
+    begin
+      @comments = @g.create_merge_request_comment(@project.gpid, params[:id], content, User.current.gid)
+      respond_to do |format|
+        format.html{redirect_to project_pull_request_path(params[:id], :project_id => @project.id)}
+      end
+    rescue Exception => e
+      @message = e.message
+    end
+  end
+
+  # Gets the comments on a merge request.
+  #
+  # @example
+  #   Gitlab.merge_request_comments(5, 1)
+  def pull_request_comments
+    begin
+      @comments = @g.merge_request_comments(@project.gpid, params[:id]).reverse
+      @comments_count = @comments.count
+
+      @limit = 10
+      @is_remote = true
+      @count = @comments_count
+      @pages = Paginator.new @count, @limit, params['page'] || 1
+      @offset ||= @pages.offset
+      @comments = paginateHelper @comments, 10
+    rescue Exception => e
+      @message = e.message
+    end
+  end
+
+  # Get a list of merge request commits.
+  # Parameters:
+  # id (required) - The ID of a project
+  # merge_request_id (required) - The ID of MR
+  def pull_request_commits
+    begin
+      @type = params[:type]
+      @commits = @g.merge_request_commits(@project.gpid, params[:id])
+      @commits_count = @commits.count
+
+      @limit = 10
+      @is_remote = true
+      @count = @commits_count
+      @pages = Paginator.new @count, @limit, params['page'] || 1
+      @offset ||= @pages.offset
+      @commits = paginateHelper @commits, 10
+    rescue Exception => e
+      @message = e.message
+    end
+  end
+
+  # Shows information about the merge request including its files and changes. With GitLab 8.2 the return fields upvotes and downvotes are deprecated and always return 0.
+  # Parameters:
+  # id (required) - The ID of a project
+  # merge_request_id (required) - The ID of MR
+  def pull_request_changes
+    begin
+      @type = params[:type]
+      @changes = @g.merge_request_changes(@project.gpid, params[:id]).try(:changes)
+      @changes_count = @changes.count
+
+      @limit = 10
+      @is_remote = true
+      @count = @changes_count
+      @pages = Paginator.new @count, @limit, params['page'] || 1
+      @offset ||= @pages.offset
+      @changes = paginateHelper @changes, 10
+    rescue Exception => e
+      @message = e.message
+    end
+  end
+
+  private
+  def connect_gitlab
+    @g = Gitlab.client
+  end
+
+  def find_project_and_repository
+    @project = Project.find(params[:project_id])
+    render_404 if @project.gpid.blank?
+    @repository = Repository.where(:project_id => @project.id, :type => "Repository::Gitlab")
+  rescue ActiveRecord::RecordNotFound
+    render_404
+  end
+
+end
diff --git a/app/controllers/quality_analysis_controller.rb b/app/controllers/quality_analysis_controller.rb
index c9873ade4..a0b275dc7 100644
--- a/app/controllers/quality_analysis_controller.rb
+++ b/app/controllers/quality_analysis_controller.rb
@@ -17,6 +17,7 @@ class QualityAnalysisController < ApplicationController
 
   # params 说明：{identifier：版本库名}
   def create
+    logger.info("11111111111111111111111111111")
     begin
       user_name = User.find(params[:user_id]).try(:login)
       identifier = params[:identifier]
@@ -32,12 +33,13 @@ class QualityAnalysisController < ApplicationController
       projects_date = open(@sonar_address + "/api/projects/index").read
       arr = JSON.parse(projects_date).map {|m| m["nm"]}   # eg: ["Hjqreturn:cc_rep", "Hjqreturn:putong", "Hjqreturn:sonar_rep2", "shitou:sonar_rep"]
       quality_an = QualityAnalysis.where(:sonar_name => sonar_name).first
-      if @client.job.exists?(job_name) && QualityAnalysis.where(:sonar_name => sonar_name).select{|qa| arr.include?(qa.sonar_name)}.blank?
-        aa = @client.job.delete("#{job_name}")
+      if @client_jenkins.job.exists?(job_name) && QualityAnalysis.where(:sonar_name => sonar_name).select{|qa| arr.include?(qa.sonar_name)}.blank?
+        aa = @client_jenkins.job.delete("#{job_name}")
         quality_an.delete unless quality_an.blank?
       end
+
       # Checks if the given job exists in Jenkins.
-      # unless @client.job.exists?(job_name)
+      unless @client_jenkins.job.exists?(job_name)
         @g = Gitlab.client
         branch = params[:branch]
         language = swith_language_type(params[:language])
@@ -59,20 +61,20 @@ class QualityAnalysisController < ApplicationController
         @doc.at_xpath("//hudson.plugins.sonar.SonarRunnerBuilder/properties").content = properties # sonar-properties
 
         # jenkins job创建
-        jenkins_job = @client.job.create("#{job_name}", @doc.to_xml)
+        jenkins_job = @client_jenkins.job.create("#{job_name}", @doc.to_xml)
         logger.info("Jenkins status of create ==> #{jenkins_job}")
 
         # 将地址作为hook值添加到gitlab
         @g.add_project_hook(@project.gpid, @jenkins_address + "/project/#{job_name}")
         # job创建完成后自动运行job,如果运行成功则返回‘200’
-        code = @client.job.build("#{job_name}")
+        code = @client_jenkins.job.build("#{job_name}")
         logger.error("build result ==> #{code}")
 
         # 判断调用sonar分析是否成功
         # 等待启动时间处理, 最长时间为30分钟
         for i in 0..360 do
           sleep(5)
-          @current_build_status = @client.job.get_current_build_status("#{job_name}")
+          @current_build_status = @client_jenkins.job.get_current_build_status("#{job_name}")
           if (@current_build_status == "success" || @current_build_status == "failure")
             break
             if i == 360
@@ -86,7 +88,7 @@ class QualityAnalysisController < ApplicationController
         sleep(10)
 
         # 获取sonar output结果
-        console_build = @client.job.get_console_output("#{job_name}", build_num = 0, start = 0, mode = 'text')["output"]
+        console_build = @client_jenkins.job.get_console_output("#{job_name}", build_num = 0, start = 0, mode = 'text')["output"]
         logger.info("@current_build_status is ==> #{@current_build_status}")
 
         # 两种情况需要删除job：
@@ -94,14 +96,14 @@ class QualityAnalysisController < ApplicationController
         # 2/creat和build成功，调用sonar启动失败则删除job
         # 错误信息存储需存到Trustie数据库，否则一旦job删除则无法获取这些信息
         if jenkins_job == '200' && code != '201'
-          @client.job.delete("#{job_name}")
+          @client_jenkins.job.delete("#{job_name}")
         else
           if @current_build_status == "failure"
             reg_console = /Exception:.*?\r/.match(console_build)
             output = reg_console[0].gsub("\r", "") unless reg_console.nil?
             se = SonarError.where(:jenkins_job_name => job_name).first
             se.nil? ? SonarError.create(:project_id => @project.id, :jenkins_job_name => job_name, :output => output) : se.update_column(:output, output)
-            @client.job.delete("#{job_name}")
+            @client_jenkins.job.delete("#{job_name}")
           elsif @current_build_status == "success"
             if quality_an.blank?
               QualityAnalysis.create(:project_id => @project.id, :author_login => user_name, :rep_identifier => identifier,
@@ -111,17 +113,24 @@ class QualityAnalysisController < ApplicationController
             end
           end
         end
-      # end
+
+        respond_to do |format|
+          if @current_build_status == "success"
+            format.html{redirect_to project_quality_analysis_path(:project_id => @project.id, :resource_id => sonar_name, :branch => branch, :current_build_status => @current_build_status, :job_name => job_name)}
+          elsif @current_build_status == "failure"
+            format.html{redirect_to error_list_project_quality_analysi_path(:project_id => @project.id, :job_name => job_name)}
+          end
+        end
+      end
     rescue => e
       @message = e.message
-    end
-    respond_to do |format|
-      if @current_build_status == "success"
-        format.html{redirect_to project_quality_analysis_path(:project_id => @project.id, :resource_id => sonar_name, :branch => branch, :current_build_status => @current_build_status, :job_name => job_name)}
-      elsif @current_build_status == "failure"
-        format.html{redirect_to error_list_project_quality_analysi_path(:project_id => @project.id, :job_name => job_name)}
+      logger.error("######################====>#{e.message}")
+      respond_to do |format|
+        format.html{redirect_to error_list_project_quality_analysi_path(:project_id => @project.id, :job_name => job_name, :message => @message)}
+        # format.html{redirect_to :controller => 'repositories', :action => 'show', :id => @project, :repository_id => identifier}
       end
     end
+
   end
 
   def error_list
@@ -159,9 +168,9 @@ class QualityAnalysisController < ApplicationController
       rep_id = Repository.where(:project_id => @project.id, :identifier => qa.rep_identifier).first.try(:id)
       job_name = "#{qa.author_login}-#{rep_id}"
       logger.info("result: job_name  ###################==>#{job_name}")
-      logger.info("result: @client.job  ###################==>#{@client.job}")
+      logger.info("result: @client_jenkins.job  ###################==>#{@client_jenkins.job}")
 
-      d_job = @client.job.delete(job_name)
+      d_job = @client_jenkins.job.delete(job_name)
       logger.info("result: delete job ###################==>#{d_job}")
       qa.delete
       respond_to do |format|
@@ -198,7 +207,7 @@ class QualityAnalysisController < ApplicationController
       @doc.at_xpath("//hudson.plugins.sonar.SonarRunnerBuilder/properties").content = properties # sonar-properties
 
       # update成功则返回 ‘200’
-      jenkins_job = @client.job.update("#{job_name}", @doc.to_xml)
+      jenkins_job = @client_jenkins.job.update("#{job_name}", @doc.to_xml)
       # 数据更新到Trustie数据
       if jenkins_job == '200'
         logger.info("quality_ananlysis will be updated: ==> #{jenkins_job}")
@@ -278,9 +287,10 @@ class QualityAnalysisController < ApplicationController
     @jenkins_address = Redmine::Configuration['jenkins_address']
     jenkins_username = Redmine::Configuration['jenkins_username']
     jenkins_password = Redmine::Configuration['jenkins_password']
-
+    logger.info("22222222222222222222222222222222")
     # connect jenkins
-    @client = JenkinsApi::Client.new(:server_url => @jenkins_address, :username => jenkins_username, :password => jenkins_password)
+    @client_jenkins = JenkinsApi::Client.new(:server_url => @jenkins_address, :username => jenkins_username, :password => jenkins_password)
+    logger.info("333333333333333333333333333333")
   rescue => e
     logger.error("failed to connect Jenkins ==> #{e}")
   end
diff --git a/app/controllers/repositories_controller.rb b/app/controllers/repositories_controller.rb
index 65b4a15d6..a79890870 100644
--- a/app/controllers/repositories_controller.rb
+++ b/app/controllers/repositories_controller.rb
@@ -386,9 +386,9 @@ update
         project_score.update_column(:changeset_num, @changesets_all_count)
       end
 
-      # unless @changesets_latest_coimmit.blank?
-      #   update_commits_date(@project, @changesets_latest_coimmit)
-      # end
+      unless @changesets_latest_coimmit.blank?
+        update_commits_date(@project, @changesets_latest_coimmit)
+      end
       @creator = @project.owner.to_s
       gitlab_address = Redmine::Configuration['gitlab_address']
 
diff --git a/app/controllers/school_controller.rb b/app/controllers/school_controller.rb
index 76d149f94..b6e34a185 100644
--- a/app/controllers/school_controller.rb
+++ b/app/controllers/school_controller.rb
@@ -188,11 +188,12 @@ class SchoolController < ApplicationController
           user_extention.school_id = school.id
           user_extention.save!
 
-          # status=4 向管理员发送信息
+          # 向管理员发送信息
           users = User.where(:admin => 1)
           users.each do |user|
-            AppliedMessage.create(:user_id => user.id, :status => 4, :applied_user_id => User.current.id, :viewed => true, :applied_id => school.id, :applied_type => "ApplyAddSchools", :name => school.name )
+            AppliedMessage.create(:user_id => user.id, :status => 0, :applied_user_id => User.current.id, :viewed => 0, :applied_id => school.id, :applied_type => "ApplyAddSchools", :name => school.name )
           end
+
         else
           data[:result] = 3
         end
diff --git a/app/controllers/student_work_controller.rb b/app/controllers/student_work_controller.rb
index 8f3ebff98..722845ef7 100644
--- a/app/controllers/student_work_controller.rb
+++ b/app/controllers/student_work_controller.rb
@@ -868,6 +868,7 @@ class StudentWorkController < ApplicationController
       update_org_activity(@homework.class,@homework.id)
       if @work.save
         @work = @homework.student_works.select("student_works.*,student_works.work_score as score").where(:id => @work.id).first
+        @count = @homework.student_works.has_committed.count
         respond_to do |format|
           format.js
         end
diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb
index 5dc736c48..e929153ad 100644
--- a/app/controllers/users_controller.rb
+++ b/app/controllers/users_controller.rb
@@ -42,7 +42,7 @@ class UsersController < ApplicationController
                                       :activity_new_score_index, :influence_new_score_index, :score_new_index,:user_projects_index,:user_resource,
                                       :user_courses4show,:user_projects4show,:user_course_activities,:user_project_activities,:user_feedback4show,:user_visitorlist,:user_messages,:edit_brief_introduction,
                                       :user_import_homeworks,:user_search_homeworks,:user_import_resource, :user_system_messages,:choose_user_course,:user_courselist,:user_projectlist,:sort_syllabus_list,
-                                      :my_homeworks,:manage_or_receive_homeworks,:search_m_r_homeworks]
+                                      :sort_project_list,:my_homeworks,:manage_or_receive_homeworks,:search_m_r_homeworks]
   before_filter :auth_user_extension, only: :show
   #before_filter :rest_user_score, only: :show
   #before_filter :select_entry, only: :user_projects
@@ -353,14 +353,14 @@ class UsersController < ApplicationController
   def dealwith_apply_request
     @msg = CourseMessage.find(params[:msg_id])
     #CourseMessage content存的是role  7教辅  9 教师
+    apply_user = User.find(@msg.course_message_id)
+    ids = @msg.content.split(",") #  [@msg.content] msg content保存的是申请的职位角色
+    integer_ids = []
+    ids.each do |role_id|
+      integer_ids << role_id.to_i
+    end
     case params[:agree]
       when 'Y'
-        apply_user = User.find(@msg.course_message_id)
-        ids = @msg.content.split(",") #  [@msg.content] msg content保存的是申请的职位角色
-        integer_ids = []
-        ids.each do |role_id|
-          integer_ids << role_id.to_i
-        end
         if apply_user.member_of_course?(Course.find(@msg.course_id))
           #将角色改为老师或者教辅
           member =  Course.find(@msg.course_id).members.where(:user_id=>apply_user.id).all[0]
@@ -383,11 +383,32 @@ class UsersController < ApplicationController
           Course.find(@msg.course_id).members << members
           CourseMessage.create(:user_id => @msg.course_message_id, :course_id => @msg.course_id, :viewed => false,:content=> @msg.content,:course_message_id=>User.current.id,:content=>@msg.content,:course_message_type=>'CourseRequestDealResult',:status=>1)
           @msg.update_attributes(:status=>1,:viewed=>1)
+
+          if integer_ids.include?(9)
+            cs = CoursesService.new
+            c = Course.find(@msg.course_id)
+            cs.send_wechat_join_class_notice apply_user,c,9,0
+          else
+            cs = CoursesService.new
+            c = Course.find(@msg.course_id)
+            cs.send_wechat_join_class_notice apply_user,c,7,0
+          end
         end
 
       when 'N'
         CourseMessage.create(:user_id => @msg.course_message_id, :course_id => @msg.course_id, :viewed => false,:content=> @msg.content,:course_message_id=>User.current.id,:content=>@msg.content,:course_message_type=>'CourseRequestDealResult',:status=>2)
         @msg.update_attributes(:status=>2,:viewed=>1)
+
+        if integer_ids.include?(9)
+          cs = CoursesService.new
+          c = Course.find(@msg.course_id)
+          cs.send_wechat_join_class_notice apply_user,c,9,1
+        else
+          cs = CoursesService.new
+          c = Course.find(@msg.course_id)
+          cs.send_wechat_join_class_notice apply_user,c,7,1
+        end
+
     end
     respond_to do |format|
       format.js
@@ -1461,6 +1482,7 @@ class UsersController < ApplicationController
   def user_projects4show
     @page = params[:page].to_i + 1
     @projects = @user.projects.visible.select("projects.*,(SELECT MAX(updated_at)  FROM `forge_activities` WHERE forge_activities.project_id = projects.id) AS a").order("a desc").limit(10).offset(@page * 10)
+    @all_count = @user.projects.visible.count
   end
 
   def user_course_activities
@@ -3418,7 +3440,22 @@ class UsersController < ApplicationController
   end
 
   def user_projectlist
-    @order, @c_sort,@type = params[:order] || 1, params[:sort] || 1, params[:type] || 1
+    @order, @c_sort, @type, @list_type = 1, 2, 1, 1
+    #limit = 5
+
+    @my_projects = @user.projects.visible.where("projects.user_id = #{@user.id}").select("projects.*,(SELECT MAX(updated_at) FROM `forge_activities` WHERE forge_activities.project_id = projects.id) AS updatetime").order("updatetime DESC")
+    @my_projects_count = @my_projects.count
+
+    @my_joined_projects = @user.projects.visible.where("projects.user_id != #{@user.id}").select("projects.*,(SELECT MAX(updated_at) FROM `forge_activities` WHERE forge_activities.project_id = projects.id) AS updatetime").order("updatetime DESC")
+    @my_joined_projects_count = @my_joined_projects.count
+    respond_to do |format|
+      format.html {render :layout => 'new_base_user'}
+    end
+  end
+
+  def sort_project_list
+    @order, @c_sort, @type, @list_type = params[:order] || 1, params[:sort] || 1, params[:type] || 1, params[:list_type] || 1
+    #limit = 5
 
     #确定 sort_type
     if @order.to_i == @type.to_i
@@ -3427,11 +3464,16 @@ class UsersController < ApplicationController
       @c_sort = 2
     end
 
-    sort_name = "updated_at"
+    sort_name = "updatetime"
     sort_type = @c_sort == 1 ? "asc" : "desc"
 
     #@projects = @user.projects.visible.order("#{sort_name} #{sort_type}")
-    @projects = @user.projects.visible.select("projects.*,(SELECT MAX(updated_at)  FROM `forge_activities` WHERE forge_activities.project_id = projects.id) AS #{sort_name} ").order("#{sort_name} #{sort_type}")
+    if @list_type.to_i == 1
+      @projects = @user.projects.visible.where("projects.user_id = #{@user.id}").select("projects.*,(SELECT MAX(updated_at) FROM `forge_activities` WHERE forge_activities.project_id = projects.id) AS #{sort_name}").order("#{sort_name} #{sort_type}")
+    else
+      @projects = @user.projects.visible.where("projects.user_id != #{@user.id}").select("projects.*,(SELECT MAX(updated_at) FROM `forge_activities` WHERE forge_activities.project_id = projects.id) AS #{sort_name}").order("#{sort_name} #{sort_type}")
+    end
+    @projects_count = @projects.count
 
     #根据 问题+资源数排序 @project.project_score.issue_num @project.project_score.attach_num
     if @order.to_i == 2
@@ -3448,18 +3490,8 @@ class UsersController < ApplicationController
       @type = 1
     end
 
-    #分页
-    @limit = 10
-    @is_remote = true
-    @atta_count = @projects.count
-    @atta_pages = Paginator.new @atta_count, @limit, params['page'] || 1
-    @offset ||= @atta_pages.offset
-    @projects = paginateHelper @projects,@limit
-    @is_project = 1
-
     respond_to do |format|
       format.js
-      format.html {render :layout => 'new_base_user'}
     end
   end
 
diff --git a/app/controllers/wechats_controller.rb b/app/controllers/wechats_controller.rb
index 23a443925..6ccfbcce1 100644
--- a/app/controllers/wechats_controller.rb
+++ b/app/controllers/wechats_controller.rb
@@ -10,8 +10,8 @@ class WechatsController < ActionController::Base
       #邀请码
     if join_class_request(request)
       sendBindClass(request, {invite_code: content})
-    # elsif join_project_request(request)
-    #   sendBindProject(request, {invite_code: content})
+    elsif join_project_request(request)
+      sendBindProject(request, {invite_code: content})
     else
       request.reply.text "您的意见已收到，非常感谢~ \n更多问题可以通过以下方式联系我们：\n官方QQ群：173184401\n我们会认真聆听您的意见和建议。"
     end
@@ -49,7 +49,7 @@ class WechatsController < ActionController::Base
   # When no any on :scan responder can match subscribe user scaned scene_id
   on :event, with: 'scan' do |request|
     if request[:EventKey].present?
-      sendBindClass(request, {ticket: request[:Ticket]})
+      checkTicket(request, {ticket: request[:Ticket]})
     end
   end
 
@@ -137,7 +137,7 @@ class WechatsController < ActionController::Base
   on :fallback, respond: 'fallback message'
 
   on :click, with: 'FEEDBACK' do |request, key|
-    request.reply.text "如有反馈问题，请直接切换至输入框，发微信给我们即可"
+    request.reply.text "如有问题反馈，请您：\n1、直接切换至输入框，发微信给我们。\n2、加入QQ群：173184401，我们直接互动。\n欢迎大家积极反馈，谢谢啦！"
   end
 
   on :click, with: 'MY_NEWS' do |request, key|
@@ -149,13 +149,13 @@ class WechatsController < ActionController::Base
   end
 
   on :click, with: 'JOIN_PROJECT' do |request, key|
-    request.reply.text "该功能将在近日开放，敬请期待！"
-    # uw = user_binded?(request[:FromUserName])
-    # unless uw
-    #   sendBind(request)
-    # else
-    #   request.reply.text "请直接回复6位项目邀请码\n(不区分大小写):"
-    # end
+    # request.reply.text "该功能将在近日开放，敬请期待！"
+    uw = user_binded?(request[:FromUserName])
+    unless uw
+      sendBind(request)
+    else
+      request.reply.text "请直接回复6位项目邀请码\n(不区分大小写):"
+    end
   end
 
   on :click, with: 'JOIN_CLASS' do |request, key|
@@ -209,6 +209,39 @@ class WechatsController < ActionController::Base
     end
   end
 
+  def checkTicket(request,params)
+    begin
+      uw = user_binded?(request[:FromUserName])
+      if !uw
+        return sendBind(request)
+      end
+
+      course = nil
+      course = Course.where(qrcode: params[:ticket]).first if params[:ticket]
+      course = Course.where(invite_code: params[:invite_code]).first if params[:invite_code]
+
+      if course
+        return join_class(params, uw.user, request)
+      else
+        project = nil
+        project = Project.where(qrcode: params[:ticket]).first if params[:ticket]
+        project = Project.where(invite_code: params[:invite_code]).first if params[:invite_code]
+        if project
+          return join_project(params, uw.user, request)
+        end
+      end
+
+      raise "该二维码已失效"
+
+    rescue => e
+      logger.error e.inspect
+      logger.error e.backtrace.join("\n")
+      return request.reply.text e
+    end
+
+
+  end
+
   def default_msg(request)
     uw = user_binded?(request[:FromUserName])
     if uw && uw.user
@@ -219,13 +252,16 @@ class WechatsController < ActionController::Base
   end
 
   def sendBind(request)
+    tmpurl = "https://open.weixin.qq.com/connect/oauth2/authorize?appid=#{Wechat.config.appid}&redirect_uri=#{ROOT_URL+'/wechat/user_activities'}&response_type=code&scope=snsapi_base&state=login&connect_redirect=1#wechat_redirect"
+    logger.info "tmpurl!!!!!!!!!!!!!!"
+    logger.info tmpurl
     news = (1..1).each_with_object([]) { |n, memo| memo << { title: '绑定登录', content: "欢迎使用Trustie创新实践服务平台！
 在这里您可以随时了解您的课程和项目动态，随时点赞和回复。
 我们将会与微信不断结合，为您提供更有价值的服务。
 
 您还未绑定确实的用户，请先绑定，谢谢！" } }
     request.reply.news(news) do |article, n, index| # article is return object
-      url = "https://open.weixin.qq.com/connect/oauth2/authorize?appid=#{Wechat.config.appid}&redirect_uri=#{ROOT_URL+'/wechat/user_activities'}&response_type=code&scope=snsapi_base&state=login#wechat_redirect"
+      url = tmpurl
       pic_url = "#{ROOT_URL}/images/weixin_pic.jpg"
       article.item title: "#{n[:title]}",
                    description: n[:content],
@@ -251,7 +287,7 @@ class WechatsController < ActionController::Base
     end
 
     news = (1..1).each_with_object([]) { |n, memo| memo << { title: '恭喜您成功加入班级，开始学习吧！',
-                                                             content: "课程名称：#{course.name}\n班级名称：#{course.name}\n任课老师：#{course.teacher.show_name}\n进入班级，和小伙伴愉快的学习吧！"} }
+                                                             content: "课程名称：#{course.syllabus.title}\n班级名称：#{course.name}\n任课老师：#{course.teacher.show_name}\n进入班级，和小伙伴愉快的学习吧！"} }
     return request.reply.news(news) do |article, n, index| # article is return object
       url = "https://open.weixin.qq.com/connect/oauth2/authorize?appid=#{Wechat.config.appid}&redirect_uri=#{ROOT_URL+'/wechat/user_activities#/class?id='+course.id.to_s}&response_type=code&scope=snsapi_base&state=myclass#wechat_redirect"
       pic_url = "#{ROOT_URL}/images/wechat/class.jpg"
@@ -273,18 +309,18 @@ class WechatsController < ActionController::Base
     role = 5
 
     ps = ProjectsService.new
-    status = ps.join_project({invite_code: project.invite_code}, user)
-    if status[:state] != 0
-      raise ProjectService::JoinProjectError.message(status)
+    status = ps.join_project({role:5, invite_code: project.invite_code}, user)
+    if status != 0
+      raise ProjectsService::JoinProjectError.message(status)
     end
 
     creator = User.find(project.user_id)
 
     news = (1..1).each_with_object([]) { |n, memo| memo << { title: '恭喜您成功加入项目，开始研发吧！',
-                                                             content: "项目名称：#{project.name}\n发起人：#{creator.name}\n进入项目，和小伙伴轻松的研发吧！"} }
+                                                             content: "项目名称：#{project.name}\n发起人：#{creator.show_name}\n进入项目，和小伙伴轻松的研发吧！"} }
     return request.reply.news(news) do |article, n, index| # article is return object
       url = "https://open.weixin.qq.com/connect/oauth2/authorize?appid=#{Wechat.config.appid}&redirect_uri=#{ROOT_URL+'/wechat/user_activities#/project?id='+project.id.to_s}&response_type=code&scope=snsapi_base&state=myproject#wechat_redirect"
-      pic_url = "#{ROOT_URL}/images/wechat/class.jpg"
+      pic_url = "#{ROOT_URL}/images/wechat/project.jpg"
       article.item title: "#{n[:title]}",
                    description: n[:content],
                    pic_url: pic_url,
@@ -300,10 +336,12 @@ class WechatsController < ActionController::Base
         code = params[:code] || session[:wechat_code]
         openid = get_openid_from_code(code)
 
-        raise "无法获取到微信openid" unless openid
+        # raise "无法获取到微信openid" unless openid
+
+        raise "请在微信中关注Trustie创新实践平台后再打开本页面" unless openid
 
         uw = UserWechat.where(openid: openid).first
-        raise "还未绑定trustie帐户" unless uw
+        raise "还未绑定trustie帐户" unless (uw && uw.bindtype == 0)
         logger.debug "get_bind ============= #{uw}"
 
         user = uw.user
@@ -316,13 +354,25 @@ class WechatsController < ActionController::Base
       end
     end
 
+    def is_bind
+      begin
+        code = params[:code] || session[:wechat_code]
+        open_id = get_openid_from_code(code)
+        raise "还未绑定trustie帐户" unless user_binded?(open_id)
+        render :json => {status: 0}
+      rescue Exception=>e
+        render :json => {status: -1, message: e.message}
+      end
+    end
+
     def bind
       begin
 
         code = params[:code] || session[:wechat_code]
         openid = get_openid_from_code(code)
 
-        raise "无法获取到openid，请在微信中打开本页面" unless openid
+        # raise "无法获取到openid，请在微信中打开本页面" unless openid
+        raise "请在微信中关注Trustie创新实践平台后再打开本页面" unless openid
         raise "此微信号已绑定用户，不能重复绑定" if user_binded?(openid)
 
         user, last_login_on = User.try_to_login(params[:username], params[:password])
@@ -336,7 +386,7 @@ class WechatsController < ActionController::Base
             user: user
         )
         ws = WechatService.new
-        ws.binding_succ_notice(user.id, "您已成功绑定Trustie平台！", user.login, format_time(Time.now))
+        ws.binding_succ_notice(user.id, "您已成功绑定Trustie平台！", user.show_name+"("+user.login+")", format_time(Time.now))
         render :json => {status:0, msg: "绑定成功"}
       rescue Exception=>e
         render :json => {status: -1, msg: e.message}
@@ -350,17 +400,28 @@ class WechatsController < ActionController::Base
       render 'wechats/user_activities', layout: nil
     end
 
+   
+
     def user_activities
+
+      @appid = Wechat.config.appid
+      ## sign
+
+      @sign_params = wechat.jsapi_ticket.signature(current_url)
+
       session[:wechat_code] = params[:code] if params[:code]
       @path = '/'+(params[:state] || '')
       open_id = get_openid_from_code(params[:code]) rescue
       unless open_id
         render 'wechats/open_wechat', layout: nil and return
       end
+
+      logger.info "user_activities!!!!!!!!!!!!!!"
+      logger.info params
       
-      unless user_binded?(open_id)
-        @path = '/login'
-      else
+      # unless (user_binded?(open_id) || params[:state] == "invite_code" || params[:state] == "project_invite_code" ||  params[:state] == "blog_comment" || params[:state] == "course_notice" || params[:state] == "project_discussion" || params[:state] == "course_discussion" || params[:state] == "homework" || params[:state] == "issues" || params[:state] == "journal_for_message")
+      #   @path = '/login'
+      # else
         if params[:state] == 'myclass'
           @course_id = params[:id];
         elsif params[:state] == 'myproject'
@@ -369,9 +430,16 @@ class WechatsController < ActionController::Base
 
         session[:wechat_openid] = open_id
         if params[:code]
-          redirect_to "/wechat/user_activities##{@path}?id=#{params[:id]}" and return
+          if params[:userid]
+            redirect_to "/wechat/user_activities##{@path}?id=#{params[:id]}&userid=#{params[:userid]}" and return
+          elsif params[:id]
+            redirect_to "/wechat/user_activities##{@path}?id=#{params[:id]}" and return
+          else
+            redirect_to "/wechat/user_activities##{@path}" and return
+          end
+          # redirect_to "/wechat/user_activities##{@path}?id=#{params[:id]}" and return
         end
-      end
+      # end
       render 'wechats/user_activities', layout: nil
     end
 
@@ -380,10 +448,19 @@ class WechatsController < ActionController::Base
     def get_openid_from_code(code)
       return 'oCnvgvz8R7QheXE-R9Kkr39j8Ndg' if code =='only-for-test'
       openid = session[:wechat_openid]
-
       unless openid
         if code
-          openid = wechat.web_access_token(code)["openid"]
+          #不能联系调两次web_access_token 否则会提示请在微信客户端打开次链接
+          info = wechat.web_access_token(code)
+          openid =info["openid"]
+          access_token =info["access_token"]
+          if access_token
+             session[:access_token] = access_token
+          end
+          refresh_token = info["refresh_token"]
+          if refresh_token
+            session[:refresh_token] = refresh_token
+          end
         end
       end
 
@@ -396,8 +473,16 @@ class WechatsController < ActionController::Base
 
     def user_binded?(openid)
       uw = UserWechat.where(openid: openid).first
+      if uw && uw.bindtype == 0
+        uw
+      else
+        nil
+      end
     end
 
+    def current_url
+      "#{request.protocol}#{request.host_with_port}#{request.fullpath}"
+    end
 
 
   end
diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb
index 0eaa10a5d..da66f249b 100644
--- a/app/helpers/application_helper.rb
+++ b/app/helpers/application_helper.rb
@@ -43,6 +43,12 @@ module ApplicationHelper
     user.nil? ? User.find(2) : user
   end
 
+  # 通过系统外部用户名查找用户，如果用户不存在则用邮箱替换
+  def get_user_by_login_and login
+    user = User.find_by_login(login)
+    user.nil? ? User.find(2) : user
+  end
+
   # 历史数据（老版本库数据）处理完则可以修改该放放
   def get_rep_identifier_by_project project
     identifier = Repository.where(:project_id => project.id, :type => "Repository::Gitlab").first.try(:identifier)
@@ -814,6 +820,18 @@ module ApplicationHelper
     return @result
   end
 
+  # 必须是项目成，项目必须提交过代码
+  def allow_pull_request project
+    return false if project.gpid.nil?
+    g = Gitlab.client
+    count = g.user_static(project.gpid, :rev => "master").count
+    if User.current.member_of?(project) && count > 0
+      true
+    else
+      false
+    end
+  end
+
   # 判断版本库是否初始为gitlab
   def rep_is_gitlab?(project)
     rep = project.repositories.where("type =?",  "Repository::Gitlab")
@@ -2154,7 +2172,7 @@ module ApplicationHelper
         candown = User.current.member_of_org?(org) || (attachment.is_public == 1) || attachment.get_status_by_attach(User.current.id) == 2
       elsif attachment.container.is_a?(OrgDocumentComment)
         org = attachment.container.organization
-        candown = User.current.member_of_org?(org) || (org.is_public && attachment.is_public == 1)
+        candown = org.allow_guest_download || User.current.member_of_org?(org) || (org.is_public && attachment.is_public == 1)
       elsif (attachment.container.has_attribute?(:board) || attachment.container.has_attribute?(:board_id)) && attachment.container.board &&
           attachment.container.board.course
         course = attachment.container.board.course
@@ -2823,7 +2841,7 @@ module ApplicationHelper
   #获取当前作业的提交截止时间/互评截止时间
   def cur_homework_end_time homework
     str = ""
-    if homework.anonymous_comment == 0 && homework.end_time < Date.today && homework.homework_detail_manual
+    if homework.anonymous_comment == 0 && homework.end_time && homework.end_time < Date.today && homework.homework_detail_manual
       str = "互评截止：#{format_date homework.homework_detail_manual.evaluation_end}"
     else
       str = "提交截止：#{homework.end_time ? (format_date homework.end_time) : '&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;--&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;'}"
diff --git a/app/helpers/pull_requests_helper.rb b/app/helpers/pull_requests_helper.rb
new file mode 100644
index 000000000..07b022358
--- /dev/null
+++ b/app/helpers/pull_requests_helper.rb
@@ -0,0 +1,50 @@
+module PullRequestsHelper
+
+  # 获取diff内容行号
+  def diff_line_num content
+    content.scan(/@@ -(\d+),\d+ \+\d+,\d+ @@/).first.nil? ? "" : content.scan(/@@ -(\d+),\d+ \+\d+,\d+ @@/).first.join("").to_i
+  end
+
+  # 处理内容
+  def diff_content content
+    content.gsub!(/.*@@ -\d+,\d+ \+\d+,\d+ @@\n/m,'')
+  end
+
+  def get_user_name user_id
+    User.find(user_id).try(:login)
+  end
+
+  # 获取接受PullRequest用户的信息
+  def accept_user pull_request_id
+    PullRequest.where(:pull_request_id => pull_request_id).first
+  end
+
+  def get_state state
+    case state
+      when "open","reopened"
+        l(:label_state_open)
+      when "closed"
+        l(:label_state_closed)
+      when "merged"
+        l(:label_state_merged)
+    end
+  end
+
+  def type_count type, requests_opened_count, requests_merged_count, requests_closed_count
+    case type
+      when nil, "1"
+        requests_opened_count
+      when "2"
+        requests_merged_count
+      when "3"
+        requests_closed_count
+    end
+  end
+
+  # 判断是否允许创建Pull Request
+  # 如果分支相同，并且项目相同则提示
+  def judge_pr_allow
+
+  end
+
+end
diff --git a/app/helpers/quality_analysis_helper.rb b/app/helpers/quality_analysis_helper.rb
index 5940dd255..f7dbf3469 100644
--- a/app/helpers/quality_analysis_helper.rb
+++ b/app/helpers/quality_analysis_helper.rb
@@ -1,23 +1,33 @@
 # encoding: utf-8
 module QualityAnalysisHelper
 
+  def sonar_time sonar_name
+    sonar = open(@sonar_address + "/api/resources/index?resource=#{sonar_name}&depth=0").read
+    sonar =JSON.parse(sonar).first['date']
+  end
+
   def sqale_rating_status val
     arr = []
     if val <= 5
       arr << "很好"
       arr << "b_green2"
+      arr << "A"
     elsif  val. > 5  && val <= 10
       arr << "较好"
       arr << "b_slow_yellow"
+      arr << "B"
     elsif  val > 10  && val <= 20
       arr << "中等"
       arr << "b_yellow"
+      arr << "C"
     elsif  val > 20  && val <= 50
       arr << "较差"
       arr << "b_slow_red"
+      arr << "D"
     elsif val > 20
       arr << "很差"
       arr << "b_red"
+      arr << "E"
     end
   end
 
diff --git a/app/helpers/repositories_helper.rb b/app/helpers/repositories_helper.rb
index ef637d3ee..bc5e8ee57 100644
--- a/app/helpers/repositories_helper.rb
+++ b/app/helpers/repositories_helper.rb
@@ -47,9 +47,9 @@ module RepositoriesHelper
   end
 
   # 获取文件目录的最新动态
-  def get_trees_last_changes(project_id, rev, ent_name, g)
+  def get_trees_last_changes(gpid, rev, ent_name, g)
     begin
-      tree_changes = g.rep_last_changes(project_id, :rev => rev, :path => ent_name)
+      tree_changes = g.rep_last_changes(gpid, :rev => rev, :path => ent_name)
     rescue Exception => e
       puts e
     end
diff --git a/app/helpers/users_helper.rb b/app/helpers/users_helper.rb
index 88fe87c6a..398fb8510 100644
--- a/app/helpers/users_helper.rb
+++ b/app/helpers/users_helper.rb
@@ -80,6 +80,19 @@ module UsersHelper
     # end
   end
 
+  def applied_project_status applied_message
+    case applied_message.status
+      when 4
+        "被拒绝"
+      when 5
+        "您已拒绝"
+      when 6
+        "已通过"
+      when 7
+        "您已同意"
+    end
+  end
+
   # 项目申请消息通过状态判断tip描述
   def applied_project_tip applied_message
     case applied_message.status
@@ -92,6 +105,35 @@ module UsersHelper
     end
   end
 
+  # 单位申请消息：通过用户的状态判断
+  # status(0：申请消息；1,2,3：系统消息)
+  def applied_school_users applied_message
+    user = User.find(applied_message.applied_user_id)
+  end
+
+  # 单位申请消息通过状态判断tip描述
+  def applied_school_tip applied_message
+    case applied_message.status
+      when 1,2,3
+        "您添加新的单位："
+      when 0
+        "申请了单位："
+    end
+  end
+
+  def applied_project_tip_header applied_message
+    case applied_message.status
+      when 4
+        "婉拒您"
+      when 5,3,2,1,7
+        "申请:"
+      when 6
+        "同意您"
+    end
+  end
+
+
+
   def get_resource_origin attach
     type = attach.container_type
     content = attach.container
diff --git a/app/models/applied_project.rb b/app/models/applied_project.rb
index b1945a937..a6eef8417 100644
--- a/app/models/applied_project.rb
+++ b/app/models/applied_project.rb
@@ -1,3 +1,4 @@
+#coding=utf-8
 class AppliedProject < ActiveRecord::Base
   attr_accessible :project_id, :user_id, :role
 
@@ -11,6 +12,14 @@ class AppliedProject < ActiveRecord::Base
   def send_appliled_message
     self.project.managers.each do |member|
       self.applied_messages << AppliedMessage.new(:user_id => member.user_id, :status => true, :viewed => false, :applied_user_id => self.user_id, :role => self.role, :project_id => self.project_id)
+
+      #----------------微信通知----------------------
+      count = ShieldWechatMessage.where("container_type='User' and container_id=#{member.user_id} and shield_type='Project' and shield_id=#{self.project_id}").count
+      if count == 0
+        ws = WechatService.new
+        ws.project_review_notice member.user_id, "review_project_member", self.project_id, "项目成员审批通知。", self.project.name, self.user.show_name, format_time(Time.now),"点击查看申请详情。",self.user.id
+      end
+      #--------------------------------------------
     end
     # end
   end
diff --git a/app/models/apply_add_schools.rb b/app/models/apply_add_schools.rb
index 573a494ef..60c2c404f 100644
--- a/app/models/apply_add_schools.rb
+++ b/app/models/apply_add_schools.rb
@@ -4,13 +4,5 @@ class ApplyAddSchools < ActiveRecord::Base
   has_many :applied_messages, :class_name =>'AppliedMessage', :as => :applied
   belongs_to :school
 
-  after_create :send_massage
-
-  #给系统所有管理发送消息
-  def send_massage
-    users = User.where(:admin => 1)
-    users.each do |user|
-      self.applied_messages << AppliedMessage.new(:user_id => user.id, :viewed => false, :status => false)
-    end
-  end
+  #after_create :send_massage
 end
diff --git a/app/models/course.rb b/app/models/course.rb
index 561a031ae..659f9fcec 100644
--- a/app/models/course.rb
+++ b/app/models/course.rb
@@ -80,6 +80,7 @@ class Course < ActiveRecord::Base
   after_update :update_files_public,:update_course_ealasticsearch_index
   after_create :create_board_sync, :act_as_course_activity, :act_as_course_message,:create_course_ealasticsearch_index
   before_destroy :delete_all_members,:delete_course_ealasticsearch_index
+  after_save :log_infor
 
   safe_attributes 'extra',
   'time',
@@ -504,6 +505,10 @@ class Course < ActiveRecord::Base
     ticket
   end
 
+  def log_infor
+    Rails.logger.info "##########################################################course's syllabus_id is #{self.syllabus_id}."
+  end
+
 end
 
 
diff --git a/app/models/homework_common.rb b/app/models/homework_common.rb
index 86aab8260..a901e6338 100644
--- a/app/models/homework_common.rb
+++ b/app/models/homework_common.rb
@@ -77,7 +77,7 @@ class HomeworkCommon < ActiveRecord::Base
           count = ShieldWechatMessage.where("container_type='User' and container_id=#{m.user_id} and shield_type='Course' and shield_id=#{self.course_id}").count
           if count == 0
             ws = WechatService.new
-            ws.homework_message_notice(m.user_id, "homework", self.id, "#{m.user.show_name}，#{l(:label_new_homework_template)}：", self.course.name, "新作业："+ self.name.html_safe, "作业内容请点击“详情”查看。")
+            ws.homework_message_notice(m.user_id, "homework", self.id, "#{m.user.show_name}，#{l(:label_new_homework_template)}", self.course.name, "新作业："+ self.name.html_safe, "作业内容请点击“详情”查看。")
           end
           # end
         end
diff --git a/app/models/news.rb b/app/models/news.rb
index 54f6fce08..cd7156cca 100644
--- a/app/models/news.rb
+++ b/app/models/news.rb
@@ -173,7 +173,7 @@ class News < ActiveRecord::Base
           count = ShieldWechatMessage.where("container_type='User' and container_id=#{m.user_id} and shield_type='Course' and shield_id=#{self.course_id}").count
           if count == 0
             ws = WechatService.new
-            content = strip_html self.author.try(:realname) + " 发布了通知：" + self.title.html_safe, 200
+            content = self.title
             ws.class_notice m.user_id, "course_notice", self.id, "#{l(:label_new_notice_template)}", self.course.name, self.author.show_name, format_time(self.created_on), content, "点击查看通知详情"
           end
         end
diff --git a/app/models/project.rb b/app/models/project.rb
index 67f010210..0d297bb3c 100644
--- a/app/models/project.rb
+++ b/app/models/project.rb
@@ -928,6 +928,18 @@ class Project < ActiveRecord::Base
     code
   end
 
+  def generate_qrcode
+    ticket = self.qrcode
+    if !ticket || ticket.size < 10
+      response = Wechat.api.qrcode_create_scene(invite_code, 2592000)
+      logger.debug "response = #{response}"
+      self.qrcode = response['ticket']
+      save!
+      ticket = qrcode
+    end
+    ticket
+  end
+
   private
 
   def after_parent_changed(parent_was)
@@ -1224,8 +1236,7 @@ class Project < ActiveRecord::Base
   # 创建项目后在项目下同步创建一个讨论区
   def create_board_sync
     @board = self.boards.build
-    self.name=" #{l(:label_borad_project) }"
-    @board.name = self.name
+    @board.name = " #{l(:label_borad_project) }"
     @board.description = self.name.to_s 
     if @board.save
       logger.debug "[Project Model] ===> #{@board.to_json}"
@@ -1243,12 +1254,14 @@ class Project < ActiveRecord::Base
 
 
   def create_project_ealasticsearch_index
+    return if Rails.env.development?
     if self.is_public
     self.__elasticsearch__.index_document
     end
   end
 
   def update_project_ealasticsearch_index
+    return if Rails.env.development?
     if self.is_public #如果是初次更新成为公开的情况，会报错，那么这条记录尚未被索引过。没有报错就是更新的其他属性
       begin
         self.__elasticsearch__.update_document
@@ -1265,6 +1278,7 @@ class Project < ActiveRecord::Base
   end
 
   def delete_project_ealasticsearch_index
+    return if Rails.env.development?
     begin
       self.__elasticsearch__.delete_document
     rescue => e
diff --git a/app/models/pull_request.rb b/app/models/pull_request.rb
new file mode 100644
index 000000000..f40397cf0
--- /dev/null
+++ b/app/models/pull_request.rb
@@ -0,0 +1,4 @@
+class PullRequest < ActiveRecord::Base
+  attr_accessible :gpid, :pull_request_id, :user_id
+  validates_uniqueness_of :pull_request_id
+end
diff --git a/app/models/user.rb b/app/models/user.rb
index 57663f3eb..b863c1f70 100644
--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -228,7 +228,7 @@ class User < Principal
   # Prevents unauthorized assignments
   attr_protected :login, :admin, :password, :password_confirmation, :hashed_password
 
-  LOGIN_LENGTH_LIMIT = 25
+  LOGIN_LENGTH_LIMIT = 30
   MAIL_LENGTH_LIMIT = 60
 
   validates_presence_of :login,  :mail, :if => Proc.new { |user| !user.is_a?(AnonymousUser) }
diff --git a/app/models/user_wechat.rb b/app/models/user_wechat.rb
index 49053dbf0..c63411ab3 100644
--- a/app/models/user_wechat.rb
+++ b/app/models/user_wechat.rb
@@ -1,6 +1,27 @@
 class UserWechat < ActiveRecord::Base
   attr_accessible :subscribe, :openid, :nickname, :sex, :language, :city, :province, :country,
-                  :headimgurl, :subscribe_time, :unionid, :remark, :groupid, :user, :user_id
+                  :headimgurl, :subscribe_time, :unionid, :remark, :groupid, :user, :user_id, :bindtype
 
   belongs_to :user
+
+  def real?
+    bindtype == 0
+  end
+
+  def migrate_user(u)
+    self.bindtype = 0
+    old_user = user.id
+    self.user = u
+    self.save
+    
+    ## 主要是将comment 迁移
+    User.delete(old_user)
+
+    JournalsForMessage.where(user_id: old_user).update_all(user_id: u.id)
+    Journal.where(user_id: old_user).update_all(user_id: u.id)
+    Comment.where(author_id: old_user).update_all(author_id: u.id)
+    Message.where(author_id: old_user).update_all(author_id: u.id)
+    BlogComment.where(author_id: old_user).update_all(author_id: u.id)
+    UserActivity.where(user_id: old_user).update_all(user_id: u.id)
+  end
 end
diff --git a/app/services/courses_service.rb b/app/services/courses_service.rb
index d01b89833..7d574bada 100644
--- a/app/services/courses_service.rb
+++ b/app/services/courses_service.rb
@@ -97,20 +97,159 @@ class CoursesService
     end
     users = []
     @members.each do |m|
-      img_url = url_to_avatar(m.user)
+      img_url = "/images/"+url_to_avatar(m.user)
       gender = m.user.user_extensions.gender.nil? ? 0 : m.user.user_extensions.gender
       work_unit = get_user_work_unit m.user
       location = get_user_location m.user
-      users << {:id => m.user.id, :img_url => img_url, :nickname => m.user.login, :gender => gender,
-                :work_unit => work_unit, :mail => m.user.mail, :location => location,
-                role_name: m.roles.first.name,
-                name: m.user.show_name,
-                roles_id: m.roles[0].id,
-                :brief_introduction => m.user.user_extensions.brief_introduction,:realname=>m.user.realname}
+
+      role_ids = []
+      m.roles.each do |r|
+        role_ids << r.id
+      end
+
+      #双重身份 学生列表中不显示
+      # unless (params[:role] == '2' && role_ids.length >= 2)
+        users << {:id => m.user.id, :img_url => img_url, :nickname => m.user.login, :gender => gender,
+                  :work_unit => work_unit, :mail => m.user.mail, :location => location,
+                  role_name: m.roles.first.name,
+                  name: m.user.show_name,
+                  roles_id: role_ids.include?(7) ? 7 : (role_ids.include?(9) ? 9 : 10 ),
+                  :brief_introduction => m.user.user_extensions.brief_introduction,:realname=>m.user.realname}
+      # end
+
     end
     users
   end
 
+  def reviewers_list course_id
+    reviewers = []
+    c = Course.find(course_id)
+
+    if c
+      messages = CourseMessage.where("course_id=? and course_message_type = 'JoinCourseRequest' and status = 0 ",course_id)
+
+      messages.each do |m|
+        user = User.find(m.course_message_id)
+
+        if user
+          img_url = url_to_avatar(user)
+          gender = user.user_extensions.gender.nil? ? 0 : user.user_extensions.gender
+          work_unit = get_user_work_unit user
+          location = get_user_location user
+          roles_ids = m.content.split(",")
+          reviewers << {:id => user.id, :img_url => img_url, :nickname => user.login, :gender => gender,
+                    :work_unit => work_unit, :mail => user.mail, :location => location,
+                    role_name: "",
+                    name: user.show_name,
+                    roles_id: roles_ids.include?("7") ? 7 : 9,
+                    :brief_introduction => user.user_extensions.brief_introduction,:realname=>user.realname}
+        end
+      end
+
+    end
+
+    reviewers
+  end
+
+  def get_reviewer_info params
+    status = -1
+    info = nil
+    c = Course.find(params[:course_id])
+    if c
+      messages = CourseMessage.where("course_id=? and course_message_id = ? and course_message_type = 'JoinCourseRequest' ",params[:course_id],params[:user_id]).last
+      if messages
+        #status  0未处理 1同意 2 通过
+        status = messages.status
+        user = User.find(params[:user_id])
+        if user
+          img_url = url_to_avatar(user)
+          gender = user.user_extensions.gender.nil? ? 0 : user.user_extensions.gender
+          work_unit = get_user_work_unit user
+          location = get_user_location user
+          roles_ids = messages.content.split(",")
+          info =  {:id => user.id, :img_url => img_url, :nickname => user.login, :gender => gender,
+                        :work_unit => work_unit, :mail => user.mail, :location => location,
+                        role_name: "",
+                        name: user.show_name,
+                        roles_id: roles_ids.include?("7") ? 7 : 9,
+                        :brief_introduction => user.user_extensions.brief_introduction,:realname=>user.realname}
+        end
+      end
+    end
+
+    {status:status,reviewer:info}
+  end
+
+  def deal_join_apply params,current_user
+    status = -1
+    message = ""
+
+    c = Course.find(params[:course_id])
+
+    if c
+      messages = CourseMessage.where("course_id=? and course_message_id = ? and course_message_type = 'JoinCourseRequest' and status = 0 ",params[:course_id],params[:user_id]).first
+      if messages
+        apply_user = User.find(params[:user_id])
+        ids = messages.content.split(",") #  content保存的是申请的职位角色
+        integer_ids = []
+        ids.each do |role_id|
+          integer_ids << role_id.to_i
+        end
+
+        if params[:type] == 0
+
+          if apply_user.member_of_course?(c)
+            #将角色改为老师或者教辅
+            member =  c.members.where(:user_id=>apply_user.id).all[0]
+            member.role_ids = integer_ids
+            #删除为学生的记录
+            unless member.role_ids.include?(10)
+              joined = StudentsForCourse.where('student_id = ? and course_id = ?', member.user_id,c.id)
+              joined.each do |join|
+                join.delete
+              end
+            end
+
+            member.course_group_id = 0
+            member.save
+            CourseMessage.create(:user_id => apply_user.id, :course_id => c.id, :viewed => false,:content=> messages.content,:course_message_id=>current_user.id,:course_message_type=>'CourseRequestDealResult',:status=>1)
+            messages.update_attributes(:status=>1,:viewed=>1)
+          else
+            members = []
+            members << Member.new(:role_ids => integer_ids, :user_id => apply_user.id)
+            c.members << members
+            CourseMessage.create(:user_id => apply_user.id, :course_id => c.id, :viewed => false,:content=> messages.content,:course_message_id=>current_user.id,:course_message_type=>'CourseRequestDealResult',:status=>1)
+            messages.update_attributes(:status=>1,:viewed=>1)
+          end
+          if integer_ids.include?(9)
+            message = "您已同意教师"+apply_user.show_name+"，加入班级"
+            send_wechat_join_class_notice apply_user,c,9,0
+          else
+            message = "您已同意助教"+apply_user.show_name+"，加入班级"
+            send_wechat_join_class_notice apply_user,c,7,0
+          end
+        else
+          CourseMessage.create(:user_id => apply_user.id, :course_id => c.id, :viewed => false,:content=> messages.content,:course_message_id=>current_user.id,:course_message_type=>'CourseRequestDealResult',:status=>2)
+          messages.update_attributes(:status=>2,:viewed=>1)
+          if integer_ids.include?(9)
+            message = "您已拒绝教师"+apply_user.show_name+"，加入班级"
+            send_wechat_join_class_notice apply_user,c,9,1
+          else
+            message = "您已拒绝助教"+apply_user.show_name+"，加入班级"
+            send_wechat_join_class_notice apply_user,c,7,1
+          end
+        end
+        status = 0
+      else
+        message = "该申请不存在或已被处理"
+      end
+    else
+      message = "该班级不存在或已被删除"
+    end
+
+    {:status => status,:message => message}
+  end
+
   #获取用户的工作单位
   def get_user_work_unit user
     work_unit = ""
@@ -218,7 +357,6 @@ class CoursesService
       #@course.password = params[:course][:password]
       @course.tea_id = current_user.id
       @course.syllabus_id = params[:syllabus_id].to_i
-      logger.error "update_syllabus_id: courses_service/create_course"
       @course.term = params[:term]
       @course.time = params[:time]
       @course.end_term = params[:end_term]
@@ -278,7 +416,6 @@ class CoursesService
     #course.safe_attributes = params[:course]
     #course.password = params[:course][:password]
     course.syllabus_id = params[:syllabus_id].to_i
-    logger.error "update_syllabus_id: courses_service/edit_course"
     course.time = params[:time]
     course.term = params[:term]
     course.end_time = params[:end_time]
@@ -331,15 +468,17 @@ class CoursesService
         0, '加入成功',
         1, '密码错误',
         2, '班级已过期 请联系班级管理员重启班级。',
-        3, '您已经加入了班级',
+        3, '您已经是该班级的成员了',
         4, '您的邀请码不正确',
         5, '您还未登录',
-        6, '申请成功，请等待审核完毕',
+        6, '您的申请已提交，请等待管理员审批',
         7, '您已经发送过申请了，请耐心等待',
         8, '您已经是该班级的教师了',
         9, '您已经是该班级的教辅了',
         10, '您已经是该班级的管理员了',
         11, '该班级不存在或已被删除啦',
+        12, '您已经发送过申请了，请耐心等待',
+        13, '您的申请已提交，请等待管理员审批',
         '未知错误，请稍后再试'
     ]
   end
@@ -393,6 +532,33 @@ class CoursesService
     {:state => @state,:course => course}
   end
 
+  #加入班级结果
+  def send_wechat_join_class_notice user,course,role_id,result
+    count = ShieldWechatMessage.where("container_type='User' and container_id=#{user.id} and shield_type='Course' and shield_id=#{course.id}").count
+    if count == 0
+      ws = WechatService.new
+
+      role_name = role_id == 7 ? "助教" : role_id == 9 ? "教师" : "学生"
+      result_name = result == 0 ? "通过" : "被拒绝"
+      content = "您以"+role_name+"身份加入班级的申请已"+result_name+"。"
+
+      if result == 0
+        title = "恭喜您加入班级成功。"
+        remark = "点击查看班级详情。"
+        uid = 0
+        type = "class"
+      else
+        title = "很遗憾您未能成功加入班级。"
+        remark = "点击查看申请详情。"
+        uid = user.id
+        type = "review_class_member"
+      end
+      ws = WechatService.new
+      ws.class_notice user.id, type, course.id, title, course.name, user.show_name, format_time(Time.now), content, remark,uid
+
+    end
+  end
+
   #多个角色加入课程
   def join_course_roles params,current_user
     course = Course.find_by_invite_code(params[:invite_code]) if params[:invite_code]
@@ -452,6 +618,7 @@ class CoursesService
               course.members << members
               StudentsForCourse.create(:student_id => current_user.id, :course_id => course.id)
               @state = 0
+              send_wechat_join_class_notice current_user,course,10,0
             else
               is_stu = false
               if role_ids.include?("10")
@@ -460,17 +627,34 @@ class CoursesService
                 course.members << members
                 StudentsForCourse.create(:student_id => current_user.id, :course_id =>course.id)
                 is_stu = true
+                send_wechat_join_class_notice current_user,course,10,0
               end
               #如果已经发送过消息了，那么就要给个提示
-              if CourseMessage.where("course_message_type = 'JoinCourseRequest' and user_id = #{course.tea_id} and content = '#{role_str}' and course_message_id = #{User.current.id} and course_id = #{course.id} and status = 0").count != 0
+              if CourseMessage.where("course_message_type = 'JoinCourseRequest' and user_id = #{course.tea_id} and content = '#{role_str}' and course_message_id = #{current_user.id} and course_id = #{course.id} and status = 0").count != 0
                 if is_stu
                   @state = 12
                 else
                   @state = 7
                 end
               else
-                Mailer.run.join_course_request(course, User.current, params[:role])
-                CourseMessage.create(:user_id => course.tea_id, :course_id => course.id, :viewed => false,:content=> role_str,:course_message_id=>User.current.id,:course_message_type=>'JoinCourseRequest',:status=>0)
+                Mailer.run.join_course_request(course, current_user, params[:role])
+                CourseMessage.create(:user_id => course.tea_id, :course_id => course.id, :viewed => false,:content=> role_str,:course_message_id=>current_user.id,:course_message_type=>'JoinCourseRequest',:status=>0)
+
+                #----------------微信通知----------------------
+
+                if role_ids.include?("7") || role_ids.include?("9")
+                  tea_user = User.find(course.tea_id)
+                  count = ShieldWechatMessage.where("container_type='User' and container_id=#{tea_user.id} and shield_type='Course' and shield_id=#{course.id}").count
+                  if count == 0
+
+                    rolename = role_ids.include?("7") ? "助教" : "教师"
+                    content = current_user.show_name + "申请以"+rolename+"身份加入班级，等待您的审批。"
+                    ws = WechatService.new
+                    ws.class_notice tea_user.id, "review_class_member", course.id, "班级成员审批通知。", course.name, tea_user.show_name, format_time(Time.now), content, "点击查看申请详情。",current_user.id
+                  end
+                end
+                #--------------------------------------------
+
                 if is_stu
                   @state = 13
                 else
@@ -1056,20 +1240,21 @@ class CoursesService
   # end
 
   #修改班级成员角色
-  def modify_user_course_role params
+  def modify_user_course_role params,roles_id
     status = -1
 
     c = Course.find("#{params[:id]}")
 
-    member = c.member_principals.includes(:roles, :principal).where("user_id=?",params[:user_id]).first
+    # member = c.member_principals.includes(:roles, :principal).where("user_id=?",params[:user_id]).first
+    member = c.members.where("user_id=?",params[:user_id]).first
 
     if member
-        role = Role.find(params[:role_id])
+        member.role_ids = roles_id
 
-        member.member_roles[0].role_id = params[:role_id]
+        role = Role.find(roles_id[0])
 
         # 这里的判断只能通过角色名，可以弄成常量
-        if params[:role_id] == 10
+        if roles_id && roles_id.include?(10)
           StudentsForCourse.create(:student_id => params[:user_id], :course_id =>params[:id])
         else
           joined = StudentsForCourse.where('student_id = ? and course_id = ?', params[:user_id],params[:id])
@@ -1092,7 +1277,7 @@ class CoursesService
 
         Role.givable.all[3..5]
 
-        if member.member_roles[0].save
+        if member.save
           status = 0
         end
     end
diff --git a/app/services/homework_service.rb b/app/services/homework_service.rb
index dd42795b1..04680f76f 100644
--- a/app/services/homework_service.rb
+++ b/app/services/homework_service.rb
@@ -256,7 +256,7 @@ class HomeworkService
     jours = @homework.journals_for_messages.where("is_comprehensive_evaluation = 3 or is_comprehensive_evaluation is null").order("created_on DESC")
     jours.each do |jour|
       user = jour.user
-      img_url = url_to_avatar(jour.user)
+      img_url = "/images/"+url_to_avatar(jour.user)
       datetime = jour.created_on
       content = jour.notes
     end
diff --git a/app/services/projects_service.rb b/app/services/projects_service.rb
index 2441ea9e5..56dfaceff 100644
--- a/app/services/projects_service.rb
+++ b/app/services/projects_service.rb
@@ -3,6 +3,9 @@
 class ProjectsService
 
   include ApplicationHelper
+  include ApiHelper
+  include ActionView::Helpers::DateHelper
+  include ProjectsHelper
 
   #获取指定用户的项目列表
   def user_projects(user)
@@ -13,8 +16,8 @@ class ProjectsService
   #显示项目
   def show_project(params,current_user)
     project = Project.find(params[:id])
-    # project.generate_invite_code
-    # project.generate_qrcode
+    project.generate_invite_code
+    project.generate_qrcode
 
     project
   end
@@ -101,20 +104,43 @@ class ProjectsService
 
   class JoinProjectError < Errors
     define_error [
-                     0, '加入成功',
+                     0, '您已成功加入项目',
                      1, '您的邀请码不正确',
                      2, '您还未登录',
                      3, '您已经是该项目的管理人员',
                      4, '您已经是该项目的开发人员',
                      5, '您已经是该项目的报告人员',
                      6, '该项目不存在或已被删除啦',
+                     7, '您的申请已提交，请等待管理员审批',
+                     8, '您已经发送过申请了，请耐心等待',
                      '未知错误，请稍后再试'
                  ]
   end
 
+  #加入项目结果
+  def send_wechat_join_project_notice user,project,role_id,result
+    count = ShieldWechatMessage.where("container_type='User' and container_id=#{user.id} and shield_type='Project' and shield_id=#{project.id}").count
+    if count == 0
+      result_name = result == 0 ? "已同意" : "已拒绝"
+      if result == 0
+        title = "恭喜您加入项目成功。"
+        remark = "点击查看项目详情。"
+        uid = 0
+        type = "project"
+      else
+        title = "很遗憾您未能成功加入项目。"
+        remark = "点击查看申请详情。"
+        uid = user.id
+        type = "review_project_member"
+      end
+      ws = WechatService.new
+      ws.join_project_notice user.id, "project", project.id,title, project.name,result_name, remark,uid
+    end
+  end
+
   def join_project params,current_user
     status = -1
-    project = project.find_by_invite_code(params[:invite_code]) if params[:invite_code]
+    project = Project.find_by_invite_code(params[:invite_code]) if params[:invite_code]
 
     if project
       if project[:is_delete] == 1
@@ -123,23 +149,186 @@ class ProjectsService
         if current_user.member_of?(project) #如果已经是成员
           member = project.member_principals.includes(:roles, :principal).where("user_id=?",current_user.id).first
           status = member.member_roles[0].role_id
+
+          #将之前的申请都改为已拒绝
+          applied_messages = AppliedMessage.where(:project_id => project.id, :status => true, :applied_user_id=>current_user.id,:applied_type => "AppliedProject")
+          applied_messages.update_all(:status=>5)
         else
           if params[:invite_code].present?
-            members = []
-            members << Member.new(:role_ids => [5], :user_id => current_user.id)
-            project.members << members
-            projectInfo = ProjectInfo.new(:user_id => current_user.id, :project_id => project.id)
-            projectInfo.save
-            status = 0
+
+            if params[:role] == 5
+              members = []
+              user_grades = []
+              project_info = []
+
+              user_grades << UserGrade.new(:user_id => current_user.id, :project_id => project.id)
+              project.user_grades << user_grades unless user_grades.first.user_id.nil?
+
+              members << Member.new(:role_ids => ["5"], :user_id => current_user.id)
+              project.members << members
+
+              project_info << ProjectInfo.new(:user_id => current_user.id, :project_id => project.id)
+              project.project_infos << project_info
+
+              status = 0
+              send_wechat_join_project_notice current_user,project,5,0
+
+              #将之前的申请都改为已拒绝
+              applied_messages = AppliedMessage.where(:project_id => project.id, :status => true, :applied_user_id=>current_user.id,:applied_type => "AppliedProject")
+              applied_messages.update_all(:status=>5)
+            else
+              if !AppliedProject.where(:project_id => project.id, :user_id => current_user.id).first.nil?
+                status = 8
+              else
+                AppliedProject.create(:user_id => current_user.id, :project_id => project.id, :role => params[:role])
+
+                status = 7
+              end
+            end
           else
             status = 4
           end
         end
       end
     else
-      status = 4
+      status = 1
     end
     status
   end
 
+  def get_project_review_members(project,role_id,current_user)
+    review_members = []
+
+    if role_id == 3 || role_id == 4
+
+      #AppliedMessage.where(:applied_id => @applied_message.applied_id, :project_id => @applied_message.project_id, :status => 1,
+      #:applied_type => "AppliedProject")
+
+
+      apply_messages = AppliedMessage.where(:user_id => current_user.id, :project_id => project.id, :status => 1, :role=>role_id)
+
+      apply_messages.each do |m|
+        user = User.find(m.applied_user_id)
+
+        if user
+          img_url = "/images/"+url_to_avatar(user)
+          gender = user.user_extensions.gender.nil? ? 0 : user.user_extensions.gender
+          work_unit = get_user_work_unit user
+          location = get_user_location user
+          review_members << {:id => user.id, :img_url => img_url, :nickname => user.login, :gender => gender,
+                        :work_unit => work_unit, :mail => user.mail, :location => location,
+                        role_name: "",
+                        name: user.show_name,
+                        roles_id: role_id,
+                        :brief_introduction => user.user_extensions.brief_introduction,:realname=>user.realname,:real_name=>user.realname}
+        end
+      end
+    end
+
+    review_members
+  end
+
+  def get_reviewer_info params,current_user
+    status = -1
+    info = nil
+    project = Project.find(params[:project_id])
+    if project
+      # messages = AppliedProject.where(:project_id=> project.id, :user_id=>params[:user_id]).first
+      #status  1未处理 5拒绝 7同意
+      applied_message = AppliedMessage.where(:user_id => current_user.id, :project_id => project.id, :applied_user_id=>params[:user_id],:applied_type => "AppliedProject").last
+      if applied_message
+        status = applied_message.status
+        user = User.find(params[:user_id])
+        if user
+          img_url = "/images/"+url_to_avatar(user)
+          gender = user.user_extensions.gender.nil? ? 0 : user.user_extensions.gender
+          work_unit = get_user_work_unit user
+          location = get_user_location user
+          info =  {:id => user.id, :img_url => img_url, :nickname => user.login, :gender => gender,
+                   :work_unit => work_unit, :mail => user.mail, :location => location,
+                   role_name: "",
+                   name: user.show_name,
+                   roles_id: applied_message.role,
+                   :brief_introduction => user.user_extensions.brief_introduction,:realname=>user.realname}
+        end
+      end
+    end
+
+    {status:status,reviewer:info}
+  end
+
+  def deal_join_apply params,current_user
+    status = -1
+    message = ""
+
+    project = Project.find(params[:project_id])
+    user =  User.find(params[:user_id])
+    if project
+        applied_messages = AppliedMessage.where(:user_id => current_user.id, :project_id => project.id, :status => 1, :applied_user_id=>user.id,:applied_type => "AppliedProject")
+        apply_message = applied_messages.first
+        if apply_message
+          if user.member_of?(project)
+            message = "已经是该项目的成员了"
+            u_member = project.member_principals.includes(:roles, :principal).where("user_id=?",params[:user_id]).first
+            if u_member.member_roles[0].role_id == 5
+              applied_messages.update_all(:status=>5)
+            else
+              applied_messages.update_all(:status=>7)
+            end
+          else
+            applied_project = apply_message.applied
+            ap_role = applied_project.try(:role)
+            if ap_role
+              rolename = ap_role == 3 ? "管理人员" : "开发人员"
+              if params[:type] == 0
+                #同意
+                members = []
+                user_grades = []
+                project_info = []
+                members << Member.new(:role_ids => ["#{ap_role}"], :user_id => user.id)
+                user_grades << UserGrade.new(:user_id => user.id, :project_id => project.id)
+                role = Role.find(ap_role)
+                project_info << ProjectInfo.new(:project_id => project.id, :user_id => user.id) if role.allowed_to?(:is_manager)
+                project.members << members
+                project.project_infos << project_info
+                project.user_grades << user_grades unless user_grades.first.user_id.nil?
+
+                # 添加成功后所有管理员收到的消息状态都要更新
+                applied_messages.update_all(:status => 7, :viewed => true)
+                # 添加成功后，申请人收到消息
+                AppliedMessage.create(:user_id => user.id, :applied_type => "AppliedProject", :applied_id => applied_project.id ,
+                                      :status => 6, :viewed => false, :applied_user_id => current_user.id, :role => applied_project.role, :project_id => applied_project.project_id)
+
+                message = "您已同意"+rolename+user.show_name+"，加入项目"
+
+                send_wechat_join_project_notice user,project,ap_role,0
+
+              else
+                #拒绝
+                AppliedMessage.create(:user_id => user.id, :applied_type => "AppliedProject", :applied_id => applied_project.id ,:status => 4,
+                                      :viewed => false, :applied_user_id => current_user.id, :role => applied_project.role, :project_id => applied_project.project_id)
+
+                applied_messages.update_all(:status => 5, :viewed => true)
+                applied_project.delete
+
+                message = "您已拒绝"+rolename+user.show_name+"，加入项目"
+
+                send_wechat_join_project_notice user,project,ap_role,1
+              end
+
+              status = 0
+            else
+              message = "该申请不存在或已被处理"
+            end
+          end
+        else
+          message = "该申请不存在或已被处理"
+        end
+    else
+      message = "该项目不存在或已被删除"
+    end
+
+    {:status => status,:message => message}
+  end
+
 end
diff --git a/app/services/syllabuses_service.rb b/app/services/syllabuses_service.rb
index 8911032dd..f12ae67cc 100644
--- a/app/services/syllabuses_service.rb
+++ b/app/services/syllabuses_service.rb
@@ -36,24 +36,21 @@ class SyllabusesService
     # courses.each do |c|
     #   other.courses << c[:course] unless c[:course].syllabus
     # end
+    result = []
+    i = 0
 
     courses = user.courses.not_deleted
     syllabus_ids = courses.empty? ? '(-1)' : "(" + courses.map{|course| !course.syllabus_id.nil? && course.syllabus_id}.join(",") + ")"
     syllabuses = Syllabus.where("id in #{syllabus_ids} or user_id = #{user.id}").order("updated_at desc")
 
     syllabuses.each do |syllabus|
-      syllabus.courses = courses.where("syllabus_id = #{syllabus.id}").select("courses.*,(SELECT MAX(updated_at)  FROM `course_activities` WHERE course_activities.course_id = courses.id) AS updatetime").order("time desc")
+      tmp_courses = courses.where("syllabus_id = #{syllabus.id}").select("courses.*,(SELECT MAX(updated_at)  FROM `course_activities` WHERE course_activities.course_id = courses.id) AS updatetime").order("updatetime desc")
+      result[i] = {:title=>syllabus.title, :id=>syllabus.id , :user_id=>syllabus.user_id,:courses=>tmp_courses }
+      i = i + 1
     end
-
-    # syllabuses.to_a << other
-
-    syllabuses.to_a
-    #管理权限 can_setting
-    # syllabuses.each do |s|
-    #   s = judge_can_setting(s,user)
-    # end
-
-    syllabuses
+    # syllabuses.to_a
+    # syllabuses
+    result
   end
 
   def after_create_course(course, user)
@@ -72,7 +69,7 @@ class SyllabusesService
     if count == 0
       ws = WechatService.new
       title = "恭喜您创建班级成功。"
-      ws.create_class_notice user.id, "create_course_notice", course.id,title, course.name, user.show_name, 0, "点击查看班级详情。"
+      ws.create_class_notice user.id, "create_course_notice", course.id,title, course.name, user.show_name, 1, "点击查看班级详情。"
     end
   end
 
@@ -86,14 +83,12 @@ class SyllabusesService
       courses.each do |course|
         if ::Course === course
           course.syllabus_id = sy.id
-          logger.error "update_syllabus_id: syllabus_service/create"
           course.save!
           send_wechat_create_class_notice user,course
         elsif Hash === course
           c = ::Course.new(course)
           c.tea_id = user.id
           c.syllabus_id = sy.id
-          logger.error "update_syllabus_id: syllabus_service/create"
           c.update_default_value
           c.is_public = 0
           c.save!
@@ -138,7 +133,6 @@ class SyllabusesService
         course.name = c
         course.tea_id = user.id
         course.syllabus_id = sy.id
-        logger.error "update_syllabus_id: syllabus_service/edit"
         course.update_default_value
         course.is_public = 0
         course.save!
diff --git a/app/services/users_service.rb b/app/services/users_service.rb
index ab1bb2ec4..5789befe5 100644
--- a/app/services/users_service.rb
+++ b/app/services/users_service.rb
@@ -80,7 +80,7 @@ class UsersService
   #id用户id
   def show_user(params)
     @user = User.find(params[:id])
-    img_url = url_to_avatar(@user)
+    img_url = "/images/"+url_to_avatar(@user)
     gender = @user.user_extensions.gender.nil? ? 0 : @user.user_extensions.gender
     work_unit = get_user_work_unit @user
     location = get_user_location @user
@@ -224,7 +224,7 @@ class UsersService
     membership.sort! {|older, newer| newer.created_on <=> older.created_on }
     course_list = []
     membership.each do |mp|
-      course_list << {:course => mp.course,:img_url => url_to_avatar(mp.course),:current_user_is_member => current_user.member_of_course?(mp.course),:current_user_is_teacher => is_course_teacher(current_user,mp.course)}
+      course_list << {:course => mp.course,:img_url => "/images/"+url_to_avatar(mp.course),:current_user_is_member => current_user.member_of_course?(mp.course),:current_user_is_teacher => is_course_teacher(current_user,mp.course)}
     end
     course_list
   end
diff --git a/app/services/wechat_service.rb b/app/services/wechat_service.rb
index 5f52aea49..3b6cfe930 100644
--- a/app/services/wechat_service.rb
+++ b/app/services/wechat_service.rb
@@ -111,11 +111,17 @@ class WechatService
     end
   end
 
-  def two_keys_template(openid, template_id, type, id, first, key1, key2, remark="")
+  def two_keys_template(openid, template_id, type, id, first, key1, key2, remark="",uid)
+    # tmpurl = "#{Setting.protocol}://#{Setting.host_name}/wechat/user_activities#/#{type}?id=#{id}"
+    tmpurl = Wechat.config.auto_openid_url_1+"?id="+id.to_s+Wechat.config.auto_openid_url_2+type+Wechat.config.auto_openid_url_3
+    if uid && uid != 0
+      tmpurl = "#{Setting.protocol}://#{Setting.host_name}/wechat/user_activities#/#{type}?id=#{id}"+ "&user_id="+uid.to_s
+      # tmpurl = Wechat.config.auto_openid_url_1+"?id="+id.to_s+ "&user_id="+uid.to_s+Wechat.config.auto_openid_url_2+type+Wechat.config.auto_openid_url_3
+    end
     data = {
         touser:openid,
         template_id:template_id,
-        url:"#{Setting.protocol}://#{Setting.host_name}/wechat/user_activities#/#{type}/#{id}",#/assets/wechat/app.html#/#{type}/#{id}
+        url:tmpurl,#/assets/wechat/app.html#/#{type}/#{id}
         topcolor:"#FF0000",
         data:{
             first: {
@@ -139,11 +145,18 @@ class WechatService
     data
   end
 
-  def three_keys_template(openid, template_id, type, id, first, key1, key2, key3, remark="")
+  def three_keys_template(openid, template_id, type, id, first, key1, key2, key3, remark="",uid)
+    # tmpurl = "#{Setting.protocol}://#{Setting.host_name}/wechat/user_activities#/#{type}?id=#{id}"
+    tmpurl = Wechat.config.auto_openid_url_1+"?id="+id.to_s+Wechat.config.auto_openid_url_2+type+Wechat.config.auto_openid_url_3
+    if uid && uid != 0
+      tmpurl = "#{Setting.protocol}://#{Setting.host_name}/wechat/user_activities#/#{type}?id=#{id}"+ "&user_id="+uid.to_s
+      # tmpurl = Wechat.config.auto_openid_url_1+"?id="+id.to_s+ "&user_id="+uid.to_s+Wechat.config.auto_openid_url_2+type+Wechat.config.auto_openid_url_3
+    end
+
     data = {
         touser:openid,
         template_id:template_id,
-        url:"#{Setting.protocol}://#{Setting.host_name}/wechat/user_activities#/#{type}/#{id}",#/assets/wechat/app.html#/#{type}/#{id}
+        url:tmpurl,#/assets/wechat/app.html#/#{type}/#{id}
         topcolor:"#FF0000",
         data:{
             first: {
@@ -171,11 +184,18 @@ class WechatService
     data
   end
 
-  def four_keys_template(openid, template_id, type, id, first, key1, key2, key3, key4, remark="")
+  def four_keys_template(openid, template_id, type, id, first, key1, key2, key3, key4, remark="",uid)
+    # tmpurl = "#{Setting.protocol}://#{Setting.host_name}/wechat/user_activities#/#{type}?id=#{id}"
+    tmpurl = Wechat.config.auto_openid_url_1+"?id="+id.to_s+Wechat.config.auto_openid_url_2+type+Wechat.config.auto_openid_url_3
+    if uid && uid != 0
+      tmpurl = "#{Setting.protocol}://#{Setting.host_name}/wechat/user_activities#/#{type}?id=#{id}"+ "&user_id="+uid.to_s
+      # tmpurl = Wechat.config.auto_openid_url_1+"?id="+id.to_s+ "&user_id="+uid.to_s+Wechat.config.auto_openid_url_2+type+Wechat.config.auto_openid_url_3
+    end
+
     data = {
     touser:openid,
     template_id:template_id,
-    url:"#{Setting.protocol}://#{Setting.host_name}/wechat/user_activities#/#{type}/#{id}", #/assets/wechat/app.html#/#{type}/#{id}
+    url:tmpurl, #/assets/wechat/app.html#/#{type}/#{id}
     topcolor:"#FF0000",
     data:{
         first: {
@@ -213,7 +233,7 @@ class WechatService
       data = {
           touser:uw.openid,
           template_id:Wechat.config.binding_succ_notice,
-          url:"#{Setting.protocol}://#{Setting.host_name}/wechat/user_activities",
+          url:Wechat.config.auto_openid_url_1+Wechat.config.auto_openid_url_2+"activites"+Wechat.config.auto_openid_url_3,
           topcolor:"#FF0000",
           data:{
               first: {
@@ -269,10 +289,10 @@ class WechatService
     end
   end
 
-  def class_notice(user_id, type, id, first, key1, key2, key3, key4, remark="")
+  def class_notice(user_id, type, id, first, key1, key2, key3, key4, remark="",uid=0)
     uw = UserWechat.where(user_id: user_id).first
     unless uw.nil?
-      data = four_keys_template uw.openid,Wechat.config.class_notice, type, id, first, key1, key2, key3, key4, remark
+      data = four_keys_template uw.openid,Wechat.config.class_notice, type, id, first, key1, key2, key3, key4, remark, uid
       begin
         req = Wechat.api.template_message_send Wechat::Message.to(uw.openid).template(data)
       rescue Exception => e
@@ -282,13 +302,26 @@ class WechatService
     end
   end
 
+  # def join_class_notice(user_id, type, id, first, key1, key2, key3,remark="")
+  #   uw = UserWechat.where(user_id: user_id).first
+  #   unless uw.nil?
+  #     data = three_keys_template uw.openid,Wechat.config.join_class_notice, type, id, first, key1, key2, key3, remark
+  #     begin
+  #       req = Wechat.api.template_message_send Wechat::Message.to(uw.openid).template(data)
+  #     rescue Exception => e
+  #       Rails.logger.error  "[join_class__notice] ===> #{e}"
+  #     end
+  #     Rails.logger.info "send over. #{req}"
+  #   end
+  # end
+
   def create_class_notice(user_id, type, id, first, key1, key2, key3, remark="")
     uw = UserWechat.where(user_id: user_id).first
     unless uw.nil?
       data = {
           touser:uw.openid,
           template_id:Wechat.config.create_class_notice,
-          url:"#{Setting.protocol}://#{Setting.host_name}/wechat/user_activities#/class?id="+id.to_s,
+          url:Wechat.config.auto_openid_url_1+"?id="+id.to_s+Wechat.config.auto_openid_url_2+"class"+Wechat.config.auto_openid_url_3,
           topcolor:"#FF0000",
           data:{
               first: {
@@ -329,7 +362,7 @@ class WechatService
       data = {
           touser:uw.openid,
           template_id:Wechat.config.create_project_notice,
-          url:"#{Setting.protocol}://#{Setting.host_name}/wechat/user_activities#/project?id="+id.to_s,
+          url:Wechat.config.auto_openid_url_1+"?id="+id.to_s+Wechat.config.auto_openid_url_2+"project"+Wechat.config.auto_openid_url_3,
           topcolor:"#FF0000",
           data:{
               first: {
@@ -360,4 +393,32 @@ class WechatService
     end
   end
 
+  def project_review_notice(user_id, type, id, first, key1, key2,key3,remark="",uid=0)
+    uw = UserWechat.where(user_id: user_id).first
+    unless uw.nil?
+      data = three_keys_template uw.openid,Wechat.config.project_review_notice, type, id, first, key1, key2, key3, remark,uid
+      begin
+        req = Wechat.api.template_message_send Wechat::Message.to(uw.openid).template(data)
+      rescue Exception => e
+        Rails.logger.error  "[project_review_notice] ===> #{e}"
+      end
+      Rails.logger.info "send over. #{req}"
+    end
+  end
+
+  def join_project_notice(user_id, type, id, first, key1, key2,remark="",uid=0)
+    uw = UserWechat.where(user_id: user_id).first
+    unless uw.nil?
+      data = two_keys_template uw.openid,Wechat.config.join_project_notice, type, id, first, key1, key2,remark,uid
+      begin
+        req = Wechat.api.template_message_send Wechat::Message.to(uw.openid).template(data)
+      rescue Exception => e
+        Rails.logger.error  "[join_project_notice] ===> #{e}"
+      end
+      Rails.logger.info "send over. #{req}"
+    end
+
+
+  end
+
 end
\ No newline at end of file
diff --git a/app/views/admin/_update_school_form.html.erb b/app/views/admin/_update_school_form.html.erb
index f006dcdc0..8bcdbe97d 100644
--- a/app/views/admin/_update_school_form.html.erb
+++ b/app/views/admin/_update_school_form.html.erb
@@ -2,7 +2,7 @@
 <div>
   <%#= hidden_field_tag(:send_id, edit_id) %>
   <div class="courseReferContainer">
-    <% if !schools.empty? %>
+    <% if !schools.empty? && !@search.nil? %>
         <% schools.each do |school| %>
             <ul class="courseSend">
               <li class="" style="display:inline-block">
diff --git a/app/views/admin/all_schools.js.erb b/app/views/admin/all_schools.js.erb
index 7a53a25dc..cbaf14ab9 100644
--- a/app/views/admin/all_schools.js.erb
+++ b/app/views/admin/all_schools.js.erb
@@ -1,11 +1,11 @@
 <% if params[:search].nil? %>
-$("#ajax-modal").html('<%= escape_javascript( render :partial => 'admin/all_schools', :locals => {:schools => @schools, :edit_id => @edit_id}) %>');
-showModal('ajax-modal', '452px');
-$('#ajax-modal').siblings().remove();
-$('#ajax-modal').before("<a href='javascript:void(0)' onclick='hideModal();' style='margin-left: 435px;' class='resourceClose'></a>");
-$('#ajax-modal').parent().css("top","50%").css("left","50%");
-$('#ajax-modal').parent().addClass("popbox").addClass("resourceUploadPopup");
-$('#ajax-modal').css("padding-left","16px").css("padding-bottom","16px");
+    $("#ajax-modal").html('<%= escape_javascript( render :partial => 'admin/all_schools', :locals => {:schools => @schools, :edit_id => @edit_id}) %>');
+    showModal('ajax-modal', '452px');
+    $('#ajax-modal').siblings().remove();
+    $('#ajax-modal').before("<a href='javascript:void(0)' onclick='hideModal();' style='margin-left: 435px;' class='resourceClose'></a>");
+    $('#ajax-modal').parent().css("top","50%").css("left","50%");
+    $('#ajax-modal').parent().addClass("popbox").addClass("resourceUploadPopup");
+    $('#ajax-modal').css("padding-left","16px").css("padding-bottom","16px");
 <% else %>
-$("#schools_list").html("<%= escape_javascript(render :partial => 'admin/update_school_form', :locals => {:schools => @schools, :edit_id => @edit_id}) %>");
+    $("#schools_list").html("<%= escape_javascript(render :partial => 'admin/update_school_form', :locals => {:schools => @schools, :edit_id => @edit_id}) %>");
 <% end %>
\ No newline at end of file
diff --git a/app/views/admin/applied_schools.html.erb b/app/views/admin/applied_schools.html.erb
index 2f139ca72..a2cc56362 100644
--- a/app/views/admin/applied_schools.html.erb
+++ b/app/views/admin/applied_schools.html.erb
@@ -11,7 +11,7 @@
       </label>
       <%= text_field_tag 'name', params[:name], :size => 30, :placeholder => '输入单位名称进行搜索' %>
       <%= submit_tag l(:button_apply ), :class => "small", :name => nil %>
-      <%= link_to l(:button_clear), {:controller => 'admin', :action => 'applied_shcools'}, :class => 'icon icon-reload' %>
+      <%= link_to l(:button_clear), {:controller => 'admin', :action => 'applied_schools'}, :class => 'icon icon-reload' %>
     </fieldset>
 <% end %>
 &nbsp;
@@ -29,7 +29,7 @@
       <th style="width: 30px;">
         申请者
       </th>
-      <th style="width: 75px;">
+      <th style="width: 85px;">
         地区
       </th>
       <th style="width: 75px;">
@@ -55,19 +55,19 @@
           </td>
           <td class="name" title='<%=apply.name%>' >
             <span id="apply_title_<%= apply.id %>"><%= apply.name %></span>
-            <textarea style="display: none; width:100px; height:16px; border:1px solid #ddd; outline:none; padding:0 0 0 5px; resize:none; overflow:hidden;" placeholder="请编辑单位名称" id="school_name_edit_<%=apply.id%>" onblur="edit_school_name('<%= edit_apply_name_school_path(apply.id)%>','<%= apply.id %>');"><%= apply.name %></textarea>
+            <textarea style="display: none; width:100px; height:16px; border:1px solid #ddd; outline:none; padding:0 0 0 5px; resize:none; overflow:hidden;" placeholder="请编辑单位名称" id="school_name_edit_<%=apply.id%>" onblur="edit_school_name('<%= edit_apply_name_school_path(apply.id)%>','<%= apply.id %>');"></textarea>
           </td>
           <td class="center">
             <% user = User.where("id=?", apply.user_id).first %>
             <% unless user.nil? %>
-            <%=link_to user.show_name, user_path(user),:target => '_blank' %>
+            <%=link_to user.show_name, user_path(user),:target => '_blank', :class => "application-default-link" %>
             <% end %>
           </td>
           <td class="center">
             <span ondblclick = "show_edit_school_province('<%= apply.id %>');" id="apply_province_<%= apply.id %>">
             <%= (apply.province.nil? ? "" : apply.province) + (apply.city.nil? ? "" : apply.city)  %>
             </span>
-            <select onchange="showcity(this.value, document.getElementById('schoolCity_<%=apply.id%>'));edit_school_province('<%= edit_apply_province_school_path(apply.id)%>','<%= apply.id %>');" name="province" id="school_province_edit_<%=apply.id%>" class="fl" style="width:50px; height:18px; display: none">
+            <select onchange="showcity(this.value, document.getElementById('schoolCity_<%=apply.id%>'));edit_school_province('<%= edit_apply_province_school_path(apply.id)%>','<%= apply.id %>');" name="province" id="school_province_edit_<%=apply.id%>" class="fl" style="width:55px; height:18px; display: none">
               <option value="北京">北京</option>
               <option value="上海">上海</option>
               <option value="广东">广东</option>
@@ -104,7 +104,7 @@
               <option value="台湾">台湾</option>
               <option value="海外">海外</option>
             </select>
-            <select onchange="edit_school_province('<%= edit_apply_province_school_path(apply.id)%>','<%= apply.id %>');" name="city" id="schoolCity_<%=apply.id%>" class="fl ml5" style="width:50px; height:18px; display: none"></select>
+            <select onchange="edit_school_province('<%= edit_apply_province_school_path(apply.id)%>','<%= apply.id %>');" name="city" id="schoolCity_<%=apply.id%>" class="fl ml5" style="width:55px; height:18px; display: none"></select>
           </td>
           <td class="center">
             <span title="双击可编辑" ondblclick = "show_edit_school_address('<%= apply.id %>');" id="apply_address_<%= apply.id %>"><%= apply.address %></span>
@@ -132,7 +132,7 @@
                   <td>
 
                   </td>
-                  <td style="text-align: left;" colspan="6">
+                  <td style="text-align: left;" colspan="7">
                     <%=  apply.remarks %>
                   </td>
                 </tr>
diff --git a/app/views/admin/has_applied_schools.html.erb b/app/views/admin/has_applied_schools.html.erb
index 1b6341fb3..f544ec8a0 100644
--- a/app/views/admin/has_applied_schools.html.erb
+++ b/app/views/admin/has_applied_schools.html.erb
@@ -11,7 +11,7 @@
       </label>
       <%= text_field_tag 'name', params[:name], :size => 30, :placeholder => '输入单位名称进行搜索' %>
       <%= submit_tag l(:button_apply ), :class => "small", :name => nil %>
-      <%= link_to l(:button_clear), {:controller => 'admin', :action => 'applied_shcools'}, :class => 'icon icon-reload' %>
+      <%= link_to l(:button_clear), {:controller => 'admin', :action => 'has_applied_schools'}, :class => 'icon icon-reload' %>
     </fieldset>
 <% end %>
 &nbsp;
@@ -20,7 +20,7 @@
   <table class="list" style="width: 100%;table-layout: fixed">
     <thead>
     <tr>
-      <th style="width: 20px;">
+      <th style="width: 25px;">
         序号
       </th>
       <th style="width: 80px;">
@@ -60,7 +60,7 @@
             <% unless apply.school_id.nil? %>
                 <% school_name = School.where("id=?", apply.school_id).first %>
                 <span title="双击可编辑" ondblclick = "show_edit_school_name('<%= apply.id %>');" id="apply_title_<%= apply.id %>"><%= school_name.name %></span>
-                <textarea style="display: none; width:100px; height:16px; border:1px solid #ddd; outline:none; padding:0 0 0 5px; resize:none; overflow:hidden;" placeholder="请编辑单位名称" id="school_name_edit_<%=apply.id%>" onblur="edit_school_name('<%= edit_apply_name_school_path(apply.id)%>','<%= apply.id %>');"><%= school_name.name %></textarea>
+                <textarea style="display: none; width:100px; height:16px; border:1px solid #ddd; outline:none; padding:0 0 0 5px; resize:none; overflow:hidden;" placeholder="请编辑单位名称" id="school_name_edit_<%=apply.id%>" onblur="edit_school_name('<%= edit_apply_name_school_path(apply.id)%>','<%= apply.id %>');"></textarea>
             <% end %>
           </td>
           <td class="center">
@@ -73,7 +73,7 @@
             <span ondblclick = "show_edit_school_province('<%= apply.id %>');" id="apply_province_<%= apply.id %>">
             <%= (apply.province.nil? ? "" : apply.province) + (apply.city.nil? ? "" : apply.city)  %>
             </span>
-            <select onchange="showcity(this.value, document.getElementById('schoolCity_<%=apply.id%>'));edit_school_province('<%= edit_apply_province_school_path(apply.id)%>','<%= apply.id %>');" name="province" id="school_province_edit_<%=apply.id%>" class="fl" style="width:50px; height:18px; display: none">
+            <select onchange="showcity(this.value, document.getElementById('schoolCity_<%=apply.id%>'));edit_school_province('<%= edit_apply_province_school_path(apply.id)%>','<%= apply.id %>');" name="province" id="school_province_edit_<%=apply.id%>" class="fl" style="width:55px; height:18px; display: none">
               <option value="北京">北京</option>
               <option value="上海">上海</option>
               <option value="广东">广东</option>
@@ -110,7 +110,7 @@
               <option value="台湾">台湾</option>
               <option value="海外">海外</option>
             </select>
-            <select onchange="edit_school_province('<%= edit_apply_province_school_path(apply.id)%>','<%= apply.id %>');" name="city" id="schoolCity_<%=apply.id%>" class="fl ml5" style="width:50px; height:18px; display: none"></select>
+            <select onchange="edit_school_province('<%= edit_apply_province_school_path(apply.id)%>','<%= apply.id %>');" name="city" id="schoolCity_<%=apply.id%>" class="fl ml5" style="width:55px; height:18px; display: none"></select>
           </td>
           <td class="center">
             <span title="双击可编辑" ondblclick = "show_edit_school_address('<%= apply.id %>');" id="apply_address_<%= apply.id %>"><%= apply.address %></span>
diff --git a/app/views/applied_project/_applied_project_tip.js.erb b/app/views/applied_project/_applied_project_tip.js.erb
index c2bc555db..24eb9b036 100644
--- a/app/views/applied_project/_applied_project_tip.js.erb
+++ b/app/views/applied_project/_applied_project_tip.js.erb
@@ -17,10 +17,16 @@
                 <p>您的申请已提交，请等待项目管理员审批</p>
              <% elsif @flag == 5 %>
                 <p>您已经申请加入该项目了，请耐心等待</p>
+            <% elsif @flag == 6 %>
+                <p>您已成功加入项目</p>
             <% end %>
             </li>
             <li>
+              <% if @flag == 6 %>
+                <%= link_to "知道了", project_path(@project), :class => "sy_btn_blue" %>
+              <% else %>
                 <a href="javascript:void(0);" class="sy_btn_blue " onclick="hideModal()">知道了</a>
+              <% end %>
             </li>
         </ul>
     </div>
diff --git a/app/views/applied_project/applied_join_project.js.erb b/app/views/applied_project/applied_join_project.js.erb
index 5d9f7f87a..f090cb485 100644
--- a/app/views/applied_project/applied_join_project.js.erb
+++ b/app/views/applied_project/applied_join_project.js.erb
@@ -1,3 +1,3 @@
 var htmlvalue = "<%= escape_javascript(render :partial => 'applied_join_project', locals: {:project_id => (@project.nil? ? nil : @project.id)}) %>";
-pop_box_new(htmlvalue,460,40,50);
+pop_box_new(htmlvalue,460,190);
 
diff --git a/app/views/applied_project/applied_project_info.js.erb b/app/views/applied_project/applied_project_info.js.erb
index ab3cb396d..c1cc6176d 100644
--- a/app/views/applied_project/applied_project_info.js.erb
+++ b/app/views/applied_project/applied_project_info.js.erb
@@ -2,4 +2,4 @@
 $("#join_in_project_applied").html('<%= escape_javascript( render :partial => 'projects/applied_status') %>');
 <% end %>
 var htmlvalue = "<%= escape_javascript(render :partial => 'applied_project/applied_project_tip') %>";
-pop_box_new(htmlvalue,380,40,50);
+pop_box_new(htmlvalue,380,166);
diff --git a/app/views/courses/_course_activity_users.html.erb b/app/views/courses/_course_activity_users.html.erb
index 8b4df3e83..67ec2ede9 100644
--- a/app/views/courses/_course_activity_users.html.erb
+++ b/app/views/courses/_course_activity_users.html.erb
@@ -3,9 +3,9 @@
       <ul class="rankList">
       <h3 style="font-size: 14px; font-weight: normal;">
         <% if (User.current.logged? && course.open_student == 1) || (User.current.member_of_course?(course)) || User.current.admin? %>
-            <%= link_to "班级活跃度", course_member_path(course, :role => 2, :sort_type => 'act_score'), :class => 'sy_cblack' %>
+            <%= link_to "班级活跃度", course_member_path(course, :role => 2, :sort_type => 'act_score'), :class => 'fontGrey3' %>
         <% else %>
-            班级活跃度
+            <span class="fontGrey7"> 班级活跃度 </span>
         <% end %>
         <a class="sy_cmore fr" onmouseover ="message_titile_show2($(this),event)" onmouseout ="message_titile_hide2($(this))" style="cursor: pointer; position:relative;">积分规则</a>
         <div class="cl"></div>
diff --git a/app/views/courses/_course_heroes.html.erb b/app/views/courses/_course_heroes.html.erb
index 4699c12d2..bd285f9b0 100644
--- a/app/views/courses/_course_heroes.html.erb
+++ b/app/views/courses/_course_heroes.html.erb
@@ -3,9 +3,9 @@
     <ul class="rankList">
       <h4 style="font-size: 14px; font-weight: normal;">
         <% if (User.current.logged? && course.open_student == 1) || (User.current.member_of_course?(course)) || User.current.admin? %>
-            <%= link_to "班级英雄榜", course_member_path(course, :role => 2), :class => 'sy_cblack' %>
+            <%= link_to "班级英雄榜", course_member_path(course, :role => 2), :class => 'fontGrey3' %>
         <% else %>
-            <span>班级英雄榜</span>
+            <span class="fontGrey7">班级英雄榜</span>
         <% end %>
         <a class="contributor_course" onmouseover ="message_titile_show2($(this),event)" onmouseout ="message_titile_hide2($(this))" style="cursor:pointer;">积分规则</a></h4>
       <div  style="cursor:pointer;" class="numIntro undis">
diff --git a/app/views/courses/join_private_courses.js.erb b/app/views/courses/join_private_courses.js.erb
index 14402a9ff..fc53970e4 100644
--- a/app/views/courses/join_private_courses.js.erb
+++ b/app/views/courses/join_private_courses.js.erb
@@ -1,2 +1,2 @@
 var htmlvalue = "<%= escape_javascript(render :partial => 'join_private_course') %>";
-pop_box_new(htmlvalue,460,40,50);
+pop_box_new(htmlvalue,460,220);
diff --git a/app/views/files/_course_list.html.erb b/app/views/files/_course_list.html.erb
index 7724bb861..be7da4732 100644
--- a/app/views/files/_course_list.html.erb
+++ b/app/views/files/_course_list.html.erb
@@ -1,19 +1,14 @@
-  <% curse_attachments.each do |file| %>
-      <% if file.is_public? || User.current.member_of_course?(course) || User.current.admin? %>
+<% curse_attachments.each do |file| %>
+    <% if file.is_public? || User.current.member_of_course?(course) || User.current.admin? %>
         <div id="resource_detail_<%=file.id %>">
-            <%=render :partial=>'files/resource_detail',:locals => {:file => file} %>
+          <%=render :partial=>'files/resource_detail',:locals => {:file => file} %>
         </div>
-      <% else %>
-          <div class="re_con_box"><span class='fr mr10 pr_join_span '><%= file.filename %>是私有资源</span></div>
-      <% end %>
-  <% end %>
-
-<% if curse_attachments.count == 10%>
-    <% if params[:action] == 'search' %>
-        <%=link_to "点击展开更多",  search_course_files_path({:course_id => course.id,:page => @obj_pages.nil? ? @feedback_pages.page + 1 : @obj_pages.page + 1}.merge(params)),:id => "show_more_attachments",:remote => "true",:class => "loadMore mt10 f_grey" %>
     <% else %>
-    <!-- 全站搜索的时候 返回的页码对象是obj_pages,而站内搜索返回的页码对象是feedback_pages -->
-        <%=link_to "点击展开更多",  course_files_path(:course_id => course.id, :page => @page), :id => "show_more_attachments",:remote => "true",:class => "loadMore mt10 f_grey" %>
-    <%end%>
-<% end%>
+        <div class="re_con_box"><span class='fr mr10 pr_join_span '><%= file.filename %>是私有资源</span></div>
+    <% end %>
+<% end %>
+
+<ul class="wlist">
+  <%= pagination_links_full @feedback_pages, @feedback_count, :per_page_links => false, :remote => true, :flag => true%>
+</ul>
 
diff --git a/app/views/files/_project_list.html.erb b/app/views/files/_project_list.html.erb
index 36dc80a18..faf254015 100644
--- a/app/views/files/_project_list.html.erb
+++ b/app/views/files/_project_list.html.erb
@@ -66,17 +66,10 @@
     <% end %>
 <% end %>
 
-<% if project_attachments.count == 10%>
-    <% if params[:action] == 'search_project' %>
-        <!--<ul class="wlist">-->
-          <!--<%#= pagination_links_full @obj_pages, @obj_count, :per_page_links => false, :remote => @is_remote, :flag => true%>-->
-        <!--</ul>-->
-        <%=link_to "点击展开更多",  search_project_project_files_path({:project_id => project.id, :page => @obj_pages.nil? ? @feedback_pages.page + 1 : @obj_pages.page + 1}.merge(params)),:id => "show_more_attachments",:remote => "true",:class => "loadMore mt10 f_grey" %>
-    <%else%>
-        <!-- 全站搜索的时候 返回的页码对象是obj_pages,而站内搜索返回的页码对象是feedback_pages -->
-        <%=link_to "点击展开更多",  project_files_path(:project_id => project.id,:page => @page),:id => "show_more_attachments",:remote => "true",:class => "loadMore mt10 f_grey" %>
-    <%end%>
-<% end%>
+<ul class="wlist">
+  <%= pagination_links_full @feedback_pages, @feedback_count, :per_page_links => false, :remote => true, :flag => true%>
+</ul>
+
 
 
 
diff --git a/app/views/files/index.js.erb b/app/views/files/index.js.erb
index 49e7ac714..982d19329 100644
--- a/app/views/files/index.js.erb
+++ b/app/views/files/index.js.erb
@@ -1,7 +1,9 @@
 <% if @course %>
-    $("#show_more_attachments").replaceWith("<%= escape_javascript( render :partial => 'files/course_list',:locals => {course:@course,all_attachments: @all_attachments,sort:@sort,order:@order,curse_attachments:@obj_attachments}   )%>");
+    $("#resource_list").html("<%= escape_javascript( render :partial => 'files/course_file',:locals => {course:@course,all_attachments: @all_attachments,sort:@sort,order:@order,curse_attachments:@obj_attachments}) %>");
+    $("#pages").html('<%= pagination_links_full @feedback_pages, @feedback_count, :per_page_links => false, :remote => true, :flag => true %>');
 <% elsif @project %>
-    $("#show_more_attachments").replaceWith("<%= escape_javascript( render :partial => 'files/project_list', :locals => {project:@project, all_attachments:@all_attachments, sort:@sort, order:@order, project_attachments:@obj_attachments})%>");
+    $("#resource_list").html("<%= escape_javascript( render :partial => 'files/project_file',:locals => {project:@project, all_attachments:@all_attachments, sort:@sort, order:@order, project_attachments:@obj_attachments}) %>");
+    $("#pages").html('<%= pagination_links_full @feedback_pages, @feedback_count, :per_page_links => false, :remote => true, :flag => true %>');
 <% elsif @org_subfield %>
     $("#show_more_attachments").replaceWith("<%= escape_javascript( render :partial => 'files/org_subfield_list', :locals => {org_subfield:@org_subfield, all_attachments:@all_attachments, sort:@sort, order:@order, org_subfield_attachments:@obj_attachments})%>");
 <%end %>
\ No newline at end of file
diff --git a/app/views/files/search.js.erb b/app/views/files/search.js.erb
index fd88b3f9e..011b3bb25 100644
--- a/app/views/files/search.js.erb
+++ b/app/views/files/search.js.erb
@@ -1,6 +1,3 @@
-<% if (@obj_pages &&( @obj_pages.page > 1)) || (@feedback_pages && (@feedback_pages.page > 1)) %> //搜索的时候有时候是需要加载下一页，有时候是直接替换当前 #course_list。这个根据 page来判定
-    $("#show_more_attachments").replaceWith("<%= escape_javascript( render :partial => 'files/course_list',:locals => {course: @course,all_attachments:  @result,sort:@sort,order:@order,curse_attachments:@searched_attach}   )%>");
-<% else %>
-    $("#course_list").html("<%= escape_javascript(render :partial => 'files/course_list',:locals => {course: @course,all_attachments: @result,sort:@sort,order:@order,curse_attachments:@searched_attach})%>");
-    $("#attachment_count").html("<%= @result.count%>")
-<% end %>
\ No newline at end of file
+
+    $("#resource_list").html("<%= escape_javascript( render :partial => 'files/course_file',:locals => {course:@course,all_attachments: @all_attachments,sort:@sort,order:@order,curse_attachments:@obj_attachments}   )%>");
+    $("#pages").html('<%= pagination_links_full @feedback_pages, @feedback_count, :per_page_links => false, :remote => true, :flag => true %>');
diff --git a/app/views/files/search_project.js.erb b/app/views/files/search_project.js.erb
index 69752e0d9..f88438d57 100644
--- a/app/views/files/search_project.js.erb
+++ b/app/views/files/search_project.js.erb
@@ -1,7 +1,2 @@
-<% if (@obj_pages &&( @obj_pages.page > 1)) || (@feedback_pages && (@feedback_pages.page > 1)) %> //搜索的时候有时候是需要加载下一页，有时候是直接替换当前 #course_list。这个根据 page来判定
-    $("#show_more_attachments").replaceWith("<%= escape_javascript( render :partial => 'files/project_list',
-    :locals => {project: @project, all_attachments:@result, sort:@sort, order:@order, project_attachments:@searched_attach})%>");
-<% else %>
-    $("#course_list").html("<%= escape_javascript(render :partial => 'files/project_list',:locals => {project:@project, all_attachments:@result, sort:@sort, order:@order,project_attachments:@searched_attach})%>");
-    $("#attachment_count").html("<%= @project_attachment_result.count %>")
-<% end %>
\ No newline at end of file
+$("#resource_list").html("<%= escape_javascript( render :partial => 'files/project_file',:locals => {project:@project, all_attachments:@all_attachments, sort:@sort, order:@order, project_attachments:@obj_attachments}) %>");
+$("#pages").html('<%= pagination_links_full @feedback_pages, @feedback_count, :per_page_links => false, :remote => true, :flag => true %>');
diff --git a/app/views/files/search_tag_attachment.js.erb b/app/views/files/search_tag_attachment.js.erb
index 3003d8b98..dff75023b 100644
--- a/app/views/files/search_tag_attachment.js.erb
+++ b/app/views/files/search_tag_attachment.js.erb
@@ -1,8 +1,7 @@
 <% if @course %>
-    $("#course_list").html("<%= escape_javascript(render :partial => 'course_list',:locals => {course: @course,all_attachments: @result,sort:@sort,order:@order,curse_attachments:@searched_attach})%>");
-    $("#course_filter_order").html("<%= escape_javascript(render :partial => 'course_file_filter_order', :locals => {course: @course,all_attachments: @result,sort:@sort,order:@order,curse_attachments:@searched_attach, tag_name: @tag_name, q: @q})%>");
-    $("#attachment_count").html("<%= @result.count%>")
+    $("#resource_list").html("<%= escape_javascript( render :partial => 'files/course_file',:locals => {course:@course,all_attachments: @all_attachments,sort:@sort,order:@order,curse_attachments:@obj_attachments}   )%>");
+    $("#pages").html('<%= pagination_links_full @feedback_pages, @feedback_count, :per_page_links => false, :remote => true, :flag => true %>');
 <% else %>
-    $("#course_list").html("<%= escape_javascript(render :partial => 'project_list',:locals => {project:@project, all_attachments:@result_search_project, sort:@sort, order:@order, project_attachments:@searched_attach}) %>");
-    $("#attachment_count").html("<%= @result_search_project.count%>")
+    $("#resource_list").html("<%= escape_javascript( render :partial => 'files/project_file',:locals => {project:@project, all_attachments:@all_attachments, sort:@sort, order:@order, project_attachments:@obj_attachments}) %>");
+    $("#pages").html('<%= pagination_links_full @feedback_pages, @feedback_count, :per_page_links => false, :remote => true, :flag => true %>');
 <% end %>
diff --git a/app/views/files/subfield_upload_file.js.erb b/app/views/files/subfield_upload_file.js.erb
index 340a2890f..96c1659fd 100644
--- a/app/views/files/subfield_upload_file.js.erb
+++ b/app/views/files/subfield_upload_file.js.erb
@@ -2,5 +2,5 @@ $('#ajax-modal').html('<%= escape_javascript(render :partial => 'files/upload_su
 showModal('ajax-modal', '513px');
 $('#ajax-modal').siblings().remove();
 $('#ajax-modal').before("<a href='javascript:void(0)' onclick='hideModal();' style='margin-left: 480px;'><img src='/images/bid/close.png' width='26px' height='26px' /></a>");
-$('#ajax-modal').parent().css("top","").css("left","").css("border","3px solid #269ac9");
+$('#ajax-modal').parent().css("top","30%").css("left","40%").css("border","3px solid #269ac9");
 $('#ajax-modal').parent().addClass("popbox_polls");
\ No newline at end of file
diff --git a/app/views/layouts/_course_base_info.html.erb b/app/views/layouts/_course_base_info.html.erb
index 1c01ecf53..09832b66c 100644
--- a/app/views/layouts/_course_base_info.html.erb
+++ b/app/views/layouts/_course_base_info.html.erb
@@ -3,6 +3,8 @@
 <% student_num = studentCount(@course) %>
 <% course_file_num = visable_attachemnts_incourse(@course).count %>
 <p class="sy_cgrey mb10">
+  <%= link_to(@course.teacher.show_name, user_path(@course.teacher), :class => 'sy_cgrey') %>
+  &nbsp;&gt;&nbsp;
   <% if @course.syllabus %>
       <%=link_to @course.syllabus.title, syllabus_path(@course.syllabus_id), :class => 'sy_cgrey' %>
       &nbsp;&gt;&nbsp;
@@ -17,7 +19,9 @@
           <ul class="sy_class_setting_text">
             <li><%= link_to @course.is_public == 0 ? "设为公开" : "设为私有", {:controller => 'courses', :action => 'private_or_public', :id => @course},:remote=>true,:confirm=>"您确定要设置为"+(@course.is_public == 0 ? "公开" : "私有")+"吗", :class => "sy_class_option" %></li>
             <li><%= link_to "复制班级", copy_course_course_path(@course.id),:remote=>true, :class => "sy_class_option" %></li>
-            <li><%= link_to "进入课程", syllabus_path(@course.syllabus), :class => "sy_class_option", :target => "_blank" %></li>
+            <% if @course.syllabus %>
+                <li><%= link_to "进入课程", syllabus_path(@course.syllabus), :class => "sy_class_option", :target => "_blank" %></li>
+            <% end %>
           </ul>
         </li>
       </ul>
diff --git a/app/views/layouts/_logined_header.html.erb b/app/views/layouts/_logined_header.html.erb
index b7e2989eb..753022d75 100644
--- a/app/views/layouts/_logined_header.html.erb
+++ b/app/views/layouts/_logined_header.html.erb
@@ -73,9 +73,9 @@
   </div>
 
   <div class="navHomepageNews" id="user_messages">
-    <%= link_to "", user_message_path(User.current), :class => "homepageNewsIcon", :target =>"_Blank", :title => "您的所有消息" %>
-    <% if User.current.count_new_message.to_i >0 %>
-        <div ><%= link_to User.current.count_new_message , user_message_path(User.current), :class => "newsActive", :target =>"_Blank" %></div>
+    <%= link_to "", user_message_path(User.current), :class => "homepageNewsIcon", :target => "_Blank", :title => "您的所有消息" %>
+    <% if User.current.count_new_message.to_i > 0 %>
+        <div ><%= link_to User.current.count_new_message , user_message_path(User.current), :class => "newsActive", :target => "_Blank" %></div>
     <% end %>
       <%#= link_to User.current.count_new_message, user_message_path(User.current), :class => "homepageNewsIcon" %>
     <div class="shadowbox_news undis" id="user_messages_list">
diff --git a/app/views/layouts/_show_messages_list.html.erb b/app/views/layouts/_show_messages_list.html.erb
index 66151f650..300cc0879 100644
--- a/app/views/layouts/_show_messages_list.html.erb
+++ b/app/views/layouts/_show_messages_list.html.erb
@@ -88,6 +88,33 @@
       <% elsif ma.course_message_type == "Exercise" && ma.status == 3 %>
           <li><a href="<%=exercise_path(:id => ma.course_message.id) %>" target="_blank" title="<%=ma.course_message.user.show_name %>老师 发布的测验：<%=ma.course_message.exercise_name %> 截止时间快到了"><span class="shadowbox_news_user"><%=ma.course_message.user.show_name %>老师 </span>发布的测验：<%=ma.course_message.exercise_name %> 截止时间快到了</a></li>
       <% end %>
+    <% elsif ma.class == AppliedMessage %>
+      <% if ma.applied_type == "AppliedProject" %>
+          <li><%=link_to "<span class='shadowbox_news_user'>#{applied_project_users(ma)}</span>".html_safe, user_path(applied_project_users(ma)), :target => '_blank' %>
+            <span><%= applied_project_tip_header(ma) %>以“<%= applied_project_message_type(ma.role) %>”身份加入<% project = Project.find(ma.project_id) %>
+                <%= link_to project.name, project_path(ma.project_id), :class => "link-blue", :target => '_blank', :title => "#{project.name}" %>
+            </span>
+      <% elsif ma.applied_type == "ApplyAddSchools" && ma.status == 0 %>
+          <li>
+            <% content = '<span class="shadowbox_news_user">'+User.where("id=?", ma.applied_user_id).first.show_name+' </span>提交了申请：添加新的单位：'+"“"+ma.name+"”" %>
+            <%= link_to content.html_safe, unapplied_schools_path(:flag => 1, :applied_message_id => ma.id), :title => "#{User.where("id=?", ma.applied_user_id).first.show_name}提交了申请：添加新的单位“#{ma.name}”", :target => '_blank' %>
+          </li>
+      <% elsif ma.applied_type == "ApplyAddSchools" && ma.status == 1 %>
+          <li>
+            <% content = "<span class='shadowbox_news_user'>系统提示：</span>“#{ma.name}”的申请，已通过审核。谢谢！" %>
+            <%= link_to content.html_safe, { :controller=> "my",:action => "account",:flag => 1, :applied_message_id => ma.id }, :title => "系统提示：“#{ma.name}”的申请，已通过审核。谢谢！", :target => '_blank'%>
+          </li>
+      <% elsif ma.applied_type == "ApplyAddSchools" && ma.status == 2 %>
+          <li>
+            <% content = "<span class='shadowbox_news_user'>系统提示：</span>“#{ma.applied.name}”的申请，因名称不符合规范，系统已将其更改为“#{ma.name}”。谢谢！" %>
+            <%= link_to content.html_safe, { :controller=> "my",:action => "account", :flag => 1, :applied_message_id => ma.id }, :title => "系统提示：“#{ma.applied.name}”的申请，因名称不符合规范，系统已将其更改为“#{ma.name}”。谢谢！", :target => '_blank'%>
+          </li>
+      <% elsif ma.applied_type == "ApplyAddSchools" && ma.status == 3 %>
+          <li>
+            <% content = "<span class='shadowbox_news_user'>系统提示：</span>“#{ma.name}”的申请，经确认为无效的单位信息，已被删除，请重新编辑您的单位资料。谢谢！" %>
+            <%= link_to content.html_safe, { :controller=> "my",:action => "account", :flag => 1, :applied_message_id => ma.id }, :title => "系统提示：“#{ma.name}”的申请，经确认为无效的单位信息，已被删除，请重新编辑您的单位资料。谢谢！", :target => '_blank'%>
+          </li>
+      <% end %>
     <% elsif ma.class == ForgeMessage %>
       <% if ma.forge_message_type == "AppliedProject" %>
           <li><a href="<%=settings_project_path(:id => ma.project, :tab => "members") %>" target="_blank" title="<%=ma.forge_message.user.show_name %> 申请加入项目：<%= ma.project.name%>"><span class="shadowbox_news_user"><%=ma.forge_message.user.show_name %> </span>申请加入项目：<%= ma.project.name%></a></li>
@@ -119,8 +146,8 @@
           <li><a href="<%=feedback_path(ma.journals_for_message.jour_id) %>" target="_blank" title="<%=ma.journals_for_message.user.show_name %> <%= ma.journals_for_message.reply_id == 0 || ma.journals_for_message.reply_id.nil? ? "给你留言了：" : "回复了你的留言：" %><%= message_content(ma.journals_for_message.notes)%>"><span class="shadowbox_news_user"><%=ma.journals_for_message.user.show_name %> </span><%= ma.journals_for_message.reply_id == 0 || ma.journals_for_message.reply_id.nil? ? "给你留言了：" : "回复了你的留言：" %><%= message_content(ma.journals_for_message.notes)%></a></li>
       <% end %>
     <% elsif ma.class == OrgMessage %>
-      <% if ma.message_type == 'ApplySubdomain' %>
-          <li><a href="<%=feedback_path(ma.journals_for_message.jour_id) %>" target="_blank" title="<%=ma.organization.name %> 申请子域名：<%= (Secdomain.where("sub_type=2 and pid=?", ma.organization.id).count == 0 || (Secdomain.where("sub_type=2 and pid=?", ma.organization.id).count > 0 && Secdomain.where("sub_type=2 and pid=?", ma.organization.id).first.subname != ma.content)) ? "同意申请":"申请已批准"%>"><span class="shadowbox_news_user"><%=ma.organization.name %> </span>申请子域名：<%= (Secdomain.where("sub_type=2 and pid=?", ma.organization.id).count == 0 || (Secdomain.where("sub_type=2 and pid=?", ma.organization.id).count > 0 && Secdomain.where("sub_type=2 and pid=?", ma.organization.id).first.subname != ma.content)) ? "同意申请":"申请已批准"%></a></li>
+      <% if ma.message_type == 'ApplySubdomain' && ma.organization %>
+          <li><a href="<%=agree_apply_subdomain_organizations_path( :organization_id => ma.organization_id, :org_domain => ma.content, :user_id => ma.sender_id, :act_id => ma.id ) %>" target="_blank" title="<%=ma.organization.name %> 申请子域名：<%= (Secdomain.where("sub_type=2 and pid=?", ma.organization.id).count == 0 || (Secdomain.where("sub_type=2 and pid=?", ma.organization.id).count > 0 && Secdomain.where("sub_type=2 and pid=?", ma.organization.id).first.subname != ma.content)) ? "同意申请":"申请已批准"%>"><span class="shadowbox_news_user"><%=ma.organization.name %> </span>申请子域名：<%= (Secdomain.where("sub_type=2 and pid=?", ma.organization.id).count == 0 || (Secdomain.where("sub_type=2 and pid=?", ma.organization.id).count > 0 && Secdomain.where("sub_type=2 and pid=?", ma.organization.id).first.subname != ma.content)) ? "同意申请":"申请已批准"%></a></li>
       <% elsif ma.message_type == 'AgreeApplySubdomain' %>
           <li><a href="javascript:void(0)" target="_blank" title="系统提示 管理员同意了您的子域名申请：<%= ma.content%>"><span class="shadowbox_news_user">系统提示 </span>管理员同意了您的子域名申请：<%= ma.content%></a></li>
       <% end %>
diff --git a/app/views/layouts/_syllabus_base_info.html.erb b/app/views/layouts/_syllabus_base_info.html.erb
index 0cc88dcf1..22139b550 100644
--- a/app/views/layouts/_syllabus_base_info.html.erb
+++ b/app/views/layouts/_syllabus_base_info.html.erb
@@ -22,10 +22,10 @@
       <li><label>实践学时</label><span class="fl ml10 sy_cgrey w110"><%=syllabus.practice_hours %>学时</span></li>
   <% end %>
   <% unless syllabus.applicable_major.nil? || syllabus.applicable_major == '' %>
-      <li><label>适用专业</label><span class="fl ml10 sy_cgrey w110"><%=syllabus.applicable_major %></span></li>
+      <li><label>适用专业</label><span class="fl ml10 sy_cgrey w110" style="word-wrap:break-word;"><%=syllabus.applicable_major %></span></li>
   <% end %>
   <% unless syllabus.pre_course.nil? || syllabus.pre_course == '' %>
-      <li><label>先修课程</label><span class="fl ml10 sy_cgrey w110"><%=syllabus.pre_course %></span></li>
+      <li><label>先修课程</label><span class="fl ml10 sy_cgrey w110" style="word-wrap:break-word;"><%=syllabus.pre_course %></span></li>
   <% end %>
 
   <% if syllabus.syllabus_type.nil? || syllabus.syllabus_type == 0 || syllabus.syllabus_type == '' %>
diff --git a/app/views/layouts/_user_courses.html.erb b/app/views/layouts/_user_courses.html.erb
index b3b21547e..d5f877eea 100644
--- a/app/views/layouts/_user_courses.html.erb
+++ b/app/views/layouts/_user_courses.html.erb
@@ -82,7 +82,6 @@
 <% end %>
 
 <% if all_count > (page.to_i+1) * 10%>
-    <input type="hidden" value="<%= page%>" id="course_page_num">
     <a class="user_navmorebox" href="javascript:void(0);" id="user_show_more_course" onclick="show_more_course('<%= user_courses4show_user_path(user.id,:page => page)%>');">
       <span class="user_icons_moreclass"></span>
     </a>
diff --git a/app/views/layouts/_user_projects.html.erb b/app/views/layouts/_user_projects.html.erb
index 37760b17e..21b42decd 100644
--- a/app/views/layouts/_user_projects.html.erb
+++ b/app/views/layouts/_user_projects.html.erb
@@ -2,7 +2,7 @@
     <li>
       <span class="user_icons_class"></span>
       <% count = ShieldActivity.where("container_type='User' and container_id=#{user.id} and shield_type='Project' and shield_id=#{project.id}").count %>
-      <%= link_to project.name, project_path(project.id,:host=>Setting.host_name), :target => '_blank', :class => "course_list_menu hidden",:id => "show_project_#{project.id}", :title => (project.is_public? ? "公开项目：":"私有项目：") + project.name%>
+      <%= link_to project.name, project_path(project.id,:host=>Setting.host_name), :target => '_blank', :class => "project_list_menu hidden",:id => "show_project_#{project.id}", :title => (project.is_public? ? "公开项目：":"私有项目：") + project.name%>
 
       <div class="user_navmore_box">
         <ul class="<%#= count > 0 ? 'shild shildP':'subNavArrow'%>">
@@ -59,17 +59,16 @@
 <% end %>
 
 <% if all_count > (page.to_i+1) * 10%>
-    <input type="hidden" value="<%= page%>" id="project_page_num">
-    <a class="user_navmorebox" href="javascript:void(0);" id="user_show_more_project" onclick="show_more_project('<%= user_projects4show_user_path(user.id)%>');">
+    <a class="user_navmorebox" href="javascript:void(0);" id="user_show_more_project" onclick="show_more_project('<%= user_projects4show_user_path(user.id,:page => page)%>');">
       <span class="user_icons_moreclass"></span>
     </a>
 <% end%>
 
 <script type="text/javascript">
-    var projectcount = <%= @user.projects.visible.count %>;
-    var projectshowcount = document.getElementsByClassName("course_list_menu").length;
+    var projectcount = <%= all_count %>;
+    var projectshowcount = document.getElementsByClassName("project_list_menu").length;
 
-    if((projectcount <= projectshowcount)&&(projectcount > 5)){
+    if((projectcount <= projectshowcount)&&(projectcount > 10)){
         $("#user_show_more_project").hide();
         $('#user_hide_project').show();
     }
diff --git a/app/views/layouts/base_courses.html.erb b/app/views/layouts/base_courses.html.erb
index 2972045aa..86a0a5518 100644
--- a/app/views/layouts/base_courses.html.erb
+++ b/app/views/layouts/base_courses.html.erb
@@ -131,7 +131,7 @@
       <%# 课程英雄榜 %>
       <%= render :partial => 'courses/course_heroes', :locals => {:course => @course} %>
       <div class="sy_class_leftbox mb15" >
-        <h3>班级推荐</h3>
+        <h3 class="fontGrey7">班级推荐</h3>
         <%= render :partial => 'courses/recommendation', :locals => {:course => @course} %>
       </div>
     </div><!--sy_class_l end-->
diff --git a/app/views/layouts/new_base_user.html.erb b/app/views/layouts/new_base_user.html.erb
index 50e788e2f..f98585b77 100644
--- a/app/views/layouts/new_base_user.html.erb
+++ b/app/views/layouts/new_base_user.html.erb
@@ -175,17 +175,17 @@
           </li>
           <% if is_current_user %>
               <li id="user_02"  class="user_icons_new">
-                <%= link_to "新建课程", new_syllabus_path(:host=> Setting.host_course), :target => "_blank"%>
+                <%= link_to "新建课程", new_syllabus_path(:host=> Setting.host_course), :target => "_blank", :style => "font-size:14px;" %>
               </li>
               <li id="user_03" class="user_icons_new">
-                <%= link_to "新建班级", new_course_path(:host=> Setting.host_course), :target => "_blank"%>
+                <%= link_to "新建班级", new_course_path(:host=> Setting.host_course), :target => "_blank", :style => "font-size:14px;" %>
               </li>
               <li id="user_04" class="user_icons_addclass">
-                <%= link_to "加入班级",join_private_courses_courses_path,:remote => true, :method => "post"%>
+                <%= link_to "加入班级",join_private_courses_courses_path,:remote => true, :method => "post", :style => "font-size:14px;" %>
               </li>
               <% if @user == User.current %>
                 <li id="user_05" class="user_icons_myhw">
-                  <%=link_to '我的作业', my_homeworks_user_path(@user.id), :target => "_blank" %>
+                  <%=link_to '我的作业', my_homeworks_user_path(@user.id), :target => "_blank", :style => "font-size:14px;" %>
                 </li>
               <% end %>
           <% end %>
@@ -212,10 +212,10 @@
           </li>
           <% if is_current_user %>
               <li id="user_07"  class="user_icons_new">
-                <%= link_to "新建项目",  new_project_path(:host=> Setting.host_name), :target => "_blank"%>
+                <%= link_to "新建项目",  new_project_path(:host=> Setting.host_name), :target => "_blank", :style => "font-size:14px;" %>
               </li>
               <li id="user_08" class="user_icons_addproject">
-                <%= link_to "加入项目", applied_join_project_path, :remote => true, :method => "post"%>
+                <%= link_to "加入项目", applied_join_project_path, :remote => true, :method => "post", :style => "font-size:14px;" %>
               </li>
               <!--<li id="user_09" class="user_icons_myissues">-->
                 <!--<a href="#user_09" >我的任务</a>-->
@@ -328,7 +328,6 @@
         for(var i = 10; i < target.length; i++){
             target.eq(i).slideToggle();
         }
-        $('#homepageLeftMenuForge').slideToggle();
         $('#hide_show_projecticon').toggleClass("user_icons_closeclass");
         $('#hide_show_projecticon').toggleClass("user_icons_moreclass");
     }
diff --git a/app/views/members/allow_to_join_project.js.erb b/app/views/members/allow_to_join_project.js.erb
index cbd37e188..222511942 100644
--- a/app/views/members/allow_to_join_project.js.erb
+++ b/app/views/members/allow_to_join_project.js.erb
@@ -1,5 +1,5 @@
 <% if @flash_message %>
     alert("<%= @flash_message %>");
 <% else%>
-    $("#applied_project_<%= @applied_message.id %>").html('<%= render :partial => "users/user_message_applide_action", :locals =>{:ma => @applied_message} %>');
+    $("#applied_project_<%= @applied_message.id %>").html('<%= escape_javascript(render :partial => 'users/applied_project_content', :locals => {:ma => @applied_message}) %>');
 <% end%>
diff --git a/app/views/members/refused_allow_to_join_project.js.erb b/app/views/members/refused_allow_to_join_project.js.erb
index 109ed3a62..57211334f 100644
--- a/app/views/members/refused_allow_to_join_project.js.erb
+++ b/app/views/members/refused_allow_to_join_project.js.erb
@@ -1 +1 @@
-$("#applied_project_<%= @applied_message.id %>").html('<%= render :partial => "users/user_message_applide_action", :locals =>{:ma => @applied_message} %>');
\ No newline at end of file
+$("#applied_project_<%= @applied_message.id %>").html('<%= escape_javascript(render :partial => 'users/applied_project_content', :locals => {:ma => @applied_message}) %>');
\ No newline at end of file
diff --git a/app/views/my/account.html.erb b/app/views/my/account.html.erb
index 46e8e015a..5c8e13e3f 100644
--- a/app/views/my/account.html.erb
+++ b/app/views/my/account.html.erb
@@ -80,7 +80,7 @@
                 <input nhname="tag" autocomplete="off"  maxlength="36"  nh_tag_0="true" nh_tag_1="true" nh_tag_3="true" id="province" name="province" style="display: none;" class="w210 fl" type="text" placeholder="--请搜索您所在的高校（单位）--" >
                 <input nhname="tag" nh_tag_4="true" id="occupation" name="occupation" style="display: none;" class="w210" type="text" value="" placeholder="     --请选择您所属的单位--"/>
                 <p class="fl ml10">
-                  <span id="errortip" class="icons_warning fl mt5" style="display: none;"></span>
+                  <!-- <span id="errortip" class="icons_warning fl mt5" style="display: none;"></span> -->
                   <span id="hint" style="color: #7f7f7f;display: none">平台找到了<a id="school_num" href="javascript:void(0)" style="color: red"  >0</a>个包含<a id="search_condition" href="javascript:void(0)">"国防"</a>的高校</span>
                 </p>
                 <!--<input nhname="tag" nh_tag_0="true" nh_tag_1="true" id="occupation_name" type="text" style="display: none;width:117px;" readonly/>-->
@@ -88,7 +88,7 @@
                 <input nhname="tag" autocomplete="off"   maxlength="36" nh_tag_0="true" nh_tag_1="true" nh_tag_3="true" id="province" name="province" style="display: none;" class="w210 fl" type="text" placeholder="--请搜索您所在的高校（单位）--" >
                 <input nhname="tag" nh_tag_4="true" id="occupation" name="occupation" style="display: none;" class="w210"  type="text" value="<%= @user.user_extensions.occupation %>" />
                 <p class="fl ml10">
-                  <span id="errortip" class="icons_warning fl mt5" style="display: none;"></span>
+                  <!-- <span id="errortip" class="icons_warning fl mt5" style="display: none;"></span> -->
                   <span id="hint" style="color: #7f7f7f;display: none">平台找到了<a id="school_num" href="javascript:void(0)" style="color: red"  >0</a>个包含<a id="search_condition" href="javascript:void(0)">"国防"</a>的高校</span>
                 </p>
                 <!--<input nhname="tag" nh_tag_0="true" nh_tag_1="true" id="occupation_name" type="text" style="display: none;width:117px;" readonly/>-->
@@ -96,7 +96,7 @@
                 <input nhname="tag" autocomplete="off" maxlength="36"   nh_tag_0="true" nh_tag_1="true" nh_tag_3="true" id="province" name="province" style="display: none;" class="w210 fl" type="text" placeholder="--请搜索您所在的高校（单位）--" >
                 <input nhname="tag" nh_tag_4="true" id="occupation" name="occupation" style="display: none;" class="w210"  type="text" placeholder="     --请选择您所属的单位--" />
                 <p class="fl ml10">
-                  <span id="errortip" class="icons_warning fl mt5" style="display: none;"></span>
+                 <!-- <span id="errortip" class="icons_warning fl mt5" style="display: none;"></span> -->
                   <span id="hint" style="color: #7f7f7f;display: none">平台找到了<a id="school_num" href="javascript:void(0)" style="color: red"  >0</a>个包含<a id="search_condition" href="javascript:void(0)">"国防"</a>的高校</span>
                 </p>
                 <!--<input nhname="tag" nh_tag_0="true" nh_tag_1="true" id="occupation_name" type="text" style="display: none;width:117px;" readonly/>-->
@@ -104,7 +104,7 @@
                 <input nhname="tag" autocomplete="off"  maxlength="36"  nh_tag_0="true" nh_tag_1="true" nh_tag_3="true" id="province" name="province" style="display: none;" class="w210 fl" type="text" value="<%= User.current.user_extensions.school %>" />
                 <input nhname="tag" nh_tag_4="true" id="occupation" name="occupation" type="text"  style="display: none;" class="w210" value="<%= User.current.user_extensions.school.id %>"/>
                 <p class="fl ml10">
-                  <span id="errortip" class="icons_warning fl mt5" style="display: none;"></span>
+                 <!-- <span id="errortip" class="icons_warning fl mt5" style="display: none;"></span> -->
                   <span id="hint" style="color: #7f7f7f;display: none">平台找到了<a id="school_num" href="javascript:void(0)" style="color: red"  >0</a>个包含<a id="search_condition" href="javascript:void(0)">"国防"</a>的高校</span>
                 </p>
                 <!--<input nhname="tag" nh_tag_0="true" nh_tag_1="true" id="occupation_name" type="text"  style="display: none;width:117px;" value="<%#= User.current.user_extensions.school.name %>" readonly="true" style="background-color: #E2E2E2;"/>-->
@@ -466,7 +466,7 @@
                   }else{
                       $("#search_school_result_list").html('');
                       str = e.target.value.length > 4 ?  e.target.value.substr(0, 4)+"..." : e.target.value;
-                      $("#hint").html('您输入的名称尚不存在，<a style="color:#64bdd9" onclick="apply_add_school();" href="javascript:void(0);">申请添加</a>');
+                      $("#hint").html('如果找不到自己的单位，您可以<a style="color:#64bdd9" onclick="apply_add_school();" href="javascript:void(0);">添加单位</a>');
                       $("#hint").show();
                       $("#errortip").show();
                   }
diff --git a/app/views/projects/_development_group.html.erb b/app/views/projects/_development_group.html.erb
index 2c7d36fb5..273fcf56a 100644
--- a/app/views/projects/_development_group.html.erb
+++ b/app/views/projects/_development_group.html.erb
@@ -39,6 +39,14 @@
   <% end %>
 </div>
 <% end %>
+
+<% if allow_pull_request(@project) %>
+    <div class="subNav">
+      <%= link_to "Pull Requests", project_pull_requests_path(@project), :class => "f14 c_blue02" %>
+      <%= link_to "+新建请求", new_project_pull_request_path(:project_id => @project.id), :class => "subnav_green" %>
+    </div>
+<% end %>
+
 <%# --版本库被设置成私有、module中设置不显示、没有创建版本库 三种情况不显示-- %>
 <% if visible_repository?(@project) %>
   <div class="subNav">
@@ -57,6 +65,8 @@
   </div>
 <% end %>
 <!-- more -->
+
+
 <div class="subNav subNav_jiantou" id="expand_tools_expand"><%= l(:label_project_more) %></div>
 <ul class="navContent" id="navContent">
   <%= render 'projects/tools_expand' %>
diff --git a/app/views/projects/new.html.erb b/app/views/projects/new.html.erb
index ff7a2d0fb..95d505d62 100644
--- a/app/views/projects/new.html.erb
+++ b/app/views/projects/new.html.erb
@@ -11,7 +11,7 @@
           <input type="text" style="display: none"/> <!--阻止表单自动填充 -->
           <input type="password" style="display: none"/> <!--阻止表单自动填充 -->
           <label><span class="c_red">*</span>&nbsp;<%= l(:label_projects_new_name)%>&nbsp;&nbsp;：</label>
-          <input  type="text" name="project[name]" id="project_name" class="courses_input" maxlength="100" onkeyup="regex_project_name();">
+          <input  type="text" name="project[name]" id="project_name" class="courses_input" maxlength="100" placeholder="例如：团队协作方法与机制研究" onkeyup="regex_project_name();">
           <span class="c_red" id="project_name_notice" style="display: none;">项目名称不能为空</span>
         </li>
         <div class="cl"></div>
diff --git a/app/views/pull_requests/_error_message.html.erb b/app/views/pull_requests/_error_message.html.erb
new file mode 100644
index 000000000..9d0dd5a21
--- /dev/null
+++ b/app/views/pull_requests/_error_message.html.erb
@@ -0,0 +1,7 @@
+<% if @message %>
+    <div class="flash error"><%= @message %></div>
+<% end %>
+
+<% if @fork_pr_message %>
+    <div class="flash notice">您的Pull Request请求已成功发送至源项目：<%= @fork_project_name %></div>
+<% end %>
\ No newline at end of file
diff --git a/app/views/pull_requests/_form.html.erb b/app/views/pull_requests/_form.html.erb
new file mode 100644
index 000000000..a276ea65c
--- /dev/null
+++ b/app/views/pull_requests/_form.html.erb
@@ -0,0 +1,88 @@
+<%= form_tag(url_for(:controller => 'pull_requests', :action => 'create', :project_id => @project.id, :forked_project_id => @forked_project.try(:gpid)), :id => 'pull_request_form', :method => "post", :remote => true) do %>
+    <div class="new-merge-wrap">
+      <div class="merge-option-name fl mt8"><span class="c_red">*</span>标题</div><input type="text" id="pr_name" name="title" class="merge-title-input fl ml30" />
+      <p id ="pull_request_title" class="fl ml100 fontGrey2 mt5 c_red" style="display: none">标题不能为空</p>
+      <div class="cl mb10"></div>
+      <div class="merge-option-name fl">描述</div><textarea type="text" name="description" class="merge-description-input fl ml30"></textarea>
+      <!--<p class="fl ml100 f12 mt5"><a href="javascript:void(0);" class="AnnexBtn fl mr10">上传附件</a></p>-->
+      <div class="cl"></div>
+    </div>
+    <div class="new-merge-wrap borderBottomNone">
+      <div class="merge-option-name fl" style="padding:5px 0">源分支</div>
+      <%= select_tag :branch, options_for_select(@source_rev), :id => "source_branch", :name => "source_branch", :value => "source_branch", :class => "ml30 fontGrey3 fb fl", :style => "padding:5px 0 5px 5px;" %>
+      <div class="cl mb10"></div>
+      <div class="merge-option-name fl" style="padding:5px 0">目标分支</div>
+      <% if @forked_project.nil? %>
+          <%= select_tag :branch, options_for_select(@source_rev), :id => "pull_request_branch", :name => "target_branch", :value => "target_branch",:class => "ml30 fontGrey3 fb fl", :style => "padding:5px 0 5px 5px;" %>
+      <% else %>
+          <select onchange="choice_branch(this.value, document.getElementById('pull_request_branch'), <%= @source_rev %>, <%= @forked_rev %>);" id="pull_request_project" name="source_project" value="source_project" class="ml30 fontGrey3 fb fl" style = "padding:5px 0 5px 5px;">
+            <option name="<%= @project.id %>" value="source_project_name" ><%= @source_project_name %></option>
+            <option name="<%= @forked_project.id %>" value="forked_project_name" ><%= @forked_project_name %></option>
+          </select>
+          <select name="target_branch" id="pull_request_branch" class = "ml30 fontGrey3 fb fl" style = "width:140px; padding:5px 0 5px 5px;">
+            <% @source_rev.each do |rev| %>
+                <option value="<%= rev %>"><%= rev %></option>
+            <% end %>
+          </select>
+      <% end %>
+      <p id="pull_request_project_hidden" style="display: none"><%= @forked_project.nil? ? "" : @project.id %></p>
+      <div class="cl"></div>
+      <p id ="pull_request_branch_error" class="ml100 fontGrey2 mt5 c_red" style="display: none">没有内容可以合并，请切换一个不同的分支</p>
+      <div class="cl"></div>
+    </div>
+    <div class="new-merge-row b_grey" style="border-top:1px solid #ddd;">
+      <a href="javascript:void(0);" class="BlueCirBtn fl ml10" onclick="pull_request_commit()">提交请求</a>
+      <%= link_to "返回", project_pull_requests_path(:project_id => @project.id), :class => "fr linkGrey2 mt5 mr10" %>
+      <div class="cl"></div>
+    </div>
+<% end %>
+
+<script>
+    function regex_pr_name()
+    {
+        var name = $.trim($("#pr_name").val());
+        if(name.length == 0)
+        {
+            $("#pull_request_title").show();
+            return false;
+        }
+        else
+        {
+            $("#pull_request_title").hide();
+            return true;
+        }
+    }
+
+    function regex_branch()
+    {
+        var source_branch = $.trim($("#source_branch").val());
+        var target_branch = $.trim($("#pull_request_branch").val());
+        var target_project = $.trim($("#pull_request_project").children().attr("name"));
+        var target_forked_project = $.trim($("#pull_request_project_hidden").text());
+        if(target_project == target_forked_project && source_branch == target_branch)
+        {
+            $("#pull_request_branch_error").show();
+            return false;
+        }
+        else
+        {
+            $("#pull_request_branch_error").hide();
+            return true;
+        }
+    }
+
+    //提交pull request
+    function pull_request_commit()
+    {
+        if(regex_pr_name() && regex_branch())
+        {
+            $("#pull_request_form").submit();
+        }
+    }
+
+     //切换项目时，替换分支
+     $("#targetProject").change(function(){
+        var defaultBranch = $("#targetBranch option:first-child").val();
+        $("#targetBranch").val(defaultBranch);
+    });
+</script>
\ No newline at end of file
diff --git a/app/views/pull_requests/_new.html.erb b/app/views/pull_requests/_new.html.erb
new file mode 100644
index 000000000..54c7434b0
--- /dev/null
+++ b/app/views/pull_requests/_new.html.erb
@@ -0,0 +1,30 @@
+<div id="pull_request_new_form">
+  <div id="create_pull_request_error">
+    <%= render :partial => "pull_requests/error_message" %>
+  </div>
+
+  <div class="new-merge-request">
+    <div class="f14 fontGrey3 fb mb10">新的合并请求</div>
+  </div>
+  <%= render :partial => "pull_requests/form" %>
+</div>
+
+<script>
+    $("#pull_request_new_form").parent().css("width","730px");
+
+    $("#changed-files").toggle(function(){
+        $("#changed-files-detail").show();
+    },function(){
+        $("#changed-files-detail").hide();
+    });
+
+    $(".merge-record li a").click(function(){
+        $(".merge-record li a").removeClass("active");
+        $(this).addClass("active");
+
+        var index = $(".merge-record li a").index(this);
+
+        $("#merge_record_0, #merge_record_1").hide();
+        $("#merge_record_" + index).show();
+    });
+</script>
\ No newline at end of file
diff --git a/app/views/pull_requests/_pull_request_changes.html.erb b/app/views/pull_requests/_pull_request_changes.html.erb
new file mode 100644
index 000000000..07e891ec6
--- /dev/null
+++ b/app/views/pull_requests/_pull_request_changes.html.erb
@@ -0,0 +1,41 @@
+<% if !@changes.blank? && @type == "3" %>
+    <% @changes.each do |cd| %>
+        <div class="showing-changes-row fontGrey2" style="width:710px;">
+          <a class="linkGrey3" id="changed-files">
+            <img src="/images/vlicon/file.png" width="18" height="20" style="vertical-align:middle;" class="mr5" /><%= cd['new_path'] %>
+          </a>
+        </div>
+        <div class="autoscroll">
+          <table class="filecontent syntaxhl" style="width:100%;" >
+            <tbody>
+            <% line_num = diff_line_num(cd['diff']) %>
+            <% diff_content = diff_content(cd['diff']) %>
+            <% syntax_highlight_lines('new_path', Redmine::CodesetUtil.to_utf8_by_setting(diff_content)).each do |line| %>
+                <tr>
+                  <th class="line-num" id="L<%= line_num %>" style="vertical-align: top;">
+                    <a href="#L<%= line_num %>" style="padding-top: 0px;"><%= line_num %></a>
+                  </th>
+                  <% if line[0,1] == "-" %>
+                      <td class="line-code diff_out"><pre style="white-space:pre;"><%= line.html_safe %></pre></td>
+                  <% elsif line[0,1] == "+" %>
+                      <td class="line-code diff_in"><pre style="white-space:pre;"><%= line.html_safe %></pre></td>
+                  <% else%>
+                      <td class="line-code"><pre style="white-space:pre;"><%= line.html_safe %></pre></td>
+                  <% end %>
+                </tr>
+                <% line_num += 1 %>
+            <% end %>
+            </tbody>
+          </table>
+        </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 @pages, @count, :per_page_links => false, :remote => @is_remote, :flag => true, :is_new => true%>
+        </ul>
+        <div class="cl"></div>
+      </div>
+    </div>
+<% end %>
+
diff --git a/app/views/pull_requests/_pull_request_comments.html.erb b/app/views/pull_requests/_pull_request_comments.html.erb
new file mode 100644
index 000000000..dfc1dda05
--- /dev/null
+++ b/app/views/pull_requests/_pull_request_comments.html.erb
@@ -0,0 +1,49 @@
+<div class="merge-discussion-input">
+  <%= form_tag(url_for(:controller => 'pull_requests', :action => 'create_pull_request_comment', :project_id => @project.id), :id => 'pull_request_comment_form', :method => "post", :remote => true) do %>
+      <textarea id="pull_request_comment" name="pull_request_comment"></textarea>
+      <span id ="pr_comment_tip" class="fontGrey2 c_red" style="display: none">内容不能为空</span>
+      <a href="javascript:void(0);" class="BlueCirBtn mt10" onclick="pull_request_commit()">留言</a>
+  <% end %>
+</div>
+<% @comments.each do |comment| %>
+    <div class="merge-discussion-content merge-discussion-automatic">
+      <%= link_to comment.author.try(:username), user_path(get_user_by_login_and(comment.author.try(:username))), :class => "link-blue mr15 fl" %>
+      <span class="fl fontGrey2"><%= time_tag(comment.created_at) %>前</span>
+      <div class="cl"></div>
+      <div class="merge-discussion-detail"><%= comment.note %></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 @pages, @count, :per_page_links => false, :remote => @is_remote, :flag => true, :is_new => true%>
+    </ul>
+    <div class="cl"></div>
+  </div>
+</div>
+
+<script>
+    function regex_pr_comment()
+    {
+        var comment = $.trim($("#pull_request_comment").val());
+        if(comment.length == 0)
+        {
+            $("#pr_comment_tip").show();
+            return false;
+        }
+        else
+        {
+            $("#pr_comment_tip").hide();
+            return true;
+        }
+    }
+
+    //提交pull request_comment
+    function pull_request_commit()
+    {
+        if(regex_pr_comment())
+        {
+            $("#pull_request_comment_form").submit();
+        }
+    }
+</script>
\ No newline at end of file
diff --git a/app/views/pull_requests/_pull_request_commits.html.erb b/app/views/pull_requests/_pull_request_commits.html.erb
new file mode 100644
index 000000000..0351f6919
--- /dev/null
+++ b/app/views/pull_requests/_pull_request_commits.html.erb
@@ -0,0 +1,32 @@
+<div class="new-merge-row b_grey fontGrey2"><span class="ml10"> 根据最近提交时间排列</span></div>
+<% if !@commits.blank? && @type == "2" %>
+    <% @commits.each do |commit| %>
+        <div class="new-merge-wrap">
+          <div class="merge-commit-time">
+            <img width="16" class="ui-datepicker-trigger mr15" style="cursor:default; margin-top:3px; margin-left:0;" /><span class="fontGrey3"><%= format_date(commit.created_at) %></span>
+            <!--<p class="mt10 fontGrey2">1次提交</p>-->
+            <p class="mt10 fontGrey2"><%= link_to commit.author_name, user_path(get_user_by_mail(commit.author_email)), :class => "link-blue" %> 创建于<%= time_tag(commit.created_at) %>前</p>
+          </div>
+          <div class="merge-commit-detail">
+            <span class="fontGrey3 fb"><%= commit.title %></span>
+
+          </div>
+          <div class="merge-commit-code">
+      <span class="fontGrey3">
+        <%= link_to truncate(commit.short_id, :length => 20), {:controller => 'repositories', :action => 'commit_diff', :id => @project.id, :changeset => commit.id}, :target => "_blank" %>
+      </span>
+          </div>
+          <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 @pages, @count, :per_page_links => false, :remote => @is_remote, :flag => true, :is_new => true%>
+        </ul>
+        <div class="cl"></div>
+      </div>
+    </div>
+<% end %>
+
+
diff --git a/app/views/pull_requests/_pull_request_container.html.erb b/app/views/pull_requests/_pull_request_container.html.erb
new file mode 100644
index 000000000..451be228f
--- /dev/null
+++ b/app/views/pull_requests/_pull_request_container.html.erb
@@ -0,0 +1,3 @@
+<script>
+  $("#RSide").before("<div class='homepageRightBanner mb10'><span class='f16 fontGrey3'>Pull Request</span></div>");
+</script>
\ No newline at end of file
diff --git a/app/views/pull_requests/_pull_requests_list.html.erb b/app/views/pull_requests/_pull_requests_list.html.erb
new file mode 100644
index 000000000..80866afca
--- /dev/null
+++ b/app/views/pull_requests/_pull_requests_list.html.erb
@@ -0,0 +1,24 @@
+<% if @requests.blank? %>
+    <div class="no-merge-content">没有可显示的请求</div>
+<% else %>
+    <% @requests.each do |request| %>
+        <li>
+          <% request %>
+          <%=link_to request.title, project_pull_request_path(request.id, :project_id => @project.id), :class => "linkGrey3 fb fl hidden", :style => "width:100%;"%>
+          <!--<a href="javascript:void(0);" class="fr fontGrey2 fb"><img src="/images/comments.png" class="mr5" width="15" />0</a><span class="fr mr15 fb fontGrey2">关闭</span>-->
+          <div class="cl mb5"></div>
+          <span class="fontGrey2">由 <%= link_to request.author.try(:username), user_path(get_user_by_login_and(request.author.try(:username))), :class => "link-blue" %> 创建于<%= time_tag(request.created_at) %></span>
+          <span class="fr fontGrey2"><%= time_tag(request.updated_at) %>更新</span>
+          <div class="cl"></div>
+        </li>
+    <% end %>
+
+    <div style="text-align:center;">
+      <div class="pages" style="width:auto; display:inline-block;">
+        <ul  id="homework_pository_ref_pages">
+          <%= pagination_links_full @pages, @count, :per_page_links => false, :remote => @is_remote, :flag => true, :is_new => true%>
+        </ul>
+        <div class="cl"></div>
+      </div>
+    </div>
+<% end %>
\ No newline at end of file
diff --git a/app/views/pull_requests/_show.html.erb b/app/views/pull_requests/_show.html.erb
new file mode 100644
index 000000000..b750728a4
--- /dev/null
+++ b/app/views/pull_requests/_show.html.erb
@@ -0,0 +1,79 @@
+<div id="create_pull_request_error">
+  <%= render :partial => "pull_requests/error_message" %>
+</div>
+
+<div id="pull_request_show">
+  <div id="mergeShow" class="f14 fontGrey2 merge-show">
+    <span class="mr10 open-status"><%= get_state(@request.state) %></span><span class="mr10">合并请求</span>   由 <%= link_to @request.author.try(:username), user_path(get_user_by_login_and(@request.author.try(:username))), :class => "link-blue" %> 于 <%= time_tag(@request.created_at) %> 前提交 · 最后编辑时间 <%= time_tag(@request.updated_at) %> 前
+    <% unless @request.state == "merged" %>
+        <%= link_to "#{@request.state == 'closed' ? '重新打开' : '关闭'}", update_pull_request_project_pull_request_path(@request.id, :project_id => @project.id, :state => @request.state =="closed" ? "reopen" : "close"), :class => "BlueCirBtn fr" %>
+    <% end %>
+    <div class="cl"></div>
+  </div>
+  <div class="new-merge-row b_grey"><strong><%= @request.title %></strong><p class="mt10"><%= @request.description %></p></div>
+
+  <div class="mt10 mb15">
+    <%= link_to @request.author.try(:username), user_path(get_user_by_login_and(@request.author.try(:username))), :class => "link-blue" %>
+    请求将 <span class="fontGrey3 fb"><%= @request.source_branch %></span> 合并至 <span class="fontGrey3 fb"><%= @request.target_branch %></span>
+    <% if @commits_count == 0 && @changes_count == 0 %>
+        <div class="merge-commit-option mt15">
+          <span class="fontGrey3 fb" style="font-size:13px;"><img src="/images/warning.png" width="16" class="mr5 mt2 fl"><%= @request.source_branch %>没有新内容可以合并至<%= @request.target_branch %></span><br />
+          <p class="fontGrey2 mt5">请将新改动提交至源分支或者切换到其它目标分支</p>
+        </div>
+        </div>
+    <% else %>
+        <% if @request.state == "merged" %>
+            <div class="merge-commit-option mt15">
+              <% if accept_user(@request.id).blank? %>
+                  <p class="fontGrey2 mt5">改动已合并至<%= @request.target_branch %></p>
+              <% else %>
+                  <span class="fontGrey3 fb" style="font-size:13px;"><%= link_to User.find(accept_user(@request.id).user_id), user_path(accept_user(@request.id).user_id), :class => "link-blue" %> 于 <%= time_tag(accept_user(@request.id).created_at) %> 前合并</span><br />
+              <% end %>
+            </div>
+        <% else %>
+            <% if is_project_manager?(User.current.id, @project.id) %>
+                <div class="merge-commit-option mt15">
+                  <% if @request.state == "closed"  %>
+                      该请求已被关闭
+                  <% else %>
+                      <%= link_to "接受请求", accept_pull_request_project_pull_request_path(@request.id, :project_id => @project.id), :class => "BlueCirBtn", :remote => true %>
+                  <% end %>
+                </div>
+            <% end %>
+        <% end %>
+  </div>
+
+        <ul class="merge-record" style="border-top:1px solid #ddd;">
+          <li><%= link_to "留言<span class='project-number-dot'>#{@comments_count}</span>".html_safe, pull_request_comments_project_pull_request_path(@request.id, :project_id => @project.id, :type => "1"), :remote => true, :class => "active" %></li>
+          <li><%= link_to "提交<span class='project-number-dot'>#{@commits_count}</span>".html_safe, pull_request_commits_project_pull_request_path(@request.id, :project_id => @project.id, :type => "2"), :remote => true %></li>
+          <li><%= link_to "改动<span class='project-number-dot'>#{@changes_count}</span>".html_safe, pull_request_changes_project_pull_request_path(@request.id, :project_id => @project.id, :type => "3"), :remote => true %></li>
+        </ul>
+        <% if @type == nil || @type == "1" %>
+            <div id="merge_record_0">
+              <%= render :partial => "pull_requests/pull_request_comments" %>
+            </div>
+        <% end %>
+        <div id="merge_record_1" class="undis">
+          <%= render :partial => "pull_requests/pull_request_commits" %>
+        </div>
+        <div id="merge_record_2" class="undis">
+          <%= render :partial => "pull_requests/pull_request_changes" %>
+        </div>
+
+    <% end %>
+</div>
+
+
+<script>
+    $("#pull_request_show").parent().css("width","730px");
+
+    $(".merge-record li a").click(function(){
+        $(".merge-record li a").removeClass("active");
+        $(this).addClass("active");
+
+        var index = $(".merge-record li a").index(this);
+
+        $("#merge_record_0, #merge_record_1, #merge_record_2").hide();
+        $("#merge_record_" + index).show();
+    });
+</script>
\ No newline at end of file
diff --git a/app/views/pull_requests/accept_pull_request.js.erb b/app/views/pull_requests/accept_pull_request.js.erb
new file mode 100644
index 000000000..b9007d7a3
--- /dev/null
+++ b/app/views/pull_requests/accept_pull_request.js.erb
@@ -0,0 +1,2 @@
+$("#create_pull_request_error").html('<%= escape_javascript(render :partial => "pull_requests/error_message") %>');
+
diff --git a/app/views/pull_requests/create.html.erb b/app/views/pull_requests/create.html.erb
new file mode 100644
index 000000000..034f30163
--- /dev/null
+++ b/app/views/pull_requests/create.html.erb
@@ -0,0 +1,3 @@
+<%= render :partial => "pull_requests/pull_request_container" %>
+<%= render :partial => "pull_requests/new" %>
+
diff --git a/app/views/pull_requests/create.js.erb b/app/views/pull_requests/create.js.erb
new file mode 100644
index 000000000..ce5f50ac0
--- /dev/null
+++ b/app/views/pull_requests/create.js.erb
@@ -0,0 +1 @@
+$("#create_pull_request_error").html('<%= escape_javascript(render :partial => "pull_requests/error_message") %>');
diff --git a/app/views/pull_requests/index.html.erb b/app/views/pull_requests/index.html.erb
new file mode 100644
index 000000000..78c4759aa
--- /dev/null
+++ b/app/views/pull_requests/index.html.erb
@@ -0,0 +1,24 @@
+<%= render :partial => "pull_requests/pull_request_container" %>
+<ul id="mergeBanner" class="project-merge-banner">
+  <li class="active"><%= link_to "待处理<span class='project-number-dot'>#{@requests_opened_count}</span>".html_safe, project_pull_requests_path(:type => "1"), :remote => true %></li>
+  <li><%= link_to "已处理<span class='project-number-dot'>#{@requests_merged_count}</span>".html_safe, project_pull_requests_path(:type => "2"), :remote => true %></li>
+  <li><%= link_to "已关闭<span class='project-number-dot'>#{@requests_closed_count}</span>".html_safe, project_pull_requests_path(:type => "3"), :remote => true %></li>
+
+  <%= link_to "创建Pull Request", new_project_pull_request_path, :class => "BlueCirBtn fr ml10 mt10", :style => "width:110px;" %>
+  <div class="cl"></div>
+</ul>
+<div class="cl"></div>
+
+<ul class="project-merge-content" id="pull_requests_list">
+  <%= render "pull_requests/pull_requests_list" %>
+</ul>
+
+
+<script>
+    $("#mergeBanner").parent().css("width","730px");
+
+    $(".project-merge-banner li").click(function(){
+        $(".project-merge-banner li").removeClass("active");
+        $(this).addClass("active");
+    });
+</script>
\ No newline at end of file
diff --git a/app/views/pull_requests/index.js.erb b/app/views/pull_requests/index.js.erb
new file mode 100644
index 000000000..bcf218cb3
--- /dev/null
+++ b/app/views/pull_requests/index.js.erb
@@ -0,0 +1 @@
+$("#pull_requests_list").html('<%= escape_javascript( render :partial => "pull_requests/pull_requests_list",  :locals => {:type => @type} ) %>');
\ No newline at end of file
diff --git a/app/views/pull_requests/new.html.erb b/app/views/pull_requests/new.html.erb
new file mode 100644
index 000000000..e7494708c
--- /dev/null
+++ b/app/views/pull_requests/new.html.erb
@@ -0,0 +1,3 @@
+<%= render :partial => "pull_requests/pull_request_container" %>
+<%= render :partial => "pull_requests/new" %>
+
diff --git a/app/views/pull_requests/pull_request_changes.js.erb b/app/views/pull_requests/pull_request_changes.js.erb
new file mode 100644
index 000000000..9021c498d
--- /dev/null
+++ b/app/views/pull_requests/pull_request_changes.js.erb
@@ -0,0 +1 @@
+$("#merge_record_2").html('<%= escape_javascript( render :partial => "pull_requests/pull_request_changes") %>');
\ No newline at end of file
diff --git a/app/views/pull_requests/pull_request_comments.js.erb b/app/views/pull_requests/pull_request_comments.js.erb
new file mode 100644
index 000000000..5a7e6683c
--- /dev/null
+++ b/app/views/pull_requests/pull_request_comments.js.erb
@@ -0,0 +1 @@
+$("#merge_record_0").html('<%= escape_javascript( render :partial => "pull_requests/pull_request_comments") %>');
\ No newline at end of file
diff --git a/app/views/pull_requests/pull_request_commits.js.erb b/app/views/pull_requests/pull_request_commits.js.erb
new file mode 100644
index 000000000..cc0a82010
--- /dev/null
+++ b/app/views/pull_requests/pull_request_commits.js.erb
@@ -0,0 +1 @@
+$("#merge_record_1").html('<%= escape_javascript( render :partial => "pull_requests/pull_request_commits") %>');
\ No newline at end of file
diff --git a/app/views/pull_requests/show.html.erb b/app/views/pull_requests/show.html.erb
new file mode 100644
index 000000000..cf344d32c
--- /dev/null
+++ b/app/views/pull_requests/show.html.erb
@@ -0,0 +1,2 @@
+<%= render :partial => "pull_requests/pull_request_container" %>
+<%= render :partial => "pull_requests/show" %>
diff --git a/app/views/pull_requests/show.js.erb b/app/views/pull_requests/show.js.erb
new file mode 100644
index 000000000..0a64c51a8
--- /dev/null
+++ b/app/views/pull_requests/show.js.erb
@@ -0,0 +1,3 @@
+<%# 详情页面和新建页面都会跳入，所以用两种局部刷新 %>
+$("#pull_request_new_form").html('<%= escape_javascript(render :partial => "pull_requests/show") %>');
+$("#pull_request_show").html('<%= escape_javascript(render :partial => "pull_requests/show") %>');
\ No newline at end of file
diff --git a/app/views/quality_analysis/_result_list.html.erb b/app/views/quality_analysis/_result_list.html.erb
index d27ef6812..5b4e4f5a0 100644
--- a/app/views/quality_analysis/_result_list.html.erb
+++ b/app/views/quality_analysis/_result_list.html.erb
@@ -10,22 +10,23 @@
   <li class="analysis-result-version fl fontBlue2" >分支</li>
   <li class="analysis-result-loc fl fontBlue2" >语言</li>
   <li class="analysis-result-debt fl fontBlue2" >路径</li>
-  <li class="analysis-result-time fl fontBlue2" ></li>
-  <!--<li class="analysis-result-time fl fontBlue2" >bianji</li>-->
+  <li class="analysis-result-time fl fontBlue2" >最近更新</li>
+  <li class="analysis-result-edit fl fontBlue2" ></li>
   <div class="cl"></div>
 </ul>
 <% if @quality_analyses.count >0 %>
     <% @quality_analyses.each do |qa| %>
         <ul class="analysis-result-list">
-          <li title="Name" title="名称"><%=link_to "#{qa.author_login}:#{qa.rep_identifier}", project_quality_analysis_path(:resource_id => qa.sonar_name, :branch => (qa.branch.nil? ? "master" : qa.branch)), :class => "analysis-result-name fl fontBlue2 hidden" %></li>
-          <li class="analysis-result-version fl fontBlue2 hidden" title="分支名"><%= qa.branch %></li>
-          <li class="analysis-result-loc fl fontBlue2 hidden" title="语言"><%= qa.language %></li>
-          <li class="analysis-result-debt fl fontBlue2 hidden" title="路径"><%= qa.path %></li>
+          <li title="<%= qa.author_login+ ':' +qa.rep_identifier %>"><%=link_to "#{qa.author_login}:#{qa.rep_identifier}", project_quality_analysis_path(:resource_id => qa.sonar_name, :branch => (qa.branch.nil? ? "master" : qa.branch)), :class => "analysis-result-name fl fontBlue2 hidden" %></li>
+          <li class="analysis-result-version fl fontBlue2 hidden" title="<%= qa.branch %>"><%= qa.branch %></li>
+          <li class="analysis-result-loc fl fontBlue2 hidden" title="<%= qa.language %>"><%= qa.language %></li>
+          <li class="analysis-result-debt fl fontBlue2 hidden" title="<%= qa.path %>"><%= qa.path %></li>
+          <li class="analysis-result-time fl fontBlue2 hidden" title="<%= sonar_time(qa.sonar_name).blank? ? qa.created_at : sonar_time(qa.sonar_name) %>"><%= format_time(sonar_time(qa.sonar_name).blank? ? qa.created_at : sonar_time(qa.sonar_name)) %></li>
           <% if User.current.try(:login) == qa.author_login || User.current.admin? || is_project_manager?(User.current.id, @project.id) %>
-              <li class="analysis-result-time fl" title="编辑">
+            <li class="analysis-result-edit fl fontBlue2 hidden" title="<%= qa.path %>">
                 <%=link_to "编辑", edit_project_quality_analysi_path(qa, :project_id => @project.id), :remote => true, :class => "fontBlue2" %><span style="color: #888"> / </span>
                 <%=link_to "删除", delete_project_quality_analysi_path(qa, :project_id => @project.id), :method => "delete", :confirm => "删除会一并删除分析结果，确定删除吗？", :class => "fontBlue2" %>
-              </li>
+            </li>
           <% end %>
           <div class="cl"></div>
         </ul>
diff --git a/app/views/quality_analysis/_show.html.erb b/app/views/quality_analysis/_show.html.erb
index 7901c6be0..f9dbfc510 100644
--- a/app/views/quality_analysis/_show.html.erb
+++ b/app/views/quality_analysis/_show.html.erb
@@ -12,7 +12,7 @@
     <div class="analysis-genral">
       <p id="container_sqale_rating" style="max-width:200px;min-height:200px;width:200px; margin:0 auto;"></p>
       <p class="fontGrey3">质量等级</p>
-      <p class="fontBlue2 pr"><%= @ha["sqale_rating"] %>
+      <p class="fontBlue2 pr"><%= sqale_rating_status(@ha["sqale_rating"].to_i)[2] %>
         <span class="f10 c_white analysis-genral-icon <%= sqale_rating_status(@ha["sqale_rating"].to_i)[1] %> borderRadius">
           <%= @ha["sqale_rating"].nil? ? "很好" : sqale_rating_status(@ha["sqale_rating"].to_i)[0] %>
         </span>
diff --git a/app/views/quality_analysis/error_list.html.erb b/app/views/quality_analysis/error_list.html.erb
index 138dc9c08..79e236d87 100644
--- a/app/views/quality_analysis/error_list.html.erb
+++ b/app/views/quality_analysis/error_list.html.erb
@@ -5,6 +5,8 @@
   <div class="c_red">本次分析失败，原因如下：</div>
   <% if @build_console_result == false %>
       分析超时
+  <% elsif params[:message] %>
+    <%= params[:message] %>
   <% else %>
       <%= h @error_list.try(:output).html_safe %>
   <% end %>
diff --git a/app/views/repositories/_commit_details.html.erb b/app/views/repositories/_commit_details.html.erb
index ef8faecd7..1845da61b 100644
--- a/app/views/repositories/_commit_details.html.erb
+++ b/app/views/repositories/_commit_details.html.erb
@@ -1,7 +1,7 @@
 <div class="commit-row-info">
   <% if !user_commit_rep(changeset.author_email).nil? %>
       <a class="commit-author-link has_tooltip"> <span class="commit-author-name">
-                        <%= image_tag(url_to_avatar(user_commit_rep(changeset.author_email)), :width => "20", :height => "20", :class => "fl portraitRadius mt2 ml4 mr5") %>
+        <%= image_tag(url_to_avatar(user_commit_rep(changeset.author_email)), :width => "20", :height => "20", :class => "fl portraitRadius mt2 ml4 mr5") %>
         <%= link_to user_commit_rep(changeset.author_email), user_path(user_commit_rep(changeset.author_email)), :length => 30 %></span></a>提交于
       <div class="committed_ago">
         <time class="time_ago js-timeago" title="<%= changeset.created_at %>"><%= time_tag(changeset.created_at) %>前 </time>&nbsp;
diff --git a/app/views/repositories/_dir_list_content.html.erb b/app/views/repositories/_dir_list_content.html.erb
index 068ae0a1b..a25d7a94c 100644
--- a/app/views/repositories/_dir_list_content.html.erb
+++ b/app/views/repositories/_dir_list_content.html.erb
@@ -26,19 +26,19 @@
       </td>
       <div id="children_tree">
         <td class="tree-comments c_grey hidden">
-          <div class="hidden" title="<%= (latest_changes.message) if latest_changes && latest_changes.message %>">
-            <%= (latest_changes.message) if latest_changes && latest_changes.message %>
+          <div class="hidden" title="<%= (latest_changes.message) if latest_changes %>">
+            <%= (latest_changes.message) if latest_changes %>
           </div>
         </td>
         <td class="tree-author c_grey">
-          <div class="hidden" title="<%= (latest_changes.author) if latest_changes && latest_changes.author %>">
-            <%= (latest_changes.author) if latest_changes && latest_changes.author %>
+          <div class="hidden" title="<%= (latest_changes.author_name) if latest_changes %>">
+            <%= (latest_changes.author_name) if latest_changes %>
           </div>
         </td>
         <td class="tree-age c_grey">
-          <div class="hidden" title="<%= format_time(latest_changes.time) %>">
+          <div class="hidden" title="<%= format_time(latest_changes.time) if latest_changes %>">
             <%# 为了转换UTC时间，时差8小时 %>
-            <%= distance_of_time_in_words(latest_changes.time, Time.now + 8.hours) if latest_changes && latest_changes.time %>
+            <%= distance_of_time_in_words(latest_changes.time, Time.now) if latest_changes %>
           </div>
         </td>
       </div>
diff --git a/app/views/student_work/_student_work_list.html.erb b/app/views/student_work/_student_work_list.html.erb
index cc078bf9c..e05df2892 100644
--- a/app/views/student_work/_student_work_list.html.erb
+++ b/app/views/student_work/_student_work_list.html.erb
@@ -2,7 +2,7 @@
   <span class="c_dark f14 fb fl mr15">
       作品
       <font class="f12 c_red">
-        (<%= @student_work_count%>人已交)
+        (<span id="student_work_count"><%= @student_work_count%></span>人已交)
       </font>
     <%# my_work = @homework.student_works.where("user_id = #{User.current.id}").first %>
     <% my_work = cur_user_works_for_homework @homework %>
diff --git a/app/views/student_work/add_score.js.erb b/app/views/student_work/add_score.js.erb
index e4341869f..c961fb077 100644
--- a/app/views/student_work/add_score.js.erb
+++ b/app/views/student_work/add_score.js.erb
@@ -17,3 +17,5 @@ $("#score_list_<%= @work.id%>").removeAttr("style");
     $("tr[id='student_work_<%= @work.id%>']").replaceWith("<%= escape_javascript(render :partial => 'evaluation_work',:locals => {:student_work => @work, :index => 1}) %>");
     $("#work_num_<%= @work.id%>").html(num);
 <% end%>
+
+$("#student_work_count").html("<%=@count %>");
diff --git a/app/views/users/_applied_project_content.html.erb b/app/views/users/_applied_project_content.html.erb
new file mode 100644
index 000000000..2d9c7b109
--- /dev/null
+++ b/app/views/users/_applied_project_content.html.erb
@@ -0,0 +1,15 @@
+<li class="homepageNewsPortrait fl">
+  <a href="javascript:void(0);"><%=link_to image_tag(url_to_avatar(applied_project_users(ma)), :width => "30", :height => "30"), user_path(applied_project_users(ma)), :target => '_blank' %></a>
+</li>
+<li class="homepageNewsPubType fl">
+  <%= render :partial => "users/user_message_applide_users", :locals =>{:ma => ma} %>
+</li>
+<li class="homepageNewsContent fl" style="width:283px;"><a href="javascript:void(0);" class="newsGrey">
+  以“<%= applied_project_message_type(ma.role) %>”身份加入<% project = Project.find(ma.project_id) %>
+  <%= link_to project.name, project_path(ma.project_id), :class => "link-blue", :target => '_blank', :title => "#{project.name}" %>
+</a>
+</li>
+<li class="fl" style="width:71px; height:49px;">
+  <span><%= render :partial => "users/user_message_applide_action", :locals =>{:ma => ma} %></span>
+</li>
+<li class="homepageNewsTime fl"><%= time_tag(ma.created_at).html_safe %> </li>
\ No newline at end of file
diff --git a/app/views/users/_homework_repository_detail.html.erb b/app/views/users/_homework_repository_detail.html.erb
index f752fbfb3..55779fcea 100644
--- a/app/views/users/_homework_repository_detail.html.erb
+++ b/app/views/users/_homework_repository_detail.html.erb
@@ -1,4 +1,4 @@
-<div class="hw_popup_box">
+<div class="hw_popup_box" style="padding-bottom:30px;">
   <div class="hw_popup_top clear">
     <a href="javascript:void(0);" class="hw_icons_close fr" style="outline: none;" onclick="hideModal()"></a>
   </div>
diff --git a/app/views/users/_my_joined_projects.html.erb b/app/views/users/_my_joined_projects.html.erb
new file mode 100644
index 000000000..4de7c2ceb
--- /dev/null
+++ b/app/views/users/_my_joined_projects.html.erb
@@ -0,0 +1,3 @@
+<div id="user_join_projects_list">
+  <%= render :partial => 'users/project_list', :locals => {:projects => @my_joined_projects, :list_type => 2, :count => @my_joined_projects_count}%>
+</div>
\ No newline at end of file
diff --git a/app/views/users/_my_projects.html.erb b/app/views/users/_my_projects.html.erb
new file mode 100644
index 000000000..87b3ad762
--- /dev/null
+++ b/app/views/users/_my_projects.html.erb
@@ -0,0 +1,3 @@
+<div id="user_projects_list">
+  <%= render :partial => 'users/project_list', :locals => {:projects => @my_projects, :list_type => 1, :count => @my_projects_count}%>
+</div>
\ No newline at end of file
diff --git a/app/views/users/_project_list.html.erb b/app/views/users/_project_list.html.erb
new file mode 100644
index 000000000..0c65dd76d
--- /dev/null
+++ b/app/views/users/_project_list.html.erb
@@ -0,0 +1,63 @@
+<div class="syllabus_category">
+  <% unless projects.empty? %>
+      <% if @type.to_i  == 2 %>
+          <%= link_to "", {:controller => 'users', :action => 'sort_project_list', :id =>@user,:list_type => list_type, :type => @type,  :sort => @c_sort, :order => 2 }, :class => "#{@c_sort.to_i == 1 ? 'sortupbtn' : 'sortdownbtn'} fr", :style => "margin-right: 5px;", :remote => true %>
+      <% else %>
+          <%= link_to "", {:controller => 'users', :action => 'sort_project_list', :id =>@user,:list_type => list_type, :type => @type,  :sort => @c_sort, :order => 2 }, :class => "sortdownbtn  sort_no fr", :style => "margin-right: 5px;", :remote => true %>
+      <% end %>
+      <%= link_to "人气", {:controller => 'users', :action => 'sort_project_list', :id =>@user,:list_type => list_type, :type => @type,  :sort => @c_sort, :order => 2 }, :class => "sortTxt fr", :remote => true %>
+      <% if @type.to_i == 1 %>
+          <%= link_to "", {:controller => 'users', :action => 'sort_project_list', :id =>@user,:list_type => list_type, :type => @type,  :sort => @c_sort, :order => 1 }, :class => "#{@c_sort.to_i == 1 ? 'sortupbtn' : 'sortdownbtn'} fr", :remote => true %>
+      <% else %>
+          <%= link_to "", {:controller => 'users', :action => 'sort_project_list', :id =>@user,:list_type => list_type, :type => @type,  :sort => @c_sort, :order => 1 }, :class => "sortdownbtn  sort_no fr", :remote => true %>
+      <% end %>
+      <%= link_to "时间", {:controller => 'users', :action => 'sort_project_list', :id =>@user,:list_type => list_type, :type => @type,  :sort => @c_sort, :order => 1 }, :class => "sortTxt fr", :remote => true %>
+  <% end %>
+<span class="grayTxt fl "><%=@user == User.current ? "我" : "他" %><%= list_type == 1 ? "创建" : "参与"%>的项目</span>
+<div class="cl"></div>
+</div>
+<div class="syllabus_courses_box" id="project_li_<%=list_type %>">
+<% if projects.empty? %>
+      <div class="icons_tishi"><img src="/images/sy/icons_tan.png" width="110" height="110" alt="" ></div>
+      <% if list_type == 1 %>
+        <p class="sy_tab_con_p"><%=@user == User.current ? "您" : "他" %>还没有创建项目~~<br />
+          <%= link_to "创建项目",  new_project_path(:host=> Setting.host_name), :target => "_blank", :class => "sy_btn_green ml5 mt5" if @user == User.current %>
+        </p>
+      <% else %>
+          <p class="sy_tab_con_p"><%=@user == User.current ? "您" : "他" %>还没有加入项目~~<br />
+            <%= link_to "加入项目", applied_join_project_path, :remote => true, :method => "post", :class => "sy_btn_green ml5 mt5" if @user == User.current %>
+          </p>
+      <% end %>
+<% else %>
+  <% projects.each_with_index do |project, i| %>
+    <div class="syllabus_courses_list <%= i > 4 ? 'none' : ''%>" style="cursor: default;">
+      <div class="sy_courses_open">
+        <span class="icons_project_list fl mt5 mr10"></span>
+        <h3><%= link_to project.name, project_path(project.id,:host=>Setting.host_name), :target => '_blank', :class => "new_project_title fl",:id => "show_project_#{project.id}", :title => (project.is_public? ? "公开项目：":"私有项目：") + project.name%></h3>
+        <% unless project.is_public? %>
+            <span class="hw_icon_private fl"></span>
+        <% end %>
+        <% projectUser = User.where("id=?",project.user_id).first %>
+        <%=link_to "<span class='fr grayTxt'>创建者：#{projectUser.try(:realname) != " " ? projectUser.lastname + projectUser.firstname : projectUser.try(:login)}</span>".html_safe, user_path(projectUser) %>
+        <div class="cl"></div>
+      </div>
+      <div>
+        <p class="fl sy_p_grey">更新时间：<%= format_date(project.updatetime) %></p>
+        <div class=" fr">
+          <p class="list-info fr grayTxt">
+            <%= link_to project.members.count, member_project_path(project), :class => "c_blue" %><span class="mr5">成员&nbsp;&nbsp;|</span>
+            <%= link_to project.project_score.issue_num, project_issues_path(project), :class => "c_blue" %><span class="mr5">问题&nbsp;&nbsp;|</span>
+            <%= link_to project.project_score.attach_num, project_files_path(project), :class => "c_blue" %><span class="mr5">资源</span>
+          </p>
+        </div>
+      </div>
+      <div class="cl"></div>
+    </div>
+  <% end %>
+    <% if count > 5 %>
+        <div class="syllabus_courses_list">
+          <p class="new_projectlist_more"><a id="project_more_<%=list_type %>" href="javascript:void(0);" data-count="<%= count %>" data-init="0" onclick="expand_projects('#project_more_<%=list_type %>', '#project_li_<%=list_type %>', <%=count%>);">共<%=count %>个项目，点击全部展开</a></p>
+        </div>
+    <% end %>
+<% end %>
+</div><!--syllabus_courses_box end-->
\ No newline at end of file
diff --git a/app/views/users/_user_message_applide_action.html.erb b/app/views/users/_user_message_applide_action.html.erb
index 48e479b22..a8b5598fa 100644
--- a/app/views/users/_user_message_applide_action.html.erb
+++ b/app/views/users/_user_message_applide_action.html.erb
@@ -1,3 +1,4 @@
+<% ma = ma.nil? ? @applied_message : ma %>
 <% if allow_to_show(ma) %>
     <%= link_to "同意", allow_to_join_project_project_memberships_path(:project_id => ma.project_id,  :applied_message_id => ma.id), :remote => true, :method => :post, :class => "link-blue"%> |
     <%= link_to "拒绝", refused_allow_to_join_project_project_memberships_path(:project_id => ma.project_id, :applied_message_id => ma.id), :remote => true, :method => :get, :class => "link-blue" %>
diff --git a/app/views/users/_user_message_applied.html.erb b/app/views/users/_user_message_applied.html.erb
index fbe422242..414b13cf7 100644
--- a/app/views/users/_user_message_applied.html.erb
+++ b/app/views/users/_user_message_applied.html.erb
@@ -1,71 +1,27 @@
 <% if ma.class == AppliedMessage %>
     <!--申请加入项目-->
     <% if ma.applied_type == "ApplyAddSchools" %>
-        <% if ma.status == 1 || ma.status == 2 || ma.status == 3 || ma.status == 4 %>
         <ul class="homepageNewsList fl">
           <li class="homepageNewsPortrait fl">
             <a href="javascript:void(0);">
-              <% if ma.status == 1 || ma.status == 2 || ma.status == 3 %>
-                <%= image_tag("/images/trustie_logo1.png", width: "30px", height: "30px", class: "mt3") %>
-              <% elsif ma.status == 4 %>
-                <%= link_to image_tag(url_to_avatar(ma.user), :width => "30", :height => "30"), user_path(ma.user), :target => '_blank' %>
+              <% if ma.status == 0 %>
+                  <%= link_to image_tag(url_to_avatar(ma.user), :width => "30", :height => "30"), user_path(ma.user), :target => '_blank' %>
+              <% else %>
+                  <%= image_tag("/images/trustie_logo1.png", width: "30px", height: "30px", class: "mt3") %>
               <% end %>
             </a>
           </li>
           <li class="homepageNewsPubType fl">
-          <% if ma.status == 1 %>
-                <span class="newsBlue homepageNewsPublisher">系统提示</span>
-            <span class="<%= ma.viewed == 0 ? "homepageNewsTypeNotRead fl" : "homepageNewsType fl" %>">您添加新的高校（单位）：</span>
-                <li class="homepageNewsContent fl">
-                  <a class ="#{ma.viewed == 0 ? 'newsBlack' : 'newsGrey'}" target = '_blank' title="<%= ma.name %>的申请，已通过">“<%= ma.name %>”的申请，已通过</a>
-                </li>
-                <li class="homepageNewsTime fl"><%= time_tag(ma.created_at).html_safe %> </li>
-          <% elsif ma.status == 2 %>
-                <span class="newsBlue homepageNewsPublisher">系统提示</span>
-                <span class="<%= ma.viewed == 0 ? "homepageNewsTypeNotRead fl" : "homepageNewsType fl" %>">您添加新的高校（单位）：</span>
-                <li class="homepageNewsContent fl">
-                  <a  class ="#{ma.viewed == 0 ? 'newsBlack' : 'newsGrey'}" target = '_blank' title="“<%= ma.applied.name %>”的申请，因名称不合法，系统已将其更改为“<%= ma.name %>”">“<%= ma.applied.name %>”的申请，因名称不合法，系统已将其更改为“<%= ma.name %>”</a>
-                </li>
-                <li class="homepageNewsTime fl"><%= time_tag(ma.created_at).html_safe %> </li>
-          <% elsif ma.status == 3 %>
-                <span class="newsBlue homepageNewsPublisher">系统提示</span>
-                <span class="<%= ma.viewed == 0 ? "homepageNewsTypeNotRead fl" : "homepageNewsType fl" %>">您添加新的高校（单位）：</span>
-                <li class="homepageNewsContent fl">
-                  <%= link_to "“"+ma.name+"”" + "的申请，因名称不合法，已被拒绝，请重新编辑您的基本资料",  { :controller=> "my",:action => "account" }, :title => "“#{ma.name}”的申请，因名称不合法，已被拒绝，请重新编辑您的基本资料", :target => '_blank'%>
-                </li>
-                <li class="homepageNewsTime fl"><%= time_tag(ma.created_at).html_safe %> </li>
-           <% elsif ma.status == 4 %>
-                <%=link_to User.where("id=?", ma.applied_user_id).first.show_name, user_path(ma.user), :class => "newsBlue homepageNewsPublisher", :target => '_blank' %>
-                <span class="<%= ma.viewed == 0 ? "homepageNewsTypeNotRead fl" : "homepageNewsType fl" %>"> 申请了单位：</span>
-                <li class="homepageNewsContent fl">
-                <a  class ="#{ma.viewed == 0 ? 'newsBlack' : 'newsGrey'}" target = '_blank'>
-                  <%= link_to User.where("id=?", ma.applied_user_id).first.show_name + "提交了申请：添加新的单位“#{ma.name}”", unapplied_schools_path(), :title => "#{User.where("id=?", ma.applied_user_id).first.show_name}提交了申请：添加新的单位“#{ma.name}”" %></a>
-                </li>
-                <li class="homepageNewsTime fl"><%= time_tag(ma.created_at).html_safe %> </li>
-            <% end %>
+              <%= render :partial => "users/user_message_applied_schools", :locals =>{:ma => ma} %>
+              <li class = "homepageNewsContent fl">
+                <%= render :partial => "users/user_message_applied_school_action", :locals =>{:ma => ma} %>
+              </li>
+              <li class="homepageNewsTime fl"><%= time_tag(ma.created_at).html_safe %> </li>
           </li>
         </ul>
-        <% end %>
     <% elsif ma && ma.applied_type == "AppliedProject" %>
-        <ul class="homepageNewsList fl">
-          <li class="homepageNewsPortrait fl">
-            <a href="javascript:void(0);"><%=link_to image_tag(url_to_avatar(applied_project_users(ma)), :width => "30", :height => "30"), user_path(applied_project_users(ma)), :target => '_blank' %></a>
-          </li>
-          <li class="homepageNewsPubType fl">
-            <%= render :partial => "users/user_message_applide_users", :locals =>{:ma => ma} %>
-          </li>
-          <li class="homepageNewsContent fl" style="width:283px;"><a href="javascript:void(0);" class="newsGrey">
-            以“<%= applied_project_message_type(ma.role) %>”身份加入
-            <% project = Project.find(ma.project_id) %>
-            <%= link_to project.name, project_path(ma.project_id), :class => "link-blue", :target => '_blank', :title => "#{project.name}" %>
-          </a>
-          </li>
-          <li class="fl" style="width:71px; height:49px;">
-            <span id="applied_project_<%= ma.id %>">
-                <%= render :partial => "users/user_message_applide_action", :locals =>{:ma => ma} %>
-            </span>
-          </li>
-          <li class="homepageNewsTime fl"><%= time_tag(ma.created_at).html_safe %> </li>
+        <ul class="homepageNewsList fl" id="applied_project_<%= ma.id %>">
+          <%= render :partial => "users/applied_project_content", :locals =>{:ma => ma} %>
         </ul>
     <% end %>
 <% end %>
\ No newline at end of file
diff --git a/app/views/users/_user_message_applied_school_action.html.erb b/app/views/users/_user_message_applied_school_action.html.erb
new file mode 100644
index 000000000..b4b0cdb6d
--- /dev/null
+++ b/app/views/users/_user_message_applied_school_action.html.erb
@@ -0,0 +1,15 @@
+<% if ma.status == 1 %>
+    <a class ="#{ma.viewed == 0 ? 'newsBlack' : 'newsGrey'}" target = '_blank' title="<%= ma.name %>的申请，已通过审核。谢谢！">
+      “<%= ma.name %>”的申请，已通过审核。谢谢！
+    </a>
+<% elsif ma.status == 2 %>
+    <a  class ="#{ma.viewed == 0 ? 'newsBlack' : 'newsGrey'}" target = '_blank' title="“<%= ma.applied.name %>”的申请，因名称不符合规范，系统已将其更改为“<%= ma.name %>”。谢谢！">
+      “<%= ma.applied.name %>”的申请，因名称不符合规范，系统已将其更改为“<%= ma.name %>”。谢谢！
+    </a>
+<% elsif ma.status == 3 %>
+    <%= link_to "“"+ma.name+"”" + "的申请，经确认为无效的单位信息，已被删除，请重新编辑您的单位资料。谢谢！",  { :controller=> "my",:action => "account" }, :title => "“#{ma.name}”的申请，经确认为无效的单位信息，已被删除，请重新编辑您的单位资料。谢谢！", :target => '_blank'%>
+<% elsif ma.status == 0 %>
+    <a  class ="#{ma.viewed == 0 ? 'newsBlack' : 'newsGrey'}" target = '_blank'>
+      <%= link_to User.where("id=?", ma.applied_user_id).first.show_name + "提交了申请：添加新的单位“#{ma.name}”", unapplied_schools_path(), :title => "#{User.where("id=?", ma.applied_user_id).first.show_name}提交了申请：添加新的单位“#{ma.name}”" %>
+    </a>
+<% end %>
\ No newline at end of file
diff --git a/app/views/users/_user_message_applied_schools.html.erb b/app/views/users/_user_message_applied_schools.html.erb
new file mode 100644
index 000000000..9de70a03a
--- /dev/null
+++ b/app/views/users/_user_message_applied_schools.html.erb
@@ -0,0 +1,7 @@
+
+<% if ma.status != 0 %>
+    <span class="newsBlue homepageNewsPublisher">系统提示</span>
+<% else %>
+    <%=link_to User.where("id=?", ma.applied_user_id).first.show_name, user_path(ma.user), :class => "newsBlue homepageNewsPublisher", :target => '_blank' %>
+<% end %>
+<span class="<%= ma.viewed == 0 ? "homepageNewsTypeNotRead fl" : "homepageNewsType fl" %>"><%= applied_school_tip(ma) %></span>
\ No newline at end of file
diff --git a/app/views/users/_user_message_course.html.erb b/app/views/users/_user_message_course.html.erb
index 98ed3d1dc..40f25d429 100644
--- a/app/views/users/_user_message_course.html.erb
+++ b/app/views/users/_user_message_course.html.erb
@@ -601,7 +601,7 @@
             </p>
             <p>申请班级：<%= Course.find(ma.course_id).name%></p>
             <div class="fl">班级描述：</div>
-            <div class="ml60"><%= Course.find(ma.course_id).description.html_safe %></div>
+            <div class="ml60"><%= Course.find(ma.course_id).description.nil? ? "" : Course.find(ma.course_id).description.html_safe %></div>
             <p>申请职位：<%= ma.content == '9'  ? "教师" : "教辅"%></p>
           </div>
           <li class="homepageNewsTime fl"><%= time_tag(ma.created_at).html_safe %> </li>
diff --git a/app/views/users/_user_project_list.html.erb b/app/views/users/_user_project_list.html.erb
index 6124b82d8..77db8bc3e 100644
--- a/app/views/users/_user_project_list.html.erb
+++ b/app/views/users/_user_project_list.html.erb
@@ -1,3 +1,86 @@
+<div class="syllabus_box">
+  <h2 class="syllabus_h2_top"><span class="icon_course fl mt7 mr5"></span>项目列表</h2>
+  <div class="syllabus_category">
+    <a class="sortdownbtn sort_no fr"></a><a href="#" class="sortTxt fr">人气</a>
+    <a class="sortupbtn fr"></a><a href="#" class="sortTxt fr ">时间</a>
+    <span class="grayTxt fl ">我创建的项目</span>
+    <div class="cl"></div>
+  </div>
+  <div class="syllabus_courses_box">
+    <% @projects.each do |project|%>
+        <div class="syllabus_courses_list" style="cursor: default">
+          <div class="sy_courses_open">
+            <span class="icons_project_list fl mt5 mr10"></span>
+            <h3><%= link_to "#{project.name}", project_path(project.id,:host=>Setting.host_name), :target => '_blank', :class => "new_project_title fl",:id => "show_project_#{project.id}", :title => (project.is_public? ? "公开项目：":"私有项目：") + project.name%></h3>
+            <% unless project.is_public? %>
+                <span class="hw_icon_private fl"></span>
+            <% end %>
+            <% projectUser = User.where("id=?",project.user_id).first %>
+            <%=link_to "<span class='fr grayTxt'>创建者：#{projectUser.try(:realname) != " " ? projectUser.lastname + projectUser.firstname : projectUser.try(:login)}</span>".html_safe, user_path(projectUser) %>
+            <div class="cl"></div>
+          </div>
+          <div>
+            <p class="fl sy_p_grey">更新时间：<%= format_date(project.updated_on) %></p>
+            <div class=" fr">
+              <p class="list-info fr grayTxt">
+                <%= link_to project.members.count, member_project_path(project), :class => "c_blue" %><span class="mr5">成员&nbsp;&nbsp;|</span>
+                <%= link_to project.project_score.issue_num, project_issues_path(project), :class => "c_blue" %><span class="mr5">问题&nbsp;&nbsp;|</span>
+                <%= link_to project.project_score.attach_num, file_project_path(project), :class => "c_blue" %><span class="mr5">资源</span>
+              </p>
+            </div>
+          </div>
+          <div class="cl"></div>
+        </div>
+    <% end %>
+
+    <div class="syllabus_courses_list ">
+      <p class="new_projectlist_more"><a href="javascript:void(0);" >共100个项目，点击全部展开</a></p>
+    </div>
+  </div><!--syllabus_courses_box end-->
+</div><!--syllabus_box end-->
+
+<div class="" style="height:20px; background:#eaebec;"></div>
+<div class="syllabus_box">
+  <div class="syllabus_category">
+    <a class="sortdownbtn sort_no fr"></a><a href="#" class="sortTxt fr">人气</a>
+    <a class="sortupbtn fr"></a><a href="#" class="sortTxt fr ">时间</a>
+    <span class="grayTxt fl ">我参与的项目</span>
+    <div class="cl"></div>
+  </div>
+  <div class="syllabus_courses_box">
+    <% @projects.each do |project| %>
+        <div class="syllabus_courses_list" style="cursor: default;">
+          <div class="sy_courses_open">
+            <span class="icons_project_list fl mt5 mr10"></span>
+            <h3><%= link_to project.name, project_path(project.id,:host=>Setting.host_name), :target => '_blank', :class => "new_project_title fl",:id => "show_project_#{project.id}", :title => (project.is_public? ? "公开项目：":"私有项目：") + project.name%></h3>
+            <% unless project.is_public? %>
+                <span class="hw_icon_private fl"></span>
+            <% end %>
+            <% projectUser = User.where("id=?",project.user_id).first %>
+            <%=link_to "<span class='fr grayTxt'>创建者：#{projectUser.try(:realname) != " " ? projectUser.lastname + projectUser.firstname : projectUser.try(:login)}</span>".html_safe, user_path(projectUser) %>
+            <div class="cl"></div>
+          </div>
+          <div>
+            <p class="fl sy_p_grey">更新时间：<%= format_date(project.updated_on) %></p>
+            <div class=" fr">
+              <p class="list-info fr grayTxt">
+                <%= link_to project.members.count, member_project_path(project), :class => "c_blue" %><span class="mr5">成员&nbsp;&nbsp;|</span>
+                <%= link_to project.project_score.issue_num, project_issues_path(project), :class => "c_blue" %><span class="mr5">问题&nbsp;&nbsp;|</span>
+                <%= link_to project.project_score.attach_num, file_project_path(project), :class => "c_blue" %><span class="mr5">资源</span>
+              </p>
+            </div>
+          </div>
+          <div class="cl"></div>
+        </div>
+    <% end %>
+    <div class="syllabus_courses_list ">
+      <p class="new_projectlist_more"><a href="javascript:void(0);" >共100个项目，点击全部展开</a></p>
+    </div>
+  </div><!--syllabus_courses_box end-->
+</div><!--syllabus_box end-->
+
+
+
 <div class="listbox" id="project-list">
   <h2 class="list-h2">项目列表</h2>
   <div class="category">
diff --git a/app/views/users/choose_user_course.js.erb b/app/views/users/choose_user_course.js.erb
index 512a66018..19a244396 100644
--- a/app/views/users/choose_user_course.js.erb
+++ b/app/views/users/choose_user_course.js.erb
@@ -8,7 +8,7 @@
 <%# else %>
     <% if params[:is_observe].nil? %>
         var htmlvalue = "<%= escape_javascript(render :partial => 'users/send_homework_to_course', :locals => {:courses => @course, :user => @user, :send_id => @send_id}) %>";
-        pop_box_new(htmlvalue,460,50,50);
+        pop_box_new(htmlvalue,460,435);
     <% else %>
         $("#send_homework_to_course_form").html("<%= escape_javascript(render :partial => 'users/send_homework_to_course_form', :locals => {:courses => @course, :user => @user, :send_id => @send_id}) %>");
     <% end %>
diff --git a/app/views/users/send_homework_to_course.js.erb b/app/views/users/send_homework_to_course.js.erb
index 7db28b869..2541c5bc7 100644
--- a/app/views/users/send_homework_to_course.js.erb
+++ b/app/views/users/send_homework_to_course.js.erb
@@ -1,4 +1,4 @@
 $("#subject_count_homework_<%=@homework.id %>").html(<%= @homework.quotes %>);
 hideModal();
 var htmlvalue = "<%= escape_javascript(render :partial => 'homework_post_notice') %>";
-pop_box_new(htmlvalue,380,40,50);
\ No newline at end of file
+pop_box_new(htmlvalue,380,182);
\ No newline at end of file
diff --git a/app/views/users/show_homework_detail.js.erb b/app/views/users/show_homework_detail.js.erb
index 8c0e3c54a..b3dff264a 100644
--- a/app/views/users/show_homework_detail.js.erb
+++ b/app/views/users/show_homework_detail.js.erb
@@ -3,5 +3,5 @@
     $("#choose_courses_notice").html("");
 <% else %>
     var htmlvalue = "<%= escape_javascript(render :partial => 'users/homework_repository_detail') %>";
-    pop_box_new(htmlvalue,820,50,50);
+    pop_box_new(htmlvalue,820,800);
 <% end %>
\ No newline at end of file
diff --git a/app/views/users/sort_project_list.js.erb b/app/views/users/sort_project_list.js.erb
new file mode 100644
index 000000000..bacb3849e
--- /dev/null
+++ b/app/views/users/sort_project_list.js.erb
@@ -0,0 +1,5 @@
+<% if @list_type.to_i == 1 %>
+$("#user_projects_list").html('<%= escape_javascript(render :partial => 'users/project_list', :locals => {:projects => @projects, :list_type => 1, :count => @projects_count}) %>');
+<% else %>
+$("#user_join_projects_list").html('<%= escape_javascript(render :partial => 'users/project_list', :locals => {:projects => @projects, :list_type => 2, :count => @projects_count}) %>');
+<% end %>
\ No newline at end of file
diff --git a/app/views/users/user_projectlist.html.erb b/app/views/users/user_projectlist.html.erb
index fb1b5b501..0605cb2f3 100644
--- a/app/views/users/user_projectlist.html.erb
+++ b/app/views/users/user_projectlist.html.erb
@@ -1 +1,39 @@
-<%= render :partial => 'users/user_project_list'%>
+<div class="syllabus_box">
+  <h2 class="syllabus_h2_top"><span class="icon_course fl mt7 mr5"></span>项目列表</h2>
+  <%= render :partial => 'users/my_projects'%>
+  <div class="" style="height:20px; background:#eaebec;"></div>
+  <%= render :partial => 'users/my_joined_projects'%>
+</div>
+
+<script type="text/javascript">
+    //如果右边的列表比左边的高度低则将右边的高度设为与左边对齐
+    $(function() {
+        var leftHeight = $("#LSide").height() - $(".fontGrey5").height() - 20;
+        var rightHeight = $(".homepageRight").height();
+        if (rightHeight < leftHeight) {
+            var diffHeight = leftHeight - rightHeight;
+            var tmpHeight = $(".syllabus_box").height() + diffHeight;
+            $(".syllabus_box").css("minHeight", tmpHeight);
+        }
+    });
+    function expand_projects(btnid,container,count){
+        var target = $(container).children('.syllabus_courses_list');
+        var btn = $(btnid);
+        if(btn.data('init')=='0'){
+            btn.data('init',1);
+            btn.html('点击收起');
+            target.show();
+        }else{
+            btn.data('init',0);
+            btn.html('共' + count + '个项目，点击全部展开');
+            target.hide();
+            target.eq(0).show();
+            target.eq(1).show();
+            target.eq(2).show();
+            target.eq(3).show();
+            target.eq(4).show();
+            btn.parent().parent().show();
+        }
+    }
+</script>
+
diff --git a/app/views/users/user_projects4show.js.erb b/app/views/users/user_projects4show.js.erb
index c19a79c81..f8b1a57df 100644
--- a/app/views/users/user_projects4show.js.erb
+++ b/app/views/users/user_projects4show.js.erb
@@ -1 +1 @@
-$("#user_show_more_project").replaceWith("<%= escape_javascript( render :partial =>  'layouts/user_projects',:locals => {:projects => @projects,:user => @user, :page => @page} )%>");
+$("#user_show_more_project").replaceWith("<%= escape_javascript( render :partial =>  'layouts/user_projects',:locals => {:projects => @projects,:user => @user, :page => @page, :all_count => @all_count} )%>");
diff --git a/app/views/wechats/user_activities.html.erb b/app/views/wechats/user_activities.html.erb
index f5cfb8250..7175f0a1e 100644
--- a/app/views/wechats/user_activities.html.erb
+++ b/app/views/wechats/user_activities.html.erb
@@ -12,15 +12,41 @@
   <link type="text/css" rel="stylesheet" href="/stylesheets/weui/weui.min.css" />
   <%= stylesheet_link_tag '/stylesheets/weui/weixin.css' %>
 
+  <script src="//res.wx.qq.com/open/js/jweixin-1.0.0.js"></script>
   <script type="text/javascript">
     window.g_debug = false; //调试标志,如果在本地请置为true
     window.apiUrl = '/api/v1/';
     window.g_redirect_path = '<%= @path %>';
+    window.g_localhost = "<%= Setting.protocol %>"+ "://"+"<%= Setting.host_name%>";
+    window.g_appid = "<%= @appid %>";
     <% if @course_id %>
     window.g_courseid = <%= @course_id %>;
     <% elsif @project_id %>
     window.g_projectid = <%= @project_id %>;
     <% end %>
+
+    //参考文档
+    //https://mp.weixin.qq.com/wiki?t=resource/res_main&id=mp1421141115&token=&lang=zh_CN
+    <% unless @sign_params.nil? %>
+        wx.config({
+          debug: false, // 开启调试模式,调用的所有api的返回值会在客户端alert出来，若要查看传入的参数，可以在pc端打开，参数信息会通过log打出，仅在pc端时才会打印。
+          appId: '<%= @appid %>', // 必填，公众号的唯一标识
+          timestamp: <%= @sign_params[:timestamp] %>, // 必填，生成签名的时间戳
+          nonceStr: '<%= @sign_params[:noncestr] %>', // 必填，生成签名的随机串
+          signature: '<%= @sign_params[:signature] %>',// 必填，签名，见附录1
+          jsApiList: ['onMenuShareTimeline', 'onMenuShareAppMessage', 'onMenuShareQQ', 'onMenuShareWeibo', 'onMenuShareQZone',
+            'hideOptionMenu','showOptionMenu','showMenuItems', 'hideMenuItems',
+            'hideAllNonBaseMenuItem','showAllNonBaseMenuItem','closeWindow', 'scanQRCode'] // 必填，需要使用的JS接口列表，所有JS接口列表见附录2
+        });
+    <% end %>
+
+    wx.ready(function(){
+      console.log("wx ready");
+    });
+
+    wx.error(function(err){
+      console.log(err);
+    });
   </script>
 
 </head>
diff --git a/config/application.rb b/config/application.rb
index 3885751f7..4b25d4278 100644
--- a/config/application.rb
+++ b/config/application.rb
@@ -3,6 +3,7 @@ require File.expand_path('../boot', __FILE__)
 require 'rails/all'
 require 'sprockets/railtie'
 require 'elasticsearch/model'
+
 if defined?(Bundler)
   # If you precompile assets before deploying to production, use this line
   Bundler.require(*Rails.groups(:assets => %w(development test)))
@@ -83,9 +84,11 @@ module RedmineApp
       end
     end
 
+
     config.wechat_srcs = ['app.js','others/factory.js','others/filter.js', 'controllers/*.js', 'directives/*.js', 'others/routes.js']
 
     config.before_initialize do
+      config.middleware.use ::ResponseIp
     end
 
     config.after_initialize do
diff --git a/config/initializers/10-patches.rb b/config/initializers/10-patches.rb
index 79641513e..ff3d8de83 100644
--- a/config/initializers/10-patches.rb
+++ b/config/initializers/10-patches.rb
@@ -1,5 +1,15 @@
+#coding=utf-8
+#
 require 'active_record'
 
+## ruby2.3在这个rails版本的activerecord有bug, 直接用respond_to?(:to_proc)作判断
+#而ruby2.3中hash可以返回 to_proc
+if RUBY_VERSION > '2.3' && Rails.version < '3.2.22.3'
+  Hash.class_eval do
+    remove_method :to_proc
+  end
+end
+
 module ActiveRecord
   class Base
     include Redmine::I18n
diff --git a/config/initializers/configuration.yml b/config/initializers/configuration.yml
new file mode 100644
index 000000000..38cb9b927
--- /dev/null
+++ b/config/initializers/configuration.yml
@@ -0,0 +1,241 @@
+# = Redmine configuration file
+#
+# Each environment has it's own configuration options.  If you are only
+# running in production, only the production block needs to be configured.
+# Environment specific configuration options override the default ones.
+#
+# Note that this file needs to be a valid YAML file.
+# DO NOT USE TABS! Use 2 spaces instead of tabs for identation.
+#
+# == Outgoing email settings (email_delivery setting)
+#
+# === Common configurations
+#
+# ==== Sendmail command
+#
+# production:
+#   email_delivery:
+#     delivery_method: :sendmail
+#
+# ==== Simple SMTP server at localhost
+#
+# production:
+#   email_delivery:
+#     delivery_method: :smtp
+#     smtp_settings:
+#       address: smtp.163.com
+#       port: 25
+#
+# ==== SMTP server at example.com using LOGIN authentication and checking HELO for foo.com
+#
+# production:
+#   email_delivery:
+#     delivery_method: :smtp
+#     smtp_settings:
+#       address: smtp.gmail.com
+#       port: 587
+#       authentication: :login
+#       domain: 'foo.com'
+#       user_name: senluowanxiangt@gmail.com
+#       password: 1913TXBja
+#
+# ==== SMTP server at example.com using PLAIN authentication
+#
+# production:
+#   email_delivery:
+#     delivery_method: :smtp
+#     smtp_settings:
+#       address: smtp.gmail.com
+#       port: 587
+#       authentication: :plain
+#       domain: 'example.com'
+#       user_name: senluowanxiangt@gmail.com
+#       password: 1913TXBja
+#
+# ==== SMTP server at using TLS (GMail)
+#
+# This might require some additional configuration. See the guides at:
+# http://www.redmine.org/projects/redmine/wiki/EmailConfiguration
+#
+# production:
+#   email_delivery:
+#     delivery_method: :smtp
+#     smtp_settings:
+#       enable_starttls_auto: true
+#       address: smtp.gmail.com
+#       port: 587
+#       domain: "smtp.gmail.com" # 'your.domain.com' for GoogleApps
+#       authentication: :plain
+#       user_name: senluowanxiangt@gmail.com
+#       password: 1913TXBja
+#
+#
+# === More configuration options
+#
+# See the "Configuration options" at the following website for a list of the
+# full options allowed:
+#
+# http://wiki.rubyonrails.org/rails/pages/HowToSendEmailsWithActionMailer
+
+
+
+default:
+  email_delivery:
+    delivery_method: :smtp
+    smtp_settings:
+          address: mail.trustie.net
+          port: 25
+          domain: mail.trustie.net
+          authentication: :login
+          user_name: "mail@trustie.net"
+          password: "loong2010"
+
+  # Absolute path to the directory where attachments are stored.
+  # The default is the 'files' directory in your Redmine instance.
+  # Your Redmine instance needs to have write permission on this
+  # directory.
+  # Examples:
+  # attachments_storage_path: /var/redmine/files
+  # attachments_storage_path: D:/redmine/files
+  attachments_storage_path:
+
+  # Configuration of the autologin cookie.
+  # autologin_cookie_name: the name of the cookie (default: autologin)
+  # autologin_cookie_path: the cookie path (default: /)
+  # autologin_cookie_secure: true sets the cookie secure flag (default: false)
+  autologin_cookie_name: "autologin_trustie"
+  autologin_cookie_path:
+  autologin_cookie_secure:
+
+  # Configuration of SCM executable command.
+  #
+  # Absolute path (e.g. /usr/local/bin/hg) or command name (e.g. hg.exe, bzr.exe)
+  # On Windows + CRuby, *.cmd, *.bat (e.g. hg.cmd, bzr.bat) does not work.
+  #
+  # On Windows + JRuby 1.6.2, path which contains spaces does not work.
+  # For example, "C:\Program Files\TortoiseHg\hg.exe".
+  # If you want to this feature, you need to install to the path which does not contains spaces.
+  # For example, "C:\TortoiseHg\hg.exe".
+  #
+  # Examples:
+  # scm_subversion_command: svn                                       # (default: svn)
+  # scm_mercurial_command:  C:\Program Files\TortoiseHg\hg.exe        # (default: hg)
+  # scm_git_command:        /usr/local/bin/git                        # (default: git)
+  # scm_cvs_command:        cvs                                       # (default: cvs)
+  # scm_bazaar_command:     bzr.exe                                   # (default: bzr)
+  # scm_darcs_command:      darcs-1.0.9-i386-linux                    # (default: darcs)
+  #
+  scm_subversion_command:
+  scm_mercurial_command:
+  scm_git_command:
+  scm_cvs_command:
+  scm_bazaar_command:
+  scm_darcs_command:
+
+  # Absolute path to the SCM commands errors (stderr) log file.
+  # The default is to log in the 'log' directory of your Redmine instance.
+  # Example:
+  # scm_stderr_log_file: /var/log/redmine_scm_stderr.log
+  scm_stderr_log_file:
+
+  # Key used to encrypt sensitive data in the database (SCM and LDAP passwords).
+  # If you don't want to enable data encryption, just leave it blank.
+  # WARNING: losing/changing this key will make encrypted data unreadable.
+  #
+  # If you want to encrypt existing passwords in your database:
+  # * set the cipher key here in your configuration file
+  # * encrypt data using 'rake db:encrypt RAILS_ENV=production'
+  #
+  # If you have encrypted data and want to change this key, you have to:
+  # * decrypt data using 'rake db:decrypt RAILS_ENV=production' first
+  # * change the cipher key here in your configuration file
+  # * encrypt data using 'rake db:encrypt RAILS_ENV=production'
+  database_cipher_key:
+
+  # Set this to false to disable plugins' assets mirroring on startup.
+  # You can use `rake redmine:plugins:assets` to manually mirror assets
+  # to public/plugin_assets when you install/upgrade a Redmine plugin.
+  #
+  #mirror_plugins_assets_on_startup: false
+
+  # Your secret key for verifying cookie session data integrity. If you
+  # change this key, all old sessions will become invalid! Make sure the
+  # secret is at least 30 characters and all random, no regular words or
+  # you'll be exposed to dictionary attacks.
+  #
+  # If you have a load-balancing Redmine cluster, you have to use the
+  # same secret token on each machine.
+  #secret_token: 'change it to a long random string'
+
+  # Absolute path (e.g. /usr/bin/convert, c:/im/convert.exe) to
+  # the ImageMagick's `convert` binary. Used to generate attachment thumbnails.
+  imagemagick_convert_command: '/home/pdl/redmine-2.3.2-0/common/bin/convert'
+
+  # Configuration of RMagcik font.
+  #
+  # Redmine uses RMagcik in order to export gantt png.
+  # You don't need this setting if you don't install RMagcik.
+  #
+  # In CJK (Chinese, Japanese and Korean),
+  # in order to show CJK characters correctly,
+  # you need to set this configuration.
+  #
+  # Because there is no standard font across platforms in CJK,
+  # you need to set a font installed in your server.
+  #
+  # This setting is not necessary in non CJK.
+  #
+  # Examples for Japanese:
+  #   Windows:
+  #     rmagick_font_path: C:\windows\fonts\msgothic.ttc
+  #   Linux:
+  #     rmagick_font_path: /usr/share/fonts/ipa-mincho/ipam.ttf
+  #
+  rmagick_font_path:
+
+  # Maximum number of simultaneous AJAX uploads
+  #max_concurrent_ajax_uploads: 2
+  #pic_types: "bmp,jpeg,jpg,png,gif"
+
+  repository_root_path: '/tmp/htdocs'
+  judge_server: 'http://judge.trustie.net/'
+
+  # Gitlab url
+  gitlab_address: 'https://git.trustie.net'
+  # Sonar url
+  sonar_address: 'http://sonar.trustie.net'
+  #Jenkins url
+  jenkins_address: 'http://jenins.trustie.net'
+  jenkins_username: 'temp'
+  jenkins_password: '123123'
+
+# specific configuration options for production environment
+# that overrides the default ones
+production:
+  # CJK support
+  rmagick_font_path: /usr/share/fonts/ipa-mincho/ipam.ttf
+  judge_server: 'http://192.168.80.21:8080/'
+  repository_root_path: '/home/pdl/redmine-2.3.2-0/apache2/htdocs'
+  cookie_domain: ".trustie.net"
+  email_delivery:
+    delivery_method: :smtp
+    smtp_settings:
+      address: mail.trustie.net
+      port: 25
+      domain: mail.trustie.net
+      authentication: :login
+      user_name: "mail@trustie.net"
+      password: "loong2010"
+
+# specific configuration options for development environment
+# that overrides the default ones
+development:
+  email_delivery:
+    delivery_method: :smtp
+    smtp_settings:
+      address: mail.trustie.net
+      port: 25
+      domain: mail.trustie.net
+      authentication: :login
+      user_name: "mail@trustie.net"
+      password: "loong2010"
diff --git a/config/locales/projects/zh.yml b/config/locales/projects/zh.yml
index 91cc96791..792ff35fd 100644
--- a/config/locales/projects/zh.yml
+++ b/config/locales/projects/zh.yml
@@ -456,4 +456,9 @@ zh:
 
   # 版本库迁移
   label_repository_migrate_dec: 注意：Trustie版本库近期进行了一次大的改造，历史版本需要转换成新的版本，输入新的版本库名，即可完成转换。 转换过程可能需要等待一段时间。
-  label_repository_name_dec: 版本库名仅小写字母（a-z）、数字、破折号（-）和下划线（_）可以使用，长度必须在 1 到 254 个字符之间，一旦保存，标识无法修改。
\ No newline at end of file
+  label_repository_name_dec: 版本库名仅小写字母（a-z）、数字、破折号（-）和下划线（_）可以使用，长度必须在 1 到 254 个字符之间，一旦保存，标识无法修改。
+
+  # pull requests
+  label_state_open: 待处理
+  label_state_closed: 关闭
+  label_state_merged: 已合并
diff --git a/config/locales/zh.yml b/config/locales/zh.yml
index 1340e7aa6..59aca719b 100644
--- a/config/locales/zh.yml
+++ b/config/locales/zh.yml
@@ -2156,6 +2156,6 @@ zh:
   label_blog_comment_template: 您的博客有新回复了。
   label_new_blog_template: 有新博客了。
   label_new_issue_template: 有新的问题动态了。
-  label_new_notice_template: 您的课程有新通知了。
+  label_new_notice_template: 您的班级有新通知了。
 #edit yk
   label_code_work_tests: 代码测试列表
diff --git a/config/menu.yml.production b/config/menu.yml.production
index f97c27d7d..c1431172e 100644
--- a/config/menu.yml.production
+++ b/config/menu.yml.production
@@ -23,13 +23,13 @@ button:
   name: "更多"
   sub_button:
   -
-    type: "click"
+    type: "view"
     name: "加入班级"
-    key:  "JOIN_CLASS"
+    url:  "https://open.weixin.qq.com/connect/oauth2/authorize?appid=wx8e1ab05163a28e37&redirect_uri=https://www.trustie.net/wechat/user_activities&response_type=code&scope=snsapi_base&state=join_class#wechat_redirect"
   -
-    type: "click"
+    type: "view"
     name: "加入项目"
-    key:  "JOIN_PROJECT"
+    url:  "https://open.weixin.qq.com/connect/oauth2/authorize?appid=wx8e1ab05163a28e37&redirect_uri=https://www.trustie.net/wechat/user_activities&response_type=code&scope=snsapi_base&state=join_project#wechat_redirect"
   -
     type: "view"
     name: "历史推文"
diff --git a/config/menu.yml.test b/config/menu.yml.test
index bdc47ba8d..dc4aacbe5 100644
--- a/config/menu.yml.test
+++ b/config/menu.yml.test
@@ -23,13 +23,13 @@ button:
   name: "更多"
   sub_button:
   -
-    type: "click"
+    type: "view"
     name: "加入班级"
-    key:  "JOIN_CLASS"
+    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=join_class#wechat_redirect"
   -
-    type: "click"
+    type: "view"
     name: "加入项目"
-    key:  "JOIN_PROJECT"
+    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=join_project#wechat_redirect"
   -
     type: "view"
     name: "历史推文"
diff --git a/config/routes.rb b/config/routes.rb
index 7924887a8..6cbc0812d 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -626,6 +626,7 @@ RedmineApp::Application.routes.draw do
       match 'user_projectlist', :to => 'users#user_projectlist',  :via => :get, :as => "user_projectlist"
 
       match 'sort_syllabus_list', :to => 'users#sort_syllabus_list',  :via => :get, :as => "sort_syllabus_list"
+      match 'sort_project_list', :to => 'users#sort_project_list',  :via => :get, :as => "sort_project_list"
 
       get 'edit_brief_introduction'
       get "user_resource"
@@ -809,6 +810,19 @@ RedmineApp::Application.routes.draw do
       end
     end
 
+    resources :pull_requests do
+      collection do
+      end
+      member do
+        get 'accept_pull_request'
+        get 'pull_request_commits'
+        get 'pull_request_changes'
+        get 'update_pull_request'
+        get 'pull_request_comments'
+        post 'create_pull_request_comment'
+      end
+    end
+
     resources :quality_analysis, :only => [:index, :create, :edit, :update, :delete] do
       collection do
       end
@@ -1329,6 +1343,7 @@ RedmineApp::Application.routes.draw do
       get :user_activities
       post :bind
       post :get_bind
+      post :is_bind
     end
   end
 
diff --git a/config/wechat.yml.template b/config/wechat.yml.template
index 02ec8db55..e6b942f09 100644
--- a/config/wechat.yml.template
+++ b/config/wechat.yml.template
@@ -22,7 +22,12 @@ default: &default
   class_notice: "MQ_mFupbXP-9jWbeHT3C5xqNBvPo8EIlNv4ULakSpJA"
   create_class_notice: "2GtJJGzzNlNy2i0UrsjEDlvfSVIUXQfSo47stpcQAVw"
   create_project_notice: "jYu0iimbDpgWYZaTLXioZe2lvqoWTdKnUPyphTJ1mxs"
+  project_review_notice: "kdb-8UlMjTc3z51Qcf8g2vY4i_nE4OGKZAucdQma_2E"
+  join_project_notice: "TtXvy0XMIQyCgpnXHhoB8t-x0QIfy-78gAJXsGf9afg"
 
+  auto_openid_url_1: "https://open.weixin.qq.com/connect/oauth2/authorize?appid=wx8e1ab05163a28e37&redirect_uri=https://www.trustie.net/wechat/user_activities"
+  auto_openid_url_2: "&response_type=code&scope=snsapi_base&state="
+  auto_openid_url_3: "&connect_redirect=1#wechat_redirect"
 production:
   <<: *default
 
diff --git a/config/wechat.yml.test b/config/wechat.yml.test
index ec5e760fa..c0676cc26 100644
--- a/config/wechat.yml.test
+++ b/config/wechat.yml.test
@@ -22,6 +22,12 @@ default: &default
   class_notice: "8LVu33l6bP-56SDomVgHn-yJc57YpCwwJ81rAJgRONk"
   create_class_notice: "9CDIvHIKiGwPEQWRw_-wieec1o50tMXQPPZIfECKu0I"
   create_project_notice: "R2ZaQKJfDJgujPcHWPzadKHIRkIyj2CjX2o_qIuRqig"
+  project_review_notice: "ip192wVXTav3qchgUn9_7B6lFfTlCZjwL7A1tncTOuc"
+  join_project_notice: "3KnMQEMUCmQWkB5JvzrpmguEwnN8bvUHUdpOTudxv_M"
+
+  auto_openid_url_1: "https://open.weixin.qq.com/connect/oauth2/authorize?appid=wxc09454f171153c2d&redirect_uri=https://test.forge.trustie.net/wechat/user_activities"
+  auto_openid_url_2: "&response_type=code&scope=snsapi_base&state="
+  auto_openid_url_3: "&connect_redirect=1#wechat_redirect"
 
 production:
   <<: *default
diff --git a/db/migrate/20160810081337_create_pull_requests.rb b/db/migrate/20160810081337_create_pull_requests.rb
new file mode 100644
index 000000000..f84cf7af9
--- /dev/null
+++ b/db/migrate/20160810081337_create_pull_requests.rb
@@ -0,0 +1,11 @@
+class CreatePullRequests < ActiveRecord::Migration
+  def change
+    create_table :pull_requests do |t|
+      t.integer :pull_request_id
+      t.integer :gpid
+      t.integer :user_id
+
+      t.timestamps
+    end
+  end
+end
diff --git a/db/migrate/20160811084401_add_bindtype_to_user_wechats.rb b/db/migrate/20160811084401_add_bindtype_to_user_wechats.rb
new file mode 100644
index 000000000..6cba9e675
--- /dev/null
+++ b/db/migrate/20160811084401_add_bindtype_to_user_wechats.rb
@@ -0,0 +1,5 @@
+class AddBindtypeToUserWechats < ActiveRecord::Migration
+  def change
+    add_column :user_wechats, :bindtype, :integer, :default => 0
+  end
+end
diff --git a/db/schema.rb b/db/schema.rb
index 3b812eb3d..47b3bf210 100644
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -11,7 +11,7 @@
 #
 # It's strongly recommended to check this file into your version control system.
 
-ActiveRecord::Schema.define(:version => 20160810080942) do
+ActiveRecord::Schema.define(:version => 20160810081337) do
 
   create_table "activities", :force => true do |t|
     t.integer  "act_id",                                  :null => false
@@ -52,6 +52,28 @@ ActiveRecord::Schema.define(:version => 20160810080942) do
   add_index "api_keys", ["access_token"], :name => "index_api_keys_on_access_token"
   add_index "api_keys", ["user_id"], :name => "index_api_keys_on_user_id"
 
+  create_table "application_settings", :force => true do |t|
+    t.integer  "default_projects_limit"
+    t.boolean  "signup_enabled"
+    t.boolean  "signin_enabled"
+    t.boolean  "gravatar_enabled"
+    t.text     "sign_in_text"
+    t.datetime "created_at"
+    t.datetime "updated_at"
+    t.string   "home_page_url"
+    t.integer  "default_branch_protection",    :default => 2
+    t.boolean  "twitter_sharing_enabled",      :default => true
+    t.text     "restricted_visibility_levels"
+    t.boolean  "version_check_enabled",        :default => true
+    t.integer  "max_attachment_size",          :default => 10,    :null => false
+    t.integer  "default_project_visibility"
+    t.integer  "default_snippet_visibility"
+    t.text     "restricted_signup_domains"
+    t.boolean  "user_oauth_applications",      :default => true
+    t.string   "after_sign_out_path"
+    t.integer  "session_expire_delay",         :default => 10080, :null => false
+  end
+
   create_table "applied_messages", :force => true do |t|
     t.integer  "user_id"
     t.integer  "applied_id"
@@ -60,16 +82,17 @@ ActiveRecord::Schema.define(:version => 20160810080942) do
     t.integer  "status",          :default => 0
     t.datetime "created_at",                     :null => false
     t.datetime "updated_at",                     :null => false
-    t.string   "name"
     t.integer  "applied_user_id"
     t.integer  "role"
     t.integer  "project_id"
+    t.string   "name"
   end
 
   create_table "applied_projects", :force => true do |t|
-    t.integer "project_id",                :null => false
-    t.integer "user_id",                   :null => false
-    t.integer "role",       :default => 0
+    t.integer "project_id",                     :null => false
+    t.integer "user_id",                        :null => false
+    t.integer "role",            :default => 0
+    t.integer "applied_user_id"
   end
 
   create_table "apply_add_schools", :force => true do |t|
@@ -184,6 +207,20 @@ ActiveRecord::Schema.define(:version => 20160810080942) do
     t.string  "typeName", :limit => 50
   end
 
+  create_table "audit_events", :force => true do |t|
+    t.integer  "author_id",   :null => false
+    t.string   "type",        :null => false
+    t.integer  "entity_id",   :null => false
+    t.string   "entity_type", :null => false
+    t.text     "details"
+    t.datetime "created_at"
+    t.datetime "updated_at"
+  end
+
+  add_index "audit_events", ["author_id"], :name => "index_audit_events_on_author_id"
+  add_index "audit_events", ["entity_id", "entity_type"], :name => "index_audit_events_on_entity_id_and_entity_type"
+  add_index "audit_events", ["type"], :name => "index_audit_events_on_type"
+
   create_table "auth_sources", :force => true do |t|
     t.string  "type",              :limit => 30, :default => "",    :null => false
     t.string  "name",              :limit => 60, :default => "",    :null => false
@@ -281,6 +318,17 @@ ActiveRecord::Schema.define(:version => 20160810080942) do
   add_index "boards", ["last_message_id"], :name => "index_boards_on_last_message_id"
   add_index "boards", ["project_id"], :name => "boards_project_id"
 
+  create_table "broadcast_messages", :force => true do |t|
+    t.text     "message",    :null => false
+    t.datetime "starts_at"
+    t.datetime "ends_at"
+    t.integer  "alert_type"
+    t.datetime "created_at"
+    t.datetime "updated_at"
+    t.string   "color"
+    t.string   "font"
+  end
+
   create_table "bug_to_osps", :force => true do |t|
     t.integer  "osp_id"
     t.integer  "relative_memo_id"
@@ -310,14 +358,16 @@ ActiveRecord::Schema.define(:version => 20160810080942) do
   add_index "changeset_parents", ["parent_id"], :name => "changeset_parents_parent_ids"
 
   create_table "changesets", :force => true do |t|
-    t.integer  "repository_id", :null => false
-    t.string   "revision",      :null => false
+    t.integer  "repository_id",                :null => false
+    t.string   "revision",                     :null => false
     t.string   "committer"
-    t.datetime "committed_on",  :null => false
+    t.datetime "committed_on",                 :null => false
     t.text     "comments"
     t.date     "commit_date"
     t.string   "scmid"
     t.integer  "user_id"
+    t.integer  "project_id"
+    t.integer  "type",          :default => 0
   end
 
   add_index "changesets", ["committed_on"], :name => "index_changesets_on_committed_on"
@@ -597,8 +647,11 @@ ActiveRecord::Schema.define(:version => 20160810080942) do
     t.string   "qrcode"
   end
 
+  add_index "courses", ["id"], :name => "id", :unique => true
   add_index "courses", ["invite_code"], :name => "index_courses_on_invite_code", :unique => true
   add_index "courses", ["syllabus_id"], :name => "index_courses_on_syllabus_id"
+  add_index "courses", ["tea_id"], :name => "tea_id"
+  add_index "courses", ["visits"], :name => "visits"
 
   create_table "custom_fields", :force => true do |t|
     t.string  "type",            :limit => 30, :default => "",    :null => false
@@ -661,6 +714,15 @@ ActiveRecord::Schema.define(:version => 20160810080942) do
 
   add_index "delayed_jobs", ["priority", "run_at"], :name => "delayed_jobs_priority"
 
+  create_table "deploy_keys_projects", :force => true do |t|
+    t.integer  "deploy_key_id", :null => false
+    t.integer  "project_id",    :null => false
+    t.datetime "created_at"
+    t.datetime "updated_at"
+  end
+
+  add_index "deploy_keys_projects", ["project_id"], :name => "index_deploy_keys_projects_on_project_id"
+
   create_table "discuss_demos", :force => true do |t|
     t.string   "title"
     t.text     "body"
@@ -710,6 +772,16 @@ ActiveRecord::Schema.define(:version => 20160810080942) do
     t.datetime "created_at"
   end
 
+  create_table "emails", :force => true do |t|
+    t.integer  "user_id",    :null => false
+    t.string   "email",      :null => false
+    t.datetime "created_at"
+    t.datetime "updated_at"
+  end
+
+  add_index "emails", ["email"], :name => "index_emails_on_email", :unique => true
+  add_index "emails", ["user_id"], :name => "index_emails_on_user_id"
+
   create_table "enabled_modules", :force => true do |t|
     t.integer "project_id"
     t.string  "name",       :null => false
@@ -732,6 +804,25 @@ ActiveRecord::Schema.define(:version => 20160810080942) do
   add_index "enumerations", ["id", "type"], :name => "index_enumerations_on_id_and_type"
   add_index "enumerations", ["project_id"], :name => "index_enumerations_on_project_id"
 
+  create_table "events", :force => true do |t|
+    t.string   "target_type"
+    t.integer  "target_id"
+    t.string   "title"
+    t.text     "data"
+    t.integer  "project_id"
+    t.datetime "created_at"
+    t.datetime "updated_at"
+    t.integer  "action"
+    t.integer  "author_id"
+  end
+
+  add_index "events", ["action"], :name => "index_events_on_action"
+  add_index "events", ["author_id"], :name => "index_events_on_author_id"
+  add_index "events", ["created_at"], :name => "index_events_on_created_at"
+  add_index "events", ["project_id"], :name => "index_events_on_project_id"
+  add_index "events", ["target_id"], :name => "index_events_on_target_id"
+  add_index "events", ["target_type"], :name => "index_events_on_target_type"
+
   create_table "exercise_answers", :force => true do |t|
     t.integer  "user_id"
     t.integer  "exercise_question_id"
@@ -834,6 +925,15 @@ ActiveRecord::Schema.define(:version => 20160810080942) do
   add_index "forge_messages", ["forge_message_id", "forge_message_type"], :name => "index_forge_messages_on_forge_message_id_and_forge_message_type"
   add_index "forge_messages", ["user_id", "project_id", "created_at"], :name => "index_forge_messages_on_user_id_and_project_id_and_created_at"
 
+  create_table "forked_project_links", :force => true do |t|
+    t.integer  "forked_to_project_id",   :null => false
+    t.integer  "forked_from_project_id", :null => false
+    t.datetime "created_at"
+    t.datetime "updated_at"
+  end
+
+  add_index "forked_project_links", ["forked_to_project_id"], :name => "index_forked_project_links_on_forked_to_project_id", :unique => true
+
   create_table "forums", :force => true do |t|
     t.string   "name",                        :null => false
     t.text     "description"
@@ -963,6 +1063,17 @@ ActiveRecord::Schema.define(:version => 20160810080942) do
     t.datetime "updated_at",         :null => false
   end
 
+  create_table "identities", :force => true do |t|
+    t.string   "extern_uid"
+    t.string   "provider"
+    t.integer  "user_id"
+    t.datetime "created_at"
+    t.datetime "updated_at"
+  end
+
+  add_index "identities", ["created_at", "id"], :name => "index_identities_on_created_at_and_id"
+  add_index "identities", ["user_id"], :name => "index_identities_on_user_id"
+
   create_table "invite_lists", :force => true do |t|
     t.integer  "project_id"
     t.integer  "user_id"
@@ -1109,6 +1220,20 @@ ActiveRecord::Schema.define(:version => 20160810080942) do
     t.integer  "private",                     :default => 0
   end
 
+  create_table "keys", :force => true do |t|
+    t.integer  "user_id"
+    t.datetime "created_at"
+    t.datetime "updated_at"
+    t.text     "key"
+    t.string   "title"
+    t.string   "type"
+    t.string   "fingerprint"
+    t.boolean  "public",      :default => false, :null => false
+  end
+
+  add_index "keys", ["created_at", "id"], :name => "index_keys_on_created_at_and_id"
+  add_index "keys", ["user_id"], :name => "index_keys_on_user_id"
+
   create_table "kindeditor_assets", :force => true do |t|
     t.string   "asset"
     t.integer  "file_size"
@@ -1120,6 +1245,27 @@ ActiveRecord::Schema.define(:version => 20160810080942) do
     t.integer  "owner_type", :default => 0
   end
 
+  create_table "label_links", :force => true do |t|
+    t.integer  "label_id"
+    t.integer  "target_id"
+    t.string   "target_type"
+    t.datetime "created_at"
+    t.datetime "updated_at"
+  end
+
+  add_index "label_links", ["label_id"], :name => "index_label_links_on_label_id"
+  add_index "label_links", ["target_id", "target_type"], :name => "index_label_links_on_target_id_and_target_type"
+
+  create_table "labels", :force => true do |t|
+    t.string   "title"
+    t.string   "color"
+    t.integer  "project_id"
+    t.datetime "created_at"
+    t.datetime "updated_at"
+  end
+
+  add_index "labels", ["project_id"], :name => "index_labels_on_project_id"
+
   create_table "member_roles", :force => true do |t|
     t.integer "member_id",                     :null => false
     t.integer "role_id",                       :null => false
@@ -1171,6 +1317,47 @@ ActiveRecord::Schema.define(:version => 20160810080942) do
     t.integer  "viewed_count",  :default => 0
   end
 
+  create_table "merge_request_diffs", :force => true do |t|
+    t.string   "state"
+    t.text     "st_commits",       :limit => 2147483647
+    t.text     "st_diffs",         :limit => 2147483647
+    t.integer  "merge_request_id",                       :null => false
+    t.datetime "created_at"
+    t.datetime "updated_at"
+  end
+
+  add_index "merge_request_diffs", ["merge_request_id"], :name => "index_merge_request_diffs_on_merge_request_id", :unique => true
+
+  create_table "merge_requests", :force => true do |t|
+    t.string   "target_branch",                    :null => false
+    t.string   "source_branch",                    :null => false
+    t.integer  "source_project_id",                :null => false
+    t.integer  "author_id"
+    t.integer  "assignee_id"
+    t.string   "title"
+    t.datetime "created_at"
+    t.datetime "updated_at"
+    t.integer  "milestone_id"
+    t.string   "state"
+    t.string   "merge_status"
+    t.integer  "target_project_id",                :null => false
+    t.integer  "iid"
+    t.text     "description"
+    t.integer  "position",          :default => 0
+    t.datetime "locked_at"
+  end
+
+  add_index "merge_requests", ["assignee_id"], :name => "index_merge_requests_on_assignee_id"
+  add_index "merge_requests", ["author_id"], :name => "index_merge_requests_on_author_id"
+  add_index "merge_requests", ["created_at", "id"], :name => "index_merge_requests_on_created_at_and_id"
+  add_index "merge_requests", ["created_at"], :name => "index_merge_requests_on_created_at"
+  add_index "merge_requests", ["milestone_id"], :name => "index_merge_requests_on_milestone_id"
+  add_index "merge_requests", ["source_branch"], :name => "index_merge_requests_on_source_branch"
+  add_index "merge_requests", ["source_project_id"], :name => "index_merge_requests_on_source_project_id"
+  add_index "merge_requests", ["target_branch"], :name => "index_merge_requests_on_target_branch"
+  add_index "merge_requests", ["target_project_id", "iid"], :name => "index_merge_requests_on_target_project_id_and_iid", :unique => true
+  add_index "merge_requests", ["title"], :name => "index_merge_requests_on_title"
+
   create_table "message_alls", :force => true do |t|
     t.integer  "user_id"
     t.integer  "message_id"
@@ -1205,6 +1392,39 @@ ActiveRecord::Schema.define(:version => 20160810080942) do
   add_index "messages", ["last_reply_id"], :name => "index_messages_on_last_reply_id"
   add_index "messages", ["parent_id"], :name => "messages_parent_id"
 
+  create_table "milestones", :force => true do |t|
+    t.string   "title",       :null => false
+    t.integer  "project_id",  :null => false
+    t.text     "description"
+    t.date     "due_date"
+    t.datetime "created_at"
+    t.datetime "updated_at"
+    t.string   "state"
+    t.integer  "iid"
+  end
+
+  add_index "milestones", ["created_at", "id"], :name => "index_milestones_on_created_at_and_id"
+  add_index "milestones", ["due_date"], :name => "index_milestones_on_due_date"
+  add_index "milestones", ["project_id", "iid"], :name => "index_milestones_on_project_id_and_iid", :unique => true
+  add_index "milestones", ["project_id"], :name => "index_milestones_on_project_id"
+
+  create_table "namespaces", :force => true do |t|
+    t.string   "name",                        :null => false
+    t.string   "path",                        :null => false
+    t.integer  "owner_id"
+    t.datetime "created_at"
+    t.datetime "updated_at"
+    t.string   "type"
+    t.string   "description", :default => "", :null => false
+    t.string   "avatar"
+  end
+
+  add_index "namespaces", ["created_at", "id"], :name => "index_namespaces_on_created_at_and_id"
+  add_index "namespaces", ["name"], :name => "index_namespaces_on_name", :unique => true
+  add_index "namespaces", ["owner_id"], :name => "index_namespaces_on_owner_id"
+  add_index "namespaces", ["path"], :name => "index_namespaces_on_path", :unique => true
+  add_index "namespaces", ["type"], :name => "index_namespaces_on_type"
+
   create_table "news", :force => true do |t|
     t.integer  "project_id"
     t.string   "title",           :limit => 60, :default => "", :null => false
@@ -1230,6 +1450,31 @@ ActiveRecord::Schema.define(:version => 20160810080942) do
     t.datetime "updated_at",  :null => false
   end
 
+  create_table "notes", :force => true do |t|
+    t.text     "note"
+    t.string   "noteable_type"
+    t.integer  "author_id"
+    t.datetime "created_at"
+    t.datetime "updated_at"
+    t.integer  "project_id"
+    t.string   "attachment"
+    t.string   "line_code"
+    t.string   "commit_id"
+    t.integer  "noteable_id"
+    t.boolean  "system",                              :default => false, :null => false
+    t.text     "st_diff",       :limit => 2147483647
+  end
+
+  add_index "notes", ["author_id"], :name => "index_notes_on_author_id"
+  add_index "notes", ["commit_id"], :name => "index_notes_on_commit_id"
+  add_index "notes", ["created_at", "id"], :name => "index_notes_on_created_at_and_id"
+  add_index "notes", ["created_at"], :name => "index_notes_on_created_at"
+  add_index "notes", ["noteable_id", "noteable_type"], :name => "index_notes_on_noteable_id_and_noteable_type"
+  add_index "notes", ["noteable_type"], :name => "index_notes_on_noteable_type"
+  add_index "notes", ["project_id", "noteable_type"], :name => "index_notes_on_project_id_and_noteable_type"
+  add_index "notes", ["project_id"], :name => "index_notes_on_project_id"
+  add_index "notes", ["updated_at"], :name => "index_notes_on_updated_at"
+
   create_table "notificationcomments", :force => true do |t|
     t.string   "notificationcommented_type"
     t.integer  "notificationcommented_id"
@@ -1239,6 +1484,49 @@ ActiveRecord::Schema.define(:version => 20160810080942) do
     t.datetime "updated_at",                 :null => false
   end
 
+  create_table "oauth_access_grants", :force => true do |t|
+    t.integer  "resource_owner_id", :null => false
+    t.integer  "application_id",    :null => false
+    t.string   "token",             :null => false
+    t.integer  "expires_in",        :null => false
+    t.text     "redirect_uri",      :null => false
+    t.datetime "created_at",        :null => false
+    t.datetime "revoked_at"
+    t.string   "scopes"
+  end
+
+  add_index "oauth_access_grants", ["token"], :name => "index_oauth_access_grants_on_token", :unique => true
+
+  create_table "oauth_access_tokens", :force => true do |t|
+    t.integer  "resource_owner_id"
+    t.integer  "application_id"
+    t.string   "token",             :null => false
+    t.string   "refresh_token"
+    t.integer  "expires_in"
+    t.datetime "revoked_at"
+    t.datetime "created_at",        :null => false
+    t.string   "scopes"
+  end
+
+  add_index "oauth_access_tokens", ["refresh_token"], :name => "index_oauth_access_tokens_on_refresh_token", :unique => true
+  add_index "oauth_access_tokens", ["resource_owner_id"], :name => "index_oauth_access_tokens_on_resource_owner_id"
+  add_index "oauth_access_tokens", ["token"], :name => "index_oauth_access_tokens_on_token", :unique => true
+
+  create_table "oauth_applications", :force => true do |t|
+    t.string   "name",                         :null => false
+    t.string   "uid",                          :null => false
+    t.string   "secret",                       :null => false
+    t.text     "redirect_uri",                 :null => false
+    t.string   "scopes",       :default => "", :null => false
+    t.datetime "created_at"
+    t.datetime "updated_at"
+    t.integer  "owner_id"
+    t.string   "owner_type"
+  end
+
+  add_index "oauth_applications", ["owner_id", "owner_type"], :name => "index_oauth_applications_on_owner_id_and_owner_type"
+  add_index "oauth_applications", ["uid"], :name => "index_oauth_applications_on_uid", :unique => true
+
   create_table "onclick_times", :force => true do |t|
     t.integer  "user_id"
     t.datetime "onclick_time"
@@ -1396,6 +1684,23 @@ ActiveRecord::Schema.define(:version => 20160810080942) do
     t.integer  "allow_teacher",        :default => 0
   end
 
+  create_table "permissions", :force => true do |t|
+    t.string  "controller",   :limit => 30, :default => "",    :null => false
+    t.string  "action",       :limit => 30, :default => "",    :null => false
+    t.string  "description",  :limit => 60, :default => "",    :null => false
+    t.boolean "is_public",                  :default => false, :null => false
+    t.integer "sort",                       :default => 0,     :null => false
+    t.boolean "mail_option",                :default => false, :null => false
+    t.boolean "mail_enabled",               :default => false, :null => false
+  end
+
+  create_table "permissions_roles", :id => false, :force => true do |t|
+    t.integer "permission_id", :default => 0, :null => false
+    t.integer "role_id",       :default => 0, :null => false
+  end
+
+  add_index "permissions_roles", ["role_id"], :name => "permissions_roles_role_id"
+
   create_table "phone_app_versions", :force => true do |t|
     t.string   "version"
     t.text     "description"
@@ -1478,6 +1783,11 @@ ActiveRecord::Schema.define(:version => 20160810080942) do
     t.datetime "updated_at",         :null => false
   end
 
+  create_table "project_import_data", :force => true do |t|
+    t.integer "project_id"
+    t.text    "data"
+  end
+
   create_table "project_infos", :force => true do |t|
     t.integer  "project_id"
     t.integer  "user_id"
@@ -1570,6 +1880,24 @@ ActiveRecord::Schema.define(:version => 20160810080942) do
   add_index "projects_trackers", ["project_id", "tracker_id"], :name => "projects_trackers_unique", :unique => true
   add_index "projects_trackers", ["project_id"], :name => "projects_trackers_project_id"
 
+  create_table "protected_branches", :force => true do |t|
+    t.integer  "project_id",                             :null => false
+    t.string   "name",                                   :null => false
+    t.datetime "created_at"
+    t.datetime "updated_at"
+    t.boolean  "developers_can_push", :default => false, :null => false
+  end
+
+  add_index "protected_branches", ["project_id"], :name => "index_protected_branches_on_project_id"
+
+  create_table "pull_requests", :force => true do |t|
+    t.integer  "pull_request_id"
+    t.integer  "gpid"
+    t.integer  "user_id"
+    t.datetime "created_at",      :null => false
+    t.datetime "updated_at",      :null => false
+  end
+
   create_table "quality_analyses", :force => true do |t|
     t.integer  "project_id"
     t.string   "author_login"
@@ -1718,6 +2046,25 @@ ActiveRecord::Schema.define(:version => 20160810080942) do
     t.integer  "is_teacher_score",              :default => 0
   end
 
+  create_table "services", :force => true do |t|
+    t.string   "type"
+    t.string   "title"
+    t.integer  "project_id"
+    t.datetime "created_at"
+    t.datetime "updated_at"
+    t.boolean  "active",                :default => false, :null => false
+    t.text     "properties"
+    t.boolean  "template",              :default => false
+    t.boolean  "push_events",           :default => true
+    t.boolean  "issues_events",         :default => true
+    t.boolean  "merge_requests_events", :default => true
+    t.boolean  "tag_push_events",       :default => true
+    t.boolean  "note_events",           :default => true,  :null => false
+  end
+
+  add_index "services", ["created_at", "id"], :name => "index_services_on_created_at_and_id"
+  add_index "services", ["project_id"], :name => "index_services_on_project_id"
+
   create_table "settings", :force => true do |t|
     t.string   "name",       :default => "", :null => false
     t.text     "value"
@@ -1756,6 +2103,26 @@ ActiveRecord::Schema.define(:version => 20160810080942) do
     t.datetime "updated_at",     :null => false
   end
 
+  create_table "snippets", :force => true do |t|
+    t.string   "title"
+    t.text     "content",          :limit => 2147483647
+    t.integer  "author_id",                                             :null => false
+    t.integer  "project_id"
+    t.datetime "created_at"
+    t.datetime "updated_at"
+    t.string   "file_name"
+    t.datetime "expires_at"
+    t.string   "type"
+    t.integer  "visibility_level",                       :default => 0, :null => false
+  end
+
+  add_index "snippets", ["author_id"], :name => "index_snippets_on_author_id"
+  add_index "snippets", ["created_at", "id"], :name => "index_snippets_on_created_at_and_id"
+  add_index "snippets", ["created_at"], :name => "index_snippets_on_created_at"
+  add_index "snippets", ["expires_at"], :name => "index_snippets_on_expires_at"
+  add_index "snippets", ["project_id"], :name => "index_snippets_on_project_id"
+  add_index "snippets", ["visibility_level"], :name => "index_snippets_on_visibility_level"
+
   create_table "softapplications", :force => true do |t|
     t.string   "name"
     t.text     "description"
@@ -1836,11 +2203,10 @@ ActiveRecord::Schema.define(:version => 20160810080942) do
     t.integer  "absence_penalty",                               :default => 0
     t.float    "system_score",                                  :default => 0.0
     t.boolean  "is_test",                                       :default => false
+    t.float    "work_score"
     t.integer  "simi_id"
     t.integer  "simi_value"
-    t.float    "work_score"
     t.integer  "work_status",                                   :default => 0
-    t.datetime "commit_time"
   end
 
   add_index "student_works", ["homework_common_id", "user_id"], :name => "index_student_works_on_homework_common_id_and_user_id"
@@ -1888,13 +2254,13 @@ ActiveRecord::Schema.define(:version => 20160810080942) do
 
   create_table "sub_domains", :force => true do |t|
     t.integer  "org_subfield_id"
-    t.integer  "priority",        :default => 0
+    t.integer  "priority"
     t.string   "name"
     t.string   "field_type"
-    t.integer  "hide",            :default => 0
-    t.integer  "status",          :default => 0
-    t.datetime "created_at",                     :null => false
-    t.datetime "updated_at",                     :null => false
+    t.integer  "hide"
+    t.integer  "status"
+    t.datetime "created_at",      :null => false
+    t.datetime "updated_at",      :null => false
   end
 
   create_table "subfield_subdomain_dirs", :force => true do |t|
@@ -1904,6 +2270,17 @@ ActiveRecord::Schema.define(:version => 20160810080942) do
     t.datetime "updated_at",      :null => false
   end
 
+  create_table "subscriptions", :force => true do |t|
+    t.integer  "user_id"
+    t.integer  "subscribable_id"
+    t.string   "subscribable_type"
+    t.boolean  "subscribed"
+    t.datetime "created_at"
+    t.datetime "updated_at"
+  end
+
+  add_index "subscriptions", ["subscribable_id", "subscribable_type", "user_id"], :name => "subscriptions_user_id_and_ref_fields", :unique => true
+
   create_table "syllabuses", :force => true do |t|
     t.string   "title"
     t.text     "description"
@@ -2164,6 +2541,17 @@ ActiveRecord::Schema.define(:version => 20160810080942) do
   add_index "users", ["id", "type"], :name => "index_users_on_id_and_type"
   add_index "users", ["type"], :name => "index_users_on_type"
 
+  create_table "users_star_projects", :force => true do |t|
+    t.integer  "project_id", :null => false
+    t.integer  "user_id",    :null => false
+    t.datetime "created_at"
+    t.datetime "updated_at"
+  end
+
+  add_index "users_star_projects", ["project_id"], :name => "index_users_star_projects_on_project_id"
+  add_index "users_star_projects", ["user_id", "project_id"], :name => "index_users_star_projects_on_user_id_and_project_id", :unique => true
+  add_index "users_star_projects", ["user_id"], :name => "index_users_star_projects_on_user_id"
+
   create_table "versions", :force => true do |t|
     t.integer  "project_id",      :default => 0,      :null => false
     t.string   "name",            :default => "",     :null => false
@@ -2215,6 +2603,23 @@ ActiveRecord::Schema.define(:version => 20160810080942) do
     t.datetime "updated_at",  :null => false
   end
 
+  create_table "web_hooks", :force => true do |t|
+    t.string   "url"
+    t.integer  "project_id"
+    t.datetime "created_at"
+    t.datetime "updated_at"
+    t.string   "type",                  :default => "ProjectHook"
+    t.integer  "service_id"
+    t.boolean  "push_events",           :default => true,          :null => false
+    t.boolean  "issues_events",         :default => false,         :null => false
+    t.boolean  "merge_requests_events", :default => false,         :null => false
+    t.boolean  "tag_push_events",       :default => false
+    t.boolean  "note_events",           :default => false,         :null => false
+  end
+
+  add_index "web_hooks", ["created_at", "id"], :name => "index_web_hooks_on_created_at_and_id"
+  add_index "web_hooks", ["project_id"], :name => "index_web_hooks_on_project_id"
+
   create_table "wechat_logs", :force => true do |t|
     t.string   "openid",       :null => false
     t.text     "request_raw"
diff --git a/lib/gitlab-cli/lib/gitlab/client/merge_requests.rb b/lib/gitlab-cli/lib/gitlab/client/merge_requests.rb
index 1ccc25081..0ac95b391 100644
--- a/lib/gitlab-cli/lib/gitlab/client/merge_requests.rb
+++ b/lib/gitlab-cli/lib/gitlab/client/merge_requests.rb
@@ -43,11 +43,11 @@ class Gitlab::Client
     # @option options [String] :target_branch (required) The target branch name.
     # @option options [Integer] :assignee_id (optional) The ID of a user to assign merge request.
     # @return [Gitlab::ObjectifiedHash] Information about created merge request.
-    def create_merge_request(project, title, options={})
+    def create_merge_request(project, title, gid, options={})
       check_attributes!(options, [:source_branch, :target_branch])
 
       body = {:title => title}.merge(options)
-      post("/projects/#{project}/merge_requests", :body => body)
+      post("/projects/#{project}/merge_requests?user_id=#{gid}", :body => body)
     end
 
     # Updates a merge request.
@@ -64,8 +64,8 @@ class Gitlab::Client
     # @option options [Integer] :assignee_id The ID of a user to assign merge request.
     # @option options [String] :state_event New state (close|reopen|merge).
     # @return [Gitlab::ObjectifiedHash] Information about updated merge request.
-    def update_merge_request(project, id, options={})
-      put("/projects/#{project}/merge_request/#{id}", :body => options)
+    def update_merge_request(project, id, gid, options={})
+      put("/projects/#{project}/merge_request/#{id}?user_id=#{gid}", :body => options)
     end
 
     # Adds a comment to a merge request.
@@ -78,8 +78,24 @@ class Gitlab::Client
     # @param  [Integer] id The ID of a merge request.
     # @param  [String] note The content of a comment.
     # @return [Gitlab::ObjectifiedHash] Information about created merge request comment.
-    def create_merge_request_comment(project, id, note)
-      post("/projects/#{project}/merge_request/#{id}/comments", :body => {:note => note})
+    def create_merge_request_comment(project, id, note, gid)
+      post("/projects/#{project}/merge_request/#{id}/comments?user_id=#{gid}", :body => {:note => note})
+    end
+
+    # Get a list of merge request commits.
+    # Parameters:
+    # id (required) - The ID of a project
+    # merge_request_id (required) - The ID of MR
+    def merge_request_commits(project, id)
+      get("/projects/#{project}/merge_request/#{id}/commits")
+    end
+
+    # Shows information about the merge request including its files and changes. With GitLab 8.2 the return fields upvotes and downvotes are deprecated and always return 0.
+    # Parameters:
+    # id (required) - The ID of a project
+    # merge_request_id (required) - The ID of MR
+    def merge_request_changes(project, id)
+      get("/projects/#{project}/merge_request/#{id}/changes")
     end
 
     # Gets the comments on a merge request.
@@ -94,6 +110,18 @@ class Gitlab::Client
       get("/projects/#{project}/merge_request/#{id}/comments")
     end
 
+    # Accept a merge request.
+    #
+    # @example
+    #   Gitlab.accept_pull_rquest(5, 1)
+    #
+    # @param  [Integer] project The ID of a project.
+    # @param  [Integer] id The ID of a merge request.
+    # @return [Gitlab::ObjectifiedHash]
+    def accept_merge_rquest(project, id, gid)
+      put("/projects/#{project}/merge_request/#{id}/merge?user_id=#{gid}")
+    end
+
     private
 
     def check_attributes!(options, attrs)
diff --git a/lib/response_ip.rb b/lib/response_ip.rb
new file mode 100644
index 000000000..97c93d222
--- /dev/null
+++ b/lib/response_ip.rb
@@ -0,0 +1,20 @@
+#coding=utf-8
+#
+require 'socket'
+
+class ResponseIp 
+    def initialize(app)                                                                                                                                      
+     @app = app                                                                                                                                              
+    end 
+
+    def ip
+      addr = Socket.ip_address_list.detect{|intf| intf.ipv4_private?}.ip_address rescue
+      addr || ''
+    end
+
+    def call(env)
+      status, headers, body = @app.call(env)                                                                                                             
+      headers["X-response-ip"] = ip
+      [status, headers, body]  
+    end
+end
diff --git a/lib/wechat/lib/wechat/api.rb b/lib/wechat/lib/wechat/api.rb
index 5cb457b9f..f267f8b69 100644
--- a/lib/wechat/lib/wechat/api.rb
+++ b/lib/wechat/lib/wechat/api.rb
@@ -7,6 +7,7 @@ module Wechat
   class Api < ApiBase
     API_BASE = 'https://api.weixin.qq.com/cgi-bin/'
     OAUTH2_BASE = 'https://api.weixin.qq.com/sns/oauth2/'
+    OAUTH2_USERINFO = 'https://api.weixin.qq.com/sns/'
 
     def initialize(appid, secret, token_file, timeout, skip_verify_ssl, jsapi_ticket_file)
       @client = Client.new(API_BASE, timeout, skip_verify_ssl)
@@ -120,5 +121,23 @@ module Wechat
       }
       get 'access_token', params: params, base: OAUTH2_BASE
     end
+
+    def web_auth_access_token(web_access_token, openid)
+      get 'auth', params: { access_token: web_access_token, openid: openid  }, base: OAUTH2_BASE
+    end
+
+    def web_refresh_access_token(user_refresh_token)
+      params = {
+        appid: access_token.appid,
+        grant_type: 'refresh_token',
+        refresh_token: user_refresh_token
+      }
+      get 'refresh_token', params: params, base: OAUTH2_BASE
+    end
+
+    def web_userinfo(web_access_token, openid, lang = 'zh_CN')
+      get 'userinfo', params: { access_token: web_access_token, openid: openid, lang: lang  }, base: OAUTH2_USERINFO
+    end
+
   end
 end
diff --git a/lib/wechat/lib/wechat/api_base.rb b/lib/wechat/lib/wechat/api_base.rb
index b873251f7..1fa3c4f7b 100644
--- a/lib/wechat/lib/wechat/api_base.rb
+++ b/lib/wechat/lib/wechat/api_base.rb
@@ -1,6 +1,6 @@
 module Wechat
   class ApiBase
-    attr_reader :access_token, :client, :jsapi_ticket
+    attr_reader :access_token, :client, :jsapi_ticket, :auth_access_token
 
     MP_BASE = 'https://mp.weixin.qq.com/cgi-bin/'
 
@@ -42,7 +42,7 @@ module Wechat
 
     def with_access_token(params = {}, tries = 2)
       params ||= {}
-      yield(params.merge(access_token: access_token.token))
+      yield(params.reverse_merge(access_token: access_token.token))
     rescue AccessTokenExpiredError
       access_token.refresh
       retry unless (tries -= 1).zero?
diff --git a/lib/wechat/lib/wechat/token/auth_access_token.rb b/lib/wechat/lib/wechat/token/auth_access_token.rb
new file mode 100644
index 000000000..5b58e261c
--- /dev/null
+++ b/lib/wechat/lib/wechat/token/auth_access_token.rb
@@ -0,0 +1,21 @@
+require 'wechat/token/access_token_base'
+
+module Wechat
+  module Token
+    class AuthAccessToken < AccessTokenBase
+
+      # def refresh
+			# 	params = {
+			# 		appid: access_token.appid,
+			# 		grant_type: 'refresh_token',
+			# 		refresh_token: user_refresh_token
+			# 	}
+			# 	data = client.get 'oauth2/refresh_token', params: params, base: OAUTH2_BASE
+			# 	write_token_to_file(data)
+			# 	read_token_from_file
+      # end
+
+    end
+  end
+end
+
diff --git a/public/assets/wechat/activities.html b/public/assets/wechat/activities.html
index fbdfb1152..a4aa9a4c7 100644
--- a/public/assets/wechat/activities.html
+++ b/public/assets/wechat/activities.html
@@ -26,8 +26,7 @@
                 <div dataID = "{{act.act_id}}" ng-click="goDetail('homework',act.act_id, act.id)" id="act_{{act.id}}">
                   <div class="post-avatar fl mr10"><img ng-src="{{replaceUrl(act.author.img_url)}}" width="30" height="30" class="border-radius img-circle" /></div>
                   <div class="post-dynamic-author hidden fl">
-                    <span ng-if="act.author.realname != ' '">{{act.author.realname}}</span>
-                    <span ng-if="act.author.realname == ' '">{{act.author.nickname}}</span>
+                    <span>{{act.author.real_name}}</span>
                     <img ng-if="act.author.gender == '0'" src="images/wechat/male.png" width="14" class="ml5" />
                     <img ng-if="act.author.gender != '0'" src="images/wechat/female.png" width="14" class="ml5" />
                   </div>
@@ -64,8 +63,7 @@
                 <div dataID = "{{act.act_id}}" ng-click="goDetail('course_notice',act.act_id, act.id)" id="act_{{act.id}}">
                   <div class="post-avatar fl mr10"><img ng-src="{{replaceUrl(act.author.img_url)}}" width="30" height="30" class="border-radius img-circle" /></div>
                   <div class="post-dynamic-author hidden fl">
-                    <span ng-if="act.author.realname != ' '">{{act.author.realname}}</span>
-                    <span ng-if="act.author.realname == ' '">{{act.author.nickname}}</span>
+                    <span>{{act.author.real_name}}</span>
                     <img ng-if="act.author.gender == '0'" src="images/wechat/male.png" width="14" class="ml5" />
                     <img ng-if="act.author.gender != '0'" src="images/wechat/female.png" width="14" class="ml5" />
                   </div>
@@ -100,8 +98,7 @@
                 <div dataID = "{{act.act_id}}" ng-click="goDetail('course_discussion',act.act_id, act.id)" id="act_{{act.id}}">
                   <div class="post-avatar fl mr10"><img ng-src="{{replaceUrl(act.author.img_url)}}" width="30" height="30" class="border-radius img-circle" /></div>
                   <div class="post-dynamic-author hidden fl">
-                    <span ng-if="act.author.realname != ' '">{{act.author.realname}}</span>
-                    <span ng-if="act.author.realname == ' '">{{act.author.nickname}}</span>
+                    <span>{{act.author.real_name}}</span>
                     <img ng-if="act.author.gender == '0'" src="images/wechat/male.png" width="14" class="ml5" />
                     <img ng-if="act.author.gender != '0'" src="images/wechat/female.png" width="14" class="ml5" />
                   </div>
@@ -136,7 +133,7 @@
             <div class="post-wrapper">
               <div class="post-main">
                 <div class="post-avatar fl mr10"><img ng-src="{{replaceUrl(act.author.img_url)}}" width="30" height="30" class="border-radius img-circle" /></div>
-                <div class="post-title hidden mb5"><span class="c-grey3 f13 fb mr10">{{act.author.realname}}</span>创建了<span class="c-grey3 f13 fb ml10">{{act.course_project_name}} | 班级</span></div>
+                <div class="post-title hidden mb5"><span class="c-grey3 f13 fb mr10">{{act.author.real_name}}</span>创建了<span class="c-grey3 f13 fb ml10">{{act.course_project_name}} | 班级</span></div>
                 <div class="post-title hidden"><span class="mr10">{{act.latest_update}}</span></div>
                 <div class="cl"></div>
               </div>
@@ -153,8 +150,7 @@
                 <div dataID = "{{act.act_id}}" ng-click="goDetail('issues',act.act_id, act.id)" id="act_{{act.id}}">
                   <div class="post-avatar fl mr10"><img ng-src="{{replaceUrl(act.author.img_url)}}" width="30" height="30" class="border-radius img-circle" /></div>
                   <div class="post-dynamic-author hidden fl">
-                    <span ng-if="act.author.realname != ' '">{{act.author.realname}}</span>
-                    <span ng-if="act.author.realname == ' '">{{act.author.nickname}}</span>
+                    <span>{{act.author.real_name}}</span>
                     <img ng-if="act.author.gender == '0'" src="images/wechat/male.png" width="14" class="ml5" />
                     <img ng-if="act.author.gender != '0'" src="images/wechat/female.png" width="14" class="ml5" />
                   </div>
@@ -192,8 +188,7 @@
                 <div dataID = "{{act.act_id}}" ng-click="goDetail('project_discussion',act.act_id, act.id)" id="act_{{act.id}}">
                   <div class="post-avatar fl mr10"><img ng-src="{{replaceUrl(act.author.img_url)}}" width="30" height="30" class="border-radius img-circle" /></div>
                   <div class="post-dynamic-author hidden fl">
-                    <span ng-if="act.author.realname != ' '">{{act.author.realname}}</span>
-                    <span ng-if="act.author.realname == ' '">{{act.author.nickname}}</span>
+                    <span>{{act.author.real_name}}</span>
                     <img ng-if="act.author.gender == '0'" src="images/wechat/male.png" width="14" class="ml5" />
                     <img ng-if="act.author.gender != '0'" src="images/wechat/female.png" width="14" class="ml5" />
                   </div>
@@ -226,7 +221,7 @@
             <div class="post-wrapper">
               <div class="post-main">
                 <div class="post-avatar fl mr10"><img ng-src="{{replaceUrl(act.author.img_url)}}" width="30" height="30" class="border-radius img-circle" /></div>
-                <div class="post-title hidden mb5"><span class="c-grey3 f13 fb mr10">{{act.author.realname}}</span>创建了<span class="c-grey3 f13 fb ml10">{{act.course_project_name}} | 项目</span></div>
+                <div class="post-title hidden mb5"><span class="c-grey3 f13 fb mr10">{{act.author.real_name}}</span>创建了<span class="c-grey3 f13 fb ml10">{{act.course_project_name}} | 项目</span></div>
                 <div class="post-title hidden"><span class="mr10">{{act.latest_update}}</span></div>
                 <div class="cl"></div>
               </div>
@@ -243,8 +238,7 @@
                 <div dataID = "{{act.act_id}}" ng-click="goDetail('journal_for_message',act.act_id, act.id)" id="act_{{act.id}}">
                   <div class="post-avatar fl mr10"><img ng-src="{{replaceUrl(act.author.img_url)}}" width="30" height="30" class="border-radius img-circle" /></div>
                   <div class="post-dynamic-author hidden fl">
-                    <span ng-if="act.author.realname != ' '">{{act.author.realname}}</span>
-                    <span ng-if="act.author.realname == ' '">{{act.author.nickname}}</span>
+                    <span>{{act.author.real_name}}</span>
                     <img ng-if="act.author.gender == '0'" src="images/wechat/male.png" width="14" class="ml5" />
                     <img ng-if="act.author.gender != '0'" src="images/wechat/female.png" width="14" class="ml5" />
                   </div>
@@ -280,8 +274,7 @@
               <div dataID = "{{act.act_id}}" ng-click="goDetail('blog_comment',act.act_id, act.id)" id="act_{{act.id}}">
                 <div class="post-avatar fl mr10"><img ng-src="{{replaceUrl(act.author.img_url)}}" width="30" height="30" class="border-radius img-circle" /></div>
                 <div class="post-dynamic-author hidden fl">
-                  <span ng-if="act.author.realname != ' '">{{act.author.realname}}</span>
-                  <span ng-if="act.author.realname == ' '">{{act.author.nickname}}</span>
+                  <span>{{act.author.real_name}}</span>
                   <img ng-if="act.author.gender == '0'" src="images/wechat/male.png" width="14" class="ml5" />
                   <img ng-if="act.author.gender != '0'" src="images/wechat/female.png" width="14" class="ml5" />
                 </div>
@@ -326,8 +319,7 @@
                               <div dataID = "{{act.act_id}}" ng-click="goDetail('homework',act.act_id, act.id)" id="act_{{act.id}}">
                                   <div class="post-avatar fl mr10"><img ng-src="{{replaceUrl(act.author.img_url)}}" width="30" height="30" class="border-radius img-circle" /></div>
                                   <div class="post-dynamic-author hidden fl">
-                                      <span ng-if="act.author.realname != ' '">{{act.author.realname}}</span>
-                                      <span ng-if="act.author.realname == ' '">{{act.author.nickname}}</span>
+                                      <span>{{act.author.real_name}}</span>
                                       <img ng-if="act.author.gender == '0'" src="images/wechat/male.png" width="14" class="ml5" />
                                       <img ng-if="act.author.gender != '0'" src="images/wechat/female.png" width="14" class="ml5" />
                                   </div>
@@ -364,8 +356,7 @@
                               <div dataID = "{{act.act_id}}" ng-click="goDetail('course_notice',act.act_id, act.id)" id="act_{{act.id}}">
                                   <div class="post-avatar fl mr10"><img ng-src="{{replaceUrl(act.author.img_url)}}" width="30" height="30" class="border-radius img-circle" /></div>
                                   <div class="post-dynamic-author hidden fl">
-                                      <span ng-if="act.author.realname != ' '">{{act.author.realname}}</span>
-                                      <span ng-if="act.author.realname == ' '">{{act.author.nickname}}</span>
+                                      <span>{{act.author.real_name}}</span>
                                       <img ng-if="act.author.gender == '0'" src="images/wechat/male.png" width="14" class="ml5" />
                                       <img ng-if="act.author.gender != '0'" src="images/wechat/female.png" width="14" class="ml5" />
                                   </div>
@@ -400,8 +391,7 @@
                               <div dataID = "{{act.act_id}}" ng-click="goDetail('course_discussion',act.act_id, act.id)" id="act_{{act.id}}">
                                   <div class="post-avatar fl mr10"><img ng-src="{{replaceUrl(act.author.img_url)}}" width="30" height="30" class="border-radius img-circle" /></div>
                                   <div class="post-dynamic-author hidden fl">
-                                      <span ng-if="act.author.realname != ' '">{{act.author.realname}}</span>
-                                      <span ng-if="act.author.realname == ' '">{{act.author.nickname}}</span>
+                                      <span>{{act.author.real_name}}</span>
                                       <img ng-if="act.author.gender == '0'" src="images/wechat/male.png" width="14" class="ml5" />
                                       <img ng-if="act.author.gender != '0'" src="images/wechat/female.png" width="14" class="ml5" />
                                   </div>
@@ -436,7 +426,7 @@
                       <div class="post-wrapper">
                           <div class="post-main">
                               <div class="post-avatar fl mr10"><img ng-src="{{replaceUrl(act.author.img_url)}}" width="30" height="30" class="border-radius img-circle" /></div>
-                              <div class="post-title hidden mb5"><span class="c-grey3 f13 fb mr10">{{act.author.realname}}</span>创建了<span class="c-grey3 f13 fb ml10">{{act.course_project_name}} | 班级</span></div>
+                              <div class="post-title hidden mb5"><span class="c-grey3 f13 fb mr10">{{act.author.real_name}}</span>创建了<span class="c-grey3 f13 fb ml10">{{act.course_project_name}} | 班级</span></div>
                               <div class="post-title hidden"><span class="mr10">{{act.latest_update}}</span></div>
                               <div class="cl"></div>
                           </div>
@@ -460,8 +450,7 @@
                           <div dataID = "{{act.act_id}}" ng-click="goDetail('issues',act.act_id, act.id)" id="act_{{act.id}}">
                               <div class="post-avatar fl mr10"><img ng-src="{{replaceUrl(act.author.img_url)}}" width="30" height="30" class="border-radius img-circle" /></div>
                               <div class="post-dynamic-author hidden fl">
-                                  <span ng-if="act.author.realname != ' '">{{act.author.realname}}</span>
-                                  <span ng-if="act.author.realname == ' '">{{act.author.nickname}}</span>
+                                  <span>{{act.author.real_name}}</span>
                                   <img ng-if="act.author.gender == '0'" src="images/wechat/male.png" width="14" class="ml5" />
                                   <img ng-if="act.author.gender != '0'" src="images/wechat/female.png" width="14" class="ml5" />
                               </div>
@@ -499,8 +488,7 @@
                           <div dataID = "{{act.act_id}}" ng-click="goDetail('project_discussion',act.act_id, act.id)" id="act_{{act.id}}">
                               <div class="post-avatar fl mr10"><img ng-src="{{replaceUrl(act.author.img_url)}}" width="30" height="30" class="border-radius img-circle" /></div>
                               <div class="post-dynamic-author hidden fl">
-                                  <span ng-if="act.author.realname != ' '">{{act.author.realname}}</span>
-                                  <span ng-if="act.author.realname == ' '">{{act.author.nickname}}</span>
+                                  <span>{{act.author.real_name}}</span>
                                   <img ng-if="act.author.gender == '0'" src="images/wechat/male.png" width="14" class="ml5" />
                                   <img ng-if="act.author.gender != '0'" src="images/wechat/female.png" width="14" class="ml5" />
                               </div>
@@ -533,7 +521,7 @@
                   <div class="post-wrapper">
                       <div class="post-main">
                           <div class="post-avatar fl mr10"><img ng-src="{{replaceUrl(act.author.img_url)}}" width="30" height="30" class="border-radius img-circle" /></div>
-                          <div class="post-title hidden mb5"><span class="c-grey3 f13 fb mr10">{{act.author.realname}}</span>创建了<span class="c-grey3 f13 fb ml10">{{act.course_project_name}} | 项目</span></div>
+                          <div class="post-title hidden mb5"><span class="c-grey3 f13 fb mr10">{{act.author.real_name}}</span>创建了<span class="c-grey3 f13 fb ml10">{{act.course_project_name}} | 项目</span></div>
                           <div class="post-title hidden"><span class="mr10">{{act.latest_update}}</span></div>
                           <div class="cl"></div>
                       </div>
diff --git a/public/assets/wechat/app.html b/public/assets/wechat/app.html
index 43640a115..d49caedd5 100644
--- a/public/assets/wechat/app.html
+++ b/public/assets/wechat/app.html
@@ -36,7 +36,9 @@
 <script src="/javascripts/wechat/directives/form_validate.js"></script>
 <script src="/javascripts/wechat/directives/input_auto.js"></script>
 <script src="/javascripts/wechat/directives/loading_spinner.js"></script>
-<!--<script src="/javascripts/wechat/directives/ellipsis.js"></script>-->
+<script src="/javascripts/wechat/directives/ellipsis.js"></script>
+<script src="/javascripts/wechat/directives/input_focus.js"></script>
+<script src="/javascripts/wechat/directives/at_delete_link.js"></script>
 <script src="/javascripts/wechat/controllers/reg.js"></script>
 <script src="/javascripts/wechat/controllers/login.js"></script>
 <script src="/javascripts/wechat/controllers/activity.js"></script>
diff --git a/public/assets/wechat/blog_detail.html b/public/assets/wechat/blog_detail.html
index ee9e968d2..c1e2fd2fd 100644
--- a/public/assets/wechat/blog_detail.html
+++ b/public/assets/wechat/blog_detail.html
@@ -8,7 +8,7 @@
 
                 <div class="post-avatar fl mr10"><img ng-src="{{blog.user.img_url}}" width="30" height="30" class="border-radius img-circle" /></div>
                 <div class="post-dynamic-author hidden fl">
-                    {{blog.user.realname}}
+                    {{blog.user.real_name}}
                     <img ng-if="blog.user.gender == '0'" src="images/wechat/male.png" width="14" class="ml5" />
                     <img ng-if="blog.user.gender != '0'" src="images/wechat/female.png" width="14" class="ml5" />
                 </div>
@@ -25,20 +25,20 @@
                     <div ng-if="blog.praise_count && !blog.has_praise" ng-click="addPraise(blog);"><img src="/images/wechat/w_praise.png" width="20" style="vertical-align:top; margin-top:2px;" class="mr5" /><span>{{blog.praise_count}}</span></div>
                     <div ng-if="blog.has_praise" ng-click="decreasePraise(blog);"><img src="/images/wechat/w_praised.png" width="20" style="vertical-align:top; margin-top:2px;" class="mr5" /><span>{{blog.praise_count}}</span></div>
                 </div>
-                <div class="fr mr25 f13">
+                <div class="fr mr25 f13" input-focus>
                     <a ng-if="!blog.comment_count"><img src="/images/wechat/w_reply.png" width="20" style="vertical-align:top; margin-top:2px;" class="mr5" /><span style="vertical-align:top;">回复</span></a>
                     <a ng-if="blog.comment_count"><img src="/images/wechat/w_reply.png" width="20" style="vertical-align:top; margin-top:2px;" class="mr5" /><span style="vertical-align:top;">{{blog.comment_count}}</span></a>
                 </div>
                 <div class="cl"></div>
             </div>
-            <div class="mb50" id="all_blog_reply">
+            <div class="mb50" id="all_blog_reply" at-delete-link>
 
                 <div ng-if="blog.all_children == ''" style="border-top:1px solid #ccc;"></div>
                 <div class="post-reply-wrap" ng-repeat="journal in blog.all_children">
                     <div class="post-reply-row" ng-class="['post-reply-row',{'border-bottom-none' : $last}]">
                         <div class="post-avatar fl mr10"><img ng-src="{{journal.user.img_url}}" width="30" height="30" class="border-radius img-circle" /></div>
                         <div class="post-reply-author hidden fl">
-                            {{journal.user.realname}}
+                            {{journal.user.real_name}}
                         </div>
                         <div class="post-reply-time fr f12">{{journal.lasted_comment}}</div>
                         <div class="cl"></div>
@@ -48,7 +48,7 @@
                             <div ng-click="showMoreReply(1,journal)" ng-show="journal.parents_reply_top.length + journal.parents_reply_bottom.length < journal.parents_count" class="mult-reply-hide"><span class="mult-reply-arrow" >&darr; </span><span class="mult-reply-arrow" style="display:none;" > &uarr;</span>点击展开更多楼层</div>
                             <div ng-repeat="reply_bottom in journal.parents_reply_bottom" class="ml5 mr5">
                                 <div class="post-reply-author hidden fl ng-binding">
-                                    {{reply_bottom.user.realname}}
+                                    {{reply_bottom.user.real_name}}
                                 </div>
                                 <div class="post-reply-time fr f12">{{reply_bottom.lasted_comment}}</div>
                                 <div class="cl"></div>
@@ -73,7 +73,7 @@
                 <div class="post-reply-row border-bottom-none">
                     <div class="post-input-container">
                         <div class="copy-input-container"><textarea class="copy-input"></textarea></div>
-                        <textarea input-auto type="text" class="post-reply-input" id="postInput1" ng-model="formData.comment" placeholder="输入回复内容~" /></textarea>
+                        <textarea input-auto type="text" class="post-reply-input" id="postInput1" ng-model="formData.comment" placeholder="{{replytip}}" /></textarea>
                         <button ng-click="addReply(formData)" ng-disabled="formData.disabled" ng-hide="formData.disabled" class="post-reply-submit fr border-radius">提交</button>
                         <button ng-disabled="formData.disabled" ng-hide="!formData.disabled" class="post-reply-submit bg-grey fr border-radius">提交</button>
                         <div class="cl"></div>
diff --git a/public/assets/wechat/class.html b/public/assets/wechat/class.html
index 5b9b71b0d..e720c90c9 100644
--- a/public/assets/wechat/class.html
+++ b/public/assets/wechat/class.html
@@ -31,15 +31,23 @@
         <div class="member-banner f13 c-grey3">授课老师</div>
 
         <div class="class-member-row f13 c-grey3" ng-repeat="teacher in teachers|filter:searchText">
-            <img ng-src="/images/wechat/{{teacher.gender==0 ? 'male' : 'female'}}.jpg" width="30" class="fl ml10 img-circle" /><span class="fl ml10 mt5">{{teacher.name}}</span><img ng-src="/images/wechat/{{teacher.gender==0 ? 'male' : 'female'}}.png" width="15" class="fl ml10 mt5" />
+            <img ng-src="{{teacher.img_url}}" width="30" height="30" class="fl ml10 img-circle" /><span class="fl ml10 mt5">{{teacher.name}}</span><img ng-src="/images/wechat/{{teacher.gender==0 ? 'male' : 'female'}}.png" width="15" class="fl ml10 mt5" />
             <img src="/images/wechat/setting.png" ng-show = "course.is_creator && teacher.id != course.tea_id" width="15" class="fr mr10" style="margin-top:7px;" ng-click="onSetting(teacher)" />
             <span class = "fr mr25 mt5" ng-show ="teacher.id == course.tea_id">管理员</span>
-            <span ng-class="['fr','mt5',{'mr10': course.is_creator,'mr25': !course.is_creator}]" ng-show ="teacher.id != course.tea_id && teacher.roles_id == 7">教辅</span>
+            <span ng-class="['fr','mt5',{'mr10': course.is_creator,'mr25': !course.is_creator}]" ng-show ="teacher.id != course.tea_id && teacher.roles_id == 7">助教</span>
             <div class="cl"></div>
         </div>
+
+        <div ng-show ="course.is_creator" class="class-member-row f13 c-grey3" ng-repeat="reviewer in reviewers|filter:searchText">
+            <img ng-src="{{reviewer.img_url}}" width="30" height="30" class="fl ml10 img-circle" /><span class="fl ml10 mt5">{{reviewer.name}}</span><img ng-src="/images/wechat/{{reviewer.gender==0 ? 'male' : 'female'}}.png" width="15" class="fl ml10 mt5" />
+            <span ng-click="review(reviewer)" class = "fr mr10 mt5 c-red">待审批 ▶</span>
+            <div class="cl"></div>
+        </div>
+
+
         <div class="member-banner f13 mt10 c-grey3">我的同学</div>
         <div class="class-member-row f13 c-grey3" ng-repeat="student in students|filter:searchText">
-            <img ng-src="/images/wechat/{{student.gender==0 ? 'male' : 'female'}}.jpg" width="30" class="fl ml10 img-circle" /><span class="fl ml10 mt5">{{student.name}}</span><img ng-src="/images/wechat/{{student.gender==0 ? 'male' : 'female'}}.png" width="15" class="fl ml10 mt5" />
+            <img ng-src="{{student.img_url}}" width="30" height="30" class="fl ml10 img-circle" /><span class="fl ml10 mt5">{{student.name}}</span><img ng-src="/images/wechat/{{student.gender==0 ? 'male' : 'female'}}.png" width="15" class="fl ml10 mt5" />
             <img src="/images/wechat/setting.png" ng-show = "course.is_creator" width="15" class="class-list-setting" ng-click="onSetting(student)" />
             <div class="cl"></div>
         </div>
diff --git a/public/assets/wechat/class_list.html b/public/assets/wechat/class_list.html
index ece31ceeb..9ac70cc0a 100644
--- a/public/assets/wechat/class_list.html
+++ b/public/assets/wechat/class_list.html
@@ -10,7 +10,7 @@
                 <li ng-show="course.id" ng-click="goClass(course.id)" ng-repeat="course in syllabus.courses" ng-class="{'border-bottom-none': $last}">
                     <img src="/images/wechat/dot.png" width="15px" class="class-list-dot" />
                     <span class="fl ml10 class-list-name hidden">{{course.name}}</span>
-                    <span class="fr c-grey4">&gt;</span>
+                    <span class="fr c-grey4 amount-arrow">&gt;</span>
                     <span class="students-amount f12 fr mt10 mr5">{{course.member_count}}人</span>
                 </li>
             </ul>
@@ -25,7 +25,7 @@
                 <li ng-show="course.id" ng-click="goClass(course.id)" ng-repeat="course in syllabus.courses" ng-class="{'border-bottom-none': $last}">
                     <img src="/images/wechat/dot.png" width="15px" class="class-list-dot" />
                     <span class="fl ml10 class-list-name hidden">{{course.name}}</span>
-                    <span class="fr c-grey4">&gt;</span>
+                    <span class="fr c-grey4 amount-arrow">&gt;</span>
                     <span class="students-amount f12 fr mt10 mr5">{{course.member_count}}人</span>
                 </li>
             </ul>
diff --git a/public/assets/wechat/course_discussion.html b/public/assets/wechat/course_discussion.html
index 9ef7bc429..3d7444c95 100644
--- a/public/assets/wechat/course_discussion.html
+++ b/public/assets/wechat/course_discussion.html
@@ -5,10 +5,11 @@
         <div class="post-container">
             <div loading-spinner></div>
             <div class="post-wrapper" style="margin-top:0;">
+                <div ng-show="is_public == 0" class="tac f16 fb c-black" style="padding-top:10px;">私有内容，请谨慎传播</div>
                 <div class="post-main">
                     <div class="post-avatar fl mr10"><img ng-src="{{discussion.user.img_url}}" width="30" height="30" class="border-radius img-circle" /></div>
                     <div class="post-dynamic-author hidden fl">
-                        {{discussion.user.realname}}
+                        {{discussion.user.real_name}}
                         <img ng-if="discussion.user.gender == '0'" src="images/wechat/male.png" width="14" class="ml5" />
                         <img ng-if="discussion.user.gender != '0'" src="images/wechat/female.png" width="14" class="ml5" />
                     </div>
@@ -23,20 +24,20 @@
                             <div ng-if="discussion.praise_count && !discussion.has_praise" ng-click="addPraise(discussion);"><img src="/images/wechat/w_praise.png" width="20" style="vertical-align:top; margin-top:2px;" class="mr5" /><span>{{discussion.praise_count}}</span></div>
                             <div ng-if="discussion.has_praise" ng-click="decreasePraise(discussion);"><img src="/images/wechat/w_praised.png" width="20" style="vertical-align:top; margin-top:2px;" class="mr5" /><span>{{discussion.praise_count}}</span></div>
                         </div>
-                        <div class="fr mr25 f13">
+                        <div class="fr mr25 f13" input-focus>
                             <a ng-if="!discussion.comment_count"><img src="/images/wechat/w_reply.png" width="20" style="vertical-align:top; margin-top:2px;" class="mr5" /><span style="vertical-align:top;">回复</span></a>
                             <a ng-if="discussion.comment_count"><img src="/images/wechat/w_reply.png" width="20" style="vertical-align:top; margin-top:2px;" class="mr5" /><span style="vertical-align:top;">{{discussion.comment_count}}</span></a>
                         </div>
                         <div class="cl"></div>
                     </div>
                 </div>
-                <div class="mb50" id="all_course_message_reply">
+                <div class="mb50" id="all_course_message_reply" at-delete-link>
                     <div ng-if="discussion.all_children == ''" style="border-top:1px solid #ccc;"></div>
                     <div class="post-reply-wrap" ng-repeat="journal in discussion.all_children">
                         <div class="post-reply-row">
                             <div class="post-avatar fl mr10"><img ng-src="{{journal.user.img_url}}" width="30" height="30" class="border-radius img-circle" /></div>
                             <div class="post-reply-author hidden fl">
-                                {{journal.user.realname}}
+                                {{journal.user.real_name}}
                             </div>
                             <div class="post-reply-time fr f12">{{journal.lasted_comment}}</div>
                             <div class="cl"></div>
@@ -47,7 +48,7 @@
                                 <div ng-click="showMoreReply(1,journal)" ng-show="journal.parents_reply_top.length + journal.parents_reply_bottom.length < journal.parents_count" class="mult-reply-hide"><span class="mult-reply-arrow" >&darr; </span><span class="mult-reply-arrow" style="display:none;" > &uarr;</span>点击展开更多楼层</div>
                                 <div class="mt10" ng-repeat="reply_bottom in journal.parents_reply_bottom">
                                     <div class="post-reply-author hidden fl ng-binding">
-                                        {{reply_bottom.user.realname}}
+                                        {{reply_bottom.user.real_name}}
                                     </div>
                                     <div class="post-reply-time fr f12">{{reply_bottom.lasted_comment}}</div>
                                     <div class="cl"></div>
diff --git a/public/assets/wechat/course_notice.html b/public/assets/wechat/course_notice.html
index b2771100b..95eeda60b 100644
--- a/public/assets/wechat/course_notice.html
+++ b/public/assets/wechat/course_notice.html
@@ -4,10 +4,11 @@
 <div ng-if="news.act_type == 'News'">
     <div class="post-container">
         <div class="post-wrapper" style="margin-top:0;">
+            <div ng-show="is_public == 0 || is_public == false" class="tac f16 fb c-black" style="padding-top:10px;">私有内容，请谨慎传播</div>
             <div class="post-main">
                 <div class="post-avatar fl mr10"><img ng-src="{{news.author.img_url}}" width="30" height="30" class="border-radius img-circle" /></div>
                 <div class="post-dynamic-author hidden fl">
-                    {{news.author.realname}}
+                    {{news.author.real_name}}
                     <img ng-if="news.author.gender == '0'" src="images/wechat/male.png" width="14" class="ml5" />
                     <img ng-if="news.author.gender != '0'" src="images/wechat/female.png" width="14" class="ml5" />
                 </div>
@@ -22,20 +23,20 @@
                         <div ng-if="news.praise_count && !news.has_praise" ng-click="addPraise(news);"><img src="/images/wechat/w_praise.png" width="20" style="vertical-align:top; margin-top:2px;" class="mr5" /><span>{{news.praise_count}}</span></div>
                         <div ng-if="news.has_praise" ng-click="decreasePraise(news);"><img src="/images/wechat/w_praised.png" width="20" style="vertical-align:top; margin-top:2px;" class="mr5" /><span>{{news.praise_count}}</span></div>
                     </div>
-                    <div class="fr mr25 f13">
+                    <div class="fr mr25 f13" input-focus>
                         <a ng-if="!news.comment_count"><img src="/images/wechat/w_reply.png" width="20" style="vertical-align:top; margin-top:2px;" class="mr5" /><span style="vertical-align:top;">回复</span></a>
                         <a ng-if="news.comment_count"><img src="/images/wechat/w_reply.png" width="20" style="vertical-align:top; margin-top:2px;" class="mr5" /><span style="vertical-align:top;">{{news.comment_count}}</span></a>
                     </div>
                     <div class="cl"></div>
                 </div>
             </div>
-            <div class="mb50" id="all_news_reply">
+            <div class="mb50" id="all_news_reply" at-delete-link>
                 <div ng-if="news.comments == ''" style="border-top:1px solid #ccc;"></div>
                 <div class="post-reply-wrap" ng-repeat="comments in news.comments">
                     <div class="post-reply-row">
                         <div class="post-avatar fl mr10"><img ng-src="{{comments.author.img_url}}" width="30" height="30" class="border-radius img-circle" /></div>
                         <div class="post-reply-author hidden fl">
-                            {{comments.author.realname}}
+                            {{comments.author.real_name}}
                         </div>
                         <div class="post-reply-time fr f12">{{comments.created_on}}</div>
                         <div class="cl"></div>
diff --git a/public/assets/wechat/edit_class_member.html b/public/assets/wechat/edit_class_member.html
index 2a15af150..f27ab76cb 100644
--- a/public/assets/wechat/edit_class_member.html
+++ b/public/assets/wechat/edit_class_member.html
@@ -2,12 +2,12 @@
     <div loading-spinner></div>
     <div ng-show="current_edit_member"  class="post-container" style="padding-bottom:50px;">
         <div class="blue-title">角色变更</div>
-        <div class="class-detail-row f13 c-grey3"><img ng-src="/images/wechat/{{current_edit_member.user.gender==0 ? 'male' : 'female'}}.jpg" width="30" class="fl ml10 img-circle mt4" /><span class="fl mt10 ml10">{{current_edit_member.user.realname == "" ? current_edit_member.user.name : current_edit_member.user.realname}}</span><img ng-src="/images/wechat/{{current_edit_member.user.gender==0 ? 'male' : 'female'}}.png" width="15" class="fl ml10 mt10" /><div class="cl"></div> </div>
+        <div class="class-detail-row f13 c-grey3"><img ng-src="{{current_edit_member.user.img_url}}" width="30" class="fl ml10 img-circle mt4" /><span class="fl mt10 ml10">{{current_edit_member.user.realname == "" ? current_edit_member.user.name : current_edit_member.user.realname}}</span><img ng-src="/images/wechat/{{current_edit_member.user.gender==0 ? 'male' : 'female'}}.png" width="15" class="fl ml10 mt10" /><div class="cl"></div> </div>
         <div class="course-list-row f13 c-grey3 mt10"><span class="fl ml10">角色</span></div>
         <ul class="class-list f13 c-grey3">
-            <li><span class="fl ml10 class-list-name hidden">教师</span><span ng-click="selectRole(9)" ng-class="['login-box', 'fr', 'mr10', 'mt12','img-circle', {'checked': current_edit_member.roles_id == 9}]"></span></li>
-            <li><span class="fl ml10 class-list-name hidden">教辅</span><span ng-click="selectRole(7)" ng-class="['login-box', 'fr', 'mr10', 'mt12','img-circle', {'checked': current_edit_member.roles_id == 7}]"></span></li>
-            <li class="border-bottom-none"><span class="fl ml10 class-list-name hidden">学生</span><span ng-click="selectRole(10)" ng-class="['login-box', 'fr', 'mr10', 'mt12','img-circle', {'checked': current_edit_member.roles_id == 10}]"></span></li>
+            <li><span class="fl ml10 class-list-name hidden">教师</span><span ng-click="selectRole(9)" ng-class="['login-box', 'fr', 'mr10', 'mt12', {'bg-grey':assistant,'checked': teacher}]"></span></li>
+            <li><span class="fl ml10 class-list-name hidden">助教</span><span ng-click="selectRole(7)" ng-class="['login-box', 'fr', 'mr10', 'mt12', {'bg-grey':teacher, 'checked': assistant}]"></span></li>
+            <li class="border-bottom-none"><span class="fl ml10 class-list-name hidden">学生</span><span ng-click="selectRole(10)" ng-class="['login-box', 'fr', 'mr10', 'mt12', {'checked': student}]"></span></li>
         </ul>
         <div class="bottom-tab-wrap mt10">
             <a href="javascript:void(0);" ng-click="cancel()" class="weixin-tab c-grey border-top">取消</a>
@@ -15,7 +15,5 @@
         </div>
     </div>
 
-
-
     <my-alert message="alertService.message" title="alertService.title" visible="alertService.visible" cb="alertService.cb"></my-alert>
 </div>
diff --git a/public/assets/wechat/edit_project_member.html b/public/assets/wechat/edit_project_member.html
index 8677844b7..51294f43e 100644
--- a/public/assets/wechat/edit_project_member.html
+++ b/public/assets/wechat/edit_project_member.html
@@ -2,7 +2,7 @@
     <div loading-spinner></div>
     <div ng-show="current_edit_member"  class="post-container" style="padding-bottom:50px;">
     <div class="blue-title">角色变更</div>
-    <div class="class-detail-row f13 c-grey3"><img ng-src="/images/wechat/{{current_edit_member.user.gender==0 ? 'male' : 'female'}}.jpg" width="30" class="fl ml10 img-circle mt4" /><span class="fl mt10 ml10">{{current_edit_member.user.real_name == "" ? current_edit_member.user.name : current_edit_member.user.real_name}}</span><img ng-src="/images/wechat/{{current_edit_member.user.gender==0 ? 'male' : 'female'}}.png" width="15" class="fl ml10 mt10" /><div class="cl"></div> </div>
+    <div class="class-detail-row f13 c-grey3"><img ng-src="{{current_edit_member.user.img_url}}" width="30" class="fl ml10 img-circle mt4" /><span class="fl mt10 ml10">{{current_edit_member.user.real_name == "" ? current_edit_member.user.name : current_edit_member.user.real_name}}</span><img ng-src="/images/wechat/{{current_edit_member.user.gender==0 ? 'male' : 'female'}}.png" width="15" class="fl ml10 mt10" /><div class="cl"></div> </div>
     <div class="course-list-row f13 c-grey3 mt10"><span class="fl ml10">角色</span></div>
     <ul class="class-list f13 c-grey3">
         <li><span class="fl ml10 class-list-name hidden">管理人员</span><span ng-click="selectRole(3)" ng-class="['login-box', 'fr', 'mr10', 'mt12','img-circle', {'checked': current_edit_member.roles_id == 3}]"></span></li>
diff --git a/public/assets/wechat/homework_detail.html b/public/assets/wechat/homework_detail.html
index 599774dfc..77aa0a48d 100644
--- a/public/assets/wechat/homework_detail.html
+++ b/public/assets/wechat/homework_detail.html
@@ -4,10 +4,11 @@
 <div ng-if="homework.act_type == 'HomeworkCommon'">
     <div class="post-container">
         <div class="post-wrapper" style="margin-top:0;">
+            <div ng-show="is_public == 0" class="tac f16 fb c-black" style="padding-top:10px;">私有内容，请谨慎传播</div>
             <div class="post-main">
                 <div class="post-avatar fl mr10"><img ng-src="{{homework.author.img_url}}" width="30" height="30" class="border-radius img-circle" /></div>
                 <div class="post-dynamic-author hidden fl">
-                    {{homework.author.realname}}
+                    {{homework.author.real_name}}
                     <img ng-if="homework.author.gender == '0'" src="images/wechat/male.png" width="14" class="ml5" />
                     <img ng-if="homework.author.gender != '0'" src="images/wechat/female.png" width="14" class="ml5" />
                 </div>
@@ -27,20 +28,20 @@
                     <div ng-if="homework.praise_count && !homework.has_praise" ng-click="addPraise(homework);"><img src="/images/wechat/w_praise.png" width="20" style="vertical-align:top; margin-top:2px;" class="mr5" /><span>{{homework.praise_count}}</span></div>
                     <div ng-if="homework.has_praise" ng-click="decreasePraise(homework);"><img src="/images/wechat/w_praised.png" width="20" style="vertical-align:top; margin-top:2px;" class="mr5" /><span>{{homework.praise_count}}</span></div>
                 </div>
-                <div class="fr mr25 f13">
+                <div class="fr mr25 f13" input-focus>
                     <a ng-if="!homework.comment_count"><img src="/images/wechat/w_reply.png" width="20" style="vertical-align:top; margin-top:2px;" class="mr5" /><span style="vertical-align:top;">回复</span></a>
                     <a ng-if="homework.comment_count"><img src="/images/wechat/w_reply.png" width="20" style="vertical-align:top; margin-top:2px;" class="mr5" /><span style="vertical-align:top;">{{homework.comment_count}}</span></a>
                 </div>
                 <div class="cl"></div>
             </div>
-            <div class="mb50" id="all_homework_reply">
+            <div class="mb50" id="all_homework_reply" at-delete-link>
 
                 <div ng-if="homework.all_children == ''" style="border-top:1px solid #ccc;"></div>
                 <div class="post-reply-wrap" ng-repeat="journal in homework.all_children">
                     <div class="post-reply-row">
                         <div class="post-avatar fl mr10"><img ng-src="{{journal.user.img_url}}" width="30" height="30" class="border-radius img-circle" /></div>
                         <div class="post-reply-author hidden fl">
-                            {{journal.user.realname}}
+                            {{journal.user.real_name}}
                         </div>
                         <div class="post-reply-time fr f12">{{journal.lasted_comment}}</div>
                         <div class="cl"></div>
@@ -51,7 +52,7 @@
                             <div ng-click="showMoreReply(1,journal)" ng-show="journal.parents_reply_top.length + journal.parents_reply_bottom.length < journal.parents_count" class="mult-reply-hide"><span class="mult-reply-arrow" >&darr; </span><span class="mult-reply-arrow" style="display:none;" > &uarr;</span>点击展开更多楼层</div>
                             <div class="ml5 mr5 mt10" ng-repeat="reply_bottom in journal.parents_reply_bottom">
                                 <div class="post-reply-author hidden fl ng-binding">
-                                    {{reply_bottom.user.realname}}
+                                    {{reply_bottom.user.real_name}}
                                 </div>
                                 <div class="post-reply-time fr f12">{{reply_bottom.lasted_comment}}</div>
                                 <div class="cl"></div>
@@ -73,7 +74,7 @@
                 <div class="post-reply-row border-bottom-none">
                     <div class="post-input-container">
                         <div class="copy-input-container"><textarea class="copy-input"></textarea></div>
-                        <textarea input-auto type="text" class="post-reply-input" id="postInput1" ng-model="formData.comment" placeholder="输入回复内容~" /></textarea>
+                        <textarea input-auto type="text" class="post-reply-input" id="postInput1" ng-model="formData.comment" placeholder="{{replytip}}" /></textarea>
                         <button ng-click="addReply(formData)" ng-disabled="formData.disabled" ng-hide="formData.disabled" class="post-reply-submit fr border-radius">提交</button>
                         <button ng-disabled="formData.disabled" ng-hide="!formData.disabled" class="post-reply-submit bg-grey fr border-radius">提交</button>
                         <div class="cl"></div>
diff --git a/public/assets/wechat/invite_code.html b/public/assets/wechat/invite_code.html
index a1b225fc9..3aaa00bbe 100644
--- a/public/assets/wechat/invite_code.html
+++ b/public/assets/wechat/invite_code.html
@@ -11,6 +11,8 @@
         <p/>
         <div class="share-code-instruction"> 1.点击右上角"发送给朋友"，邀请同学加入班级<br />
             2.长按二维码，通过“识别图中二维码”功能加入班级<br />
-            3.通过“加入班级”菜单输入邀请码加入班级（长按邀请码可以复制哦~）</div>
+            3.通过“加入班级”菜单输入邀请码加入班级（长按邀请码可以复制哦~）<br/>
+            4.扫码默认以学生身份加入班级
+        </div>
     </div>
 </div>
\ No newline at end of file
diff --git a/public/assets/wechat/issue_detail.html b/public/assets/wechat/issue_detail.html
index 852103b81..14df1cfb1 100644
--- a/public/assets/wechat/issue_detail.html
+++ b/public/assets/wechat/issue_detail.html
@@ -4,11 +4,12 @@
 <div ng-if="issue.act_type == 'Issue'">
     <div class="post-container">
         <div class="post-wrapper" style="margin-top:0;">
+            <div ng-show="is_public == false" class="tac f16 fb c-black" style="padding-top:10px;">私有内容，请谨慎传播</div>
             <div class="post-main">
 
                 <div class="post-avatar fl mr10"><img ng-src="{{issue.author.img_url}}" width="30" height="30" class="border-radius img-circle" /></div>
                 <div class="post-dynamic-author hidden fl">
-                    {{issue.author.realname}}
+                    {{issue.author.real_name}}
                     <img ng-if="issue.author.gender == '0'" src="images/wechat/male.png" width="14" class="ml5" />
                     <img ng-if="issue.author.gender != '0'" src="images/wechat/female.png" width="14" class="ml5" />
                 </div>
@@ -28,20 +29,20 @@
                         <div ng-if="issue.praise_count && !issue.has_praise" ng-click="addPraise(discussion);"><img src="/images/wechat/w_praise.png" width="20" style="vertical-align:top; margin-top:2px;" class="mr5" /><span>{{issue.praise_count}}</span></div>
                         <div ng-if="issue.has_praise" ng-click="decreasePraise(issue);"><img src="/images/wechat/w_praised.png" width="20" style="vertical-align:top; margin-top:2px;" class="mr5" /><span>{{issue.praise_count}}</span></div>
                     </div>
-                    <div class="fr mr25 f13">
+                    <div class="fr mr25 f13" input-focus>
                         <a ng-if="!issue.comment_count"><img src="/images/wechat/w_reply.png" width="20" style="vertical-align:top; margin-top:2px;" class="mr5" /><span style="vertical-align:top;">回复</span></a>
                         <a ng-if="issue.comment_count"><img src="/images/wechat/w_reply.png" width="20" style="vertical-align:top; margin-top:2px;" class="mr5" /><span style="vertical-align:top;">{{issue.comment_count}}</span></a>
                     </div>
                     <div class="cl"></div>
                 </div>
             </div>
-            <div class="mb50" id="all_issue_reply">
+            <div class="mb50" id="all_issue_reply" at-delete-link>
                 <div ng-if="issue.issue_journals == ''" style="border-top:1px solid #ccc;"></div>
                 <div class="post-reply-wrap" ng-repeat="journal in issue.issue_journals">
                     <div class="post-reply-row">
                         <div class="post-avatar fl mr10"><img ng-src="{{journal.user.img_url}}" width="30" height="30" class="border-radius img-circle" /></div>
                         <div class="post-reply-author hidden fl">
-                            {{journal.user.realname}}
+                            {{journal.user.real_name}}
                         </div>
                         <div class="post-reply-time fr f12">{{journal.created_on}}</div>
                         <div class="cl"></div>
diff --git a/public/assets/wechat/join_class.html b/public/assets/wechat/join_class.html
new file mode 100644
index 000000000..b5733e584
--- /dev/null
+++ b/public/assets/wechat/join_class.html
@@ -0,0 +1,28 @@
+<div class="post-container">
+    <div loading-spinner></div>
+    <div class="post-container" style="padding-bottom:50px;">
+        <div class="blue-title">欢迎加入班级</div>
+        <div class="course-list-row f13 c-grey3 mt30"><span class="fl ml15 c-grey3">班级邀请码</span><input class="new-class-input ml25" ng-model="invite_code" required placeholder="请输入5位邀请码" /></div>
+        <div class="course-list-row f13 c-grey3 mt10"><span class="fl ml15">角色</span></div>
+        <ul class="class-list f13 c-grey3">
+            <li><span class="fl ml10 class-list-name hidden">教师</span><span ng-click="selectRole(9)" ng-class="['login-box', 'fr', 'mr10', 'mt12', {'bg-grey':assistant,'checked': teacher}]"></span></li>
+            <li><span class="fl ml10 class-list-name hidden">助教</span><span ng-click="selectRole(7)" ng-class="['login-box', 'fr', 'mr10', 'mt12', {'bg-grey':teacher, 'checked': assistant}]"></span></li>
+            <li class="border-bottom-none"><span class="fl ml10 class-list-name hidden">学生</span><span ng-click="selectRole(10)" ng-class="['login-box', 'fr', 'mr10', 'mt12', {'checked': student}]"></span></li>
+        </ul>
+
+        <div class="f12 c-grey6 mt10 ml15">
+            <span class="f13 c-grey3">提示</span>
+            <ul class="mb15 mt5 ml10 new-tip">
+                <li><span class="project-intro-dot">•</span>教师、助教角色需要班级管理员审批</li>
+                <li><span class="project-intro-dot">•</span>学生角色无需管理员审批</li>
+            </ul>
+        </div>
+
+        <div class="bottom-tab-wrap mt10">
+            <a href="javascript:void(0);" ng-click="cancel()" class="weixin-tab c-grey border-top">取消</a>
+            <a href="javascript:void(0);" ng-click="joinClass()" class="weixin-tab link-blue2 border-top">确定</a>
+        </div>
+    </div>
+
+    <my-alert message="alertService.message" title="alertService.title" visible="alertService.visible" cb="alertService.cb"></my-alert>
+</div>
diff --git a/public/assets/wechat/join_project.html b/public/assets/wechat/join_project.html
new file mode 100644
index 000000000..61be93cfd
--- /dev/null
+++ b/public/assets/wechat/join_project.html
@@ -0,0 +1,27 @@
+<div class="post-container">
+    <div loading-spinner></div>
+    <div class="post-container" style="padding-bottom:50px;">
+        <div class="blue-title">欢迎加入项目</div>
+        <div class="course-list-row f13 c-grey3 mt30"><span class="fl ml15 c-grey3">项目邀请码</span><input class="new-class-input ml25" ng-model="invite_code" required placeholder="请输入6位邀请码" /></div>
+        <div class="course-list-row f13 c-grey3 mt10"><span class="fl ml15">角色</span></div>
+        <ul class="class-list f13 c-grey3">
+            <li><span class="fl ml10 class-list-name hidden">管理人员</span><span ng-click="selectRole(3)" ng-class="['login-box', 'fr', 'mr10', 'mt12','img-circle', {'checked': role_id == 3}]"></span></li>
+            <li><span class="fl ml10 class-list-name hidden">开发人员</span><span ng-click="selectRole(4)" ng-class="['login-box', 'fr', 'mr10', 'mt12','img-circle', {'checked': role_id == 4}]"></span></li>
+            <li class="border-bottom-none"><span class="fl ml10 class-list-name hidden">报告人员</span><span ng-click="selectRole(5)" ng-class="['login-box', 'fr', 'mr10', 'mt12','img-circle', {'checked': role_id == 5}]"></span></li>
+        </ul>
+        <div class="f12 c-grey6 mt10 ml15">
+            <span class="f13 c-grey3">提示</span>
+            <ul class="mb15 mt5 ml10 new-tip">
+                <li><span class="project-intro-dot">•</span>管理人员、开发人员角色需要项目管理员审批</li>
+                <li><span class="project-intro-dot">•</span>报告人员角色无需管理员审批</li>
+            </ul>
+        </div>
+        <div class="bottom-tab-wrap mt10">
+            <a href="javascript:void(0);" ng-click="cancel()" class="weixin-tab c-grey border-top">取消</a>
+            <a href="javascript:void(0);" ng-click="join_project()" class="weixin-tab link-blue2 border-top">确定</a>
+        </div>
+    </div>
+
+
+    <my-alert message="alertService.message" title="alertService.title" visible="alertService.visible" cb="alertService.cb"></my-alert>
+</div>
diff --git a/public/assets/wechat/jour_message_detail.html b/public/assets/wechat/jour_message_detail.html
index 78760da71..b94bca8b2 100644
--- a/public/assets/wechat/jour_message_detail.html
+++ b/public/assets/wechat/jour_message_detail.html
@@ -3,11 +3,12 @@
 <div ng-if="message.act_type == 'JournalsForMessage'">
     <div class="post-container">
         <div class="post-wrapper" style="margin-top:0;">
+            <div ng-show="is_public == 0 && is_public == false" class="tac f16 fb c-black" style="padding-top:10px;">私有内容，请谨慎传播</div>
             <div class="post-main">
 
                 <div class="post-avatar fl mr10"><img ng-src="{{message.user.img_url}}" width="30" height="30" class="border-radius img-circle" /></div>
                 <div class="post-dynamic-author hidden fl">
-                    {{message.user.realname}}
+                    {{message.user.real_name}}
                     <img ng-if="message.user.gender == '0'" src="images/wechat/male.png" width="14" class="ml5" />
                     <img ng-if="message.user.gender != '0'" src="images/wechat/female.png" width="14" class="ml5" />
                 </div>
@@ -22,21 +23,21 @@
                         <div ng-if="message.praise_count && !message.has_praise" ng-click="addPraise(message);"><img src="/images/wechat/w_praise.png" width="20" style="vertical-align:top; margin-top:2px;" class="mr5" /><span>{{message.praise_count}}</span></div>
                         <div ng-if="message.has_praise" ng-click="decreasePraise(message);"><img src="/images/wechat/w_praised.png" width="20" style="vertical-align:top; margin-top:2px;" class="mr5" /><span>{{message.praise_count}}</span></div>
                     </div>
-                    <div class="fr mr25 f13">
+                    <div class="fr mr25 f13" input-focus>
                         <a ng-if="!message.comment_count"><img src="/images/wechat/w_reply.png" width="20" style="vertical-align:top; margin-top:2px;" class="mr5" /><span style="vertical-align:top;">回复</span></a>
                         <a ng-if="message.comment_count"><img src="/images/wechat/w_reply.png" width="20" style="vertical-align:top; margin-top:2px;" class="mr5" /><span style="vertical-align:top;">{{message.comment_count}}</span></a>
                     </div>
                     <div class="cl"></div>
                 </div>
             </div>
-            <div class="mb50" id="all_message_reply">
+            <div class="mb50" id="all_message_reply"  at-delete-link>
 
                 <div ng-if="message.child_reply == ''" style="border-top:1px solid #ccc;"></div>
                 <div class="post-reply-wrap" ng-repeat="journal in message.all_children">
                     <div class="post-reply-row">
                         <div class="post-avatar fl mr10"><img ng-src="{{journal.user.img_url}}" width="30" height="30" class="border-radius img-circle" /></div>
                         <div class="post-reply-author hidden fl">
-                            {{journal.user.realname}}
+                            {{journal.user.real_name}}
                         </div>
                         <div class="post-reply-time fr f12">{{journal.lasted_comment}}</div>
                         <div class="cl"></div>
@@ -46,7 +47,7 @@
                             <div ng-click="showMoreReply(1,journal)" ng-show="journal.parents_reply_top.length + journal.parents_reply_bottom.length < journal.parents_count" class="mult-reply-hide"><span class="mult-reply-arrow" >&darr; </span><span class="mult-reply-arrow" style="display:none;" > &uarr;</span>点击展开更多楼层</div>
                             <div class="mt10 ml5 mr5" ng-repeat="reply_bottom in journal.parents_reply_bottom">
                                 <div class="post-reply-author hidden fl ng-binding">
-                                    {{reply_bottom.user.realname}}
+                                    {{reply_bottom.user.real_name}}
                                 </div>
                                 <div class="post-reply-time fr f12">{{reply_bottom.lasted_comment}}</div>
                                 <div class="cl"></div>
diff --git a/public/assets/wechat/login.html b/public/assets/wechat/login.html
index 61c9b9de3..05d844ca8 100644
--- a/public/assets/wechat/login.html
+++ b/public/assets/wechat/login.html
@@ -17,7 +17,7 @@
 
     </div>
     <div class="login-wrap mt5"><a href="javascript:void(0);" ng-class="['btn1', 'bg-blue', 'f18', {'btn-disabled':!loginFrm.$valid} ]" ng-click="login(loginFrm, user)">确定绑定</a></div>
-    <div class="forget-psw-wrap"><a href="javascript:void(0);" class="f12 forget-psw" ng-click="showBox()">忘记密码？</a></div>
+    <div class="forget-psw-wrap"><a href="javascript:void(0);" class="f12 c-grey5" ng-click="showBox()">忘记密码？</a></div>
         <my-alert message="findPwdDialog.message" title="findPwdDialog.title" visible="findPwdDialog.visible"></my-alert>
     </form>
 </div>
diff --git a/public/assets/wechat/login_tip.html b/public/assets/wechat/login_tip.html
new file mode 100644
index 000000000..82bb6d906
--- /dev/null
+++ b/public/assets/wechat/login_tip.html
@@ -0,0 +1,13 @@
+<div class="post-container">
+    <div loading-spinner></div>
+
+    <div class="blue-title">提示</div>
+    <div class="ac-wrap">
+        <ul class="ac-content f13 c-grey3">
+            <li class="mt30 mb15"><span class="project-intro-dot">•</span>您的回复内容已提交</li>
+            <li class="mb15"><span class="project-intro-dot">•</span>想要实时接收动态、加入社区？<br/>长按二维码，关注公众号</li>
+            <li class="mb20" style="text-align:center;"><img src="/images/wechat/trustie_QR.jpg" width="150" class="inline-block" /></li>
+        </ul>
+    </div>
+</div>
+
diff --git a/public/assets/wechat/new_project.html b/public/assets/wechat/new_project.html
index 9ef19fad9..103651ef9 100644
--- a/public/assets/wechat/new_project.html
+++ b/public/assets/wechat/new_project.html
@@ -1,26 +1,26 @@
-<div class="post-container">
-    <div loading-spinner></div>
-
-    <div class="blue-title">新建项目</div>
-    <form novalidate name="classForm">
-        <div class="course-list-row f13 c-grey3 mt30"><span class="fl ml15 c-grey3">项目名称</span><input class="new-class-input ml25" ng-model="project.name" required placeholder="如：团队协作方法与机制研究" /></div>
-        <a ng-click="newProject(classForm, project)" ng-class="['finish-btn', {'btn-disabled':!classForm.$valid} ]" >完成</a>
+<div class="post-container">
+    <div loading-spinner></div>
+
+    <div class="blue-title">新建项目</div>
+    <form novalidate name="classForm">
+        <div class="course-list-row f13 c-grey3 mt30"><span class="fl ml15 c-grey3">项目名称</span><input class="new-class-input ml25" ng-model="project.name" required placeholder="如：团队协作方法与机制研究" /></div>
+        <a ng-click="newProject(classForm, project)" ng-class="['finish-btn', {'btn-disabled':!classForm.$valid} ]" >完成</a>
         <div class="f12 c-grey6 tac">
-            <span class="f13 fb c-grey3">项目功能特性（微信版）</span>
-            <ul class="project-intro mb15 mt5">
-                <li>创建项目、加入项目</li>
-                <li>邀请成员、修改角色</li>
-                <li>浏览、回复项目动态</li>
-                <li>点赞、分享项目动态</li>
-            </ul>
-            <span class="f13 fb c-grey3">更多项目特性（浏览器版）</span>
-            <ul class="project-intro mt5">
-                <li>发布任务、问题跟踪</li>
-                <li>代码托管、质量分析</li>
-                <li>资源分享、交流研讨</li>
-            </ul>
-        </div>
-    </form>
-
-    <my-alert message="alertService.message" title="alertService.title" visible="alertService.visible" cb="alertService.cb"></my-alert>
-</div>
+            <span class="f13 c-grey3">项目功能特性（微信版）</span>
+            <ul class="project-intro mb15 mt5">
+                <li><span class="project-intro-dot">•</span>创建项目、加入项目</li>
+                <li><span class="project-intro-dot">•</span>邀请成员、修改角色</li>
+                <li><span class="project-intro-dot">•</span>浏览、回复项目动态</li>
+                <li><span class="project-intro-dot">•</span>点赞、分享项目动态</li>
+            </ul>
+            <span class="f13 c-grey3">更多项目特性（浏览器版）</span>
+            <ul class="project-intro mt5">
+                <li><span class="project-intro-dot">•</span>发布任务、问题跟踪</li>
+                <li><span class="project-intro-dot">•</span>代码托管、质量分析</li>
+                <li><span class="project-intro-dot">•</span>资源分享、交流研讨</li>
+            </ul>
+        </div>
+    </form>
+
+    <my-alert message="alertService.message" title="alertService.title" visible="alertService.visible" cb="alertService.cb"></my-alert>
+</div>
diff --git a/public/assets/wechat/project.html b/public/assets/wechat/project.html
index 76ebc0430..733f0899d 100644
--- a/public/assets/wechat/project.html
+++ b/public/assets/wechat/project.html
@@ -5,7 +5,7 @@
         <a ng-click="tab($index+1)" ng-repeat="menu in menus" id="class_tab_1" href="javascript:void(0);" ng-class="['weixin-tab', {'class-tab-active': currentTab == $index+1}]">{{menu}}</a>
     </div>
 
-    <div ng-class="{'undis': currentTab != 1}">
+    <div ng-show="project" ng-class="{'undis': currentTab != 1}">
         <div ng-repeat="act in project_activities">
             <div ng-if="act.container_type=='Project' ">
                 <div ng-if="act.act_type=='Issue'">
@@ -15,8 +15,7 @@
                                 <div dataID = "{{act.act_id}}" ng-click="goDetail('issues',act.act_id, act.id)" id="act_{{act.id}}">
                                     <div class="post-avatar fl mr10"><img ng-src="{{replaceUrl(act.author.img_url)}}" width="30" height="30" class="border-radius img-circle" /></div>
                                     <div class="post-dynamic-author hidden fl">
-                                        <span ng-if="act.author.realname != ' '">{{act.author.realname}}</span>
-                                        <span ng-if="act.author.realname == ' '">{{act.author.nickname}}</span>
+                                        <span>{{act.author.real_name}}</span>
                                         <img ng-if="act.author.gender == '0'" src="images/wechat/male.png" width="14" class="ml5" />
                                         <img ng-if="act.author.gender != '0'" src="images/wechat/female.png" width="14" class="ml5" />
                                     </div>
@@ -30,7 +29,7 @@
                                     </div>
                                     <div class="cl"></div>
                                 </div>
-                                <div class="post-dynamic-from hidden fl c-grey3">来源: <span class="c-blue">{{act.course_project_name}}</span></div>
+
                                 <div class="fr f13">
                                     <div ng-if="!act.praise_count" ng-click="addPraise(act);"><img src="/images/wechat/w_praise.png" width="20" style="vertical-align:top; margin-top:2px;" class="mr5" /><span>赞</span></div>
                                     <div ng-if="act.praise_count && !act.has_praise" ng-click="addPraise(act);"><img src="/images/wechat/w_praise.png" width="20" style="vertical-align:top; margin-top:2px;" class="mr5" /><span>{{act.praise_count}}</span></div>
@@ -54,8 +53,7 @@
                                 <div dataID = "{{act.act_id}}" ng-click="goDetail('project_discussion',act.act_id, act.id)" id="act_{{act.id}}">
                                     <div class="post-avatar fl mr10"><img ng-src="{{replaceUrl(act.author.img_url)}}" width="30" height="30" class="border-radius img-circle" /></div>
                                     <div class="post-dynamic-author hidden fl">
-                                        <span ng-if="act.author.realname != ' '">{{act.author.realname}}</span>
-                                        <span ng-if="act.author.realname == ' '">{{act.author.nickname}}</span>
+                                        <span>{{act.author.real_name}}</span>
                                         <img ng-if="act.author.gender == '0'" src="images/wechat/male.png" width="14" class="ml5" />
                                         <img ng-if="act.author.gender != '0'" src="images/wechat/female.png" width="14" class="ml5" />
                                     </div>
@@ -67,7 +65,7 @@
                                     </div>
                                     <div class="cl"></div>
                                 </div>
-                                <div class="post-dynamic-from hidden fl c-grey3">来源: <span class="c-blue">{{act.course_project_name}}</span></div>
+
                                 <div class="fr f13">
                                     <div ng-if="!act.praise_count" ng-click="addPraise(act);"><img src="/images/wechat/w_praise.png" width="20" style="vertical-align:top; margin-top:2px;" class="mr5" /><span>赞</span></div>
                                     <div ng-if="act.praise_count && !act.has_praise" ng-click="addPraise(act);"><img src="/images/wechat/w_praise.png" width="20" style="vertical-align:top; margin-top:2px;" class="mr5" /><span>{{act.praise_count}}</span></div>
@@ -88,7 +86,7 @@
                         <div class="post-wrapper">
                             <div class="post-main">
                                 <div class="post-avatar fl mr10"><img ng-src="{{replaceUrl(act.author.img_url)}}" width="30" height="30" class="border-radius img-circle" /></div>
-                                <div class="post-title hidden mb5"><span class="c-grey3 f13 fb mr10">{{act.author.realname}}</span>创建了<span class="c-grey3 f13 fb ml10">{{act.course_project_name}} | 项目</span></div>
+                                <div class="post-title hidden mb5"><span class="c-grey3 f13 fb mr10">{{act.author.real_name}}</span>创建了<span class="c-grey3 f13 fb ml10">{{act.course_project_name}} | 项目</span></div>
                                 <div class="post-title hidden"><span class="mr10">{{act.latest_update}}</span></div>
                                 <div class="cl"></div>
                             </div>
@@ -102,7 +100,7 @@
         </div>
     </div>
 
-    <div ng-class="{'undis': currentTab != 2}">
+    <div ng-show="project" ng-class="{'undis': currentTab != 2}">
         <div class="class-search-wrap">
             <div class="class-search-inner"> <img src="/images/wechat/search.png" width="18" class="class-search-icon" />
                 <input class="class-detail-search" ng-model="searchText" placeholder="输入关键词进行搜索" />
@@ -110,19 +108,30 @@
         </div>
         <div class="member-banner f13 c-grey3">管理人员({{project_master_members.length}})</div>
         <div class="class-member-row f13 c-grey3" ng-repeat="master in project_master_members|filter:searchText">
-            <img ng-src="/images/wechat/{{master.user.gender==0 ? 'male' : 'female'}}.jpg" width="30" class="fl ml10 img-circle" /><span class="fl ml10 mt5">{{master.user.real_name == "" ? master.user.name : master.user.real_name }}</span><span class="fr mr10 c-grey2">{{teacher.role_name|identify}}</span><img ng-src="/images/wechat/{{master.user.gender==0 ? 'male' : 'female'}}.png" width="15" class="fl ml10 mt5" />
+            <img ng-src="{{master.user.img_url}}" width="30" height="30" class="fl ml10 img-circle" /><span class="fl ml10 mt5">{{master.user.real_name == "" ? master.user.name : master.user.real_name }}</span><img ng-src="/images/wechat/{{master.user.gender==0 ? 'male' : 'female'}}.png" width="15" class="fl ml10 mt5" />
             <img src="/images/wechat/setting.png" ng-show = "master.user.id != project.user_id && project.can_setting" width="15" class="class-list-setting" ng-click="onSetting(master)" />
             <div class="cl"></div>
         </div>
+        <div ng-show="project.can_setting" class="class-member-row f13 c-grey3" ng-repeat="user in review_master_members|filter:searchText">
+            <img ng-src="{{user.img_url}}" width="30" height="30" class="fl ml10 img-circle" /><span class="fl ml10 mt5">{{user.real_name == "" ? user.name : user.real_name }}</span><span class="fr mr10 c-grey2"></span><img ng-src="/images/wechat/{{user.gender==0 ? 'male' : 'female'}}.png" width="15" class="fl ml10 mt5" />
+            <span ng-click="review(user)" class = "fr mr10 mt5 c-red">待审批 ▶</span>
+            <div class="cl"></div>
+        </div>
+
         <div class="member-banner f13 mt10 c-grey3">开发人员({{project_develop_members.length}})</div>
         <div class="class-member-row f13 c-grey3" ng-repeat="develop in project_develop_members|filter:searchText">
-            <img ng-src="/images/wechat/{{develop.user.gender==0 ? 'male' : 'female'}}.jpg" width="30" class="fl ml10 img-circle" /><span class="fl ml10 mt5">{{develop.user.real_name == "" ? develop.user.name : develop.user.real_name}}</span><img ng-src="/images/wechat/{{develop.user.gender==0 ? 'male' : 'female'}}.png" width="15" class="fl ml10 mt5" />
+            <img ng-src="{{develop.user.img_url}}" width="30" height="30" class="fl ml10 img-circle" /><span class="fl ml10 mt5">{{develop.user.real_name == "" ? develop.user.name : develop.user.real_name}}</span><img ng-src="/images/wechat/{{develop.user.gender==0 ? 'male' : 'female'}}.png" width="15" class="fl ml10 mt5" />
             <img src="/images/wechat/setting.png" ng-show = "master.user.id != project.user_id && project.can_setting " width="15" class="class-list-setting" ng-click="onSetting(develop)" />
             <div class="cl"></div>
         </div>
+        <div ng-show="project.can_setting" class="class-member-row f13 c-grey3" ng-repeat="user in review_develop_members|filter:searchText">
+            <img ng-src="{{user.img_url}}" width="30" height="30" class="fl ml10 img-circle" /><span class="fl ml10 mt5">{{user.real_name == "" ? user.name : user.real_name}}</span><img ng-src="/images/wechat/{{user.gender==0 ? 'male' : 'female'}}.png" width="15" class="fl ml10 mt5" />
+            <span ng-click="review(user)" class = "fr mr10 mt5 c-red">待审批 ▶</span>
+            <div class="cl"></div>
+        </div>
         <div class="member-banner f13 mt10 c-grey3">报告人员({{project_report_members.length}})</div>
         <div class="class-member-row f13 c-grey3" ng-repeat="report in project_report_members|filter:searchText">
-            <img ng-src="/images/wechat/{{report.user.gender==0 ? 'male' : 'female'}}.jpg" width="30" class="fl ml10 img-circle" /><span class="fl ml10 mt5">{{report.user.real_name == "" ? report.user.name : report.user.real_name}}</span><img ng-src="/images/wechat/{{report.user.gender==0 ? 'male' : 'female'}}.png" width="15" class="fl ml10 mt5" />
+            <img ng-src="{{report.user.img_url}}" width="30" height="30" class="fl ml10 img-circle" /><span class="fl ml10 mt5">{{report.user.real_name == "" ? report.user.name : report.user.real_name}}</span><img ng-src="/images/wechat/{{report.user.gender==0 ? 'male' : 'female'}}.png" width="15" class="fl ml10 mt5" />
             <img src="/images/wechat/setting.png" ng-show = "master.user.id != project.user_id && project.can_setting " width="15" class="class-list-setting" ng-click="onSetting(report)" />
             <div class="cl"></div>
         </div>
diff --git a/public/assets/wechat/project_discussion.html b/public/assets/wechat/project_discussion.html
index cc3d4b1c8..fef0a2f6e 100644
--- a/public/assets/wechat/project_discussion.html
+++ b/public/assets/wechat/project_discussion.html
@@ -4,10 +4,11 @@
 <div ng-if="discussion.act_type == 'Message'">
     <div class="post-container">
         <div class="post-wrapper" style="margin-top:0;">
+            <div ng-show="is_public == false" class="tac f16 fb c-black" style="padding-top:10px;">私有内容，请谨慎传播</div>
             <div class="post-main">
                 <div class="post-avatar fl mr10"><img ng-src="{{discussion.user.img_url}}" width="30" height="30" class="border-radius img-circle" /></div>
                 <div class="post-dynamic-author hidden fl">
-                    {{discussion.user.realname}}
+                    {{discussion.user.real_name}}
                     <img ng-if="discussion.user.gender == '0'" src="images/wechat/male.png" width="14" class="ml5" />
                     <img ng-if="discussion.user.gender != '0'" src="images/wechat/female.png" width="14" class="ml5" />
                 </div>
@@ -23,7 +24,7 @@
                         <div ng-if="discussion.praise_count && !discussion.has_praise" ng-click="addPraise(discussion);"><img src="/images/wechat/w_praise.png" width="20" style="vertical-align:top; margin-top:2px;" class="mr5" /><span>{{discussion.praise_count}}</span></div>
                         <div ng-if="discussion.has_praise" ng-click="decreasePraise(discussion);"><img src="/images/wechat/w_praised.png" width="20" style="vertical-align:top; margin-top:2px;" class="mr5" /><span>{{discussion.praise_count}}</span></div>
                     </div>
-                    <div class="fr mr25 f13">
+                    <div class="fr mr25 f13" input-focus>
                         <a ng-if="!discussion.comment_count"><img src="/images/wechat/w_reply.png" width="20" style="vertical-align:top; margin-top:2px;" class="mr5" /><span style="vertical-align:top;">回复</span></a>
                         <a ng-if="discussion.comment_count"><img src="/images/wechat/w_reply.png" width="20" style="vertical-align:top; margin-top:2px;" class="mr5" /><span style="vertical-align:top;">{{discussion.comment_count}}</span></a>
                     </div>
@@ -31,13 +32,13 @@
                 </div>
             </div>
 
-            <div class="mb50" id="all_course_message_reply">
+            <div class="mb50" id="all_course_message_reply" at-delete-link>
                 <div ng-if="discussion.all_children == ''" style="border-top:1px solid #ccc;"></div>
                 <div class="post-reply-wrap" ng-repeat="journal in discussion.all_children">
                     <div class="post-reply-row">
                         <div class="post-avatar fl mr10"><img ng-src="{{journal.user.img_url}}" width="30" height="30" class="border-radius img-circle" /></div>
                         <div class="post-reply-author hidden fl">
-                            {{journal.user.realname}}
+                            {{journal.user.real_name}}
                         </div>
                         <div class="post-reply-time fr f12">{{journal.lasted_comment}}</div>
                         <div class="cl"></div>
@@ -47,7 +48,7 @@
                             <div ng-click="showMoreReply(1,journal)" ng-show="journal.parents_reply_top.length + journal.parents_reply_bottom.length < journal.parents_count" class="mult-reply-hide"><span class="mult-reply-arrow" >&darr; </span><span class="mult-reply-arrow" style="display:none;" > &uarr;</span>点击展开更多楼层</div>
                             <div class="mt10 ml5 mr5" ng-repeat="reply_bottom in journal.parents_reply_bottom">
                                 <div class="post-reply-author hidden fl ng-binding">
-                                    {{reply_bottom.user.realname}}
+                                    {{reply_bottom.user.real_name}}
                                 </div>
                                 <div class="post-reply-time fr f12">{{reply_bottom.lasted_comment}}</div>
                                 <div class="cl"></div>
diff --git a/public/assets/wechat/project_invite_code.html b/public/assets/wechat/project_invite_code.html
index a17b8fe85..7685d7aef 100644
--- a/public/assets/wechat/project_invite_code.html
+++ b/public/assets/wechat/project_invite_code.html
@@ -11,6 +11,8 @@
         <p/>
         <div class="share-code-instruction"> 1.点击右上角"发送给朋友"，邀请朋友加入项目<br />
             2.长按二维码，通过“识别图中二维码”功能加入项目<br />
-            3.通过“加入项目”菜单输入邀请码加入项目（长按邀请码可以复制哦~）</div>
+            3.通过“加入项目”菜单输入邀请码加入项目（长按邀请码可以复制哦~）<br/>
+            4.扫码默认以报告人员身份加入项目
+        </div>
     </div>
 </div>
\ No newline at end of file
diff --git a/public/assets/wechat/project_list.html b/public/assets/wechat/project_list.html
index 1d385dabf..d9313b6a7 100644
--- a/public/assets/wechat/project_list.html
+++ b/public/assets/wechat/project_list.html
@@ -7,7 +7,7 @@
         <div  ng-repeat="project in projects" style="position:relative;">
             <div ng-click="goProject(project.id)" ng-show="project.is_creator" class="course-list-row f13 c-grey3 border-top-none">
                 <span class="fl ml15 class-list-name hidden">{{project.name}}</span>
-                <span class="fr c-grey4 mr10">&gt;</span>
+                <span class="fr c-grey4 mr10 amount-arrow">&gt;</span>
                 <span class="students-amount f12 fr mt10 mr5">{{project.member_count}}人</span>
             </div>
 
@@ -20,7 +20,7 @@
         <div ng-click="goProject(project.id)"  ng-repeat="project in projects" style="position:relative;">
             <div ng-show="!project.is_creator" class="course-list-row f13 c-grey3 border-top-none">
                 <span class="fl ml15 class-list-name hidden">{{project.name}}</span>
-                <span class="fr c-grey4 mr10">&gt;</span>
+                <span class="fr c-grey4 mr10 amount-arrow">&gt;</span>
                 <span class="students-amount f12 fr mt10 mr5">{{project.member_count}}人</span>
             </div>
 
diff --git a/public/assets/wechat/reg.html b/public/assets/wechat/reg.html
index 26a17931f..f42108202 100644
--- a/public/assets/wechat/reg.html
+++ b/public/assets/wechat/reg.html
@@ -27,9 +27,10 @@
             </div>
         </div>
         <div class="input-box-wrap login-wrap mb20">
-            <input class="input-box" required ng-model="user.username" name="username" placeholder="输入用户登录名"/>
+            <input class="input-box" required ng-model="user.username" name="username" placeholder="请输入登录名（英文字母、数字和下划线）" unconfirm/>
             <div ng-show="regFrm.$submitted || regFrm.username.$touched">
-                <span class="f12 c-red fl" ng-show="regFrm.username.$error.required">用户名不能为空</span>
+                <span class="f12 c-red fl" ng-show="regFrm.username.$error.required">登录名不能为空</span>
+                <span class="f12 c-red fl" ng-show="regFrm.username.$error.unconfirm">不能以下划线开头，不能包括中文，长度不超过25个字符</span>
             </div>
         </div>
 
diff --git a/public/assets/wechat/review_class_member.html b/public/assets/wechat/review_class_member.html
new file mode 100644
index 000000000..e066c48f0
--- /dev/null
+++ b/public/assets/wechat/review_class_member.html
@@ -0,0 +1,40 @@
+<div class="post-container">
+    <div loading-spinner></div>
+    <div ng-show="current_course && current_review_member "  class="post-container" style="padding-bottom:50px;">
+        <div ng-show="status==0">
+            <div class="blue-title">{{current_course.name}}</div>
+            <div class="class-detail-row f13 c-grey3"><img ng-src="{{current_review_member.img_url}}" width="30" class="fl ml10 img-circle mt4" /><span class="fl mt10 ml10">{{current_review_member.realname == "" ? current_review_member.name : current_review_member.realname}}</span><img ng-src="/images/wechat/{{current_review_member.gender==0 ? 'male' : 'female'}}.png" width="15" class="fl ml10 mt10" /><div class="cl"></div> </div>
+            <div class="course-list-row f13 c-grey3 mt10"><span class="fl ml10">角色</span></div>
+            <ul class="class-list f13 c-grey3">
+                <li><span class="fl ml10 class-list-name hidden">教师</span><span ng-class="['login-box', 'fr', 'mr10', 'mt12', {'bg-grey':current_review_member.roles_id == 7,'checked': current_review_member.roles_id == 9}]"></span></li>
+                <li class="border-bottom-none"><span class="fl ml10 class-list-name hidden">助教</span><span ng-class="['login-box', 'fr', 'mr10', 'mt12', {'bg-grey':current_review_member.roles_id == 9, 'checked': current_review_member.roles_id == 7}]"></span></li>
+            </ul>
+            <div class="bottom-tab-wrap mt10">
+                <a href="javascript:void(0);" ng-click="deal(1)" class="weixin-tab c-grey border-top">拒绝</a>
+                <a href="javascript:void(0);" ng-click="deal(0)" class="weixin-tab link-blue2 border-top">同意</a>
+            </div>
+        </div>
+        <div ng-show="status==1 || status==2">
+            <div class="blue-title">审批结果</div>
+            <div class="f12 c-grey6" style="width:200px; margin:40px auto;"> <span class="f13 c-grey3">该申请已被处理，处理情况如下：</span>
+                <ul class="mb15 mt5 ml10 new-tip">
+                    <li><span class="project-intro-dot">•</span>申请用户： {{current_review_member.realname == "" ? current_review_member.name : current_review_member.realname}}</li>
+                    <li><span class="project-intro-dot">•</span>申请角色： {{current_review_member.roles_id == 7 ? "助教" : "教师" }}</li>
+                    <li><span class="project-intro-dot">•</span>班级名称： {{current_course.name}}</li>
+                    <li><span class="project-intro-dot">•</span>处理结果： {{status == 1 ? "同意" : "拒绝"}}</li>
+                </ul>
+            </div>
+            <div ng-click="goClassMemberList();" class="btn2 bg-blue">知道了</div>
+        </div>
+    </div>
+
+    <div ng-show="current_course && !current_review_member ">
+        <div class="blue-title">{{current_course.name}}</div>
+        <div class="tac sn-font-grey2" style="margin-top:50px;">{{tip_2}}</div>
+    </div>
+
+    <div ng-show="!current_course" class="blue-title">{{tip_1}}</div>
+
+
+    <my-alert message="alertService.message" title="alertService.title" visible="alertService.visible" cb="alertService.cb"></my-alert>
+</div>
diff --git a/public/assets/wechat/review_project_member.html b/public/assets/wechat/review_project_member.html
new file mode 100644
index 000000000..bcbbb50b6
--- /dev/null
+++ b/public/assets/wechat/review_project_member.html
@@ -0,0 +1,40 @@
+<div class="post-container">
+    <div loading-spinner></div>
+    <div ng-show="current_project && current_review_member"  class="post-container" style="padding-bottom:50px;">
+        <div ng-show="status==1">
+            <div class="blue-title">{{current_project.name}}</div>
+            <div class="class-detail-row f13 c-grey3"><img ng-src="{{current_review_member.img_url}}" width="30" class="fl ml10 img-circle mt4" /><span class="fl mt10 ml10">{{current_review_member.realname == "" ? current_review_member.name : current_review_member.realname}}</span><img ng-src="/images/wechat/{{current_review_member.gender==0 ? 'male' : 'female'}}.png" width="15" class="fl ml10 mt10" /><div class="cl"></div> </div>
+            <div class="course-list-row f13 c-grey3 mt10"><span class="fl ml10">角色</span></div>
+            <ul class="class-list f13 c-grey3">
+                <li><span class="fl ml10 class-list-name hidden">管理人员</span><span ng-class="['login-box', 'fr', 'mr10', 'mt12','img-circle',{'bg-grey':current_review_member.roles_id == 4,'checked': current_review_member.roles_id == 3}]"></span></li>
+                <li class="border-bottom-none"><span class="fl ml10 class-list-name hidden">开发人员</span><span ng-class="['login-box', 'fr', 'mr10', 'mt12','img-circle',{'bg-grey':current_review_member.roles_id == 3,'checked': current_review_member.roles_id == 4}]"></span></li>
+            </ul>
+            <div class="bottom-tab-wrap mt10">
+                <a href="javascript:void(0);" ng-click="deal(1)" class="weixin-tab c-grey border-top">拒绝</a>
+                <a href="javascript:void(0);" ng-click="deal(0)" class="weixin-tab link-blue2 border-top">同意</a>
+            </div>
+        </div>
+
+        <div ng-show="status==5 || status==7">
+            <div class="blue-title">审批结果</div>
+            <div class="f12 c-grey6" style="width:200px; margin:40px auto;"> <span class="f13 c-grey3">该申请已被处理，处理情况如下：</span>
+                <ul class="mb15 mt5 ml10 new-tip">
+                    <li><span class="project-intro-dot">•</span>申请用户： {{current_review_member.realname == "" ? current_review_member.name : current_review_member.realname}}</li>
+                    <li><span class="project-intro-dot">•</span>申请角色： {{current_review_member.roles_id == 3 ? "管理人员" : "开发人员" }}</li>
+                    <li><span class="project-intro-dot">•</span>项目名称： {{current_project.name}}</li>
+                    <li><span class="project-intro-dot">•</span>处理结果： {{status == 7 ? "同意" : "拒绝"}}</li>
+                </ul>
+            </div>
+            <div ng-click="goProjectMemberList()" class="btn2 bg-blue">知道了</div>
+        </div>
+    </div>
+
+    <div ng-show="current_project && !current_review_member ">
+        <div class="blue-title">{{current_project.name}}</div>
+        <div class="tac sn-font-grey2" style="margin-top:50px;">{{tip_2}}</div>
+    </div>
+
+    <div ng-show="!current_project" class="blue-title">{{tip_1}}</div>
+
+    <my-alert message="alertService.message" title="alertService.title" visible="alertService.visible" cb="alertService.cb"></my-alert>
+</div>
diff --git a/public/images/wechat/project.jpg b/public/images/wechat/project.jpg
new file mode 100644
index 000000000..5ac1cb67c
Binary files /dev/null and b/public/images/wechat/project.jpg differ
diff --git a/public/images/wechat/trustie_QR.jpg b/public/images/wechat/trustie_QR.jpg
new file mode 100644
index 000000000..2b0c38f8b
Binary files /dev/null and b/public/images/wechat/trustie_QR.jpg differ
diff --git a/public/images/wechat/wx_logo.jpg b/public/images/wechat/wx_logo.jpg
new file mode 100644
index 000000000..8faeef27a
Binary files /dev/null and b/public/images/wechat/wx_logo.jpg differ
diff --git a/public/javascripts/application.js b/public/javascripts/application.js
index 60e5855c2..504fea3cb 100644
--- a/public/javascripts/application.js
+++ b/public/javascripts/application.js
@@ -1493,13 +1493,69 @@ function pop_up_box(value,tWidth,tTop,tLeft){
 }
 
 // 公共弹框样式
-function pop_box_new(value, Width, Top, Left){
+function pop_box_new(value, Width, Height){
+    w = ($(window).width() - Width)/2;
+    h = ($(window).height() - Height)/2;
     $("#ajax-modal").html(value);
     showModal('ajax-modal', Width + 'px');
     $('#ajax-modal').siblings().remove();
-    $('#ajax-modal').parent().css({"top": Top+"%","left": Left+"%","transform":"translate(-50%,-50%)","padding":"0","border":"none"});
+    $('#ajax-modal').parent().css({"top": h+"px","left": w+"px","padding":"0","border":"none","position":"fixed"});
     $('#ajax-modal').css({"padding":"0","overflow":"hidden"});
+    $('#ajax-modal').parent().attr("id","popupWrap");
+
+    //拖拽
+    function Drag(id) {
+        this.div = document.getElementById(id);
+        if (this.div) {
+            this.div.style.cursor = "move";
+            this.div.style.position = "fixed";
+        }
+        this.disX = 0;
+        this.disY = 0;
+        var _this = this;
+        this.div.onmousedown = function (evt) {
+            _this.getDistance(evt);
+            document.onmousemove = function (evt) {
+                _this.setPosition(evt);
+            }
+            _this.div.onmouseup = function () {
+                _this.clearEvent();
+            }
+        }
+    }
+    Drag.prototype.getDistance = function (evt) {
+        var oEvent = evt || event;
+        this.disX = oEvent.clientX - this.div.offsetLeft;
+        this.disY = oEvent.clientY - this.div.offsetTop;
+    }
+    Drag.prototype.setPosition = function (evt) {
+        var oEvent = evt || event;
+        var l = oEvent.clientX - this.disX;
+        var t = oEvent.clientY - this.disY;
+        if (l <= 0) {
+            l = 0;
+        }
+        else if (l >= document.documentElement.clientWidth - this.div.offsetWidth) {
+            l = document.documentElement.clientWidth - this.div.offsetWidth;
+        }
+        if (t <= 0) {
+            t = 0;
+        }
+        else if (t >= document.documentElement.clientHeight - this.div.offsetHeight) {
+            t = document.documentElement.clientHeight - this.div.offsetHeight;
+        }
+        this.div.style.left = l + "px";
+        this.div.style.top = t + "px";
+    }
+    Drag.prototype.clearEvent = function () {
+        this.div.onmouseup = null;
+        document.onmousemove = null;
+    }
 
+    $(".sy_popup_con").mousedown(function(event){
+        event.stopPropagation();
+        new Drag("popupWrap");
+    });
 }
 
 // 公共提示弹框样式
@@ -1910,6 +1966,7 @@ function edit_school_name(url,id){
         url,
         {id: id ,name: $("#school_name_edit_"+id).val() },
         function (data) {
+            $("#school_name_edit_"+id).val("");
             if(data.status == 0){
                 $("#apply_title_"+data.id).show();
                 $("#school_name_edit_"+data.id).hide();
@@ -1943,6 +2000,7 @@ function edit_school_address(url,id){
         url,
         {id: id ,address: $("#school_address_edit_"+id).val() },
         function (data) {
+            $("#school_address_edit_"+data.id).val("");
             if(data.status == 0){
                 $("#apply_address_"+data.id).show();
                 $("#school_address_edit_"+data.id).hide();
diff --git a/public/javascripts/new_user.js b/public/javascripts/new_user.js
index 8db3fbc20..1013dd749 100644
--- a/public/javascripts/new_user.js
+++ b/public/javascripts/new_user.js
@@ -38,7 +38,6 @@ function edit_user_introduction(url){
 function show_more_course(url){
     $.get(
         url,
-        { page: $("#course_page_num").val() },
         function (data) {
         }
     );
@@ -48,7 +47,6 @@ function show_more_course(url){
 function show_more_project(url){
     $.get(
         url,
-        { page: $("#project_page_num").val() },
         function (data) {
 
         }
diff --git a/public/javascripts/project.js b/public/javascripts/project.js
index fa5648ffa..13ed76aa4 100644
--- a/public/javascripts/project.js
+++ b/public/javascripts/project.js
@@ -658,3 +658,23 @@ function search_tag_attachment(url,tag_name,q,course_id,sort)
     }
 
 }
+
+
+function choice_branch(name, branch, source_rev, forked_rev) {
+    switch (name) {
+        case "source_project_name" :
+            var branchOptions = source_rev;
+            break;
+        case "forked_project_name" :
+            var branchOptions = forked_rev;
+            break;
+        default:
+            var branchOptions = source_rev;
+            break;
+    }
+
+    branch.options.length = 0;
+    for (var i = 0; i < branchOptions.length; i++) {
+        branch.options[i] = new Option(branchOptions[i]);
+    }
+}
\ No newline at end of file
diff --git a/public/javascripts/syllabus.js b/public/javascripts/syllabus.js
index 24b997496..0319bd4d1 100644
--- a/public/javascripts/syllabus.js
+++ b/public/javascripts/syllabus.js
@@ -2,7 +2,6 @@
 function show_more_course(url){
     $.get(
         url,
-        { page: $("#course_page_num").val() },
         function (data) {
         }
     );
diff --git a/public/javascripts/wechat/controllers/activity.js b/public/javascripts/wechat/controllers/activity.js
index 678733a82..3f75d9e99 100644
--- a/public/javascripts/wechat/controllers/activity.js
+++ b/public/javascripts/wechat/controllers/activity.js
@@ -2,6 +2,10 @@
 app.controller('ActivityController',
     ['$anchorScroll', '$location','$scope', '$http', '$timeout', 'auth', 'rms', 'common','alertService',
     function($anchorScroll, $location,$scope, $http, $timeout, auth, rms, common, alertService){
+
+    common.checkLogin();
+
+
     $scope.replaceUrl = function(url){
         return url;
     };
@@ -142,8 +146,8 @@ app.controller('ActivityController',
         rms.save("activities",$scope.activities);
         rms.save("course_activities",$scope.course_activities);
         rms.save("project_activities",$scope.project_activities);
-        $location.path('/'+type+'/'+act_id);
-    }
+        $location.path("/"+type).search({id: act_id});
+    };
 
     $scope.addPraise = function(act){
         for(var i in $scope.activities){
diff --git a/public/javascripts/wechat/controllers/blog.js b/public/javascripts/wechat/controllers/blog.js
index 5fb61151d..21c1cf345 100644
--- a/public/javascripts/wechat/controllers/blog.js
+++ b/public/javascripts/wechat/controllers/blog.js
@@ -7,6 +7,7 @@ app.controller('BlogController',
             scope: $scope,
             type: 'blog_comments',
             replyType: 'BlogComment',
+            urlName: 'blog_comment',
             loadCallback: function(data){
                 console.log(data.data);
 
diff --git a/public/javascripts/wechat/controllers/class.js b/public/javascripts/wechat/controllers/class.js
index 490ecc033..1e03277a2 100644
--- a/public/javascripts/wechat/controllers/class.js
+++ b/public/javascripts/wechat/controllers/class.js
@@ -1,163 +1,185 @@
-app.controller('ClassController', ['$scope', 'config','$http', 'auth','$location','$routeParams','alertService','rms', function($scope, config, $http, auth, $location, $routeParams,alertService,rms){
-
-    var vm = $scope;
-    var courseid = $routeParams.id;
-    var tag = $routeParams.tag;
-
-
-    var getUsers = function(){
-        if(vm.teachers.length<=0){
-            $http.get(config.apiUrl + 'courses/teachers?token='+auth.token()+'&course_id='+courseid).then(
-                function(response) {
-                    console.log(response.data);
-                    vm.teachers = response.data.data;
-                }
-            )
-        }
-
-        if(vm.students.length<=0){
-            $http.get(config.apiUrl + 'courses/students?token='+auth.token()+'&course_id='+courseid).then(
-                function(response) {
-                    console.log(response.data);
-                    vm.students = response.data.data;
-                }
-            )
-        }
-    }
-
-    var getResources = function(){
-        if(vm.resources.length<=0){
-            $http.post(config.apiUrl + "courses/"+courseid+"/attachments",
-                {token: auth.token(), name: ''}
-            ).then(function(response){
-                vm.resources = response.data.data;
-                vm.resources_tag = true;
-            });
-        }
-    }
-
-    var getHomeworks = function(){
-        if(vm.homeworks.length <=0){
-            $http.get(config.apiUrl + "courses/homeworks/"+courseid+"?token="+auth.token()).then(function(response){
-                vm.homeworks = response.data.data;
-                console.log(response.data);
-                vm.homeworks_tag = true;
-            });
-        }
-    }
-
-    var getExercises = function(){
-        if(vm.exercises.length <=0){
-            $http.get(config.apiUrl + "courses/"+courseid+"/exercises?token="+auth.token()).then(function(response){
-                vm.exercises = response.data.data;
-                console.log(response.data);
-                vm.exercises_tag = true;
-            });
-        }
-    }
-
-
-    vm.isTeacher = false;
-    vm.currentTab = 1;
-    vm.tab = function(index){
-       vm.currentTab = index;
-       vm.searchText = '';
-
-        vm.showClassMate = false;
-        vm.showResources = false;
-        vm.showHomework = false;
-        vm.showTestcase = false;
-        vm.resources_tag = false;
-        vm.homeworks_tag = false;
-        vm.exercises_tag = false;
-
-        if(vm.isTeacher){
-            if(index == 1){ //课件
-                getResources();
-                vm.showResources = true;
-            } else if(index==2){ //作业
-                getHomeworks();
-                vm.showHomework = true;
-            } else if(index==3){ //小测验
-                getExercises();
-                vm.showTestcase = true;
-            } else if(index==4){ //学生管理
-                getUsers();
-                vm.showClassMate = true;
-            }
-
-        } else {
-            if(index == 2){
-                getUsers();
-                vm.showClassMate = true;
-            } else if(index==1){
-                getResources();
-                vm.showResources = true;
-            }
-        }
-    }
-
-    vm.course = {};
-    vm.students = [];
-    vm.teachers = [];
-    vm.resources = [];
-    vm.homeworks = [];
-    vm.exercises = [];
-
-    //发送类别 1课件 2作业 3测验
-    vm.myresource_sendIndex = rms.get('myresource_sendIndex') || 1;
-
-    vm.alertService = alertService.create();
-    
-    vm.invite = function(){
-       $location.path("/invite_code").search({id: courseid}); 
-    };
-
-    vm.sendFile = function(r,index){
-        vm.myresource_sendIndex = index;
-        rms.save('myresource_sendIndex',index);
-        $location.path("/send_class_list").search({id: r.id});
-    }
-
-    $http.get(config.apiUrl+ 'courses/'+courseid+"?token="+auth.token()).then(
-        function(response) {
-            console.log(response.data);
-
-            if (response.data.status == 0){
-                vm.course = response.data.data;
-                resetMenu(vm.course.current_user_is_teacher);
-                if(tag){
-                    vm.tab(4);
-                    tag = null;
-                }
-                else{
-                    vm.tab(1);
-                }
-            }
-            else{
-                vm.alertService.showMessage('提示', response.data.message);
-            }
-
-        }
-    );
-
-
-    var resetMenu = function(is_teacher){
-        vm.isTeacher = is_teacher;
-        if(is_teacher){
-            vm.menus = ["课件", "作业", "测验", "成员管理"];
-        } else {
-            vm.menus = ['课件', "我的同学"];
-        }
-
-    }
-
-    vm.onSetting = function(user){
-        rms.save('current_edit_member', user);
-        $location.path("/edit_class_member").search({id: courseid,user_id: user.id});
-    };
-
-
-
-
+app.controller('ClassController', ['$scope', 'config','$http', 'auth','$location','$routeParams','alertService','rms','common', function($scope, config, $http, auth, $location, $routeParams,alertService,rms,common){
+    common.checkLogin();
+
+    var vm = $scope;
+    var courseid = $routeParams.id;
+    var tag = $routeParams.tag;
+
+
+    var getUsers = function(){
+        if(vm.teachers.length<=0){
+            $http.get(config.apiUrl + 'courses/teachers?token='+auth.token()+'&course_id='+courseid).then(
+                function(response) {
+                    console.log(response.data);
+                    vm.teachers = response.data.data;
+                }
+            )
+        }
+
+        if(vm.course.is_creator){
+            if(vm.reviewers.length<=0){
+                $http.get(config.apiUrl + 'courses/reviewers?token='+auth.token()+'&course_id='+courseid).then(
+                    function(response) {
+                        console.log(response.data);
+                        vm.reviewers = response.data.data;
+                    }
+                )
+            }
+        }
+
+        if(vm.students.length<=0){
+            $http.get(config.apiUrl + 'courses/students?token='+auth.token()+'&course_id='+courseid).then(
+                function(response) {
+                    console.log(response.data);
+                    vm.students = response.data.data;
+                }
+            )
+        }
+    }
+
+    var getResources = function(){
+        if(vm.resources.length<=0){
+            $http.post(config.apiUrl + "courses/"+courseid+"/attachments",
+                {token: auth.token(), name: ''}
+            ).then(function(response){
+                vm.resources = response.data.data;
+                vm.resources_tag = true;
+            });
+        }
+    }
+
+    var getHomeworks = function(){
+        if(vm.homeworks.length <=0){
+            $http.get(config.apiUrl + "courses/homeworks/"+courseid+"?token="+auth.token()).then(function(response){
+                vm.homeworks = response.data.data;
+                console.log(response.data);
+                vm.homeworks_tag = true;
+            });
+        }
+    }
+
+    var getExercises = function(){
+        if(vm.exercises.length <=0){
+            $http.get(config.apiUrl + "courses/"+courseid+"/exercises?token="+auth.token()).then(function(response){
+                vm.exercises = response.data.data;
+                console.log(response.data);
+                vm.exercises_tag = true;
+            });
+        }
+    }
+
+
+    vm.isTeacher = false;
+    vm.currentTab = 1;
+    vm.tab = function(index){
+       vm.currentTab = index;
+       vm.searchText = '';
+
+        vm.showClassMate = false;
+        vm.showResources = false;
+        vm.showHomework = false;
+        vm.showTestcase = false;
+        vm.resources_tag = false;
+        vm.homeworks_tag = false;
+        vm.exercises_tag = false;
+
+        if(vm.isTeacher){
+            if(index == 1){ //课件
+                getResources();
+                vm.showResources = true;
+            } else if(index==2){ //作业
+                getHomeworks();
+                vm.showHomework = true;
+            } else if(index==3){ //小测验
+                getExercises();
+                vm.showTestcase = true;
+            } else if(index==4){ //学生管理
+                getUsers();
+                vm.showClassMate = true;
+            }
+
+        } else {
+            if(index == 2){
+                getUsers();
+                vm.showClassMate = true;
+            } else if(index==1){
+                getResources();
+                vm.showResources = true;
+            }
+        }
+        rms.save("tab_num",index);
+    }
+
+    vm.tabRecord = rms.get('tab_num') || 1;
+
+    vm.course = {};
+    vm.students = [];
+    vm.teachers = [];
+    vm.reviewers = [];   //待审批
+    vm.resources = [];
+    vm.homeworks = [];
+    vm.exercises = [];
+
+    //发送类别 1课件 2作业 3测验
+    vm.myresource_sendIndex = rms.get('myresource_sendIndex') || 1;
+
+    vm.alertService = alertService.create();
+    
+    vm.invite = function(){
+       $location.path("/invite_code").search({id: courseid}); 
+    };
+
+    vm.sendFile = function(r,index){
+        vm.myresource_sendIndex = index;
+        rms.save('myresource_sendIndex',index);
+        $location.path("/send_class_list").search({id: r.id});
+    }
+
+    $http.get(config.apiUrl+ 'courses/'+courseid+"?token="+auth.token()).then(
+        function(response) {
+            console.log(response.data);
+
+            if (response.data.status == 0){
+                vm.course = response.data.data;
+                resetMenu(vm.course.current_user_is_teacher,vm.tabRecord);
+                if(tag){
+                    vm.tab(4);
+                    tag = null;
+                }
+                else{
+                    vm.tab(vm.tabRecord);
+                }
+            }
+            else{
+                vm.alertService.showMessage('提示', response.data.message);
+            }
+
+        }
+    );
+
+
+    var resetMenu = function(is_teacher){
+        vm.isTeacher = is_teacher;
+        if(is_teacher){
+            vm.menus = ["课件", "作业", "测验", "成员管理"];
+        } else {
+            vm.menus = ['课件', "我的同学"];
+        }
+
+    }
+
+    vm.onSetting = function(user){
+        rms.save('current_edit_member', user);
+        $location.path("/edit_class_member").search({id: courseid,user_id: user.id});
+    };
+
+    vm.review = function(user){
+        rms.save('current_review_member', user);
+        rms.save('current_course', vm.course);
+
+        $location.path("/review_class_member").search({id: courseid,user_id: user.id});
+    }
+
+
+
 }]);
\ No newline at end of file
diff --git a/public/javascripts/wechat/controllers/class_list.js b/public/javascripts/wechat/controllers/class_list.js
index 488d1913c..cc5b12ff6 100644
--- a/public/javascripts/wechat/controllers/class_list.js
+++ b/public/javascripts/wechat/controllers/class_list.js
@@ -3,8 +3,10 @@
  */
 
 
-app.controller('ClassListController', ['$scope', 'config', 'auth', '$http', '$location', 'alertService','rms',
-    function ($scope, config, auth, $http, $location, alertService,rms) {
+app.controller('ClassListController', ['$scope', 'config', 'auth', '$http', '$location', 'alertService','rms','common',
+    function ($scope, config, auth, $http, $location, alertService,rms,common) {
+        common.checkLogin();
+
         var vm = $scope;
         vm.syllabuses = rms.get('syllabuses') || [];
 
@@ -16,6 +18,27 @@ app.controller('ClassListController', ['$scope', 'config', 'auth', '$http', '$lo
                 function (response) {
                     console.log(response.data);
                     vm.syllabuses = response.data.data;
+
+                    var show_1 = false;
+                    var show_2 = false;
+
+                    for (var i in vm.syllabuses) {
+                        if(vm.syllabuses[i].can_setting && vm.syllabuses[i].courses.length > 0 && show_1 == false ){
+                            vm.syllabuses[i].show_plus = true;
+                            show_1 = true;
+                        }
+
+                        if(!vm.syllabuses[i].can_setting && vm.syllabuses[i].courses.length > 0 && show_2 == false ){
+                            vm.syllabuses[i].show_plus = true;
+                            show_2 = true;
+                        }
+
+                        if(show_1 && show_2){
+                            break;
+                        }
+
+                    }
+
                     rms.save('syllabuses', vm.syllabuses);
                 }
             );
@@ -25,7 +48,6 @@ app.controller('ClassListController', ['$scope', 'config', 'auth', '$http', '$lo
             loadClassList();
         }
 
-
         vm.goClass = function (course_id) {
             console.log(course_id);
             $location.path("/class").search({id: course_id});
@@ -33,45 +55,49 @@ app.controller('ClassListController', ['$scope', 'config', 'auth', '$http', '$lo
 
         vm.newClass = function () {
             //先判断下权限
-            $http.post(config.apiUrl + "syllabuses/auth",{token: auth.token()} ).then(
-                function (response) {
-                    console.log(response.data);
-                    if (response.data.auth == 0) {
-                        vm.alertService_1.showMessage('提示', '非教师身份不能创建课程哦~');
-                    }
-                    else{
-                        $location.path("/new_class");
-                    }
-                }
-            );
-        }
+//            $http.post(config.apiUrl + "syllabuses/auth",{token: auth.token()} ).then(
+//                function (response) {
+//                    console.log(response.data);
+//                    if (response.data.auth == 0) {
+//                        vm.alertService_1.showMessage('提示', '非教师身份不能创建课程哦~');
+//                    }
+//                    else{
+//                        $location.path("/new_class");
+//                    }
+//                }
+//            );
+            $location.path("/new_class");
+        };
 
         vm.goResource = function () {
             $location.path("/myresource");
-        }
+        };
 
         vm.joinClass = function () {
-            vm.alertService_3.showMessage('提示', '请输入5位班级邀请码(不区分大小写)', function(){
-                if (vm.alertService_3.invite && vm.alertService_3.invite.length == 5) {
-                    $http.post(config.apiUrl + "courses/join", {
-                        token: auth.token(),
-                        invite_code: vm.alertService_3.invite
-                    }).then(function (response) {
-                        console.log(response.data);
-                        if (response.data.status != 0) {
-                            vm.alertService_1.showMessage('提示', response.data.message);
-                        } else {
-                            vm.alertService_1.showMessage('提示', '加入课程成功');
-                            vm.alertService_3.invite = "";
-                            loadClassList();
-                        }
-                    });
-                } else {
-                    if(vm.alertService_3.invite){
-                        vm.alertService_1.showMessage('提示', '邀请码格式不正确');
-                    }
-                }
-            });
+//            vm.alertService_3.showMessage('提示', '请输入5位班级邀请码(不区分大小写)', function(){
+//                if (vm.alertService_3.invite && vm.alertService_3.invite.length == 5) {
+//                    $http.post(config.apiUrl + "courses/join", {
+//                        token: auth.token(),
+//                        invite_code: vm.alertService_3.invite
+//                    }).then(function (response) {
+//                        console.log(response.data);
+//                        if (response.data.status != 0) {
+//                            vm.alertService_1.showMessage('提示', response.data.message);
+//                        } else {
+//                            vm.alertService_1.showMessage('提示', '加入课程成功');
+//                            vm.alertService_3.invite = "";
+//                            loadClassList();
+//                        }
+//                    });
+//                } else {
+//                    if(vm.alertService_3.invite){
+//                        vm.alertService_1.showMessage('提示', '邀请码格式不正确');
+//                    }
+//                }
+//            });
+
+            $location.path("/join_class").search({tag: 1});
+
         };
 
         vm.onSetting = function (syllabus) {
diff --git a/public/javascripts/wechat/controllers/course_notice.js b/public/javascripts/wechat/controllers/course_notice.js
index 77d2e6ab0..9f9ba83d6 100644
--- a/public/javascripts/wechat/controllers/course_notice.js
+++ b/public/javascripts/wechat/controllers/course_notice.js
@@ -6,8 +6,10 @@ app.controller('CourseNoticeController', ['$scope', '$http', '$routeParams', 'au
             scope: $scope,
             type: 'newss',
             replyType: 'News',
+            urlName: 'course_notice',
             loadCallback: function(data){
                 $scope.news = data.data;
+                $scope.is_public = data.is_public;
             },
             replyCallback: function(){
             }
diff --git a/public/javascripts/wechat/controllers/discussion.js b/public/javascripts/wechat/controllers/discussion.js
index 60bfb3ee3..21e842d0f 100644
--- a/public/javascripts/wechat/controllers/discussion.js
+++ b/public/javascripts/wechat/controllers/discussion.js
@@ -5,6 +5,7 @@ app.controller('DiscussionController', ['$scope', '$http', '$routeParams', 'auth
         scope: $scope,
         type: 'messages',
         replyType: 'Message',
+        urlName: 'discussion',
         loadCallback: function(data){
             console.log(data.data);
 
@@ -16,6 +17,7 @@ app.controller('DiscussionController', ['$scope', '$http', '$routeParams', 'auth
                 if (page == 0){
                     $scope.discussion = data.data;
                     $scope.page = 0;
+                    $scope.is_public = data.is_public;
                 }
                 else{
                     $scope.discussion.all_children = $scope.discussion.all_children.concat(data.data.all_children);
diff --git a/public/javascripts/wechat/controllers/edit_class.js b/public/javascripts/wechat/controllers/edit_class.js
index 0a09ce1e3..30c78e35a 100644
--- a/public/javascripts/wechat/controllers/edit_class.js
+++ b/public/javascripts/wechat/controllers/edit_class.js
@@ -1,6 +1,8 @@
 
 
-app.controller('EditClassController', ['$scope', '$http', 'auth', 'config', 'alertService','$location','$routeParams','rms', function($scope, $http, auth, config, alertService, $location,$routeParams, rms){
+app.controller('EditClassController', ['$scope', '$http', 'auth', 'config', 'alertService','$location','$routeParams','rms','common', function($scope, $http, auth, config, alertService, $location,$routeParams, rms,common){
+    common.checkLogin();
+
     var vm = $scope;
 
     vm.syllabus = rms.get('current_edit_syllobus');
diff --git a/public/javascripts/wechat/controllers/edit_class_member.js b/public/javascripts/wechat/controllers/edit_class_member.js
index cddc183c5..7b28e1f4a 100644
--- a/public/javascripts/wechat/controllers/edit_class_member.js
+++ b/public/javascripts/wechat/controllers/edit_class_member.js
@@ -1,6 +1,8 @@
 
 
-app.controller('EditClassMemberController', ['$scope', '$http', 'auth', 'config', 'alertService','$location','$routeParams','rms', function($scope, $http, auth, config, alertService, $location,$routeParams, rms){
+app.controller('EditClassMemberController', ['$scope', '$http', 'auth', 'config', 'alertService','$location','$routeParams','rms','common', function($scope, $http, auth, config, alertService, $location,$routeParams, rms,common){
+    common.checkLogin();
+
     var vm = $scope;
 
 //    vm.current_edit_member = rms.get('current_edit_member');
@@ -10,6 +12,16 @@ app.controller('EditClassMemberController', ['$scope', '$http', 'auth', 'config'
 
     var course_id = $routeParams.id;
     var user_id = $routeParams.user_id;
+
+    vm.teacher = false;         //教师
+    vm.assistant = false;       //教辅
+    vm.student = false;         //学生.
+
+    vm.tmpteacher = false;         //教师
+    vm.tmpassistant = false;       //教辅
+    vm.tmpstudent = false;         //学生
+
+
     if(!vm.current_edit_member){
         $http.post(config.apiUrl+'courses/get_member_info', {
             token: auth.token(),
@@ -19,54 +31,81 @@ app.controller('EditClassMemberController', ['$scope', '$http', 'auth', 'config'
             if(response.data.status!=0){
                 vm.alertService.showMessage('提示', response.data.message);
             } else {
+                console.log(response);
                 course_id = response.data.course_id;
                 user_id = response.data.user_id;
                 vm.current_edit_member = response.data.member_info;
                 vm.current_roles_id = vm.current_edit_member.roles_id;
+
+                for(var i in vm.current_roles_id){
+                    if(vm.current_roles_id[i] == 9){
+                        vm.teacher = true;
+                        vm.tmpteacher = true;
+                    }
+                    else if(vm.current_roles_id[i] == 7){
+                        vm.assistant = true;
+                        vm.tmpassistant = true;
+                    }
+                    else if(vm.current_roles_id[i] == 10){
+                        vm.student = true;
+                        vm.tmpstudent = true;
+                    }
+                }
             }
         });
     }
 
-    console.log(vm.current_edit_member);
-
     vm.cancel = function(){
-        vm.alertService.showMessage('提示', '您确定不对角色进行变更吗？', function(){
-//            rms.save("project_master_members",[]);
-//            rms.save("project_develop_members",[]);
-//            rms.save("project_report_members",[]);
-            window.history.back();
-//                $location.path("/project").search({id: project_id});
-        });
+//        vm.alertService.showMessage('提示', '您确定不对角色进行变更吗？', function(){
+//            window.history.back();
+//        });
+        window.history.back();
     };
 
     vm.edit_member_role = function(){
-        if(vm.current_roles_id == vm.current_edit_member.roles_id){
+        if((vm.teacher == vm.tmpteacher)&& (vm.assistant == vm.tmpassistant)&&(vm.student == vm.tmpstudent)){
             vm.alertService.showMessage('提示', "该用户当前已是该角色");
             return;
         }
 
+        if((vm.teacher == false)&& (vm.assistant == false)&&(vm.student == false)){
+            vm.alertService.showMessage('提示', "请至少选择一种角色");
+            return;
+        }
+
         $http.post(config.apiUrl+'courses/edit_member_role', {
             token: auth.token(),
             id: course_id,
             user_id:vm.current_edit_member.user.id,
-            role_id:vm.current_edit_member.roles_id
+            teacher_flag:vm.teacher,
+            assistant_flag:vm.assistant,
+            student_flag:vm.student
         }).then(function(response){
             if(response.data.status!=0){
                 vm.alertService.showMessage('提示', response.data.message);
             } else {
                 vm.alertService.showMessage('提示', '修改角色成功', function(){
 //                    window.history.back();
-
                     $location.path("/class").search({id: course_id,tag:1});
                 });
             }
         });
-
-
     };
 
     vm.selectRole = function(role_id){
-        vm.current_edit_member.roles_id = role_id;
+        if (role_id == 7){
+            if(!vm.teacher){
+                vm.assistant = !vm.assistant;
+            }
+        }
+        else if (role_id == 9){
+            if(!vm.assistant){
+                vm.teacher = !vm.teacher;
+            }
+        }
+        else if (role_id == 10){
+            vm.student = !vm.student;
+        }
     }
 
 }] );
\ No newline at end of file
diff --git a/public/javascripts/wechat/controllers/edit_project_member.js b/public/javascripts/wechat/controllers/edit_project_member.js
index 1063c0b13..d5b8788d8 100644
--- a/public/javascripts/wechat/controllers/edit_project_member.js
+++ b/public/javascripts/wechat/controllers/edit_project_member.js
@@ -1,6 +1,8 @@
 
 
-app.controller('EditProjectMemberController', ['$scope', '$http', 'auth', 'config', 'alertService','$location','$routeParams','rms', function($scope, $http, auth, config, alertService, $location,$routeParams, rms){
+app.controller('EditProjectMemberController', ['$scope', '$http', 'auth', 'config', 'alertService','$location','$routeParams','rms','common', function($scope, $http, auth, config, alertService, $location,$routeParams, rms,common){
+    common.checkLogin();
+
     var vm = $scope;
 
 //    vm.current_edit_member = rms.get('current_edit_member');
@@ -23,6 +25,7 @@ app.controller('EditProjectMemberController', ['$scope', '$http', 'auth', 'confi
                 project_id = response.data.project_id;
                 user_id = response.data.user_id;
                 vm.current_edit_member = response.data.member_info;
+                vm.current_edit_member.roles_id = vm.current_edit_member.roles_id[0];
                 vm.current_roles_id = vm.current_edit_member.roles_id;
             }
         });
@@ -31,13 +34,10 @@ app.controller('EditProjectMemberController', ['$scope', '$http', 'auth', 'confi
     console.log(vm.current_edit_member);
 
     vm.cancel = function(){
-        vm.alertService.showMessage('提示', '您确定不对角色进行变更吗？', function(){
-//            rms.save("project_master_members",[]);
-//            rms.save("project_develop_members",[]);
-//            rms.save("project_report_members",[]);
-            window.history.back();
-//                $location.path("/project").search({id: project_id});
-        });
+//        vm.alertService.showMessage('提示', '您确定不对角色进行变更吗？', function(){
+//            window.history.back();
+//        });
+        window.history.back();
     };
 
     vm.edit_member_role = function(){
@@ -63,6 +63,8 @@ app.controller('EditProjectMemberController', ['$scope', '$http', 'auth', 'confi
                     rms.save("project_master_members",[]);
                     rms.save("project_develop_members",[]);
                     rms.save("project_report_members",[]);
+                    rms.save("review_master_members",[]);
+                    rms.save("review_develop_members",[]);
                     rms.save('tab_num',null);
 //                    window.history.back();
                     $location.path("/project").search({id: project_id,tag:1});
@@ -70,7 +72,6 @@ app.controller('EditProjectMemberController', ['$scope', '$http', 'auth', 'confi
             }
         });
 
-
     };
 
     vm.selectRole = function(role_id){
diff --git a/public/javascripts/wechat/controllers/homework.js b/public/javascripts/wechat/controllers/homework.js
index 2898fc27f..f61f2be1d 100644
--- a/public/javascripts/wechat/controllers/homework.js
+++ b/public/javascripts/wechat/controllers/homework.js
@@ -5,6 +5,7 @@ app.controller('HomeworkController', ['$scope', '$http', '$routeParams', 'auth',
         scope: $scope,
         type: 'whomeworks',
         replyType: 'HomeworkCommon',
+        urlName: 'homework',
         loadCallback: function(data){
             console.log(data.data);
 
@@ -16,6 +17,7 @@ app.controller('HomeworkController', ['$scope', '$http', '$routeParams', 'auth',
                 if (page == 0){
                     $scope.homework = data.data;
                     $scope.page = 0;
+                    $scope.is_public = data.is_public;
                 }
                 else{
                     $scope.homework.all_children = $scope.homework.all_children.concat(data.data.all_children);
diff --git a/public/javascripts/wechat/controllers/invite_code.js b/public/javascripts/wechat/controllers/invite_code.js
index ca69e308c..50c14c0c3 100644
--- a/public/javascripts/wechat/controllers/invite_code.js
+++ b/public/javascripts/wechat/controllers/invite_code.js
@@ -3,7 +3,7 @@
  */
 
 
-app.controller('InviteCodeController', ['$scope','$http', '$routeParams','config','auth', function($scope, $http, $routeParams, config, auth){
+app.controller('InviteCodeController', ['$scope','$http', '$routeParams','config','auth','wx','common', function($scope, $http, $routeParams, config, auth, wx,common){
     var vm = $scope;
 
     vm.course = {};
@@ -12,6 +12,43 @@ app.controller('InviteCodeController', ['$scope','$http', '$routeParams','config
         function(response){
             console.log(response.data);
             vm.course = response.data.data;
+
+            var desc = "您的好友邀请您加入班级：【"+vm.course.name+"】，和小伙伴一起踏上便捷的学习之旅吧！";
+            var link = "https://open.weixin.qq.com/connect/oauth2/authorize?appid="+window.g_appid+
+                "&redirect_uri="+window.g_localhost+"/wechat/user_activities?id="+vm.course.id+
+                "&response_type=code&scope=snsapi_base&state=invite_code&connect_redirect=1#wechat_redirect";
+
+            common.wxConfig("",desc,"",link);
+
+//            wx.ready(function(){
+//                wx.onMenuShareTimeline({
+//                    title: 'Trustie创新实践平台', // 分享标题
+////                    link: 'http://www.trustie.net/', // 分享链接
+//                    imgUrl: 'http://www.trustie.net/images/logo2.png', // 分享图标
+//                    success: function () {
+//                        console.log("share successed.");
+//                    },
+//                    cancel: function () {
+//                        console.log("share canceled.");
+//                    }
+//                });
+//
+//                wx.onMenuShareAppMessage({
+//                    title: 'Trustie创新实践平台', // 分享标题
+//                    desc: desc, // 分享描述
+////                    link: '', // 分享链接
+////                    imgUrl: '', // 分享图标
+//                    imgUrl: 'http://www.trustie.net/images/logo2.png', // 分享图标
+////                    type: '', // 分享类型,music、video或link，不填默认为link
+////                    dataUrl: '', // 如果type是music或video，则要提供数据链接，默认为空
+//                    success: function () {
+//                        // 用户确认分享后执行的回调函数
+//                    },
+//                    cancel: function () {
+//                        // 用户取消分享后执行的回调函数
+//                    }
+//                });
+//            });
         }
     );
 
diff --git a/public/javascripts/wechat/controllers/issue.js b/public/javascripts/wechat/controllers/issue.js
index ae0cc4450..131fab6f6 100644
--- a/public/javascripts/wechat/controllers/issue.js
+++ b/public/javascripts/wechat/controllers/issue.js
@@ -5,9 +5,11 @@ app.controller('IssueController', ['$scope', '$http', '$routeParams', 'auth', 'c
         scope: $scope,
         type: 'issues',
         replyType: 'Issue',
+        urlName: 'issues',
         loadCallback: function(data){
             console.log(data);
             $scope.issue = data.data;
+            $scope.is_public = data.is_public;
         },
         replyCallback: function(){
         }
diff --git a/public/javascripts/wechat/controllers/join_class.js b/public/javascripts/wechat/controllers/join_class.js
new file mode 100644
index 000000000..3992a8ae3
--- /dev/null
+++ b/public/javascripts/wechat/controllers/join_class.js
@@ -0,0 +1,82 @@
+
+
+app.controller('JoinClassController', ['$scope', '$http', 'auth', 'config', 'alertService','$location','$routeParams','rms','wx','common', function($scope, $http, auth, config, alertService, $location,$routeParams, rms,wx,common){
+    common.checkLogin();
+
+    var vm = $scope;
+
+//    vm.current_edit_member = rms.get('current_edit_member');
+    vm.current_edit_member = null;
+    var tag = $routeParams.tag;
+
+    vm.alertService = alertService.create();
+
+    vm.invite_code = "";
+    vm.teacher = false;         //教师
+    vm.assistant = false;       //教辅
+    vm.student = false;         //学生.
+
+    vm.cancel = function(){
+//        vm.alertService.showMessage('提示', '您确定不对角色进行变更吗？', function(){
+//            window.history.back();
+//        });
+        if(tag){
+            window.history.back();
+        }
+        else{
+            wx.closeWindow();
+        }
+
+    };
+
+    vm.joinClass = function(){
+        if((vm.teacher == false)&& (vm.assistant == false)&&(vm.student == false)){
+            vm.alertService.showMessage('提示', "请至少选择一个角色");
+            return;
+        }
+
+        if(vm.invite_code.length == 0)
+        {
+            vm.alertService.showMessage('提示', '请输入5位邀请码');
+            return;
+        }
+        if(vm.invite_code.length != 5)
+        {
+            vm.alertService.showMessage('提示', '邀请码格式不正确');
+            return;
+        }
+
+        $http.post(config.apiUrl+'courses/join_class', {
+            token: auth.token(),
+            invite_code: vm.invite_code,
+            teacher_flag:vm.teacher,
+            assistant_flag:vm.assistant,
+            student_flag:vm.student
+        }).then(function(response){
+            if(response.data.status == 0){
+                vm.alertService.showMessage('提示', response.data.message,function(){
+                    $location.path("/class_list");
+                });
+            } else {
+                vm.alertService.showMessage('提示', response.data.message);
+            }
+        });
+    };
+
+    vm.selectRole = function(role_id){
+        if (role_id == 7){
+            if(!vm.teacher){
+                vm.assistant = !vm.assistant;
+            }
+        }
+        else if (role_id == 9){
+            if(!vm.assistant){
+                vm.teacher = !vm.teacher;
+            }
+        }
+        else if (role_id == 10){
+            vm.student = !vm.student;
+        }
+    }
+
+}] );
\ No newline at end of file
diff --git a/public/javascripts/wechat/controllers/join_project.js b/public/javascripts/wechat/controllers/join_project.js
new file mode 100644
index 000000000..915277d3b
--- /dev/null
+++ b/public/javascripts/wechat/controllers/join_project.js
@@ -0,0 +1,62 @@
+
+
+app.controller('JoinProjectController', ['$scope', '$http', 'auth', 'config', 'alertService','$location','$routeParams','rms','wx','common', function($scope, $http, auth, config, alertService, $location,$routeParams, rms,wx,common){
+    common.checkLogin();
+
+    var vm = $scope;
+
+//    vm.current_edit_member = rms.get('current_edit_member');
+
+
+    vm.role_id = 0;
+    vm.alertService = alertService.create();
+    vm.invite_code = "";
+    var tag = $routeParams.tag;
+
+    vm.cancel = function(){
+        if(tag){
+            window.history.back();
+        }
+        else{
+            wx.closeWindow();
+        }
+    };
+
+    vm.join_project = function(){
+        if(vm.role_id == 0){
+            vm.alertService.showMessage('提示', "请至少选择一个角色");
+            return;
+        }
+
+        if(vm.invite_code.length == 0)
+        {
+            vm.alertService.showMessage('提示', '请输入6位邀请码');
+            return;
+        }
+        if(vm.invite_code.length != 6)
+        {
+            vm.alertService.showMessage('提示', '邀请码格式不正确');
+            return;
+        }
+
+
+        $http.post(config.apiUrl+'projects/join_project', {
+            token: auth.token(),
+            invite_code: vm.invite_code,
+            role_id:vm.role_id
+        }).then(function(response){
+            if(response.data.status == 0){
+                vm.alertService.showMessage('提示', response.data.message,function(){
+                    $location.path("/project_list");
+                });
+            } else {
+                vm.alertService.showMessage('提示', response.data.message);
+            }
+        });
+    };
+
+    vm.selectRole = function(role_id){
+        vm.role_id = role_id;
+    }
+
+}] );
\ No newline at end of file
diff --git a/public/javascripts/wechat/controllers/journals.js b/public/javascripts/wechat/controllers/journals.js
index 23f3b908b..0570e695f 100644
--- a/public/javascripts/wechat/controllers/journals.js
+++ b/public/javascripts/wechat/controllers/journals.js
@@ -4,6 +4,7 @@ app.controller('JournalsController', ['$scope', '$http', '$routeParams', 'auth',
         scope: $scope,
         type: 'journal_for_messages',
         replyType: 'JournalsForMessage',
+        urlName: 'journal_for_message',
         loadCallback: function(data){
             console.log(data.data);
 
@@ -15,6 +16,7 @@ app.controller('JournalsController', ['$scope', '$http', '$routeParams', 'auth',
                 if (page == 0){
                     $scope.message = data.data;
                     $scope.page = 0;
+                    $scope.is_public = data.is_public;
                 }
                 else{
                     $scope.message.all_children = $scope.message.all_children.concat(data.data.all_children);
diff --git a/public/javascripts/wechat/controllers/login.js b/public/javascripts/wechat/controllers/login.js
index f31dd629f..ea86a71a2 100644
--- a/public/javascripts/wechat/controllers/login.js
+++ b/public/javascripts/wechat/controllers/login.js
@@ -1,5 +1,13 @@
-app.controller('LoginController', ['$scope', '$http', '$location', '$routeParams', 'alertService', 'config','auth','session',
-    function ($scope, $http, $location, $routeParams, alertService, config, auth,session) {
+app.controller('LoginController', ['$scope', '$http', '$location', '$routeParams', 'alertService', 'config','auth','session','wx',
+    function ($scope, $http, $location, $routeParams, alertService, config, auth,session, wx) {
+
+      var tag = $routeParams.tag;
+
+      // 登录页不用显示菜音
+      wx.ready(function(){
+         wx.hideOptionMenu();
+      })
+
         if(auth.get_bind().then(function(){
                 $location.path("/activities");
          }));
@@ -33,8 +41,13 @@ app.controller('LoginController', ['$scope', '$http', '$location', '$routeParams
                     vm.loginFailed = (response.data.status != 0);
                     if (!$scope.loginFailed) { //绑定成功
                         vm.alertService.showMessage('提示', response.data.message, function(){
-//                            $location.path("/activities");
-                            window.WeixinJSBridge.call('closeWindow');
+                            if(tag){
+                                window.history.back();
+                                tag = null;
+                            }
+                            else{
+                                wx.closeWindow();
+                            }
                         });
                     } else {
                         vm.alertService.showMessage('出错了', response.data.message);
diff --git a/public/javascripts/wechat/controllers/login_tip..js b/public/javascripts/wechat/controllers/login_tip..js
new file mode 100644
index 000000000..a719abf79
--- /dev/null
+++ b/public/javascripts/wechat/controllers/login_tip..js
@@ -0,0 +1,7 @@
+app.controller('LoginTipController', ['$scope', '$http', '$location', 'alertService','$location',
+    function ($scope, $http, $location, alertService, $location) {
+        $scope.bindWx = function(){
+            $location.path("/login").search({tag:1});
+        };
+
+    }]);
\ No newline at end of file
diff --git a/public/javascripts/wechat/controllers/myresource.js b/public/javascripts/wechat/controllers/myresource.js
index b5489c065..706827b8e 100644
--- a/public/javascripts/wechat/controllers/myresource.js
+++ b/public/javascripts/wechat/controllers/myresource.js
@@ -1,4 +1,6 @@
-app.controller('MyResourceController', ['$scope', '$http', 'auth', 'config', '$location', 'rms', function($scope, $http, auth, config, $location,rms){
+app.controller('MyResourceController', ['$scope', '$http', 'auth', 'config', '$location', 'rms','common', function($scope, $http, auth, config, $location,rms,common){
+    common.checkLogin();
+
     var vm = $scope;
 //    vm.menus = ['课件', '作业', '测验'];
     vm.menus = ['课件', '作业'];
diff --git a/public/javascripts/wechat/controllers/new_class.js b/public/javascripts/wechat/controllers/new_class.js
index 5e9f339a1..0a8ea25b2 100644
--- a/public/javascripts/wechat/controllers/new_class.js
+++ b/public/javascripts/wechat/controllers/new_class.js
@@ -1,6 +1,8 @@
 
 
-app.controller('NewClassController', ['$scope', '$http', 'auth', 'config', 'alertService','$location','rms', function($scope, $http, auth, config, alertService, $location,rms){
+app.controller('NewClassController', ['$scope', '$http', 'auth', 'config', 'alertService','$location','rms','common', function($scope, $http, auth, config, alertService, $location,rms,common){
+    common.checkLogin();
+
     var vm = $scope;
 
     vm.alertService = alertService.create();
diff --git a/public/javascripts/wechat/controllers/new_project.js b/public/javascripts/wechat/controllers/new_project.js
index 6eb6a1caa..a73da1419 100644
--- a/public/javascripts/wechat/controllers/new_project.js
+++ b/public/javascripts/wechat/controllers/new_project.js
@@ -1,6 +1,8 @@
 
 
-app.controller('NewProjectController', ['$scope', '$http', 'auth', 'config', 'alertService','$location','rms', function($scope, $http, auth, config, alertService, $location,rms){
+app.controller('NewProjectController', ['$scope', '$http', 'auth', 'config', 'alertService','$location','rms','common', function($scope, $http, auth, config, alertService, $location,rms,common){
+    common.checkLogin();
+
     var vm = $scope;
 
     vm.alertService = alertService.create();
diff --git a/public/javascripts/wechat/controllers/project.js b/public/javascripts/wechat/controllers/project.js
index 0d6ca99f2..3c487eeb5 100644
--- a/public/javascripts/wechat/controllers/project.js
+++ b/public/javascripts/wechat/controllers/project.js
@@ -1,4 +1,6 @@
 app.controller('ProjectController', ['$scope', 'config','$http','$timeout', 'auth','$location','$routeParams','alertService','rms','common', function($scope, config, $http,$timeout, auth, $location, $routeParams,alertService,rms,common){
+    common.checkLogin();
+
     $scope.replaceUrl = function(url){
         return url;
     };
@@ -19,16 +21,31 @@ app.controller('ProjectController', ['$scope', 'config','$http','$timeout', 'aut
     vm.project_develop_members = rms.get("project_develop_members") || [];
     vm.project_report_members = rms.get("project_report_members") || [];
 
+//    vm.review_master_members = rms.get("review_master_members") || [];
+//    vm.review_develop_members = rms.get("review_master_members") || [];
+
+    vm.review_master_members = rms.get("review_master_members") || [];
+    vm.review_develop_members = rms.get("review_develop_members") || [];
+
 //    vm.project_members_has_more = rms.get("project_members_has_more");
 
     vm.alertService = alertService.create();
 
     //跳入邀请界面
     vm.invite = function(){
-        vm.alertService.showMessage('提示', "该功能将在近日开放，敬请期待！");
+//        vm.alertService.showMessage('提示', "该功能将在近日开放，敬请期待！");
 
+        rms.save('project_activities_page',vm.project_activities_page);
+        rms.save("project_activities",vm.project_activities);
+        rms.save("project_has_more",vm.project_has_more);
+        rms.save("project",vm.project);
+        rms.save("project_master_members",vm.project_master_members);
+        rms.save("project_develop_members",vm.project_develop_members);
+        rms.save("project_report_members",vm.project_report_members);
+        rms.save("review_master_members",vm.review_master_members);
+        rms.save("review_develop_members",vm.review_develop_members);
 
-//        $location.path("/project_invite_code").search({id: projectid});
+        $location.path("/project_invite_code").search({id: projectid});
     };
 
     //获取项目动态
@@ -82,6 +99,8 @@ app.controller('ProjectController', ['$scope', 'config','$http','$timeout', 'aut
                 vm.project_develop_members = response.data.develop_members;
                 vm.project_report_members = response.data.report_members;
 
+                vm.review_master_members = response.data.review_master_members;
+                vm.review_develop_members = response.data.review_develop_members;
             }
             else{
                 vm.alertService.showMessage('提示', response.data.message);
@@ -94,11 +113,13 @@ app.controller('ProjectController', ['$scope', 'config','$http','$timeout', 'aut
 
     //跳到详情页
     vm.goDetail = function(type, act_id,id){
-        rms.save("yoffset", document.documentElement.scrollTop);
+        rms.save("yoffset", document.documentElement.scrollTop || document.body.scrollTop);
         rms.save("project_activities",vm.project_activities);
+        rms.save('project_has_more', vm.project_has_more);
         rms.save("project",vm.project);
-        $location.path('/'+type+'/'+act_id);
-    }
+//        $location.path('/'+type+'/'+act_id);
+        $location.path("/"+type).search({id: act_id});
+    };
 
     //切换 按钮
     vm.tab = function(index){
@@ -141,9 +162,11 @@ app.controller('ProjectController', ['$scope', 'config','$http','$timeout', 'aut
                     if(tag){
                         vm.tab(2);
                         tag = null;
+                        vm.currentTab = 2;
                     }
                     else{
                         vm.tab(1);
+                        vm.currentTab = 1;
                     }
                 }
                 else{
@@ -154,8 +177,6 @@ app.controller('ProjectController', ['$scope', 'config','$http','$timeout', 'aut
                 }
             }
         );
-        vm.currentTab = 1;
-        vm.tab(vm.currentTab);
     } else {
         $timeout(function(){
             window.scrollTo(0, rms.get("yoffset"));
@@ -197,8 +218,23 @@ app.controller('ProjectController', ['$scope', 'config','$http','$timeout', 'aut
         rms.save("project_master_members",vm.project_master_members);
         rms.save("project_develop_members",vm.project_develop_members);
         rms.save("project_report_members",vm.project_report_members);
+        rms.save("review_master_members",vm.review_master_members);
+        rms.save("review_develop_members",vm.review_develop_members);
 
         $location.path("/edit_project_member").search({id: projectid,user_id: data.user.id});
     };
 
+    vm.review = function(user){
+        rms.save('current_review_member', user);
+        rms.save('current_project', vm.project);
+        rms.save("project",vm.project);
+        rms.save("project_master_members",vm.project_master_members);
+        rms.save("project_develop_members",vm.project_develop_members);
+        rms.save("project_report_members",vm.project_report_members);
+        rms.save("review_master_members",vm.review_master_members);
+        rms.save("review_develop_members",vm.review_develop_members);
+
+        $location.path("/review_project_member").search({id: projectid,user_id: user.id});
+    }
+
 }]);
\ No newline at end of file
diff --git a/public/javascripts/wechat/controllers/project_invite_code.js b/public/javascripts/wechat/controllers/project_invite_code.js
index eb3032650..a68bf430b 100644
--- a/public/javascripts/wechat/controllers/project_invite_code.js
+++ b/public/javascripts/wechat/controllers/project_invite_code.js
@@ -3,7 +3,7 @@
  */
 
 
-app.controller('ProjectInviteCodeController', ['$scope','$http', '$routeParams','config','auth', function($scope, $http, $routeParams, config, auth){
+app.controller('ProjectInviteCodeController', ['$scope','$http', '$routeParams','config','auth','wx','common', function($scope, $http, $routeParams, config, auth,wx,common){
     var vm = $scope;
 
     vm.project = {};
@@ -12,23 +12,46 @@ app.controller('ProjectInviteCodeController', ['$scope','$http', '$routeParams',
         function(response){
             console.log(response.data);
             vm.project = response.data.data;
+
+            var desc = "您的好友邀请您加入项目：【"+vm.project.name+"】，和小伙伴一起踏上便捷的研发之旅吧！";
+            var link = "https://open.weixin.qq.com/connect/oauth2/authorize?appid="+window.g_appid+
+                "&redirect_uri="+window.g_localhost+"/wechat/user_activities?id="+vm.project.id+
+                "&response_type=code&scope=snsapi_base&state=project_invite_code&connect_redirect=1#wechat_redirect";
+
+            common.wxConfig("",desc,"",link);
+
+//            wx.ready(function(){
+//                wx.onMenuShareTimeline({
+//                    title: 'Trustie创新实践平台', // 分享标题
+////                    link: 'http://www.trustie.net/', // 分享链接
+//                    imgUrl: 'http://www.trustie.net/images/logo2.png', // 分享图标
+//                    success: function () {
+//                        console.log("share successed.");
+//                    },
+//                    cancel: function () {
+//                        console.log("share canceled.");
+//                    }
+//                });
+//
+//                wx.onMenuShareAppMessage({
+//                    title: 'Trustie创新实践平台', // 分享标题
+//                    desc: desc, // 分享描述
+////                    link: '', // 分享链接
+////                    imgUrl: '', // 分享图标
+//                    imgUrl: 'http://www.trustie.net/images/logo2.png', // 分享图标
+////                    type: '', // 分享类型,music、video或link，不填默认为link
+////                    dataUrl: '', // 如果type是music或video，则要提供数据链接，默认为空
+//                    success: function () {
+//                        // 用户确认分享后执行的回调函数
+//                    },
+//                    cancel: function () {
+//                        // 用户取消分享后执行的回调函数
+//                    }
+//                });
+//            });
         }
     );
 
-    vm.share = function(){
-        window.WeixinJSBridge.invoke('sendAppMessage',{
-            'appid': 'wxf694495398c7d470', // 公众号appID
-            'type': 'link', // 非必填，music,vido或link,默认为link。
-            'data_url': '', // 非必填，连接地址,如音乐的mp3数据地址,供内置播放器使用
-            'img_url': 'http://pnewsapp.tc.qq.com/newsapp_bt/0/9963967/640', // 缩略图地址
-            'img_height':370, // 缩略图高度
-            'img_width':550, // 缩略图宽度
-            'link':'http://view.inews.qq.com/a/WXN2013101101385701', // 链接地址
-            'desc':'desc', // 描述
-            'title':'title' // 标题
-        },function(res){
-            //alert(res.err_msg);
-        });
-    }
+
 
 }]);
diff --git a/public/javascripts/wechat/controllers/project_list.js b/public/javascripts/wechat/controllers/project_list.js
index 058b7dde2..395215b25 100644
--- a/public/javascripts/wechat/controllers/project_list.js
+++ b/public/javascripts/wechat/controllers/project_list.js
@@ -3,8 +3,10 @@
  */
 
 
-app.controller('ProjectListController', ['$scope', 'config', 'auth', '$http', '$location', 'alertService','rms',
-    function ($scope, config, auth, $http, $location, alertService,rms) {
+app.controller('ProjectListController', ['$scope', 'config', 'auth', '$http', '$location', 'alertService','rms','common',
+    function ($scope, config, auth, $http, $location, alertService,rms,common) {
+        common.checkLogin();
+
         var vm = $scope;
 //        vm.projects = rms.get('projects') || [];
         vm.projects = [];
@@ -17,6 +19,10 @@ app.controller('ProjectListController', ['$scope', 'config', 'auth', '$http', '$
                 function (response) {
                     console.log(response.data);
                     vm.projects = response.data.data;
+                    
+
+
+
                     rms.save('projects', vm.projects);
                 }
             );
@@ -32,9 +38,12 @@ app.controller('ProjectListController', ['$scope', 'config', 'auth', '$http', '$
             rms.save("project_activities",[]);
             rms.save("project_has_more",false);
             rms.save("project",null);
-            rms.save('project_members_page',0);
-            rms.save("project_members",[]);
-            rms.save("project_members_has_more",false);
+            rms.save("project_master_members",[]);
+            rms.save("project_develop_members",[]);
+            rms.save("project_report_members",[]);
+            rms.save("review_master_members",[]);
+            rms.save("review_develop_members",[]);
+
             rms.save('tab_num',null);
             console.log(project_id);
             $location.path("/project").search({id: project_id});
@@ -45,7 +54,7 @@ app.controller('ProjectListController', ['$scope', 'config', 'auth', '$http', '$
         };
 
         vm.joinProject = function () {
-            vm.alertService_1.showMessage('提示', "该功能将在近日开放，敬请期待！");
+//            vm.alertService_1.showMessage('提示', "该功能将在近日开放，敬请期待！");
 
 //            vm.alertService_3.showMessage('提示', '请输入6位项目邀请码(不区分大小写)', function(){
 //                if (vm.alertService_3.invite && vm.alertService_3.invite.length == 6) {
@@ -68,6 +77,7 @@ app.controller('ProjectListController', ['$scope', 'config', 'auth', '$http', '$
 //                    }
 //                }
 //            });
+            $location.path("/join_project").search({tag: 1});
         };
 
         vm.onSetting = function (project) {
diff --git a/public/javascripts/wechat/controllers/reg.js b/public/javascripts/wechat/controllers/reg.js
index 9600e9dbf..1247cd931 100644
--- a/public/javascripts/wechat/controllers/reg.js
+++ b/public/javascripts/wechat/controllers/reg.js
@@ -1,5 +1,5 @@
-app.controller('RegController', ['$scope', '$http', '$location', 'alertService','$location',
-    function ($scope, $http, $location, alertService, $location) {
+app.controller('RegController', ['$scope', '$http', '$location', 'alertService','$location','wx',
+    function ($scope, $http, $location, alertService, $location,wx) {
 
         var vm = $scope;
         vm.errDialog = alertService.create();
@@ -35,7 +35,8 @@ app.controller('RegController', ['$scope', '$http', '$location', 'alertService',
                 } else {
                     vm.successDialog.showMessage("提示","注册且绑定微信成功", function(){
 //                        $location.path("/activities");
-                        window.WeixinJSBridge.call('closeWindow');
+//                        window.WeixinJSBridge.call('closeWindow');
+                        wx.closeWindow();
                     });
                 }
             }, function (response) {
diff --git a/public/javascripts/wechat/controllers/review_class_member.js b/public/javascripts/wechat/controllers/review_class_member.js
new file mode 100644
index 000000000..5bf8a36fd
--- /dev/null
+++ b/public/javascripts/wechat/controllers/review_class_member.js
@@ -0,0 +1,90 @@
+
+
+app.controller('ReviewClassMemberController', ['$scope', '$http', 'auth', 'config', 'alertService','$location','$routeParams','rms','common', function($scope, $http, auth, config, alertService, $location,$routeParams, rms,common){
+    common.checkLogin();
+
+    var vm = $scope;
+
+//    vm.current_edit_member = rms.get('current_edit_member');
+
+    vm.current_review_member =  rms.get('current_review_member');
+    vm.current_course = rms.get('current_course');
+
+    vm.alertService = alertService.create();
+
+    vm.tip_1 = "";
+    vm.tip_2 = "";
+
+    var course_id = $routeParams.id;
+    var user_id = $routeParams.user_id;
+    vm.status = 0;
+
+    if(!vm.current_course){
+        $http.get(config.apiUrl+ 'courses/'+course_id+"?token="+auth.token()).then(
+            function(response) {
+                console.log(response.data);
+                if (response.data.status == 0){
+                    vm.current_course = response.data.data;
+                    console.log("courses");
+                    console.log(response.data.data);
+                }
+                else{
+                    vm.alertService.showMessage('提示', response.data.message);
+                }
+                if(!vm.current_course){
+                    vm.tip_1 = "该班级不存在或已被删除";
+                }
+
+            }
+        );
+    }
+
+    if(!vm.current_review_member){
+        $http.post(config.apiUrl+'courses/review_member_info', {
+            token: auth.token(),
+            course_id: course_id,
+            user_id:user_id
+        }).then(function(response){
+            if(response.data.status==-1){
+                vm.alertService.showMessage('提示', response.data.message);
+            } else {
+                vm.current_review_member = response.data.data;
+                vm.status = response.data.status;
+                console.log("review_member_info");
+                console.log(response.data.data);
+            }
+
+            if(!vm.current_review_member){
+                vm.tip_2 = "该申请不存在";
+            }
+        });
+
+    }
+
+    vm.deal = function(result){
+        $http.post(config.apiUrl+'courses/deal_join_apply', {
+            token: auth.token(),
+            course_id: course_id,
+            user_id:user_id,
+            type:result
+        }).then(function(response) {
+            if (response.data.status == 0) {
+                vm.alertService.showMessage('提示', response.data.message, function () {
+                    $location.path("/class").search({id: course_id,tag: 1});
+                });
+            }
+            else{
+                vm.alertService.showMessage('提示', response.data.message);
+            }
+        });
+    };
+
+    vm.goClassMemberList = function(){
+        if(vm.current_course.is_member){
+            $location.path("/class").search({id: course_id,tag: 1});
+        }
+        else{
+            $location.path("/class_list");
+        }
+    };
+}] );
\ No newline at end of file
diff --git a/public/javascripts/wechat/controllers/review_project_member.js b/public/javascripts/wechat/controllers/review_project_member.js
new file mode 100644
index 000000000..2254a8340
--- /dev/null
+++ b/public/javascripts/wechat/controllers/review_project_member.js
@@ -0,0 +1,102 @@
+
+
+app.controller('ReviewProjectMemberController', ['$scope', '$http', 'auth', 'config', 'alertService','$location','$routeParams','rms','common', function($scope, $http, auth, config, alertService, $location,$routeParams, rms,common){
+    common.checkLogin();
+
+    var vm = $scope;
+
+//    vm.current_edit_member = rms.get('current_edit_member');
+
+    vm.current_review_member =  rms.get('current_review_member');
+    vm.current_project = rms.get('current_project');
+
+    vm.alertService = alertService.create();
+
+    vm.tip_1 = "";
+    vm.tip_2 = "";
+
+    var project_id = $routeParams.id;
+    var user_id = $routeParams.user_id;
+    vm.status = 1;
+
+    if(!vm.current_project){
+        $http.get(config.apiUrl+ 'projects/'+project_id+"?token="+auth.token()).then(
+            function(response) {
+                console.log(response.data);
+                if (response.data.status == 0){
+                    vm.current_project = response.data.data;
+                    console.log("projects");
+                    console.log(response.data.data);
+                }
+                else{
+                    vm.alertService.showMessage('提示', response.data.message);
+                }
+
+                if(!vm.current_project){
+                    vm.tip_1 = "该项目不存在或已被删除";
+                }
+
+            }
+        );
+    }
+
+    if(!vm.current_review_member){
+        $http.post(config.apiUrl+'projects/review_member_info', {
+            token: auth.token(),
+            project_id: project_id,
+            user_id:user_id
+        }).then(function(response){
+            if(response.data.status==-1){
+                vm.alertService.showMessage('提示', response.data.message);
+            } else {
+                vm.status = response.data.status;
+                vm.current_review_member = response.data.data;
+                console.log("review_member_info");
+                console.log(response.data.data);
+            }
+
+            if(!vm.current_review_member){
+                vm.tip_2 = "该申请不存在";
+            }
+        });
+    }
+
+    vm.deal = function(result){
+        $http.post(config.apiUrl+'projects/deal_join_apply', {
+            token: auth.token(),
+            project_id: project_id,
+            user_id:user_id,
+            type:result
+        }).then(function(response) {
+            if (response.data.status == 0) {
+                vm.alertService.showMessage('提示', response.data.message, function () {
+                    rms.save("project_master_members",[]);
+                    rms.save("project_develop_members",[]);
+                    rms.save("project_report_members",[]);
+                    rms.save("review_master_members",[]);
+                    rms.save("review_develop_members",[]);
+                    rms.save("tab_num",null);
+                    $location.path("/project").search({id: project_id,tag:1});
+                });
+            }
+            else{
+                vm.alertService.showMessage('提示', response.data.message);
+            }
+        });
+    };
+
+    vm.goProjectMemberList = function(){
+        rms.save("project_master_members",[]);
+        rms.save("project_develop_members",[]);
+        rms.save("project_report_members",[]);
+        rms.save("review_master_members",[]);
+        rms.save("review_develop_members",[]);
+        rms.save("tab_num",null);
+        if(vm.current_project.is_member){
+            $location.path("/project").search({id: project_id,tag: 1});
+        }
+        else{
+            $location.path("/project_list")
+        }
+    };
+}] );
\ No newline at end of file
diff --git a/public/javascripts/wechat/controllers/send_class_list.js b/public/javascripts/wechat/controllers/send_class_list.js
index bc81cfc08..0e7b912c6 100644
--- a/public/javascripts/wechat/controllers/send_class_list.js
+++ b/public/javascripts/wechat/controllers/send_class_list.js
@@ -1,4 +1,6 @@
-app.controller('SendClassListController', ['$scope', '$http','$routeParams', 'config','auth','alertService', 'rms', function($scope, $http, $routeParams, config, auth, alertService,rms){
+app.controller('SendClassListController', ['$scope', '$http','$routeParams', 'config','auth','alertService', 'rms','common', function($scope, $http, $routeParams, config, auth, alertService,rms,common){
+    common.checkLogin();
+
     var vm = $scope;
     var send_id = $routeParams.id;
 
diff --git a/public/javascripts/wechat/directives/at_delete_link.js b/public/javascripts/wechat/directives/at_delete_link.js
new file mode 100644
index 000000000..15190c327
--- /dev/null
+++ b/public/javascripts/wechat/directives/at_delete_link.js
@@ -0,0 +1,17 @@
+/**
+ * Created by ttang on 2016/8/10.
+ */
+app.directive('atDeleteLink',["$timeout",function(timer){
+    return{
+        restrict: 'A',
+        scope: {},
+        link: function(scope, element){
+            timer(function(){
+               $(".at a").each(function(){
+                   var atText = $(this).text();
+                   $(this).parent().html(atText);
+               });
+            })
+        }
+    }
+}]);
diff --git a/public/javascripts/wechat/directives/ellipsis.js b/public/javascripts/wechat/directives/ellipsis.js
index e5e59abf1..1bc8491b3 100644
--- a/public/javascripts/wechat/directives/ellipsis.js
+++ b/public/javascripts/wechat/directives/ellipsis.js
@@ -1,25 +1,25 @@
 /**
  * Created by Tim on 7/22/16.
  */
-//app.directive('ellipsisShow',["$timeout",function(timer){
-//    return{
-//        restrict: 'A',
-//        scope: {},
-//        link: function(scope, element){
-//            timer(function() {
-//                var textSplit = element.text().split(" ");
-//                var newContent = [];
-//                element.text("");
-//                for (var i = 0; i < textSplit.length; i++) {
-//                    newContent = newContent + " " + textSplit[i];
-//                    element.text(newContent);
-//                    if(element[0].scrollHeight >= 100){
-//                        newContent = newContent + " " + textSplit[i+1] + " " + textSplit[i+2] + " " + textSplit[i+3] + " " + textSplit[i+4] +  "...";
-//                        element.text(newContent);
-//                        break;
-//                    }
-//                }
-//            });
-//        }
-//    }
-//}]);
\ No newline at end of file
+app.directive('ellipsisShow',["$timeout",function(timer){
+    return{
+        restrict: 'A',
+        scope: {},
+        link: function(scope, element){
+            timer(function() {
+                var textSplit = element.text().split("");
+                var newContent = [];
+                element.text("");
+                for (var i = 0; i < textSplit.length; i++) {
+                    newContent = newContent + textSplit[i];
+                    element.text(newContent);
+                    if(element[0].scrollHeight >= 100){
+                        newContent = newContent + textSplit[i+1] + textSplit[i+2] + textSplit[i+3] + textSplit[i+4] + textSplit[i+5] + textSplit[i+6] + textSplit[i+7] + textSplit[i+8] + textSplit[i+9] + textSplit[i+10] +  "...";
+                        element.text(newContent);
+                        break;
+                    }
+                }
+            });
+        }
+    }
+}]);
\ No newline at end of file
diff --git a/public/javascripts/wechat/directives/form_validate.js b/public/javascripts/wechat/directives/form_validate.js
index 553560c56..7b5657428 100644
--- a/public/javascripts/wechat/directives/form_validate.js
+++ b/public/javascripts/wechat/directives/form_validate.js
@@ -7,4 +7,18 @@ app.directive('pwdconfirm', function(){
            }
        }
    }
+});
+
+app.directive('unconfirm', function(){
+    return {
+        require: 'ngModel',
+        link: function(scope, elm, attrs, ctrl){
+            ctrl.$validators.unconfirm = function(modelValue, viewValue) {
+                if(viewValue == ""){
+                    return true;
+                }
+                return (/^[a-zA-Z\d]\w{0,23}[a-zA-Z\d]{0,1}$/.test(viewValue));
+            }
+        }
+    }
 });
\ No newline at end of file
diff --git a/public/javascripts/wechat/directives/input_focus.js b/public/javascripts/wechat/directives/input_focus.js
new file mode 100644
index 000000000..38cc01ec9
--- /dev/null
+++ b/public/javascripts/wechat/directives/input_focus.js
@@ -0,0 +1,14 @@
+/**
+ * Created by ttang on 2016/8/10.
+ */
+app.directive('inputFocus',function(){
+    return{
+        restrict: 'A',
+        scope: {},
+        link: function(scope, element){
+            element.on('click',function(){
+                $("#postInput1").focus();
+            });
+        }
+    }
+});
\ No newline at end of file
diff --git a/public/javascripts/wechat/others/factory.js b/public/javascripts/wechat/others/factory.js
index 89e2b700f..1c40c9c10 100644
--- a/public/javascripts/wechat/others/factory.js
+++ b/public/javascripts/wechat/others/factory.js
@@ -1,304 +1,466 @@
-app.factory('alertService', function(){
-    function Alert(){
-        this.title = null;
-        this.message = null;
-        this.visible = null;
-        this.cb = null;
-        this.invite = "";
-    }
-
-    Alert.prototype.showMessage = function(title, msg, cb){
-        this.message = msg;
-        this.title = title;
-        this.visible = true;
-        this.cb = cb;
-        this.invite = "";
-    }
-
-    Alert.prototype.dismiss = function(){
-        this.message = null;
-        this.title = null;
-        this.visible = false;
-        this.invite = "";
-        if(this.cb) {this.cb();}
-    }
-
-    return {
-        create: function(){
-            return new Alert();
-        }
-    }
-});
-
-
-app.factory('auth', ['$http','$routeParams', '$q', 'session', 'config',function($http,$routeParams, $q, session,config){
-    //是否已经绑定
-    var isBind = function(){
-        var defer = $q.defer();
-
-        var token = getToken();
-        if(token && token.length>10){
-            defer.resolve(token);
-        } else {
-            var code = window.g_code || $routeParams.code || session.get("code");
-            $http.post(
-                '/wechat/get_bind',
-                {}  ///不用传code了,都由服务器来处理
-            ).then(function(response){
-                if(response.data.status!=0){
-                    defer.reject(response.data.message);
-                }else {
-                    session.save("token", response.data.token);
-                    defer.resolve(response.data.token);
-                }
-            }).catch(function(e){
-                defer.reject(e);
-            });
-        }
-
-        return defer.promise;
-    }
-
-    var getToken = function(){
-        return 'token';//session.get("token");
-    }
-    return {get_bind: isBind, token: getToken};
-}]);
-
-app.factory("session", function(){
-    return {
-        save: function(key,value){
-            sessionStorage.setItem(key,value);
-        },
-        get: function(key){
-            return sessionStorage.getItem(key);
-        }
-    }
-});
-
-app.factory('rms', function(){
-    var _saveStorage = {};
-    var save = function(key, value){
-        _saveStorage[key] = value;
-    };
-
-    var get = function(key){
-        return _saveStorage[key];
-    };
-
-    return {save: save, get: get};
-});
-
-app.factory('common', ['$http', 'auth', '$routeParams','rms','config', function($http, auth, $routeParams,rms,config){
-    var addCommonReply = function(id, type, data, cb){
-
-        if(!data.comment || data.comment.length<=0){
-            return;
-        }
-
-        var temp =  data.comment.replace(/\n/g,'<br/>');
-
-        var userInfo = {
-            type: type,
-            content: temp,
-            token: auth.token()
-        };
-        //回复按钮禁用
-        data.disabled = true;
-
-        $http({
-            method: 'POST',
-            url: apiUrl+ "new_comment/"+id,
-            data: userInfo
-        }).then(function successCallback(response) {
-            //alert("提交成功");
-            //数据提交完成,回复按钮启用
-            data.disabled = false;
-            if(typeof cb === 'function'){
-                cb();
-            }
-
-            //保证内外回复数一致
-            activities = rms.get("activities") || [];
-            course_activities = rms.get("course_activities") || [];
-            project_activities = rms.get("project_activities") || [];
-            for(var i in activities){
-                if(activities[i].act_id == id){
-                    activities[i].reply_count += 1;
-                    break;
-                }
-            }
-            for(var i in course_activities){
-                if(course_activities[i].act_id == id){
-                    course_activities[i].reply_count += 1;
-                    break;
-                }
-            }
-            for(var i in project_activities){
-                if(project_activities[i].act_id == id){
-                    project_activities[i].reply_count += 1;
-                    break;
-                }
-            }
-            rms.save("activities",activities);
-            rms.save("course_activities",course_activities);
-            rms.save("project_activities",project_activities);
-
-        }, function errorCallback(response) {
-        });
-    };
-
-//    var loadCommonData = function(id, type,replytype,page){
-//        return $http({
-//            method: 'GET',
-//            url: apiUrl+ type + "/" + id+"?token="+auth.token(),
-//        })
-//    };
-
-    var loadCommonData = function(id, type,replytype,page){
-        return $http({
-            method: 'POST',
-            url: apiUrl+ type + "/" + id,
-            dataType: 'jsonp',
-            data:{token:auth.token(),type:replytype,page:page}
-        })
-    };
-
-    var addCommonPraise = function(act){
-//        act.praise_count += 1;
-//        act.has_praise = true;
-
-        $http({
-            method: 'POST',
-            url: apiUrl + "praise/" + act.act_id,
-            data:{token:auth.token(),type:act.act_type}
-        }).then(function successCallback(response) {
-            console.log(response.data);
-        }, function errorCallback(response) {
-        });
-
-    };
-
-    var decreaseCommonPraise = function(act){
-//        act.praise_count -= 1;
-//        act.has_praise = false;
-        $http({
-            method: 'POST',
-            url: apiUrl + "praise/" + act.act_id,
-            data:{token:auth.token(),type:act.act_type}
-        }).then(function successCallback(response) {
-            console.log(response.data);
-        }, function errorCallback(response) {
-        });
-    };
-
-    var init = function(args){
-        args.scope.formData = {comment: ''};
-        var loadData = function(id,replytype,page){
-            loadCommonData(id, args.type,replytype,page).then(function successCallback(response) {
-                args.loadCallback(response.data);
-            }, function errorCallback(response) {
-            });
-        };
-
-        loadData(args.id,0,0);
-        args.scope.addReply = function(data){
-            console.log(data.comment);
-            addCommonReply(args.id, args.replyType, data, function(){
-                args.scope.formData = {comment: ''};
-                loadData(args.id,0,0);
-                if(typeof args.replyCallback === 'function'){
-                    args.replyCallback();
-                }
-            });
-        };
-
-//       动态详情界面点赞与动态界面的数据要同步  保证进入详情点赞后出来显示一致
-        args.scope.addPraise = function(act){
-            activities = rms.get("activities") || [];
-            course_activities = rms.get("course_activities") || [];
-            project_activities = rms.get("project_activities") || [];
-            for(var i in activities){
-                if(activities[i].act_id == act.act_id){
-                    activities[i].praise_count += 1;
-                    activities[i].has_praise = true;
-                    break;
-                }
-            }
-            for(var i in course_activities){
-                if(course_activities[i].act_id == act.act_id){
-                    course_activities[i].praise_count += 1;
-                    course_activities[i].has_praise = true;
-                    break;
-                }
-            }
-            for(var i in project_activities){
-                if(project_activities[i].act_id == act.act_id){
-                    project_activities[i].praise_count += 1;
-                    project_activities[i].has_praise = true;
-                    break;
-                }
-            }
-            rms.save("activities",activities);
-            rms.save("course_activities",course_activities);
-            rms.save("project_activities",project_activities);
-
-            act.praise_count += 1;
-            act.has_praise = true;
-            addCommonPraise(act);
-        };
-
-        args.scope.decreasePraise = function(act){
-            activities = rms.get("activities") || [];
-            course_activities = rms.get("course_activities") || [];
-            project_activities = rms.get("project_activities") || [];
-            for(var i in activities){
-                if(activities[i].act_id == act.act_id){
-                    activities[i].praise_count -= 1;
-                    activities[i].has_praise = false;
-                    break;
-                }
-            }
-            for(var i in course_activities){
-                if(course_activities[i].act_id == act.act_id){
-                    course_activities[i].praise_count -= 1;
-                    course_activities[i].has_praise = false;
-                    break;
-                }
-            }
-            for(var i in project_activities){
-                if(project_activities[i].act_id == act.act_id){
-                    project_activities[i].praise_count -= 1;
-                    project_activities[i].has_praise = false;
-                    break;
-                }
-            }
-            rms.save("activities",activities);
-            rms.save("course_activities",course_activities);
-            rms.save("project_activities",project_activities);
-
-            act.praise_count -= 1;
-            act.has_praise = false;
-            decreaseCommonPraise(act);
-        };
-
-        args.scope.showMoreReply = function(replytype,data){
-            if(!data.page){
-                data.page = 1;
-            }
-            else{
-                data.page = data.page + 1;
-            }
-
-            loadCommonData(data.id, args.type,replytype,data.page).then(function successCallback(response) {
-                args.loadCallback(response.data);
-            }, function errorCallback(response) {
-            });
-        };
-
-        args.scope.commentreply_path =  config.rootPath+ 'templates/comment_reply.html';
-
-    }
-
-    return {init: init, addCommonReply: addCommonReply, loadCommonData: loadCommonData, addCommonPraise: addCommonPraise, decreaseCommonPraise: decreaseCommonPraise};
-}]);
+app.factory('alertService', function(){
+    function Alert(){
+        this.title = null;
+        this.message = null;
+        this.visible = null;
+        this.cb = null;
+        this.invite = "";
+    }
+
+    Alert.prototype.showMessage = function(title, msg, cb){
+        this.message = msg;
+        this.title = title;
+        this.visible = true;
+        this.cb = cb;
+        this.invite = "";
+    }
+
+    Alert.prototype.dismiss = function(){
+        this.message = null;
+        this.title = null;
+        this.visible = false;
+        this.invite = "";
+        if(this.cb) {this.cb();}
+    }
+
+    return {
+        create: function(){
+            return new Alert();
+        }
+    }
+});
+
+app.factory('wx', ['$window', function($window){
+  var wechat = $window.wx;
+  return wechat;
+}]);
+
+app.factory('auth', ['$http','$routeParams', '$q', 'session', 'config',function($http,$routeParams, $q, session,config){
+    //是否已经绑定
+    var isBind = function(){
+        var defer = $q.defer();
+
+        var token = getToken();
+        if(token && token.length>10){
+            defer.resolve(token);
+        } else {
+            var code = window.g_code || $routeParams.code || session.get("code");
+            $http.post(
+                '/wechat/get_bind',
+                {}  ///不用传code了,都由服务器来处理
+            ).then(function(response){
+                if(response.data.status!=0){
+                    defer.reject(response.data.message);
+                }else {
+                    session.save("token", response.data.token);
+                    defer.resolve(response.data.token);
+                }
+            }).catch(function(e){
+                defer.reject(e);
+            });
+        }
+
+        return defer.promise;
+    }
+
+    var getToken = function(){
+        return 'token';//session.get("token");
+    }
+    return {get_bind: isBind, token: getToken};
+}]);
+
+app.factory("session", function(){
+    return {
+        save: function(key,value){
+            sessionStorage.setItem(key,value);
+        },
+        get: function(key){
+            return sessionStorage.getItem(key);
+        }
+    }
+});
+
+app.factory('rms', function(){
+    var _saveStorage = {};
+    var save = function(key, value){
+        _saveStorage[key] = value;
+    };
+
+    var get = function(key){
+        return _saveStorage[key];
+    };
+
+    return {save: save, get: get};
+});
+
+app.factory('common', ['$http', 'auth', '$routeParams','rms','config','wx','$location', function($http, auth, $routeParams,rms,config,wx,$location){
+    var addCommonReply = function(id, type, data,args, cb){
+        //先判断有没有绑定
+//        $http.post(
+//            '/wechat/is_bind',
+//            {}  ///不用传code了,都由服务器来处理
+//        ).then(function(response){
+//            console.log(response.data);
+//            if(response.data.status != 0){
+//                $location.path("/login_tip");
+//            }
+//        });
+
+        if(!data.comment || data.comment.length<=0){
+            return;
+        }
+
+        var temp =  data.comment.replace(/\n/g,'<br/>');
+
+        var userInfo = {
+            type: type,
+            content: temp,
+            token: auth.token()
+        };
+        //回复按钮禁用
+        data.disabled = true;
+
+        $http({
+            method: 'POST',
+            url: apiUrl+ "new_comment/"+id,
+            data: userInfo
+        }).then(function successCallback(response) {
+            //alert("提交成功");
+            //数据提交完成,回复按钮启用
+            console.log(response);
+            if(response.data.status == -1){
+                console.log("回复失败！");
+                data.comment = "";
+                if(response.data.tip == 0){
+                    args.scope.replytip = "您不是该私有班级成员，不能回复";
+                }
+                else{
+                    args.scope.replytip = "您不是该私有项目成员，不能回复";
+                }
+                return;
+            }
+
+            data.disabled = false;
+            if(typeof cb === 'function'){
+                cb(response.data.subscribe);
+            }
+
+            //保证内外回复数一致
+            activities = rms.get("activities") || [];
+            course_activities = rms.get("course_activities") || [];
+            project_activities = rms.get("project_activities") || [];
+            for(var i in activities){
+                if(activities[i].act_id == id){
+                    activities[i].reply_count += 1;
+                    break;
+                }
+            }
+            for(var i in course_activities){
+                if(course_activities[i].act_id == id){
+                    course_activities[i].reply_count += 1;
+                    break;
+                }
+            }
+            for(var i in project_activities){
+                if(project_activities[i].act_id == id){
+                    project_activities[i].reply_count += 1;
+                    break;
+                }
+            }
+            rms.save("activities",activities);
+            rms.save("course_activities",course_activities);
+            rms.save("project_activities",project_activities);
+
+        }, function errorCallback(response) {
+        });
+    };
+
+//    var loadCommonData = function(id, type,replytype,page){
+//        return $http({
+//            method: 'GET',
+//            url: apiUrl+ type + "/" + id+"?token="+auth.token(),
+//        })
+//    };
+
+    var loadCommonData = function(id, type,replytype,page){
+        return $http({
+            method: 'POST',
+            url: apiUrl+ type + "/" + id,
+            dataType: 'jsonp',
+            data:{token:auth.token(),type:replytype,page:page}
+        })
+    };
+
+    var addCommonPraise = function(act){
+//        act.praise_count += 1;
+//        act.has_praise = true;
+
+        $http({
+            method: 'POST',
+            url: apiUrl + "praise/" + act.act_id,
+            data:{token:auth.token(),type:act.act_type}
+        }).then(function successCallback(response) {
+            console.log(response.data);
+        }, function errorCallback(response) {
+        });
+
+    };
+
+    var decreaseCommonPraise = function(act){
+//        act.praise_count -= 1;
+//        act.has_praise = false;
+        $http({
+            method: 'POST',
+            url: apiUrl + "praise/" + act.act_id,
+            data:{token:auth.token(),type:act.act_type}
+        }).then(function successCallback(response) {
+            console.log(response.data);
+        }, function errorCallback(response) {
+        });
+    };
+
+    var init = function(args){
+        args.scope.replytip = "输入回复内容~";
+        args.scope.formData = {comment: ''};
+        var loadData = function(id,replytype,page){
+            loadCommonData(id, args.type,replytype,page).then(function successCallback(response) {
+                console.log(response.data);
+                //--------------分享内容定制-------------
+                var tmptile = "分享动态";
+                var imgUrl = "";
+
+                if(response.data.data.title){
+                    tmptile = response.data.data.title;
+                }
+
+                var tmpname = "匿名用户";
+
+                if(response.data.data.user){
+                    tmpname = response.data.data.user.realname;
+                    imgUrl = window.g_localhost+response.data.data.user.img_url;
+                }
+
+                if(response.data.data.author){
+                    tmpname = response.data.data.author.realname;
+                    imgUrl = window.g_localhost+response.data.data.author.img_url;
+                }
+
+                var desc = ""
+                if(response.data.data.content){
+                    desc = response.data.data.content.replace(/<[^>]+>/g,"").replace(/\s*/g,"").replace(/&nbsp;/g,"");
+                }
+
+                if(response.data.data.description){
+                    desc = response.data.data.description.replace(/<[^>]+>/g,"").replace(/\s*/g,"").replace(/&nbsp;/g,"");
+                }
+
+                if(desc.length > 30){
+                    desc = desc.substring(0,30)+"...";
+                }
+
+                var title = tmpname+"："+tmptile;
+                console.log("desc = "+desc);
+                console.log("imgUrl= "+imgUrl);
+
+                var link = "";
+
+                if(args.urlName == "discussion"){
+                    var urlName = response.data.type_name + "_discussion";
+                    link = "https://open.weixin.qq.com/connect/oauth2/authorize?appid="+window.g_appid +
+                        "&redirect_uri="+window.g_localhost+"/wechat/user_activities?id="+response.data.data.act_id+
+                        "&response_type=code&scope=snsapi_userinfo&state="+urlName+"&connect_redirect=1#wechat_redirect";
+                }
+                else{
+                    link = "https://open.weixin.qq.com/connect/oauth2/authorize?appid="+window.g_appid +
+                        "&redirect_uri="+window.g_localhost+"/wechat/user_activities?id="+response.data.data.act_id+
+                        "&response_type=code&scope=snsapi_userinfo&state="+args.urlName+"&connect_redirect=1#wechat_redirect";
+                }
+
+//                if(args.urlName == "discussion"){
+//                    var urlName = response.data.type_name + "_discussion";
+//                    link = "https://open.weixin.qq.com/connect/oauth2/authorize?appid=wxc09454f171153c2d" +
+//                        "&redirect_uri=https://test.forge.trustie.net/wechat/user_activities?id="+response.data.data.act_id+
+//                        "&response_type=code&scope=snsapi_base&state="+urlName+"&connect_redirect=1#wechat_redirect";
+//                }
+//                else{
+//                    link = "https://open.weixin.qq.com/connect/oauth2/authorize?appid=wxc09454f171153c2d" +
+//                        "&redirect_uri=https://test.forge.trustie.net/wechat/user_activities?id="+response.data.data.act_id+
+//                        "&response_type=code&scope=snsapi_base&state="+args.urlName+"&connect_redirect=1#wechat_redirect";
+//                }
+
+                console.log("link= "+link);
+
+                wxConfig(title,desc,imgUrl,link);
+
+                //--------------分享内容定制-------------
+                args.loadCallback(response.data);
+            }, function errorCallback(response) {
+            });
+        };
+
+        loadData(args.id,0,0);
+        args.scope.addReply = function(data){
+            console.log(data.comment);
+            addCommonReply(args.id, args.replyType, data,args, function(subscribe){
+                args.scope.formData = {comment: ''};
+                if(subscribe == 0){
+                    $location.path("/login_tip");
+                    return;
+                }
+                else{
+                    loadData(args.id,0,0);
+                }
+
+                if(typeof args.replyCallback === 'function'){
+                    args.replyCallback();
+                }
+            });
+        };
+
+//       动态详情界面点赞与动态界面的数据要同步  保证进入详情点赞后出来显示一致
+        args.scope.addPraise = function(act){
+            activities = rms.get("activities") || [];
+            course_activities = rms.get("course_activities") || [];
+            project_activities = rms.get("project_activities") || [];
+            for(var i in activities){
+                if(activities[i].act_id == act.act_id){
+                    activities[i].praise_count += 1;
+                    activities[i].has_praise = true;
+                    break;
+                }
+            }
+            for(var i in course_activities){
+                if(course_activities[i].act_id == act.act_id){
+                    course_activities[i].praise_count += 1;
+                    course_activities[i].has_praise = true;
+                    break;
+                }
+            }
+            for(var i in project_activities){
+                if(project_activities[i].act_id == act.act_id){
+                    project_activities[i].praise_count += 1;
+                    project_activities[i].has_praise = true;
+                    break;
+                }
+            }
+            rms.save("activities",activities);
+            rms.save("course_activities",course_activities);
+            rms.save("project_activities",project_activities);
+
+            act.praise_count += 1;
+            act.has_praise = true;
+            addCommonPraise(act);
+        };
+
+        args.scope.decreasePraise = function(act){
+            activities = rms.get("activities") || [];
+            course_activities = rms.get("course_activities") || [];
+            project_activities = rms.get("project_activities") || [];
+            for(var i in activities){
+                if(activities[i].act_id == act.act_id){
+                    activities[i].praise_count -= 1;
+                    activities[i].has_praise = false;
+                    break;
+                }
+            }
+            for(var i in course_activities){
+                if(course_activities[i].act_id == act.act_id){
+                    course_activities[i].praise_count -= 1;
+                    course_activities[i].has_praise = false;
+                    break;
+                }
+            }
+            for(var i in project_activities){
+                if(project_activities[i].act_id == act.act_id){
+                    project_activities[i].praise_count -= 1;
+                    project_activities[i].has_praise = false;
+                    break;
+                }
+            }
+            rms.save("activities",activities);
+            rms.save("course_activities",course_activities);
+            rms.save("project_activities",project_activities);
+
+            act.praise_count -= 1;
+            act.has_praise = false;
+            decreaseCommonPraise(act);
+        };
+
+        args.scope.showMoreReply = function(replytype,data){
+            if(!data.page){
+                data.page = 1;
+            }
+            else{
+                data.page = data.page + 1;
+            }
+
+            loadCommonData(data.id, args.type,replytype,data.page).then(function successCallback(response) {
+                args.loadCallback(response.data);
+            }, function errorCallback(response) {
+            });
+        };
+
+        args.scope.commentreply_path =  config.rootPath+ 'templates/comment_reply.html';
+
+    };
+
+    var wxConfig = function(title,desc,imgUrl,link){
+
+        if(title == null || title == ""){
+            title = 'Trustie创新实践平台';
+        }
+
+        if(desc == null || desc == ""){
+            desc = 'Trustie创新实践平台';
+        }
+
+        if(imgUrl == null || imgUrl == ""){
+            imgUrl = window.g_localhost+'/images/wechat/wx_logo.jpg';
+        }
+
+        wx.ready(function(){
+            wx.onMenuShareTimeline({
+                title: title, // 分享标题
+                link: link, // 分享链接
+                imgUrl: imgUrl, // 分享图标
+                success: function () {
+                    console.log("share successed.");
+                },
+                cancel: function () {
+                    console.log("share canceled.");
+                }
+            });
+
+            wx.onMenuShareAppMessage({
+                title: title, // 分享标题
+                desc: desc, // 分享描述
+                link: link, // 分享链接
+//                    imgUrl: '', // 分享图标
+                imgUrl: imgUrl, // 分享图标
+//                    type: '', // 分享类型,music、video或link，不填默认为link
+//                    dataUrl: '', // 如果type是music或video，则要提供数据链接，默认为空
+                success: function () {
+                    // 用户确认分享后执行的回调函数
+                },
+                cancel: function () {
+                    // 用户取消分享后执行的回调函数
+                }
+            });
+        });
+    };
+
+    var checkLogin = function(){
+        $http.post(
+            '/wechat/is_bind',
+            {}  ///不用传code了,都由服务器来处理
+        ).then(function(response){
+                console.log(response.data);
+               if(response.data.status != 0){
+                   $location.path("/login");
+                   return;
+               }
+        });
+    };
+
+    return {init: init, addCommonReply: addCommonReply, loadCommonData: loadCommonData, addCommonPraise: addCommonPraise, decreaseCommonPraise: decreaseCommonPraise, wxConfig: wxConfig, checkLogin: checkLogin};
+}]);
diff --git a/public/javascripts/wechat/others/routes.js b/public/javascripts/wechat/others/routes.js
index 8596ee706..7311c66c1 100644
--- a/public/javascripts/wechat/others/routes.js
+++ b/public/javascripts/wechat/others/routes.js
@@ -23,13 +23,13 @@ app.config(['$routeProvider',"$httpProvider", "$locationProvider",'config', func
             controller: 'RegController'
         })
         .when('/activites', makeRoute('activities.html', 'ActivityController'))
-        .when('/issues/:id', makeRoute('issue_detail.html', 'IssueController'))
-        .when('/project_discussion/:id', makeRoute('project_discussion.html', 'DiscussionController'))
-        .when('/homework/:id', makeRoute('homework_detail.html', 'HomeworkController'))
-        .when('/course_notice/:id', makeRoute('course_notice.html', 'CourseNoticeController'))
-        .when('/course_discussion/:id', makeRoute('course_discussion.html', 'DiscussionController'))
-        .when('/journal_for_message/:id', makeRoute('jour_message_detail.html', 'JournalsController'))
-        .when('/blog_comment/:id', makeRoute('blog_detail.html', 'BlogController'))
+        .when('/issues', makeRoute('issue_detail.html', 'IssueController'))
+        .when('/project_discussion', makeRoute('project_discussion.html', 'DiscussionController'))
+        .when('/homework', makeRoute('homework_detail.html', 'HomeworkController'))
+        .when('/course_notice', makeRoute('course_notice.html', 'CourseNoticeController'))
+        .when('/course_discussion', makeRoute('course_discussion.html', 'DiscussionController'))
+        .when('/journal_for_message', makeRoute('jour_message_detail.html', 'JournalsController'))
+        .when('/blog_comment', makeRoute('blog_detail.html', 'BlogController'))
         .when('/class', makeRoute('class.html', 'ClassController'))
         .when('/new_class', makeRoute('new_class.html', 'NewClassController'))
         .when('/edit_class', makeRoute('edit_class.html', 'EditClassController'))
@@ -38,11 +38,16 @@ app.config(['$routeProvider',"$httpProvider", "$locationProvider",'config', func
         .when('/myresource', makeRoute('myresource.html', 'MyResourceController'))
         .when('/invite_code', {templateUrl: rootPath + 'invite_code.html', controller: 'InviteCodeController'})
         .when('/send_class_list', makeRoute('send_class_list.html', 'SendClassListController'))
+        .when('/join_class', makeRoute('join_class.html', 'JoinClassController'))
+        .when('/review_class_member', makeRoute('review_class_member.html', 'ReviewClassMemberController'))
         .when('/project_list', makeRoute('project_list.html', 'ProjectListController'))
         .when('/project', makeRoute('project.html', 'ProjectController'))
         .when('/edit_project_member', makeRoute('edit_project_member.html', 'EditProjectMemberController'))
         .when('/new_project', makeRoute('new_project.html', 'NewProjectController'))
         .when('/project_invite_code', {templateUrl: rootPath + 'project_invite_code.html', controller: 'ProjectInviteCodeController'})
+        .when('/join_project', makeRoute('join_project.html', 'JoinProjectController'))
+        .when('/review_project_member', makeRoute('review_project_member.html', 'ReviewProjectMemberController'))
+        .when('/login_tip', makeRoute('login_tip.html', 'LoginTipController'))
         .otherwise({
             redirectTo: '/activites'
         });
diff --git a/public/stylesheets/css/common.css b/public/stylesheets/css/common.css
index a8a967a00..f704a3f0d 100644
--- a/public/stylesheets/css/common.css
+++ b/public/stylesheets/css/common.css
@@ -96,9 +96,7 @@ h4{ font-size:14px;}/*color:#3b3b3b;*/
 .flow_hidden{ width:300px;overflow:hidden; white-space: nowrap; text-overflow:ellipsis;}
 .white_space{white-space:nowrap;}
 .pr {position:relative;}
-.fontGrey3 {color:#484848;}
-a.linkGrey6 {color:#484848 !important;}
-a.linkGrey6:hover {color:#ffffff !important;}
+
 .markPopup {width:290px; height:auto;  padding:5px 0px 15px 15px; background-color:#ffffff; z-index:1000;}
 .markInput { outline:none; border:1px solid #e6e6e6; height:30px; width:50px; color:#3d3c3c; margin-bottom:10px; text-align:center; margin-right:5px; padding-left:0;}
 .markPercentage {margin:10px 0; border:1px solid #e6e6e6; width:70px; height:30px; outline:none; font-size:12px; color:#3d3c3c;}
@@ -402,6 +400,7 @@ a:hover.c_grey{ color:#333;}
 .fontGrey4{color:#999999;}
 .fontGrey5 {color:#a1a1a1;}
 .fontGrey6 {color:#7a7a7a;}
+.fontGrey7 {color:#555;}
 .fontBlue {color:#3498db;}
 span.newsBlack {color:#4b4b4b; font-size:13px; font-weight:bold}
 a.underline {text-decoration:underline;}
@@ -409,6 +408,7 @@ a.fontBlue {color:#297fb8;}
 .fontBlue2 {color:#269ac9 !important;}
 a.fontGrey {color:#cecece;}
 a.fontGrey2 {color:#888888;}
+a.fontGrey3 {color:#555;}
 a.link-black {color:#000;}
 a.link-black:hover {color:#3b94d6;}
 a.link-blue {color:#3b94d6;}
@@ -547,6 +547,10 @@ a:hover.BlueCirBtnMini{ background:#269ac9; color:#fff;}
 .borderRadius {border-radius:5px;}
 a.Blue-btn{ display:block; margin-right:15px;width:65px; height:22px; background-color:#ffffff; line-height:24px; vertical-align:middle;  text-align:center; border:1px solid #3598db; color:#3598db;  -moz-border-radius:5px;  -webkit-border-radius:5px;  border-radius:5px;}
 a:hover.Blue-btn{ background:#3598db; color:#fff;}
+a.BlueCirBtn{ display:block;width:75px; height:28px; background-color:#fff; line-height:28px; vertical-align:middle;  text-align:center; border:1px solid #3598db; color:#3598db;  -moz-border-radius:5px;  -webkit-border-radius:5px;  border-radius:5px;}
+a:hover.BlueCirBtn{ background:#3598db; color:#fff;}
+a.BlueCirBtnMini{ display:block;width:40px; height:22px; background-color:#ffffff; line-height:24px; vertical-align:middle;  text-align:center; border:1px solid #3598db; color:#3598db;  -moz-border-radius:5px;  -webkit-border-radius:5px;  border-radius:5px;}
+a:hover.BlueCirBtnMini{ background:#3598db; color:#fff;}
 
 /*20160725 项目申请按钮*/
 a.sy_btn_grey{
diff --git a/public/stylesheets/css/courses.css b/public/stylesheets/css/courses.css
index 7a1a0dabb..163f33338 100644
--- a/public/stylesheets/css/courses.css
+++ b/public/stylesheets/css/courses.css
@@ -8,14 +8,10 @@
 .HomeWork {width:718px; background-color:#ffffff; padding:15px; border:1px solid #dddddd; float:right;}
 .RightBanner {font-size:16px; width:733px;  color:#4b4b4b; padding:10px 0 0 15px; margin-bottom:10px; background:#fff; border:1px solid #dddddd;height:34px;}
 select.InputBox,input.InputBox,textarea.InputBox{ border:1px solid #d9d9d9; color:#888888; height:28px; line-height:28px; padding-left:5px; font-size:14px;}
-a.BlueCirBtn{ display:block;width:75px; height:28px; background-color:#fff; line-height:28px; vertical-align:middle;  text-align:center; border:1px solid #3598db; color:#3598db;  -moz-border-radius:5px;  -webkit-border-radius:5px;  border-radius:5px;}
-a:hover.BlueCirBtn{ background:#3598db; color:#fff;}
 /*a.AnnexBtn{  background: url(../images/homepage_icon.png) 0px -343px no-repeat; width:70px; height:20px; display:block; padding-left:20px; color:#888888;}*/
 /*a:hover.AnnexBtn{background: url(../images/homepage_icon.png) -90px -343px no-repeat; color:#3598db;}*/
 a.FilesBtn{  background: url(../images/homepage_icon.png) 0px -373px no-repeat; width:38px; height:20px; display:block; padding-left:20px; color:#888888;}
 a:hover.FilesBtn{background: url(../images/homepage_icon.png) -89px -372px no-repeat; color:#3598db;}
-a.BlueCirBtnMini{ display:block;width:40px; height:22px; background-color:#ffffff; line-height:24px; vertical-align:middle;  text-align:center; border:1px solid #3598db; color:#3598db;  -moz-border-radius:5px;  -webkit-border-radius:5px;  border-radius:5px;}
-a:hover.BlueCirBtnMini{ background:#3598db; color:#fff;}
 a.ProBtn{background: url(../images/homepage_icon.png) -86px -396px no-repeat; width:30px; height:20px; display:block; padding-left:20px; color:#888888;}
 a:hover.ProBtn{background: url(../images/homepage_icon.png) -86px -426px no-repeat; color:#3598db;}
 
diff --git a/public/stylesheets/css/project.css b/public/stylesheets/css/project.css
index 350141150..95891d365 100644
--- a/public/stylesheets/css/project.css
+++ b/public/stylesheets/css/project.css
@@ -160,9 +160,9 @@ div.thumbnails div {background:#fff;display:inline-block;margin-right:2px;}
 .repos_files ul:hover{ background:#ffffdd;}
 .repos_t_c li{ text-align:center;}
 .pic_stats{display:block; background:url(/images/public_icon.png) 0px -548px no-repeat; width:20px; height:15px;}
-.tree-age{width:10%; text-align:right;}
+.tree-age{width:15%; text-align:right;}
 .tree-author{width:10%; text-align:left;}
-.tree-comments{width:40%; text-align:left;}
+.tree-comments{width:35%; text-align:left;}
 
 /* 里程碑 */
 .roadmap_box{ background:#f8f8f8; width:648px; padding:10px; margin-top:5px; border:1px solid #ddd; color:#555;}
@@ -511,6 +511,72 @@ a:hover.upload_btn_grey{background:#8a8a8a;}
 .analysis-result-name {width:200px;}
 .analysis-result-version {width:90px; text-align:right;}
 .analysis-result-loc {width:60px; text-align:right;}
-.analysis-result-debt {width:160px; text-align:right;}
+.analysis-result-debt {width:80px; text-align:right;}
 .analysis-result-time {width:150px; text-align:right;}
-.analysis-name-icon {background:url(/images/code-analysis-icon.png) -2px -148px no-repeat; width:16px; height:16px; display:inline-block; vertical-align:middle;}
\ No newline at end of file
+.analysis-result-edit {width:80px; text-align:right;}
+.analysis-name-icon {background:url(/images/code-analysis-icon.png) -2px -148px no-repeat; width:16px; height:16px; display:inline-block; vertical-align:middle;}
+
+
+/*20160801项目合并*/
+.project-merge-banner {margin:-10px -10px 0 -10px; padding:0 10px; border-bottom:1px solid #ddd;}
+.project-merge-banner li {float:left;}
+.project-merge-banner .active {border-bottom:2px solid #3b94d6;}
+.project-merge-banner li a {padding:14px; font-size:14px; color:#555; display:inline-block;}
+.project-number-dot {display:inline-block; min-width:10px; padding:3px 5px; font-size:12px; color:#888; line-height:1; vertical-align:middle; white-space:nowrap; text-align:center; background-color:#eee; border-radius:10px; margin-left:5px;}
+.project-merge-content {}
+.project-merge-content>li {padding:10px; margin:0 -10px; background-color:#f9f9f9; border-bottom:1px solid #e5e5e5;}
+.no-merge-content {padding:10px 15px; color:#888;}
+.new-merge-request {border-bottom:1px solid #ddd; padding-bottom:10px;}
+.new-merge-wrap {font-size:13px; color:#484848; border-bottom:1px solid #ddd; padding:10px 0;}
+.new-merge-row {font-size:13px; color:#484848; border-bottom:1px solid #ddd; margin:0 -10px; padding:10px;}
+.merge-option-name {width:70px; text-align:right; }
+.merge-title-input {width:610px; height:16px; padding:8px 5px; border-radius:2px;}
+.merge-description-input {width:610px; height:90px; line-height:18px; padding:8px 5px;}
+.merge-record {font-size:13px; color:#484848; border-bottom:1px solid #ddd; margin:0 -10px; text-align:center;}
+.merge-record li {display:inline-block;}
+.merge-record li a {display:inline-block; padding:10px;}
+.merge-record .active {border-bottom:2px solid #3b94d6;}
+.merge-commit-time {width:200px; float:left;}
+.merge-commit-detail {width:380px; float:left;}
+.merge-commit-code {width:150px; float:left; text-align:right;}
+.merge-show {margin:-10px -10px 0 -10px; padding:10px; line-height:36px; border-bottom:1px solid #ddd;}
+.open-status {color:#fff; padding:0 16px; background-color:#3b94d6; border-radius:2px; display:inline-block;}
+.merge-commit-option {padding:12px; border:1px solid #ddd; background-color:#f9f9f9; border-radius:2px;}
+.merge-discussion-content {font-size:13px; color: #484848; margin:0 -10px; padding:10px; border-bottom:1px solid #ddd;}
+.merge-discussion-detail {font-size:13px; line-height:1.5em; color:#484848; margin-top:10px;}
+.merge-discussion-automatic {background-color:#fdfdfd;}
+.merge-discussion-input {margin:0 -10px; padding:10px; background-color:#f8f8f8;}
+.merge-discussion-input textarea {width:720px; height:80px; font-size:13px; line-height:16px; color:#484848; padding:5px;}
+
+/*新版项目列表新增*/
+.new_project_title{ font-size:16px; color:#333; max-width:560px; font-weight:normal;white-space:nowrap; overflow:hidden; text-overflow:ellipsis;  }
+.icons_project_list{ width:8px; height:8px; border:2px solid #fff; background:#3b94d6;-webkit-border-radius:50px;-moz-border-radius:50px;-o-border-radius:50px;border-radius:50px;-webkit-box-shadow: 0px 2px 5px rgba(146, 153, 169, 0.5);-moz-box-shadow: 0px 2px 5px rgba(146, 153, 169, 0.5);box-shadow: 0px 2px 5px rgba(146, 153, 169, 0.5); }
+.new_projectlist_more{ text-align:center;}
+.new_projectlist_more a:hover{ color:#3b94d6;}
+/*新版项目引用的新版课程大纲中的公共样式*/
+.icons_tishi{
+    width: 110px;
+    height: 110px;
+    margin: 135px auto 20px;
+}
+.sy_tab_con_p{
+    font-size: 16px;
+    text-align: center;
+    margin-bottom:100px;
+    color:#888;
+}
+a.sy_btn_green{
+    display:inline-block;
+    color: #fff;
+    background: #60b25e;
+    text-align: center;
+    font-size: 12px;
+    padding:0 15px;
+    height: 30px;
+    line-height: 30px;
+    -webkit-border-radius:3px;
+    -moz-border-radius:3px;
+    -o-border-radius:3px;
+    border-radius:3px;
+}
+a:hover.sy_btn_green{ background: #51a74f;}
\ No newline at end of file
diff --git a/public/stylesheets/css/public.css b/public/stylesheets/css/public.css
index 26c43756d..f9d344cf3 100644
--- a/public/stylesheets/css/public.css
+++ b/public/stylesheets/css/public.css
@@ -148,7 +148,6 @@ a.opnionButton:hover{background: #297fb8; }
 
 
 .hiddent{ overflow:hidden; white-space: nowrap; text-overflow:ellipsis;}
-.break_word_firefox{white-space: pre-wrap;word-break: break-all;}
 .font_bold{font-weight: bold;}
 
 
@@ -263,7 +262,7 @@ div.flash.warning, .conflict {
 /*弹出框*/
 .black_overlay{display:none;position:fixed;top:0px;left:0px;width:100%;height:100%;background-color:black;z-index:1001;-moz-opacity:0.8;opacity:.80;filter:alpha(opacity=80);}
 .white_content{display:none;position:fixed;top:15%;left:30%;width:420px;height: auto; margin-bottom:20px;padding:16px;border:3px solid #269ac9;background-color:white;z-index:1002;overflow:auto;}
-.white_content02{display:none;position:fixed;top:15%;left:30%;width:200px;height: auto; margin-bottom:20px;padding:10px;border:3px solid #269ac9;background-color:white;z-index:1002;overflow:auto; width:456px;}
+.white_content02{display:none;position:fixed;top:25%;left:40%;width:200px;height: auto; margin-bottom:20px;padding:10px;border:3px solid #269ac9;background-color:white;z-index:1002;overflow:auto; width:456px;}
 .newhwork_content{ display:none;position:fixed;top:15%;left:30%;width:600px;height: auto; margin-bottom:20px;padding:16px;border:3px solid #269ac9;background-color:white;z-index:1002;overflow:auto;}
 .floatbox{ width:420px; border:3px solid #269ac9; background:#fff; padding:5px;}
 a.box_close{ display:block; float:right; width:16px; height:16px; background:url(../images/img_floatbox.png) 0 0 no-repeat;}
@@ -443,7 +442,7 @@ a.sortArrowActiveU {background:url(../images/post_image_list.png) -17px -20px no
 .postDetailWrap {width:655px; float:left;}
 .postDetailTitle {width:570px; max-width:570px; margin-bottom:5px;}
 .postDetailDes {width:580px; max-width:580px; margin-bottom:6px; color:#888888;display:block;overflow:hidden;word-break:keep-all;text-overflow:ellipsis;}
-.postDetailDes p,div,em{word-break: break-all;word-wrap: break-word;}
+/*.postDetailDes p,div,em{word-break: break-all;word-wrap: break-word;}*/
 .postDetailDes ol li{list-style-type: decimal;margin-left: 40px;}
 .postDetailDes ul li{list-style-type: disc;margin-left: 40px;}
 .postDetailDes td,.postDetailDes tr {border: 1px solid; border-color: inherit;}
diff --git a/public/stylesheets/css/structure.css b/public/stylesheets/css/structure.css
index 44b1165c6..c9a4059e0 100644
--- a/public/stylesheets/css/structure.css
+++ b/public/stylesheets/css/structure.css
@@ -474,6 +474,7 @@ a.f_grey:hover {color:#000000;}
 .shadowbox_news_list{ max-height:400px; overflow:hidden;}
 .shadowbox_news_list a{ color:#999;}
 .shadowbox_news_list li{ height:40px; border-bottom:1px dashed #ebebeb; line-height:40px;overflow:hidden; white-space: nowrap; text-overflow:ellipsis; padding:0 10px;}
+.shadowbox_news_list li:last-child {border-bottom:none;}
 .shadowbox_news_list li:hover{ background-color:#eee;}
 span.shadowbox_news_user{ color:#3b94d6;}
 a.shadowbox_news_all{ display:block; width:305px; height:40px; line-height:40px; color:#3b94d6; text-align:center;border-top:1px solid #eee;}
diff --git a/public/stylesheets/sy_public.css b/public/stylesheets/sy_public.css
index 4b5a72369..deeb36c15 100644
--- a/public/stylesheets/sy_public.css
+++ b/public/stylesheets/sy_public.css
@@ -4,7 +4,6 @@
 .sy_corange{ color: #ee4a1f;}
 .sy_f14{ font-size: 14px;}
 .sy_f16{ font-size: 16px;}
-a.sy_cgrey{ color: #888;}
 a:hover.sy_cgrey{ color:#ee4a1f;}
 a.sy_corange{ color: #ee4a1f; }
 a:hover.sy_corange{ text-decoration:underline;}
@@ -235,7 +234,7 @@ a.sy_icons_close{
 .hw_popup_top a.hw_icons_close{display:block;width:26px; height:26px;background: url(../images/hw/icons_hw.png) 0 -95px no-repeat; transition: all 0s linear;}
 .hw_popup_top a:hover.hw_icons_close{background: url(../images/hw/icons_hw.png) -41px -95px no-repeat; }
 .hw_popup_con{ width:770px; max-height:770px; margin:0 auto;}
-.hw_popup_txt{width:770px; max-height:700px; margin:15px auto;overflow:auto;}
+.hw_popup_txt{width:770px; max-height:680px; margin:15px auto;overflow:auto;}
 /* 题库发送弹框 */
 .hw_sendpopup_box{ width:460px;background:#fff;padding-bottom:15px;-webkit-border-radius:5px;-moz-border-radius:5px;-o-border-radius:5px;border-radius:5px;-webkit-box-shadow: 0px 0px 8px rgba(146, 153, 169, 0.5);-moz-box-shadow: 0px 0px 8px rgba(146, 153, 169, 0.5);box-shadow: 0px 0px 8px rgba(146, 153, 169, 0.5);}
 .hw_sendpopup_top{background:#3b94d6;height:40px;-webkit-border-radius: 5px 5px 0px 0px;-o-border-radius: 5px 5px 0px 0px;border-radius: 5px 5px 0px 0px;}
diff --git a/public/stylesheets/syllabus.css b/public/stylesheets/syllabus.css
index c506d3d5f..9e6a9817d 100644
--- a/public/stylesheets/syllabus.css
+++ b/public/stylesheets/syllabus.css
@@ -324,9 +324,10 @@ a.sy_class_option:hover {
     height:110px;
 }
 .sy_class_id{
-    width:110px;
-    height:80px;
-    background:#f1f1f1;
+    width:108px;
+    height:78px;
+    border:1px solid #f1f1f1;
+    background:#fff;
     text-align:center;
     padding-top:30px;
 }
@@ -400,10 +401,10 @@ a:hover.sy_btn_orange{
 .accordion li > a {
     display: block;
     padding: 0 10px 0 40px;
-    height:49px;
+    height:45px;
     line-height:49px;
-    color: #333;
-    font-size:16px;
+    color: #555;
+    font-size:14px;
     background: #f8f8f8;
     border:1px solid #e5e5e5;
     border-bottom:none;
@@ -426,19 +427,19 @@ a:hover.sy_btn_orange{
     margin-top:15px;
     font-size:12px;
     padding: 0 10px;
-    background: #dbdbdb;
+    background: #ccc;
     -webkit-border-radius: 15px;
     -moz-border-radius: 15px;
     border-radius: 15px;
     margin-left:10px;
-    color: #333;
+    color: #888;
 }
 .accordion > li:hover > a span,
 .accordion > li:target > a span,
 .accordion > li > a.active span {
     margin-left:10px;
-    color: #333;
-    background: #dbdbdb;
+    color: #888;
+    background: #ccc;
 }
 /* Images */
 .accordion > li > a:before {
@@ -615,4 +616,4 @@ a:hover.sy_class_ltitle{ color:#333;}
 
 /* 我的作业 */
 .hw_classname{ width:180px; overflow:hidden; display:block;overflow:hidden;white-space: nowrap; text-overflow:ellipsis;}
-.hw_tab_top{ height: 50px; line-height: 50px; padding-left: 15px;  border-bottom:1px solid #ddd; border-left:3px solid #3b94d6; }
\ No newline at end of file
+.hw_tab_top{ height: 50px; line-height: 50px; padding-left: 15px;  border-bottom:1px solid #ddd; border-left:3px solid #3b94d6; }
diff --git a/public/stylesheets/weui/weixin.css b/public/stylesheets/weui/weixin.css
index c882c604c..2fbf9c082 100644
--- a/public/stylesheets/weui/weixin.css
+++ b/public/stylesheets/weui/weixin.css
@@ -1,245 +1,256 @@
-@charset "utf-8";
-/* CSS Document */
-
-/*基本样式*/
-body,table,input,textarea,select,button { font-family: "微软雅黑","宋体","Helvetica Neue", Helvetica, Arial, sans-serif;}
-body, ul, h1,h2,h3,h4,h5,p,pre,input {padding:0px; margin:0px;}
-body{background-color: #efeff4;}
-ul li {list-style:none;}
-img {max-width:100%;}
-blockquote {border:1px solid #d4d4d4; padding: 0.6em; margin: 5px 0.4em 5px 1.4em; border-radius: 4px; font-family: "Microsoft YaHei"; background-size: 100% 100%;}
-.text-control {word-break:normal; word-wrap:break-word;}
-.f12 {font-size:12px;}
-.f13 {font-size:13px;}
-.f14 {font-size:14px;}
-.f15 {font-size:15px;}
-.f16 {font-size:16px;}
-.fb {font-weight:bold;}
-.mt2 {margin-top:2px;}
-.mt3 {margin-top:3px;}
-.mt4 {margin-top:4px;}
-.mt5 {margin-top:5px;}
-.mt10 {margin-top:10px;}
-.mt11 {margin-top:11px;}
-.mt12 {margin-top:12px;}
-.mt15 {margin-top:15px;}
-.mt30 {margin-top:30px;}
-.mt70 {margin-top:70px;}
-.mb5 {margin-bottom:5px;}
-.mb10 {margin-bottom:10px;}
-.mb15 {margin-bottom:15px;}
-.mb20 {margin-bottom:20px;}
-.mb50 {margin-bottom:50px;}
-.ml5 {margin-left:5px;}
-.ml10 {margin-left:10px;}
-.ml40 {margin-left:40px;}
-.mr5 {margin-right:5px;}
-.mr10 {margin-right:10px;}
-.ml15 {margin-left:15px;}
-.ml35 {margin-left:35px;}
-.mr15 {margin-right:15px;}
-.mr20 {margin-right:20px;}
-.ml25 {margin-left:25px;}
-.mr25 {margin-right:25px;}
-.ml55 {margin-left:55px;}
-.mr55 {margin-right:55px;}
-.c-red {color:#e81a1a;}
-.c-blue {color:#269ac9;}
-.c-grey {color:#9a9a9a !important;}
-.c-grey2 {color:#707070;}
-.c-grey3 {color:#555555;}
-.c-grey4 {color:#888888;}
-.c-grey5 {color:#aaaaaa;}
-.c-grey6 {color:#777777;}
-.c-blue {color:#3b94d6;}
-.c-white {color:#ffffff;}
-.c-black {color:#333}
-a {color:#707070;}
-a.c-grey {color:#707070;}
-a.c-grey2 {color:#9a9a9a;}
-a.c-grey3 {color:#353535;}
-a.c-green {color:#0bb20c;}
-a:link,a:visited{text-decoration:none;}
-a:hover,a:active{cursor:pointer;}
-a.link-blue {color:#269ac9;}
-a.link-blue2 {color:#3b94d6;}
-a.underline {text-decoration:underline;}
-.border-radius {border-radius:5px;}
-.w36 {width:36px;}
-.max-width-60 {max-width:60px;}
-.max-width-130 {max-width:130px;}
-.hidden {overflow:hidden; white-space:nowrap; text-overflow:ellipsis;}
-.inline-block {display:inline-block;}
-.dis {display:block;}
-.undis {display:none;}
-.text-nowrap {white-space:nowrap;}
-.v-top {vertical-align:top;}
-.tac {text-align:center;}
-.block-center {margin-left:auto; margin-right:auto; display:block;}
-
-/*背景色*/
-.bg-grey {background-color:#c1c1c1 !important;}
-.bg-blue {background-color:#3b94d6;}
-
-/*按钮样式*/
-.btn1 {width:100%; height:40px; line-height:40px; vertical-align:middle; text-align:center; color:#fff; display:block; border-radius:5px;}
-.bg-blue:not(.btn-disabled):active {background-color:#2780c2;}
-.btn-disabled {background-color:#ccc !important;}
-.btn2 {width:145px; height:35px; color:#fff; font-size:15px; line-height:35px; text-align:center; vertical-align:middle; margin:18px auto 20px auto; border-radius:50px; display:block;}
-.btn3 {width:145px; height:35px; color:#fff; font-size:15px; line-height:35px; text-align:center; vertical-align:middle; border-radius:50px; display:block;}
-.fixed-bottom-btn {position:fixed; bottom:5px; left:50%; transform:translate(-50%,0);}
-
-/*tab*/
-.tab-wrap {position:relative; width:100%; line-height:38px; display:-webkit-box; display:-moz-box; display:-ms-flexbox; display:-webkit-flex; display:flex; font-size:13px; background-color:#fff;}
-.tab-wrap a {position:relative; display:block; -webkit-box-flex:1; -moz-box-flex:1; -ms-flex:1; flex:1;}
-.tab-wrap a:first-child:after {display:none;}
-.tab-wrap a:after {content:" "; position:absolute; left:0; top:0; width:1px; height:100%; border-left:1px solid #ccc; color:#707070;}
-.weixin-tab {text-align:center; border-bottom:1px solid #ccc;}
-
-/*bottom-tab*/
-.bottom-tab-wrap {position:fixed; width:100%; bottom:0; line-height:38px; display:-webkit-box; display:-moz-box; display:-ms-flexbox; display:-webkit-flex; display:flex; font-size:13px; background-color:#fff;}
-.bottom-tab-wrap a {display:block; -webkit-box-flex:1; -moz-box-flex:1; -ms-flex:1; flex:1; position:relative;}
-.bottom-tab-wrap a:after {content:" "; position:absolute; left:0; top:0; width:1px; height:100%; border-left:1px solid #ccc; color:#707070;}
-
-/*动态样式*/
-.post-container {width:100%;}
-.post-wrapper {width:100%; background-color:#ffffff; margin:10px auto;}
-.post-main {padding:10px 15px; color:#9a9a9a;}
-.post-avatar {width:30px; height:30px;}
-.post-title {font-size:13px; text-align:left;}
-.post-detail-info {font-size:13px; text-align:left; color:#9a9a9a;}
-.fl {float:left;}
-.fr {float:right;}
-.cl {clear:both; overflow:hidden;}
-.post-content {width:100%; font-size:14px; line-height:20px; height:100px; overflow:hidden; word-break:normal; word-wrap:break-word; text-align:justify;}
-.post-all-content a {color:#136ec2;}
-.post-interactive {width:100%; height:35px; line-height:35px; vertical-align:middle; border-top:1px solid #e6e6e6; background-color:#f8f9fb;}
-.post-interactive-column,
-.post-interactive-reply,
-.post-interactive-praise {width:50%; text-align:center; float:left; font-size:13px;}
-.more-wrap {width:100%;}
-.more-events {width:100%; font-size:13px; text-align:center; margin:0 auto; padding: 5px 0; border-top:1px solid #e6e6e6; border-bottom:1px solid #e6e6e6; border-radius:3px; background-color:#f8f9fb; }
-.border-bottom {border-bottom:1px solid #e6e6e6;}
-.post-reply-wrap {width:100%;}
-.post-reply-wrap:first-child {border-top:1px solid #ccc;}
-.post-input-wrap {width:100%; position:fixed; bottom:0; background-color:#fff;}
-.post-input-wrap2 {width:100%;}
-.post-reply-row {margin:10px 15px; color:#9a9a9a; background-color:#fff; border-bottom:1px solid #f0f0f0;}
-.post-reply-avatar {width:45px; height:30px; text-align:center; margin-right:10px;}
-.post-reply-user {font-size:13px; text-align:left; margin-bottom:10px;}
-.post-reply-content {font-size:13px; word-break:break-all; word-wrap:break-word; overflow:hidden; text-align:justify;}
-.post-reply-content img {max-width:100%;}
-.post-reply-content a {color:#136ec2;}
-.post-reply-date, .post-reply-trigger {font-size:13px;}
-.post-input-container {position:relative; padding-right:70px;}
-.copy-input-container {position:relative; padding-right:70px;}
-.copy-input {width:100%; height:18px; line-height:18px; padding:5px; vertical-align: middle; font-size:12px; border-radius:3px; position:absolute; left:-999em;}
-.post-reply-input {width:100%; height:18px; max-height:54px; line-height:18px; vertical-align: middle; font-size:13px; border:1px solid #e6e6e6; outline:none; padding:5px; margin:0; border-radius:3px; overflow-y:auto; resize:none; background-color:#f0eff4;}
-.post-reply-submit {position:absolute; font-size:13px; height:30px; line-height:30px; vertical-align:middle; padding:0 8px; color:#fff; background-color:#269ac9; outline:none; border:none; top:0; right:0;}
-.reply-icon {background:url(/images/wechat/icon_list.gif) -150px -155px no-repeat; width:20px; height:20px; display:inline-block; vertical-align:middle;}
-.praise-icon {background:url(/images/wechat/icon_list.gif) -36px -88px no-repeat; width:20px; height:20px; display:inline-block; vertical-align:middle;}
-.praised-icon {background:url(/images/wechat/icon_list.gif) -152px -86px no-repeat; width:20px; height:20px; display:inline-block; vertical-align:middle;}
-.num-block {display:inline-block; vertical-align:top;}
-.post-op-banner {height:20px; line-height:20px; vertical-align:middle;}
-
-/*20160628动态新样式*/
-.post-dynamic-author {width:50%; height:30px; line-height:30px; font-size:14px; color:#5b5b5b; vertical-align:middle;}
-.post-dynamic-time {height:30px; line-height:30px; vertical-align:middle;}
-.post-dynamic-title {font-size:15px;}
-.post-dynamic-from {width:50%; font-size:13px;}
-.post-box-shadow {box-shadow: 0px 2px 8px rgba(146, 153, 169, 0.5);}
-.post-reply-author {width:50%; height:20px; line-height:20px; font-size:12px; color:#5d5d5d; vertical-align:middle;}
-.post-reply-time {height:20px; line-height:20px; vertical-align:middle;}
-
-/* loading 弹框*/
-.loading-bg {position:fixed; width:100%; height:100%; left:0; top:0; z-index:99; background:rgba(206, 206, 206, 0.3); overflow:hidden;}
-.loading-box {position:absolute; top:50%; background:rgba(240,240,240, 0.5); width:160px; height:72px; left:50%; margin-top:-36px; margin-left:-80px; text-align:center;}
-.loading-box img {margin-top: 3px; text-align: center;}
-.loading-box span {display: block; font-size:12px;}
-
-/*帖子锁定样式*/
-.locked_btn_cir {background: url("/images/wechat/locked.png") 0 0 no-repeat; cursor: default;}
-
-/*20150612加入班级样式*/
-.add-class-box {position:fixed; width:80%; max-width:300px; min-width:240px; font-size:15px; color:#444; background-color:#fff; box-shadow: 0px 2px 8px rgba(146, 153, 169, 0.5); border-radius:5px; top:50%; left:50%; transform: translate(-50%,-50%); -ms-transform: translate(-50%,-50%); -moz-transform: translate(-50%,-50%); -webkit-transform: translate(-50%,-50%); -o-transform: translate(-50%,-50%);}
-.add-class-tip {padding-top:1.2em; padding-bottom:.5em; font-weight:400;}
-.class-number-input {width:80%; max-width:240px; height:28px; border:1px solid #ccc; padding-left:5px; margin:0 auto; display:block;}
-.cancel-btn {width:49%; height:37px; line-height:37px; text-align:center; vertical-align:middle; border-top:1px solid #ccc;}
-.submit-btn {width:49%; height:37px; line-height:37px; text-align:center; vertical-align:middle; border-top:1px solid #ccc;}
-.slice {width:2%; text-align:center; border-top:1px solid #ccc;}
-.slice-line {width:1px; height:37px; margin:auto; background:#ccc;}
-
-/*20160613邀请码样式*/
-.qr-code-wrap {width:100%; padding:40px 0; background-color:#3b94d6;}
-.qr-code-box {width:225px; background-color:#fff; border-radius:3px; margin:0 auto;}
-.share-class-name {font-size:18px; color:#3b3b3b; text-align:center; padding:12px; border-bottom:1px solid #cccccc;}
-.qr-img-wrap {width:100%; border-bottom:1px dashed #ccc;}
-.qr-code-img {margin:36px auto; display:block;}
-.invitation-code-wrap {text-align:center; font-size:18px; color:#3b3b3b; padding:16px;}
-.share-code-wrap {width:100%; background-color:#efeff4;}
-.share-code-btn, .finish-btn {width:145px; height:35px; color:#fff; font-size:15px; line-height:35px; text-align:center; vertical-align:middle; background-color:#ff7239; margin:18px auto 20px auto; border-radius:50px; display:block;}
-.share-code-instruction {max-width:228px; font-size:12px; color:#666; line-height:20px; margin:0 auto;}
-
-/*20160613班级详情*/
-.class-detail-name, .blue-title {width:100%; height:45px; line-height:45px; vertical-align:middle; background-color:#3b94d6; color:#fff; font-size:18px; text-align:center;}
-.blue-title-sub {position:absolute; right:10px;}
-.slice2 {width:2%; text-align:center; background-color:#fff; border-bottom:1px solid #ccc;}
-.slice3 {width:1%; height:38px; text-align:center; background-color:#fff; border-bottom:1px solid #ccc;}
-.slice-line2 {width:1px; height:38px; margin:auto; background:#ccc;}
-.class-detail-tab {width:23%; height:38px; line-height:38px; font-size:13px; color:#444; background-color:#fff; float:left; text-align:center; vertical-align:middle; border-bottom:1px solid #ccc;}
-.class-detail-tab2 {width:32%; height:38px; line-height:38px; font-size:13px; color:#444; background-color:#fff; float:left; text-align:center; vertical-align:middle; border-bottom:1px solid #ccc;}
-.class-detail-tab3 {width:48%; height:38px; line-height:38px; font-size:13px; color:#444; background-color:#fff; float:left; text-align:center; vertical-align:middle; border-bottom:1px solid #ccc;}
-.class-tab-active {border-bottom:3px solid #3b94d6;}
-.tab-active-arrow {border-width:4px; position:absolute; top:41px; left:50%; transform:translate(-50%,0); border-color:#3b94d6 transparent transparent transparent; border-style:solid dashed dashed dashed;}
-.class-search-wrap {padding:8px 12px; position:relative;}
-.class-search-inner {padding:0 30px; background-color:#fff;}
-.class-search-icon {position:absolute; top:16px; left:16px;}
-.class-detail-search {width:100%; height:33px; color:#999; background-color:#fff; border:none; outline:none;}
-.border-top {border-top:1px solid #ccc;}
-.class-detail-row {width:100%; line-height:18px; padding:10px 0; border-bottom:1px solid #ccc; background-color:#fff;}
-.class-member-row {width:100%; line-height:18px; padding:5px 0; border-bottom:1px solid #ccc; background-color:#fff; position:relative;}
-.class-test-tip {text-align:center; font-size:13px; color:#444; padding-top:40px;}
-.img-circle {border-radius:50% !important;}
-.member-banner {height:24px; line-height:24px; text-align:center; vertical-align:middle; background-color:#dfdfdf;}
-.resource-width {width:76%;}
-.courseware-from-width {max-width:57%;}
-.other-from-width {max-width:80%;}
-.course-name-width {width:68%;}
-
-/*20160614班级列表*/
-.course-diff-row {width:100%; height:28px; line-height:28px; vertical-align:middle; background-color:#fff; border-bottom:1px solid #ccc;}
-.course-list-row {width:100%; height:38px; line-height:38px; vertical-align:middle; border-top:1px solid #ccc; border-bottom:1px solid #ccc; background-color:#fff;}
-.class-list {width:100%; border-bottom:1px solid #ccc;}
-.class-list li {height:40px; line-height:40px; vertical-align:middle; margin:0 25px; border-left:1px solid #ccc; border-bottom:1px solid #ccc; position:relative;}
-.class-list-name {max-width:75%; display:inline-block;}
-.class-list-dot {position:absolute; top:13px; left:-8px;}
-.border-bottom-none {border-bottom:none !important;}
-.border-top-none {border-top:none !important;}
-.students-amount {height:14px; line-height:14px; vertical-align:middle; padding:2px 5px; background-color:#e6e6e6; border-radius:10px;}
-.new-class-btn {font-size:15px; color:#fff; background-color:#3b94d6; padding:10px 40px; border-radius:20px; display:inline-block; margin:0 auto;}
-.join-class-btn {font-size:15px; color:#444; background-color:#ccc; padding:10px 40px; border-radius:20px; display:inline-block; margin:0 auto;}
-.new-class-input {width:60%; color:#555; height:16px; line-height:16px; vertical-align:middle; border:none; outline:none; padding:8px 0;}
-.class-list-setting {position:absolute; top:11px; right:10px;}
-.class-setting-wrap {width:38px; height:38px; position:absolute; top:0; right:0;}
-
-/*20160616登录注册*/
-.login-wrap {padding:0 10px;}
-.input-box-wrap {padding-right:17px;}
-.input-box { -webkit-appearance: none; font-size: 15px;width:100%; height:18px; padding: 10px 0px 10px 5px; line-height:18px; border:1px solid #ccc; border-radius:5px;}
-.login-op-wrap {height:30px; line-height:30px; vertical-align:middle;}
-.login-box{display:inline-block; width:14px; height:14px; line-height:14px; text-align:center; vertical-align:middle; border:1px solid #ccc; background:#fff; border-radius:3px; color:#fff; cursor:pointer;}
-.login-box.checked{background:#63c360; border:1px solid #63c360;}
-.login-box.checked:after{content:url(/images/wechat/checked.png);}
-.forget-psw-wrap {width:60px; margin:0 auto;}
-.forget-psw {position:fixed; bottom:10px;}
-
-/*二级回复*/
-.mult-reply-container{ border:solid 1px #f3ddb3; background:#fffef4; padding:4px;color:#999;}
-.mult-reply-content{ color:#555; font-size:13px;}
-.mult-reply-hide{ text-align:center; display:block; font-size:14px; color:#aaa; border-bottom:1px solid #F3DDB3; padding:8px 0;}
-.mult-reply-arrow{ color:#aaa; margin-right:10px; font-size:14px; font-weight:bold;}
-
-
-/*20160729项目说明*/
-.project-intro {line-height:2; width:140px; margin-left:auto; margin-right:auto;}
-.project-intro li {list-style:disc; margin-left:20px;}
\ No newline at end of file
+@charset "utf-8";
+/* CSS Document */
+
+/*基本样式*/
+body,table,input,textarea,select,button { font-family: "微软雅黑","宋体","Helvetica Neue", Helvetica, Arial, sans-serif;}
+body, ul, h1,h2,h3,h4,h5,p,pre,input {padding:0px; margin:0px;}
+body{background-color: #efeff4;}
+ul li {list-style:none;}
+img {max-width:100%;}
+blockquote {border:1px solid #d4d4d4; padding: 0.6em; margin: 5px 0.4em 5px 1.4em; border-radius: 4px; font-family: "Microsoft YaHei"; background-size: 100% 100%;}
+.text-control {word-break:normal; word-wrap:break-word;}
+.f12 {font-size:12px;}
+.f13 {font-size:13px;}
+.f14 {font-size:14px;}
+.f15 {font-size:15px;}
+.f16 {font-size:16px;}
+.fb {font-weight:bold;}
+.mt2 {margin-top:2px;}
+.mt3 {margin-top:3px;}
+.mt4 {margin-top:4px;}
+.mt5 {margin-top:5px;}
+.mt10 {margin-top:10px;}
+.mt11 {margin-top:11px;}
+.mt12 {margin-top:12px;}
+.mt15 {margin-top:15px;}
+.mt30 {margin-top:30px;}
+.mt70 {margin-top:70px;}
+.mb5 {margin-bottom:5px;}
+.mb10 {margin-bottom:10px;}
+.mb15 {margin-bottom:15px;}
+.mb20 {margin-bottom:20px;}
+.mb50 {margin-bottom:50px;}
+.ml5 {margin-left:5px;}
+.ml10 {margin-left:10px;}
+.ml40 {margin-left:40px;}
+.mr5 {margin-right:5px;}
+.mr10 {margin-right:10px;}
+.ml15 {margin-left:15px;}
+.ml35 {margin-left:35px;}
+.mr15 {margin-right:15px;}
+.mr20 {margin-right:20px;}
+.ml25 {margin-left:25px;}
+.mr25 {margin-right:25px;}
+.ml55 {margin-left:55px;}
+.mr55 {margin-right:55px;}
+.c-red {color:#e81a1a;}
+.c-blue {color:#269ac9;}
+.c-grey {color:#9a9a9a !important;}
+.c-grey2 {color:#707070;}
+.c-grey3 {color:#555555;}
+.c-grey4 {color:#888888;}
+.c-grey5 {color:#aaaaaa;}
+.c-grey6 {color:#777777;}
+.c-blue {color:#3b94d6;}
+.c-white {color:#ffffff;}
+.c-black {color:#333}
+a {color:#707070;}
+a.c-grey {color:#707070;}
+a.c-grey2 {color:#9a9a9a;}
+a.c-grey3 {color:#353535;}
+a.c-green {color:#0bb20c;}
+a:link,a:visited{text-decoration:none;}
+a:hover,a:active{cursor:pointer;}
+a.link-blue {color:#269ac9;}
+a.link-blue2 {color:#3b94d6;}
+a.underline {text-decoration:underline;}
+.border-radius {border-radius:5px;}
+.w36 {width:36px;}
+.max-width-60 {max-width:60px;}
+.max-width-130 {max-width:130px;}
+.hidden {overflow:hidden; white-space:nowrap; text-overflow:ellipsis;}
+.inline-block {display:inline-block;}
+.dis {display:block;}
+.undis {display:none;}
+.text-nowrap {white-space:nowrap;}
+.v-top {vertical-align:top;}
+.tac {text-align:center;}
+.block-center {margin-left:auto; margin-right:auto; display:block;}
+
+/*背景色*/
+.bg-grey {background-color:#c1c1c1 !important;}
+.bg-blue {background-color:#3b94d6;}
+
+/*按钮样式*/
+.btn1 {width:100%; height:40px; line-height:40px; vertical-align:middle; text-align:center; color:#fff; display:block; border-radius:5px;}
+.bg-blue:not(.btn-disabled):active {background-color:#2780c2;}
+.btn-disabled {background-color:#ccc !important;}
+.btn2 {width:145px; height:35px; color:#fff; font-size:15px; line-height:35px; text-align:center; vertical-align:middle; margin:18px auto 20px auto; border-radius:50px; display:block;}
+.btn3 {width:145px; height:35px; color:#fff; font-size:15px; line-height:35px; text-align:center; vertical-align:middle; border-radius:50px; display:block;}
+.btn4 {width:150px; height:40px; line-height:40px; vertical-align:middle; text-align:center; color:#fff; display:inline-block; border-radius:5px;}
+.fixed-bottom-btn {position:fixed; bottom:5px; left:50%; transform:translate(-50%,0);}
+
+/*tab*/
+.tab-wrap {position:relative; width:100%; line-height:38px; display:-webkit-box; display:-moz-box; display:-ms-flexbox; display:-webkit-flex; display:flex; font-size:13px; background-color:#fff;}
+.tab-wrap a {position:relative; display:block; -webkit-box-flex:1; -moz-box-flex:1; -ms-flex:1; flex:1;}
+.tab-wrap a:first-child:after {display:none;}
+.tab-wrap a:after {content:" "; position:absolute; left:0; top:0; width:1px; height:100%; border-left:1px solid #ccc; color:#707070;}
+.weixin-tab {text-align:center; border-bottom:1px solid #ccc;}
+
+/*bottom-tab*/
+.bottom-tab-wrap {position:fixed; width:100%; bottom:0; line-height:38px; display:-webkit-box; display:-moz-box; display:-ms-flexbox; display:-webkit-flex; display:flex; font-size:13px; background-color:#fff;}
+.bottom-tab-wrap a {display:block; -webkit-box-flex:1; -moz-box-flex:1; -ms-flex:1; flex:1; position:relative;}
+.bottom-tab-wrap a:after {content:" "; position:absolute; left:0; top:0; width:1px; height:100%; border-left:1px solid #ccc; color:#707070;}
+
+/*动态样式*/
+.post-container {width:100%;}
+.post-wrapper {width:100%; background-color:#ffffff; margin:10px auto;}
+.post-main {padding:10px 15px; color:#9a9a9a;}
+.post-avatar {width:30px; height:30px;}
+.post-title {font-size:13px; text-align:left;}
+.post-detail-info {font-size:13px; text-align:left; color:#9a9a9a;}
+.fl {float:left;}
+.fr {float:right;}
+.cl {clear:both; overflow:hidden;}
+.post-content {width:100%; font-size:14px; line-height:20px; height:100px; overflow:hidden; word-break:normal; word-wrap:break-word; text-align:justify;}
+.post-all-content a {color:#136ec2;}
+.post-interactive {width:100%; height:35px; line-height:35px; vertical-align:middle; border-top:1px solid #e6e6e6; background-color:#f8f9fb;}
+.post-interactive-column,
+.post-interactive-reply,
+.post-interactive-praise {width:50%; text-align:center; float:left; font-size:13px;}
+.more-wrap {width:100%;}
+.more-events {width:100%; font-size:13px; text-align:center; margin:0 auto; padding: 5px 0; border-top:1px solid #e6e6e6; border-bottom:1px solid #e6e6e6; border-radius:3px; background-color:#f8f9fb; }
+.border-bottom {border-bottom:1px solid #e6e6e6;}
+.post-reply-wrap {width:100%;}
+.post-reply-wrap:first-child {border-top:1px solid #ccc;}
+.post-input-wrap {width:100%; position:fixed; bottom:0; background-color:#fff;}
+.post-input-wrap2 {width:100%;}
+.post-reply-row {margin:10px 15px; color:#9a9a9a; background-color:#fff; border-bottom:1px solid #f0f0f0;}
+.post-reply-avatar {width:45px; height:30px; text-align:center; margin-right:10px;}
+.post-reply-user {font-size:13px; text-align:left; margin-bottom:10px;}
+.post-reply-content {font-size:13px; word-break:break-all; word-wrap:break-word; overflow:hidden; text-align:justify;}
+.post-reply-content img {max-width:100%;}
+.post-reply-content a {color:#136ec2;}
+.post-reply-date, .post-reply-trigger {font-size:13px;}
+.post-input-container {position:relative; padding-right:70px;}
+.copy-input-container {position:relative; padding-right:70px;}
+.copy-input {width:100%; height:18px; line-height:18px; padding:5px; vertical-align: middle; font-size:12px; border-radius:3px; position:absolute; left:-999em;}
+.post-reply-input {width:100%; height:18px; max-height:54px; line-height:18px; vertical-align: middle; font-size:13px; border:1px solid #e6e6e6; outline:none; padding:5px; margin:0; border-radius:3px; overflow-y:auto; resize:none; background-color:#f0eff4;}
+.post-reply-submit {position:absolute; font-size:13px; height:30px; line-height:30px; vertical-align:middle; padding:0 8px; color:#fff; background-color:#269ac9; outline:none; border:none; top:0; right:0;}
+.reply-icon {background:url(/images/wechat/icon_list.gif) -150px -155px no-repeat; width:20px; height:20px; display:inline-block; vertical-align:middle;}
+.praise-icon {background:url(/images/wechat/icon_list.gif) -36px -88px no-repeat; width:20px; height:20px; display:inline-block; vertical-align:middle;}
+.praised-icon {background:url(/images/wechat/icon_list.gif) -152px -86px no-repeat; width:20px; height:20px; display:inline-block; vertical-align:middle;}
+.num-block {display:inline-block; vertical-align:top;}
+.post-op-banner {height:20px; line-height:20px; vertical-align:middle;}
+
+/*20160628动态新样式*/
+.post-dynamic-author {width:50%; height:30px; line-height:30px; font-size:14px; color:#5b5b5b; vertical-align:middle;}
+.post-dynamic-time {height:30px; line-height:30px; vertical-align:middle;}
+.post-dynamic-title {font-size:15px;}
+.post-dynamic-from {width:50%; font-size:13px;}
+.post-box-shadow {box-shadow: 0px 2px 8px rgba(146, 153, 169, 0.5);}
+.post-reply-author {width:50%; height:20px; line-height:20px; font-size:12px; color:#5d5d5d; vertical-align:middle;}
+.post-reply-time {height:20px; line-height:20px; vertical-align:middle;}
+
+/* loading 弹框*/
+.loading-bg {position:fixed; width:100%; height:100%; left:0; top:0; z-index:99; background:rgba(206, 206, 206, 0.3); overflow:hidden;}
+.loading-box {position:absolute; top:50%; background:rgba(240,240,240, 0.5); width:160px; height:72px; left:50%; margin-top:-36px; margin-left:-80px; text-align:center;}
+.loading-box img {margin-top: 3px; text-align: center;}
+.loading-box span {display: block; font-size:12px;}
+
+/*帖子锁定样式*/
+.locked_btn_cir {background: url("/images/wechat/locked.png") 0 0 no-repeat; cursor: default;}
+
+/*20150612加入班级样式*/
+.add-class-box {position:fixed; width:80%; max-width:300px; min-width:240px; font-size:15px; color:#444; background-color:#fff; box-shadow: 0px 2px 8px rgba(146, 153, 169, 0.5); border-radius:5px; top:50%; left:50%; transform: translate(-50%,-50%); -ms-transform: translate(-50%,-50%); -moz-transform: translate(-50%,-50%); -webkit-transform: translate(-50%,-50%); -o-transform: translate(-50%,-50%);}
+.add-class-tip {padding-top:1.2em; padding-bottom:.5em; font-weight:400;}
+.class-number-input {width:80%; max-width:240px; height:28px; border:1px solid #ccc; padding-left:5px; margin:0 auto; display:block;}
+.cancel-btn {width:49%; height:37px; line-height:37px; text-align:center; vertical-align:middle; border-top:1px solid #ccc;}
+.submit-btn {width:49%; height:37px; line-height:37px; text-align:center; vertical-align:middle; border-top:1px solid #ccc;}
+.slice {width:2%; text-align:center; border-top:1px solid #ccc;}
+.slice-line {width:1px; height:37px; margin:auto; background:#ccc;}
+
+/*20160613邀请码样式*/
+.qr-code-wrap {width:100%; padding:40px 0; background-color:#3b94d6;}
+.qr-code-box {width:225px; background-color:#fff; border-radius:3px; margin:0 auto;}
+.share-class-name {font-size:18px; color:#3b3b3b; text-align:center; padding:12px; border-bottom:1px solid #cccccc;}
+.qr-img-wrap {width:100%; border-bottom:1px dashed #ccc;}
+.qr-code-img {margin:36px auto; display:block;}
+.invitation-code-wrap {text-align:center; font-size:18px; color:#3b3b3b; padding:16px;}
+.share-code-wrap {width:100%; background-color:#efeff4;}
+.share-code-btn, .finish-btn {width:145px; height:35px; color:#fff; font-size:15px; line-height:35px; text-align:center; vertical-align:middle; background-color:#ff7239; margin:18px auto 20px auto; border-radius:50px; display:block;}
+.share-code-instruction {max-width:228px; font-size:12px; color:#666; line-height:20px; margin:20px auto 30px;}
+
+/*20160613班级详情*/
+.class-detail-name, .blue-title {width:100%; height:45px; line-height:45px; vertical-align:middle; background-color:#3b94d6; color:#fff; font-size:18px; text-align:center;}
+.blue-title-sub {position:absolute; right:10px;}
+.slice2 {width:2%; text-align:center; background-color:#fff; border-bottom:1px solid #ccc;}
+.slice3 {width:1%; height:38px; text-align:center; background-color:#fff; border-bottom:1px solid #ccc;}
+.slice-line2 {width:1px; height:38px; margin:auto; background:#ccc;}
+.class-detail-tab {width:23%; height:38px; line-height:38px; font-size:13px; color:#444; background-color:#fff; float:left; text-align:center; vertical-align:middle; border-bottom:1px solid #ccc;}
+.class-detail-tab2 {width:32%; height:38px; line-height:38px; font-size:13px; color:#444; background-color:#fff; float:left; text-align:center; vertical-align:middle; border-bottom:1px solid #ccc;}
+.class-detail-tab3 {width:48%; height:38px; line-height:38px; font-size:13px; color:#444; background-color:#fff; float:left; text-align:center; vertical-align:middle; border-bottom:1px solid #ccc;}
+.class-tab-active {border-bottom:3px solid #3b94d6;}
+.tab-active-arrow {border-width:4px; position:absolute; top:41px; left:50%; transform:translate(-50%,0); border-color:#3b94d6 transparent transparent transparent; border-style:solid dashed dashed dashed;}
+.class-search-wrap {padding:8px 12px; position:relative;}
+.class-search-inner {padding:0 30px; background-color:#fff;}
+.class-search-icon {position:absolute; top:16px; left:16px;}
+.class-detail-search {width:100%; height:33px; color:#999; background-color:#fff; border:none; outline:none;}
+.border-top {border-top:1px solid #ccc;}
+.class-detail-row {width:100%; line-height:18px; padding:10px 0; border-bottom:1px solid #ccc; background-color:#fff;}
+.class-member-row {width:100%; line-height:18px; padding:5px 0; border-bottom:1px solid #ccc; background-color:#fff; position:relative;}
+.class-test-tip {text-align:center; font-size:13px; color:#444; padding-top:40px;}
+.img-circle {border-radius:50% !important;}
+.member-banner {height:24px; line-height:24px; text-align:center; vertical-align:middle; background-color:#dfdfdf;}
+.resource-width {width:76%;}
+.courseware-from-width {max-width:57%;}
+.other-from-width {max-width:80%;}
+.course-name-width {width:68%;}
+
+/*20160614班级列表*/
+.course-diff-row {width:100%; height:28px; line-height:28px; vertical-align:middle; background-color:#fff; border-bottom:1px solid #ccc;}
+.course-list-row {width:100%; height:38px; line-height:38px; vertical-align:middle; border-top:1px solid #ccc; border-bottom:1px solid #ccc; background-color:#fff;}
+.class-list {width:100%; border-bottom:1px solid #ccc;}
+.class-list li {height:40px; line-height:40px; vertical-align:middle; margin:0 25px; border-left:1px solid #ccc; border-bottom:1px solid #ccc; position:relative;}
+.class-list-name {max-width:75%; display:inline-block;}
+.class-list-dot {position:absolute; top:13px; left:-8px;}
+.border-bottom-none {border-bottom:none !important;}
+.border-top-none {border-top:none !important;}
+.students-amount {height:14px; line-height:14px; vertical-align:middle; padding:2px 5px; background-color:#e6e6e6; border-radius:10px;}
+.amount-arrow {height:14px; line-height:14px; vertical-align:middle; margin-top:12px;}
+.new-class-btn {font-size:15px; color:#fff; background-color:#3b94d6; padding:10px 40px; border-radius:20px; display:inline-block; margin:0 auto;}
+.join-class-btn {font-size:15px; color:#444; background-color:#ccc; padding:10px 40px; border-radius:20px; display:inline-block; margin:0 auto;}
+.new-class-input {width:60%; color:#555; height:16px; line-height:16px; vertical-align:middle; border:none; outline:none; padding:8px 0;}
+.class-list-setting {position:absolute; top:11px; right:10px;}
+.class-setting-wrap {width:38px; height:38px; position:absolute; top:0; right:0;}
+
+/*20160616登录注册*/
+.login-wrap {padding:0 10px;}
+.input-box-wrap {padding-right:17px;}
+.input-box { -webkit-appearance: none; font-size: 15px;width:100%; height:18px; padding: 10px 0px 10px 5px; line-height:18px; border:1px solid #ccc; border-radius:5px;}
+.login-op-wrap {height:30px; line-height:30px; vertical-align:middle;}
+.login-box{display:inline-block; width:14px; height:14px; line-height:14px; text-align:center; vertical-align:middle; border:1px solid #ccc; background:#fff; border-radius:3px; color:#fff; cursor:pointer;}
+.login-box.checked{background:#63c360; border:1px solid #63c360;}
+.login-box.checked:after{content:url(/images/wechat/checked.png);}
+.forget-psw-wrap {width:60px; margin:30px auto;}
+
+/*二级回复*/
+.mult-reply-container{ border:solid 1px #f3ddb3; background:#fffef4; padding:4px;color:#999;}
+.mult-reply-content{ color:#555; font-size:13px;}
+.mult-reply-hide{ text-align:center; display:block; font-size:14px; color:#aaa; border-bottom:1px solid #F3DDB3; padding:8px 0;}
+.mult-reply-arrow{ color:#aaa; margin-right:10px; font-size:14px; font-weight:bold;}
+
+
+/*20160729项目说明*/
+.project-intro {line-height:2; width:120px; margin-left:auto; margin-right:auto;}
+.project-intro li {position:relative;}
+.project-intro-dot {font-size:25px; font-weight:bold; position:absolute; left:-10px; top:-13px;}
+
+/*新建说明*/
+.new-tip {line-height:2;}
+.new-tip li {position:relative; padding-left:10px;}
+
+/*20160810绑定说明*/
+.ac-wrap {text-align:center;}
+.ac-content {display:inline-block; line-height:2;}
+.ac-content li {position:relative; text-align:left; padding-left:5px;}
\ No newline at end of file
diff --git a/spec/controllers/pull_requests_controller_spec.rb b/spec/controllers/pull_requests_controller_spec.rb
new file mode 100644
index 000000000..1e6838c53
--- /dev/null
+++ b/spec/controllers/pull_requests_controller_spec.rb
@@ -0,0 +1,5 @@
+require 'rails_helper'
+
+RSpec.describe PullRequestsController, :type => :controller do
+
+end
diff --git a/spec/factories/pull_requests.rb b/spec/factories/pull_requests.rb
new file mode 100644
index 000000000..51a2b94a1
--- /dev/null
+++ b/spec/factories/pull_requests.rb
@@ -0,0 +1,8 @@
+FactoryGirl.define do
+  factory :pull_request do
+    pull_request_id 1
+gpid 1
+user_id 1
+  end
+
+end
diff --git a/spec/models/pull_request_spec.rb b/spec/models/pull_request_spec.rb
new file mode 100644
index 000000000..d7e798e9a
--- /dev/null
+++ b/spec/models/pull_request_spec.rb
@@ -0,0 +1,5 @@
+require 'rails_helper'
+
+RSpec.describe PullRequest, :type => :model do
+  pending "add some examples to (or delete) #{__FILE__}"
+end