Merge branch 'saas' of http://git.dayaedu.com/yonge/mec into zx_1020_redis

# Conflicts:
#	mec-application/src/main/resources/bootstrap-dev.properties
#	mec-application/src/main/resources/logback-spring.xml
#	mec-biz/src/main/java/com/ym/mec/biz/service/impl/VipGroupServiceImpl.java
#	mec-education/src/main/resources/bootstrap-prod.properties
#	mec-monitor/src/main/resources/bootstrap-prod.properties
#	mec-student/src/main/resources/bootstrap-prod.properties
#	mec-teacher/src/main/resources/bootstrap-prod.properties
#	mec-web/src/main/java/com/ym/mec/web/controller/PhotoAlbumController.java
#	mec-web/src/main/java/com/ym/mec/web/controller/education/EduPhotoAlbumController.java
#	mec-zipkin/src/main/resources/bootstrap-prod.properties

mec-biz/src/main/java/com/ym/mec/biz/dal/page/StudentCompetitionQueryInfo.java

@@ -1,6 +1,5 @@
 package com.ym.mec.biz.dal.page;
 
-import com.sun.org.apache.xpath.internal.operations.Bool;
 import com.ym.mec.common.page.QueryInfo;
 import io.swagger.annotations.ApiModelProperty;
 

mec-web/src/main/java/com/ym/mec/web/controller/PhotoAlbumController.java

@@ -1,59 +0,0 @@
-package com.ym.mec.web.controller;
-
-import com.ym.mec.biz.dal.entity.PhotoAlbum;
-import com.ym.mec.biz.dal.page.PhotoQueryInfo;
-import com.ym.mec.biz.service.PhotoAlbumService;
-import com.ym.mec.common.controller.BaseController;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import org.apache.commons.lang3.StringUtils;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.security.access.prepost.PreAuthorize;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-
-import java.util.List;
-
-@RequestMapping("photoAlbum")
-@Api(tags = "相册")
-@RestController
-public class PhotoAlbumController extends BaseController {
-
-	@Autowired
-	private PhotoAlbumService photoAlbumService;
-
-	@ApiOperation("新增")
-	@PostMapping(value = "add")
-	@PreAuthorize("@pcs.hasPermissions('photoAlbum/add')")
-	public Object add(PhotoAlbum photoAlbum) {
-		if(StringUtils.isEmpty(photoAlbum.getCoverUrl())){
-			photoAlbum.setCoverUrl("https://oss.dayaedu.com/default-images/mec/Sdmx7vx.png");
-		}
-		return succeed(photoAlbumService.insert(photoAlbum));
-	}
-
-	@ApiOperation("修改")
-	@PostMapping(value = "batchUpdate")
-	@PreAuthorize("@pcs.hasPermissions('photoAlbum/batchUpdate')")
-	public Object batchUpdate(@RequestBody List<PhotoAlbum> photoAlbumList) {
-		photoAlbumService.batchUpdate(photoAlbumList);
-		return succeed();
-	}
-
-	@ApiOperation("删除")
-	@PostMapping(value = "del")
-	@PreAuthorize("@pcs.hasPermissions('photoAlbum/del')")
-	public Object del(String ids) {
-		photoAlbumService.batchDelete(ids);
-		return succeed();
-	}
-
-	@ApiOperation("分页查询")
-	@PostMapping(value = "queryPage")
-	@PreAuthorize("@pcs.hasPermissions('photoAlbum/queryPage')")
-	public Object queryPage(PhotoQueryInfo queryInfo) {
-		return succeed(photoAlbumService.queryAlbumPage(queryInfo));
-	}
-}

mec-web/src/main/java/com/ym/mec/web/controller/education/EduPhotoAlbumController.java

@@ -1,55 +0,0 @@
-package com.ym.mec.web.controller.education;
-
-import com.ym.mec.biz.dal.entity.PhotoAlbum;
-import com.ym.mec.biz.dal.page.PhotoQueryInfo;
-import com.ym.mec.biz.service.PhotoAlbumService;
-import com.ym.mec.common.controller.BaseController;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import org.apache.commons.lang3.StringUtils;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.security.access.prepost.PreAuthorize;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-
-import java.util.List;
-
-@RequestMapping("eduPhotoAlbum")
-@Api(tags = "相册")
-@RestController
-public class EduPhotoAlbumController extends BaseController {
-
-	@Autowired
-	private PhotoAlbumService photoAlbumService;
-
-	@ApiOperation("新增")
-	@PostMapping(value = "add")
-	public Object add(PhotoAlbum photoAlbum) {
-		if(StringUtils.isEmpty(photoAlbum.getCoverUrl())){
-			photoAlbum.setCoverUrl("https://oss.dayaedu.com/default-images/mec/Sdmx7vx.png");
-		}
-		return succeed(photoAlbumService.insert(photoAlbum));
-	}
-
-	@ApiOperation("修改")
-	@PostMapping(value = "batchUpdate")
-	public Object batchUpdate(@RequestBody List<PhotoAlbum> photoAlbumList) {
-		photoAlbumService.batchUpdate(photoAlbumList);
-		return succeed();
-	}
-
-	@ApiOperation("删除")
-	@PostMapping(value = "del")
-	public Object del(String ids) {
-		photoAlbumService.batchDelete(ids);
-		return succeed();
-	}
-
-	@ApiOperation("分页查询")
-	@PostMapping(value = "queryPage")
-	public Object queryPage(PhotoQueryInfo queryInfo) {
-		return succeed(photoAlbumService.queryAlbumPage(queryInfo));
-	}
-}