钉钉第三方企业应用登录

ruoyi-admin/src/main/java/com/ruoyi/web/controller/dingding/service/DingAuthServiceInfo.java

@@ -1,6 +1,7 @@
 package com.ruoyi.web.controller.dingding.service;
 
 import com.alibaba.fastjson.JSONObject;
+import com.aliyun.dingtalkcontact_1_0.models.GetUserResponseBody;
 import com.dingtalk.api.response.OapiV2UserGetResponse;
 import com.ruoyi.common.core.domain.entity.SysUser;
 
@@ -30,7 +31,7 @@ public interface DingAuthServiceInfo {
 
     SysUser addUserAndOrg(OapiV2UserGetResponse response);
 
-    SysUser addUserAndOrg2(OapiV2UserGetResponse response,String corpId);
+    SysUser addUserAndOrg2(GetUserResponseBody response, String corpId);
 
     String decryptText(String signature, String timestamp, String nonce, String encryptMsg);
 

ruoyi-admin/src/main/java/com/ruoyi/web/controller/dingding/service/DingAuthServiceInfoImpl.java

@@ -2,6 +2,7 @@ package com.ruoyi.web.controller.dingding.service;
 
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
+import com.aliyun.dingtalkcontact_1_0.models.GetUserResponseBody;
 import com.dingtalk.api.response.OapiV2UserGetResponse;
 import com.dingtalk.oapi.lib.aes.DingTalkEncryptException;
 import com.dingtalk.oapi.lib.aes.DingTalkEncryptor;
@@ -122,12 +123,12 @@ public class DingAuthServiceInfoImpl implements DingAuthServiceInfo {
     }
 
     @Override
-    public SysUser addUserAndOrg2(OapiV2UserGetResponse response,String corpId) {
+    public SysUser addUserAndOrg2(GetUserResponseBody response, String corpId) {
         SysUser newUser = new SysUser();
-        newUser.setUserName(response.getResult().getUserid());
-        newUser.setAvatar(response.getResult().getAvatar());
-        newUser.setNickName(response.getResult().getName());
-        newUser.setEmail(response.getResult().getEmail());
+        newUser.setUserName(response.getMobile());
+        newUser.setAvatar(response.getAvatarUrl());
+        newUser.setNickName(response.getNick());
+        newUser.setEmail(response.getEmail());
         newUser.setCreateBy("admin");
         newUser.setPassword(SecurityUtils.encryptPassword("admin123"));
         //角色自动赋值为简历管理角色

ruoyi-admin/src/main/java/com/ruoyi/web/controller/dingding/service/DingThirdTokenService.java

@@ -1,5 +1,7 @@
 package com.ruoyi.web.controller.dingding.service;
 
+import com.aliyun.dingtalkcontact_1_0.models.GetUserHeaders;
+import com.aliyun.dingtalkcontact_1_0.models.GetUserResponse;
 import com.aliyun.dingtalkoauth2_1_0.Client;
 import com.aliyun.dingtalkoauth2_1_0.models.*;
 import com.aliyun.tea.TeaException;
@@ -7,10 +9,8 @@ import com.aliyun.teaopenapi.models.Config;
 import com.aliyun.teautil.models.RuntimeOptions;
 import com.dingtalk.api.DefaultDingTalkClient;
 import com.dingtalk.api.DingTalkClient;
-import com.dingtalk.api.request.OapiV2UserGetRequest;
-import com.dingtalk.api.request.OapiV2UserGetuserinfoRequest;
-import com.dingtalk.api.response.OapiV2UserGetResponse;
-import com.dingtalk.api.response.OapiV2UserGetuserinfoResponse;
+import com.dingtalk.api.request.*;
+import com.dingtalk.api.response.*;
 import com.ruoyi.common.constant.Constants;
 import com.ruoyi.common.core.redis.RedisCache;
 import com.ruoyi.common.utils.dingding.config.DingAppConfig;
@@ -37,7 +37,7 @@ public class DingThirdTokenService {
     @Resource
     private RedisCache redisCache;
 
-    public static Client createClient() throws Exception {
+    public static Client createClient2_1_0() throws Exception {
         Config config = new Config();
         config.protocol = "https";
         config.regionId = "central";
@@ -47,7 +47,7 @@ public class DingThirdTokenService {
     public GetUserTokenResponse getUserAccessToken(String code) {
         GetUserTokenResponse userToken = null;
         try {
-            Client client = this.createClient();
+            Client client = this.createClient2_1_0();
             GetUserTokenRequest request = new GetUserTokenRequest()
                     .setClientSecret(dingAppConfig.getAppSecret())
                     .setClientId(dingAppConfig.getAppKey())
@@ -82,7 +82,7 @@ public class DingThirdTokenService {
             return corpAccessToken;
         }
         try {
-            com.aliyun.dingtalkoauth2_1_0.Client client = this.createClient();
+            com.aliyun.dingtalkoauth2_1_0.Client client = this.createClient2_1_0();
             String suiteTicket = redisCache.getCacheObject(redisKeyPrefix + Constants.DAILY_DING_SUITE_TICKET);
             log.info("从Redis缓存中获取到的第三方企业{},suiteTicket = {}", corpId, suiteTicket);
             com.aliyun.dingtalkoauth2_1_0.models.GetCorpAccessTokenRequest getCorpAccessTokenRequest = new com.aliyun.dingtalkoauth2_1_0.models.GetCorpAccessTokenRequest()
@@ -112,7 +112,56 @@ public class DingThirdTokenService {
         return corpAccessToken;
     }
 
-    public OapiV2UserGetuserinfoResponse getUserUnfo(String code,String access_token) {
+    public Object q() {
+        DefaultDingTalkClient client = new DefaultDingTalkClient("https://oapi.dingtalk.com/service/get_corp_token");
+        OapiServiceGetCorpTokenRequest req = new OapiServiceGetCorpTokenRequest();
+        req.setAuthCorpid("dingc365fcxxxx");
+        try {
+            OapiServiceGetCorpTokenResponse execute = client.execute(req, dingAppConfig.getAppKey(), dingAppConfig.getAppSecret(), "suiteTicket");
+        } catch (ApiException e) {
+            throw new RuntimeException(e);
+        }
+        return null;
+    }
+
+    //服务商获取第三方应用授权企业的access_token
+    public String getThirdCorpAccessToken(String corpId) {
+        String redisKeyPrefix = Constants.DAILY_DING_AUTH + corpId + ":";
+        // 从持久化存储中读取
+        String corpAccessToken = redisCache.getCacheObject(redisKeyPrefix + Constants.DAILY_DING_CORP_ACCESS_TOKEN);
+        log.info("从Redis缓存中获取到的第三方企业{},corpAccessToken = {}", corpAccessToken);
+        if (corpAccessToken != null) {
+            return corpAccessToken;
+        }
+        try {
+            String suiteTicket = redisCache.getCacheObject(redisKeyPrefix + Constants.DAILY_DING_SUITE_TICKET);
+            log.info("从Redis缓存中获取到的第三方企业{},suiteTicket = {}", corpId, suiteTicket);
+            DefaultDingTalkClient client = new DefaultDingTalkClient("https://oapi.dingtalk.com/service/get_corp_token");
+            OapiServiceGetCorpTokenRequest req = new OapiServiceGetCorpTokenRequest();
+            req.setAuthCorpid(corpId);
+            OapiServiceGetCorpTokenResponse execute = client.execute(req, dingAppConfig.getAppKey(), dingAppConfig.getAppSecret(), suiteTicket);
+            corpAccessToken = execute.getAccessToken();
+            Long expireIn = execute.getExpiresIn();
+            log.info("从Redis缓存中获取到的第三方企业{},corpAccessToken = {}", execute.getAccessToken());
+            redisCache.setCacheObject(Constants.DAILY_DING_CORP_ACCESS_TOKEN, corpAccessToken, expireIn.intValue(), TimeUnit.MINUTES);
+        } catch (TeaException err) {
+            if (!com.aliyun.teautil.Common.empty(err.code) && !com.aliyun.teautil.Common.empty(err.message)) {
+                // err 中含有 code 和 message 属性，可帮助开发定位问题
+                log.error("getAccessToken failed", err.message);
+            }
+            return corpAccessToken;
+        } catch (Exception _err) {
+            TeaException err = new TeaException(_err.getMessage(), _err);
+            if (!com.aliyun.teautil.Common.empty(err.code) && !com.aliyun.teautil.Common.empty(err.message)) {
+                // err 中含有 code 和 message 属性，可帮助开发定位问题
+                log.error("getAccessToken failed", err.message);
+            }
+            return corpAccessToken;
+        }
+        return corpAccessToken;
+    }
+
+    public OapiV2UserGetuserinfoResponse getUserUnfo(String code, String access_token) {
         DingTalkClient client = new DefaultDingTalkClient("https://oapi.dingtalk.com/topapi/v2/user/getuserinfo");
         OapiV2UserGetuserinfoRequest req = new OapiV2UserGetuserinfoRequest();
         req.setCode(code);
@@ -124,6 +173,7 @@ public class DingThirdTokenService {
         }
         return rsp;
     }
+
     public OapiV2UserGetResponse getAuthUser(String accessToken, String userId) {
         DingTalkClient client = new DefaultDingTalkClient(DingUrlConstant.URL_USER_GET_V2);
         OapiV2UserGetResponse response;
@@ -138,11 +188,12 @@ public class DingThirdTokenService {
         }
         return response;
     }
+
     //获取应用管理后台免登的用户信息
     public Object getSsoUserInfo(String xAcsDingtalkAccessToken, String code) {
         GetSsoUserInfoResponse ssoUserInfoWithOptions = null;
         try {
-            com.aliyun.dingtalkoauth2_1_0.Client client = this.createClient();
+            com.aliyun.dingtalkoauth2_1_0.Client client = this.createClient2_1_0();
             GetSsoUserInfoHeaders getSsoUserInfoHeaders = new GetSsoUserInfoHeaders();
             getSsoUserInfoHeaders.xAcsDingtalkAccessToken = xAcsDingtalkAccessToken;
             GetSsoUserInfoRequest getSsoUserInfoRequest = new GetSsoUserInfoRequest()
@@ -161,4 +212,132 @@ public class DingThirdTokenService {
         return ssoUserInfoWithOptions;
     }
 
+    public com.aliyun.dingtalkcontact_1_0.Client createClient_1_0() throws Exception {
+        Config config = new Config();
+        config.protocol = "https";
+        config.regionId = "central";
+        return new com.aliyun.dingtalkcontact_1_0.Client(config);
+    }
+
+    /**
+     * @description: 获取用户通讯录个人信息
+     * @param: accessToken
+     * @param: unionId
+     * @return: java.lang.Object
+     * nick 用户的钉钉昵称。
+     * avatarUrl头像URL。
+     * mobile用户的手机号。
+     * openId用户的openId。
+     * unionId用户的unionId。
+     * email用户的个人邮箱。
+     * stateCode手机号对应的国家号。
+     */
+    public GetUserResponse getAddressBookUserInfo(String accessToken, String unionId) {
+        GetUserResponse response = null;
+        try {
+            com.aliyun.dingtalkcontact_1_0.Client client = this.createClient_1_0();
+            GetUserHeaders getUserHeaders = new GetUserHeaders();
+            getUserHeaders.xAcsDingtalkAccessToken = accessToken;
+            response = client.getUserWithOptions(unionId, getUserHeaders, new RuntimeOptions());
+        } catch (TeaException err) {
+            if (!com.aliyun.teautil.Common.empty(err.code) && !com.aliyun.teautil.Common.empty(err.message)) {
+                // err 中含有 code 和 message 属性，可帮助开发定位问题
+            }
+        } catch (Exception _err) {
+            TeaException err = new TeaException(_err.getMessage(), _err);
+            if (!com.aliyun.teautil.Common.empty(err.code) && !com.aliyun.teautil.Common.empty(err.message)) {
+                // err 中含有 code 和 message 属性，可帮助开发定位问题
+            }
+        }
+        return response;
+    }
+
+
+    //获取第三方企业应用的suite_access_token
+    public OapiServiceGetSuiteTokenResponse getSuiteToken(String corpId) {
+        OapiServiceGetSuiteTokenResponse rsp = null;
+        String redisKeyPrefix = Constants.DAILY_DING_AUTH + corpId + ":";
+        // 从持久化存储中读取
+        String corpAccessToken = redisCache.getCacheObject(redisKeyPrefix + Constants.DAILY_DING_CORP_ACCESS_TOKEN);
+        log.info("从Redis缓存中获取到的第三方企业{},corpAccessToken = {}", corpAccessToken);
+        try {
+            String suiteTicket = redisCache.getCacheObject(redisKeyPrefix + Constants.DAILY_DING_SUITE_TICKET);
+            log.info("从Redis缓存中获取到的第三方企业{},suiteTicket = {}", corpId, suiteTicket);
+            DingTalkClient client = new DefaultDingTalkClient("https://oapi.dingtalk.com/service/get_suite_token");
+            OapiServiceGetSuiteTokenRequest req = new OapiServiceGetSuiteTokenRequest();
+            req.setSuiteKey(dingAppConfig.getAppKey());
+            req.setSuiteSecret(dingAppConfig.getAppSecret());
+            req.setSuiteTicket(suiteTicket);
+            rsp = client.execute(req);
+            redisCache.setCacheObject(Constants.DAILY_DING_CORP_ACCESS_TOKEN, rsp.getSuiteAccessToken(), rsp.getExpiresIn().intValue(), TimeUnit.MINUTES);
+        } catch (TeaException err) {
+            if (!com.aliyun.teautil.Common.empty(err.code) && !com.aliyun.teautil.Common.empty(err.message)) {
+                // err 中含有 code 和 message 属性，可帮助开发定位问题
+                log.error("getAccessToken failed", err.message);
+            }
+        } catch (Exception _err) {
+            TeaException err = new TeaException(_err.getMessage(), _err);
+            if (!com.aliyun.teautil.Common.empty(err.code) && !com.aliyun.teautil.Common.empty(err.message)) {
+                // err 中含有 code 和 message 属性，可帮助开发定位问题
+                log.error("getAccessToken failed", err.message);
+            }
+        }
+        return rsp;
+    }
+
+    //获取企业授权信息
+    public Object getAuthInfoRequest(String corpId) {
+        OapiServiceGetAuthInfoResponse rsp = null;
+        String redisKeyPrefix = Constants.DAILY_DING_AUTH + corpId + ":";
+        // 从持久化存储中读取
+        String corpAccessToken = redisCache.getCacheObject(redisKeyPrefix + Constants.DAILY_DING_CORP_ACCESS_TOKEN);
+        log.info("从Redis缓存中获取到的第三方企业{},corpAccessToken = {}", corpAccessToken);
+        try {
+            String suiteTicket = redisCache.getCacheObject(redisKeyPrefix + Constants.DAILY_DING_SUITE_TICKET);
+            log.info("从Redis缓存中获取到的第三方企业{},suiteTicket = {}", corpId, suiteTicket);
+            DingTalkClient client = new DefaultDingTalkClient("https://oapi.dingtalk.com/service/get_auth_info");
+            OapiServiceGetAuthInfoRequest req = new OapiServiceGetAuthInfoRequest();
+            req.setSuiteKey(suiteTicket);
+            req.setAuthCorpid(corpId);
+            // 第三方企业应用的填写应用SuiteKey和SuiteSecret。
+            // 定制应用填写应用的CustomKey和CustomSecret。
+            rsp = client.execute(req, dingAppConfig.getAppKey(), dingAppConfig.getAppSecret(), suiteTicket);
+        } catch (TeaException err) {
+            if (!com.aliyun.teautil.Common.empty(err.code) && !com.aliyun.teautil.Common.empty(err.message)) {
+                // err 中含有 code 和 message 属性，可帮助开发定位问题
+                log.error("getAccessToken failed", err.message);
+            }
+        } catch (Exception _err) {
+            TeaException err = new TeaException(_err.getMessage(), _err);
+            if (!com.aliyun.teautil.Common.empty(err.code) && !com.aliyun.teautil.Common.empty(err.message)) {
+                // err 中含有 code 和 message 属性，可帮助开发定位问题
+                log.error("getAccessToken failed", err.message);
+            }
+        }
+        return rsp;
+    }
+//
+//    public OapiServiceGetUnactiveCorpResponse getUnactiveCorpResponseetUnactiveCorpResponse(Long appId,String suiteAccessToken) {
+//        OapiServiceGetUnactiveCorpResponse rsp = null;
+//        try {
+//            DingTalkClient client = new DefaultDingTalkClient(
+//                    "https://oapi.dingtalk.com/service/get_unactive_corp?suite_access_token="+suiteAccessToken+"");
+//            OapiServiceGetUnactiveCorpRequest req = new OapiServiceGetUnactiveCorpRequest();
+//            req.setAppId(appId);
+//            rsp = client.execute(req);
+//        } catch (TeaException err) {
+//            if (!com.aliyun.teautil.Common.empty(err.code) && !com.aliyun.teautil.Common.empty(err.message)) {
+//                // err 中含有 code 和 message 属性，可帮助开发定位问题
+//                log.error("getAccessToken failed", err.message);
+//            }
+//        } catch (Exception _err) {
+//            TeaException err = new TeaException(_err.getMessage(), _err);
+//            if (!com.aliyun.teautil.Common.empty(err.code) && !com.aliyun.teautil.Common.empty(err.message)) {
+//                // err 中含有 code 和 message 属性，可帮助开发定位问题
+//                log.error("getAccessToken failed", err.message);
+//            }
+//        }
+//        return rsp;
+//    }
+
 }

ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysLoginController.java

@@ -1,110 +1,114 @@
-package com.ruoyi.web.controller.system;
-
-import java.util.List;
-import java.util.Set;
-import com.ruoyi.system.domain.dhrm.DhrmCompany;
-import com.ruoyi.system.service.dhrm.IDhrmCompanyService;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.*;
-import com.ruoyi.common.constant.Constants;
-import com.ruoyi.common.core.domain.AjaxResult;
-import com.ruoyi.common.core.domain.entity.SysMenu;
-import com.ruoyi.common.core.domain.entity.SysUser;
-import com.ruoyi.common.core.domain.model.LoginBody;
-import com.ruoyi.common.utils.SecurityUtils;
-import com.ruoyi.framework.web.service.SysLoginService;
-import com.ruoyi.framework.web.service.SysPermissionService;
-import com.ruoyi.system.service.ISysMenuService;
-
-/**
- * 登录验证
- * 
- * @author ruoyi
- */
-@RestController
-public class SysLoginController
-{
-    @Autowired
-    private SysLoginService loginService;
-
-    @Autowired
-    private ISysMenuService menuService;
-
-    @Autowired
-    private SysPermissionService permissionService;
-
-    @Autowired
-    private IDhrmCompanyService dhrmCompanyService;
-
-    /**
-     * 登录方法
-     * 
-     * @param loginBody 登录信息
-     * @return 结果
-     */
-    @PostMapping("/login")
-    public AjaxResult login(@RequestBody LoginBody loginBody)
-    {
-        AjaxResult ajax = AjaxResult.success();
-        // 生成令牌
-        String token = loginService.login(loginBody.getUsername(), loginBody.getPassword(), loginBody.getCode(),
-                loginBody.getUuid());
-        ajax.put(Constants.TOKEN, token);
-        return ajax;
-    }
-
-    /**
-     * 单点登录方法
-     *
-     * @param loginBody 登录信息
-     * @return 结果
-     */
-    @PostMapping("/authSingleSignIn")
-    public AjaxResult authSingleSignIn(@RequestBody LoginBody loginBody)
-    {
-        AjaxResult ajax = AjaxResult.success();
-        // 生成令牌
-        String token = loginService.authSingleSignIn(loginBody.getUsername());
-        ajax.put(Constants.TOKEN, token);
-        return ajax;
-    }
-
-
-    /**
-     * 获取用户信息
-     * 
-     * @return 用户信息
-     */
-    @GetMapping("getInfo")
-    public AjaxResult getInfo()
-    {
-        SysUser user = SecurityUtils.getLoginUser().getUser();
-        // 角色集合
-        Set<String> roles = permissionService.getRolePermission(user);
-        // 权限集合
-        Set<String> permissions = permissionService.getMenuPermission(user);
-        // 所属公司
-        DhrmCompany dhrmCompany = dhrmCompanyService.selectDhrmCompanyByEmployNo(user.getEmployNo());
-        AjaxResult ajax = AjaxResult.success();
-        ajax.put("user", user);
-        ajax.put("roles", roles);
-        ajax.put("permissions", permissions);
-        ajax.put("dhrmCompany",dhrmCompany);
-        return ajax;
-    }
-
-    /**
-     * 获取路由信息
-     * 
-     * @return 路由信息
-     */
-    @GetMapping("getRouters")
-    public AjaxResult getRouters(String systemType)
-    {
-        Long userId = SecurityUtils.getUserId();
-        List<SysMenu> menus = menuService.selectMenuTreeByUserId(userId,systemType);
-        return AjaxResult.success(menuService.buildMenus(menus));
-    }
-
-
-}
+package com.ruoyi.web.controller.system;
+
+import java.util.List;
+import java.util.Set;
+
+import com.ruoyi.common.core.domain.model.LoginUser;
+import com.ruoyi.system.domain.dhrm.DhrmCompany;
+import com.ruoyi.system.service.dhrm.IDhrmCompanyService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+import com.ruoyi.common.constant.Constants;
+import com.ruoyi.common.core.domain.AjaxResult;
+import com.ruoyi.common.core.domain.entity.SysMenu;
+import com.ruoyi.common.core.domain.entity.SysUser;
+import com.ruoyi.common.core.domain.model.LoginBody;
+import com.ruoyi.common.utils.SecurityUtils;
+import com.ruoyi.framework.web.service.SysLoginService;
+import com.ruoyi.framework.web.service.SysPermissionService;
+import com.ruoyi.system.service.ISysMenuService;
+
+/**
+ * 登录验证
+ * 
+ * @author ruoyi
+ */
+@RestController
+public class SysLoginController
+{
+    @Autowired
+    private SysLoginService loginService;
+
+    @Autowired
+    private ISysMenuService menuService;
+
+    @Autowired
+    private SysPermissionService permissionService;
+
+    @Autowired
+    private IDhrmCompanyService dhrmCompanyService;
+
+    /**
+     * 登录方法
+     * 
+     * @param loginBody 登录信息
+     * @return 结果
+     */
+    @PostMapping("/login")
+    public AjaxResult login(@RequestBody LoginBody loginBody)
+    {
+        AjaxResult ajax = AjaxResult.success();
+        // 生成令牌
+        String token = loginService.login(loginBody.getUsername(), loginBody.getPassword(), loginBody.getCode(),
+                loginBody.getUuid());
+        ajax.put(Constants.TOKEN, token);
+        return ajax;
+    }
+
+    /**
+     * 单点登录方法
+     *
+     * @param loginBody 登录信息
+     * @return 结果
+     */
+    @PostMapping("/authSingleSignIn")
+    public AjaxResult authSingleSignIn(@RequestBody LoginBody loginBody)
+    {
+        AjaxResult ajax = AjaxResult.success();
+        // 生成令牌
+        String token = loginService.authSingleSignIn(loginBody.getUsername());
+        ajax.put(Constants.TOKEN, token);
+        return ajax;
+    }
+
+
+    /**
+     * 获取用户信息
+     * 
+     * @return 用户信息
+     */
+    @GetMapping("getInfo")
+    public AjaxResult getInfo()
+    {
+        SysUser user = SecurityUtils.getLoginUser().getUser();
+        LoginUser loginUser = SecurityUtils.getLoginUser();
+        // 角色集合
+        Set<String> roles = permissionService.getRolePermission(user);
+        // 权限集合
+        Set<String> permissions = permissionService.getMenuPermission(user);
+        // 所属公司
+        DhrmCompany dhrmCompany = dhrmCompanyService.selectDhrmCompanyByEmployNo(user.getEmployNo());
+        AjaxResult ajax = AjaxResult.success();
+        ajax.put("loginUser", loginUser);
+        ajax.put("user", user);
+        ajax.put("roles", roles);
+        ajax.put("permissions", permissions);
+        ajax.put("dhrmCompany",dhrmCompany);
+        return ajax;
+    }
+
+    /**
+     * 获取路由信息
+     * 
+     * @return 路由信息
+     */
+    @GetMapping("getRouters")
+    public AjaxResult getRouters(String systemType)
+    {
+        Long userId = SecurityUtils.getUserId();
+        List<SysMenu> menus = menuService.selectMenuTreeByUserId(userId,systemType);
+        return AjaxResult.success(menuService.buildMenus(menus));
+    }
+
+
+}