open-soure / poet_ready_system · 提交

转到一个项目

作者 钟来
提交 e76d37b05e707e6e2db3fc2a291e888765d7445c 1 个父辈 7d9202cc

初始提交

内嵌 并排对比
正在显示 4 个修改的文件 包含 121 行增加 和 7 行删除
  1 +<?xml version="1.0" encoding="UTF-8"?>
  2 +<module org.jetbrains.idea.maven.project.MavenProjectsManager.isMavenModule="true" type="JAVA_MODULE" version="4">
  3 + <component name="FacetManager">
  4 + <facet type="web" name="Web">
  5 + <configuration>
  6 + <webroots>
  7 + <root url="file://$MODULE_DIR$/src/main/webapp" relative="/" />
  8 + </webroots>
  9 + </configuration>
  10 + </facet>
  11 + <facet type="Spring" name="Spring">
  12 + <configuration />
  13 + </facet>
  14 + </component>
  15 + <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_8">
  16 + <output url="file://$MODULE_DIR$/target/classes" />
  17 + <output-test url="file://$MODULE_DIR$/target/test-classes" />
  18 + <content url="file://$MODULE_DIR$">
  19 + <sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />
  20 + <sourceFolder url="file://$MODULE_DIR$/src/main/resources" type="java-resource" />
  21 + <excludeFolder url="file://$MODULE_DIR$/target" />
  22 + </content>
  23 + <orderEntry type="inheritedJdk" />
  24 + <orderEntry type="sourceFolder" forTests="false" />
  25 + <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter:1.5.15.RELEASE" level="project" />
  26 + <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot:1.5.15.RELEASE" level="project" />
  27 + <orderEntry type="library" name="Maven: org.springframework:spring-context:4.3.18.RELEASE" level="project" />
  28 + <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-autoconfigure:1.5.15.RELEASE" level="project" />
  29 + <orderEntry type="library" name="Maven: org.springframework:spring-core:4.3.18.RELEASE" level="project" />
  30 + <orderEntry type="library" scope="RUNTIME" name="Maven: org.yaml:snakeyaml:1.17" level="project" />
  31 + <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-web:1.5.15.RELEASE" level="project" />
  32 + <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-tomcat:1.5.15.RELEASE" level="project" />
  33 + <orderEntry type="library" name="Maven: org.apache.tomcat.embed:tomcat-embed-core:8.5.32" level="project" />
  34 + <orderEntry type="library" name="Maven: org.apache.tomcat:tomcat-annotations-api:8.5.32" level="project" />
  35 + <orderEntry type="library" name="Maven: org.apache.tomcat.embed:tomcat-embed-el:8.5.32" level="project" />
  36 + <orderEntry type="library" name="Maven: org.apache.tomcat.embed:tomcat-embed-websocket:8.5.32" level="project" />
  37 + <orderEntry type="library" name="Maven: org.hibernate:hibernate-validator:5.3.6.Final" level="project" />
  38 + <orderEntry type="library" name="Maven: javax.validation:validation-api:1.1.0.Final" level="project" />
  39 + <orderEntry type="library" name="Maven: org.jboss.logging:jboss-logging:3.3.2.Final" level="project" />
  40 + <orderEntry type="library" name="Maven: com.fasterxml:classmate:1.3.4" level="project" />
  41 + <orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-databind:2.8.11.2" level="project" />
  42 + <orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-annotations:2.8.0" level="project" />
  43 + <orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-core:2.8.11" level="project" />
  44 + <orderEntry type="library" name="Maven: org.springframework:spring-web:4.3.18.RELEASE" level="project" />
  45 + <orderEntry type="library" name="Maven: org.springframework:spring-aop:4.3.18.RELEASE" level="project" />
  46 + <orderEntry type="library" name="Maven: org.springframework:spring-beans:4.3.18.RELEASE" level="project" />
  47 + <orderEntry type="library" name="Maven: org.springframework:spring-webmvc:4.3.18.RELEASE" level="project" />
  48 + <orderEntry type="library" name="Maven: org.springframework:spring-expression:4.3.18.RELEASE" level="project" />
  49 + <orderEntry type="library" name="Maven: org.mybatis.spring.boot:mybatis-spring-boot-starter:1.3.2" level="project" />
  50 + <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-jdbc:1.5.15.RELEASE" level="project" />
  51 + <orderEntry type="library" name="Maven: org.apache.tomcat:tomcat-jdbc:8.5.32" level="project" />
  52 + <orderEntry type="library" name="Maven: org.apache.tomcat:tomcat-juli:8.5.32" level="project" />
  53 + <orderEntry type="library" name="Maven: org.springframework:spring-jdbc:4.3.18.RELEASE" level="project" />
  54 + <orderEntry type="library" name="Maven: org.springframework:spring-tx:4.3.18.RELEASE" level="project" />
  55 + <orderEntry type="library" name="Maven: org.mybatis.spring.boot:mybatis-spring-boot-autoconfigure:1.3.2" level="project" />
  56 + <orderEntry type="library" name="Maven: org.mybatis:mybatis:3.4.6" level="project" />
  57 + <orderEntry type="library" name="Maven: org.mybatis:mybatis-spring:1.3.2" level="project" />
  58 + <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-log4j:1.3.8.RELEASE" level="project" />
  59 + <orderEntry type="library" name="Maven: org.slf4j:jcl-over-slf4j:1.7.25" level="project" />
  60 + <orderEntry type="library" name="Maven: org.slf4j:slf4j-api:1.7.25" level="project" />
  61 + <orderEntry type="library" name="Maven: org.slf4j:jul-to-slf4j:1.7.25" level="project" />
  62 + <orderEntry type="library" name="Maven: org.slf4j:slf4j-log4j12:1.7.25" level="project" />
  63 + <orderEntry type="library" name="Maven: log4j:log4j:1.2.17" level="project" />
  64 + <orderEntry type="library" name="Maven: mysql:mysql-connector-java:5.1.21" level="project" />
  65 + <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-freemarker:1.5.15.RELEASE" level="project" />
  66 + <orderEntry type="library" name="Maven: org.freemarker:freemarker:2.3.28" level="project" />
  67 + <orderEntry type="library" name="Maven: org.springframework:spring-context-support:4.3.18.RELEASE" level="project" />
  68 + <orderEntry type="library" scope="TEST" name="Maven: org.springframework.boot:spring-boot-starter-test:1.5.15.RELEASE" level="project" />
  69 + <orderEntry type="library" scope="TEST" name="Maven: org.springframework.boot:spring-boot-test:1.5.15.RELEASE" level="project" />
  70 + <orderEntry type="library" scope="TEST" name="Maven: org.springframework.boot:spring-boot-test-autoconfigure:1.5.15.RELEASE" level="project" />
  71 + <orderEntry type="library" scope="TEST" name="Maven: com.jayway.jsonpath:json-path:2.2.0" level="project" />
  72 + <orderEntry type="library" scope="TEST" name="Maven: net.minidev:json-smart:2.2.1" level="project" />
  73 + <orderEntry type="library" scope="TEST" name="Maven: net.minidev:accessors-smart:1.1" level="project" />
  74 + <orderEntry type="library" scope="TEST" name="Maven: org.ow2.asm:asm:5.0.3" level="project" />
  75 + <orderEntry type="library" scope="TEST" name="Maven: junit:junit:4.12" level="project" />
  76 + <orderEntry type="library" scope="TEST" name="Maven: org.assertj:assertj-core:2.6.0" level="project" />
  77 + <orderEntry type="library" scope="TEST" name="Maven: org.mockito:mockito-core:1.10.19" level="project" />
  78 + <orderEntry type="library" scope="TEST" name="Maven: org.objenesis:objenesis:2.1" level="project" />
  79 + <orderEntry type="library" scope="TEST" name="Maven: org.hamcrest:hamcrest-core:1.3" level="project" />
  80 + <orderEntry type="library" scope="TEST" name="Maven: org.hamcrest:hamcrest-library:1.3" level="project" />
  81 + <orderEntry type="library" scope="TEST" name="Maven: org.skyscreamer:jsonassert:1.4.0" level="project" />
  82 + <orderEntry type="library" scope="TEST" name="Maven: com.vaadin.external.google:android-json:0.0.20131108.vaadin1" level="project" />
  83 + <orderEntry type="library" scope="TEST" name="Maven: org.springframework:spring-test:4.3.18.RELEASE" level="project" />
  84 + <orderEntry type="library" name="Maven: org.jsoup:jsoup:1.11.3" level="project" />
  85 + <orderEntry type="library" name="Maven: com.alibaba:fastjson:1.2.15" level="project" />
  86 + <orderEntry type="library" name="Maven: com.alibaba:druid:1.1.0" level="project" />
  87 + <orderEntry type="module-library">
  88 + <library name="Maven: com.alibaba:jconsole:1.8.0">
  89 + <CLASSES>
  90 + <root url="jar://D:/java/jdk1.8.0_45/lib/jconsole.jar!/" />
  91 + </CLASSES>
  92 + <JAVADOC />
  93 + <SOURCES />
  94 + </library>
  95 + </orderEntry>
  96 + <orderEntry type="module-library">
  97 + <library name="Maven: com.alibaba:tools:1.8.0">
  98 + <CLASSES>
  99 + <root url="jar://D:/java/jdk1.8.0_45/lib/tools.jar!/" />
  100 + </CLASSES>
  101 + <JAVADOC />
  102 + <SOURCES />
  103 + </library>
  104 + </orderEntry>
  105 + <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-devtools:1.5.15.RELEASE" level="project" />
  106 + <orderEntry type="library" name="Maven: com.aliyun.oss:aliyun-sdk-oss:2.8.3" level="project" />
  107 + <orderEntry type="library" name="Maven: org.apache.httpcomponents:httpclient:4.5.6" level="project" />
  108 + <orderEntry type="library" name="Maven: org.apache.httpcomponents:httpcore:4.4.10" level="project" />
  109 + <orderEntry type="library" name="Maven: org.jdom:jdom:1.1" level="project" />
  110 + <orderEntry type="library" name="Maven: com.github.qcloudsms:qcloudsms:1.0.6" level="project" />
  111 + <orderEntry type="library" name="Maven: org.json:json:20140107" level="project" />
  112 + <orderEntry type="library" name="Maven: org.apache.httpcomponents:httpmime:4.5.6" level="project" />
  113 + <orderEntry type="library" name="Maven: commons-codec:commons-codec:1.10" level="project" />
  114 + </component>
  115 +</module>
@@ -15,7 +15,6 @@ import org.springframework.web.multipart.MultipartFile; @@ -15,7 +15,6 @@ import org.springframework.web.multipart.MultipartFile;
15 public class OSSService { 15 public class OSSService {
16 private static Logger logger = Logger.getLogger(OSSService.class); 16 private static Logger logger = Logger.getLogger(OSSService.class);
17 17
18 -  
19 /** 18 /**
20 * 上传图片 19 * 上传图片
21 * @param file 20 * @param file
@@ -5,11 +5,11 @@ server.session.timeout=1800 @@ -5,11 +5,11 @@ server.session.timeout=1800
5 5
6 #\u6570\u636E\u5E93\u914D\u7F6E 6 #\u6570\u636E\u5E93\u914D\u7F6E
7 spring.datasource.driver-class-name=com.mysql.jdbc.Driver 7 spring.datasource.driver-class-name=com.mysql.jdbc.Driver
8 -#spring.datasource.url=jdbc:mysql://127.0.0.1:3306/poet_ready_system?characterEncoding=utf-8&autoReconnect=true  
9 -spring.datasource.url=jdbc:mysql://cdb-7qc6eyrn.gz.tencentcdb.com:10104/poet_read_system?characterEncoding=utf-8&autoReconnect=true  
10 -spring.datasource.username=root  
11 -#spring.datasource.password=password  
12 -spring.datasource.password=cmy941222 8 +spring.datasource.url=jdbc:mysql://114.215.126.2:3306/poet_read_system?characterEncoding=utf-8&autoReconnect=true
  9 +#spring.datasource.url=jdbc:mysql://cdb-7qc6eyrn.gz.tencentcdb.com:10104/poet_read_system?characterEncoding=utf-8&autoReconnect=true
  10 +spring.datasource.username=luhui
  11 +spring.datasource.password=Luhui586
  12 +#spring.datasource.password=cmy941222
13 spring.datasource.type=com.alibaba.druid.pool.DruidDataSource 13 spring.datasource.type=com.alibaba.druid.pool.DruidDataSource
14 spring.datasource.dbcp2.max-total=50 14 spring.datasource.dbcp2.max-total=50
15 spring.datasource.dbcp2.initial-size=2 15 spring.datasource.dbcp2.initial-size=2
1 -<#assign ctx="http://127.0.0.1:8080"/>  
  1 +<#assign ctx="http://localhost:8080"/>