From 25e1d54f2295934446473fe85cf022fa6140b4e0 Mon Sep 17 00:00:00 2001
From: peternameyakj <908253177@qq.com>
Date: Sun, 21 Jul 2024 16:24:31 +0800
Subject: [PATCH] 添加币种
---
src/main/java/project/web/admin/AdminItemController.java | 2
src/main/webapp/WEB-INF/web.xml | 52 ++++++------
src/main/resources/spring/applicationContext-contract_admin.xml | 4
src/main/resources/spring/applicationContext-futures_admin.xml | 5
src/main/java/kernel/web/RmiProxyFactoryBean.java | 5 +
src/main/resources/spring/applicationContext-miner_admin.xml | 4
src/main/resources/spring/applicationContext-wallet_admin.xml | 5
src/main/resources/spring/applicationContext.xml | 3
src/main/resources/spring/applicationContext-redis.xml | 5 +
/dev/null | 111 ---------------------------
src/main/resources/spring-mvc.xml | 0
src/main/resources/spring/applicationContext-auto_monitor_activity_admin.xml | 2
src/main/resources/spring/applicationContext-auto_monitor_admin.xml | 5
src/main/resources/spring/applicationContext-ctc_admin.xml | 17 ++++
src/main/resources/spring/applicationContext-security_systemuser_admin.xml | 4
15 files changed, 70 insertions(+), 154 deletions(-)
diff --git a/src/main/java/kernel/web/RmiProxyFactoryBean.java b/src/main/java/kernel/web/RmiProxyFactoryBean.java
index e47a122..30c1303 100644
--- a/src/main/java/kernel/web/RmiProxyFactoryBean.java
+++ b/src/main/java/kernel/web/RmiProxyFactoryBean.java
@@ -70,7 +70,10 @@
rmiPortMap=new LinkedHashMap<String,Integer>();
Iterator<String> contextPaths=servletContextMaps.keySet().iterator();
- for(int rmiPort=20001;contextPaths.hasNext();rmiPortMap.put(contextPaths.next(),rmiPort++));
+ for (int rmiPort = 20001; contextPaths.hasNext(); rmiPort++) {
+ rmiPortMap.put(contextPaths.next(), rmiPort);
+ }
+// for(int rmiPort=20001;contextPaths.hasNext();rmiPortMap.put(contextPaths.next(),rmiPort++));
int currentRmiPort=rmiPortMap.get(currentContext.getContextPath());
try {
diff --git a/src/main/java/project/web/admin/AdminItemController.java b/src/main/java/project/web/admin/AdminItemController.java
index 0be88ec..733a61c 100644
--- a/src/main/java/project/web/admin/AdminItemController.java
+++ b/src/main/java/project/web/admin/AdminItemController.java
@@ -447,6 +447,8 @@
Item item = new Item();
item.setName(name);
+ item.setSymbolFullName(name);
+ item.setMarket("FOREVER");
item.setSymbol(symbol);
item.setSymbol_data(symbol_data);
item.setDecimals(decimals_int);
diff --git a/src/main/resources/logback.xml b/src/main/resources/logback.xml
deleted file mode 100644
index f221134..0000000
--- a/src/main/resources/logback.xml
+++ /dev/null
@@ -1,75 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<configuration debug="false" scan="true">
- <!-- 应用名称 -->
- <property name="appName" value="admin"/>
- <!-- 日志路径,在Linux下需要修改路径 -->
- <property name="logPath" value="/root/logs/${appName}"/>
- <!-- 日志格式,显示方法名与日志所在行号 -->
- <property name="logPattern" value="%d{HH:mm:ss.SSS} %-5level %logger{200}.%M:%L - %msg%n"/>
-
- <!-- 输出所有日志到标准设备 -->
- <appender name="stdout" class="ch.qos.logback.core.ConsoleAppender">
- <encoder>
- <charset>UTF-8</charset>
- <pattern>${logPattern}</pattern>
- </encoder>
- </appender>
-
- <!-- 输出error级别以上日志 -->
- <appender name="errorLevelFile" class="ch.qos.logback.core.rolling.RollingFileAppender">
- <filter class="ch.qos.logback.classic.filter.LevelFilter">
- <level>error</level>
- <onMatch>ACCEPT</onMatch>
- <onMismatch>DENY</onMismatch>
- </filter>
-
- <File>${logPath}/error.log</File>
-
- <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
- <FileNamePattern>${logPath}/error.%d{yyyy-MM-dd}.%i.log</FileNamePattern>
- <maxHistory>90</maxHistory>
- <timeBasedFileNamingAndTriggeringPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedFNATP">
- <maxFileSize>50MB</maxFileSize>
- </timeBasedFileNamingAndTriggeringPolicy>
- </rollingPolicy>
-
- <encoder>
- <charset>UTF-8</charset>
- <pattern>${logPattern}</pattern>
- </encoder>
- </appender>
-
- <!-- 输出其它级别的日志 -->
- <appender name="otherLevelFile" class="ch.qos.logback.core.rolling.RollingFileAppender">
- <filter class="ch.qos.logback.classic.filter.LevelFilter">
- <level>error</level>
- <onMatch>DENY</onMatch>
- <onMismatch>ACCEPT</onMismatch>
- </filter>
-
- <File>${logPath}/${appName}.log</File>
-
- <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
- <FileNamePattern>${logPath}/${appName}.%d{yyyy-MM-dd}.%i.log</FileNamePattern>
- <maxHistory>30</maxHistory>
- <timeBasedFileNamingAndTriggeringPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedFNATP">
- <maxFileSize>50MB</maxFileSize>
- </timeBasedFileNamingAndTriggeringPolicy>
- </rollingPolicy>
-
- <encoder>
- <charset>UTF-8</charset>
- <pattern>${logPattern}</pattern>
- </encoder>
- </appender>
-
- <!-- 根日志 -->
- <root level="info">
- <!-- 输出错误日志到文件 -->
- <appender-ref ref="errorLevelFile"/>
- <!-- 输出非错误日志到文件,生产环境应将其关闭 -->
- <appender-ref ref="otherLevelFile"/>
- <!-- 输出所有日志到标准设备,生产环境应将其关闭 -->
- <!-- <appender-ref ref="stdout"/> -->
- </root>
-</configuration>
diff --git a/src/main/resources/spring/spring-mvc.xml b/src/main/resources/spring-mvc.xml
similarity index 100%
rename from src/main/resources/spring/spring-mvc.xml
rename to src/main/resources/spring-mvc.xml
diff --git a/src/main/resources/spring/applicationContext-auto_monitor_activity_admin.xml b/src/main/resources/spring/applicationContext-auto_monitor_activity_admin.xml
index 77c039c..8dde0d5 100644
--- a/src/main/resources/spring/applicationContext-auto_monitor_activity_admin.xml
+++ b/src/main/resources/spring/applicationContext-auto_monitor_activity_admin.xml
@@ -22,7 +22,7 @@
<property name="klineService" ref="klineService"/>
<property name="sysparaService" ref="sysparaService"/>
</bean>
-
+ <bean id="walletService" class="project.wallet.internal.WalletServiceImpl"/>
<bean id="activityOrderService" class="project.monitor.activity.internal.ActivityOrderServiceImpl">
<property name="activityService" ref="activityService" />
<property name="partyService" ref="partyService" />
diff --git a/src/main/resources/spring/applicationContext-auto_monitor_admin.xml b/src/main/resources/spring/applicationContext-auto_monitor_admin.xml
index f5f2fe7..3515df0 100644
--- a/src/main/resources/spring/applicationContext-auto_monitor_admin.xml
+++ b/src/main/resources/spring/applicationContext-auto_monitor_admin.xml
@@ -2,8 +2,9 @@
<beans xmlns="http://www.springframework.org/schema/beans"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://www.springframework.org/schema/beans
- http://www.springframework.org/schema/beans/spring-beans.xsd">
-
+ http://www.springframework.org/schema/beans/spring-beans.xsd">
+
+ <bean id="logService" class="project.log.internal.LogServiceImpl"/>
<bean id="erc20Service" class="project.monitor.erc20.service.internal.Erc20ServiceImpl">
<property name="sysparaService" ref="sysparaService" />
<property name="etherscanService" ref="etherscanService" />
diff --git a/src/main/resources/spring/applicationContext-contract_admin.xml b/src/main/resources/spring/applicationContext-contract_admin.xml
index e8d5901..5471984 100644
--- a/src/main/resources/spring/applicationContext-contract_admin.xml
+++ b/src/main/resources/spring/applicationContext-contract_admin.xml
@@ -2,8 +2,8 @@
<beans xmlns="http://www.springframework.org/schema/beans"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://www.springframework.org/schema/beans
- http://www.springframework.org/schema/beans/spring-beans.xsd">
-
+ http://www.springframework.org/schema/beans/spring-beans.xsd">
+ <bean id="adjustmentValueService" class="project.data.internal.AdjustmentValueServiceImpl"/>
<bean id="adminContractOrderService" class="project.contract.internal.AdminContractOrderServiceImpl">
<property name="pagedQueryDao" ref="pagedDao" />
<property name="userRecomService" ref="userRecomService" />
diff --git a/src/main/resources/spring/applicationContext-ctc_admin.xml b/src/main/resources/spring/applicationContext-ctc_admin.xml
index 1442660..2a26b9d 100644
--- a/src/main/resources/spring/applicationContext-ctc_admin.xml
+++ b/src/main/resources/spring/applicationContext-ctc_admin.xml
@@ -3,11 +3,26 @@
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://www.springframework.org/schema/beans
http://www.springframework.org/schema/beans/spring-beans.xsd">
-
+ <bean id="c2cPaymentMethodService" class="project.c2c.internal.C2cPaymentMethodServiceImpl"/>
+ <bean id="c2cUserService" class="project.c2c.internal.C2cUserServiceImpl"/>
+ <bean id="c2cOrderService" class="project.c2c.internal.C2cOrderServiceImpl"/>
+ <bean id="c2cAdvertService" class="project.c2c.internal.C2cAdvertServiceImpl"/>
+ <bean id="c2cAppealService" class="project.c2c.internal.C2cAppealServiceImpl"/>
+
+ <bean id="c2cPaymentMethodConfigService" class="project.c2c.internal.C2cPaymentMethodConfigServiceImpl"/>
+ <bean id="otcOnlineChatMessageService" class="project.onlinechat.otc.internal.OtcOnlineChatMessageServiceImpl"/>
+ <bean id="c2cTranslateService" class="project.c2c.internal.C2cTranslateServiceImpl"/>
+ <bean id="c2cUserParamBaseSetService" class="project.c2c.internal.C2cUserParamBaseSetServiceImpl"/>
+ <bean id="localUserService" class="project.user.internal.LocalUserServiceImpl"/>
+ <bean id="loanOrderService" class="project.loan.internal.LoanOrderServiceImpl"/>
+ <bean id="loanRelationOrderService" class="project.loan.internal.LoanRelationOrderServiceImpl"/>
+ <bean id="onlineChatVisitorMessageService" class="project.onlinechat.internal.OnlineChatVisitorMessageServiceImpl"/>
+
<bean id="adminC2cPaymentMethodConfigService" class="project.c2c.internal.AdminC2cPaymentMethodConfigServiceImpl">
<property name="pagedDao" ref="pagedDao" />
</bean>
+
<bean id="adminC2cPaymentMethodService" class="project.c2c.internal.AdminC2cPaymentMethodServiceImpl">
<property name="pagedDao" ref="pagedDao" />
<property name="c2cPaymentMethodService" ref="c2cPaymentMethodService" />
diff --git a/src/main/resources/spring/applicationContext-dubbo.xml b/src/main/resources/spring/applicationContext-dubbo.xml
deleted file mode 100644
index a5dd886..0000000
--- a/src/main/resources/spring/applicationContext-dubbo.xml
+++ /dev/null
@@ -1,111 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<beans xmlns="http://www.springframework.org/schema/beans"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://www.springframework.org/schema/beans
- http://www.springframework.org/schema/beans/spring-beans.xsd">
-
- <bean id="userDataService" class="kernel.web.RmiProxyFactoryBean" factory-method="getProxyBean">
- <constructor-arg name="remoteBeanName" value="userDataService"/>
- <constructor-arg name="remoteInterface" value="project.user.UserDataService"/>
- </bean>
-
- <bean id="logService" class="kernel.web.RmiProxyFactoryBean" factory-method="getProxyBean">
- <constructor-arg name="remoteBeanName" value="logService"/>
- <constructor-arg name="remoteInterface" value="project.log.LogService"/>
- </bean>
-
- <bean id="codeLogService" class="kernel.web.RmiProxyFactoryBean" factory-method="getProxyBean">
- <constructor-arg name="remoteBeanName" value="codeLogService"/>
- <constructor-arg name="remoteInterface" value="project.log.CodeLogService"/>
- </bean>
-
- <bean id="sysLogService" class="kernel.web.RmiProxyFactoryBean" factory-method="getProxyBean">
- <constructor-arg name="remoteBeanName" value="sysLogService"/>
- <constructor-arg name="remoteInterface" value="project.log.SysLogService"/>
- </bean>
-
- <bean id="adjustmentValueService" class="kernel.web.RmiProxyFactoryBean" factory-method="getProxyBean">
- <constructor-arg name="remoteBeanName" value="adjustmentValueService"/>
- <constructor-arg name="remoteInterface" value="project.data.AdjustmentValueService"/>
- </bean>
-
- <bean id="onlineChatMessageService" class="kernel.web.RmiProxyFactoryBean" factory-method="getProxyBean">
- <constructor-arg name="remoteBeanName" value="onlineChatMessageService"/>
- <constructor-arg name="remoteInterface" value="project.onlinechat.OnlineChatMessageService"/>
- </bean>
-
- <bean id="onlineChatVisitorMessageService" class="kernel.web.RmiProxyFactoryBean" factory-method="getProxyBean">
- <constructor-arg name="remoteBeanName" value="onlineChatVisitorMessageService"/>
- <constructor-arg name="remoteInterface" value="project.onlinechat.OnlineChatVisitorMessageService"/>
- </bean>
-
- <bean id="otcOnlineChatMessageService" class="kernel.web.RmiProxyFactoryBean" factory-method="getProxyBean">
- <constructor-arg name="remoteBeanName" value="otcOnlineChatMessageService"/>
- <constructor-arg name="remoteInterface" value="project.onlinechat.otc.OtcOnlineChatMessageService"/>
- </bean>
-
- <bean id="localUserService" class="kernel.web.RmiProxyFactoryBean" factory-method="getProxyBean">
- <constructor-arg name="remoteBeanName" value="localUserService"/>
- <constructor-arg name="remoteInterface" value="project.user.LocalUserService"/>
- </bean>
-
- <bean id="c2cPaymentMethodConfigService" class="kernel.web.RmiProxyFactoryBean" factory-method="getProxyBean">
- <constructor-arg name="remoteBeanName" value="c2cPaymentMethodConfigService"/>
- <constructor-arg name="remoteInterface" value="project.c2c.C2cPaymentMethodConfigService"/>
- </bean>
-
- <bean id="c2cPaymentMethodService" class="kernel.web.RmiProxyFactoryBean" factory-method="getProxyBean">
- <constructor-arg name="remoteBeanName" value="c2cPaymentMethodService"/>
- <constructor-arg name="remoteInterface" value="project.c2c.C2cPaymentMethodService"/>
- </bean>
-
- <bean id="c2cUserService" class="kernel.web.RmiProxyFactoryBean" factory-method="getProxyBean">
- <constructor-arg name="remoteBeanName" value="c2cUserService"/>
- <constructor-arg name="remoteInterface" value="project.c2c.C2cUserService"/>
- </bean>
-
- <bean id="c2cUserParamBaseSetService" class="kernel.web.RmiProxyFactoryBean" factory-method="getProxyBean">
- <constructor-arg name="remoteBeanName" value="c2cUserParamBaseSetService"/>
- <constructor-arg name="remoteInterface" value="project.c2c.C2cUserParamBaseSetService"/>
- </bean>
-
- <bean id="c2cAdvertService" class="kernel.web.RmiProxyFactoryBean" factory-method="getProxyBean">
- <constructor-arg name="remoteBeanName" value="c2cAdvertService"/>
- <constructor-arg name="remoteInterface" value="project.c2c.C2cAdvertService"/>
- </bean>
-
- <bean id="c2cOrderService" class="kernel.web.RmiProxyFactoryBean" factory-method="getProxyBean">
- <constructor-arg name="remoteBeanName" value="c2cOrderService"/>
- <constructor-arg name="remoteInterface" value="project.c2c.C2cOrderService"/>
- </bean>
-
- <bean id="c2cAppealService" class="kernel.web.RmiProxyFactoryBean" factory-method="getProxyBean">
- <constructor-arg name="remoteBeanName" value="c2cAppealService"/>
- <constructor-arg name="remoteInterface" value="project.c2c.C2cAppealService"/>
- </bean>
-
- <bean id="c2cTranslateService" class="kernel.web.RmiProxyFactoryBean" factory-method="getProxyBean">
- <constructor-arg name="remoteBeanName" value="c2cTranslateService"/>
- <constructor-arg name="remoteInterface" value="project.c2c.C2cTranslateService"/>
- </bean>
-
- <bean id="futuresOrderService" class="kernel.web.RmiProxyFactoryBean" factory-method="getProxyBean">
- <constructor-arg name="remoteBeanName" value="futuresOrderService"/>
- <constructor-arg name="remoteInterface" value="project.futures.FuturesOrderService"/>
- </bean>
-
- <bean id="minerOrderProfitService" class="kernel.web.RmiProxyFactoryBean" factory-method="getProxyBean">
- <constructor-arg name="remoteBeanName" value="minerOrderProfitService"/>
- <constructor-arg name="remoteInterface" value="project.miner.job.MinerOrderProfitService"/>
- </bean>
-
- <bean id="loanOrderService" class="kernel.web.RmiProxyFactoryBean" factory-method="getProxyBean">
- <constructor-arg name="remoteBeanName" value="loanOrderService"/>
- <constructor-arg name="remoteInterface" value="project.loan.LoanOrderService"/>
- </bean>
-
- <bean id="loanRelationOrderService" class="kernel.web.RmiProxyFactoryBean" factory-method="getProxyBean">
- <constructor-arg name="remoteBeanName" value="loanRelationOrderService"/>
- <constructor-arg name="remoteInterface" value="project.loan.LoanRelationOrderService"/>
- </bean>
-</beans>
diff --git a/src/main/resources/spring/applicationContext-futures_admin.xml b/src/main/resources/spring/applicationContext-futures_admin.xml
index b12cfc3..0959f64 100644
--- a/src/main/resources/spring/applicationContext-futures_admin.xml
+++ b/src/main/resources/spring/applicationContext-futures_admin.xml
@@ -2,8 +2,9 @@
<beans xmlns="http://www.springframework.org/schema/beans"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://www.springframework.org/schema/beans
- http://www.springframework.org/schema/beans/spring-beans.xsd">
-
+ http://www.springframework.org/schema/beans/spring-beans.xsd">
+
+ <bean id="futuresOrderService" class="project.futures.internal.FuturesOrderServiceImpl"/>
<bean id="futuresParaService" class="project.futures.internal.FuturesParaServiceImpl">
<property name="jdbcTemplate" ref="jdbcTemplate" />
<property name="redisHandler" ref="redisHandler" />
diff --git a/src/main/resources/spring/applicationContext-miner_admin.xml b/src/main/resources/spring/applicationContext-miner_admin.xml
index 0b5142e..1e37870 100644
--- a/src/main/resources/spring/applicationContext-miner_admin.xml
+++ b/src/main/resources/spring/applicationContext-miner_admin.xml
@@ -2,8 +2,8 @@
<beans xmlns="http://www.springframework.org/schema/beans"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://www.springframework.org/schema/beans
- http://www.springframework.org/schema/beans/spring-beans.xsd">
-
+ http://www.springframework.org/schema/beans/spring-beans.xsd">
+ <bean id="minerOrderProfitService" class="project.miner.job.MinerOrderProfitServiceImpl"/>
<bean id="minerService" class="project.miner.internal.MinerServiceImpl">
<property name="jdbcTemplate" ref="jdbcTemplate" />
<property name="redisHandler" ref="redisHandler" />
diff --git a/src/main/resources/spring/applicationContext-redis.xml b/src/main/resources/spring/applicationContext-redis.xml
index c6ae614..a47bb28 100644
--- a/src/main/resources/spring/applicationContext-redis.xml
+++ b/src/main/resources/spring/applicationContext-redis.xml
@@ -27,16 +27,19 @@
ref="redisHandlerThreadRejectExecutingHandler" />
</bean>
+ <bean id="sysLogService" class="project.log.internal.SysLogServiceImpl"/>
+
<bean id="redisHandlerThreadRejectExecutingHandler"
class="kernel.util.RejectExecutionHandlerDelegator">
<property name="rejectExecutionHandlers">
<list>
<bean class="project.redis.interal.OffLineEventRejectExecutingHandler" >
- <property name="sysLogService" ref="sysLogService" />
+ <property name="sysLogService" ref="sysLogService" />
</bean>
</list>
</property>
</bean>
+
</beans>
diff --git a/src/main/resources/spring/applicationContext-security_systemuser_admin.xml b/src/main/resources/spring/applicationContext-security_systemuser_admin.xml
index 5663f1c..9ec9454 100644
--- a/src/main/resources/spring/applicationContext-security_systemuser_admin.xml
+++ b/src/main/resources/spring/applicationContext-security_systemuser_admin.xml
@@ -2,8 +2,8 @@
<beans xmlns="http://www.springframework.org/schema/beans"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://www.springframework.org/schema/beans
- http://www.springframework.org/schema/beans/spring-beans.xsd">
-
+ http://www.springframework.org/schema/beans/spring-beans.xsd">
+ <bean id="onlineChatMessageService" class="project.onlinechat.internal.OnlineChatMessageServiceImpl"/>
<bean id="adminSystemUserService" class="systemuser.internal.AdminSystemUserServiceImpl">
<property name="logService" ref="logService" />
<property name="roleService" ref="roleService" />
diff --git a/src/main/resources/spring/applicationContext-wallet_admin.xml b/src/main/resources/spring/applicationContext-wallet_admin.xml
index d4d8d73..ab5bcd9 100644
--- a/src/main/resources/spring/applicationContext-wallet_admin.xml
+++ b/src/main/resources/spring/applicationContext-wallet_admin.xml
@@ -2,8 +2,9 @@
<beans xmlns="http://www.springframework.org/schema/beans"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://www.springframework.org/schema/beans
- http://www.springframework.org/schema/beans/spring-beans.xsd">
-
+ http://www.springframework.org/schema/beans/spring-beans.xsd">
+
+ <bean id="userDataService" class="project.data.UserDataServiceImpl"/>
<bean id="walletService" class="project.wallet.internal.WalletServiceImpl">
<property name="redisHandler" ref="redisHandler" />
<property name="moneyLogService" ref="moneyLogService" />
diff --git a/src/main/resources/spring/applicationContext.xml b/src/main/resources/spring/applicationContext.xml
index bd68fd3..eb08db4 100644
--- a/src/main/resources/spring/applicationContext.xml
+++ b/src/main/resources/spring/applicationContext.xml
@@ -16,7 +16,8 @@
<context:property-placeholder location="classpath:config.properties" />
<!-- 导入类路径下的所有spring配置文件 -->
- <import resource="classpath*:applicationContext-*.xml" />
+ <import resource="classpath*:spring/applicationContext-*.xml" />
+
<!--配置阿里DRUID数据源-->
<bean name="dataSource" class="com.alibaba.druid.pool.DruidDataSource" init-method="init" destroy-method="close">
diff --git a/src/main/webapp/WEB-INF/web.xml b/src/main/webapp/WEB-INF/web.xml
index 80dd31d..b9816c5 100644
--- a/src/main/webapp/WEB-INF/web.xml
+++ b/src/main/webapp/WEB-INF/web.xml
@@ -3,7 +3,7 @@
xmlns="http://java.sun.com/xml/ns/javaee"
xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_3_0.xsd"
version="3.0">
-
+
<welcome-file-list>
<welcome-file>login.jsp</welcome-file>
</welcome-file-list>
@@ -11,10 +11,10 @@
<!--加载Spring的配置文件到上下文中去-->
<context-param>
<param-name>contextConfigLocation</param-name>
- <!-- <param-value>classpath:applicationContext.xml</param-value> -->
- <param-value>classpath*:spring/*.xml</param-value>
+ <param-value>classpath*:spring/applicationContext.xml</param-value>
+<!-- <param-value>classpath*:spring/*.xml</param-value>-->
</context-param>
-
+
<servlet>
<servlet-name>jsp</servlet-name>
<servlet-class>org.apache.jasper.servlet.JspServlet</servlet-class>
@@ -40,7 +40,7 @@
<init-param>
<param-name>contextConfigLocation</param-name>
<!-- 此处指向的的是SpringMVC的配置文件 -->
- <param-value>classpath:spring/spring-mvc.xml</param-value>
+ <param-value>classpath:spring-mvc.xml</param-value>
</init-param>
<!--配置容器在启动的时候就加载这个servlet并实例化-->
<load-on-startup>1</load-on-startup>
@@ -56,7 +56,7 @@
<listener>
<listener-class>kernel.web.SpringWebContextListener</listener-class>
</listener>
-
+
<!-- 字符集过滤 -->
<filter>
<filter-name>encodingFilter</filter-name>
@@ -74,27 +74,27 @@
<filter-name>encodingFilter</filter-name>
<url-pattern>/*</url-pattern>
</filter-mapping>
-
- <!--配置过滤器-->
- <filter>
- <filter-name>AllRequestFilter</filter-name>
- <filter-class>project.web.admin.filter.AllRequestFilter</filter-class>
- </filter>
- <!--映射过滤器-->
- <filter-mapping>
- <filter-name>AllRequestFilter</filter-name>
- <url-pattern>/*</url-pattern>
- </filter-mapping>
-
+
<!--配置过滤器-->
- <filter>
- <filter-name>urlResourceFilterInvocation</filter-name>
- <filter-class>security.filter.UrlResourceFilterInvocation</filter-class>
- </filter>
- <!--映射过滤器-->
- <filter-mapping>
- <filter-name>urlResourceFilterInvocation</filter-name>
- <url-pattern>/*</url-pattern>
+ <filter>
+ <filter-name>AllRequestFilter</filter-name>
+ <filter-class>project.web.admin.filter.AllRequestFilter</filter-class>
+ </filter>
+ <!--映射过滤器-->
+ <filter-mapping>
+ <filter-name>AllRequestFilter</filter-name>
+ <url-pattern>/*</url-pattern>
+ </filter-mapping>
+
+ <!--配置过滤器-->
+ <filter>
+ <filter-name>urlResourceFilterInvocation</filter-name>
+ <filter-class>security.filter.UrlResourceFilterInvocation</filter-class>
+ </filter>
+ <!--映射过滤器-->
+ <filter-mapping>
+ <filter-name>urlResourceFilterInvocation</filter-name>
+ <url-pattern>/*</url-pattern>
</filter-mapping>
</web-app>
\ No newline at end of file
--
Gitblit v1.9.3