diff --git a/modules/core/src/main/resources/config/logger-core.xml b/modules/core/src/main/resources/config/logger-core.xml index 39146cc4..3acf57a9 100644 --- a/modules/core/src/main/resources/config/logger-core.xml +++ b/modules/core/src/main/resources/config/logger-core.xml @@ -11,7 +11,10 @@ + + + diff --git a/modules/core/src/main/resources/jta.properties b/modules/core/src/main/resources/jta.properties index 4d3cbe0e..8c397fb6 100644 --- a/modules/core/src/main/resources/jta.properties +++ b/modules/core/src/main/resources/jta.properties @@ -1,4 +1,10 @@ # 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 \ No newline at end of file +com.atomikos.icatch.enable_logging=false + +# 提示 oracle.jdbc.xa.OracleXAResource.recover 错误需要授权: +#grant select on sys.dba_pending_transactions to jeesite; +#grant select on sys.pending_trans$ to jeesite; +#grant select on sys.dba_2pc_pending to jeesite; +#grant execute on sys.dbms_system to jeesite; \ No newline at end of file diff --git a/modules/core/src/main/resources/views/include/head.html b/modules/core/src/main/resources/views/include/head.html index d2d3231a..1db2d98b 100644 --- a/modules/core/src/main/resources/views/include/head.html +++ b/modules/core/src/main/resources/views/include/head.html @@ -9,3 +9,6 @@ content="width=device-width, initial-scale=1, user-scalable=1" name="viewport"/> +<% if(parameter.__layer! == 'true'){ %> + +<% } %> diff --git a/modules/core/src/main/resources/views/modules/sys/sysSwitchSkin.html b/modules/core/src/main/resources/views/modules/sys/sysSwitchSkin.html index 959dd031..97209847 100644 --- a/modules/core/src/main/resources/views/modules/sys/sysSwitchSkin.html +++ b/modules/core/src/main/resources/views/modules/sys/sysSwitchSkin.html @@ -1,4 +1,5 @@ <% layout('/layouts/default.html', {title: '切换主题风格'}){ %> +