Skip to content

T
traffic-front
Commit daacc806 authored by neo.wang's avatar neo.wang
Browse files
Options

Merge branch 'dev_neo' into 'dev' 

[DEV] delete some spring devpendence for web

See merge request root/atms!54
parents c98f9d94 5f50c864
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 68 additions and 70 deletions
atms-web/pom.xml
View file @ daacc806
This diff is collapsed.
atms-web/src/main/resources/applicationContext-mvc.xml
View file @ daacc806
<?xml version="1.0" encoding="UTF-8"?>
<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:mvc="http://www.springframework.org/schema/mvc"
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
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
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
http://www.springframework.org/schema/mvc http://www.springframework.org/schema/mvc/spring-mvc-4.3.xsd">
<!-- **************************************************************** -->
<!-- Spring-MVC配置 -->
<!-- **************************************************************** -->
<mvc:resources mapping="/**" location="/" />
<!-- **************************************************************** -->
<!-- Spring-MVC配置 -->
<!-- **************************************************************** -->
<mvc:resources mapping="/**" location="/"/>
<mvc:annotation-driven>
<mvc:message-converters>
<!-- <ref bean="fastJsonHttpMessageConverter" /> -->
<ref bean="mappingJackson2HttpMessageConverter" />
</mvc:message-converters>
</mvc:annotation-driven>
<mvc:annotation-driven>
<mvc:message-converters>
<!-- <ref bean="fastJsonHttpMessageConverter" /> -->
<ref bean="mappingJackson2HttpMessageConverter"/>
</mvc:message-converters>
</mvc:annotation-driven>
<!-- **************************************************************** -->
<!-- 整合Thymeleaf3 -->
<!-- See: http://www.thymeleaf.org/doc/tutorials/3.0/thymeleafspring.html -->
<!-- **************************************************************** -->
<bean id="templateResolver"
class="org.thymeleaf.spring4.templateresolver.SpringResourceTemplateResolver">
<property name="prefix" value="/WEB-INF/templates/" />
<property name="suffix" value=".html" />
<property name="templateMode" value="HTML" />
<property name="cacheable" value="false" />
<property name="characterEncoding" value="UTF-8" />
</bean>
<!-- **************************************************************** -->
<!-- 整合Thymeleaf3 -->
<!-- See: http://www.thymeleaf.org/doc/tutorials/3.0/thymeleafspring.html -->
<!-- **************************************************************** -->
<bean id="templateResolver"
class="org.thymeleaf.spring4.templateresolver.SpringResourceTemplateResolver">
<property name="prefix" value="/WEB-INF/templates/"/>
<property name="suffix" value=".html"/>
<property name="templateMode" value="HTML"/>
<property name="cacheable" value="false"/>
<property name="characterEncoding" value="UTF-8"/>
</bean>
<bean id="templateEngine" class="org.thymeleaf.spring4.SpringTemplateEngine">
<property name="templateResolver" ref="templateResolver" />
<property name="enableSpringELCompiler" value="true" />
<property name="additionalDialects">
<set>
<!-- Note the package would change to 'springsecurity3' if you are using
that version -->
<bean
class="org.thymeleaf.extras.springsecurity4.dialect.SpringSecurityDialect" />
</set>
</property>
</bean>
<bean id="templateEngine" class="org.thymeleaf.spring4.SpringTemplateEngine">
<property name="templateResolver" ref="templateResolver"/>
<property name="enableSpringELCompiler" value="true"/>
<property name="additionalDialects">
<set>
<!-- Note the package would change to 'springsecurity3' if you are using
that version -->
<bean
class="org.thymeleaf.extras.springsecurity4.dialect.SpringSecurityDialect"/>
</set>
</property>
</bean>
<bean class="org.thymeleaf.spring4.view.ThymeleafViewResolver">
<property name="templateEngine" ref="templateEngine" />
<property name="characterEncoding" value="UTF-8" />
<property name="order" value="100" />
</bean>
<bean class="org.thymeleaf.spring4.view.ThymeleafViewResolver">
<property name="templateEngine" ref="templateEngine"/>
<property name="characterEncoding" value="UTF-8"/>
<property name="order" value="100"/>
</bean>
</beans>
\ No newline at end of file
atms-web/src/main/resources/applicationContext.xml
View file @ daacc806
<?xml version="1.0" encoding="UTF-8"?>
<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:mvc="http://www.springframework.org/schema/mvc"
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
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 ">
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns:context="http://www.springframework.org/schema/context"
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">
<bean id="standardPBEStringEncryptor" class="org.jasypt.encryption.pbe.StandardPBEStringEncryptor">
<property name="password"
value="${atms_password:9C7jLBQ62cDbVwIzP85DIlzdAm76DdMb}" />
</bean>
<bean id="standardPBEStringEncryptor" class="org.jasypt.encryption.pbe.StandardPBEStringEncryptor">
<property name="password"
value="${atms_password:9C7jLBQ62cDbVwIzP85DIlzdAm76DdMb}"/>
</bean>
<bean id="encryptablePropertyPlaceholderConfigurer"
class="org.jasypt.spring31.properties.EncryptablePropertyPlaceholderConfigurer">
<property name="ignoreUnresolvablePlaceholders" value="true" />
<constructor-arg ref="standardPBEStringEncryptor" />
<property name="locations">
<list>
<!-- Base settings for all environments -->
<value>classpath:conf_base.properties</value>
<!-- Settings for selected environment -->
<value>classpath:conf.properties
</value>
</list>
</property>
</bean>
<bean id="encryptablePropertyPlaceholderConfigurer"
class="org.jasypt.spring31.properties.EncryptablePropertyPlaceholderConfigurer">
<property name="ignoreUnresolvablePlaceholders" value="true"/>
<constructor-arg ref="standardPBEStringEncryptor"/>
<property name="locations">
<list>
<!-- Base settings for all environments -->
<value>classpath:conf_base.properties</value>
<!-- Settings for selected environment -->
<value>classpath:conf.properties
</value>
</list>
</property>
</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>
\ 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