Merge branch 'develop' of http://192.168.11.14:51037/gitadmin/tuoheng_freeway into develop

tuoheng-service/tuoheng-admin/src/main/java/com/tuoheng/admin/controller/RoleController.java

@@ -81,8 +81,8 @@ public class RoleController {
      * @param query
      * @return
      */
-    @PostMapping("/getMenuList")
-    public JsonResult getMenuList(@RequestBody RoleClientQuery query) {
+    @GetMapping("/getMenuList")
+    public JsonResult getMenuList(RoleClientQuery query) {
         return roleService.getMenuList(query);
     }
 

tuoheng-service/tuoheng-miniprogram/src/main/java/com/tuoheng/miniprogram/utils/CurrentUserUtil.java

@@ -2,6 +2,7 @@ package com.tuoheng.miniprogram.utils;
 
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.tuoheng.common.core.exception.ServiceException;
+import com.tuoheng.common.core.utils.SecurityUserUtils;
 import com.tuoheng.miniprogram.dao.TenantMapper;
 import com.tuoheng.miniprogram.dao.UserMapper;
 import com.tuoheng.miniprogram.entity.Tenant;
@@ -46,8 +47,7 @@ public class CurrentUserUtil {
      * @return
      */
     public static User getUserInfo() {
-//        String username = SecurityUserUtils.username();
-        String username = "admin";
+        String username = SecurityUserUtils.username();
         User user = currentUserUtil.userMapper.selectOne(Wrappers.<User>lambdaQuery().eq(User::getMark, 1).eq(User::getStatus, 1).eq(User::getUsername, username));
         if (null == user) {
             Tenant tenant = currentUserUtil.tenantMapper.selectOne(Wrappers.<Tenant>lambdaQuery().eq(Tenant::getMark, 1).eq(Tenant::getStatus, 1).eq(Tenant::getUsername, username));