Merge branch 'developer' of…

Merge branch 'developer' of http://115.159.76.241/base_platform_enterprise/gic-webapp-plug into developer

 Conflicts:
	src/main/java/com/gic/plug/web/controller/UploadImgController.java

src/main/java/com/gic/plug/web/controller/ProvincesController.java

@@ -2,6 +2,7 @@ package com.gic.plug.web.controller;
 
 import com.alibaba.fastjson.JSONObject;
 import com.gic.api.base.commons.ServiceResponse;
+import com.gic.commons.annotation.HeaderSignIgnore;
 import com.gic.commons.util.EntityUtil;
 import com.gic.commons.webapi.reponse.RestResponse;
 import com.gic.enterprise.ano.IgnoreLogin;
@@ -38,6 +39,7 @@ public class ProvincesController {
     @RequestMapping("dict-district-list")
     @ResponseBody
     @IgnoreLogin
+    @HeaderSignIgnore
     public Object provinces(String id, @RequestParam(defaultValue = "1")int type){
         switch (type){
             case 1:
@@ -75,6 +77,7 @@ public class ProvincesController {
     @RequestMapping("query-provinces")
     @ResponseBody
     @IgnoreLogin
+    @HeaderSignIgnore
     public Object searchProvinces(String search){
         ServiceResponse<List<ProvinceDTO>> serviceResponse = this.provincesApiService.queryProvinces(search);
         if(serviceResponse.isSuccess()){
@@ -86,6 +89,7 @@ public class ProvincesController {
     @RequestMapping("query-city")
     @ResponseBody
     @IgnoreLogin
+    @HeaderSignIgnore
     public Object searchCitys(String search){
         if(StringUtils.isBlank(search)){
             return RestResponse.failure(ErrorCode.MISS_PARAMETER.getCode(), ErrorCode.MISS_PARAMETER.getMsg());
@@ -100,6 +104,7 @@ public class ProvincesController {
     @RequestMapping("query-county")
     @ResponseBody
     @IgnoreLogin
+    @HeaderSignIgnore
     public Object searchCounty(String search){
         if(StringUtils.isBlank(search)){
             return RestResponse.failure(ErrorCode.MISS_PARAMETER.getCode(), ErrorCode.MISS_PARAMETER.getMsg());
@@ -114,6 +119,7 @@ public class ProvincesController {
     @RequestMapping("query-district")
     @ResponseBody
     @IgnoreLogin
+    @HeaderSignIgnore
     public RestResponse queryDistrictByIds(String ids){
         if(StringUtils.isBlank(ids)){
             return RestResponse.success();
@@ -158,6 +164,7 @@ public class ProvincesController {
     @RequestMapping("dict-provinces-citys")
     @ResponseBody
     @IgnoreLogin
+    @HeaderSignIgnore
     public RestResponse listProvincesCitys(){
         ServiceResponse<List<ProvinceDTO>> serviceResponse = this.provincesApiService.selectAllProvince();
         ServiceResponse<List<CityDTO>> citResponse = this.provincesApiService.selectAllCity();

src/main/java/com/gic/plug/web/controller/UploadImgController.java

 package com.gic.plug.web.controller;
 
 import com.alibaba.fastjson.JSON;
+import com.gic.commons.annotation.HeaderSignIgnore;
 import com.gic.commons.webapi.reponse.RestResponse;
 import com.gic.enterprise.ano.IgnoreLogin;
 import com.gic.enterprise.error.ErrorCode;
@@ -36,6 +37,7 @@ public class UploadImgController {
 
     @RequestMapping("upload-images")
     @IgnoreLogin
+    @HeaderSignIgnore
     public RestResponse uploadImages(HttpServletRequest request) throws IOException {
         MultipartHttpServletRequest multiRequest = (MultipartHttpServletRequest) request;
         Iterator<String> iter = multiRequest.getFileNames();
@@ -56,6 +58,7 @@ public class UploadImgController {
                     return RestResponse.failure(ErrorCode.NOT_SUPPORT.getCode(), "图片不支持上传CMYK色彩模式，请上传RGB色彩模式的图片");
                 }
                 UploadResult uploadResult = QqCloudPicUtils.uploadLocalPicStream("pic01", "", mf.getBytes());
+                UploadResult uploadResult = QqCloudPicUtils.uploadLocalPicStream("pic01", "", mf.getBytes());
                 logger.info("上传图片结果："+JSON.toJSONString(uploadResult));
                 Map<String, Object> pic = new HashMap<>(8);
                 pic.put("fileId", uploadResult.getFileId());
@@ -69,6 +72,7 @@ public class UploadImgController {
 
     @RequestMapping("get-cos-secret")
     @IgnoreLogin
+    @HeaderSignIgnore
     public RestResponse getCosSecret(HttpServletRequest request) throws IOException {
         Map<String, String> map = new HashMap<>(8);
         map.put("secretId", "AKIDxpbnsmZ0KYtAKNd5f7QbbP3YyDJD6Rq3");
@@ -84,6 +88,7 @@ public class UploadImgController {
 
     @RequestMapping("upload-file")
     @IgnoreLogin
+    @HeaderSignIgnore
     public RestResponse uploadFile(HttpServletRequest request) throws IOException {
         MultipartHttpServletRequest multiRequest = (MultipartHttpServletRequest) request;
         Iterator<String> iter = multiRequest.getFileNames();