liuc/biz_supplier_manage
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' into 'uat'

Browse Source 
Master

See merge request eshop/biz_service_ebtp_project!36
This commit is contained in:
付庆吉
2022-03-17 09:42:37 +08:00
parent 69cd4b8d0c 57ada2621d
commit 8256bf3a19
2 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/com/chinaunicom/mall/ebtp/project/baseoperlog/aop/OperLogAspect.java
View File

@ -73,7 +73,7 @@ public class OperLogAspect {
boolean success = true; boolean success = true;
try { try {
return joinPoint.proceed(); return joinPoint.proceed();
} catch (Throwable e) { } catch (Exception e) {
success = false; success = false;
throw e; throw e;
} finally { } finally {

8
src/main/java/com/chinaunicom/mall/ebtp/project/config/SwaggerConfiguration.java
View File

@ -14,8 +14,8 @@ import springfox.documentation.service.Contact;
import springfox.documentation.spi.DocumentationType; import springfox.documentation.spi.DocumentationType;
import springfox.documentation.spring.web.plugins.Docket; import springfox.documentation.spring.web.plugins.Docket;
@EnableKnife4j //@EnableKnife4j
@Configuration //@Configuration
public class SwaggerConfiguration { public class SwaggerConfiguration {
@Value("${spring.application.name}") @Value("${spring.application.name}")
@ -27,7 +27,7 @@ public class SwaggerConfiguration {
@Value("${mconfig.host-name}") @Value("${mconfig.host-name}")
private String hostName; private String hostName;
@Bean // @Bean
public Docket tenderRestApi() { public Docket tenderRestApi() {
return new Docket(DocumentationType.SWAGGER_2) return new Docket(DocumentationType.SWAGGER_2)
.groupName(groupName) .groupName(groupName)
@ -38,7 +38,7 @@ public class SwaggerConfiguration {
.build(); .build();
} }
@Bean // @Bean
public ApiInfo tenderApiInfo() { public ApiInfo tenderApiInfo() {
String url = hostName+":"+port; String url = hostName+":"+port;
return new ApiInfoBuilder() return new ApiInfoBuilder()