jeecg 3.6.4版本号提交

pull/6/merge
zhangdaiscott 2016-07-06 15:34:13 +08:00
parent 85a5f31808
commit dc6e996152
4 changed files with 50 additions and 8 deletions

View File

@ -95,8 +95,8 @@
<description>系统初始化监听器</description>
<listener-class>org.jeecgframework.web.system.listener.InitListener</listener-class>
</listener>
<!-- 在线用户监听器-->
<listener>
<description>在线用户监听器</description>
<listener-class>org.jeecgframework.web.system.listener.OnlineListener</listener-class>
</listener>
@ -149,6 +149,7 @@
<url-pattern>/rest/*</url-pattern>
</servlet-mapping>
<!-- druid -->
<servlet>
<servlet-name>druidStatView</servlet-name>
<servlet-class>com.alibaba.druid.support.http.StatViewServlet</servlet-class>
@ -158,6 +159,46 @@
<url-pattern>/webpage/system/druid/*</url-pattern>
</servlet-mapping>
<!-- ckfinder -->
<servlet>
<servlet-name>ConnectorServlet</servlet-name>
<servlet-class>com.ckfinder.connector.ConnectorServlet</servlet-class>
<init-param>
<param-name>XMLConfig</param-name>
<param-value>/WEB-INF/classes/CKfinderConfig.xml</param-value>
</init-param>
<init-param>
<param-name>debug</param-name>
<param-value>false</param-value>
</init-param>
<!-- 自定义ckfinder监听器 -->
<init-param>
<param-name>configuration</param-name>
<param-value>org.jeecgframework.web.system.listener.CkfinderConfiguration</param-value>
</init-param>
<load-on-startup>2</load-on-startup>
</servlet>
<servlet-mapping>
<servlet-name>ConnectorServlet</servlet-name>
<url-pattern>/plug-in/ckfinder/core/connector/java/connector.java</url-pattern>
</servlet-mapping>
<filter>
<filter-name>FileUploadFilter</filter-name>
<filter-class>com.ckfinder.connector.FileUploadFilter</filter-class>
<init-param>
<param-name>sessionCookieName</param-name>
<param-value>jsessionid</param-value>
</init-param>
<init-param>
<param-name>sessionParameterName</param-name>
<param-value>JSESSIONID</param-value>
</init-param>
</filter>
<filter-mapping>
<filter-name>FileUploadFilter</filter-name>
<url-pattern>/plug-in/ckfinder/core/connector/java/connector.java</url-pattern>
</filter-mapping>
<!-- 验证码 -->
<servlet>
<servlet-name>RandCodeImage</servlet-name>
@ -167,6 +208,7 @@
<servlet-name>RandCodeImage</servlet-name>
<url-pattern>/randCodeImage</url-pattern>
</servlet-mapping>
<!-- 404错误页面 -->
<error-page>
<error-code>404</error-code>

View File

@ -114,7 +114,7 @@
</form>
</div>
</div>
<div class="center"><h4 class="blue" id="id-company-text">&copy; JEECG版权所有 v_3.6.3</h4></div>
<div class="center"><h4 class="blue" id="id-company-text">&copy; JEECG版权所有 v_3.6.4</h4></div>
<div class="navbar-fixed-top align-right">
<br />
&nbsp;
@ -236,7 +236,7 @@
callback : function() {
iframe = this.iframe.contentWindow;
var orgId = $('#orgId', iframe.document).val();
//update-begin---author:scott---date:20160529--for变更采用ajax方式提高效率----
formData['orgId'] = orgId ? orgId : "";
$.ajax({
async : false,
@ -250,7 +250,7 @@
window.location.href = actionurl;
}
});
//update-begin---author:scott---date:20160529--for变更采用ajax方式提高效率----
this.close();
return false;
}

View File

@ -47,7 +47,7 @@
</h2>
<p>JEECG是一款基于代码生成器的J2EE快速开发平台开源界“小普元”超越传统商业企业级开发平台。引领新的开发模式(Online Coding模式(自定义表单)->代码生成器模式->手工MERGE智能开发) 可以帮助解决Java项目60%的重复工作让开发更多关注业务逻辑。既能快速提高开发效率帮助公司节省人力成本同时又不失灵活性。她可以用于所有的Web应用程序如:<b>MIS</b><b>CRM</b><b>OA</b><b>ERP</b><b>CMS</b><b>网站后台</b><b>微信管家</b>,等等,当然,您也可以对她进行深度定制,以做出更强系统。</p>
<p>
<b>当前版本:</b>v3.6.3
<b>当前版本:</b>v3.6.4
</p>
<p>
<span class="label label-warning">开源 免费</span>
@ -132,7 +132,7 @@
<div class="panel panel-default">
<div class="panel-heading">
<h5 class="panel-title">
<a data-toggle="collapse" data-parent="#version" href="#v42">v3.6.3</a><code class="pull-right">2016.04.09</code>
<a data-toggle="collapse" data-parent="#version" href="#v42">v3.6.4</a><code class="pull-right">2016.04.09</code>
</h5>
</div>
<div id="v42" class="panel-collapse collapse in">

View File

@ -47,7 +47,7 @@
</h2>
<p>JEECG是一款基于代码生成器的J2EE快速开发平台开源界“小普元”超越传统商业企业级开发平台。引领新的开发模式(Online Coding模式(自定义表单)->代码生成器模式->手工MERGE智能开发) 可以帮助解决Java项目60%的重复工作让开发更多关注业务逻辑。既能快速提高开发效率帮助公司节省人力成本同时又不失灵活性。她可以用于所有的Web应用程序如:<b>MIS</b><b>CRM</b><b>OA</b><b>ERP</b><b>CMS</b><b>网站后台</b><b>微信管家</b>,等等,当然,您也可以对她进行深度定制,以做出更强系统。</p>
<p>
<b>当前版本:</b>v3.6.3
<b>当前版本:</b>v3.6.4
</p>
<p>
<span class="label label-warning">开源 &nbsp; | &nbsp; 免费 | &nbsp; 更多插件</span>
@ -168,7 +168,7 @@
<div class="panel panel-default">
<div class="panel-heading">
<h5 class="panel-title">
<a data-toggle="collapse" data-parent="#version" href="#v43">v3.6.3</a><code class="pull-right">2016.04.09</code>
<a data-toggle="collapse" data-parent="#version" href="#v43">v3.6.4</a><code class="pull-right">2016.04.09</code>
</h5>
</div>
<div id="v43" class="panel-collapse collapse">