diff --git a/mf-business/mf-sys/src/main/resources/logback-logstash.xml b/mf-business/mf-sys/src/main/resources/logback-logstash.xml new file mode 100644 index 00000000..577675a4 --- /dev/null +++ b/mf-business/mf-sys/src/main/resources/logback-logstash.xml @@ -0,0 +1,98 @@ + + + + + + + + + + + + + ${log.pattern} + UTF-8 + + + + + + ${log.path}/info.log + + + + ${log.path}/info.%d{yyyy-MM-dd}.%i.log + + 60 + ${maxFileSize} + + + ${log.pattern} + UTF-8 + + + + INFO + + ACCEPT + + DENY + + + + + ${log.path}/sql.log + + + + ${log.path}/sql.%d{yyyy-MM-dd}.%i.log + + 60 + ${maxFileSize} + + + ${log.pattern} + UTF-8 + + + + + ${log.path}/error.log + + + + ${log.path}/error.%d{yyyy-MM-dd}.%i.log + + 60 + ${maxFileSize} + + + ${log.pattern} + UTF-8 + + + + ERROR + + ACCEPT + + DENY + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/mf-business/mf-sys/src/main/resources/logback.xml b/mf-business/mf-sys/src/main/resources/logback.xml deleted file mode 100644 index 1cafe4de..00000000 --- a/mf-business/mf-sys/src/main/resources/logback.xml +++ /dev/null @@ -1,74 +0,0 @@ - - - - - - - - - - - ${log.pattern} - - - - - - ${log.path}/info.log - - - - ${log.path}/info.%d{yyyy-MM-dd}.log - - 60 - - - ${log.pattern} - - - - INFO - - ACCEPT - - DENY - - - - - ${log.path}/error.log - - - - ${log.path}/error.%d{yyyy-MM-dd}.log - - 60 - - - ${log.pattern} - - - - ERROR - - ACCEPT - - DENY - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/mf-code-create/src/main/resources/logback-logstash.xml b/mf-code-create/src/main/resources/logback-logstash.xml new file mode 100644 index 00000000..fe81543d --- /dev/null +++ b/mf-code-create/src/main/resources/logback-logstash.xml @@ -0,0 +1,98 @@ + + + + + + + + + + + + + ${log.pattern} + UTF-8 + + + + + + ${log.path}/info.log + + + + ${log.path}/info.%d{yyyy-MM-dd}.%i.log + + 60 + ${maxFileSize} + + + ${log.pattern} + UTF-8 + + + + INFO + + ACCEPT + + DENY + + + + + ${log.path}/sql.log + + + + ${log.path}/sql.%d{yyyy-MM-dd}.%i.log + + 60 + ${maxFileSize} + + + ${log.pattern} + UTF-8 + + + + + ${log.path}/error.log + + + + ${log.path}/error.%d{yyyy-MM-dd}.%i.log + + 60 + ${maxFileSize} + + + ${log.pattern} + UTF-8 + + + + ERROR + + ACCEPT + + DENY + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/mf-code-create/src/main/resources/logback.xml b/mf-code-create/src/main/resources/logback.xml deleted file mode 100644 index 946f5429..00000000 --- a/mf-code-create/src/main/resources/logback.xml +++ /dev/null @@ -1,74 +0,0 @@ - - - - - - - - - - - ${log.pattern} - - - - - - ${log.path}/info.log - - - - ${log.path}/info.%d{yyyy-MM-dd}.log - - 60 - - - ${log.pattern} - - - - INFO - - ACCEPT - - DENY - - - - - ${log.path}/error.log - - - - ${log.path}/error.%d{yyyy-MM-dd}.log - - 60 - - - ${log.pattern} - - - - ERROR - - ACCEPT - - DENY - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/mf-gateway/src/main/resources/logback-logstash.xml b/mf-gateway/src/main/resources/logback-logstash.xml new file mode 100644 index 00000000..246ff790 --- /dev/null +++ b/mf-gateway/src/main/resources/logback-logstash.xml @@ -0,0 +1,94 @@ + + + + + + + + + + + + + ${log.pattern} + UTF-8 + + + + + + ${log.path}/info.log + + + + ${log.path}/info.%d{yyyy-MM-dd}.%i.log + + 60 + ${maxFileSize} + + + ${log.pattern} + UTF-8 + + + + INFO + + ACCEPT + + DENY + + + + + ${log.path}/sql.log + + + + ${log.path}/sql.%d{yyyy-MM-dd}.%i.log + + 60 + ${maxFileSize} + + + ${log.pattern} + UTF-8 + + + + + ${log.path}/error.log + + + + ${log.path}/error.%d{yyyy-MM-dd}.%i.log + + 60 + ${maxFileSize} + + + ${log.pattern} + UTF-8 + + + + ERROR + + ACCEPT + + DENY + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/mf-gateway/src/main/resources/logback.xml b/mf-gateway/src/main/resources/logback.xml deleted file mode 100644 index 1efead87..00000000 --- a/mf-gateway/src/main/resources/logback.xml +++ /dev/null @@ -1,74 +0,0 @@ - - - - - - - - - - - ${log.pattern} - - - - - - ${log.path}/info.log - - - - ${log.path}/info.%d{yyyy-MM-dd}.log - - 60 - - - ${log.pattern} - - - - INFO - - ACCEPT - - DENY - - - - - ${log.path}/error.log - - - - ${log.path}/error.%d{yyyy-MM-dd}.log - - 60 - - - ${log.pattern} - - - - ERROR - - ACCEPT - - DENY - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/mf-oauth/src/main/java/cn/com/mfish/oauth/mapper/xml/SsoMenuMapper.xml b/mf-oauth/src/main/java/cn/com/mfish/oauth/mapper/xml/SsoMenuMapper.xml index c81a75c5..890885d4 100644 --- a/mf-oauth/src/main/java/cn/com/mfish/oauth/mapper/xml/SsoMenuMapper.xml +++ b/mf-oauth/src/main/java/cn/com/mfish/oauth/mapper/xml/SsoMenuMapper.xml @@ -58,7 +58,7 @@ - UNION ALL SELECT * FROM sso_menu WHERE menu_code IN (SELECT DISTINCT SUBSTR(menu_code, 1,(menu_level-#{value})*5) FROM + UNION SELECT * FROM sso_menu WHERE menu_code IN (SELECT DISTINCT SUBSTR(menu_code, 1,(menu_level-#{value})*5) FROM sso_menu diff --git a/mf-oauth/src/main/resources/logback-logstash.xml b/mf-oauth/src/main/resources/logback-logstash.xml new file mode 100644 index 00000000..c42b6f4f --- /dev/null +++ b/mf-oauth/src/main/resources/logback-logstash.xml @@ -0,0 +1,98 @@ + + + + + + + + + + + + + ${log.pattern} + UTF-8 + + + + + + ${log.path}/info.log + + + + ${log.path}/info.%d{yyyy-MM-dd}.%i.log + + 60 + ${maxFileSize} + + + ${log.pattern} + UTF-8 + + + + INFO + + ACCEPT + + DENY + + + + + ${log.path}/sql.log + + + + ${log.path}/sql.%d{yyyy-MM-dd}.%i.log + + 60 + ${maxFileSize} + + + ${log.pattern} + UTF-8 + + + + + ${log.path}/error.log + + + + ${log.path}/error.%d{yyyy-MM-dd}.%i.log + + 60 + ${maxFileSize} + + + ${log.pattern} + UTF-8 + + + + ERROR + + ACCEPT + + DENY + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/mf-oauth/src/main/resources/logback.xml b/mf-oauth/src/main/resources/logback.xml deleted file mode 100644 index b75e61e8..00000000 --- a/mf-oauth/src/main/resources/logback.xml +++ /dev/null @@ -1,74 +0,0 @@ - - - - - - - - - - - ${log.pattern} - - - - - - ${log.path}/info.log - - - - ${log.path}/info.%d{yyyy-MM-dd}.log - - 60 - - - ${log.pattern} - - - - INFO - - ACCEPT - - DENY - - - - - ${log.path}/error.log - - - - ${log.path}/error.%d{yyyy-MM-dd}.log - - 60 - - - ${log.pattern} - - - - ERROR - - ACCEPT - - DENY - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/mf-test/src/main/resources/logback-logstash.xml b/mf-test/src/main/resources/logback-logstash.xml new file mode 100644 index 00000000..1bfcbc15 --- /dev/null +++ b/mf-test/src/main/resources/logback-logstash.xml @@ -0,0 +1,94 @@ + + + + + + + + + + + + + ${log.pattern} + UTF-8 + + + + + + ${log.path}/info.log + + + + ${log.path}/info.%d{yyyy-MM-dd}.%i.log + + 60 + ${maxFileSize} + + + ${log.pattern} + UTF-8 + + + + INFO + + ACCEPT + + DENY + + + + + ${log.path}/sql.log + + + + ${log.path}/sql.%d{yyyy-MM-dd}.%i.log + + 60 + ${maxFileSize} + + + ${log.pattern} + UTF-8 + + + + + ${log.path}/error.log + + + + ${log.path}/error.%d{yyyy-MM-dd}.%i.log + + 60 + ${maxFileSize} + + + ${log.pattern} + UTF-8 + + + + ERROR + + ACCEPT + + DENY + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/mf-test/src/main/resources/logback.xml b/mf-test/src/main/resources/logback.xml deleted file mode 100644 index a053e734..00000000 --- a/mf-test/src/main/resources/logback.xml +++ /dev/null @@ -1,74 +0,0 @@ - - - - - - - - - - - ${log.pattern} - - - - - - ${log.path}/info.log - - - - ${log.path}/info.%d{yyyy-MM-dd}.log - - 60 - - - ${log.pattern} - - - - INFO - - ACCEPT - - DENY - - - - - ${log.path}/error.log - - - - ${log.path}/error.%d{yyyy-MM-dd}.log - - 60 - - - ${log.pattern} - - - - ERROR - - ACCEPT - - DENY - - - - - - - - - - - - - - - - - - \ No newline at end of file