Merge branch 'uat' into 'uat-v2.1.0'

Uat

See merge request eshop/biz_service_ebtp_project!37

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

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

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

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