1.0.11.RELEASE

common-core/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>matrix</artifactId>
         <groupId>com.secoo.mall</groupId>
-        <version>1.0.10.RELEASE</version>
+        <version>1.0.11.RELEASE</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

common-core/src/main/java/com/secoo/mall/common/core/aop/AopTransaction.java

@@ -15,7 +15,7 @@ import javax.annotation.Resource;
 
 @Aspect
 @Component
-@ConditionalOnProperty(value = "transaction.support.enabled",havingValue = "true")
+@ConditionalOnProperty(value = "matrix.aop-transaction.enabled",havingValue = "true")
 public class AopTransaction {
     @Resource
     private PlatformTransactionManager transactionManager;

common-core/src/main/java/com/secoo/mall/common/core/condition/ProdEnvCondition.java → common-core/src/main/java/com/secoo/mall/common/core/condition/BateEnvCondition.java

@@ -7,7 +7,7 @@ import org.springframework.context.annotation.Condition;
 import org.springframework.context.annotation.ConditionContext;
 import org.springframework.core.type.AnnotatedTypeMetadata;
 
-public class ProdEnvCondition implements Condition {
+public class BateEnvCondition implements Condition {
     @Override
     public boolean matches(ConditionContext conditionContext, AnnotatedTypeMetadata annotatedTypeMetadata) {
         String[] profiles = conditionContext.getEnvironment().getActiveProfiles();

common-util/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>matrix</artifactId>
         <groupId>com.secoo.mall</groupId>
-        <version>1.0.10.RELEASE</version>
+        <version>1.0.11.RELEASE</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

config-starter/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>matrix</artifactId>
         <groupId>com.secoo.mall</groupId>
-        <version>1.0.10.RELEASE</version>
+        <version>1.0.11.RELEASE</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

elasticsearch-starter/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>matrix</artifactId>
         <groupId>com.secoo.mall</groupId>
-        <version>1.0.10.RELEASE</version>
+        <version>1.0.11.RELEASE</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

logger-starter/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>matrix</artifactId>
         <groupId>com.secoo.mall</groupId>
-        <version>1.0.10.RELEASE</version>
+        <version>1.0.11.RELEASE</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

logger-starter/secoo-log-starter/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>logger-starter</artifactId>
         <groupId>com.secoo.mall</groupId>
-        <version>1.0.10.RELEASE</version>
+        <version>1.0.11.RELEASE</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>

logger-starter/secoo-log/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>logger-starter</artifactId>
         <groupId>com.secoo.mall</groupId>
-        <version>1.0.10.RELEASE</version>
+        <version>1.0.11.RELEASE</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

mongodb-starter/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>matrix</artifactId>
         <groupId>com.secoo.mall</groupId>
-        <version>1.0.10.RELEASE</version>
+        <version>1.0.11.RELEASE</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

monitor-starter/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>matrix</artifactId>
         <groupId>com.secoo.mall</groupId>
-        <version>1.0.10.RELEASE</version>
+        <version>1.0.11.RELEASE</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

mybatis-starter/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>matrix</artifactId>
         <groupId>com.secoo.mall</groupId>
-        <version>1.0.10.RELEASE</version>
+        <version>1.0.11.RELEASE</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

openfeign-starter/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>matrix</artifactId>
         <groupId>com.secoo.mall</groupId>
-        <version>1.0.10.RELEASE</version>
+        <version>1.0.11.RELEASE</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

pom.xml

@@ -6,7 +6,7 @@
 
     <groupId>com.secoo.mall</groupId>
     <artifactId>matrix</artifactId>
-    <version>1.0.10.RELEASE</version>
+    <version>1.0.11.RELEASE</version>
     <packaging>pom</packaging>
 
 
@@ -28,7 +28,7 @@
     <parent>
         <groupId>org.springframework.boot</groupId>
         <artifactId>spring-boot-starter-parent</artifactId>
-        <version>2.1.6.RELEASE</version>
+        <version>2.1.7.RELEASE</version>
         <relativePath/>
     </parent>
 
@@ -45,67 +45,67 @@
             <dependency>
                 <groupId>com.secoo.mall</groupId>
                 <artifactId>secoo-log-starter</artifactId>
-                <version>1.0.10.RELEASE</version>
+                <version>1.0.11.RELEASE</version>
             </dependency>
             <dependency>
                 <groupId>com.secoo.mall</groupId>
                 <artifactId>secoo-log</artifactId>
-                <version>1.0.10.RELEASE</version>
+                <version>1.0.11.RELEASE</version>
             </dependency>
             <dependency>
                 <groupId>com.secoo.mall</groupId>
                 <artifactId>monitor-starter</artifactId>
-                <version>1.0.10.RELEASE</version>
+                <version>1.0.11.RELEASE</version>
             </dependency>
             <dependency>
                 <groupId>com.secoo.mall</groupId>
                 <artifactId>common-core</artifactId>
-                <version>1.0.10.RELEASE</version>
+                <version>1.0.11.RELEASE</version>
             </dependency>
             <dependency>
                 <groupId>com.secoo.mall</groupId>
                 <artifactId>config-starter</artifactId>
-                <version>1.0.10.RELEASE</version>
+                <version>1.0.11.RELEASE</version>
             </dependency>
             <dependency>
                 <groupId>com.secoo.mall</groupId>
                 <artifactId>common-util</artifactId>
-                <version>1.0.10.RELEASE</version>
+                <version>1.0.11.RELEASE</version>
             </dependency>
             <dependency>
                 <groupId>com.secoo.mall</groupId>
                 <artifactId>redis-starter</artifactId>
-                <version>1.0.10.RELEASE</version>
+                <version>1.0.11.RELEASE</version>
             </dependency>
             <dependency>
                 <groupId>com.secoo.mall</groupId>
                 <artifactId>mybatis-starter</artifactId>
-                <version>1.0.10.RELEASE</version>
+                <version>1.0.11.RELEASE</version>
             </dependency>
             <dependency>
                 <groupId>com.secoo.mall</groupId>
                 <artifactId>mongodb-starter</artifactId>
-                <version>1.0.10.RELEASE</version>
+                <version>1.0.11.RELEASE</version>
             </dependency>
             <dependency>
                 <groupId>com.secoo.mall</groupId>
                 <artifactId>elasticsearch-starter</artifactId>
-                <version>1.0.10.RELEASE</version>
+                <version>1.0.11.RELEASE</version>
             </dependency>
             <dependency>
                 <groupId>com.secoo.mall</groupId>
                 <artifactId>protocol-starter</artifactId>
-                <version>1.0.10.RELEASE</version>
+                <version>1.0.11.RELEASE</version>
             </dependency>
             <dependency>
                 <groupId>com.secoo.mall</groupId>
                 <artifactId>rocketmq-starter</artifactId>
-                <version>1.0.10.RELEASE</version>
+                <version>1.0.11.RELEASE</version>
             </dependency>
             <dependency>
                 <groupId>com.secoo.mall</groupId>
                 <artifactId>openfeign-starter</artifactId>
-                <version>1.0.10.RELEASE</version>
+                <version>1.0.11.RELEASE</version>
             </dependency>
 
             <dependency>

protocol-starter/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>matrix</artifactId>
         <groupId>com.secoo.mall</groupId>
-        <version>1.0.10.RELEASE</version>
+        <version>1.0.11.RELEASE</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

protocol-starter/src/main/java/com/secoo/mall/common/config/MatrixSwaggerAutoConfiguration.java

 package com.secoo.mall.common.config;
 
 import com.github.xiaoymin.swaggerbootstrapui.annotations.EnableSwaggerBootstrapUI;
-import com.secoo.mall.common.core.condition.ProdEnvCondition;
+import com.secoo.mall.common.core.condition.BateEnvCondition;
 import com.secoo.mall.dubbo.swagger.annotations.EnableDubboSwagger;
 import com.secoo.mall.web.annotation.ApiController;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
 import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.Conditional;
 import org.springframework.context.annotation.Configuration;
 import springfox.documentation.builders.ApiInfoBuilder;
 import springfox.documentation.builders.PathSelectors;
@@ -17,13 +16,12 @@ import springfox.documentation.spi.DocumentationType;
 import springfox.documentation.spring.web.plugins.Docket;
 import springfox.documentation.swagger2.annotations.EnableSwagger2;
 
-;
 
 @Configuration
 @EnableSwagger2
 @EnableSwaggerBootstrapUI
 @EnableDubboSwagger
-@ConditionalOnClass(ProdEnvCondition.class)
+@ConditionalOnClass(BateEnvCondition.class)
 public class MatrixSwaggerAutoConfiguration {
 
     @Value("${spring.application.name}")
@@ -42,15 +40,11 @@ public class MatrixSwaggerAutoConfiguration {
                 .build();
     }
 
-
+    @Bean
     public Docket createDubboApi() {
         return new Docket(DocumentationType.SWAGGER_2)
                 .apiInfo(apiInfo())
-                .groupName("dubbo")
-                .select()
-                .apis(RequestHandlerSelectors.basePackage("com.deepoove.dubbo.provider.springboot"))
-                .paths(PathSelectors.any())
-                .build();
+                .groupName("dubbo");
     }
 
     private ApiInfo apiInfo() {

protocol-starter/src/main/java/com/secoo/mall/web/util/WebUtil.java

@@ -9,6 +9,7 @@ import javax.servlet.http.HttpServletResponse;
 import javax.servlet.http.HttpSession;
 
 public class WebUtil {
+    private static String sessionUser = "sessionUser";
 
     public static String getParameter(String name) {
         return getRequest().getParameter(name);
@@ -40,7 +41,15 @@ public class WebUtil {
     }
 
     public static <T> void setAttribute(String name, T obj) {
-        getRequest().setAttribute(name, obj);
+        getRequest().setAttribute(sessionUser, obj);
+    }
+
+    public static <T> void setSessionUser(T obj) {
+        setAttribute(sessionUser, obj);
+    }
+
+    public static <T> T getSessionUser(Class<T> clazz) {
+        return getAttribute(sessionUser);
     }
 
 }

redis-starter/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>matrix</artifactId>
         <groupId>com.secoo.mall</groupId>
-        <version>1.0.10.RELEASE</version>
+        <version>1.0.11.RELEASE</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

rocketmq-starter/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>matrix</artifactId>
         <groupId>com.secoo.mall</groupId>
-        <version>1.0.10.RELEASE</version>
+        <version>1.0.11.RELEASE</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>