Ver Fonte

fix 修改接口

daiyihua há 1 ano atrás
pai
commit
d9f4edd22d

+ 8 - 4
ywt-platform-glasses-common/src/main/java/com/ywt/glasses/config/jpa/GlassesConfig.java

@@ -1,5 +1,6 @@
 package com.ywt.glasses.config.jpa;
 
+import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Qualifier;
 import org.springframework.boot.autoconfigure.orm.jpa.HibernateProperties;
@@ -29,10 +30,11 @@ import java.util.Map;
         transactionManagerRef = "transactionManagerGlasses",
         basePackages = {"com.ywt.glasses.domain.entity.glasses"}
 )
+@Slf4j
 public class GlassesConfig {
     @Autowired
-    @Qualifier("ywtCenterDataSource")
-    private DataSource ywtCenterDataSource;
+    @Qualifier("glassesDataSource")
+    private DataSource glassesDataSource;
 
     @Autowired
     private JpaProperties jpaProperties;
@@ -48,7 +50,7 @@ public class GlassesConfig {
             EntityManagerFactoryBuilder builder) {
         Map<String, Object> properties = hibernateProperties.determineHibernateProperties(
                 jpaProperties.getProperties(), new HibernateSettings());
-        return builder.dataSource(ywtCenterDataSource).properties(properties)
+        return builder.dataSource(glassesDataSource).properties(properties)
                 .packages("com.ywt.glasses.domain.entity.glasses").build();
     }
 
@@ -60,11 +62,12 @@ public class GlassesConfig {
     @Bean(name = "entityManagerFactoryGlasses")
     @Primary
     public EntityManagerFactory entityManagerFactory(EntityManagerFactoryBuilder builder) {
+        log.info("创建 glasses 的EntityManagerFactory");
         return this.entityManagerFactoryBean(builder).getObject();
     }
 
     @Bean(name = "entityManager")
-    //@Primary TODO 去除该标签不然会报错
+    // @Primary  TODO 去除该标签不然会报错
     public EntityManager entityManager(@Qualifier("entityManagerFactoryGlasses") EntityManagerFactory entityManagerFactory) {
         return entityManagerFactory.createEntityManager();
     }
@@ -75,6 +78,7 @@ public class GlassesConfig {
     @Bean(name = "transactionManagerGlasses")
     @Primary
     public PlatformTransactionManager transactionManager(EntityManagerFactoryBuilder builder) {
+        log.info("创建 glasses 的 TransactionManager");
         return new JpaTransactionManager(this.entityManagerFactory(builder));
     }
 }

+ 19 - 0
ywt-platform-glasses-web/src/main/java/com/ywt/glasses/configs/WebMvcConfigure.java

@@ -0,0 +1,19 @@
+package com.ywt.glasses.configs;
+
+import com.ywt.glasses.core.SpringContext;
+import com.ywt.glasses.interceptors.AccessBehaviorInterceptor;
+import com.ywt.glasses.interceptors.AuthInterceptor;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.web.servlet.config.annotation.InterceptorRegistry;
+import org.springframework.web.servlet.config.annotation.WebMvcConfigurerAdapter;
+
+@Configuration
+public class WebMvcConfigure extends WebMvcConfigurerAdapter {
+
+    @Override
+    public void addInterceptors(InterceptorRegistry registry) {
+        registry.addInterceptor((AccessBehaviorInterceptor) SpringContext.getBean(AccessBehaviorInterceptor.class)).addPathPatterns("/**");
+        registry.addInterceptor((AuthInterceptor) SpringContext.getBean(AuthInterceptor.class)).addPathPatterns("/**");
+        super.addInterceptors(registry);
+    }
+}

+ 1 - 1
ywt-platform-glasses-web/src/main/java/com/ywt/glasses/controllers/mg/interceptors/AccessBehaviorInterceptor.java → ywt-platform-glasses-web/src/main/java/com/ywt/glasses/interceptors/AccessBehaviorInterceptor.java

@@ -1,4 +1,4 @@
-package com.ywt.glasses.controllers.mg.interceptors;
+package com.ywt.glasses.interceptors;
 
 import com.fasterxml.jackson.databind.JsonNode;
 

+ 1 - 1
ywt-platform-glasses-web/src/main/java/com/ywt/glasses/controllers/mg/interceptors/AuthInterceptor.java → ywt-platform-glasses-web/src/main/java/com/ywt/glasses/interceptors/AuthInterceptor.java

@@ -1,4 +1,4 @@
-package com.ywt.glasses.controllers.mg.interceptors;
+package com.ywt.glasses.interceptors;
 
 import com.fasterxml.jackson.databind.JsonNode;
 

+ 2 - 2
ywt-platform-glasses-web/src/main/resources/application.yml

@@ -17,7 +17,7 @@ spring:
   # datasource 配置
   datasource:
     glasses:
-      jdbcUrl: jdbc:mysql://rm-wz9a76b4u608w6f0efo.mysql.rds.aliyuncs.com:3306/ywt_center?characterEncoding=utf8&useSSL=false&useOldAliasMetadataBehavior=true&autoReconnect=true
+      jdbcUrl: jdbc:mysql://rm-wz9a76b4u608w6f0efo.mysql.rds.aliyuncs.com:3306/glasses?characterEncoding=utf8&useSSL=false&useOldAliasMetadataBehavior=true&autoReconnect=true
       driver-class-name: com.mysql.jdbc.Driver
       username: ywt_qa
       password: Ywtqa123456x*#
@@ -30,7 +30,7 @@ spring:
       maxLifetime: 1800000
       connectionTestQuery: SELECT 1
     ywtcenter:
-      jdbcUrl: jdbc:mysql://rm-wz9a76b4u608w6f0efo.mysql.rds.aliyuncs.com:3306/glasses?characterEncoding=utf8&useSSL=false&useOldAliasMetadataBehavior=true&autoReconnect=true
+      jdbcUrl: jdbc:mysql://rm-wz9a76b4u608w6f0efo.mysql.rds.aliyuncs.com:3306/ywt_center?characterEncoding=utf8&useSSL=false&useOldAliasMetadataBehavior=true&autoReconnect=true
       driver-class-name: com.mysql.jdbc.Driver
       username: ywt_qa
       password: Ywtqa123456x*#

+ 1 - 1
ywt-platform-glasses-web/src/main/resources/logback-spring.xml

@@ -22,7 +22,7 @@
         </encoder>
     </appender>
 
-    <logger name="org.hibernate" level="INFO" />
+    <logger name="org.hibernate" level="ERROR" />
     <!-- 日志输出级别 -->
     <root level="@logging.level.root@">
         <appender-ref ref="FILE" />