From 834b65aeeb105e4d9af9aead4f62adba0d60febc Mon Sep 17 00:00:00 2001
From: anke1460 <zuosjob@gmail.com>
Date: Thu, 27 Feb 2020 21:52:57 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E8=BF=87=E6=BB=A4=E9=9D=9E?=
 =?UTF-8?q?=E6=B3=95=E5=86=85=E5=AE=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/models/user.rb                            |   4 ++--
 .../chinese_dictionary.txt                    |   3 ---
 config/harmonious_dictionary/harmonious.hash  | Bin 46278 -> 46209 bytes
 3 files changed, 2 insertions(+), 5 deletions(-)

diff --git a/app/models/user.rb b/app/models/user.rb
index e74290c84..6fac73416 100644
--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -726,8 +726,8 @@ class User < ApplicationRecord
   end
 
   def validate_sensitive_string
-    raise("真实姓名包含敏感词汇，请重新输入") if lastname && !HarmoniousDictionary.clean?(lastname)
-    raise("昵称包含敏感词汇，请重新输入") if nickname && !HarmoniousDictionary.clean?(nickname)
+    raise("真实姓名包含敏感词汇，请重新输入#{lastname}") if lastname && !HarmoniousDictionary.clean?(lastname)
+    raise("昵称包含敏感词汇，请重新输入#{nickname}") if nickname && !HarmoniousDictionary.clean?(nickname)
   end
 
   def set_laboratory
diff --git a/config/harmonious_dictionary/chinese_dictionary.txt b/config/harmonious_dictionary/chinese_dictionary.txt
index 6696c8be2..65f4397ce 100644
--- a/config/harmonious_dictionary/chinese_dictionary.txt
+++ b/config/harmonious_dictionary/chinese_dictionary.txt
@@ -357,7 +357,6 @@ H漫画
 学生暴动
 镇压学生
 广安第二人民医院
-胡新宇
 趙紫陽
 自由亚州
 践踏中国女性
@@ -1155,7 +1154,6 @@ A片
 信用危机
 邢铮
 熊炎
-熊焱
 徐邦秦
 徐才厚
 徐匡迪
@@ -1192,7 +1190,6 @@ A片
 张伯笠
 张宏堡
 张万年
-张伟国
 张昭富
 张志清
 赵海青
diff --git a/config/harmonious_dictionary/harmonious.hash b/config/harmonious_dictionary/harmonious.hash
index 22445986863bd30d3f1fc58da23e02cf36cee963..67e985d4c9cb4de4c6f9b4a21b7aa66fde07a2a5 100644
GIT binary patch
delta 54
zcmX^1lBw|}(}u--jQo?A@VRbg;de=77w}Z#c)DcyWJf=V$>{|*Hb)iuTC%eN1)n$d
KZQi?zlM4VekQ8D7

delta 75
zcmZpC$#m=`(}u--i~^IF@VQQYJA;S$>ALpKcliPm83iZn6?|iUvS<F}hb$7CRSJDA
f#n?TSIG#84u~{>ORI^#Lg@Cv%8#h<1;^YDVr9>Sp