Skip to content

J
JuniorSpringMVCTemplate
Commit 505da248 authored by 邢足健's avatar 邢足健
Browse files
Options

coding

parent e384f16e
Hide whitespace changes
Inline Side-by-side
Showing with 586 additions and 544 deletions
.idea/artifacts/web_war.xml
View file @ 505da248
<component name="ArtifactManager"> <component name="ArtifactManager">
<artifact type="war" name="web:war"> <artifact type="war" name="web:war">
<output-path>$PROJECT_DIR$/web/target</output-path> <output-path>$PROJECT_DIR$/web/target</output-path>
<root id="archive" name="milk.war"> <root id="archive" name="JuniorSpringMVCTemplate.war">
<element id="artifact" artifact-name="web:war exploded" /> <element id="artifact" artifact-name="web:war exploded" />
</root> </root>
</artifact> </artifact>
......
.idea/compiler.xml
View file @ 505da248
...@@ -15,8 +15,7 @@ ...@@ -15,8 +15,7 @@
<bytecodeTargetLevel> <bytecodeTargetLevel>
<module name="dao" target="1.8" /> <module name="dao" target="1.8" />
<module name="domain" target="1.8" /> <module name="domain" target="1.8" />
<module name="JuniorSpringMVCTemplates" target="1.5" /> <module name="JuniorSpringMVCTemplate" target="1.5" />
<module name="milk" target="1.5" />
<module name="service" target="1.8" /> <module name="service" target="1.8" />
<module name="web" target="1.8" /> <module name="web" target="1.8" />
</bytecodeTargetLevel> </bytecodeTargetLevel>
......
.idea/misc.xml
View file @ 505da248
...@@ -6,13 +6,9 @@ ...@@ -6,13 +6,9 @@
<component name="MavenProjectsManager"> <component name="MavenProjectsManager">
<option name="originalFiles"> <option name="originalFiles">
<list> <list>
<option value="$PROJECT_DIR$/service/pom.xml" />
<option value="$PROJECT_DIR$/dao/pom.xml" />
<option value="$PROJECT_DIR$/domain/pom.xml" />
<option value="$PROJECT_DIR$/pom.xml" /> <option value="$PROJECT_DIR$/pom.xml" />
<option value="$PROJECT_DIR$/web/pom.xml" />
</list> </list>
</option> </option>
</component> </component>
<component name="ProjectRootManager" version="2" languageLevel="JDK_1_9" default="false" project-jdk-name="1.8" project-jdk-type="JavaSDK" /> <component name="ProjectRootManager" version="2" project-jdk-name="1.8" project-jdk-type="JavaSDK" />
</project> </project>
\ No newline at end of file
.idea/modules.xml
View file @ 505da248
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
<project version="4"> <project version="4">
<component name="ProjectModuleManager"> <component name="ProjectModuleManager">
<modules> <modules>
<module fileurl="file://$PROJECT_DIR$/JuniorSpringMVCTemplates.iml" filepath="$PROJECT_DIR$/JuniorSpringMVCTemplates.iml" /> <module fileurl="file://$PROJECT_DIR$/JuniorSpringMVCTemplate.iml" filepath="$PROJECT_DIR$/JuniorSpringMVCTemplate.iml" />
<module fileurl="file://$PROJECT_DIR$/dao/dao.iml" filepath="$PROJECT_DIR$/dao/dao.iml" /> <module fileurl="file://$PROJECT_DIR$/dao/dao.iml" filepath="$PROJECT_DIR$/dao/dao.iml" />
<module fileurl="file://$PROJECT_DIR$/domain/domain.iml" filepath="$PROJECT_DIR$/domain/domain.iml" /> <module fileurl="file://$PROJECT_DIR$/domain/domain.iml" filepath="$PROJECT_DIR$/domain/domain.iml" />
<module fileurl="file://$PROJECT_DIR$/service/service.iml" filepath="$PROJECT_DIR$/service/service.iml" /> <module fileurl="file://$PROJECT_DIR$/service/service.iml" filepath="$PROJECT_DIR$/service/service.iml" />
......
.idea/workspace.xml
View file @ 505da248
This source diff could not be displayed because it is too large. You can view the blob instead.
README.md
View file @ 505da248
...@@ -21,5 +21,5 @@ mvn install:install-file -Dfile=docs/jar/excel-1.1.1-SNAPSHOT.jar -DgroupId=exc ...@@ -21,5 +21,5 @@ mvn install:install-file -Dfile=docs/jar/excel-1.1.1-SNAPSHOT.jar -DgroupId=exc
>jar项目维护在gitlab.haomo-studio.com上的excel-jar的项目 >jar项目维护在gitlab.haomo-studio.com上的excel-jar的项目
>使用请看的demo请看：web/src/main/test/com/haomostudio/milk/test/Test.java >使用请看的demo请看：web/src/main/test/com/haomostudio/JuniorSpringMVCTemplate/test/Test.java
dao/pom.xml
View file @ 505da248
...@@ -3,8 +3,8 @@ ...@@ -3,8 +3,8 @@
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<parent> <parent>
<groupId>com.haomostudio.milk</groupId> <groupId>com.haomostudio.JuniorSpringMVCTemplate</groupId>
<artifactId>milk</artifactId> <artifactId>JuniorSpringMVCTemplate</artifactId>
<version>0.0.1-SNAPSHOT</version> <version>0.0.1-SNAPSHOT</version>
</parent> </parent>
...@@ -15,15 +15,17 @@ ...@@ -15,15 +15,17 @@
<description>dao</description> <description>dao</description>
<url>http://maven.apache.org</url> <url>http://maven.apache.org</url>
<properties> <properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
</properties> </properties>
<dependencies> <dependencies>
<dependency> <dependency>
<groupId>com.haomostudio.milk</groupId> <groupId>com.haomostudio.JuniorSpringMVCTemplate</groupId>
<artifactId>domain</artifactId> <artifactId>domain</artifactId>
<version>${milk.domain.version}</version> <version>${JuniorSpringMVCTemplate.domain.version}</version>
</dependency> </dependency>
</dependencies> </dependencies>
......
deploy.sh
View file @ 505da248
#!/bin/bash #!/bin/bash
#rsync -avz web/target/milk.war member@tentop.com.cn:/opt/tomcat8/webapps/milk.war #rsync -avz web/target/JuniorSpringMVCTemplate.war member@tentop.com.cn:/opt/tomcat8/webapps/JuniorSpringMVCTemplate.war
#rsync -avz web/target/milk.war member@haomo-tech.com:/data/tomcat/webapps/milk.war #rsync -avz web/target/JuniorSpringMVCTemplate.war member@haomo-tech.com:/data/tomcat/webapps/JuniorSpringMVCTemplate.war
rsync -avz -e "ssh -p12322" web/target/milk.war haomo@haomo-studio.com:/opt/hm_tomcat/webapps rsync -avz -e "ssh -p12322" web/target/JuniorSpringMVCTemplate.war haomo@haomo-studio.com:/opt/hm_tomcat/webapps
\ No newline at end of file \ No newline at end of file
domain/pom.xml
View file @ 505da248
...@@ -3,8 +3,8 @@ ...@@ -3,8 +3,8 @@
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<parent> <parent>
<groupId>com.haomostudio.milk</groupId> <groupId>com.haomostudio.JuniorSpringMVCTemplate</groupId>
<artifactId>milk</artifactId> <artifactId>JuniorSpringMVCTemplate</artifactId>
<version>0.0.1-SNAPSHOT</version> <version>0.0.1-SNAPSHOT</version>
</parent> </parent>
......
pom.xml
View file @ 505da248
...@@ -16,10 +16,10 @@ ...@@ -16,10 +16,10 @@
</modules> </modules>
<properties> <properties>
<milk.web.version>0.0.1-SNAPSHOT</milk.web.version> <JuniorSpringMVCTemplate.web.version>0.0.1-SNAPSHOT</JuniorSpringMVCTemplate.web.version>
<milk.service.version>0.0.1-SNAPSHOT</milk.service.version> <JuniorSpringMVCTemplate.service.version>0.0.1-SNAPSHOT</JuniorSpringMVCTemplate.service.version>
<milk.dao.version>0.0.1-SNAPSHOT</milk.dao.version> <JuniorSpringMVCTemplate.dao.version>0.0.1-SNAPSHOT</JuniorSpringMVCTemplate.dao.version>
<milk.domain.version>0.0.1-SNAPSHOT</milk.domain.version> <JuniorSpringMVCTemplate.domain.version>0.0.1-SNAPSHOT</JuniorSpringMVCTemplate.domain.version>
<spring.version>4.1.4.RELEASE</spring.version> <spring.version>4.1.4.RELEASE</spring.version>
<spring-data-jpa.version>1.9.1.RELEASE</spring-data-jpa.version> <spring-data-jpa.version>1.9.1.RELEASE</spring-data-jpa.version>
<jackson.version>2.5.0</jackson.version> <jackson.version>2.5.0</jackson.version>
...@@ -506,7 +506,7 @@ ...@@ -506,7 +506,7 @@
<artifactId>maven-war-plugin</artifactId> <artifactId>maven-war-plugin</artifactId>
<version>2.4</version> <version>2.4</version>
<configuration> <configuration>
<warName>milk</warName> <warName>JuniorSpringMVCTemplate</warName>
<webXml>src/main/resources/webapp/WEB-INF/web.xml</webXml> <webXml>src/main/resources/webapp/WEB-INF/web.xml</webXml>
</configuration> </configuration>
</plugin> </plugin>
......
service/pom.xml
View file @ 505da248
...@@ -3,8 +3,8 @@ ...@@ -3,8 +3,8 @@
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<parent> <parent>
<groupId>com.haomostudio.milk</groupId> <groupId>com.haomostudio.JuniorSpringMVCTemplate</groupId>
<artifactId>milk</artifactId> <artifactId>JuniorSpringMVCTemplate</artifactId>
<version>0.0.1-SNAPSHOT</version> <version>0.0.1-SNAPSHOT</version>
</parent> </parent>
...@@ -21,14 +21,14 @@ ...@@ -21,14 +21,14 @@
<dependencies> <dependencies>
<dependency> <dependency>
<groupId>com.haomostudio.milk</groupId> <groupId>com.haomostudio.JuniorSpringMVCTemplate</groupId>
<artifactId>dao</artifactId> <artifactId>dao</artifactId>
<version>${milk.dao.version}</version> <version>${JuniorSpringMVCTemplate.dao.version}</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>com.haomostudio.milk</groupId> <groupId>com.haomostudio.JuniorSpringMVCTemplate</groupId>
<artifactId>domain</artifactId> <artifactId>domain</artifactId>
<version>${milk.dao.version}</version> <version>${JuniorSpringMVCTemplate.dao.version}</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>com.sap</groupId> <groupId>com.sap</groupId>
......
web/pom.xml
View file @ 505da248
...@@ -3,8 +3,8 @@ ...@@ -3,8 +3,8 @@
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<parent> <parent>
<groupId>com.haomostudio.milk</groupId> <groupId>com.haomostudio.JuniorSpringMVCTemplate</groupId>
<artifactId>milk</artifactId> <artifactId>JuniorSpringMVCTemplate</artifactId>
<version>0.0.1-SNAPSHOT</version> <version>0.0.1-SNAPSHOT</version>
</parent> </parent>
...@@ -20,19 +20,19 @@ ...@@ -20,19 +20,19 @@
<dependencies> <dependencies>
<dependency> <dependency>
<groupId>com.haomostudio.milk</groupId> <groupId>com.haomostudio.JuniorSpringMVCTemplate</groupId>
<artifactId>service</artifactId> <artifactId>service</artifactId>
<version>${milk.service.version}</version> <version>${JuniorSpringMVCTemplate.service.version}</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>com.haomostudio.milk</groupId> <groupId>com.haomostudio.JuniorSpringMVCTemplate</groupId>
<artifactId>dao</artifactId> <artifactId>dao</artifactId>
<version>${milk.dao.version}</version> <version>${JuniorSpringMVCTemplate.dao.version}</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>com.haomostudio.milk</groupId> <groupId>com.haomostudio.JuniorSpringMVCTemplate</groupId>
<artifactId>domain</artifactId> <artifactId>domain</artifactId>
<version>${milk.domain.version}</version> <version>${JuniorSpringMVCTemplate.domain.version}</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.apache.httpcomponents</groupId> <groupId>org.apache.httpcomponents</groupId>
......
web/src/main/resources/filePath.properties
View file @ 505da248
#upload_file_path=/Users/haomo/Desktop/ #upload_file_path=/Users/haomo/Desktop/
upload_file_path=/root/hm_tomcat/webapps/file/milk/ upload_file_path=/root/hm_tomcat/webapps/file/JuniorSpringMVCTemplate/
#pdf_export_path=/Users/liuranran/Tomcat8/ #pdf_export_path=/Users/liuranran/Tomcat8/
\ No newline at end of file
web/src/main/test/com/haomostudio/milk/test/Test.java → web/src/main/test/com/haomostudio/JuniorSpringMVCTemplate/test/Test.java
View file @ 505da248
package com.haomostudio.milk.test; package com.haomostudio.JuniorSpringMVCTemplate.test;
import com.guanpb.poi.excel.ExcelExportUtil; import com.guanpb.poi.excel.ExcelExportUtil;
import com.guanpb.poi.excel.ExcelImportUtil; import com.guanpb.poi.excel.ExcelImportUtil;
import com.haomostudio.milk.pojo.User; import com.haomostudio.JuniorSpringMVCTemplate.pojo.User;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Date; import java.util.Date;
......
web/src/main/test/com/haomostudio/milk/util/MyJob.java → web/src/main/test/com/haomostudio/JuniorSpringMVCTemplate/util/MyJob.java
View file @ 505da248
package com.haomostudio.milk.util; package com.haomostudio.JuniorSpringMVCTemplate.util;
import org.quartz.Job; import org.quartz.Job;
import org.quartz.JobExecutionContext; import org.quartz.JobExecutionContext;
......
web/target/classes/application.properties
View file @ 505da248
...@@ -9,9 +9,9 @@ dbcp.maxIdle=10 ...@@ -9,9 +9,9 @@ dbcp.maxIdle=10
#versions #versions
system.version=0.0.1-SNAPSHOT system.version=0.0.1-SNAPSHOT
spring.version=${spring.version} spring.version=4.1.4.RELEASE
hibernate.version=${hibernate.version} hibernate.version=4.2.5.Final
activiti.version=${activiti.version} activiti.version=5.19.0
db.type=${db.type} db.type=${db.type}
#\u7F13\u5B58\u56FE\u7247:http://www.kafeitu.me/activiti/2013/02/14/improve-performance-for-reading-diagram.html #\u7F13\u5B58\u56FE\u7247:http://www.kafeitu.me/activiti/2013/02/14/improve-performance-for-reading-diagram.html
......
web/target/classes/filePath.properties
View file @ 505da248
#upload_file_path=/Users/haomo/Desktop/ #upload_file_path=/Users/haomo/Desktop/
upload_file_path=/root/hm_tomcat/webapps/file/milk/ upload_file_path=/root/hm_tomcat/webapps/file/JuniorSpringMVCTemplate/
#pdf_export_path=/Users/liuranran/Tomcat8/ #pdf_export_path=/Users/liuranran/Tomcat8/
\ No newline at end of file
web/target/classes/spring/crm-redis-config.xml
View file @ 505da248
...@@ -4,7 +4,7 @@ ...@@ -4,7 +4,7 @@
xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd"> xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd">
<!--<bean id="redisServer" class="com.haomostudio.redis.RedisServiceImpl" init-method="init">--> <!--<bean id="redisServer" class="com.haomostudio.redis.RedisServiceImpl" init-method="init">-->
<!--<property name="redisIp" value="${redis.ip}"></property>--> <!--<property name="redisIp" value="127.0.0.1"></property>-->
<!--<property name="redisPort" value="${redis.port}"></property>--> <!--<property name="redisPort" value="6379"></property>-->
<!--</bean>--> <!--</bean>-->
</beans> </beans>
web/target/web/WEB-INF/classes/application.properties
View file @ 505da248
...@@ -9,9 +9,9 @@ dbcp.maxIdle=10 ...@@ -9,9 +9,9 @@ dbcp.maxIdle=10
#versions #versions
system.version=0.0.1-SNAPSHOT system.version=0.0.1-SNAPSHOT
spring.version=${spring.version} spring.version=4.1.4.RELEASE
hibernate.version=${hibernate.version} hibernate.version=4.2.5.Final
activiti.version=${activiti.version} activiti.version=5.19.0
db.type=${db.type} db.type=${db.type}
#\u7F13\u5B58\u56FE\u7247:http://www.kafeitu.me/activiti/2013/02/14/improve-performance-for-reading-diagram.html #\u7F13\u5B58\u56FE\u7247:http://www.kafeitu.me/activiti/2013/02/14/improve-performance-for-reading-diagram.html
......
web/target/web/WEB-INF/classes/filePath.properties
View file @ 505da248
#upload_file_path=/Users/haomo/Desktop/ #upload_file_path=/Users/haomo/Desktop/
upload_file_path=/root/hm_tomcat/webapps/file/milk/ upload_file_path=/root/hm_tomcat/webapps/file/JuniorSpringMVCTemplate/
#pdf_export_path=/Users/liuranran/Tomcat8/ #pdf_export_path=/Users/liuranran/Tomcat8/
\ No newline at end of file
web/target/web/WEB-INF/classes/spring/crm-redis-config.xml
View file @ 505da248
...@@ -4,7 +4,7 @@ ...@@ -4,7 +4,7 @@
xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd"> xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd">
<!--<bean id="redisServer" class="com.haomostudio.redis.RedisServiceImpl" init-method="init">--> <!--<bean id="redisServer" class="com.haomostudio.redis.RedisServiceImpl" init-method="init">-->
<!--<property name="redisIp" value="${redis.ip}"></property>--> <!--<property name="redisIp" value="127.0.0.1"></property>-->
<!--<property name="redisPort" value="${redis.port}"></property>--> <!--<property name="redisPort" value="6379"></property>-->
<!--</bean>--> <!--</bean>-->
</beans> </beans>
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment