manager/my-worker
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

多数据源优化，支持分布式事务，支持Service层切换数据源；支持MyBatisDao注解指定数据源名称；jquery validate

Browse Source 
remote 中文乱码导致验证失败问题；角色管理增加状态条件；附件列表增加上传人和时间；
This commit is contained in:
thinkgem
2018-04-21 12:58:42 +08:00
parent 630a1f1d73
commit 503e14b146
18 changed files with 41 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
modules/core/src/main/resources/config/jeesite-core.yml
View File

@@ -72,7 +72,7 @@ jdbc:
# 最大连接数
maxActive: 20
# # 多数数据源名称列表，调用方式：DataSourceHolder.setDataSourceName("ds2")
# # 多数据源名称列表，启用方式：@MyBatisDao(dataSourceName="ds2")
# dataSourceNames: ds2
#
# # 多数据源配置：ds2

2
modules/core/src/main/resources/config/logger-core.xml
View File

@@ -6,6 +6,8 @@
<logger name="org.mybatis.spring.transaction" level="DEBUG" />
<logger name="org.apache.catalina.webresources.Cache" level="ERROR" />
<logger name="org.springframework.boot.context.embedded" level="INFO" />
<logger name="com.atomikos.icatch.config.UserTransactionServiceImp" level="ERROR" />
<logger name="com.atomikos.jdbc.AbstractDataSourceBean" level="ERROR" />
<logger name="com.jeesite" level="DEBUG" />
<logger name="com.jeesite.common.i18n" level="INFO" />

4
modules/core/src/main/resources/jta.properties Normal file
View File

@@ -0,0 +1,4 @@
# transactions.properties not found - looking for jta.properties in classpath...
com.atomikos.icatch.service=com.atomikos.icatch.standalone.UserTransactionServiceFactory
com.atomikos.icatch.max_actives=-1
com.atomikos.icatch.enable_logging=false

2
modules/core/src/main/resources/mybatis/mybatis-config.xml
View File

@@ -46,8 +46,8 @@
<!-- 插件配置 -->
<plugins>
<plugin interceptor="com.jeesite.common.mybatis.interceptor.DataSourceInterceptor" />
<plugin interceptor="com.jeesite.common.mybatis.interceptor.PaginationInterceptor" />
<!-- <plugin interceptor="com.jeesite.common.mybatis.interceptor.TimerInterceptor" /> -->
</plugins>
</configuration>

6
modules/core/src/main/resources/views/modules/sys/sysIndex/topMenu.html
View File

@@ -17,9 +17,9 @@
<li><a href="javascript:" id="switchSkin" title="${text('切换主题')}" style="margin-top:-1px;"><i class="fa fa-dashboard"></i></a></li>
<% include('/modules/sys/sysIndex/topMenuLang.html'){} %>
<% include('/modules/sys/sysIndex/topMenuOnline.html'){} %>
<% include('/modules/sys/sysIndex/topMenuMsg.html'){} %>
<% include('/modules/sys/sysIndex/topMenuNotify.html'){} %>
<% include('/modules/sys/sysIndex/topMenuTask.html'){} %>
<% //include('/modules/sys/sysIndex/topMenuMsg.html'){} %>
<% //include('/modules/sys/sysIndex/topMenuNotify.html'){} %>
<% //include('/modules/sys/sysIndex/topMenuTask.html'){} %>
<% include('/modules/sys/sysIndex/topMenuUser.html'){} %>
</ul>
</div>