From 91819a2dcd4f9be2d740d96cd3c5c5c8521ca248 Mon Sep 17 00:00:00 2001 From: educoder Date: Mon, 28 Nov 2022 16:35:48 +0800 Subject: [PATCH] up --- .../game/controller/VscodeController.java | 18 ++++++++---------- 1 file changed, 8 insertions(+), 10 deletions(-) diff --git a/web/src/main/java/com/imitate/web/module/game/controller/VscodeController.java b/web/src/main/java/com/imitate/web/module/game/controller/VscodeController.java index bbc1a6a..236b8c3 100644 --- a/web/src/main/java/com/imitate/web/module/game/controller/VscodeController.java +++ b/web/src/main/java/com/imitate/web/module/game/controller/VscodeController.java @@ -48,9 +48,9 @@ import java.util.Map; public class VscodeController extends BasicController { private final Logger logger = LoggerFactory.getLogger(getClass()); - private static final String C_IMAGE_NAME = "gcc-codeserver-ww"; - private static final String JAVA_IMAGE_NAME = "vscode-ww"; - private static final String PYTHON_IMAGE_NAME = "python3d7-codeserver"; + private static final String C_IMAGE_NAME = "W3siaW1hZ2UiOiJnY2MtY29kZXNlcnZlci13dzp2MS4wIiwiY3B1TGltaXQiOjIuMCwiY3B1UmVxdWVzdCI6MC4zLCJtZW1vcnlMaW1pdCI6IjIwNDhNIiwibWVtb3J5UmVxdWVzdCI6IjEwMjRNIiwicmVzb3VyY2VMaW1pdCI6IjEwMDAwSyIsInN0YXJ0VGltZSI6MjAwLCJ0eXBlIjoibWFpbiJ9XQo="; + private static final String JAVA_IMAGE_NAME = "W3siaW1hZ2UiOiJ2c2NvZGUtd3c6djEuMCIsImNwdUxpbWl0IjoyLjAsImNwdVJlcXVlc3QiOjAuMywibWVtb3J5TGltaXQiOiIyMDQ4TSIsIm1lbW9yeVJlcXVlc3QiOiIxMDI0TSIsInJlc291cmNlTGltaXQiOiIxMDAwMEsiLCJzdGFydFRpbWUiOjIwMCwidHlwZSI6Im1haW4ifV0K"; + private static final String PYTHON_IMAGE_NAME = "W3siaW1hZ2UiOiJweXRob24zZDctY29kZXNlcnZlcjp2MS4wIiwiY3B1TGltaXQiOjIuMCwiY3B1UmVxdWVzdCI6MC4zLCJtZW1vcnlMaW1pdCI6IjIwNDhNIiwibWVtb3J5UmVxdWVzdCI6IjEwMjRNIiwicmVzb3VyY2VMaW1pdCI6IjEwMDAwSyIsInN0YXJ0VGltZSI6MjAwLCJ0eXBlIjoibWFpbiJ9XQo="; @Autowired @@ -106,17 +106,15 @@ public class VscodeController extends BasicController { } if ("c".equals(vsCodeParam.getLanguage().toLowerCase(Locale.ROOT))){ - imageName = C_IMAGE_NAME; + vsCodeParam.setContainers(JAVA_IMAGE_NAME); }else if("java".equals(vsCodeParam.getLanguage().toLowerCase(Locale.ROOT))){ - imageName = JAVA_IMAGE_NAME; + vsCodeParam.setContainers(C_IMAGE_NAME); }else if("python".equals(vsCodeParam.getLanguage().toLowerCase(Locale.ROOT))){ - imageName = PYTHON_IMAGE_NAME; + vsCodeParam.setContainers(PYTHON_IMAGE_NAME); } - //根据语言替换镜像名 - mainContainer.put("image",imageName + ":v1.0"); - mainContainer.put("imageName",imageName); - logger.info("mainContainer :{}",mainContainer); + containers = Base64Util.decode(vsCodeParam.getContainers()); + boolean createImage = vsCodeParam.getCreateImage() != null && vsCodeParam.getCreateImage();