From 140d07cdf8af1acffadb5a688093b0143bc5ef8e Mon Sep 17 00:00:00 2001 From: huangfeng Date: Thu, 4 Jul 2024 11:55:38 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20=E5=A2=9E=E5=8A=A0=E5=8F=91=E6=B6=88?= =?UTF-8?q?=E6=81=AF=E6=B5=8B=E8=AF=95=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/TestController.java | 56 +++++-------------- 1 file changed, 14 insertions(+), 42 deletions(-) diff --git a/xymanager_admin/src/main/java/com/shxy/xymanager_admin/controller/TestController.java b/xymanager_admin/src/main/java/com/shxy/xymanager_admin/controller/TestController.java index a52ecf2..a2a7883 100644 --- a/xymanager_admin/src/main/java/com/shxy/xymanager_admin/controller/TestController.java +++ b/xymanager_admin/src/main/java/com/shxy/xymanager_admin/controller/TestController.java @@ -1,57 +1,29 @@ package com.shxy.xymanager_admin.controller; -import com.shxy.xymanager_common.annotation.Log; + +import com.shxy.xymanager_common.base.BaseController; +import com.shxy.xymanager_framework.socket.WebSocketServer; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; -import io.swagger.annotations.ApiResponse; -import io.swagger.annotations.ApiResponses; import lombok.extern.slf4j.Slf4j; -import org.springframework.stereotype.Controller; import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; +import javax.annotation.Resource; -@Api(value = "测试接口", tags = "测试接口tags") -@Controller +@RestController +@Api(tags = {"测试接口"}) +@RequestMapping("test") @Slf4j -public class TestController { +public class TestController extends BaseController { - @ApiOperation(value = "测试", notes = "测试notes", httpMethod = "POST") - @ApiResponses({@ApiResponse(code = 200, message = "请求成功"), @ApiResponse(code = 400, message = "请求参数没填好"), @ApiResponse(code = 404, message = "请求路径没有或页面跳转路径不对")}) - @RequestMapping("/user/login") - @Log(title = "测试", type = "查询") - public String gettest() { - log.info("有一个沙雕点了链接"); - return "/api/index2"; - } + @Resource + WebSocketServer webSocketServer; - @GetMapping("/user/logins") - @Log(title = "测试", type = "查询") - public String hhtest() { - log.info("有一个沙雕点了链接"); - return "/api/index2.html"; + @GetMapping("sendMsg") + @ApiOperation("发送消息") + public void sendMsg(String msg) { + webSocketServer.sendMessage(msg); } - -// @ApiOperation(value = "登录", notes = "登录", httpMethod = "POST") -//// @ApiResponses({@ApiResponse(code = 200, message = "请求成功"), @ApiResponse(code = 400, message = "请求参数没填好"), @ApiResponse(code = 404, message = "请求路径没有或页面跳转路径不对")}) -// @RequestMapping("/login") -// @Log(title = "登录", type = "查询") -// public String login(String username, String password) { -// //获取主题对象 -// Subject subject = SecurityUtils.getSubject(); -// try { -// subject.login(new UsernamePasswordToken(username,password)); -// System.out.println("登录成功！！！"); -// return "登录成功"; -// } catch (UnknownAccountException e) { -// e.printStackTrace(); -// System.out.println("用户错误！！！"); -// } catch (IncorrectCredentialsException e) { -// System.out.println("密码错误！！！"); -// } -// return "登录失败"; -// } - }