From f946312abdfeaed4fdb241b2b263f98a6b0d93d0 Mon Sep 17 00:00:00 2001
From: daiao <358551898@qq.com>
Date: Mon, 5 Aug 2019 18:03:16 +0800
Subject: [PATCH 1/4] =?UTF-8?q?=E7=9C=9F=E5=AE=9E=E5=A7=93=E5=90=8D?=
 =?UTF-8?q?=E5=92=8C=E6=98=B5=E7=A7=B0=E9=95=BF=E5=BA=A6=E9=99=90=E5=88=B6?=
 =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E5=88=B030?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/forms/users/update_account_form.rb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/forms/users/update_account_form.rb b/app/forms/users/update_account_form.rb
index 16c3c8013..2a75a7d87 100644
--- a/app/forms/users/update_account_form.rb
+++ b/app/forms/users/update_account_form.rb
@@ -5,8 +5,8 @@ class Users::UpdateAccountForm
   attr_accessor :nickname, :name, :show_realname, :gender, :location, :location_city,
                 :identity, :student_id, :technical_title, :school_id, :department_id
 
-  validates :nickname, presence: true, length: { maximum: 20 }
-  validates :name, presence: true, length: { maximum: 10 }
+  validates :nickname, presence: true, length: { maximum: 30 }
+  validates :name, presence: true, length: { maximum: 30 }
   validates :gender, presence: true, numericality: { only_integer: true }, inclusion: { in: [0, 1] }
   validates :location, presence: true
   validates :location_city, presence: true

From d04c4c306d861794cf9e5840ba31a24fc26182eb Mon Sep 17 00:00:00 2001
From: daiao <358551898@qq.com>
Date: Mon, 5 Aug 2019 18:10:27 +0800
Subject: [PATCH 2/4] =?UTF-8?q?=E7=94=A8=E6=88=B7=E5=A7=93=E5=90=8D?=
 =?UTF-8?q?=E5=92=8C=E6=98=B5=E7=A7=B0=E9=AA=8C=E8=AF=81=E5=8E=BB=E9=99=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/forms/users/update_account_form.rb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/forms/users/update_account_form.rb b/app/forms/users/update_account_form.rb
index 2a75a7d87..16c3c8013 100644
--- a/app/forms/users/update_account_form.rb
+++ b/app/forms/users/update_account_form.rb
@@ -5,8 +5,8 @@ class Users::UpdateAccountForm
   attr_accessor :nickname, :name, :show_realname, :gender, :location, :location_city,
                 :identity, :student_id, :technical_title, :school_id, :department_id
 
-  validates :nickname, presence: true, length: { maximum: 30 }
-  validates :name, presence: true, length: { maximum: 30 }
+  validates :nickname, presence: true, length: { maximum: 20 }
+  validates :name, presence: true, length: { maximum: 10 }
   validates :gender, presence: true, numericality: { only_integer: true }, inclusion: { in: [0, 1] }
   validates :location, presence: true
   validates :location_city, presence: true

From 0fce5d58e7316bb9dae1939b12086b093a986b36 Mon Sep 17 00:00:00 2001
From: caishi <1149225589@qq.com>
Date: Tue, 6 Aug 2019 10:29:46 +0800
Subject: [PATCH 3/4] =?UTF-8?q?=E4=B8=AA=E4=BA=BA=E4=B8=BB=E9=A1=B5?=
 =?UTF-8?q?=E5=A7=93=E5=90=8D=E8=B6=85=E5=87=BA=E7=9C=81=E7=95=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 public/react/src/modules/user/usersInfo/InfosPath.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/public/react/src/modules/user/usersInfo/InfosPath.js b/public/react/src/modules/user/usersInfo/InfosPath.js
index b7038b0e9..11f50ebf9 100644
--- a/public/react/src/modules/user/usersInfo/InfosPath.js
+++ b/public/react/src/modules/user/usersInfo/InfosPath.js
@@ -170,7 +170,7 @@ class InfosPath extends Component{
                     <div className="mt10">
                       <p className="color-grey-6 clearfix">
                         <a href="javascript:void(0)" className="fl color-grey-9 overflowHidden1"
-                            title={item.owner_name.length > 12 ? item.owner_name : ''}  style={{ maxWidth: '198px'}}
+                            title={item.owner_name.length > 12 ? item.owner_name : ''}  style={{ maxWidth: '175px'}}
                         >{item.owner_name}</a>
                         <span className="fr squareIconSpan">
                           <Tooltip placement='bottom' title="访问量">

From c3e287cff8a7db1ae043d82cfc6fe5754002be26 Mon Sep 17 00:00:00 2001
From: caishi <1149225589@qq.com>
Date: Tue, 6 Aug 2019 10:47:35 +0800
Subject: [PATCH 4/4] =?UTF-8?q?=E4=B8=AA=E4=BA=BA=E4=B8=BB=E9=A1=B5?=
 =?UTF-8?q?=E5=A7=93=E5=90=8D=E8=BF=87=E9=95=BF=E7=9C=81=E7=95=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 public/react/src/modules/user/usersInfo/InfosCourse.js  | 2 +-
 public/react/src/modules/user/usersInfo/InfosProject.js | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/public/react/src/modules/user/usersInfo/InfosCourse.js b/public/react/src/modules/user/usersInfo/InfosCourse.js
index 2f7d206b8..bff9792e7 100644
--- a/public/react/src/modules/user/usersInfo/InfosCourse.js
+++ b/public/react/src/modules/user/usersInfo/InfosCourse.js
@@ -157,7 +157,7 @@ class InfosCourse extends Component{
                       <span>{item.name}</span>
                     </p>
                     <span><img alt="用户" className="radius mt15" height="60" src={getImageUrl('images/'+`${item.teacher && item.teacher.avatar_url}`)} width="60"/></span>
-                    <p className="font-14 mt10"><span>{item.teacher && item.teacher.real_name}</span></p>
+                    <p className="font-14 mt10 task-hide"><span>{item.teacher && item.teacher.real_name}</span></p>
                     <p className="font-16 mb15 task-hide mt10"><span className="color-grey-98">{item.teacher && item.teacher.school_name}</span></p>
                   </div>
                   <div className="edu-txt-center course-bottom">
diff --git a/public/react/src/modules/user/usersInfo/InfosProject.js b/public/react/src/modules/user/usersInfo/InfosProject.js
index 195e98b73..c4ce920f0 100644
--- a/public/react/src/modules/user/usersInfo/InfosProject.js
+++ b/public/react/src/modules/user/usersInfo/InfosProject.js
@@ -151,7 +151,7 @@ class InfosProject extends Component{
                       <span>{item.name}</span>
                     </p>
                     <span><img alt="用户" className="radius mt15" height="60" src={getImageUrl(`images/${item.owner.avatar_url}`)} width="60"/></span>
-                    <p className="font-14 mt10"><span>{item.owner.real_name}</span></p>
+                    <p className="font-14 mt10 task-hide"><span>{item.owner.real_name}</span></p>
                     <p className="font-16 mb15 mt10 task-hide"><span className="color-grey-9">{item.owner.school_name}</span></p>
                   </div>
                   <div className="edu-txt-center course-bottom">