diff --git a/app/models/project.rb b/app/models/project.rb
index 3333c805b..520407589 100644
--- a/app/models/project.rb
+++ b/app/models/project.rb
@@ -910,6 +910,7 @@ class Project < ActiveRecord::Base
   end
 
   # 生成邀请码
+  # 如果已有改邀请码，则重新生成
   CODES = %W(2 3 4 5 6 7 8 9 A B C D E F G H J K L N M O P Q R S T U V W X Y Z)
   def generate_invite_code
     code = read_attribute(:invite_code)
diff --git a/app/views/layouts/_join_exit_project.html.erb b/app/views/layouts/_join_exit_project.html.erb
index 35d8f87ef..e893949f4 100644
--- a/app/views/layouts/_join_exit_project.html.erb
+++ b/app/views/layouts/_join_exit_project.html.erb
@@ -2,9 +2,7 @@
    <!--关注:非项目成员-->
   <% if !User.current.member_of?(@project) && User.current.login? && !User.current.admin %>
       <span><%= watcher_link_for_project(@project, User.current) %></span>
-  <% end %>
   <!--加入项目 -->
-  <% if !User.current.member_of?(@project) && User.current.login? && !User.current.admin  %>
       <%= join_in_project_link(@project, User.current) %>
   <% end %>
   <!--配置项目-->
diff --git a/app/views/layouts/base_projects.html.erb b/app/views/layouts/base_projects.html.erb
index f68f4c86f..e7b23b3b5 100644
--- a/app/views/layouts/base_projects.html.erb
+++ b/app/views/layouts/base_projects.html.erb
@@ -53,7 +53,8 @@
           <%= image_tag(url_to_avatar(@project), :width => "60", :height => "60") %>
         </div>
         <div class="pr_info_id fl mb5 f14">
-          <%= l(:label_project_ivite_code)%><%= @project.generate_invite_code %>
+          <%= l(:label_project_ivite_code)%>
+          <%= (User.current.member_of?(@project) || User.current.admin?) ? @project.invite_code : "******" %>
         </div>
         <!--关注、申请加入/退出项目-->
         <div id="join_exit_project_div">