Merge branch 'develop' into trustie_server

app/models/user/avatar.rb

@@ -11,11 +11,16 @@ class User
     end
 
     def get_letter_avatar_url(size = :lg)
-      avatar_path(size).split('public/')&.last
+      avatar_path(self.username, size).split('public/')&.last
     end
 
-    def avatar_path(size)
+    def self.get_letter_avatar_url(name, size = :lg)
-      LetterAvatar.generate self.username, avatar_size(size)
+      return "" if name.blank?
+      avatar_path(Pinyin.t(name), size).split('public/')&.last
+    end
+    
+    def avatar_path(username, size)
+      LetterAvatar.generate username, avatar_size(size)
     end
     
     # 返回头像尺寸

app/views/repositories/_commit_author.json.jbuilder

@@ -7,5 +7,5 @@ else
   json.id nil
   json.login name 
   json.name name 
-  json.image_url File.join("avatars/User","b")
+  json.image_url User.get_letter_avatar_url(name)
 end

app/views/repositories/commits.json.jbuilder

@@ -26,7 +26,7 @@ else
           json.login commit['commit']['author']['name']
           json.type nil
           json.name commit['commit']['author']['name']
-          json.image_url File.join("avatars/User","b")
+          json.image_url User.get_letter_avatar_url(commit['commit']['author']['name'])
         end
       end
     end