From 1b372f738797a4b191c182832408375915117002 Mon Sep 17 00:00:00 2001
From: Lei Xu <leixu@leixu-macpro16>
Date: Tue, 15 Feb 2022 15:22:52 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=AE=8C=E6=95=B4IDE?=
 =?UTF-8?q?=E9=85=8D=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .ide/.gitignore                               |  3 +-
 .ide/.ide.yaml                                | 45 ++++++++++++++++++-
 .../src/main/resources/application-druid.yml  |  2 +-
 .../src/main/resources/application.yml        |  2 +-
 4 files changed, 47 insertions(+), 5 deletions(-)

diff --git a/.ide/.gitignore b/.ide/.gitignore
index e05080462..8243c466b 100644
--- a/.ide/.gitignore
+++ b/.ide/.gitignore
@@ -1 +1,2 @@
-/.temp/
\ No newline at end of file
+/.temp/
+/.data/
\ No newline at end of file
diff --git a/.ide/.ide.yaml b/.ide/.ide.yaml
index 972565cbf..054b12a62 100644
--- a/.ide/.ide.yaml
+++ b/.ide/.ide.yaml
@@ -8,7 +8,8 @@ workspace:
     ports:
       webide: 6800
       ssh: 6822
-      application: 3001
+      ruoyi-ui: 8000
+      ruoyi-admin: 8080
     ide-type: vscode
     volumes:
       git-config: true
@@ -21,13 +22,53 @@ workspace:
         ROOT_PASSWORD: root123
         LOCAL_USER_PASSWORD: root123
       ports:
-        - 3001:3001
+        - 8080:8080
+        - 8000:80
         - 6822:22
         - 6800:3000
       volumes:
         - .:/home/project
       networks:
         - smartide-network
+
+    ruoyi-db:
+      image: registry.cn-hangzhou.aliyuncs.com/boathouse/mysql:5.6
+      command: 
+        - --default-authentication-plugin=mysql_native_password
+      restart: always
+      expose:
+        - 3306
+      ports:
+        - 3306:3306
+      environment:
+        MYSQL_ROOT_PASSWORD: password
+      volumes:
+        - './.ide/.data/mysql-data:/var/lib/mysql'
+      networks:
+        - boathouse-dev-network
+
+    ruoyi-phpmyadmin:
+      image: registry.cn-hangzhou.aliyuncs.com/boathouse/phpmyadmin:5.0.4-apache
+      restart: always
+      expose:
+        - 8090
+      ports:
+        - 8090:80
+      environment:
+        PMA_ARBITRARY: "1"
+      networks:
+        - boathouse-dev-network
+    
+    gruoyi-redis:
+      image: registry.cn-hangzhou.aliyuncs.com/smartide/redis:6.0.6
+      container_name: gva-redis
+      restart: always
+      expose:
+        - 6379
+      ports:
+        - "6379:6379"
+      networks:
+        - gva-dev-network
   networks:
     smartide-network:
       external: true
\ No newline at end of file
diff --git a/ruoyi-admin/src/main/resources/application-druid.yml b/ruoyi-admin/src/main/resources/application-druid.yml
index 1f098e407..02ca03df0 100644
--- a/ruoyi-admin/src/main/resources/application-druid.yml
+++ b/ruoyi-admin/src/main/resources/application-druid.yml
@@ -6,7 +6,7 @@ spring:
         druid:
             # 主库数据源
             master:
-                url: jdbc:mysql://localhost:3306/ry-vue?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
+                url: jdbc:mysql://ruoyi-db:3306/ry-vue?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
                 username: root
                 password: password
             # 从库数据源
diff --git a/ruoyi-admin/src/main/resources/application.yml b/ruoyi-admin/src/main/resources/application.yml
index ccef2502d..0dc469a2f 100644
--- a/ruoyi-admin/src/main/resources/application.yml
+++ b/ruoyi-admin/src/main/resources/application.yml
@@ -62,7 +62,7 @@ spring:
   # redis 配置
   redis:
     # 地址
-    host: localhost
+    host: gruoyi-redis
     # 端口，默认为6379
     port: 6379
     # 数据库索引