فهرست منبع

去除mysql依赖
+dockerfile
+相关脚本

梅杰 6 سال پیش
والد
کامیت
eeba6d2657

+ 5 - 0
Dockerfile

@@ -0,0 +1,5 @@
+FROM openjdk:8-jdk-alpine
+ADD ./target/crowd_review-1.0-SNAPSHOT.jar /project/crowd_review.jar
+COPY ./sgns.wiki.word.zip /Users/major/Downloads/
+EXPOSE 8090
+ENTRYPOINT ["/project/deploy.sh"]

+ 6 - 0
build-run.sh

@@ -0,0 +1,6 @@
+#!/bin/sh
+mvn clean package
+
+docker build -t crowd_review:0.1 .
+
+docker run --name crowd_review --rm -it -v /Users/major/development/crowd_review/deploy.sh:/project/deploy.sh -p 8090:8090 crowd_review:0.1 /bin/sh

+ 4 - 0
deploy.sh

@@ -0,0 +1,4 @@
+#!/bin/sh
+unzip -o /Users/major/Downloads/sgns.wiki.word.zip -d /Users/major/Downloads/
+
+java -Djava.security.egd=file:/dev/./urandom -jar -Dspring.profiles.active=test /project/crowd_review.jar

+ 1 - 23
pom.xml

@@ -65,7 +65,7 @@
         <dependency>
             <groupId>org.projectlombok</groupId>
             <artifactId>lombok</artifactId>
-            <version>1.16.6</version>
+            <version>1.18.6</version>
         </dependency>
 
         <dependency>
@@ -101,29 +101,7 @@
             <version>4.2</version>
         </dependency>
 
-        <dependency>
-            <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-starter-data-jpa</artifactId>
-        </dependency>
 
-        <dependency>
-            <groupId>org.hibernate</groupId>
-            <artifactId>hibernate-java8</artifactId>
-        </dependency>
-
-        <dependency>
-            <groupId>mysql</groupId>
-            <artifactId>mysql-connector-java</artifactId>
-            <version>5.1.21</version>
-        </dependency>
-
-
-        <!-- druid数据库连接池 -->
-        <dependency>
-            <groupId>com.alibaba</groupId>
-            <artifactId>druid-spring-boot-starter</artifactId>
-            <version>1.1.9</version>
-        </dependency>
 
         <dependency>
             <groupId>org.springframework.boot</groupId>

+ 0 - 57
src/main/java/com/mooctest/config/DruidConfiguration.java

@@ -1,57 +0,0 @@
-package com.mooctest.config;
-
-import com.alibaba.druid.spring.boot.autoconfigure.DruidDataSourceBuilder;
-import com.alibaba.druid.support.http.StatViewServlet;
-import com.alibaba.druid.support.http.WebStatFilter;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.boot.context.properties.ConfigurationProperties;
-import org.springframework.boot.web.servlet.FilterRegistrationBean;
-import org.springframework.boot.web.servlet.ServletRegistrationBean;
-import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.Configuration;
-import org.springframework.context.annotation.Primary;
-
-import javax.sql.DataSource;
-
-@Configuration
-public class DruidConfiguration{
-
-    private static final Logger logger = LoggerFactory.getLogger(DruidConfiguration.class);
-    @Bean
-    public ServletRegistrationBean druidServlet() {
-        logger.info("init Druid Servlet Configuration ");
-        ServletRegistrationBean servletRegistrationBean = new ServletRegistrationBean(new StatViewServlet(), "/druid/*");
-
-        //控制台管理用户
-        servletRegistrationBean.addInitParameter("loginUsername", "admin");
-        servletRegistrationBean.addInitParameter("loginPassword", "admin");
-        //是否能够重置数据 禁用HTML页面上的“Reset All”功能
-        servletRegistrationBean.addInitParameter("resetEnable", "false");
-
-        // IP白名单
-        // servletRegistrationBean.addInitParameter("allow", "192.168.2.25,127.0.0.1");
-        // IP黑名单(共同存在时,deny优先于allow)
-        //servletRegistrationBean.addInitParameter("deny", "192.168.1.100");
-        return servletRegistrationBean;
-    }
-
-    @Bean
-    public FilterRegistrationBean webStatFilterBean() {
-        FilterRegistrationBean webStatFilter = new FilterRegistrationBean(new WebStatFilter());
-        webStatFilter.addUrlPatterns("/*");
-        webStatFilter.addInitParameter("exclusions", "*.js,*.gif,*.jpg,*.png,*.css,*.ico,/druid/*");
-
-        //配置profileEnable能够监控单个url调用的sql列表
-        webStatFilter.addInitParameter("profileEnable", "true");
-        return webStatFilter;
-    }
-
-    @Primary
-    @Bean
-    @ConfigurationProperties("spring.datasource.druid")
-    public DataSource dataSourceOne(){
-        return DruidDataSourceBuilder.create().build();
-    }
-}
-

+ 0 - 2
src/main/java/com/mooctest/dao/AggTaskStatusDao.java

@@ -1,10 +1,8 @@
 package com.mooctest.dao;
 
 import com.mooctest.model.AggTaskStatus;
-import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.data.mongodb.repository.MongoRepository;
 
-import java.sql.Timestamp;
 import java.util.Date;
 import java.util.List;
 

+ 0 - 1
src/main/java/com/mooctest/dao/FinalReportDao.java

@@ -1,7 +1,6 @@
 package com.mooctest.dao;
 
 import com.mooctest.model.FinalReport;
-import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.data.mongodb.repository.MongoRepository;
 import org.springframework.transaction.annotation.Transactional;
 

+ 0 - 1
src/main/java/com/mooctest/dao/MasterReportDao.java

@@ -1,7 +1,6 @@
 package com.mooctest.dao;
 
 import com.mooctest.model.MasterReport;
-import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.data.mongodb.repository.MongoRepository;
 import org.springframework.transaction.annotation.Transactional;
 

+ 0 - 3
src/main/java/com/mooctest/dao/SupplementDao.java

@@ -1,10 +1,7 @@
 package com.mooctest.dao;
 
 import com.mooctest.model.SupplementItem;
-import org.springframework.data.jpa.repository.JpaRepository;
-import org.springframework.data.jpa.repository.Query;
 import org.springframework.data.mongodb.repository.MongoRepository;
-import org.springframework.data.repository.query.Param;
 import org.springframework.transaction.annotation.Transactional;
 
 import java.util.List;

+ 1 - 1
src/main/java/com/mooctest/model/AggTaskStatus.java

@@ -5,9 +5,9 @@ import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Data;
 import lombok.NoArgsConstructor;
+import org.springframework.data.annotation.Id;
 import org.springframework.data.mongodb.core.mapping.Document;
 
-import javax.persistence.*;
 import java.util.Date;
 
 @Data

+ 1 - 1
src/main/java/com/mooctest/model/FinalReport.java

@@ -5,9 +5,9 @@ import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Data;
 import lombok.NoArgsConstructor;
+import org.springframework.data.annotation.Id;
 import org.springframework.data.mongodb.core.mapping.Document;
 
-import javax.persistence.Id;
 import java.util.Date;
 
 @Data

+ 1 - 0
src/main/java/com/mooctest/model/MasterReport.java

@@ -5,6 +5,7 @@ import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Data;
 import lombok.NoArgsConstructor;
+import org.springframework.data.annotation.Id;
 import org.springframework.data.mongodb.core.mapping.Document;
 
 import javax.persistence.*;

+ 1 - 3
src/main/java/com/mooctest/model/SupplementItem.java

@@ -4,14 +4,12 @@ import com.mooctest.annotation.AutoValue;
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.NoArgsConstructor;
+import org.springframework.data.annotation.Id;
 import org.springframework.data.mongodb.core.mapping.Document;
 
-import javax.persistence.*;
-
 @Data
 @AllArgsConstructor
 @NoArgsConstructor
-@Entity
 @Document(collection = "SupplementItem")
 public class SupplementItem {
     @Id

+ 18 - 21
src/main/resources/application.yml

@@ -1,24 +1,6 @@
 spring.profiles.active: dev
 
 spring:
-  datasource:
-    driver-class-name: com.mysql.jdbc.Driver
-    druid:
-      initial-size: 1
-      max-active: 20
-      minIdle: 1
-      maxWait: 60000 #配置获取连接等待超时的时间
-      timeBetweenEvictionRunsMillis: 60000 #配置间隔多久才进行一次检测,检测需要关闭的空闲连接,单位是毫秒
-      minEvictableIdleTimeMillis: 300000 #配置一个连接在池中最小生存的时间,单位是毫秒
-      validationQuery: SELECT 'x'
-      poolPreparedStatements: true
-      maxPoolPreparedStatementPerConnectionSize: 20
-      # 配置监控统计拦截的filters,去掉后监控界面sql无法统计,'wall'用于防火墙
-      filters: stat,wall,log4j
-      # 通过connectProperties属性来打开mergeSql功能;慢SQL记录
-      connectionProperties: druid.stat.mergeSql=true;druid.stat.slowSqlMillis=5000
-      # 合并多个DruidDataSource的监控数据
-      #useGlobalDataSourceStat: true
   mvc:
     favicon:
       enabled: false
@@ -34,19 +16,34 @@ spring:
 ---
 spring:
     profiles: dev
+    thymeleaf:
+        cache: false
+    data:
+      mongodb:
+        uri: mongodb://localhost:27017/crowd_review
+server:
+    port: 8090
+logging:
+  level:
+    com.mooctest: debug
+  pattern:
+    console: "%d{yyyy-MM-dd HH:mm:ss} [%p] [%t] [%c] %m%n"
+---
+spring:
+    profiles: test
     datasource:
-        url: jdbc:mysql://localhost:3306/dup_report?useUnicode=true&characterEncoding=utf8&useSSL=false
+        url: jdbc:mysql://host.docker.internal:3306/dup_report?useUnicode=true&characterEncoding=utf8&useSSL=false
         username: root
         password: qyff2011
     thymeleaf:
         cache: false
     data:
       mongodb:
-        uri: mongodb://localhost:27017/crowd_review
+        uri: mongodb://host.docker.internal:27017/crowd_review
 server:
     port: 8090
 logging:
   level:
     com.mooctest: debug
   pattern:
-    console: "%d{yyyy-MM-dd HH:mm:ss} [%p] [%t] [%c] %m%n"
+    console: "%d{yyyy-MM-dd HH:mm:ss} [%p] [%t] [%c] %m%n"