更新zheng-demo结构
This commit is contained in:
shuzheng
parent
0be0129c44
commit
d42d766378
|
|
@ -1,114 +1,24 @@
|
||||||
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
|
<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">
|
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
|
||||||
<modelVersion>4.0.0</modelVersion>
|
<modelVersion>4.0.0</modelVersion>
|
||||||
|
|
||||||
<groupId>com.zheng</groupId>
|
<groupId>com.zheng</groupId>
|
||||||
<artifactId>zheng-demo</artifactId>
|
<artifactId>zheng-demo</artifactId>
|
||||||
<version>1.0.0</version>
|
<version>1.0.0</version>
|
||||||
<packaging>war</packaging>
|
<packaging>pom</packaging>
|
||||||
|
|
||||||
<name>zheng-demo Maven Webapp</name>
|
<name>zheng-demo</name>
|
||||||
<url>http://www.zhangshuzheng.cn</url>
|
<url>http://www.zhangshuzheng.cn</url>
|
||||||
|
|
||||||
<properties>
|
<properties>
|
||||||
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
|
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
|
||||||
|
|
||||||
<maven.compiler.source>1.7</maven.compiler.source>
|
<maven.compiler.source>1.7</maven.compiler.source>
|
||||||
<maven.compiler.target>1.7</maven.compiler.target>
|
<maven.compiler.target>1.7</maven.compiler.target>
|
||||||
<maven.compiler.compilerVersion>1.7</maven.compiler.compilerVersion>
|
<maven.compiler.compilerVersion>1.7</maven.compiler.compilerVersion>
|
||||||
</properties>
|
</properties>
|
||||||
|
|
||||||
<dependencies>
|
<modules>
|
||||||
<dependency>
|
<module>zheng-demo-web</module>
|
||||||
<groupId>com.zheng</groupId>
|
</modules>
|
||||||
<artifactId>zheng-common</artifactId>
|
|
||||||
<version>1.0.0</version>
|
|
||||||
</dependency>
|
|
||||||
<dependency>
|
|
||||||
<groupId>com.zheng</groupId>
|
|
||||||
<artifactId>zheng-admin</artifactId>
|
|
||||||
<version>1.0.0</version>
|
|
||||||
</dependency>
|
|
||||||
<dependency>
|
|
||||||
<groupId>junit</groupId>
|
|
||||||
<artifactId>junit</artifactId>
|
|
||||||
<version>4.12</version>
|
|
||||||
<scope>test</scope>
|
|
||||||
</dependency>
|
|
||||||
<dependency>
|
|
||||||
<groupId>javax.servlet</groupId>
|
|
||||||
<artifactId>servlet-api</artifactId>
|
|
||||||
<version>2.5</version>
|
|
||||||
<scope>provided</scope>
|
|
||||||
</dependency>
|
|
||||||
<dependency>
|
|
||||||
<groupId>javax.servlet</groupId>
|
|
||||||
<artifactId>jstl</artifactId>
|
|
||||||
<version>1.2</version>
|
|
||||||
</dependency>
|
|
||||||
</dependencies>
|
|
||||||
|
|
||||||
<profiles>
|
|
||||||
<profile>
|
|
||||||
<id>dev</id>
|
|
||||||
<properties>
|
|
||||||
<env>dev</env>
|
|
||||||
</properties>
|
|
||||||
<activation>
|
|
||||||
<activeByDefault>true</activeByDefault>
|
|
||||||
</activation>
|
|
||||||
</profile>
|
|
||||||
<profile>
|
|
||||||
<id>test</id>
|
|
||||||
<properties>
|
|
||||||
<env>test</env>
|
|
||||||
</properties>
|
|
||||||
</profile>
|
|
||||||
<profile>
|
|
||||||
<id>prod</id>
|
|
||||||
<properties>
|
|
||||||
<env>prod</env>
|
|
||||||
</properties>
|
|
||||||
</profile>
|
|
||||||
</profiles>
|
|
||||||
|
|
||||||
<build>
|
|
||||||
<finalName>zheng-demo</finalName>
|
|
||||||
<filters>
|
|
||||||
<filter>src/main/resources/profiles/${env}.properties</filter>
|
|
||||||
</filters>
|
|
||||||
<resources>
|
|
||||||
<resource>
|
|
||||||
<directory>src/main/resources</directory>
|
|
||||||
<filtering>true</filtering>
|
|
||||||
</resource>
|
|
||||||
</resources>
|
|
||||||
<plugins>
|
|
||||||
<!-- jetty插件 -->
|
|
||||||
<plugin>
|
|
||||||
<groupId>org.eclipse.jetty</groupId>
|
|
||||||
<artifactId>jetty-maven-plugin</artifactId>
|
|
||||||
<!--<version>9.0.0.v20130308</version>-->
|
|
||||||
<version>9.2.7.v20150116</version>
|
|
||||||
<configuration>
|
|
||||||
<scanIntervalSeconds>3</scanIntervalSeconds>
|
|
||||||
<webApp>
|
|
||||||
<contextPath>/</contextPath>
|
|
||||||
</webApp>
|
|
||||||
<httpConnector>
|
|
||||||
<port>8888</port>
|
|
||||||
</httpConnector>
|
|
||||||
<reload>automatic</reload>
|
|
||||||
</configuration>
|
|
||||||
</plugin>
|
|
||||||
<plugin>
|
|
||||||
<groupId>org.apache.maven.plugins</groupId>
|
|
||||||
<artifactId>maven-surefire-plugin</artifactId>
|
|
||||||
<version>2.18.1</version>
|
|
||||||
<configuration>
|
|
||||||
<skipTests>true</skipTests>
|
|
||||||
<testFailureIgnore>true</testFailureIgnore>
|
|
||||||
</configuration>
|
|
||||||
</plugin>
|
|
||||||
</plugins>
|
|
||||||
</build>
|
|
||||||
</project>
|
</project>
|
||||||
|
|
|
||||||
|
|
@ -0,0 +1,107 @@
|
||||||
|
<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">
|
||||||
|
<modelVersion>4.0.0</modelVersion>
|
||||||
|
|
||||||
|
<parent>
|
||||||
|
<groupId>com.zheng</groupId>
|
||||||
|
<artifactId>zheng-demo</artifactId>
|
||||||
|
<version>1.0.0</version>
|
||||||
|
</parent>
|
||||||
|
|
||||||
|
<artifactId>zheng-demo-web</artifactId>
|
||||||
|
<packaging>war</packaging>
|
||||||
|
|
||||||
|
<name>zheng-demo-web Maven Webapp</name>
|
||||||
|
<url>http://www.zhangshuzheng.cn</url>
|
||||||
|
|
||||||
|
<dependencies>
|
||||||
|
<dependency>
|
||||||
|
<groupId>com.zheng</groupId>
|
||||||
|
<artifactId>zheng-common</artifactId>
|
||||||
|
<version>1.0.0</version>
|
||||||
|
<type>jar</type>
|
||||||
|
</dependency>
|
||||||
|
<dependency>
|
||||||
|
<groupId>junit</groupId>
|
||||||
|
<artifactId>junit</artifactId>
|
||||||
|
<version>4.12</version>
|
||||||
|
<scope>test</scope>
|
||||||
|
</dependency>
|
||||||
|
<dependency>
|
||||||
|
<groupId>javax.servlet</groupId>
|
||||||
|
<artifactId>servlet-api</artifactId>
|
||||||
|
<version>2.5</version>
|
||||||
|
<scope>provided</scope>
|
||||||
|
</dependency>
|
||||||
|
<dependency>
|
||||||
|
<groupId>javax.servlet</groupId>
|
||||||
|
<artifactId>jstl</artifactId>
|
||||||
|
<version>1.2</version>
|
||||||
|
</dependency>
|
||||||
|
</dependencies>
|
||||||
|
|
||||||
|
<profiles>
|
||||||
|
<profile>
|
||||||
|
<id>dev</id>
|
||||||
|
<properties>
|
||||||
|
<env>dev</env>
|
||||||
|
</properties>
|
||||||
|
<activation>
|
||||||
|
<activeByDefault>true</activeByDefault>
|
||||||
|
</activation>
|
||||||
|
</profile>
|
||||||
|
<profile>
|
||||||
|
<id>test</id>
|
||||||
|
<properties>
|
||||||
|
<env>test</env>
|
||||||
|
</properties>
|
||||||
|
</profile>
|
||||||
|
<profile>
|
||||||
|
<id>prod</id>
|
||||||
|
<properties>
|
||||||
|
<env>prod</env>
|
||||||
|
</properties>
|
||||||
|
</profile>
|
||||||
|
</profiles>
|
||||||
|
|
||||||
|
<build>
|
||||||
|
<finalName>zheng-demo-web</finalName>
|
||||||
|
<filters>
|
||||||
|
<filter>src/main/resources/profiles/${env}.properties</filter>
|
||||||
|
</filters>
|
||||||
|
<resources>
|
||||||
|
<resource>
|
||||||
|
<directory>src/main/resources</directory>
|
||||||
|
<filtering>true</filtering>
|
||||||
|
</resource>
|
||||||
|
</resources>
|
||||||
|
<plugins>
|
||||||
|
<!-- jetty插件 -->
|
||||||
|
<plugin>
|
||||||
|
<groupId>org.eclipse.jetty</groupId>
|
||||||
|
<artifactId>jetty-maven-plugin</artifactId>
|
||||||
|
<!--<version>9.0.0.v20130308</version>-->
|
||||||
|
<version>9.2.7.v20150116</version>
|
||||||
|
<configuration>
|
||||||
|
<scanIntervalSeconds>3</scanIntervalSeconds>
|
||||||
|
<webApp>
|
||||||
|
<contextPath>/</contextPath>
|
||||||
|
</webApp>
|
||||||
|
<httpConnector>
|
||||||
|
<port>8888</port>
|
||||||
|
</httpConnector>
|
||||||
|
<reload>automatic</reload>
|
||||||
|
</configuration>
|
||||||
|
</plugin>
|
||||||
|
<plugin>
|
||||||
|
<groupId>org.apache.maven.plugins</groupId>
|
||||||
|
<artifactId>maven-surefire-plugin</artifactId>
|
||||||
|
<version>2.18.1</version>
|
||||||
|
<configuration>
|
||||||
|
<skipTests>true</skipTests>
|
||||||
|
<testFailureIgnore>true</testFailureIgnore>
|
||||||
|
</configuration>
|
||||||
|
</plugin>
|
||||||
|
</plugins>
|
||||||
|
</build>
|
||||||
|
</project>
|
||||||
|
|
@ -1,7 +1,7 @@
|
||||||
package com.zheng.demo.controller;
|
package com.zheng.demo.web.controller;
|
||||||
|
|
||||||
import com.zheng.common.base.BaseController;
|
import com.zheng.common.base.BaseController;
|
||||||
import com.zheng.demo.model.User;
|
import com.zheng.demo.web.model.User;
|
||||||
import org.slf4j.Logger;
|
import org.slf4j.Logger;
|
||||||
import org.slf4j.LoggerFactory;
|
import org.slf4j.LoggerFactory;
|
||||||
import org.springframework.stereotype.Controller;
|
import org.springframework.stereotype.Controller;
|
||||||
|
|
@ -1,4 +1,4 @@
|
||||||
package com.zheng.demo.interceptor;
|
package com.zheng.demo.web.interceptor;
|
||||||
|
|
||||||
import com.zheng.common.util.PropertiesFileUtil;
|
import com.zheng.common.util.PropertiesFileUtil;
|
||||||
import org.slf4j.Logger;
|
import org.slf4j.Logger;
|
||||||
|
|
@ -1,4 +1,4 @@
|
||||||
package com.zheng.demo.model;
|
package com.zheng.demo.web.model;
|
||||||
|
|
||||||
import javax.persistence.Column;
|
import javax.persistence.Column;
|
||||||
import javax.persistence.Entity;
|
import javax.persistence.Entity;
|
||||||
|
|
@ -11,13 +11,13 @@
|
||||||
<!-- 获取登录信息 -->
|
<!-- 获取登录信息 -->
|
||||||
<mvc:interceptor>
|
<mvc:interceptor>
|
||||||
<mvc:mapping path="/**"/>
|
<mvc:mapping path="/**"/>
|
||||||
<bean class="com.zheng.demo.interceptor.DemoInterceptor"></bean>
|
<bean class="com.zheng.demo.web.interceptor.DemoInterceptor"></bean>
|
||||||
</mvc:interceptor>
|
</mvc:interceptor>
|
||||||
</mvc:interceptors>
|
</mvc:interceptors>
|
||||||
|
|
||||||
<context:property-placeholder location="classpath:config.properties"/>
|
<context:property-placeholder location="classpath:config.properties"/>
|
||||||
|
|
||||||
<!-- 使用thymeleaf视图 -->
|
<!-- thymeleaf视图 -->
|
||||||
<bean id="templateResolver" class="org.thymeleaf.spring4.templateresolver.SpringResourceTemplateResolver">
|
<bean id="templateResolver" class="org.thymeleaf.spring4.templateresolver.SpringResourceTemplateResolver">
|
||||||
<property name="order" value="0"/>
|
<property name="order" value="0"/>
|
||||||
<property name="prefix" value="${zheng-ui.path}"/>
|
<property name="prefix" value="${zheng-ui.path}"/>
|
||||||
|
|
@ -37,4 +37,14 @@
|
||||||
<property name="viewNames" value="*.html"/>
|
<property name="viewNames" value="*.html"/>
|
||||||
</bean>
|
</bean>
|
||||||
|
|
||||||
|
<!-- Jsp视图 -->
|
||||||
|
<bean id="viewResolver" class="org.springframework.web.servlet.view.InternalResourceViewResolver">
|
||||||
|
<property name="order" value="1"/>
|
||||||
|
<property name="viewNames" value="*.jsp"/>
|
||||||
|
<property name="prefix" value="/WEB-INF/jsp"/>
|
||||||
|
<property name="suffix" value=""/>
|
||||||
|
<property name="contentType" value="text/html; charset=utf-8"/>
|
||||||
|
<property name="viewClass" value="org.springframework.web.servlet.view.JstlView"/>
|
||||||
|
</bean>
|
||||||
|
|
||||||
</beans>
|
</beans>
|
||||||
Loading…
Reference in New Issue