From 6963c7758cf65270631fbc179963dbb417ec91e4 Mon Sep 17 00:00:00 2001
From: Lei Xu <leixu@leixu-macpro16>
Date: Thu, 17 Feb 2022 14:28:59 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BD=BF=E7=94=A8jetbrains=20projector?=
 =?UTF-8?q?=E4=BD=9C=E4=B8=BA=E9=BB=98=E8=AE=A4ide?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .ide/.ide.yaml                          | 8 +++++---
 .ide/{idea.ide.yaml => vscode.ide.yaml} | 8 +++-----
 2 files changed, 8 insertions(+), 8 deletions(-)
 rename .ide/{idea.ide.yaml => vscode.ide.yaml} (89%)

diff --git a/.ide/.ide.yaml b/.ide/.ide.yaml
index ebbe7ae5e..d5018b569 100644
--- a/.ide/.ide.yaml
+++ b/.ide/.ide.yaml
@@ -10,13 +10,13 @@ workspace:
       ssh: 6822
       ruoyi-ui: 8000
       ruoyi-admin: 8080
-    ide-type: vscode
+    ide-type: jb-projector
     volumes:
       git-config: true
       ssh-key: true
   services:
     ruoyi-dev:
-      image: registry.cn-hangzhou.aliyuncs.com/smartide/smartide-java-v2-vscode:2070
+      image: registry.cn-hangzhou.aliyuncs.com/smartide/smartide-java-v2-jetbrains-idea:2021.2.3-openjdk-11-jdk-2081
       restart: always
       environment:
         ROOT_PASSWORD: root123
@@ -25,7 +25,7 @@ workspace:
         - 8080:8080
         - 8000:80
         - 6822:22
-        - 6800:3000
+        - 6800:8887
       volumes:
         - .:/home/project
         - $HOME/.m2/repository:/home/smartide/.m2/repository
@@ -36,6 +36,8 @@ workspace:
       image: registry.cn-hangzhou.aliyuncs.com/smartide/mysql:8.0.21
       command: 
         - --default-authentication-plugin=mysql_native_password
+        - --character-set-server=utf8mb4
+        - --collation-server=utf8mb4_unicode_ci
       restart: always
       expose:
         - 3306
diff --git a/.ide/idea.ide.yaml b/.ide/vscode.ide.yaml
similarity index 89%
rename from .ide/idea.ide.yaml
rename to .ide/vscode.ide.yaml
index d5018b569..ebbe7ae5e 100644
--- a/.ide/idea.ide.yaml
+++ b/.ide/vscode.ide.yaml
@@ -10,13 +10,13 @@ workspace:
       ssh: 6822
       ruoyi-ui: 8000
       ruoyi-admin: 8080
-    ide-type: jb-projector
+    ide-type: vscode
     volumes:
       git-config: true
       ssh-key: true
   services:
     ruoyi-dev:
-      image: registry.cn-hangzhou.aliyuncs.com/smartide/smartide-java-v2-jetbrains-idea:2021.2.3-openjdk-11-jdk-2081
+      image: registry.cn-hangzhou.aliyuncs.com/smartide/smartide-java-v2-vscode:2070
       restart: always
       environment:
         ROOT_PASSWORD: root123
@@ -25,7 +25,7 @@ workspace:
         - 8080:8080
         - 8000:80
         - 6822:22
-        - 6800:8887
+        - 6800:3000
       volumes:
         - .:/home/project
         - $HOME/.m2/repository:/home/smartide/.m2/repository
@@ -36,8 +36,6 @@ workspace:
       image: registry.cn-hangzhou.aliyuncs.com/smartide/mysql:8.0.21
       command: 
         - --default-authentication-plugin=mysql_native_password
-        - --character-set-server=utf8mb4
-        - --collation-server=utf8mb4_unicode_ci
       restart: always
       expose:
         - 3306