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 { 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); src/main/resources/logback.xml
File was deleted src/main/resources/spring-mvc.xml
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" /> src/main/resources/spring/applicationContext-auto_monitor_admin.xml
@@ -4,6 +4,7 @@ xsi:schemaLocation="http://www.springframework.org/schema/beans 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" /> src/main/resources/spring/applicationContext-contract_admin.xml
@@ -3,7 +3,7 @@ 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="adjustmentValueService" class="project.data.internal.AdjustmentValueServiceImpl"/> <bean id="adminContractOrderService" class="project.contract.internal.AdminContractOrderServiceImpl"> <property name="pagedQueryDao" ref="pagedDao" /> <property name="userRecomService" ref="userRecomService" /> 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" /> src/main/resources/spring/applicationContext-dubbo.xml
File was deleted src/main/resources/spring/applicationContext-futures_admin.xml
@@ -4,6 +4,7 @@ xsi:schemaLocation="http://www.springframework.org/schema/beans 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" /> src/main/resources/spring/applicationContext-miner_admin.xml
@@ -3,7 +3,7 @@ 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="minerOrderProfitService" class="project.miner.job.MinerOrderProfitServiceImpl"/> <bean id="minerService" class="project.miner.internal.MinerServiceImpl"> <property name="jdbcTemplate" ref="jdbcTemplate" /> <property name="redisHandler" ref="redisHandler" /> src/main/resources/spring/applicationContext-redis.xml
@@ -27,6 +27,8 @@ ref="redisHandlerThreadRejectExecutingHandler" /> </bean> <bean id="sysLogService" class="project.log.internal.SysLogServiceImpl"/> <bean id="redisHandlerThreadRejectExecutingHandler" class="kernel.util.RejectExecutionHandlerDelegator"> <property name="rejectExecutionHandlers"> @@ -37,6 +39,7 @@ </list> </property> </bean> </beans>
@@ -3,7 +3,7 @@ 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="onlineChatMessageService" class="project.onlinechat.internal.OnlineChatMessageServiceImpl"/> <bean id="adminSystemUserService" class="systemuser.internal.AdminSystemUserServiceImpl"> <property name="logService" ref="logService" /> <property name="roleService" ref="roleService" /> src/main/resources/spring/applicationContext-wallet_admin.xml
@@ -4,6 +4,7 @@ xsi:schemaLocation="http://www.springframework.org/schema/beans 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" /> 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"> src/main/webapp/WEB-INF/web.xml
@@ -11,8 +11,8 @@ <!--加载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> @@ -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>
