diff --git a/pkg/app/server/controller/userhandler.go b/pkg/app/server/controller/userhandler.go
index 2a7929057149f268907d78656eb98387c953bbff..e325ad01ddae46c726ed9afed6a44f5067b03bbf 100644
--- a/pkg/app/server/controller/userhandler.go
+++ b/pkg/app/server/controller/userhandler.go
@@ -48,7 +48,7 @@ func Register(c *gin.Context) {
 		response.Response(c, http.StatusUnprocessableEntity,
 			422,
 			nil,
-			"Email exist!")
+			"邮箱已存在!")
 		return
 	}
 
@@ -130,6 +130,19 @@ func UserAll(c *gin.Context) {
 	model.JsonPagination(c, list, total, query)
 }
 
+// 高级搜索
+func UserSearch(c *gin.Context) {
+	// var users model.User
+	// c.Bind(&users)
+	// var email = users.Email
+	// fmt.Println(email)
+	// mysqlmanager.DB.Where("email like ?", "%"+email+"%").Find(&users)
+	// response.Response(c, http.StatusOK,
+	// 	200,
+	// 	gin.H{"data": users},
+	// 	"查询成功!")
+}
+
 // 重置密码
 func ResetPassword(c *gin.Context) {
 	var user model.User
@@ -143,10 +156,10 @@ func ResetPassword(c *gin.Context) {
 		response.Response(c, http.StatusOK,
 			200,
 			gin.H{"data": user},
-			"password reset successfully!")
+			"密码重置成功!")
 		return
 	} else {
-		response.Fail(c, nil, "No user found!")
+		response.Fail(c, nil, "无此用户!")
 	}
 }
 
@@ -156,14 +169,14 @@ func DeleteUser(c *gin.Context) {
 	c.Bind(&user)
 	userEmail := user.Email
 	if dao.IsEmailExist(userEmail) {
-		mysqlmanager.DB.Where("email=?", userEmail).Delete(user)
+		mysqlmanager.DB.Where("email=?", userEmail).Unscoped().Delete(user)
 		response.Response(c, http.StatusOK,
 			200,
 			nil,
-			"User deleted successfully!")
+			"此用户已删除!")
 		return
 	} else {
-		response.Fail(c, nil, "No user found!")
+		response.Fail(c, nil, "无此用户!")
 	}
 }
 
diff --git a/pkg/app/server/model/user.go b/pkg/app/server/model/user.go
index 731c944587c3df51f8aedfcd20fe7553733050ab..4e84af7c9a0cf5982e9d1a8005d292115f94f494 100644
--- a/pkg/app/server/model/user.go
+++ b/pkg/app/server/model/user.go
@@ -31,8 +31,3 @@ func (u *User) All(q *PaginationQ) (list *[]User, total uint, err error) {
 	total, err = CrudAll(q, tx, list)
 	return
 }
-
-//Refresh
-func (m *User) Refresh() (err error) {
-	return mysqlmanager.DB.Model(m).Update(m).Error
-}
diff --git a/pkg/app/server/router/router.go b/pkg/app/server/router/router.go
index 6de54c8af220db3fcd7af3b15c0919b7d17838cd..79d60f4c340da7b1e92a6ce32b345a742cce3692 100644
--- a/pkg/app/server/router/router.go
+++ b/pkg/app/server/router/router.go
@@ -38,6 +38,7 @@ func SetupRouter() *gin.Engine {
 		user.POST("/login", controller.Login)
 		user.GET("/info", middleware.AuthMiddleware(), controller.Info)
 		user.GET("/searchAll", controller.UserAll)
+		user.GET("/userSearch", controller.UserSearch)
 		user.GET("/reset", controller.ResetPassword)
 		user.POST("/delete", controller.DeleteUser)
 		user.POST("/update", controller.UpdateUser)
diff --git a/pkg/utils/os/cpu.go b/pkg/utils/os/cpu.go
index 3c852b587cc88ac834b666097e30b0758afc9b69..bde3d1b8b1d5cae70b3774cce99e0e68c49f0c5d 100644
--- a/pkg/utils/os/cpu.go
+++ b/pkg/utils/os/cpu.go
@@ -13,8 +13,8 @@ import (
 
 // 通过 /proc/cpuinfo来获取CPU型号
 type CPUInfo struct {
-	CpuName string
-	CpuNum  int
+	ModelName string
+	CpuNum    int
 }
 
 func (cpu *CPUInfo) String() string {
@@ -32,16 +32,28 @@ func (cpu *CPUInfo) String() string {
 
 // 获取CPU型号
 func GetCPUName() string {
-	cpuname, _ := utils.RunCommand("cat /proc/cpuinfo | grep name | sort | uniq")
+	cpuname, _ := utils.RunCommand("lscpu | grep '型号名称'| sort| uniq")
+	if cpuname == "" {
+		cpuname, _ = utils.RunCommand("lscpu | grep 'Model name'| sort| uniq")
+		if cpuname == "" {
+			logger.Error("获取cpu型号失败!")
+		}
+	}
+
 	cpuname = strings.Replace(cpuname, "\n", "", -1)
-	str := len("model name	: ")
-	cpuname = cpuname[str:]
+	str := strings.Split(cpuname, "：")
+	if len(str) == 1 {
+		str = strings.Split(cpuname, ":")
+		cpuname = strings.TrimLeft(str[1], " ")
+	} else {
+		cpuname = strings.TrimLeft(str[1], " ")
+	}
 	return cpuname
 }
 
 // 获取物理CPU个数
 func GetPhysicalCPU() int {
-	num, _ := utils.RunCommand("cat /proc/cpuinfo| grep 'physical id'| sort| uniq| wc -l")
+	num, _ := utils.RunCommand("cat /proc/cpuinfo| grep 'processor'| sort| uniq| wc -l")
 	num = strings.Replace(num, "\n", "", -1)
 	cpunum, err := strconv.Atoi(num)
 	if err != nil {
@@ -52,8 +64,8 @@ func GetPhysicalCPU() int {
 
 func GetCPUInfo() *CPUInfo {
 	cpuinfo := &CPUInfo{
-		CpuName: GetCPUName(),
-		CpuNum:  GetPhysicalCPU(),
+		ModelName: GetCPUName(),
+		CpuNum:    GetPhysicalCPU(),
 	}
 	return cpuinfo
 }