Merge branch 'feature/sso-server-merge-1228' of http://121.40.234.130:8899/root/lanzhouhailiang_one into master_test

2022-12-30 10:21:01 +08:00
parent 2294282665 d540fdfa04
commit 6af24f299a
346 changed files with 9522 additions and 7632 deletions
--- a/lms/nladmin-system/src/main/resources/logback-spring.xml
+++ b/lms/nladmin-system/src/main/resources/logback-spring.xml
@@ -83,7 +83,7 @@ https://juejin.cn/post/6844903775631572999
        <root level="debug">
            <appender-ref ref="CONSOLE"/>
            <appender-ref ref="asyncFileAppender"/>
-            <appender-ref ref="lokiAppender" />
+<!--            <appender-ref ref="lokiAppender" />-->
        </root>
        <logger name="org.springframework" level="ERROR" additivity="false">
            <appender-ref ref="CONSOLE"/>