Skip to content

C
cust-api
Commit be651e54 authored by gaoyingwei's avatar gaoyingwei
Browse files
Options

修改pom文件，升级springboot3，解决swagger适配

parent ed650767
Hide whitespace changes
Inline Side-by-side
Showing with 127 additions and 105 deletions
pom.xml
View file @ be651e54
......@@ -15,7 +15,7 @@
<java.version>17</java.version>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
<spring-boot.version>2.5.5</spring-boot.version>
<spring-boot.version>3.0.5</spring-boot.version>
</properties>
<dependencyManagement>
......@@ -47,7 +47,8 @@
<dependency>
<groupId>org.91isoft</groupId>
<artifactId>91isoft_spbt</artifactId>
<version>3.2.1_WF_A_beta4</version>
<version>3.3.0_core_alpha1</version>
<scope>compile</scope>
<!-- <version>3.0.0_nlt.25</version>-->
<!-- 排除oracle12的驱动，此处代码不能提交，测试使用的是12，生产为11 -->
</dependency>
......@@ -94,13 +95,6 @@
<version>3.8.1</version>
</dependency>
<!-- 工具包 -->
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-lang3</artifactId>
<version>3.3.2</version>
</dependency>
<!-- 工具包 -->
<dependency>
<groupId>commons-io</groupId>
......@@ -181,7 +175,7 @@
<version>${spring-boot.version}</version>
<configuration>
<mainClass>org.rcisoft.CustApplication</mainClass>
<fork>true</fork>
<!-- <fork>true</fork>-->
</configuration>
<executions>
<execution>
......
src/main/java/org/rcisoft/business/cmsActivity/controller/CmsActivityController.java
View file @ be651e54
......@@ -3,9 +3,9 @@ package org.rcisoft.business.cmsActivity.controller;
/*固定导入*/
import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiImplicitParams;
import io.swagger.annotations.ApiOperation;
import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.Parameter;
import io.swagger.v3.oas.annotations.Parameters;
import org.rcisoft.business.cmsActivity.entity.CmsActivity;
import org.rcisoft.business.cmsActivity.service.CmsActivityService;
import org.rcisoft.core.anno.CyOpeLogAnno;
......@@ -22,7 +22,7 @@ import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.validation.BindingResult;
import org.springframework.web.bind.annotation.*;
import javax.servlet.http.HttpServletResponse;
import jakarta.servlet.http.HttpServletResponse;
import javax.validation.Valid;
import java.util.List;
......@@ -40,7 +40,7 @@ public class CmsActivityController extends CyPaginationController<CmsActivity> {
@PreAuthorize("@cyPerm.hasPerm('cms:activity:increase')")
@CyOpeLogAnno(title = "system-活动管理-新增活动", businessType = CyLogTypeEnum.INSERT)
@ApiOperation(value = "添加活动", notes = "添加活动")
@Operation(summary = "添加活动", description = "添加活动")
@PostMapping(value = "/add")
public CyResult add(@Valid CmsActivity cmsActivity, BindingResult bindingResult) {
CyPersistModel data = cmsActivityServiceImpl.persist(cmsActivity);
......@@ -52,8 +52,8 @@ public class CmsActivityController extends CyPaginationController<CmsActivity> {
@PreAuthorize("@cyPerm.hasPerm('cms:activity:removing')")
@CyOpeLogAnno(title = "system-活动管理-删除活动", businessType = CyLogTypeEnum.DELETE)
@ApiOperation(value = "删除活动", notes = "删除活动")
@ApiImplicitParams({@ApiImplicitParam(name = "businessId", value = "businessId", required = true, dataType = "varchar")})
@Operation(summary = "删除活动", description = "删除活动")
@Parameters({@Parameter(name = "businessId", description = "businessId", required = true)})
@DeleteMapping("/delete/{businessId:\\w+}")
public CyResult delete(@PathVariable Integer businessId, CmsActivity cmsActivity) {
cmsActivity.setBusinessId(businessId);
......@@ -66,8 +66,8 @@ public class CmsActivityController extends CyPaginationController<CmsActivity> {
@PreAuthorize("@cyPerm.hasPerm('cms:activity:modifications')")
@CyOpeLogAnno(title = "system-活动管理-修改活动", businessType = CyLogTypeEnum.INSERT)
@ApiOperation(value = "修改活动", notes = "修改活动")
@ApiImplicitParams({@ApiImplicitParam(name = "businessId", value = "businessId", required = false, dataType = "varchar")})
@Operation(summary = "修改活动", description = "修改活动")
@Parameters({@Parameter(name = "businessId", description = "businessId", required = false)})
@PostMapping("/update/{businessId:\\w+}")
public CyResult update(@PathVariable Integer businessId, @Valid CmsActivity cmsActivity, BindingResult bindingResult) {
cmsActivity.setBusinessId(businessId);
......@@ -80,8 +80,8 @@ public class CmsActivityController extends CyPaginationController<CmsActivity> {
// @PreAuthorize("@cyPerm.hasPerm('cms:activity:singleSearch')")
@CyOpeLogAnno(title = "system-活动管理-查询活动", businessType = CyLogTypeEnum.QUERY)
@ApiOperation(value = "查询单一活动", notes = "查询单一活动")
@ApiImplicitParams({@ApiImplicitParam(name = "businessId", value = "businessId", required = true, dataType = "varchar")})
@Operation(summary = "查询单一活动", description = "查询单一活动")
@Parameters({@Parameter(name = "businessId", description = "businessId", required = true)})
@GetMapping("/detail/{businessId:\\w+}")
public CyResult detail(@PathVariable Integer businessId) {
return CyResultGenUtil.builder(new CyPersistModel(1),
......@@ -92,7 +92,7 @@ public class CmsActivityController extends CyPaginationController<CmsActivity> {
//@PreAuthorize("@cyPerm.hasPerm('sys:activity:list')")
@CyOpeLogAnno(title = "system-活动管理-查询活动管理", businessType = CyLogTypeEnum.QUERY)
@ApiOperation(value = "查询活动集合", notes = "查询活动集合")
@Operation(summary = "查询活动集合", description = "查询活动集合")
@GetMapping(value = "/queryCmsActivity")
public CyResult querySysContentNewsInformations(CmsActivity cmsActivity) {
return CyResultGenUtil.builder(new CyPersistModel(1),
......@@ -103,7 +103,7 @@ public class CmsActivityController extends CyPaginationController<CmsActivity> {
// @PreAuthorize("@cyPerm.hasPerm('cms:activity:pageSearch')")
@CyOpeLogAnno(title = "system-活动管理-查询活动", businessType = CyLogTypeEnum.QUERY)
@ApiOperation(value = "分页查询活动集合", notes = "分页查询活动集合")
@Operation(summary = "分页查询活动集合", description = "分页查询活动集合")
@GetMapping(value = "/queryCmsActivityByPagination")
public CyGridModel listByPagination(CmsActivity cmsActivity) {
cmsActivityServiceImpl.findAllByPagination(getPaginationUtility(), cmsActivity);
......@@ -113,8 +113,8 @@ public class CmsActivityController extends CyPaginationController<CmsActivity> {
//修改状态
@PreAuthorize("@cyPerm.hasPerm('cms:activity:modificationsStatus')")
@CyOpeLogAnno(title = "system-活动管理管理-修改活动管理状态", businessType = CyLogTypeEnum.UPDATE)
@ApiOperation(value = "修改活动状态", notes = "修改活动状态")
@ApiImplicitParams({@ApiImplicitParam(name = "businessId", value = "businessId", required = true, dataType = "varchar")})
@Operation(summary = "修改活动状态", description = "修改活动状态")
@Parameters({@Parameter(name = "businessId", description = "businessId", required = true)})
@PostMapping("/updateStatus/{businessId:\\w+}")
public CyResult updateStatus(CmsActivity cmsActivity) {
CyPersistModel data = cmsActivityServiceImpl.updateStatus(cmsActivity);
......@@ -125,7 +125,7 @@ public class CmsActivityController extends CyPaginationController<CmsActivity> {
}
@PreAuthorize("@cyPerm.hasPerm('cms:activity:derive')")
@CyOpeLogAnno(title = "system-活动管理管理-查询活动管理", businessType = CyLogTypeEnum.EXPORT)
@ApiOperation(value = "导出活动信息", notes = "导出活动信息")
@Operation(summary = "导出活动信息", description = "导出活动信息")
@GetMapping(value = "/export")
public void outSysContentNewsInformation(HttpServletResponse response, CmsActivity cmsActivity, @PathVariable @RequestParam(defaultValue = "0") String excelId) {
String excelName = "";
......
src/main/java/org/rcisoft/business/cmsApplication/controller/CmsApplicationController.java
View file @ be651e54
package org.rcisoft.business.cmsApplication.controller;
/*固定导入*/
import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiImplicitParams;
import io.swagger.annotations.ApiOperation;
import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.Parameter;
import io.swagger.v3.oas.annotations.Parameters;
import org.rcisoft.business.cmsApplication.entity.CmsApplication;
import org.rcisoft.business.cmsApplication.service.CmsApplicationService;
import org.rcisoft.core.anno.CyOpeLogAnno;
......@@ -34,11 +35,11 @@ public class CmsApplicationController extends CyPaginationController<CmsApplicat
@Autowired
private CmsApplicationService cmsApplicationServiceImpl;
@PreAuthorize("@cyPerm.hasPerm('cms:application:singleSearch')")
@CyOpeLogAnno(title = "system-报名管理-查询报名", businessType = CyLogTypeEnum.QUERY)
@ApiOperation(value = "查询单一报名", notes = "查询单一报名")
@ApiImplicitParams({@ApiImplicitParam(name = "businessId", value = "businessId", required = true, dataType = "varchar")})
@Operation(summary = "查询单一报名", description = "查询单一报名")
@Parameters({@Parameter(name = "businessId", description = "businessId", required = true)})
@GetMapping("/detail/{businessId:\\w+}")
public CyResult detail(@PathVariable Integer businessId) {
return CyResultGenUtil.builder(new CyPersistModel(1),
......@@ -49,7 +50,7 @@ public class CmsApplicationController extends CyPaginationController<CmsApplicat
@PreAuthorize("@cyPerm.hasPerm('sys:application:list')")
@CyOpeLogAnno(title = "system-报名管理-查询报名管理", businessType = CyLogTypeEnum.QUERY)
@ApiOperation(value = "查询报名集合", notes = "查询报名集合")
@Operation(summary = "查询报名集合", description = "查询报名集合")
@GetMapping(value = "/queryCmsApplication")
public CyResult queryCmsApplication(CmsApplication cmsApplication) {
return CyResultGenUtil.builder(new CyPersistModel(1),
......@@ -60,7 +61,7 @@ public class CmsApplicationController extends CyPaginationController<CmsApplicat
@PreAuthorize("@cyPerm.hasPerm('cms:application:pageSearch')")
@CyOpeLogAnno(title = "system-报名管理-查询报名", businessType = CyLogTypeEnum.QUERY)
@ApiOperation(value = "分页查询报名集合", notes = "分页查询报名集合")
@Operation(summary = "分页查询报名集合", description = "分页查询报名集合")
@GetMapping(value = "/queryCmsApplicationByPagination")
public CyGridModel listByPagination(@RequestParam(required = false) Integer activityId, CmsApplication cmsApplication) {
// 如果传入了 activityId，设置到 cmsApplication 对象中
......
src/main/java/org/rcisoft/business/cmsBanner/controller/CmsBannerController.java
View file @ be651e54
......@@ -3,9 +3,9 @@ package org.rcisoft.business.cmsBanner.controller;
/*固定导入*/
import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiImplicitParams;
import io.swagger.annotations.ApiOperation;
import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.Parameter;
import io.swagger.v3.oas.annotations.Parameters;
import org.rcisoft.business.cmsBanner.entity.CmsBanner;
import org.rcisoft.business.cmsBanner.service.CmsBannerService;
import org.rcisoft.core.anno.CyOpeLogAnno;
......@@ -22,7 +22,7 @@ import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.validation.BindingResult;
import org.springframework.web.bind.annotation.*;
import javax.servlet.http.HttpServletResponse;
import jakarta.servlet.http.HttpServletResponse;
import javax.validation.Valid;
import java.util.List;
......@@ -39,7 +39,7 @@ public class CmsBannerController extends CyPaginationController<CmsBanner> {
@PreAuthorize("@cyPerm.hasPerm('cms:banner:increase')")
@CyOpeLogAnno(title = "system-banner管理管理-新增banner管理", businessType = CyLogTypeEnum.INSERT)
@ApiOperation(value="添加banner管理", notes="添加banner管理")
@Operation(summary="添加banner管理", description="添加banner管理")
@PostMapping(value = "/add")
public CyResult add(@Valid CmsBanner cmsBanner, BindingResult bindingResult) {
CyPersistModel data = cmsBannerServiceImpl.persist(cmsBanner);
......@@ -50,8 +50,8 @@ public class CmsBannerController extends CyPaginationController<CmsBanner> {
}
@PreAuthorize("@cyPerm.hasPerm('cms:banner:removing')")
@CyOpeLogAnno(title = "system-banner管理管理-删除banner管理", businessType = CyLogTypeEnum.DELETE)
@ApiOperation(value="逻辑删除banner管理", notes="逻辑删除banner管理")
@ApiImplicitParams({@ApiImplicitParam(name = "businessId", value = "businessId", required = true, dataType = "varchar")})
@Operation(summary="逻辑删除banner管理", description="逻辑删除banner管理")
@Parameters({@Parameter(name = "businessId", description = "businessId", required = true)})
@DeleteMapping("/deleteLogical/{businessId:\\w+}")
public CyResult deleteLogical(@PathVariable String businessId,CmsBanner cmsBanner) {
cmsBanner.setBusinessId(Integer.valueOf(businessId));
......@@ -63,8 +63,8 @@ public class CmsBannerController extends CyPaginationController<CmsBanner> {
}
//@PreAuthorize("@cyPerm.hasPerm('sys:banner:delete')")
@CyOpeLogAnno(title = "system-banner管理管理-删除banner管理", businessType = CyLogTypeEnum.DELETE)
@ApiOperation(value="删除banner管理", notes="删除banner管理")
@ApiImplicitParams({@ApiImplicitParam(name = "businessId", value = "businessId", required = true, dataType = "varchar")})
@Operation(summary="删除banner管理", description="删除banner管理")
@Parameters({@Parameter(name = "businessId", description = "businessId", required = true)})
@DeleteMapping("/delete/{businessId:\\w+}")
public CyResult delete(@PathVariable String businessId,CmsBanner cmsBanner) {
cmsBanner.setBusinessId(Integer.valueOf(businessId));
......@@ -77,8 +77,8 @@ public class CmsBannerController extends CyPaginationController<CmsBanner> {
@PreAuthorize("@cyPerm.hasPerm('cms:banner:modifications')")
@CyOpeLogAnno(title = "system-banner管理管理-修改banner管理", businessType = CyLogTypeEnum.UPDATE)
@ApiOperation(value="修改banner管理", notes="修改banner管理")
@ApiImplicitParams({@ApiImplicitParam(name = "businessId", value = "businessId", required = false, dataType = "varchar")})
@Operation(summary="修改banner管理", description="修改banner管理")
@Parameters({@Parameter(name = "businessId", description = "businessId", required = false)})
@PutMapping("/update/{businessId:\\w+}")
public CyResult update(@PathVariable String businessId, @Valid CmsBanner cmsBanner, BindingResult bindingResult) {
cmsBanner.setBusinessId(Integer.valueOf(businessId));
......@@ -91,8 +91,8 @@ public class CmsBannerController extends CyPaginationController<CmsBanner> {
@PreAuthorize("@cyPerm.hasPerm('cms:banner:singleSearch')")
@CyOpeLogAnno(title = "system-banner管理管理-查询banner管理", businessType = CyLogTypeEnum.QUERY)
@ApiOperation(value="查询单一banner管理", notes="查询单一banner管理")
@ApiImplicitParams({@ApiImplicitParam(name = "businessId", value = "businessId", required = true, dataType = "varchar")})
@Operation(summary="查询单一banner管理", description="查询单一banner管理")
@Parameters({@Parameter(name = "businessId", description = "businessId", required = true)})
@GetMapping("/detail/{businessId:\\w+}")
public CyResult detail(@PathVariable String businessId) {
return CyResultGenUtil.builder(new CyPersistModel(1),
......@@ -103,7 +103,7 @@ public class CmsBannerController extends CyPaginationController<CmsBanner> {
@PreAuthorize("@cyPerm.hasPerm('cms:banner:search')")
@CyOpeLogAnno(title = "system-banner管理管理-查询banner管理", businessType = CyLogTypeEnum.QUERY)
@ApiOperation(value="查询banner管理集合", notes="查询banner管理集合")
@Operation(summary="查询banner管理集合", description="查询banner管理集合")
@GetMapping(value = "/queryCmsBanners")
public CyResult queryCmsBanners(CmsBanner cmsBanner) {
return CyResultGenUtil.builder(new CyPersistModel(1),
......@@ -114,7 +114,7 @@ public class CmsBannerController extends CyPaginationController<CmsBanner> {
// @PreAuthorize("@cyPerm.hasPerm('cms:banner:pageSearch')")
@CyOpeLogAnno(title = "system-banner管理管理-查询banner管理", businessType = CyLogTypeEnum.QUERY)
@ApiOperation(value="分页查询banner管理集合", notes="分页查询banner管理集合")
@Operation(summary="分页查询banner管理集合", description="分页查询banner管理集合")
@GetMapping(value = "/queryCmsBannerByPagination")
public CyGridModel listByPagination(CmsBanner cmsBanner) {
cmsBannerServiceImpl.findAllByPagination(getPaginationUtility(), cmsBanner);
......@@ -123,9 +123,9 @@ public class CmsBannerController extends CyPaginationController<CmsBanner> {
@PreAuthorize("@cyPerm.hasPerm('cms:banner:derive')")
@CyOpeLogAnno(title = "system-banner管理管理-查询banner管理", businessType = CyLogTypeEnum.EXPORT)
@ApiOperation(value = "导出banner管理信息", notes = "导出banner管理信息")
@Operation(summary = "导出banner管理信息", description = "导出banner管理信息")
@GetMapping(value = "/export")
public void outCmsBanner(HttpServletResponse response,CmsBanner cmsBanner,@PathVariable @RequestParam(defaultValue = "0") String excelId) {
public void outCmsBanner(HttpServletResponse response, CmsBanner cmsBanner, @PathVariable @RequestParam(defaultValue = "0") String excelId) {
String excelName="";
switch(excelId){
case "0": excelName="banner管理信息.xls";break;
......
src/main/java/org/rcisoft/business/cmsNotice/controller/CmsNoticeController.java
View file @ be651e54
......@@ -3,9 +3,9 @@ package org.rcisoft.business.cmsNotice.controller;
/*固定导入*/
import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiImplicitParams;
import io.swagger.annotations.ApiOperation;
import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.Parameter;
import io.swagger.v3.oas.annotations.Parameters;
import org.rcisoft.business.cmsNotice.entity.CmsNotice;
import org.rcisoft.business.cmsNotice.service.CmsNoticeService;
import org.rcisoft.core.anno.CyOpeLogAnno;
......@@ -22,7 +22,7 @@ import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.validation.BindingResult;
import org.springframework.web.bind.annotation.*;
import javax.servlet.http.HttpServletResponse;
import jakarta.servlet.http.HttpServletResponse;
import javax.validation.Valid;
import java.util.List;
......@@ -40,7 +40,7 @@ public class CmsNoticeController extends CyPaginationController<CmsNotice> {
@PreAuthorize("@cyPerm.hasPerm('cms:notice:increase')")
@CyOpeLogAnno(title = "system-公告管理-新增公告", businessType = CyLogTypeEnum.INSERT)
@ApiOperation(value = "添加公告", notes = "添加公告")
@Operation(summary = "添加公告", description = "添加公告")
@PostMapping(value = "/add")
public CyResult add(@Valid CmsNotice cmsNotice, BindingResult bindingResult) {
CyPersistModel data = cmsNoticeServiceImpl.persist(cmsNotice);
......@@ -52,8 +52,8 @@ public class CmsNoticeController extends CyPaginationController<CmsNotice> {
@PreAuthorize("@cyPerm.hasPerm('cms:notice:removing')")
@CyOpeLogAnno(title = "system-公告管理-删除公告", businessType = CyLogTypeEnum.DELETE)
@ApiOperation(value = "删除公告", notes = "删除公告")
@ApiImplicitParams({@ApiImplicitParam(name = "businessId", value = "businessId", required = true, dataType = "varchar")})
@Operation(summary = "删除公告", description = "删除公告")
@Parameters({@Parameter(name = "businessId", description = "businessId", required = true)})
@DeleteMapping("/delete/{businessId:\\w+}")
public CyResult delete(@PathVariable Integer businessId, CmsNotice cmsNotice) {
cmsNotice.setBusinessId(businessId);
......@@ -66,8 +66,8 @@ public class CmsNoticeController extends CyPaginationController<CmsNotice> {
@PreAuthorize("@cyPerm.hasPerm('cms:notice:modifications')")
@CyOpeLogAnno(title = "system-公告管理-修改公告", businessType = CyLogTypeEnum.INSERT)
@ApiOperation(value = "修改公告", notes = "修改公告")
@ApiImplicitParams({@ApiImplicitParam(name = "businessId", value = "businessId", required = false, dataType = "varchar")})
@Operation(summary = "修改公告", description = "修改公告")
@Parameters({@Parameter(name = "businessId", description = "businessId", required = false)})
@PostMapping("/update/{businessId:\\w+}")
public CyResult update(@PathVariable Integer businessId, @Valid CmsNotice cmsNotice, BindingResult bindingResult) {
cmsNotice.setBusinessId(businessId);
......@@ -80,8 +80,8 @@ public class CmsNoticeController extends CyPaginationController<CmsNotice> {
// @PreAuthorize("@cyPerm.hasPerm('cms:notice:singleSearch')")
@CyOpeLogAnno(title = "system-公告管理-查询公告", businessType = CyLogTypeEnum.QUERY)
@ApiOperation(value = "查询单一公告", notes = "查询单一公告")
@ApiImplicitParams({@ApiImplicitParam(name = "businessId", value = "businessId", required = true, dataType = "varchar")})
@Operation(summary = "查询单一公告", description = "查询单一公告")
@Parameters({@Parameter(name = "businessId", description = "businessId", required = true)})
@GetMapping("/detail/{businessId:\\w+}")
public CyResult detail(@PathVariable Integer businessId) {
return CyResultGenUtil.builder(new CyPersistModel(1),
......@@ -92,7 +92,7 @@ public class CmsNoticeController extends CyPaginationController<CmsNotice> {
//@PreAuthorize("@cyPerm.hasPerm('sys:contentNewsInformation:list')")
@CyOpeLogAnno(title = "system-公告管理-查询公告", businessType = CyLogTypeEnum.QUERY)
@ApiOperation(value = "查询公告集合", notes = "查询公告集合")
@Operation(summary = "查询公告集合", description = "查询公告集合")
@GetMapping(value = "/queryCmsNotice")
public CyResult querySysContentNewsInformations(CmsNotice cmsNotice) {
......@@ -104,7 +104,7 @@ public class CmsNoticeController extends CyPaginationController<CmsNotice> {
// @PreAuthorize("@cyPerm.hasPerm('cms:notice:pageSearch')")
@CyOpeLogAnno(title = "system-公告管理-查询公告", businessType = CyLogTypeEnum.QUERY)
@ApiOperation(value = "分页查询公告集合", notes = "分页查询公告集合")
@Operation(summary = "分页查询公告集合", description = "分页查询公告集合")
@GetMapping(value = "/queryCmsNoticeByPagination")
public CyGridModel listByPagination(CmsNotice cmsNotice) {
cmsNoticeServiceImpl.findAllByPagination(getPaginationUtility(), cmsNotice);
......@@ -114,8 +114,8 @@ public class CmsNoticeController extends CyPaginationController<CmsNotice> {
//修改状态
@PreAuthorize("@cyPerm.hasPerm('cms:notice:modificationsStatus')")
@CyOpeLogAnno(title = "system-公告管理-修改公告状态", businessType = CyLogTypeEnum.UPDATE)
@ApiOperation(value = "修改公告状态", notes = "修改公告状态")
@ApiImplicitParams({@ApiImplicitParam(name = "businessId", value = "businessId", required = true, dataType = "varchar")})
@Operation(summary = "修改公告状态", description = "修改公告状态")
@Parameters({@Parameter(name = "businessId", description = "businessId", required = true)})
@PostMapping("/updateStatus/{businessId:\\w+}")
public CyResult updateStatus(CmsNotice cmsNotice) {
CyPersistModel data = cmsNoticeServiceImpl.updateStatus(cmsNotice);
......@@ -126,7 +126,7 @@ public class CmsNoticeController extends CyPaginationController<CmsNotice> {
}
@PreAuthorize("@cyPerm.hasPerm('cms:notice:derive')")
@CyOpeLogAnno(title = "system-公告管理-查询公告", businessType = CyLogTypeEnum.EXPORT)
@ApiOperation(value = "导出公告信息", notes = "导出公告信息")
@Operation(summary = "导出公告信息", description = "导出公告信息")
@GetMapping(value = "/export")
public void outSysContentNewsInformation(HttpServletResponse response, CmsNotice cmsNotice, @PathVariable @RequestParam(defaultValue = "0") String excelId) {
String excelName = "";
......
src/main/java/org/rcisoft/common/component/Global.java
View file @ be651e54
......@@ -226,7 +226,7 @@ public class Global {
private String OPEN_OFFICE_HOME;
/*redis缓存超时时间*/
@Value("${spring.redis.timeout}")
@Value("${spring.data.redis.timeout}")
private Integer REDIS_TIMEOUT;
@Value("${global.path.xml_location}")
......
src/main/resources/application-common.yml
View file @ be651e54
......@@ -58,18 +58,18 @@ spring:
max-interval: 15000ms #重试最大时间间隔
multiplier: 2 #倍数
# 2. redis ------
redis:
host: ${cy_redis.ip}
port: ${cy_redis.port}
database: ${cy_redis.database:0}
password: ${cy_redis.password}
timeout: 3000
jedis:
pool:
max-active: 32
max-idle: 16
max-wait: 300ms
min-idle: 8
# redis:
# host: ${cy_redis.ip}
# port: ${cy_redis.port}
# database: ${cy_redis.database:0}
# password: ${cy_redis.password}
# timeout: 3000
# jedis:
# pool:
# max-active: 32
# max-idle: 16
# max-wait: 300ms
# min-idle: 8
# 3. redis-cluster ------
# redis:
......@@ -100,6 +100,18 @@ spring:
# 4. mongodb
data:
redis:
host: ${cy_redis.ip}
port: ${cy_redis.port}
database: ${cy_redis.database:0}
password: ${cy_redis.password}
timeout: 3000
jedis:
pool:
max-active: 32
max-idle: 16
max-wait: 300ms
min-idle: 8
mongodb:
uri: mongodb://${cy_mongodb.username}:${cy_mongodb.password}@${cy_mongodb.ip}:${cy_mongodb.port}/${cy_mongodb.db}?authSource=${cy_mongodb.authDb}
transactionEnabled: true
......@@ -115,7 +127,7 @@ spring:
max-lifetime: 180000
connection-timeout: 3000
# mysql
# connection-test-query: select 1 from dual
connection-test-query: select 1 from dual
#---------5.1 MYSQL-------------
# mysql5.0
......@@ -185,19 +197,33 @@ minio:
readAccessKey: ${cy_minio.readAccessKey}
readSecretKey: ${cy_minio.readSecretKey}
springdoc:
swagger-ui:
path: /swagger-ui.html
tags-sorter: alpha
operations-sorter: alpha
api-docs:
path: /v3/api-docs
group-configs:
- group: 'default'
paths-to-match: '/**'
packages-to-scan: org.rcisoft
- group: 'activiti'
paths-to-match: '/**'
packages-to-scan: org.activiti
knife4j:
markdowns: classpath:markdown/*
basic:
enable: false
username: zhangsan
password: 123456
enable: true
setting:
language: zh_cn
# basic:
# enable: false
# username: zhangsan
# password: 123456
springfox:
documentation:
swagger:
v2:
path: /api-docs
# 滑块验证码
aj:
......
src/main/resources/application-dev-conf.yml
View file @ be651e54
......@@ -61,7 +61,7 @@ cy_db:
cy:
model:
swagger2Config: true
swagger3Config: true
# sms
sms:
enable: true
......@@ -90,7 +90,7 @@ cy:
permitUnStatic:
- "/static/**"
- "/webjars/**"
- "/v2/**"
- "/v3/**"
- "/swagger-resources/**"
- "/api-docs/**"
- "/auth/**"
......@@ -103,7 +103,7 @@ cy:
- "/office/getFile"
- "/office/callback"
- "/**/**"
permitStatic: [ "/", "/*.html", "/favicon.ico", "/**/*.html", "/**/*.js", "/**/*.css" ]
permitStatic: [ "/", "/*.html", "/favicon.ico", "/**/*.html", "/**/*.js", "/**/*.css","/swagger-ui/*" ]
logoutSuccessUrl: "/login"
loginPage: "/login"
loginfailureUrl: "/login-error.html"
......
src/main/resources/application-kube-conf.yml
View file @ be651e54
......@@ -50,7 +50,7 @@ cy_db:
cy:
model:
swagger2Config: true
swagger3Config: true
sms:
enable: true
realSend: true
......@@ -78,7 +78,7 @@ cy:
permitUnStatic:
- "/static/**"
- "/webjars/**"
- "/v2/**"
- "/v3/**"
- "/swagger-resources/**"
- "/api-docs/**"
- "/auth/**"
......@@ -90,7 +90,7 @@ cy:
- "/office/callback"
- "/common/getKSA"
#- "/**/**"
permitStatic: [ "/", "/*.html", "/favicon.ico", "/**/*.html", "/**/*.js", "/**/*.css" ]
permitStatic: [ "/", "/*.html", "/favicon.ico", "/**/*.html", "/**/*.js", "/**/*.css" ,"/swagger-ui/*"]
logoutSuccessUrl: "/login"
loginPage: "/login"
loginfailureUrl: "/login-error.html"
......
src/main/resources/application-prod-conf.yml
View file @ be651e54
......@@ -50,7 +50,7 @@ cy_db:
cy:
model:
swagger2Config: true
swagger3Config: true
sms:
enable: true
realSend: true
......@@ -78,7 +78,7 @@ cy:
permitUnStatic:
- "/static/**"
- "/webjars/**"
- "/v2/**"
- "/v3/**"
- "/swagger-resources/**"
- "/api-docs/**"
- "/auth/**"
......@@ -89,7 +89,7 @@ cy:
- "/office/callback"
#- "/cros/**"
- "/common/getKSA"
permitStatic: [ "/", "/*.html", "/favicon.ico", "/**/*.html", "/**/*.js", "/**/*.css" ]
permitStatic: [ "/", "/*.html", "/favicon.ico", "/**/*.html", "/**/*.js", "/**/*.css","/swagger-ui/*" ]
logoutSuccessUrl: "/login"
loginPage: "/login"
loginfailureUrl: "/login-error.html"
......
src/main/resources/application-spbt.yml
View file @ be651e54
......@@ -113,6 +113,8 @@ cy:
saltGeneratorClassName: org.jasypt.salt.RandomSaltGenerator
ivGeneratorClassName: org.jasypt.iv.RandomIvGenerator
stringOutputType: base644
#身份证、邮箱、手机号存储加密
aesSecret: 'PLMOKNIJBU'
global:
path:
# base_upload_location: C:\software\nginx-1.26.2\html\upload
......
src/main/resources/application-test-conf.yml
View file @ be651e54
......@@ -49,7 +49,7 @@ cy_db:
db: zt_db
cy:
model:
swagger2Config: true
swagger3Config: true
sms:
enable: false
realSend: true
......@@ -77,7 +77,7 @@ cy:
permitUnStatic:
- "/static/**"
- "/webjars/**"
- "/v2/**"
- "/v3/**"
- "/swagger-resources/**"
- "/api-docs/**"
- "/auth/**"
......@@ -88,7 +88,7 @@ cy:
- "/office/callback"
#- "/cros/**"
- "/common/getKSA"
permitStatic: [ "/", "/*.html", "/favicon.ico", "/**/*.html", "/**/*.js", "/**/*.css" ]
permitStatic: [ "/", "/*.html", "/favicon.ico", "/**/*.html", "/**/*.js", "/**/*.css","/swagger-ui/*" ]
logoutSuccessUrl: "/login"
loginPage: "/login"
loginfailureUrl: "/login-error.html"
......
src/main/resources/logback-spring.xml
View file @ be651e54
......@@ -5,8 +5,7 @@
<appender name="consoleLog" class="ch.qos.logback.core.ConsoleAppender">
<layout class="ch.qos.logback.classic.PatternLayout">
<pattern>%white(%d{yyyy-MM-dd HH:mm:ss}) %green([%thread]) %highlight(%-5level)
%boldMagenta(%logger{10}.%M.%L) - %cyan(%msg%n)
<pattern>%white(%d{yyyy-MM-dd HH:mm:ss}) %green([%thread]) %highlight(%-5level) %boldMagenta(%logger{10}.%M.%L) - %cyan(%msg%n)
</pattern>
<!--格式化输出：%d表示日期，%thread表示线程名，%-5level：级别从左显示5个字符宽度%msg：日志消息，%n是换行符-->
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment