Merge remote-tracking branch 'origin/dev' into dev

rs-datacenter/rs-datacenter-server/src/main/java/com/upyuns/platform/rs/datacenter/rest/RscpAreaInfoController.java

@@ -2,6 +2,7 @@ package com.upyuns.platform.rs.datacenter.rest;
 
 import cn.hutool.core.collection.CollUtil;
 import cn.hutool.core.util.StrUtil;
+import com.github.wxiaoqi.security.auth.client.annotation.IgnoreUserToken;
 import com.github.wxiaoqi.security.common.msg.ObjectRestResponse;
 import com.github.wxiaoqi.security.common.rest.BaseController;
 import com.upyuns.platform.rs.datacenter.biz.RscpAreaInfoBiz;
@@ -18,10 +19,11 @@ import java.util.stream.Collectors;
 import static com.github.wxiaoqi.security.common.constant.CommonConstants.SYS_TRUE;
 
 @RestController
-@RequestMapping("areaInfo")
+@RequestMapping("/web/areaInfo")
 public class RscpAreaInfoController extends BaseController<RscpAreaInfoBiz, RscpAreaInfo> {
 
     @RequestMapping(value = "/app/unauth/getAreaList", method = RequestMethod.GET)
+    @IgnoreUserToken
     public ObjectRestResponse<List<RscpAreaInfo>> getAreaList(String parentId) {
         if(StrUtil.isBlank(parentId)) {
             parentId = "000000";
@@ -30,6 +32,7 @@ public class RscpAreaInfoController extends BaseController<RscpAreaInfoBiz, Rscp
     }
 
     @RequestMapping(value = "/app/unauth/queryAreaInfoByAreaId", method = RequestMethod.GET)
+    @IgnoreUserToken
     public ObjectRestResponse<RscpAreaInfo> queryAreaInfoByAreaId(String areaCode) {
         return ObjectRestResponse.succ( baseBiz.queryAreaInfoByAreaId(areaCode));
     }

rs-datacenter/rs-datacenter-server/src/main/java/com/upyuns/platform/rs/datacenter/rest/RscpImageDataTotalController.java

@@ -4,6 +4,7 @@ import cn.hutool.core.collection.CollUtil;
 import cn.hutool.core.date.DateUtil;
 import cn.hutool.core.util.StrUtil;
 import com.alibaba.fastjson.JSONObject;
+import com.github.wxiaoqi.security.auth.client.annotation.IgnoreUserToken;
 import com.github.wxiaoqi.security.common.msg.ObjectRestResponse;
 import com.github.wxiaoqi.security.common.rest.BaseController;
 import com.github.wxiaoqi.security.common.util.Query;
@@ -27,13 +28,14 @@ import java.util.Collections;
 import java.util.List;
 
 @RestController
-@RequestMapping("imageData")
+@RequestMapping("/web/imageData")
 public class RscpImageDataTotalController extends BaseController<RscpImageDataTotalBiz, RscpImageDataTotal> {
 
     @Autowired
     RscpAreaImageTotalBiz rscpAreaImageTotalBiz;
 
     @RequestMapping(value = "/app/unauth/query", method = RequestMethod.GET)
+    @IgnoreUserToken
     public ObjectRestResponse unauthQuery(PageParam pageParam) {
         return ObjectRestResponse.succ(baseBiz.selectByQuery(new Query(pageParam)));
     }
@@ -67,6 +69,7 @@ public class RscpImageDataTotalController extends BaseController<RscpImageDataTo
 //	     分辨率id
 
     @RequestMapping(value = "/app/unauth/queryDataList", method = RequestMethod.POST)
+    @IgnoreUserToken
     public ObjectRestResponse queryDataList(@RequestBody QueryDTO dto) {
         if(RscpImageDataTotalController.QueryDTO.TYPE_AREA == dto.getType()) {
             return ObjectRestResponse.succ(rscpAreaImageTotalBiz.queryDataList(dto));

rs-datacenter/rs-datacenter-server/src/main/java/com/upyuns/platform/rs/datacenter/rest/RscpImagePriceController.java

 package com.upyuns.platform.rs.datacenter.rest;
 
 import cn.hutool.core.collection.CollUtil;
+import com.github.wxiaoqi.security.auth.client.annotation.IgnoreUserToken;
 import com.github.wxiaoqi.security.common.msg.ObjectRestResponse;
 import com.github.wxiaoqi.security.common.rest.BaseController;
 import com.github.wxiaoqi.security.common.util.Query;
@@ -21,10 +22,11 @@ import java.util.stream.Collectors;
 import static com.github.wxiaoqi.security.common.constant.CommonConstants.SYS_TRUE;
 
 @RestController
-@RequestMapping("imagePrice")
+@RequestMapping("/web/imagePrice")
 public class RscpImagePriceController extends BaseController<RscpImagePriceBiz, RscpImagePrice> {
 
     @RequestMapping(value = "/app/unauth/all", method = RequestMethod.GET)
+    @IgnoreUserToken
     public ObjectRestResponse unauthQuery() {
 
         List<RscpImagePrice> list = baseBiz.selectByWeekend(w -> {

rs-datacenter/rs-datacenter-server/src/main/java/com/upyuns/platform/rs/datacenter/rest/RscpResolutionController.java

 package com.upyuns.platform.rs.datacenter.rest;
 
 import cn.hutool.core.collection.CollUtil;
+import com.github.wxiaoqi.security.auth.client.annotation.IgnoreUserToken;
 import com.github.wxiaoqi.security.common.msg.ObjectRestResponse;
 import com.github.wxiaoqi.security.common.rest.BaseController;
 import com.upyuns.platform.rs.datacenter.biz.RscpImagePriceBiz;
@@ -20,11 +21,12 @@ import static com.github.wxiaoqi.security.common.constant.CommonConstants.SYS_FA
 import static com.github.wxiaoqi.security.common.constant.CommonConstants.SYS_TRUE;
 
 @RestController
-@RequestMapping("resolution")
+@RequestMapping("/web/resolution")
 public class RscpResolutionController extends BaseController<RscpResolutionBiz, RscpResolution> {
 
 
     @RequestMapping(value = "/app/unauth/all", method = RequestMethod.GET)
+    @IgnoreUserToken
     public ObjectRestResponse unauthQuery() {
 
         List<RscpResolution> list = baseBiz.selectByWeekend(w -> {

rs-website/rs-website-api/src/main/java/com/upyuns/platform/rs/website/entity/CustomForm.java

@@ -166,6 +166,26 @@ public class CustomForm implements Serializable {
     @Column(name = "is_del")
 	@ApiModelProperty(value = "是否删除：0、否， 1、是")
     private Integer isDel;
-	
+
+	/**
+	 *  省名称
+	 */
+	@Column(name = "province_name")
+	@ApiModelProperty(value = "省名称")
+	private String provinceName;
+
+	/**
+	 *  市名称
+	 */
+	@Column(name = "city_name")
+	@ApiModelProperty(value = "市名称")
+	private String cityName;
+
+	/**
+	 *  区名称
+	 */
+	@Column(name = "area_name")
+	@ApiModelProperty(value = "区名称")
+	private String areaName;
 
 }

rs-website/rs-website-server/src/main/java/com/upyuns/platform/rs/website/config/WebConfiguration.java

@@ -58,7 +58,8 @@ public class WebConfiguration implements WebMvcConfigurer {
                 "/industryApplicationInfo/**",
                 "/industryApplicationType/**",
                 "/newsInfo/**",
-                "/newsType/**"
+                "/newsType/**",
+                "/customForm/**"
         };
         Collections.addAll(list, urls);
         return list;

rs-website/rs-website-server/src/main/java/com/upyuns/platform/rs/website/controller/BannerController.java

 package com.upyuns.platform.rs.website.controller;
 
+import com.github.wxiaoqi.security.auth.client.annotation.IgnoreUserToken;
 import com.github.wxiaoqi.security.common.msg.ObjectRestResponse;
 import com.github.wxiaoqi.security.common.rest.BaseController;
 import com.upyuns.platform.rs.website.biz.BannerBiz;
@@ -22,6 +23,7 @@ public class BannerController extends BaseController<BannerBiz, Banner> {
 	}
 
 	@GetMapping(value = "/app/unauth/getAll")
+	@IgnoreUserToken
 	public ObjectRestResponse getAll() {
 		return baseBiz.getAll(1);
 	}

rs-website/rs-website-server/src/main/java/com/upyuns/platform/rs/website/controller/ImageInformationController.java

 package com.upyuns.platform.rs.website.controller;
 
+import com.github.wxiaoqi.security.auth.client.annotation.IgnoreUserToken;
 import com.github.wxiaoqi.security.common.msg.ObjectRestResponse;
 import com.github.wxiaoqi.security.common.rest.BaseController;
 import com.upyuns.platform.rs.website.biz.ImageInformationBiz;
@@ -24,6 +25,7 @@ public class ImageInformationController extends BaseController<ImageInformationB
 	}
 
 	@GetMapping(value = "/app/unauth/getAll")
+	@IgnoreUserToken
 	public ObjectRestResponse getAll(ImageInformationDto imageInformationDto) {
 		return ObjectRestResponse.succ(baseBiz.selectList(imageInformationDto));
 	}

rs-website/rs-website-server/src/main/java/com/upyuns/platform/rs/website/controller/IndustryApplicationInfoController.java

 package com.upyuns.platform.rs.website.controller;
 
+import com.github.wxiaoqi.security.auth.client.annotation.IgnoreUserToken;
 import com.github.wxiaoqi.security.common.msg.ObjectRestResponse;
 import com.github.wxiaoqi.security.common.rest.BaseController;
 import com.upyuns.platform.rs.website.biz.IndustryApplicationInfoBiz;
@@ -22,11 +23,13 @@ public class IndustryApplicationInfoController extends BaseController<IndustryAp
 	}
 
 	@GetMapping(value = "/app/unauth/getAll")
+	@IgnoreUserToken
 	public ObjectRestResponse getAll() {
 		return baseBiz.getAllIndexShow();
 	}
 
 	@GetMapping(value = "/app/unauth/detail")
+	@IgnoreUserToken
 	public ObjectRestResponse detail(Integer id) {
 		return ObjectRestResponse.succ(baseBiz.selectById(id));
 	}

rs-website/rs-website-server/src/main/java/com/upyuns/platform/rs/website/controller/IndustryApplicationTypeController.java

 package com.upyuns.platform.rs.website.controller;
 
+import com.github.wxiaoqi.security.auth.client.annotation.IgnoreUserToken;
 import com.github.wxiaoqi.security.common.msg.ObjectRestResponse;
 import com.github.wxiaoqi.security.common.rest.BaseController;
 import com.upyuns.platform.rs.website.biz.IndustryApplicationTypeBiz;
@@ -22,12 +23,14 @@ public class IndustryApplicationTypeController extends BaseController<IndustryAp
 	}
 
 	@GetMapping(value = "/app/unauth/getAll")
+	@IgnoreUserToken
 	public ObjectRestResponse getAll(Integer indexShow) {
 		return baseBiz.getAll(indexShow);
 	}
 
 
 	@GetMapping(value = "/app/unauth/getDetail")
+	@IgnoreUserToken
 	public ObjectRestResponse getDetail(Integer id) {
 		return baseBiz.getDetail(id);
 	}

rs-website/rs-website-server/src/main/java/com/upyuns/platform/rs/website/controller/NewsInfoController.java

 package com.upyuns.platform.rs.website.controller;
 
+import com.github.wxiaoqi.security.auth.client.annotation.IgnoreUserToken;
 import com.github.wxiaoqi.security.common.msg.ObjectRestResponse;
 import com.github.wxiaoqi.security.common.rest.BaseController;
 import com.upyuns.platform.rs.website.biz.NewsInfoBiz;
@@ -22,16 +23,19 @@ public class NewsInfoController extends BaseController<NewsInfoBiz, NewsInfo> {
 	}
 
 	@GetMapping(value = "/app/unauth/getAll")
+	@IgnoreUserToken
 	public ObjectRestResponse getAll(NewsInfoDto newsInfoDto) {
 		return baseBiz.selectList(newsInfoDto);
 	}
 
 	@GetMapping(value = "/app/unauth/getHot")
+	@IgnoreUserToken
 	public ObjectRestResponse getHotMsg() {
 		return baseBiz.getHotMsg();
 	}
 
 	@GetMapping(value = "/app/unauth/detail")
+	@IgnoreUserToken
 	public ObjectRestResponse detail(Integer id) {
 		return ObjectRestResponse.succ(baseBiz.selectById(id));
 	}

rs-website/rs-website-server/src/main/java/com/upyuns/platform/rs/website/controller/NewsTypeController.java

 package com.upyuns.platform.rs.website.controller;
 
+import com.github.wxiaoqi.security.auth.client.annotation.IgnoreUserToken;
 import com.github.wxiaoqi.security.common.msg.ObjectRestResponse;
 import com.github.wxiaoqi.security.common.rest.BaseController;
 import com.upyuns.platform.rs.website.biz.NewsTypeBiz;
@@ -17,6 +18,7 @@ public class NewsTypeController extends BaseController<NewsTypeBiz, NewsType> {
 	}
 
 	@GetMapping(value = "/app/unauth/getAll")
+	@IgnoreUserToken
 	public ObjectRestResponse getAll() {
 		return baseBiz.getAll();
 	}

rs-website/rs-website-server/src/main/java/com/upyuns/platform/rs/website/controller/web/CommonInfoWebController.java

 package com.upyuns.platform.rs.website.controller.web;
 
+import com.github.wxiaoqi.security.auth.client.annotation.IgnoreUserToken;
 import com.github.wxiaoqi.security.common.msg.ObjectRestResponse;
 import com.github.wxiaoqi.security.common.rest.BaseController;
 import com.upyuns.platform.rs.website.biz.CommonInfoBiz;
@@ -12,6 +13,7 @@ import org.springframework.web.bind.annotation.*;
 public class CommonInfoWebController extends BaseController<CommonInfoBiz,CommonInfo> {
 
 	@GetMapping(value = "/app/unauth/getByType")
+	@IgnoreUserToken
 	public ObjectRestResponse getByType(Integer type) {
 		return ObjectRestResponse.succ(baseBiz.getByType(type));
 	}

rs-website/rs-website-server/src/main/java/com/upyuns/platform/rs/website/controller/web/ImageImgStorageWebController.java

 package com.upyuns.platform.rs.website.controller.web;
 
+import com.github.wxiaoqi.security.auth.client.annotation.IgnoreUserToken;
 import com.github.wxiaoqi.security.common.msg.ObjectRestResponse;
 import com.github.wxiaoqi.security.common.rest.BaseController;
 import com.upyuns.platform.rs.website.biz.ImageImgStorageBiz;
@@ -12,11 +13,13 @@ import org.springframework.web.bind.annotation.*;
 public class ImageImgStorageWebController extends BaseController<ImageImgStorageBiz,ImageImgStorage> {
 
 	@GetMapping(value = "/app/unauth/getDetail/{id}")
+	@IgnoreUserToken
 	public ObjectRestResponse getDetail(@PathVariable Integer id) {
 		return baseBiz.getDetail(id);
 	}
 
 	@GetMapping(value = "/app/unauth/getAll")
+	@IgnoreUserToken
 	public ObjectRestResponse getAll(Integer type) {
 		return baseBiz.getAll(type);
 	}

rs-website/rs-website-server/src/main/java/com/upyuns/platform/rs/website/controller/web/ImageInformationWebController.java

 package com.upyuns.platform.rs.website.controller.web;
 
+import com.github.wxiaoqi.security.auth.client.annotation.IgnoreUserToken;
 import com.github.wxiaoqi.security.common.msg.ObjectRestResponse;
 import com.github.wxiaoqi.security.common.rest.BaseController;
 import com.upyuns.platform.rs.website.biz.ImageInformationBiz;
@@ -12,11 +13,13 @@ import org.springframework.web.bind.annotation.*;
 public class ImageInformationWebController extends BaseController<ImageInformationBiz,ImageInformation> {
 
 	@GetMapping(value = "/app/unauth/getAll")
+	@IgnoreUserToken
 	public ObjectRestResponse getAll(ImageInformationDto imageInformationDto) {
 		return ObjectRestResponse.succ(baseBiz.selectList(imageInformationDto));
 	}
 
 	@GetMapping(value = "/app/unauth/getDetail/{id}")
+	@IgnoreUserToken
 	public ObjectRestResponse getDetail(@PathVariable Integer id) {
 		return ObjectRestResponse.succ(baseBiz.selectById(id));
 	}