修改返回值

carbon-h5/carbon-h5-service/src/main/java/com/hcloud/microserver/h5/controller/web/WechatAppController.java

@@ -66,7 +66,7 @@ public class WechatAppController extends BaseController {
     public ResponseBase login(@RequestBody LoginRequest request) {
         String code = request.getCode();
         if (StringUtils.isBlank(code)) {
-            return responseSuccess(new ResultVO(1, "请输入code错误!"));
+            return resultVOError("请输入code错误!");
         }
         try {
             // 获取微信用户session
@@ -75,7 +75,7 @@ public class WechatAppController extends BaseController {
                 throw new RuntimeException("login handler error");
             }
             // 解密用户信息
-            WxMaUserInfo wxUserInfo = wxMaService.getUserService().getUserInfo(session.getSessionKey(),request.getEncryptedData(), request.getIv());
+            WxMaUserInfo wxUserInfo = wxMaService.getUserService().getUserInfo(session.getSessionKey(), request.getEncryptedData(), request.getIv());
             //解密手机号
             WxMaPhoneNumberInfo phoneNoInfo = wxMaService.getUserService().getPhoneNoInfo(session.getSessionKey(), request.getEncryptedData(), request.getIv());
             if (null == wxUserInfo) {

common-core/src/main/java/com/hcloud/microserver/commoncore/base/BaseController.java

@@ -117,7 +117,26 @@ public class BaseController {
      */
     protected ResponseBase resultVOSuccess(Object data) {
         ResultVO resultVO=new ResultVO();
-        resultVO.setCode(200);
+        resultVO.setCode(0);
+        resultVO.setData(data);
+        ResponseBase responseBase = new ResponseBase(resultVO.getData());
+        RetHead retHead = new RetHead();
+        retHead.setErrCode(resultVO.getCode().shortValue());
+        retHead.setErrMsg(resultVO.getMsg());
+        retHead.setTotal(resultVO.getCount());
+        responseBase.setRetHead(retHead);
+        return responseBase;
+    }
+
+    /**
+     * 操作成功后，返回结果（前后端分离）
+     *
+     * @param
+     * @return
+     */
+    protected ResponseBase resultVOError(Object data) {
+        ResultVO resultVO=new ResultVO();
+        resultVO.setCode(1);
         resultVO.setData(data);
         ResponseBase responseBase = new ResponseBase(resultVO.getData());
         RetHead retHead = new RetHead();
@@ -136,7 +155,7 @@ public class BaseController {
      */
     protected ResponseBase resultVOSuccess() {
         ResultVO resultVO=new ResultVO();
-        resultVO.setCode(200);
+        resultVO.setCode(0);
         resultVO.setMsg("操作成功!");
         ResponseBase responseBase = new ResponseBase(resultVO.getData());
         RetHead retHead = new RetHead();