UPDATE-数据源放入到各能力中心中

pom.xml

@@ -39,21 +39,6 @@
 	<dependencies>
 
 		<dependency>
-			<groupId>org.springframework.boot</groupId>
-			<artifactId>spring-boot-starter-data-jpa</artifactId>
-			<exclusions>
-				<exclusion>
-					<groupId>org.slf4j</groupId>
-					<artifactId>jcl-over-slf4j</artifactId>
-				</exclusion>
-				<exclusion>
-					<groupId>org.slf4j</groupId>
-					<artifactId>jul-to-slf4j</artifactId>
-				</exclusion>
-
-			</exclusions>
-		</dependency>
-		<dependency>
 			<groupId>javax.validation</groupId>
 			<artifactId>validation-api</artifactId>
 		</dependency>
@@ -86,11 +71,6 @@
 		    <artifactId>slf4j-api</artifactId>
 		</dependency>
 
-		<dependency>
-			<groupId>com.zaxxer</groupId>
-			<artifactId>HikariCP</artifactId>
-		</dependency>
-
 
 		<dependency>
 			<groupId>org.springframework.boot</groupId>

src/main/java/com/ywt/biz/common/config/db/Datasources.java

@@ -1,31 +0,0 @@
-package com.ywt.biz.common.config.db;
-
-import org.springframework.beans.factory.annotation.Qualifier;
-import org.springframework.boot.jdbc.DataSourceBuilder ;
-import org.springframework.boot.context.properties.ConfigurationProperties;
-import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.Configuration;
-import org.springframework.context.annotation.Primary;
-
-import javax.sql.DataSource;
-
-/**
- * Created by huangguoping.
- */
-@Configuration
-public class Datasources {
-    @Bean(name = "ywtCenterDataSource")
-    @Qualifier("ywtCenterDataSource")
-    @ConfigurationProperties(prefix="spring.datasource.ywtcenter")
-    @Primary
-    public DataSource ywtCenterDataSource(){
-        return DataSourceBuilder.create().build();
-    }
-
-    @Bean(name = "ywtLogDataSource")
-    @Qualifier("ywtLogDataSource")
-    @ConfigurationProperties(prefix="spring.datasource.ywtlog")
-    public DataSource ywtLogDataSource(){
-        return DataSourceBuilder.create().build();
-    }
-}

src/main/java/com/ywt/biz/common/config/db/YwtLog.java

@@ -1,67 +0,0 @@
-package com.ywt.biz.common.config.db;
-
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.beans.factory.annotation.Qualifier;
-import org.springframework.boot.autoconfigure.orm.jpa.HibernateProperties;
-import org.springframework.boot.autoconfigure.orm.jpa.HibernateSettings;
-import org.springframework.boot.autoconfigure.orm.jpa.JpaProperties;
-import org.springframework.boot.context.properties.ConfigurationProperties;
-import org.springframework.boot.orm.jpa.EntityManagerFactoryBuilder;
-import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.Configuration;
-import org.springframework.data.jpa.repository.config.EnableJpaRepositories;
-import org.springframework.orm.jpa.JpaTransactionManager;
-import org.springframework.orm.jpa.LocalContainerEntityManagerFactoryBean;
-import org.springframework.transaction.PlatformTransactionManager;
-import org.springframework.transaction.annotation.EnableTransactionManagement;
-
-import javax.persistence.EntityManager;
-import javax.sql.DataSource;
-import java.util.Map;
-
-/**
- * @author Walker
- * Created on 2021/3/4
- */
-@Configuration
-@EnableTransactionManagement
-@EnableJpaRepositories(
-        entityManagerFactoryRef = "entityManagerFactoryLog",
-        transactionManagerRef = "transactionManagerLog",
-        basePackages = {"com.ywt.domain.entity.log"}
-)
-public class YwtLog {
-    @Autowired
-    @Qualifier("ywtLogDataSource")
-    private DataSource ywtLogDataSource;
-
-    @Bean(name = "entityManagerLog")
-    public EntityManager entityManager(EntityManagerFactoryBuilder builder,@Qualifier("ywtLogJpaProperties") JpaProperties jpaProperties) {
-        return entityManagerFactory(builder, jpaProperties).getObject().createEntityManager();
-    }
-
-    @Bean(name = "entityManagerFactoryLog")
-    public LocalContainerEntityManagerFactoryBean entityManagerFactory (EntityManagerFactoryBuilder builder,
-                                                                        @Qualifier("ywtLogJpaProperties") JpaProperties jpaProperties) {
-        return builder
-                .dataSource(ywtLogDataSource)
-                .properties(jpaProperties.getProperties())
-                .properties(new HibernateProperties()
-                        .determineHibernateProperties(
-                                jpaProperties.getProperties(), new HibernateSettings()))
-                .packages("com.ywt.domain.entity.log") //设置实体类所在位置
-                .persistenceUnit("ywtLogPersistenceUnit")
-                .build();
-    }
-
-    @Bean(name = "ywtLogJpaProperties")
-    @ConfigurationProperties(prefix = "spring.jpa.ywtLog")
-    public JpaProperties jpaProperties() {
-        return new JpaProperties();
-    }
-
-    @Bean(name = "transactionManagerLog")
-    public PlatformTransactionManager transactionManager(EntityManagerFactoryBuilder builder, @Qualifier("ywtLogJpaProperties") JpaProperties jpaProperties) {
-        return new JpaTransactionManager(entityManagerFactory(builder,jpaProperties).getObject());
-    }
-}

src/main/java/com/ywt/biz/common/config/db/Ywtcenter.java

@@ -1,71 +0,0 @@
-package com.ywt.biz.common.config.db;
-
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.beans.factory.annotation.Qualifier;
-import org.springframework.boot.autoconfigure.orm.jpa.HibernateProperties;
-import org.springframework.boot.autoconfigure.orm.jpa.HibernateSettings;
-import org.springframework.boot.autoconfigure.orm.jpa.JpaProperties;
-import org.springframework.boot.context.properties.ConfigurationProperties;
-import org.springframework.boot.orm.jpa.EntityManagerFactoryBuilder;
-import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.Configuration;
-import org.springframework.context.annotation.Primary;
-import org.springframework.data.jpa.repository.config.EnableJpaRepositories;
-import org.springframework.orm.jpa.JpaTransactionManager;
-import org.springframework.orm.jpa.LocalContainerEntityManagerFactoryBean;
-import org.springframework.transaction.PlatformTransactionManager;
-import org.springframework.transaction.annotation.EnableTransactionManagement;
-
-import javax.persistence.EntityManager;
-import javax.sql.DataSource;
-import java.util.Map;
-
-/**
- * Created by huangguoping.
- */
-@Configuration
-@EnableTransactionManagement
-@EnableJpaRepositories(
-        entityManagerFactoryRef = "entityManagerFactory",
-        transactionManagerRef = "transactionManager",
-        basePackages = {"com.ywt.domain.entity.center"}
-)
-public class Ywtcenter {
-    @Autowired
-    @Qualifier("ywtCenterDataSource")
-    private DataSource ywtCenterDataSource;
-
-    @Primary
-    @Bean(name = "entityManager")
-    public EntityManager entityManager(EntityManagerFactoryBuilder builder,@Qualifier("ywtLogJpaProperties") JpaProperties jpaProperties) {
-        return entityManagerFactory(builder,jpaProperties).getObject().createEntityManager();
-    }
-
-    @Primary
-    @Bean(name = "entityManagerFactory")
-    public LocalContainerEntityManagerFactoryBean entityManagerFactory (EntityManagerFactoryBuilder builder, @Qualifier("ywtLogJpaProperties") JpaProperties jpaProperties) {
-        return builder
-                .dataSource(ywtCenterDataSource)
-                .properties(jpaProperties.getProperties())
-                .properties(new HibernateProperties()
-                        .determineHibernateProperties(
-                                jpaProperties.getProperties(), new HibernateSettings()))
-                .packages("com.ywt.domain.entity.center") //设置实体类所在位置
-                .persistenceUnit("ywtcenterPersistenceUnit")
-                .build();
-    }
-
-    @Bean(name = "ywtCenterJpaProperties")
-    @ConfigurationProperties(prefix = "spring.jpa.ywtCenter")
-    public JpaProperties jpaProperties() {
-        return new JpaProperties();
-    }
-
-
-
-    @Primary
-    @Bean(name = "transactionManager")
-    public PlatformTransactionManager transactionManager(EntityManagerFactoryBuilder builder,@Qualifier("ywtLogJpaProperties") JpaProperties jpaProperties) {
-        return new JpaTransactionManager(entityManagerFactory(builder,jpaProperties).getObject());
-    }
-}

src/main/java/com/ywt/biz/common/config/redis/LettuceRedisConfig.java

@@ -24,8 +24,7 @@ import org.springframework.data.redis.serializer.*;
  */
 @EnableCaching
 @Configuration
-@ConfigurationProperties(prefix = "spring.redis")
-@ConditionalOnProperty(name = "redis.enable", havingValue = "true")
+@ConditionalOnProperty(name = "spring.redis.enable", havingValue = "true")
 public class LettuceRedisConfig {
 
 

src/main/java/com/ywt/biz/common/util/DateUtil.java

@@ -122,4 +122,46 @@ public class DateUtil {
         }
         return WEEK_DAYS_MIDDLE[index];
     }
+
+    public static Date parseDate(String str, String pattern) {
+        if (StringHelper.isNullOrWhiteSpace(str)) {
+            return null;
+        }
+
+        if (StringHelper.isNullOrWhiteSpace(pattern)) {
+            pattern = "yyyy-MM-dd HH:mm:ss";    //默认日期格式
+        }
+
+        SimpleDateFormat format = new SimpleDateFormat(pattern);
+        try {
+            format.setLenient(false);
+            return format.parse(str);
+        } catch (ParseException e) {
+            return null;
+        }
+    }
+
+    /**
+     * 得到修改之后的日期
+     * @param type:1-天，2-月，3-年
+     * @param changeNumber : 往前或往后变动日期，changeNumber < 0 表示往前修改(eg:2019->2018) changeNumber 日/月/年，
+     *                     changeNumber > 0 表示往后修改(eg:2018->2019</>) changeNumber 日/月/年，
+     * @param date 日期
+     * @return 修改之后的日期，格式：yyyy-MM-dd HH:mm:ss
+     */
+    public static Date getChangeMonthDate(Date date, int type, int changeNumber) throws Exception {
+        //获得实体类
+        Calendar ca = Calendar.getInstance();
+        ca.setTime(date);
+        //设置最后一天
+        if (type == 1){
+            ca.add(Calendar.DAY_OF_YEAR, changeNumber);
+        }else if(type == 2){
+            ca.add(Calendar.MONTH, changeNumber);
+        }else if (type == 3){
+            ca.add(Calendar.YEAR, changeNumber);
+        }
+        //最后一天格式化
+        return ca.getTime();
+    }
 }