From 43105be63e02a447916c56d1b9707e02f7fa4d62 Mon Sep 17 00:00:00 2001
From: songhuangfeng123 <shf18767906695@163.com>
Date: 星期二, 05 七月 2022 09:10:53 +0800
Subject: [PATCH] Merge branches 'genchuang' and 'master' of https://sinanoaq.cn:8888/r/safePlatform-out into genchuang
---
safePlatfrom-out-web/src/main/java/com/gkhy/safePlatform/accountController/MenuController.java | 10 ++++------
1 files changed, 4 insertions(+), 6 deletions(-)
diff --git a/safePlatfrom-out-web/src/main/java/com/gkhy/safePlatform/accountController/MenuController.java b/safePlatfrom-out-web/src/main/java/com/gkhy/safePlatform/accountController/MenuController.java
index ccc7f7d..07fc726 100644
--- a/safePlatfrom-out-web/src/main/java/com/gkhy/safePlatform/accountController/MenuController.java
+++ b/safePlatfrom-out-web/src/main/java/com/gkhy/safePlatform/accountController/MenuController.java
@@ -1,6 +1,6 @@
package com.gkhy.safePlatform.accountController;
-import com.gkhy.safePlatform.account.rpc.apimodel.UserAccountService;
+import com.gkhy.safePlatform.account.rpc.apimodel.AccountMenuService;
import com.gkhy.safePlatform.account.rpc.apimodel.model.req.MenuAddRPCReqDTO;
import com.gkhy.safePlatform.account.rpc.apimodel.model.resp.MenuModRPCReqDTO;
import com.gkhy.safePlatform.commons.enums.ResultCodes;
@@ -18,7 +18,7 @@
public class MenuController {
@DubboReference(check = false)
- private UserAccountService userAccountService;
+ private AccountMenuService accountMenuService;
/**
@@ -27,8 +27,7 @@
@RequestMapping(value = "/add",method = RequestMethod.POST)
public ResultVO<String> addMenu(Principal principal, @RequestBody MenuAddRPCReqDTO menuAddDto) {
String userId = principal.getName();
- userAccountService.addMenu(Long.valueOf(userId), menuAddDto);
- return new ResultVO<>(ResultCodes.OK);
+ return accountMenuService.addMenu(Long.valueOf(userId), menuAddDto);
}
@@ -38,8 +37,7 @@
@RequestMapping(value = "/mod",method = RequestMethod.POST)
public ResultVO<String> addMenu(Principal principal, @RequestBody MenuModRPCReqDTO menuModDto) {
String userId = principal.getName();
- userAccountService.modMenu(Long.valueOf(userId), menuModDto);
- return new ResultVO<>(ResultCodes.OK);
+ return accountMenuService.modMenu(Long.valueOf(userId), menuModDto);
}
}
--
Gitblit v1.9.2