From 1a2daec518d161d981ef2a2078786efea7f6134f Mon Sep 17 00:00:00 2001 From: zxui Date: Sat, 27 Apr 2019 20:50:40 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E8=BD=AC=E6=88=90maven=E9=A1=B9=E7=9B=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- build.gradle | 82 ------------------------ pom.xml | 161 ++++++++++++++++++++++++++++++++++++++++++++++++ settings.gradle | 2 - 3 files changed, 161 insertions(+), 84 deletions(-) delete mode 100644 build.gradle create mode 100644 pom.xml delete mode 100644 settings.gradle diff --git a/build.gradle b/build.gradle deleted file mode 100644 index 0961c5e..0000000 --- a/build.gradle +++ /dev/null @@ -1,82 +0,0 @@ -group "com.github.izhangzhihao" -version "1.0-SNAPSHOT" - -apply plugin: "java" -apply plugin: "war" - -sourceCompatibility = 1.8 -targetCompatibility = 1.8 -def springVersion = "4.3.4.RELEASE" -def HibernateVersion = "5.2.4.Final" -def JacksonVersion = "2.8.4" - -repositories { - mavenLocal() - maven { url "http://maven.aliyun.com/nexus/content/groups/public/" } - mavenCentral() -} - -dependencies { - compile( - // spring framework - "org.springframework:spring-context:${springVersion}", - "org.springframework:spring-web:${springVersion}", - "org.springframework:spring-webmvc:${springVersion}", - "org.springframework:spring-test:${springVersion}", - "org.springframework:spring-beans:${springVersion}", - "org.springframework:spring-expression:${springVersion}", - "org.springframework:spring-aop:${springVersion}", - "org.springframework:spring-aspects:${springVersion}", - "org.springframework:spring-core:${springVersion}", - "org.springframework:spring-instrument:${springVersion}", - "org.springframework:spring-orm:${springVersion}", - - // MySQL - "mysql:mysql-connector-java:6.0.4", - - //servlet - "javax.servlet:javax.servlet-api:3.1.0", - - //apache - "commons-fileupload:commons-fileupload:1.3.1", - - // JSON - "com.fasterxml.jackson.core:jackson-core:${JacksonVersion}", - "com.fasterxml.jackson.core:jackson-databind:${JacksonVersion}", - "com.fasterxml.jackson.core:jackson-annotations:${JacksonVersion}", - - - //Hibernate - "org.hibernate:hibernate-core:${HibernateVersion}", - "org.hibernate:hibernate-validator:5.2.4.Final", - - //C3P0 - "com.mchange:c3p0:0.9.5.2", - "org.hibernate:hibernate-c3p0:${HibernateVersion}", - - //ehcache - "org.ehcache:ehcache:3.1.2", - "org.hibernate:hibernate-ehcache:${HibernateVersion}", - - //jUnit - "junit:junit:4.12", - - //@NotNull - "org.jetbrains:annotations:15.0", - - ) - testCompile( - //jUnit - "junit:junit:4.12", - ) -} - -task copyJars(type: Copy) { - from configurations.runtime - into "lib" //复制到lib目录 -} - -//让gradle支持中文 -tasks.withType(JavaCompile) { - options.encoding = "UTF-8" -} diff --git a/pom.xml b/pom.xml new file mode 100644 index 0000000..a2f7df5 --- /dev/null +++ b/pom.xml @@ -0,0 +1,161 @@ + + + 4.0.0 + com.github.izhangzhihao + FileUpload + 1.0-SNAPSHOT + war + + + 1.8 + 1.8 + + + + + junit + junit + 4.12 + + + org.jetbrains + annotations + 15.0 + + + org.springframework + spring-test + 4.3.4.RELEASE + + + com.fasterxml.jackson.core + jackson-core + 2.8.4 + + + commons-fileupload + commons-fileupload + 1.3.1 + + + org.springframework + spring-aspects + 4.3.4.RELEASE + + + org.springframework + spring-orm + 4.3.4.RELEASE + + + org.ehcache + ehcache + 3.1.2 + + + com.fasterxml.jackson.core + jackson-databind + 2.8.4 + + + org.springframework + spring-beans + 4.3.4.RELEASE + + + org.hibernate + hibernate-validator + 5.2.4.Final + + + mysql + mysql-connector-java + 6.0.4 + + + org.springframework + spring-instrument + 4.3.4.RELEASE + + + org.hibernate + hibernate-ehcache + 5.2.4.Final + + + org.springframework + spring-expression + 4.3.4.RELEASE + + + org.springframework + spring-aop + 4.3.4.RELEASE + + + org.springframework + spring-context + 4.3.4.RELEASE + + + org.springframework + spring-webmvc + 4.3.4.RELEASE + + + com.mchange + c3p0 + 0.9.5.2 + + + org.springframework + spring-web + 4.3.4.RELEASE + + + org.hibernate + hibernate-c3p0 + 5.2.4.Final + + + com.fasterxml.jackson.core + jackson-annotations + 2.8.4 + + + org.hibernate + hibernate-core + 5.2.4.Final + + + javax.servlet + javax.servlet-api + 3.1.0 + + + org.springframework + spring-core + 4.3.4.RELEASE + + + + ${project.artifactId} + + + org.apache.maven.plugins + maven-compiler-plugin + 3.3 + + 1.8 + 1.8 + + + + org.codehaus.mojo + build-helper-maven-plugin + 1.1 + + + + diff --git a/settings.gradle b/settings.gradle deleted file mode 100644 index 8e7698b..0000000 --- a/settings.gradle +++ /dev/null @@ -1,2 +0,0 @@ -rootProject.name = 'FileUpload.Java' - From 1897977e27303f667e8707745d65d98aef5e9123 Mon Sep 17 00:00:00 2001 From: zxui Date: Sat, 27 Apr 2019 21:17:27 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=85=8D=E7=BD=AE?= =?UTF-8?q?=E6=96=87=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/zhangzhihao/FileUpload/Java/Utils/SaveFile.java | 8 +------- src/main/resources/db.properties | 6 +++--- 2 files changed, 4 insertions(+), 10 deletions(-) diff --git a/src/main/java/com/zhangzhihao/FileUpload/Java/Utils/SaveFile.java b/src/main/java/com/zhangzhihao/FileUpload/Java/Utils/SaveFile.java index 333639f..29055ea 100644 --- a/src/main/java/com/zhangzhihao/FileUpload/Java/Utils/SaveFile.java +++ b/src/main/java/com/zhangzhihao/FileUpload/Java/Utils/SaveFile.java @@ -1,6 +1,5 @@ package com.zhangzhihao.FileUpload.Java.Utils; -import com.zhangzhihao.FileUpload.Java.Controller.FileUploadController; import org.jetbrains.annotations.NotNull; import org.springframework.web.multipart.MultipartFile; @@ -79,12 +78,7 @@ public static byte[] readInputStream(InputStream inStream) throws Exception { * @return */ public static String getRealPath() { - String realPath; - String path = FileUploadController.class.getResource("/").getFile(); - int index = path.indexOf("build"); - realPath = path.substring(0, index) + "/src/main/webapp/upload/"; - realPath = realPath.replaceFirst("/", ""); - return realPath; + return "D:/project/FileUpload/build/"; } diff --git a/src/main/resources/db.properties b/src/main/resources/db.properties index 065aab9..636ed8e 100644 --- a/src/main/resources/db.properties +++ b/src/main/resources/db.properties @@ -1,7 +1,7 @@ -# ݿӲ +# ���ݿ����Ӳ��� jdbc.driverClass=com.mysql.jdbc.Driver -jdbc.connectionURL=jdbc:mysql:///FileUpload?useUnicode=true&characterEncoding=utf-8&serverTimezone=UTC +jdbc.connectionURL=jdbc:mysql://localhost:3306/hive?createDatabaseIfNotExist=true&useSSL=false&useUnicode=true&characterEncoding=utf-8&serverTimezone=UTC jdbc.userName=root -jdbc.password= +jdbc.password=123456 jdbc.initPoolSize=5 jdbc.maxPoolSize=10