Merge branch 'feature/login-token' into developer

haoban-manage3-wx/src/main/java/com/gic/haoban/manage/web/controller/DictController.java

 package com.gic.haoban.manage.web.controller;
 
+import com.gic.haoban.common.anno.IgnoreLogin;
 import com.gic.haoban.common.utils.EntityUtil;
 import com.gic.haoban.common.utils.HaobanResponse;
 import com.gic.haoban.manage.api.dto.DictDTO;
@@ -8,9 +9,8 @@ import com.gic.haoban.manage.web.errCode.HaoBanErrCode;
 import com.gic.haoban.manage.web.vo.DictVo;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.ResponseBody;
+import org.springframework.web.bind.annotation.RestController;
 
 import java.util.Arrays;
 import java.util.List;
@@ -20,14 +20,13 @@ import java.util.List;
  *
  * @author hua
  */
-@Controller
+@RestController
 public class DictController extends WebBaseController {
 
     @Autowired
     private DictApiService dictApiService;
 
     @RequestMapping("/dict-list")
-    @ResponseBody
     public HaobanResponse queryDictList(String dictKeys) {
         if (StringUtils.isBlank(dictKeys)) {
             return resultResponse(HaoBanErrCode.ERR_5);
@@ -44,7 +43,7 @@ public class DictController extends WebBaseController {
      * @return
      */
     @RequestMapping("/find-dict-key")
-    @ResponseBody
+    @IgnoreLogin
     public HaobanResponse queryDictByKey(String dictKey) {
         if (StringUtils.isBlank(dictKey)) {
             return resultResponse(HaoBanErrCode.ERR_5);