mxd 3 年 前
コミット
36da7fd4c9

+ 1 - 1
magic-api/src/main/java/org/ssssssss/magicapi/core/handler/MagicWorkbenchHandler.java

@@ -38,6 +38,7 @@ public class MagicWorkbenchHandler {
 	public void onLogin(MagicConsoleSession session, String token, String clientId) {
 		try {
 			MagicUser user = guest;
+			session.setClientId(clientId);
 			if (!authorizationInterceptor.requireLogin() || (user = authorizationInterceptor.getUserByToken(token)) != null) {
 				String ip = Optional.ofNullable(session.getWebSocketSession().getRemoteAddress()).map(it -> it.getAddress().getHostAddress()).orElse("unknown");
 				HttpHeaders headers = session.getWebSocketSession().getHandshakeHeaders();
@@ -45,7 +46,6 @@ public class MagicWorkbenchHandler {
 				session.setAttribute(Constants.WEBSOCKET_ATTRIBUTE_USER_ID, user.getId());
 				session.setAttribute(Constants.WEBSOCKET_ATTRIBUTE_USER_IP, StringUtils.defaultIfBlank(ip, "unknown"));
 				session.setAttribute(Constants.WEBSOCKET_ATTRIBUTE_USER_NAME, user.getUsername());
-				session.setClientId(clientId);
 				session.setActivateTime(System.currentTimeMillis());
 				synchronized (MagicWorkbenchHandler.class){
 					if(WebSocketSessionManager.getConsoleSession(clientId) != null){

+ 0 - 11
magic-api/src/main/java/org/ssssssss/magicapi/core/web/MagicWorkbenchController.java

@@ -177,17 +177,6 @@ public class MagicWorkbenchController extends MagicController implements MagicEx
 		return new JsonBean<>();
 	}
 
-	@PostMapping("/refresh")
-	@ResponseBody
-	@Valid
-	public JsonBean<Void> refresh() {
-		// 刷新缓存
-		configuration.getMagicResourceService().refresh();
-		// 发送更新通知
-		configuration.getMagicNotifyService().sendNotify(new MagicNotify(configuration.getInstanceId()));
-		return new JsonBean<>();
-	}
-
 	@GetMapping("/plugins")
 	@Valid(requireLogin = false)
 	@ResponseBody