diff --git a/pluss-api-page/src/main/java/cn/pluss/platform/controller/UserInfoController.java b/pluss-api-page/src/main/java/cn/pluss/platform/controller/UserInfoController.java
index 7562770..ff5d5a8 100644
--- a/pluss-api-page/src/main/java/cn/pluss/platform/controller/UserInfoController.java
+++ b/pluss-api-page/src/main/java/cn/pluss/platform/controller/UserInfoController.java
@@ -93,7 +93,10 @@ public class UserInfoController {
     @ApiImplicitParams({
             @ApiImplicitParam(name = "UserInfo", value = "待添加的UserInfo实例", paramType = "body", dataType = "UserInfo", required = true)})
     public Result<Object> add(@RequestBody UserInfo userInfo) {
-        userInfo.getPassword();
+        String s = StringUtil.passwordCheck(userInfo.getPassword());
+        if (s == null){
+            return ResultGenerator.genFailResult("密码不合规");
+        }
         userInfoNewService.register(userInfo);
         return ResultGenerator.genSuccessResult();
     }
@@ -139,6 +142,10 @@ public class UserInfoController {
     @ApiImplicitParams({
             @ApiImplicitParam(name = "UserInfo", value = "更新的UserInfo实例", paramType = "body", dataType = "UserInfo", required = true),})
     public Result<Object> forgetPassword(@RequestBody UserInfo userInfo) {
+        String s = StringUtil.passwordCheck(userInfo.getPassword());
+        if (s == null){
+            return ResultGenerator.genFailResult("密码不合规");
+        }
         userInfoNewService.forgetPwd(userInfo);
         return ResultGenerator.genSuccessResult();
     }
diff --git a/pluss-common-bundle/src/main/java/cn/pluss/platform/util/StringUtil.java b/pluss-common-bundle/src/main/java/cn/pluss/platform/util/StringUtil.java
index 6c1e0a0..5de6654 100644
--- a/pluss-common-bundle/src/main/java/cn/pluss/platform/util/StringUtil.java
+++ b/pluss-common-bundle/src/main/java/cn/pluss/platform/util/StringUtil.java
@@ -383,8 +383,12 @@ public class StringUtil extends StringUtils {
      * @param password
      * @return
      */
-//    public static String passwordCheck(String password){
-//        int length = password.length();
-//        if (length)
-//    }
+    public static String passwordCheck(String password){
+        int length = password.length();
+        if (length >= 7 && length <= 16){
+            return password;
+        }else {
+            return null;
+        }
+    }
 }