diff --git a/platform-biz-service/src/main/java/com/lyms/platform/permission/model/Organization.java b/platform-biz-service/src/main/java/com/lyms/platform/permission/model/Organization.java
index 83115b3..5eb75c9 100644
--- a/platform-biz-service/src/main/java/com/lyms/platform/permission/model/Organization.java
+++ b/platform-biz-service/src/main/java/com/lyms/platform/permission/model/Organization.java
@@ -17,7 +17,7 @@ public class Organization {
     private String provinceId;
     private String cityId;
     private String areaId;
-    private String streetId;      //街道 城镇
+    private String streetId;
     private String address;
     private String description;
     private Integer publishId;
diff --git a/platform-biz-service/src/main/java/com/lyms/platform/permission/model/OrganizationQuery.java b/platform-biz-service/src/main/java/com/lyms/platform/permission/model/OrganizationQuery.java
index f67f07d..1bf41eb 100644
--- a/platform-biz-service/src/main/java/com/lyms/platform/permission/model/OrganizationQuery.java
+++ b/platform-biz-service/src/main/java/com/lyms/platform/permission/model/OrganizationQuery.java
@@ -15,7 +15,7 @@ public class OrganizationQuery extends BaseQuery {
     private String provinceId;
     private String cityId;
     private String areaId;
-    private String streetId;      //街道 城镇
+    private String streetId;
     private String address;
     private String description;
     private Integer publishId;
diff --git a/platform-common/src/main/java/com/lyms/platform/common/base/ExceptionHandlerController.java b/platform-common/src/main/java/com/lyms/platform/common/base/ExceptionHandlerController.java
index dfc775b..b30f6ad 100644
--- a/platform-common/src/main/java/com/lyms/platform/common/base/ExceptionHandlerController.java
+++ b/platform-common/src/main/java/com/lyms/platform/common/base/ExceptionHandlerController.java
@@ -7,12 +7,20 @@ import java.util.Map;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
+import com.lyms.platform.common.core.resolve.MessageResolver;
+import com.lyms.platform.common.result.BaseResponse;
+import org.apache.commons.collections.CollectionUtils;
+import org.springframework.aop.AopInvocationException;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.dao.DataAccessResourceFailureException;
 import org.springframework.http.HttpStatus;
+import org.springframework.http.converter.HttpMessageNotReadableException;
 import org.springframework.validation.BindException;
 import org.springframework.validation.BindingResult;
 import org.springframework.web.bind.MethodArgumentNotValidException;
 import org.springframework.web.bind.MissingServletRequestParameterException;
 import org.springframework.web.bind.annotation.ExceptionHandler;
+import org.springframework.web.bind.annotation.ResponseBody;
 import org.springframework.web.bind.annotation.ResponseStatus;
 
 import com.lyms.platform.common.constants.ErrorCodeConstants;
@@ -27,6 +35,42 @@ import com.lyms.platform.common.utils.JsonUtil;
  */
 public class ExceptionHandlerController {
 
+    @Autowired
+    private MessageResolver messageResolver;
+
+    @ExceptionHandler(HttpMessageNotReadableException.class)
+    @ResponseBody
+    @ResponseStatus(HttpStatus.BAD_REQUEST)
+    public BaseResponse handException(HttpMessageNotReadableException e) {
+        ExceptionUtils.catchException(e, e.getMessage());
+        BaseResponse error = new BaseResponse();
+        error.setErrorcode(ErrorCodeConstants.PARAMETER_ERROR);
+        error.setErrormsg("鍙傛暟閿欒");
+        return error;
+    }
+
+    @ExceptionHandler(org.springframework.dao.DataAccessResourceFailureException.class)
+    @ResponseBody
+    @ResponseStatus(HttpStatus.INTERNAL_SERVER_ERROR)
+    public BaseResponse handException(DataAccessResourceFailureException e) {
+        ExceptionUtils.catchException(e, e.getMessage());
+        BaseResponse error = new BaseResponse();
+        error.setErrorcode(ErrorCodeConstants.SYSTEM_ERROR);
+        error.setErrormsg("閿欒");
+        return error;
+    }
+    @ExceptionHandler(org.springframework.aop.AopInvocationException.class)
+    @ResponseBody
+    @ResponseStatus(HttpStatus.INTERNAL_SERVER_ERROR)
+    public BaseResponse handException(AopInvocationException e) {
+        ExceptionUtils.catchException(e, e.getMessage());
+        BaseResponse error = new BaseResponse();
+        error.setErrorcode(ErrorCodeConstants.SYSTEM_ERROR);
+        error.setErrormsg("閿欒");
+        return error;
+    }
+
+
     @ExceptionHandler(MethodArgumentNotValidException.class)
     @ResponseStatus(HttpStatus.OK)
     public void validationError(MethodArgumentNotValidException e, HttpServletResponse httpServletResponse) {
@@ -132,7 +176,8 @@ public class ExceptionHandlerController {
         List<org.springframework.validation.FieldError> fieldErrors = bindingResult.getFieldErrors();
         for (org.springframework.validation.FieldError fieldError : fieldErrors) {
             map.put("errorcode", ErrorCodeConstants.PARAMETER_ERROR);
-            map.put("errormsg",fieldError.getDefaultMessage());
+            map.put("errormsg",messageResolver.getErrorMessage(fieldError
+                    .getDefaultMessage()));
             break;
         }
         return map;
diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/AssayConfigController.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/AssayConfigController.java
index e07b98c..8dbafab 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/AssayConfigController.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/AssayConfigController.java
@@ -23,7 +23,7 @@ import java.util.List;
 
 //鍖栭獙椤归厤缃�
 @Controller
-public class AssayConfigController extends RestController{
+public class AssayConfigController extends BaseController{
     @Autowired
     private AssayConfigService assayConfigService;
 
diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/BabyManageController.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/BabyManageController.java
index 9dd80c6..765f0f7 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/BabyManageController.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/BabyManageController.java
@@ -25,7 +25,7 @@ import com.lyms.platform.operate.web.request.BabyManagerUpdateRequest;
  *
  */
 @Controller
-public class BabyManageController extends RestController {
+public class BabyManageController extends BaseController {
     
     /**
      * 
diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/BasicConfigController.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/BasicConfigController.java
index 276dc4d..61d7e57 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/BasicConfigController.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/BasicConfigController.java
@@ -27,7 +27,7 @@ import java.util.List;
  * @author Administrator
  */
 @Controller
-public class BasicConfigController extends RestController {
+public class BasicConfigController extends BaseController {
    
     @Autowired
     private BasicConfigFacade basicConfigFacade;
diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/CommunityConfigController.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/CommunityConfigController.java
index acea8b3..40ade07 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/CommunityConfigController.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/CommunityConfigController.java
@@ -42,7 +42,7 @@ import com.lyms.platform.pojo.CommunityConfig;
  * Created by Zhang.Rui on 2016/3/18.
  */
 @Controller
-public class CommunityConfigController  extends RestController {
+public class CommunityConfigController  extends BaseController {
     @Autowired
     private CommunityConfigService communityConfigService;
     @Autowired
diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/DepartmentsController.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/DepartmentsController.java
index 8d0f01b..723b0d9 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/DepartmentsController.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/DepartmentsController.java
@@ -23,7 +23,7 @@ import java.util.List;
  * Created by zhang.rui on 2015/9/28 0028.
  */
 @Controller
-public class DepartmentsController extends   RestController {
+public class DepartmentsController extends   BaseController {
     @Autowired
     private DepartmentsService departmentsService;
     @Autowired
diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/PermissionsController.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/PermissionsController.java
index ea4fa3b..529c8a2 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/PermissionsController.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/PermissionsController.java
@@ -32,7 +32,7 @@ import java.util.*;
  * Created by Administrator on 2015/9/28 0028.
  */
 @Controller
-public class PermissionsController extends RestController {
+public class PermissionsController extends BaseController {
 
     @Autowired
     private PermissionsService permissionsService;
diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/PuerperaManageController.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/PuerperaManageController.java
index aeea19a..67f7b3d 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/PuerperaManageController.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/PuerperaManageController.java
@@ -24,7 +24,7 @@ import com.lyms.platform.operate.web.request.PuerperaManagerQueryRequest;
  * @author Administrator
  */
 @Controller
-public class PuerperaManageController extends RestController {
+public class PuerperaManageController extends BaseController {
 
 
     @Autowired
diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/ReferConfigController.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/ReferConfigController.java
index 758e5bd..28702bd 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/ReferConfigController.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/ReferConfigController.java
@@ -6,6 +6,7 @@ import javax.validation.Valid;
 
 import com.lyms.platform.biz.param.ReferConfigQuery;
 import com.lyms.platform.common.annotation.TokenRequired;
+import com.lyms.platform.common.base.BaseController;
 import com.lyms.platform.common.enums.YnEnums;
 import com.lyms.platform.operate.web.result.FrontEndResult;
 import org.apache.commons.lang.StringUtils;
@@ -29,7 +30,7 @@ import com.lyms.platform.pojo.ReferValue;
  * 鍙傝�冨�奸厤缃�
  */
 @Controller
-public class ReferConfigController extends  RestController{
+public class ReferConfigController extends BaseController {
     @Autowired
     ReferConfigService referConfigService;
     @Autowired
diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/RegionController.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/RegionController.java
index f37abab..afa0290 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/RegionController.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/RegionController.java
@@ -27,7 +27,7 @@ import java.util.Map;
  * Created by Administrator on 2015/9/17 0017.
  */
 @Controller
-public class RegionController extends RestController{
+public class RegionController extends BaseController{
 
     @Autowired
     private BasicConfigService basicConfigService;
diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/RolesController.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/RolesController.java
index 6e615a7..877f8da 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/RolesController.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/RolesController.java
@@ -25,7 +25,7 @@ import java.util.*;
  * Created by Administrator on 2015/9/29 0029.
  */
 @Controller
-public class RolesController extends RestController {
+public class RolesController extends BaseController {
 
     @Autowired
     private RolesService rolesService;
diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/VisitController.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/VisitController.java
index 03512f0..e957b7d 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/VisitController.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/VisitController.java
@@ -3,6 +3,7 @@ package com.lyms.platform.operate.web.controller;
 import javax.validation.Valid;
 
 import com.lyms.platform.common.annotation.TokenRequired;
+import com.lyms.platform.common.base.BaseController;
 import org.apache.commons.lang.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.MediaType;
@@ -23,7 +24,7 @@ import com.lyms.platform.operate.web.request.VisitAddRequest;
  * @author Administrator
  */
 @Controller
-public class VisitController extends RestController {
+public class VisitController extends BaseController {
 
     @Autowired
     private VisitFacade visitFacade;
diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/inteceptor/TokenValidateInteceptor.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/inteceptor/TokenValidateInteceptor.java
index 173534b..f993adc 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/inteceptor/TokenValidateInteceptor.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/inteceptor/TokenValidateInteceptor.java
@@ -65,7 +65,7 @@ public class TokenValidateInteceptor extends HandlerInterceptorAdapter {
     public boolean validateToken(HttpServletRequest httpServletRequest, HttpServletResponse httpServletResponse) {
         String token = httpServletRequest.getHeader("Authorization");
         if (StringUtils.isEmpty(token)) {
-            throw new ParameterException();
+            throw new TokenException();
         }
         LoginContext loginContext = LoginUtil.checkLoginState(token);
         if(!loginContext.isLogin()) {