Skip to content

N
nouiWithSpringMVC
Commit eecb13ff by WeiCong
Options

修复部分jar冲突 

修复部分启动报错问题
parent 3621199c
Showing with 220 additions and 8 deletions
.gitignore
......@@ -2,4 +2,6 @@ out/
target/
.idea
.settings
log
\ No newline at end of file
log
e-lib
classes/
\ No newline at end of file
business.iml
......@@ -33,12 +33,12 @@
<orderEntry type="sourceFolder" forTests="false" />
<orderEntry type="library" name="bd环境" level="project" />
<orderEntry type="library" name="eibs-hibernatesupport-2.0.0" level="project" />
<orderEntry type="library" name="c3p0-0.9.2.1" level="project" />
<orderEntry type="library" name="dzxt-bean" level="project" />
<orderEntry type="library" name="bd环境" level="project" />
<orderEntry type="library" name="freemarker" level="project" />
<orderEntry type="library" name="ojdbc6-12.1.0.2" level="project" />
<orderEntry type="library" name="orai18n-12.1.0.2" level="project" />
<orderEntry type="library" name="e结算依赖包" level="project" />
<orderEntry type="library" name="Maven: net.sf.ehcache:ehcache:2.10.4" level="project" />
<orderEntry type="library" name="Maven: com.auth0:java-jwt:2.2.0" level="project" />
<orderEntry type="module-library">
......@@ -54,6 +54,7 @@
<orderEntry type="library" name="Maven: org.slf4j:jul-to-slf4j:1.7.30" level="project" />
<orderEntry type="library" name="Maven: org.apache.logging.log4j:log4j-core:2.12.1" level="project" />
<orderEntry type="library" name="Maven: org.apache.logging.log4j:log4j-api:2.12.1" level="project" />
<orderEntry type="library" name="Maven: org.apache.logging.log4j:log4j-slf4j-impl:2.12.1" level="project" />
<orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-databind:2.9.7" level="project" />
<orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-annotations:2.9.7" level="project" />
<orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-core:2.9.7" level="project" />
......
pom.xml
......@@ -83,6 +83,12 @@
</dependency>
<dependency>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-slf4j-impl</artifactId>
<version>${log4j2.version}</version>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-databind</artifactId>
<version>${jackson.version}</version>
......@@ -354,7 +360,6 @@
<goal>copy-dependencies</goal>
</goals>
<configuration>
<excludeGroupIds>org.sss</excludeGroupIds>
<!-- 依赖包 输出目录 -->
<outputDirectory>${project.build.directory}/lib</outputDirectory>
<!-- 是否不包含间接依赖的包 -->
......
src/main/java/org/sss/presentation/noui/controller/AbstractCommonController.java
......@@ -149,13 +149,13 @@ public abstract class AbstractCommonController {
stream.setName(file.getOriginalFilename());
stream.setType(file.getContentType());
log.info("文件表单 key:" + file.getOriginalFilename() + ",size:" + file.getSize());
IOUtils.copy(file.getInputStream(), stream.getOutputStream(), 1024);
IOUtils.copy(file.getInputStream(), stream.getOutputStream());
dataField.invokeEventRules(context, EventType.ON_STREAM_UPLOAD, null);
} else if (eventType.equals(ON_STREAM_DOWNLOAD)) {
@SuppressWarnings("rawtypes")
IDatafield dataField = (IDatafield) baseObject(context, noUiRequest, alias);
IStream stream = (IStream) dataField.getValue();
byte[] data = IOUtils.readFully(stream.getInputStream(), (int) stream.size());
byte[] data = IOUtils.toByteArray(stream.getInputStream());
dataField.invokeEventRules(context, EventType.ON_STREAM_DOWNLOAD, null);
IOUtils.write(data, response.getOutputStream());
}
......
src/main/java/org/sss/presentation/noui/util/NoUiPresentationUtil.java
......@@ -371,7 +371,7 @@ public class NoUiPresentationUtil {
context.getSession().saveData(sysmod, stream);
byte[] sysmodBytes = null;
try {
sysmodBytes = IOUtils.readFully(stream.getInputStream(), (int) stream.size());
sysmodBytes = IOUtils.toByteArray(stream.getInputStream());
} catch (IOException e) {
log.error("sysmodToBytes exception",e);
}
......
src/main/resources/applicationContext.xml
......@@ -3,7 +3,7 @@
xsi:schemaLocation="http://www.springframework.org/schema/beans
http://www.springframework.org/schema/beans/spring-beans-4.2.xsd">
<bean id="annotationPropertyConfigurerRedis"
<bean id="propertyConfigurer"
class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer">
<property name="order" value="1"/>
<property name="ignoreUnresolvablePlaceholders" value="true"/>
......
src/main/resources/eIBS.xml 0 → 100644
<?xml version="1.0" encoding="UTF-8"?>
<configuration>
<service class="org.sss.presentation.noui.util.NoUiUtils"
initMethodName="init" deinitMethodName="deinit">
<property name="datapath" value="D:/"/>
<property name="fieldencode" value="true" class="boolean"/>
<property name="connectKeeped" value="true" class="boolean"/>
<property name="debugMode" value="false" class="boolean"/>
<!-- WAR包本身的目录为变量$ROOT，WAR/WEB-INF/classes目录为变量$HOME -->
<property name="rootPath" value="$ROOT"/>
<!-- 外部资源目录
<property name="resourcePath" value="$ROOT/upload" /> -->
<!-- 代码转换的实现（可替换，但必须实现ICodetable接口） -->
<property name="tbl" class="org.sss.common.impl.CodetableImpl"
methodName="getInstance">
<property name="homePath" value="$HOME" direct="false"/>
</property>
<!-- 国际化的实现（可替换，但必须实现II18n接口） -->
<property name="i18n" class="org.sss.common.impl.I18nImpl"/>
<!-- 密码编解码的实现（可替换，但必须实现IFilter接口） -->
<property name="passwordFilter" class="org.sss.presentation.noui.filter.PasswordSM2Filter"/>
<!-- Module工厂实现（不可替换） -->
<property name="factory" class="org.sss.module.hibernate.ModuleSessionFactory"/>
<!-- 后台应用服务启动用户名 -->
<property name="userName" value="bgUser"/>
<!-- 后台应用服务中断重启间隙时间（单位：毫秒） -->
<property name="millis" value="5000" class="long"/>
<!-- 后台应用服务超时时间（单位：毫秒） -->
<property name="timeout" value="600000" class="long"/>
<!-- 关闭时等待后台应用服务退出时间（单位：毫秒） -->
<property name="waitExit" value="60000" class="long"/>
<!-- 服务列表（以逗号隔开多个服务名，服务名前加下划线忽略后台应用服务超时时间） -->
<property name="serviceNames" value="" class="java.lang.String[]"/>
<property name="userNames" value="bgUser1,bgUser2" class="java.lang.String[]"/>
<property name="millises" value="60000,5000" class="long[]"/>
<property name="timeouts" value="600000,600000" class="long[]"/>
</service>
<service class="com.brilliance.etrade.auth.impl.LoginContextImpl">
<!-- 网银认证时间间隔 -->
<property name="timeStep" value="600000" class="long"/>
</service>
<service class="org.sss.util.ContainerUtils">
<!-- <property name="cacheClassName" value="org.sss.presentation.noui.cache.Ehcache.EhcacheCache" class="java.lang.String" /> -->
<!-- 交易DAT文件是否采用压缩 -->
<property name="isCompressed" value="false" class="boolean"/>
</service>
<service class="org.sss.module.hibernate.HibernateUtils" initMethodName="init" deinitMethodName="deinit">
<!-- 生成代码基本包名（不可修改）***暂时注释掉 -->
<!--<property name="packageName" value="com.brilliance.eibs.etrade"/>-->
<!-- 生成数据库脚本 -->
<!-- <property name="scriptFile" value="C:/eIBS.sql" />-->
<!-- 自动重建数据库表 -->
<property name="autoCreate" value="false" class="boolean"/>
<!-- 设置查询最大读取数(0为无限制) -->
<property name="maxFetchSize" value="1000" class="int"/>
<property name="ignoreFetchError" value="true" class="boolean"/>
</service>
<service class="org.sss.presentation.zk.ZkDisplayUtils">
<property name="unit" value="px"/>
<property name="leftOffset" value="5" class="int"/>
<property name="topOffset" value="55" class="int"/>
</service>
<service class="org.sss.presentation.zk.ZkUtils" initMethodName="init" deinitMethodName="deinit">
<property name="autoTextarea" value="false" class="boolean"/>
<!-- 是否为调试状态 -->
<property name="debugMode" value="true" class="boolean"/>
<!-- WAR包本身的目录为变量$ROOT，WAR/WEB-INF/classes目录为变量$HOME -->
<property name="rootPath" value="/weblogic/webapps/resource"/>
<!-- 外部资源目录 -->
<property name="resourcePath" value="/weblogic/webapps/resource/data/loginfile/"/>
<!-- 代码转换的实现（可替换，但必须实现ICodetable接口） -->
<property name="tbl" class="org.sss.common.impl.CodetableImpl" methodName="getInstance">
<property name="homePath" value="$HOME" direct="false"/>
<!-- <property name="homePath" value="/weblogic/webapps/resource/codetable/" direct="false" /> -->
</property>
<!-- 国际化的实现（可替换，但必须实现II18n接口） -->
<property name="i18n" class="org.sss.common.impl.I18nImpl"/>
<!-- 密码编解码的实现（可替换，但必须实现IFilter接口） -->
<property name="passwordFilter" class="org.sss.common.impl.PasswordFilter"/>
<!-- Module工厂实现（不可替换） -->
<property name="factory" class="org.sss.module.hibernate.ModuleSessionFactory"/>
<!-- 后台应用服务启动用户名 -->
<property name="userName" value="bgUser"/>
<!-- 后台应用服务中断重启间隙时间（单位：毫秒） -->
<property name="millis" value="10000" class="long"/>
<!-- 关闭时等待后台应用服务退出时间（单位：毫秒） -->
<property name="waitExit" value="600000" class="long"/>
<!-- 服务列表（以逗号隔开多个服务名） -->
<!-- <property name="serviceNames" value="_xmltsk" direct="true" class="java.lang.String[]" /> -->
<property name="serviceNames" value="" direct="true" class="java.lang.String[]"/>
</service>
</configuration>
src/main/webapp/WEB-INF/web.xml
......@@ -25,6 +25,21 @@
<param-value>hibernate</param-value>
</context-param>
<context-param>
<param-name>redirectUri</param-name>
<param-value>/redirect.zul</param-value>
</context-param>
<context-param>
<param-name>loginUri</param-name>
<param-value>/login.zul</param-value>
</context-param>
<context-param>
<param-name>messageTemplate</param-name>
<param-value>/error/template.zul</param-value>
</context-param>
<!-- 配置监听器 -->
<listener>
......@@ -41,6 +56,12 @@
<listener-class>org.sss.server.WebContextListener</listener-class>
</listener>
<listener>
<listener-class>org.sss.presentation.zk.common.SessionListener</listener-class>
</listener>
<listener>
<listener-class>org.zkoss.zk.ui.http.HttpSessionListener</listener-class>
</listener>
<listener>
<listener-class>org.sss.presentation.noui.listener.NoUiApiInitListener</listener-class>
</listener>
<filter>
......@@ -70,6 +91,52 @@
<url-pattern>/*</url-pattern>
</filter-mapping>
<filter>
<filter-name>applicationFilter</filter-name>
<filter-class>org.sss.presentation.zk.common.ApplicationFilter</filter-class>
<init-param>
<param-name>secureRequired</param-name>
<param-value>false</param-value><!-- 这里设置必须为https方式登录系统 -->
</init-param>
<init-param>
<param-name>ssoLoginRequired</param-name>
<param-value>false</param-value><!-- 这里设置单点登录系统 -->
</init-param>
<init-param>
<param-name>loginContextClassName</param-name>
<param-value>com.brilliance.etrade.auth.impl.CopyOfSimpleLoginContextImpl</param-value>
</init-param>
<init-param>
<param-name>excludes</param-name>
<!-- 这里设置不需要登录就可以访问资源 -->
<param-value>*.dsp,*.js,*.css,/zkau/*,/public/*,/error/*</param-value>
</init-param>
</filter>
<filter-mapping>
<filter-name>applicationFilter</filter-name>
<servlet-name>zkLoader</servlet-name>
</filter-mapping>
<filter-mapping>
<filter-name>applicationFilter</filter-name>
<servlet-name>auEngine</servlet-name>
</filter-mapping>
<filter-mapping>
<filter-name>applicationFilter</filter-name>
<url-pattern>/file/*</url-pattern>
</filter-mapping>
<filter-mapping>
<filter-name>applicationFilter</filter-name>
<url-pattern>/locale/*</url-pattern>
</filter-mapping>
<filter-mapping>
<filter-name>applicationFilter</filter-name>
<url-pattern>/entity/*</url-pattern>
</filter-mapping>
<filter-mapping>
<filter-name>applicationFilter</filter-name>
<url-pattern>/resource/*</url-pattern>
</filter-mapping>
<servlet>
<servlet-name>springDispatcherServlet</servlet-name>
<servlet-class>org.springframework.web.servlet.DispatcherServlet</servlet-class>
......@@ -86,6 +153,46 @@
<url-pattern>/service/*</url-pattern>
</servlet-mapping>
<servlet>
<servlet-name>zkLoader</servlet-name>
<servlet-class>org.zkoss.zk.ui.http.DHtmlLayoutServlet</servlet-class>
<init-param>
<param-name>update-uri</param-name>
<param-value>/zkau</param-value>
</init-param>
<load-on-startup>1</load-on-startup>
</servlet>
<servlet>
<servlet-name>auEngine</servlet-name>
<servlet-class>org.zkoss.zk.au.http.DHtmlUpdateServlet</servlet-class>
</servlet>
<servlet-mapping>
<servlet-name>zkLoader</servlet-name>
<url-pattern>*.zul</url-pattern>
</servlet-mapping>
<servlet-mapping>
<servlet-name>zkLoader</servlet-name>
<url-pattern>*.zhtml</url-pattern>
</servlet-mapping>
<servlet-mapping>
<servlet-name>zkLoader</servlet-name>
<url-pattern>*.svg</url-pattern>
</servlet-mapping>
<servlet-mapping>
<servlet-name>zkLoader</servlet-name>
<url-pattern>*.xml2html</url-pattern>
</servlet-mapping>
<servlet-mapping>
<servlet-name>zkLoader</servlet-name>
<url-pattern>/zk/*</url-pattern>
</servlet-mapping>
<servlet-mapping>
<servlet-name>auEngine</servlet-name>
<url-pattern>/zkau/*</url-pattern>
</servlet-mapping>
<session-config>
<session-timeout>1800</session-timeout>
</session-config>
......
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