From f23f02cb80cfd88caf718a0764b870f04294a429 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E2=80=9Cxxq250=E2=80=9D?= <“xxq250@qq.com”>
Date: Wed, 23 Nov 2022 17:07:54 +0800
Subject: [PATCH 1/3] =?UTF-8?q?fixed=20=E5=A2=9E=E5=8A=A0emoji=E8=A1=A8?=
 =?UTF-8?q?=E6=83=85=E6=94=AF=E6=8C=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../20221123023450_update_user_nick_name.rb   | 21 +++++++++++++++++++
 1 file changed, 21 insertions(+)
 create mode 100644 db/migrate/20221123023450_update_user_nick_name.rb

diff --git a/db/migrate/20221123023450_update_user_nick_name.rb b/db/migrate/20221123023450_update_user_nick_name.rb
new file mode 100644
index 000000000..0910b7397
--- /dev/null
+++ b/db/migrate/20221123023450_update_user_nick_name.rb
@@ -0,0 +1,21 @@
+class UpdateUserNickName < ActiveRecord::Migration[5.2]
+  def change
+    execute("ALTER TABLE `users` MODIFY `nickname` VARCHAR(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci;")
+    execute("ALTER TABLE `open_users` MODIFY `extra` text CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci;")
+
+    execute("ALTER TABLE `issues` MODIFY `subject` VARCHAR(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci;")
+    execute("ALTER TABLE `issues` MODIFY `description` longtext CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci;")
+
+    execute("ALTER TABLE `projects` MODIFY `description` longtext CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci;")
+    execute("ALTER TABLE `project_details` MODIFY `content` longtext CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci;")
+
+    execute("ALTER TABLE `journals` MODIFY `notes` longtext CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci;")
+    execute("ALTER TABLE `journal_details` MODIFY `old_value` text CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci;")
+    execute("ALTER TABLE `journal_details` MODIFY `value` text CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci;")
+
+    execute("ALTER TABLE `claims` MODIFY `note` text CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci;")
+
+    execute("ALTER TABLE `commit_logs` MODIFY `message` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci;")
+
+  end
+end

From a6923bf7ed3c5ce2fa54ee9811a344b046848989 Mon Sep 17 00:00:00 2001
From: yystopf <yystopf@163.com>
Date: Wed, 23 Nov 2022 17:44:37 +0800
Subject: [PATCH 2/3] =?UTF-8?q?=E6=96=B0=E5=A2=9E=EF=BC=9Aget=5Fuser=5Finf?=
 =?UTF-8?q?o=E7=94=B5=E8=AF=9D=E5=8F=B7=E7=A0=81=E5=B1=95=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/users/get_user_info.json.jbuilder | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/views/users/get_user_info.json.jbuilder b/app/views/users/get_user_info.json.jbuilder
index 611a09d50..b20bc2e16 100644
--- a/app/views/users/get_user_info.json.jbuilder
+++ b/app/views/users/get_user_info.json.jbuilder
@@ -10,7 +10,7 @@ json.is_teacher @user.user_extension&.teacher?
 json.user_identity @user.identity
 json.tidding_count 0
 json.user_phone_binded @user.phone.present?
-# json.phone @user.phone
+json.phone @user.phone
 # json.email @user.mail
 json.profile_completed @user.profile_is_completed?
 json.professional_certification @user.professional_certification

From 8f8dab10c3e39e908e33149cce50060a4cb94e66 Mon Sep 17 00:00:00 2001
From: xxq250 <xxq250@qq.com>
Date: Wed, 23 Nov 2022 17:58:51 +0800
Subject: [PATCH 3/3] =?UTF-8?q?fixed=20=E5=A2=9E=E5=8A=A0emoji=E8=A1=A8?=
 =?UTF-8?q?=E6=83=85=E6=94=AF=E6=8C=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/models/user.rb                                 | 3 ++-
 db/migrate/20221123023450_update_user_nick_name.rb | 2 ++
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/app/models/user.rb b/app/models/user.rb
index 62eeb77ee..fc0911d03 100644
--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -190,7 +190,8 @@ class User < Owner
            :show_email, :show_location, :show_department, :super_description, :show_super_description,
            :technical_title, :province, :city, :custom_department, to: :user_extension, allow_nil: true
 
-  before_save :update_hashed_password, :set_lastname
+  # before_save :update_hashed_password, :set_lastname
+  before_save :update_hashed_password
   after_save :reset_cache_data
   after_create do
     SyncTrustieJob.perform_later("user", 1) if allow_sync_to_trustie?
diff --git a/db/migrate/20221123023450_update_user_nick_name.rb b/db/migrate/20221123023450_update_user_nick_name.rb
index 0910b7397..0759f9291 100644
--- a/db/migrate/20221123023450_update_user_nick_name.rb
+++ b/db/migrate/20221123023450_update_user_nick_name.rb
@@ -17,5 +17,7 @@ class UpdateUserNickName < ActiveRecord::Migration[5.2]
 
     execute("ALTER TABLE `commit_logs` MODIFY `message` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci;")
 
+    execute("ALTER TABLE `user_extensions` MODIFY `description` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci;")
+
   end
 end