fix

code/sapparent/pom.xml

@@ -45,7 +45,7 @@
 		<weixin-java-cp.version>3.7.8.B</weixin-java-cp.version>
 		<lombok.version>1.18.10</lombok.version>
 		<springfox.version>2.6.1</springfox.version>
-		<swagger-bootstrap-ui.version>1.9.3</swagger-bootstrap-ui.version>
+		<swagger-bootstrap-ui.version>1.9.6</swagger-bootstrap-ui.version>
 	</properties>
 
 	<dependencies>

code/sapparent/sapcms/src/main/java/org/fouram/config/SwaggerConfig.java

@@ -21,6 +21,6 @@ public class SwaggerConfig {
 	}
 
 	private ApiInfo apiInfo() {
-		return new ApiInfoBuilder().title("SAP-API").description("©2020").version("2.0").build();
+		return new ApiInfoBuilder().title("SAP-API").version("1.0").license("LICENSE").build();
 	}
 }

code/sapparent/sapcms/src/main/java/org/fouram/config/WebConfig.java

@@ -25,11 +25,13 @@ public class WebConfig extends WebMvcConfigurationSupport {
 	public void addInterceptors(InterceptorRegistry registry) {
 
 	}
-
+	
 	@Override
-	protected void addResourceHandlers(ResourceHandlerRegistry registry) {
+	public void addResourceHandlers(ResourceHandlerRegistry registry) {
 		registry.addResourceHandler("swagger-ui.html").addResourceLocations("classpath:/META-INF/resources/");
-		registry.addResourceHandler("/webjars/**").addResourceLocations("classpath:/META-INF/resources/webjars/");
+		registry.addResourceHandler("webjars/**").addResourceLocations("classpath:/META-INF/resources/webjars/");
+		registry.addResourceHandler("/**").addResourceLocations("/WEB-INF/", "classpath:/META-INF/resources/",
+				"classpath:/resources/", "classpath:/static/", "classpath:/public/");
 	}
 
 	/**
@@ -37,7 +39,6 @@ public class WebConfig extends WebMvcConfigurationSupport {
 	 *
 	 * @param
 	 */
-
 	@Bean
 	@Order(100)
 	public CorsFilter corsFilter() {

code/sapparent/sapcms/src/main/java/org/fouram/controller/ApiController.java

@@ -36,8 +36,13 @@ import org.springframework.web.bind.annotation.ResponseBody;
 
 import com.google.common.collect.Maps;
 
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiImplicitParams;
+import io.swagger.annotations.ApiOperation;
 import me.chanjar.weixin.cp.bean.WxCpOauth2UserInfo;
 
+@Api(value = "API接口")
 @Controller
 @RequestMapping(value = "/API")
 public class ApiController extends BaseController {
@@ -181,12 +186,9 @@ public class ApiController extends BaseController {
 			return AppUtil.error(ResultConstant.WEB_ERR_MSG);
 		}
 	}
-	
-	/**
-	 * 查询待确认员工列表
-	 *
-	 * @return
-	 */
+
+	@ApiImplicitParams({ @ApiImplicitParam(name = "currentPage", value = "当前页", dataType = "Integer") })
+	@ApiOperation(value = "查询待确认员工列表")
 	@RequestMapping(value = "/getToBeConfirmedList", produces = "application/json;charset=utf-8")
 	@ResponseBody
 	public Object getToBeConfirmedList(HttpServletRequest request, GetToBeConfirmedListDTO dto) {
@@ -263,8 +265,8 @@ public class ApiController extends BaseController {
 			if (dto.getPageNumber() == null) {
 				return ResultUtil.error("参数pageNumber为空");
 			}
-			Object result = sapCheckReportService.findUserReportPage(dto.getStartDate(), dto.getEndDate(), dto.getDepartId(),
-					dto.getName(), dto.getStatus(), dto.getPageSize(), dto.getPageNumber());
+			Object result = sapCheckReportService.findUserReportPage(dto.getStartDate(), dto.getEndDate(),
+					dto.getDepartId(), dto.getName(), dto.getStatus(), dto.getPageSize(), dto.getPageNumber());
 			return ResultUtil.success(result, "操作成功");
 		} catch (Exception e) {
 			LoggerUtil.error(e);
@@ -285,14 +287,14 @@ public class ApiController extends BaseController {
 			String ysFilePath = "/public/excel/userReport.xlsx";
 			// 汇总
 			String hzFilePath = "/public/excel/userReport" + DateUtil.getTimeStamp() + ".xlsx";
-			List<Map<String, Object>> hzList = sapCheckReportService.selectReportDayList(dto.getStartDate(), dto.getEndDate(),
-					dto.getDepartId(), dto.getName());
+			List<Map<String, Object>> hzList = sapCheckReportService.selectReportDayList(dto.getStartDate(),
+					dto.getEndDate(), dto.getDepartId(), dto.getName());
 			ExcelExportUtil.exportExcelFile(getRootPath() + ysFilePath, hzList, getRootPath() + hzFilePath, 0, 0);
 			ysFilePath = hzFilePath;
 			// 明细
 			String resultFilePath = "/public/excel/userReport" + DateUtil.getTimeStamp() + ".xlsx";
-			List<Map<String, Object>> mxList = sapCheckReportService.findUserReports(dto.getStartDate(), dto.getEndDate(),
-					dto.getDepartId(), dto.getName(), dto.getStatus(), null, null);
+			List<Map<String, Object>> mxList = sapCheckReportService.findUserReports(dto.getStartDate(),
+					dto.getEndDate(), dto.getDepartId(), dto.getName(), dto.getStatus(), null, null);
 			ExcelExportUtil.exportExcelFile(getRootPath() + ysFilePath, mxList, getRootPath() + resultFilePath, 1, 1);
 			return ResultUtil.success(resultFilePath, "操作成功");
 		} catch (Exception e) {

code/sapparent/sapservice/src/main/resources/spring/shiro.xml

@@ -50,13 +50,13 @@
 				/API/* = anon
 				/task/* = anon
 				/report/* = anon
-				
-				/doc.html=anon
+				/**html=anon
+				/*/api-docs=anon
 				/swagger*=anon
 				/configuration/*=anon
 				/*/configuration/*=anon
+				/doc*=anon
 				/webjars/**=anon
-				
 				/** = authc
 			</value>  
 		</property>