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
Show whitespace changes
Inline Side-by-side
Showing with 37 additions and 74 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"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<groupId>pwc.taxtech.atms</groupId> <groupId>pwc.taxtech.atms</groupId>
<artifactId>atms-web</artifactId> <artifactId>atms-web</artifactId>
...@@ -31,44 +32,21 @@ ...@@ -31,44 +32,21 @@
</dependencyManagement> </dependencyManagement>
<dependencies> <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> <dependency>
<groupId>org.springframework</groupId> <groupId>org.springframework</groupId>
<artifactId>spring-webmvc</artifactId> <artifactId>spring-webmvc</artifactId>
</dependency> </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> <dependency>
<groupId>org.springframework.security</groupId> <groupId>org.springframework.security</groupId>
<artifactId>spring-security-web</artifactId> <artifactId>spring-security-web</artifactId>
<version>4.2.3.RELEASE</version> <version>4.2.3.RELEASE</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>commons-fileupload</groupId> <groupId>commons-fileupload</groupId>
<artifactId>commons-fileupload</artifactId> <artifactId>commons-fileupload</artifactId>
<version>1.3.3</version> <version>1.3.3</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.slf4j</groupId> <groupId>org.slf4j</groupId>
<artifactId>slf4j-log4j12</artifactId> <artifactId>slf4j-log4j12</artifactId>
...@@ -125,17 +103,17 @@ ...@@ -125,17 +103,17 @@
<artifactId>fastjson</artifactId> <artifactId>fastjson</artifactId>
<version>1.2.40</version> <version>1.2.40</version>
</dependency> </dependency>
<dependency> <!--<dependency>-->
<groupId>org.nutz</groupId> <!--<groupId>org.nutz</groupId>-->
<artifactId>nutz</artifactId> <!--<artifactId>nutz</artifactId>-->
<version>1.r.63.r2</version> <!--<version>1.r.63.r2</version>-->
</dependency> <!--</dependency>-->
<dependency> <!--<dependency>-->
<groupId>joda-time</groupId> <!--<groupId>joda-time</groupId>-->
<artifactId>joda-time</artifactId> <!--<artifactId>joda-time</artifactId>-->
<version>2.9.9</version> <!--<version>2.9.9</version>-->
</dependency> <!--</dependency>-->
<dependency> <dependency>
<groupId>org.jasypt</groupId> <groupId>org.jasypt</groupId>
<artifactId>jasypt</artifactId> <artifactId>jasypt</artifactId>
...@@ -146,25 +124,13 @@ ...@@ -146,25 +124,13 @@
<artifactId>jasypt-spring31</artifactId> <artifactId>jasypt-spring31</artifactId>
<version>1.9.2</version> <version>1.9.2</version>
</dependency> </dependency>
<!-- jackson json --> <!--&lt;!&ndash; jackson json &ndash;&gt;-->
<dependency> <dependency>
<groupId>com.fasterxml.jackson.core</groupId> <groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-databind</artifactId> <artifactId>jackson-databind</artifactId>
<version>2.9.4</version> <version>2.9.4</version>
</dependency> </dependency>
<dependency>
<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> </dependencies>
<profiles> <profiles>
...@@ -206,7 +172,7 @@ ...@@ -206,7 +172,7 @@
</profile> </profile>
</profiles> </profiles>
<build> <build>
<finalName>atms-web</finalName> <finalName>atms-web</finalName>
<resources> <resources>
<resource> <resource>
...@@ -258,6 +224,6 @@ ...@@ -258,6 +224,6 @@
</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>
...@@ -25,29 +24,29 @@ ...@@ -25,29 +24,29 @@
<!-- **************************************************************** --> <!-- **************************************************************** -->
<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 -->
...@@ -28,7 +25,7 @@ ...@@ -28,7 +25,7 @@
</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" /> -->
......
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