Merge branch 'master' into 'lwby_advert_1'

# Conflicts:
#   src/main/java/com/boot/security/server/config/DruidConfig.java
#   src/main/resources/static/index.html
#   src/main/resources/static/login.html
#   src/main/resources/static/pages/dashboard.html

README.md

+# lwby_ad_data
+
+蓝湾博阅
\ No newline at end of file

logs/admin-server.log.error

+2020-04-17 16:33:24,084 [main] ERROR o.a.c.core.AprLifecycleListener -[DirectJDKLog.java:180]- An incompatible version [1.2.12] of the APR based Apache Tomcat Native library is installed, while Tomcat requires version [1.2.14]
+2020-04-17 16:33:24,224 [main] ERROR o.a.c.core.AprLifecycleListener -[DirectJDKLog.java:180]- An incompatible version [1.2.12] of the APR based Apache Tomcat Native library is installed, while Tomcat requires version [1.2.14]
+2020-04-17 16:33:24,240 [localhost-startStop-1] ERROR o.a.c.core.AprLifecycleListener -[DirectJDKLog.java:180]- An incompatible version [1.2.12] of the APR based Apache Tomcat Native library is installed, while Tomcat requires version [1.2.14]
+2020-04-17 16:34:25,231 [http-nio-8089-exec-1] ERROR o.a.c.core.AprLifecycleListener -[DirectJDKLog.java:180]- An incompatible version [1.2.12] of the APR based Apache Tomcat Native library is installed, while Tomcat requires version [1.2.14]
+2020-04-17 16:34:25,432 [http-nio-8089-exec-4] ERROR o.a.c.core.AprLifecycleListener -[DirectJDKLog.java:180]- An incompatible version [1.2.12] of the APR based Apache Tomcat Native library is installed, while Tomcat requires version [1.2.14]
+2020-04-17 16:34:38,761 [http-nio-8089-exec-3] ERROR o.a.c.core.AprLifecycleListener -[DirectJDKLog.java:180]- An incompatible version [1.2.12] of the APR based Apache Tomcat Native library is installed, while Tomcat requires version [1.2.14]
+2020-04-17 16:34:38,764 [http-nio-8089-exec-5] ERROR o.a.c.core.AprLifecycleListener -[DirectJDKLog.java:180]- An incompatible version [1.2.12] of the APR based Apache Tomcat Native library is installed, while Tomcat requires version [1.2.14]
+2020-04-17 16:34:38,765 [http-nio-8089-exec-6] ERROR o.a.c.core.AprLifecycleListener -[DirectJDKLog.java:180]- An incompatible version [1.2.12] of the APR based Apache Tomcat Native library is installed, while Tomcat requires version [1.2.14]
+2020-04-17 16:34:38,766 [http-nio-8089-exec-4] ERROR o.a.c.core.AprLifecycleListener -[DirectJDKLog.java:180]- An incompatible version [1.2.12] of the APR based Apache Tomcat Native library is installed, while Tomcat requires version [1.2.14]
+2020-04-17 16:44:54,814 [main] ERROR o.a.c.core.AprLifecycleListener -[DirectJDKLog.java:180]- An incompatible version [1.2.12] of the APR based Apache Tomcat Native library is installed, while Tomcat requires version [1.2.14]
+2020-04-17 16:44:54,939 [main] ERROR o.a.c.core.AprLifecycleListener -[DirectJDKLog.java:180]- An incompatible version [1.2.12] of the APR based Apache Tomcat Native library is installed, while Tomcat requires version [1.2.14]
+2020-04-17 16:44:54,970 [localhost-startStop-1] ERROR o.a.c.core.AprLifecycleListener -[DirectJDKLog.java:180]- An incompatible version [1.2.12] of the APR based Apache Tomcat Native library is installed, while Tomcat requires version [1.2.14]
+2020-04-17 16:45:57,486 [http-nio-8089-exec-1] ERROR o.a.c.core.AprLifecycleListener -[DirectJDKLog.java:180]- An incompatible version [1.2.12] of the APR based Apache Tomcat Native library is installed, while Tomcat requires version [1.2.14]
+2020-04-17 16:45:57,677 [http-nio-8089-exec-4] ERROR o.a.c.core.AprLifecycleListener -[DirectJDKLog.java:180]- An incompatible version [1.2.12] of the APR based Apache Tomcat Native library is installed, while Tomcat requires version [1.2.14]