From bfac3f49131a7090efa950e5c45f33aad7f26e58 Mon Sep 17 00:00:00 2001
From: xxq250 <xxq250@qq.com>
Date: Wed, 7 Dec 2022 14:28:22 +0800
Subject: [PATCH] =?UTF-8?q?=E7=94=A8=E6=88=B7=E5=90=8D=E7=A7=B0=E7=BB=9F?=
 =?UTF-8?q?=E4=B8=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/models/user.rb                            | 26 +++++++++++--------
 .../20221207065141_change_memos_emoji.rb      |  6 +++++
 2 files changed, 21 insertions(+), 11 deletions(-)
 create mode 100644 db/migrate/20221207065141_change_memos_emoji.rb

diff --git a/app/models/user.rb b/app/models/user.rb
index 6a9678f6..d606c0e2 100644
--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -443,16 +443,19 @@ class User < ApplicationRecord
   def full_name
     return '游客' unless logged?
 
-    name = show_realname? ? lastname + firstname : nickname
-    name.blank? ? (nickname.blank? ? login : nickname) : name
+    # name = show_realname? ? lastname + firstname : nickname
+    # name.blank? ? (nickname.blank? ? login : nickname) : name
+    nickname.blank? ? login : nickname
   end
 
   # 用户的真实姓名（不考虑用户是否隐藏了真实姓名，课堂模块都用真实姓名）
   def real_name
     return '游客' unless logged?
-    name = lastname + firstname
-    name = name.blank? ? (nickname.blank? ? login : nickname) : name
-    name.gsub(/\s+/, '').strip    #6.11 -hs
+    # name = lastname + firstname
+    # name = name.blank? ? (nickname.blank? ? login : nickname) : name
+    # name.gsub(/\s+/, '').strip    #6.11 -hs
+    # name.strip
+    nickname.blank? ? login : nickname
   end
 
   def only_real_name
@@ -570,12 +573,13 @@ class User < ApplicationRecord
   end
 
   def show_real_name
-    name = lastname + firstname
-    if name.blank?
-      nickname.blank? ? login : nickname
-    else
-      name
-    end
+    # name = lastname + firstname
+    # if name.blank?
+    #   nickname.blank? ? login : nickname
+    # else
+    #   name
+    # end
+    nickname.blank? ? login : nickname
   end
 
   def update_hashed_password
diff --git a/db/migrate/20221207065141_change_memos_emoji.rb b/db/migrate/20221207065141_change_memos_emoji.rb
new file mode 100644
index 00000000..69465ce4
--- /dev/null
+++ b/db/migrate/20221207065141_change_memos_emoji.rb
@@ -0,0 +1,6 @@
+class ChangeMemosEmoji < ActiveRecord::Migration[5.2]
+  def change
+    execute("ALTER TABLE `memos` MODIFY `subject` VARCHAR(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci;")
+    execute("ALTER TABLE `memos` MODIFY `content` text CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci;")
+  end
+end