Merge branch 'master' of http://git.ycjcjy.com/xiangsong/xs-service

src/main/java/com/huiju/estateagents/controller/MiniAppController.java

@@ -245,6 +245,7 @@ public class MiniAppController extends BaseController {
 
             Map<String, Object> result = new HashMap<>();
             result.put("person", taPerson);
+            result.put("sessionKey", session.getSessionKey());
             result.put("token", token);
             if (null != sceneParams) {
                 result.put("scene", sceneParams);

src/main/java/com/huiju/estateagents/controller/TaNewsController.java

@@ -105,7 +105,7 @@ public class TaNewsController extends BaseController {
             @ApiImplicitParam(dataTypeClass = Boolean.class, name = "mine", paramType = "query",value = "是否我的活动")
     })
     @RequestMapping(value="/wx/taNews",method= RequestMethod.GET)
-    public ResponseBean wxTaNewsList(@RequestParam(value ="pageNumber",defaultValue = "1") Integer pageNumber,
+    public ResponseBean wxTaNewsList(@RequestParam(value ="pageNum",defaultValue = "1") Integer pageNum,
                                      @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize,
                                      @RequestParam(required = false) String buildingId,
                                      @RequestParam(required = false) Integer cityId,
@@ -124,7 +124,7 @@ public class TaNewsController extends BaseController {
             targets = iTaSaveService.getTargesOfPerson(persons.get(0).getPersonId(), CommConstant.FAVOR_NEWS);
         }
 
-        IPage<TaNews> results = iTaNewsService.getWxList(pageNumber, pageSize, buildingId, targets,cityId,mine,orgId);
+        IPage<TaNews> results = iTaNewsService.getWxList(pageNum, pageSize, buildingId, targets,cityId,mine,orgId);
         return ResponseBean.success(results);
     }
 

src/main/java/com/huiju/estateagents/interceptor/AccessInterceptor.java

@@ -51,6 +51,12 @@ public class AccessInterceptor implements HandlerInterceptor {
     private ITaThirdPartyMiniappConfigService taThirdPartyMiniappConfigService;
     
     private String[] whiteList = {
+            // swagger
+            "/swagger-resources",
+            "/webjars",
+            "/swagger-ui.html",
+            "/v2/api-docs",
+
             "/wx/chat", // 聊天暂时不鉴权
             "/api/wx/login",
             "/api/wx/tdCity",

src/main/java/com/huiju/estateagents/property/controller/BuildingTreeController.java

@@ -30,7 +30,7 @@ public class BuildingTreeController extends BaseController {
 	private BuildingTreeServiceI buildingTreeService;
 	
 	// @ApiOperation(value = "上传楼栋信息接口", notes = "上传楼栋信息接口")
-	@PostMapping(value = "/tree/uploadExcel", consumes = "multipart/*", headers = "content-type=multipart/form-data")
+	@PostMapping(value = "/admin/buildingInfo/tree/uploadExcel", consumes = "multipart/*", headers = "content-type=multipart/form-data")
 	public ResponseBean uploadExcel(@RequestParam("file") MultipartFile file) {
 		ResponseBean responseBean = new ResponseBean();
 		responseBean = buildingTreeService.getExcelData(file);
@@ -38,7 +38,7 @@ public class BuildingTreeController extends BaseController {
 	}
 	
 	// @ApiOperation(value = "上传楼栋信息并入库", notes = "上传楼栋信息并入库")
-	@PostMapping(value = "/tree/submitExcel", consumes = "multipart/*", headers = "content-type=multipart/form-data")
+	@PostMapping(value = "/admin/buildingInfo/tree/submitExcel", consumes = "multipart/*", headers = "content-type=multipart/form-data")
 	public ResponseBean submitExcel(@RequestParam("file") MultipartFile file, HttpServletRequest request) {
 		ResponseBean responseBean = new ResponseBean();
 		TaUser userElement = getTaUser(request);