瞎几把改

core/pom.xml

@@ -1,7 +1,7 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
     <parent>
-        <artifactId>webCrawler</artifactId>
+        <artifactId>webcrawler</artifactId>
         <groupId>org.pqh</groupId>
         <version>1.0-SNAPSHOT</version>
     </parent>
@@ -9,7 +9,7 @@
     <artifactId>core</artifactId>
     <packaging>jar</packaging>
     <name>core Maven Webapp</name>
-    <url>https://gitee.com/WuXianChaoPin/webCrawler</url>
+    <url>https://gitee.com/WuXianChaoPin/webcrawler</url>
 
     <dependencies>
 

core/src/main/java/org/pqh/core/config/HibernateConfig.java

@@ -1,9 +1,13 @@
 package org.pqh.core.config;
 
 import org.apache.commons.dbcp2.BasicDataSource;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
 import org.pqh.core.util.PropertiesUtil;
+import org.springframework.beans.factory.annotation.Value;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
+import org.springframework.context.annotation.PropertySource;
 import org.springframework.orm.hibernate5.HibernateTemplate;
 import org.springframework.orm.hibernate5.HibernateTransactionManager;
 import org.springframework.orm.hibernate5.LocalSessionFactoryBean;
@@ -16,19 +20,24 @@ import java.util.Properties;
  * Created by reborn on 2017/7/28.
  */
 @Configuration
+@PropertySource("classpath:config.properties")
 @EnableTransactionManagement
 public class HibernateConfig {
 
     private LocalSessionFactoryBean sessionFactoryBean;
     private BasicDataSource dataSource;
-    Properties properties = PropertiesUtil.loadPropertiesFromResourceFile("config.properties");
+    private Logger log= LogManager.getLogger();
+
+    @Value("${dbcp2.url}")
+    private String url;
+    @Value("${dbcp2.username}")
+    private String username;
+    @Value("${dbcp2.password}")
+    private String password;
 
     public HibernateConfig() {
+        log.info("数据库配置初始化\ndburl="+url+",dbcp2.username="+username+",dbcp2.password="+password);
         dataSource = new BasicDataSource();
-        dataSource.setUrl(properties.getProperty("dbcp2.url"));
-        dataSource.setUsername(properties.getProperty("dbcp2.username"));
-        dataSource.setPassword(properties.getProperty("dbcp2.password"));
-
         dataSource.setDriverClassName("com.mysql.cj.jdbc.Driver");
         sessionFactoryBean = new LocalSessionFactoryBean();
         sessionFactoryBean.setDataSource(dataSource);

pom.xml

@@ -2,15 +2,15 @@
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
     <modelVersion>4.0.0</modelVersion>
     <groupId>org.pqh</groupId>
-    <artifactId>webCrawler</artifactId>
+    <artifactId>webcrawler</artifactId>
     <packaging>pom</packaging>
     <version>1.0-SNAPSHOT</version>
     <modules>
-        <module>webCrawler-core</module>
+        <module>core</module>
-        <module>webCrawler-achieve</module>
+        <module>web</module>
     </modules>
-    <name>webCrawler Maven Webapp</name>
+    <name>webcrawler Maven Webapp</name>
-    <url>https://gitee.com/WuXianChaoPin/webCrawler</url>
+    <url>https://gitee.com/WuXianChaoPin/webcrawler</url>
 
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
@@ -120,7 +120,7 @@
     </dependencyManagement>
 
     <build>
-        <finalName>webCrawler</finalName>
+        <finalName>webcrawler</finalName>
         <plugins>
             <plugin>
                 <artifactId>maven-war-plugin</artifactId>

web/pom.xml

@@ -1,15 +1,15 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
     <parent>
-        <artifactId>webCrawler</artifactId>
+        <artifactId>webcrawler</artifactId>
         <groupId>org.pqh</groupId>
         <version>1.0-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
-    <artifactId>achieve</artifactId>
+    <artifactId>web</artifactId>
     <packaging>war</packaging>
     <name>achieve Maven Webapp</name>
-    <url>https://gitee.com/WuXianChaoPin/webCrawler</url>
+    <url>https://gitee.com/WuXianChaoPin/webcrawler</url>
     <dependencies>
         <dependency>
             <groupId>org.pqh</groupId>
@@ -88,8 +88,13 @@
             <artifactId>junit</artifactId>
             <scope>test</scope>
         </dependency>
+        <dependency>
+            <groupId>org.pqh</groupId>
+            <artifactId>core</artifactId>
+            <version>1.0-SNAPSHOT</version>
+        </dependency>
     </dependencies>
     <build>
-        <finalName>achieve</finalName>
+        <finalName>web</finalName>
     </build>
 </project>

web/src/main/java/org/pqh/achieve/config/SpringConfig.java

@@ -1,5 +1,6 @@
 package org.pqh.achieve.config;
 
+import org.pqh.core.annotation.EnableWebCrawlerConfiguration;
 import org.pqh.core.config.HibernateConfig;
 import org.springframework.context.ApplicationContext;
 import org.springframework.context.annotation.*;
@@ -12,9 +13,8 @@ import org.springframework.web.servlet.view.InternalResourceViewResolver;
  */
 @Configuration
 @EnableWebMvc
-@ComponentScan(basePackages = "org.pqh")
 @EnableAspectJAutoProxy
-@Import(HibernateConfig.class)
+@Import({HibernateConfig.class,WebCrawlerConfig.class})
 public class SpringConfig extends WebMvcConfigurationSupport{
 
     private static ApplicationContext applicationContext;

web/src/main/resources/config.properties

@@ -1,6 +1,6 @@
 #dbcp2.url=jdbc:mysql://localhost:3306/bilibili?serverTimezone=UTC&&useSSL=true
 #dbcp2.username=root
 #dbcp2.password=123456
-dbcp2.url=jdbc:mysql://172.16.0.50:3306/bb?serverTimezone=UTC&&useSSL=true
+dbcp2.url=jdbc:mysql://localhost:3306/bilibili?serverTimezone=UTC&&useSSL=true
 dbcp2.username=root
 dbcp2.password=123456