From 6c17e1f3da486ffd16b7237d9bc35a9bcbef5348 Mon Sep 17 00:00:00 2001
From: chenlu <1320612696@qq.com>
Date: 星期五, 29 三月 2024 16:35:41 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10101/r/ERP_override
---
north-glass-erp/src/main/java/com/example/erp/controller/userInfo/SysMenuController.java | 7 ++++---
1 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/north-glass-erp/src/main/java/com/example/erp/controller/userInfo/SysMenuController.java b/north-glass-erp/src/main/java/com/example/erp/controller/userInfo/SysMenuController.java
index c4f7e29..a2ac667 100644
--- a/north-glass-erp/src/main/java/com/example/erp/controller/userInfo/SysMenuController.java
+++ b/north-glass-erp/src/main/java/com/example/erp/controller/userInfo/SysMenuController.java
@@ -6,6 +6,7 @@
import com.example.erp.tools.netty.MyChannelHandlerPool;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PathVariable;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
@@ -18,12 +19,12 @@
private CacheUtil cacheUtil;
@Autowired
private SysMenuService sysMenuService;
- @GetMapping
- public Result getMenu(){
+ @GetMapping("/getMenu/{lang}")
+ public Result getMenu(@PathVariable String lang){
MyChannelHandlerPool myChannelHandlerPool = new MyChannelHandlerPool();
//myChannelHandlerPool.sendMsg("123");
//MyChannelHandlerPool.channelGroup.writeAndFlush( new TextWebSocketFrame("123123"));
- return Result.seccess(sysMenuService.getMenu());
+ return Result.seccess(sysMenuService.getMenu(lang));
}
}
--
Gitblit v1.8.0