Merge branch 'master' into docker_package

2022-07-18 14:29:52 +08:00 · 2022-07-18 14:29:52 +08:00 · c2b0982710
parent 175d51aebe 7cfe1ce192
commit c2b0982710
5 changed files with 1 additions and 1 deletions
--- a/renren-admin/src/main/java/io/renren/modules/security/user/SecurityUser.java
+++ b/renren-admin/src/main/java/io/renren/modules/security/user/SecurityUser.java
@ -25,7 +25,7 @@ public class SecurityUser {
     */
    public static UserDetail getUser() {

-        logger.info("当前调用的方法为————————————————————————————" + getMyGrandpaStackTrace());
+        logger.debug("当前调用的方法为————————————————————————————" + getMyGrandpaStackTrace());

        Subject subject = getSubject();
        if (subject == null) {
--- a/renren-admin/src/main/resources/db/R__init_sys_dic.sql
+++ b/renren-admin/src/main/resources/db/R__init_sys_dic.sql
--- a/renren-admin/src/main/resources/db/R__init_sys_user.sql
+++ b/renren-admin/src/main/resources/db/R__init_sys_user.sql
--- a/renren-admin/src/main/resources/db/R__init_tb_data_catagory.sql
+++ b/renren-admin/src/main/resources/db/R__init_tb_data_catagory.sql
--- a/renren-admin/src/main/resources/db/R__notice_update.sql
+++ b/renren-admin/src/main/resources/db/R__notice_update.sql