From 19752502f1c27b85a4da5748293ac3ff1fcf5d63 Mon Sep 17 00:00:00 2001 From: thinkgem Date: Wed, 12 Dec 2018 21:21:20 +0800 Subject: [PATCH] =?UTF-8?q?=E4=B8=BB=E9=A2=98=E5=88=87=E6=8D=A2=E4=B8=AD?= =?UTF-8?q?=E6=96=B0=E5=A2=9E=E2=80=9C=E8=A1=A8=E5=8D=95=E5=BC=B9=E7=AA=97?= =?UTF-8?q?=E6=A8=A1=E5=BC=8F=E2=80=9D=E3=80=81=E2=80=9C=E5=8F=96=E6=B6=88?= =?UTF-8?q?=E9=A1=B5=E7=AD=BE=E6=A8=A1=E5=BC=8F=E2=80=9D=E9=80=89=E9=A1=B9?= =?UTF-8?q?=E5=BC=80=E5=85=B3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/resources/config/logger-core.xml | 3 + .../core/src/main/resources/jta.properties | 8 +- .../main/resources/views/include/head.html | 3 + .../views/modules/sys/sysSwitchSkin.html | 80 +++++++++++++------ web/db/oracle/create_user.sql | 2 +- 5 files changed, 70 insertions(+), 26 deletions(-) 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: '切换主题风格'}){ %> +