Skip to content

T
traffic-front
Commit 5f50c864 authored by neo's avatar neo
Browse files
Options

[DEV] delete some spring devpendence for web

parent 59ba591d
Hide whitespace changes
Inline Side-by-side
Showing with 245 additions and 281 deletions
atms-web/pom.xml
View file @ 5f50c864
<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"> <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
<modelVersion>4.0.0</modelVersion> xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<groupId>pwc.taxtech.atms</groupId> <modelVersion>4.0.0</modelVersion>
<artifactId>atms-web</artifactId> <groupId>pwc.taxtech.atms</groupId>
<packaging>war</packaging> <artifactId>atms-web</artifactId>
<version>0.1.1</version> <packaging>war</packaging>
<version>0.1.1</version>
<properties> <properties>
<maven.test.skip>true</maven.test.skip> <maven.test.skip>true</maven.test.skip>
<java.version>1.8</java.version> <java.version>1.8</java.version>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding> <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
<maven.compiler.source>${java.version}</maven.compiler.source> <maven.compiler.source>${java.version}</maven.compiler.source>
<maven.compiler.target>${java.version}</maven.compiler.target> <maven.compiler.target>${java.version}</maven.compiler.target>
<spring.version>4.3.13.RELEASE</spring.version> <spring.version>4.3.13.RELEASE</spring.version>
<thymeleaf.version>3.0.9.RELEASE</thymeleaf.version> <thymeleaf.version>3.0.9.RELEASE</thymeleaf.version>
<maven.build.timestamp.format>yyyy-MM-dd HH:mm:ss z</maven.build.timestamp.format> <maven.build.timestamp.format>yyyy-MM-dd HH:mm:ss z</maven.build.timestamp.format>
<timestamp>${maven.build.timestamp}</timestamp> <timestamp>${maven.build.timestamp}</timestamp>
</properties> </properties>
<dependencyManagement> <dependencyManagement>
<dependencies> <dependencies>
<dependency> <dependency>
<groupId>org.springframework</groupId> <groupId>org.springframework</groupId>
<artifactId>spring-framework-bom</artifactId> <artifactId>spring-framework-bom</artifactId>
<version>${spring.version}</version> <version>${spring.version}</version>
<type>pom</type> <type>pom</type>
<scope>import</scope> <scope>import</scope>
</dependency> </dependency>
</dependencies> </dependencies>
</dependencyManagement> </dependencyManagement>
<dependencies>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-context</artifactId>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-context-support</artifactId>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-web</artifactId>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-webmvc</artifactId>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-aspects</artifactId>
</dependency>
<dependency>
<groupId>org.springframework.security</groupId>
<artifactId>spring-security-config</artifactId>
<version>4.2.3.RELEASE</version>
</dependency>
<dependency> <dependencies>
<groupId>org.springframework.security</groupId> <dependency>
<artifactId>spring-security-web</artifactId> <groupId>org.springframework</groupId>
<version>4.2.3.RELEASE</version> <artifactId>spring-webmvc</artifactId>
</dependency> </dependency>
<dependency>
<groupId>commons-fileupload</groupId>
<artifactId>commons-fileupload</artifactId>
<version>1.3.3</version>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-log4j12</artifactId>
<version>1.7.25</version>
</dependency>
<dependency>
<groupId>org.thymeleaf</groupId>
<artifactId>thymeleaf</artifactId>
<version>${thymeleaf.version}</version>
</dependency>
<dependency>
<groupId>org.thymeleaf</groupId>
<artifactId>thymeleaf-spring4</artifactId>
<version>${thymeleaf.version}</version>
</dependency>
<dependency>
<groupId>org.thymeleaf.extras</groupId>
<artifactId>thymeleaf-extras-springsecurity4</artifactId>
<version>3.0.2.RELEASE</version>
</dependency>
<dependency> <dependency>
<groupId>jstl</groupId> <groupId>org.springframework.security</groupId>
<artifactId>jstl</artifactId> <artifactId>spring-security-web</artifactId>
<version>1.2</version> <version>4.2.3.RELEASE</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>taglibs</groupId> <groupId>commons-fileupload</groupId>
<artifactId>standard</artifactId> <artifactId>commons-fileupload</artifactId>
<version>1.1.2</version> <version>1.3.3</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>commons-codec</groupId> <groupId>org.slf4j</groupId>
<artifactId>commons-codec</artifactId> <artifactId>slf4j-log4j12</artifactId>
<version>1.10</version> <version>1.7.25</version>
</dependency> </dependency>
<dependency>
<groupId>org.thymeleaf</groupId>
<artifactId>thymeleaf</artifactId>
<version>${thymeleaf.version}</version>
</dependency>
<dependency>
<groupId>org.thymeleaf</groupId>
<artifactId>thymeleaf-spring4</artifactId>
<version>${thymeleaf.version}</version>
</dependency>
<dependency>
<groupId>org.thymeleaf.extras</groupId>
<artifactId>thymeleaf-extras-springsecurity4</artifactId>
<version>3.0.2.RELEASE</version>
</dependency>
<dependency> <dependency>
<groupId>org.apache.httpcomponents</groupId> <groupId>jstl</groupId>
<artifactId>httpclient</artifactId> <artifactId>jstl</artifactId>
<version>4.5.5</version> <version>1.2</version>
</dependency> </dependency>
<dependency>
<groupId>taglibs</groupId>
<artifactId>standard</artifactId>
<version>1.1.2</version>
</dependency>
<dependency>
<groupId>commons-codec</groupId>
<artifactId>commons-codec</artifactId>
<version>1.10</version>
</dependency>
<dependency> <dependency>
<groupId>javax.servlet</groupId> <groupId>org.apache.httpcomponents</groupId>
<artifactId>servlet-api</artifactId> <artifactId>httpclient</artifactId>
<version>2.5</version> <version>4.5.5</version>
<scope>provided</scope> </dependency>
</dependency>
<!-- https://mvnrepository.com/artifact/com.alibaba/fastjson --> <dependency>
<dependency> <groupId>javax.servlet</groupId>
<groupId>com.alibaba</groupId> <artifactId>servlet-api</artifactId>
<artifactId>fastjson</artifactId> <version>2.5</version>
<version>1.2.40</version> <scope>provided</scope>
</dependency> </dependency>
<dependency>
<groupId>org.nutz</groupId>
<artifactId>nutz</artifactId>
<version>1.r.63.r2</version>
</dependency>
<dependency> <!-- https://mvnrepository.com/artifact/com.alibaba/fastjson -->
<groupId>joda-time</groupId> <dependency>
<artifactId>joda-time</artifactId> <groupId>com.alibaba</groupId>
<version>2.9.9</version> <artifactId>fastjson</artifactId>
</dependency> <version>1.2.40</version>
<dependency> </dependency>
<groupId>org.jasypt</groupId> <!--<dependency>-->
<artifactId>jasypt</artifactId> <!--<groupId>org.nutz</groupId>-->
<version>1.9.2</version> <!--<artifactId>nutz</artifactId>-->
</dependency> <!--<version>1.r.63.r2</version>-->
<dependency> <!--</dependency>-->
<groupId>org.jasypt</groupId>
<artifactId>jasypt-spring31</artifactId>
<version>1.9.2</version>
</dependency>
<!-- jackson json -->
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-databind</artifactId>
<version>2.9.4</version>
</dependency>
<!--<dependency>-->
<!--<groupId>joda-time</groupId>-->
<!--<artifactId>joda-time</artifactId>-->
<!--<version>2.9.9</version>-->
<!--</dependency>-->
<dependency>
<groupId>org.jasypt</groupId>
<artifactId>jasypt</artifactId>
<version>1.9.2</version>
</dependency>
<dependency>
<groupId>org.jasypt</groupId>
<artifactId>jasypt-spring31</artifactId>
<version>1.9.2</version>
</dependency>
<!--&lt;!&ndash; jackson json &ndash;&gt;-->
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-databind</artifactId>
<version>2.9.4</version>
</dependency>
<dependency> </dependencies>
<groupId>org.springframework</groupId>
<artifactId>spring-test</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>4.12</version>
<scope>test</scope>
</dependency>
</dependencies>
<profiles> <profiles>
<profile> <profile>
...@@ -206,58 +172,58 @@ ...@@ -206,58 +172,58 @@
</profile> </profile>
</profiles> </profiles>
<build> <build>
<finalName>atms-web</finalName> <finalName>atms-web</finalName>
<resources> <resources>
<resource> <resource>
<directory>src/main/resources</directory> <directory>src/main/resources</directory>
<includes> <includes>
<include>**/*.properties</include> <include>**/*.properties</include>
<include>**/*.xml</include> <include>**/*.xml</include>
</includes> </includes>
<filtering>true</filtering><!-- replace variable attribute or not --> <filtering>true</filtering><!-- replace variable attribute or not -->
</resource> </resource>
</resources> </resources>
<plugins> <plugins>
<plugin> <plugin>
<groupId>org.apache.maven.plugins</groupId> <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-war-plugin</artifactId> <artifactId>maven-war-plugin</artifactId>
<version>3.2.0</version> <version>3.2.0</version>
<configuration> <configuration>
<archive> <archive>
<addMavenDescriptor>false</addMavenDescriptor> <addMavenDescriptor>false</addMavenDescriptor>
</archive> </archive>
<packagingExcludes> <packagingExcludes>
Gruntfile.js, Gruntfile.js,
package-lock.json, package-lock.json,
package.json, package.json,
run_grunt.bat run_grunt.bat
</packagingExcludes> </packagingExcludes>
<webResources> <webResources>
<resource> <resource>
<directory>src/main/webapp-filtered</directory> <directory>src/main/webapp-filtered</directory>
<includes> <includes>
<include>**</include> <include>**</include>
</includes> </includes>
<filtering>true</filtering> <filtering>true</filtering>
</resource> </resource>
</webResources> </webResources>
</configuration> </configuration>
</plugin> </plugin>
<plugin> <plugin>
<groupId>org.apache.tomcat.maven</groupId> <groupId>org.apache.tomcat.maven</groupId>
<!-- tomcat7的插件， 不同tomcat版本这个也不一样 --> <!-- tomcat7的插件， 不同tomcat版本这个也不一样 -->
<artifactId>tomcat7-maven-plugin</artifactId> <artifactId>tomcat7-maven-plugin</artifactId>
<version>2.1</version> <version>2.1</version>
<configuration> <configuration>
<!-- 通过maven tomcat7:run运行项目时，访问项目的端口号 --> <!-- 通过maven tomcat7:run运行项目时，访问项目的端口号 -->
<port>8080</port> <port>8080</port>
<!-- 项目访问路径 本例：localhost:9090, 如果配置的aa， 则访问路径为localhost:9090/aa--> <!-- 项目访问路径 本例：localhost:9090, 如果配置的aa， 则访问路径为localhost:9090/aa-->
<path>/</path> <path>/</path>
<uriEncoding>UTF-8</uriEncoding> <uriEncoding>UTF-8</uriEncoding>
</configuration> </configuration>
</plugin> </plugin>
</plugins> </plugins>
</build> </build>
</project> </project>
atms-web/src/main/resources/applicationContext-mvc.xml
View file @ 5f50c864
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<beans xmlns="http://www.springframework.org/schema/beans" <beans xmlns="http://www.springframework.org/schema/beans"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:context="http://www.springframework.org/schema/context" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns:mvc="http://www.springframework.org/schema/mvc" xmlns:mvc="http://www.springframework.org/schema/mvc"
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
http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context-4.3.xsd
http://www.springframework.org/schema/mvc http://www.springframework.org/schema/mvc/spring-mvc-4.3.xsd"> http://www.springframework.org/schema/mvc http://www.springframework.org/schema/mvc/spring-mvc-4.3.xsd">
<!-- **************************************************************** --> <!-- **************************************************************** -->
<!-- Spring-MVC配置 --> <!-- Spring-MVC配置 -->
<!-- **************************************************************** --> <!-- **************************************************************** -->
<mvc:resources mapping="/**" location="/" /> <mvc:resources mapping="/**" location="/"/>
<mvc:annotation-driven> <mvc:annotation-driven>
<mvc:message-converters> <mvc:message-converters>
<!-- <ref bean="fastJsonHttpMessageConverter" /> --> <!-- <ref bean="fastJsonHttpMessageConverter" /> -->
<ref bean="mappingJackson2HttpMessageConverter" /> <ref bean="mappingJackson2HttpMessageConverter"/>
</mvc:message-converters> </mvc:message-converters>
</mvc:annotation-driven> </mvc:annotation-driven>
<!-- **************************************************************** --> <!-- **************************************************************** -->
<!-- 整合Thymeleaf3 --> <!-- 整合Thymeleaf3 -->
<!-- See: http://www.thymeleaf.org/doc/tutorials/3.0/thymeleafspring.html --> <!-- See: http://www.thymeleaf.org/doc/tutorials/3.0/thymeleafspring.html -->
<!-- **************************************************************** --> <!-- **************************************************************** -->
<bean id="templateResolver" <bean id="templateResolver"
class="org.thymeleaf.spring4.templateresolver.SpringResourceTemplateResolver"> class="org.thymeleaf.spring4.templateresolver.SpringResourceTemplateResolver">
<property name="prefix" value="/WEB-INF/templates/" /> <property name="prefix" value="/WEB-INF/templates/"/>
<property name="suffix" value=".html" /> <property name="suffix" value=".html"/>
<property name="templateMode" value="HTML" /> <property name="templateMode" value="HTML"/>
<property name="cacheable" value="false" /> <property name="cacheable" value="false"/>
<property name="characterEncoding" value="UTF-8" /> <property name="characterEncoding" value="UTF-8"/>
</bean> </bean>
<bean id="templateEngine" class="org.thymeleaf.spring4.SpringTemplateEngine"> <bean id="templateEngine" class="org.thymeleaf.spring4.SpringTemplateEngine">
<property name="templateResolver" ref="templateResolver" /> <property name="templateResolver" ref="templateResolver"/>
<property name="enableSpringELCompiler" value="true" /> <property name="enableSpringELCompiler" value="true"/>
<property name="additionalDialects"> <property name="additionalDialects">
<set> <set>
<!-- Note the package would change to 'springsecurity3' if you are using <!-- Note the package would change to 'springsecurity3' if you are using
that version --> that version -->
<bean <bean
class="org.thymeleaf.extras.springsecurity4.dialect.SpringSecurityDialect" /> class="org.thymeleaf.extras.springsecurity4.dialect.SpringSecurityDialect"/>
</set> </set>
</property> </property>
</bean> </bean>
<bean class="org.thymeleaf.spring4.view.ThymeleafViewResolver"> <bean class="org.thymeleaf.spring4.view.ThymeleafViewResolver">
<property name="templateEngine" ref="templateEngine" /> <property name="templateEngine" ref="templateEngine"/>
<property name="characterEncoding" value="UTF-8" /> <property name="characterEncoding" value="UTF-8"/>
<property name="order" value="100" /> <property name="order" value="100"/>
</bean> </bean>
</beans> </beans>
\ No newline at end of file
atms-web/src/main/resources/applicationContext.xml
View file @ 5f50c864
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<beans xmlns="http://www.springframework.org/schema/beans" <beans xmlns="http://www.springframework.org/schema/beans"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:context="http://www.springframework.org/schema/context" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns:mvc="http://www.springframework.org/schema/mvc" xmlns:context="http://www.springframework.org/schema/context"
xmlns:aop="http://www.springframework.org/schema/aop" 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 http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context-4.3.xsd">
http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context-4.3.xsd
http://www.springframework.org/schema/mvc http://www.springframework.org/schema/mvc/spring-mvc-4.3.xsd
http://www.springframework.org/schema/aop http://www.springframework.org/schema/aop/spring-aop.xsd ">
<bean id="standardPBEStringEncryptor" class="org.jasypt.encryption.pbe.StandardPBEStringEncryptor"> <bean id="standardPBEStringEncryptor" class="org.jasypt.encryption.pbe.StandardPBEStringEncryptor">
<property name="password" <property name="password"
value="${atms_password:9C7jLBQ62cDbVwIzP85DIlzdAm76DdMb}" /> value="${atms_password:9C7jLBQ62cDbVwIzP85DIlzdAm76DdMb}"/>
</bean> </bean>
<bean id="encryptablePropertyPlaceholderConfigurer" <bean id="encryptablePropertyPlaceholderConfigurer"
class="org.jasypt.spring31.properties.EncryptablePropertyPlaceholderConfigurer"> class="org.jasypt.spring31.properties.EncryptablePropertyPlaceholderConfigurer">
<property name="ignoreUnresolvablePlaceholders" value="true" /> <property name="ignoreUnresolvablePlaceholders" value="true"/>
<constructor-arg ref="standardPBEStringEncryptor" /> <constructor-arg ref="standardPBEStringEncryptor"/>
<property name="locations"> <property name="locations">
<list> <list>
<!-- Base settings for all environments --> <!-- Base settings for all environments -->
<value>classpath:conf_base.properties</value> <value>classpath:conf_base.properties</value>
<!-- Settings for selected environment --> <!-- Settings for selected environment -->
<value>classpath:conf.properties <value>classpath:conf.properties
</value> </value>
</list> </list>
</property> </property>
</bean> </bean>
<context:component-scan base-package="pwc.taxtech.atms.web" /> <context:component-scan base-package="pwc.taxtech.atms.web"/>
<!-- <tx:annotation-driven proxy-target-class="true" /> --> <!-- <tx:annotation-driven proxy-target-class="true" /> -->
</beans> </beans>
\ No newline at end of file
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