Merge branch 'main' of https://github.com/UncleChair/GoFrameBootcamp

UncleChair · Aug 8, 2024 · 80ecf3e · 80ecf3e
2 parents 1d1bb1d + 9a9a1fe
commit 80ecf3e
Show file tree

Hide file tree

Showing 5 changed files with 33 additions and 37 deletions.
diff --git a/content/web-server/initial/database.md b/content/web-server/initial/database.md
@@ -4,6 +4,22 @@ type: docs
 weight: 1
 ---
 
+With GoFrame CLI tools, we could create a new project quickly and then configure the compose file for docker.
+
+## Create project
+
+Use the following command to create your project:
+
+```bash
+gf init bootcamp -u
+```
+
+Or change the `bootcamp` to whatever you want for your project name.
+
+{{< callout type="info" >}}
+GoFrame project have its own folder structure, we may talk about some methodology later.
+{{< /callout >}}
+
 Create a `database` folder in `manifest` folder, you can store you database related code or settings here.
 
 ## Setup

diff --git a/content/web-server/initial/database.zh-cn.md b/content/web-server/initial/database.zh-cn.md
@@ -4,6 +4,22 @@ type: docs
 weight: 1
 ---
 
+使用 GoFrame 命令行工具，我们可以快速创建一个新项目。然后我们将为 docker 配置 compose 文件。
+
+## 创建项目
+
+使用以下命令创建你的项目：
+
+```bash
+gf init bootcamp -u
+```
+
+或者将 `bootcamp` 替换为你想创建的项目名称。
+
+{{< callout type="info" >}}
+GoFrame 项目拥有自己的工程结构，稍后我们会讨论一些有关的方法论。
+{{< /callout >}}
+
 在 `manifest` 文件夹下创建一个 `database` 文件夹，你可以在这里存储和数据库相关代码或设置。
 
 ## 设置

diff --git a/content/web-server/initial/project.md b/content/web-server/initial/project.md
@@ -4,31 +4,13 @@ type: docs
 weight: 2
 ---
 
-With GoFrame CLI tools, we could create a new project quickly and then configure the compose file for docker.
-
-## Reminder
-
 {{< callout type="info" >}}
 Remember our database info in the previous part? We will use them here.
 - **Database**: bootcamp
 - **Username**: dbadmin
 - **Password**: Password
 {{< /callout >}}
 
-## Create project
-
-Use the following command to create your project:
-
-```bash
-gf init bootcamp -u
-```
-
-Or change the `bootcamp` to whatever you want for your project name.
-
-{{< callout type="info" >}}
-GoFrame project have its own folder structure, we may talk about some methodology later.
-{{< /callout >}}
-
 ## Configurations
 
 ### CLI tool

diff --git a/content/web-server/initial/project.zh-cn.md b/content/web-server/initial/project.zh-cn.md
@@ -4,31 +4,13 @@ type: docs
 weight: 2
 ---
 
-使用 GoFrame 命令行工具，我们可以快速创建一个新项目。然后我们将为 docker 配置 compose 文件。
-
-## 提示
-
 {{< callout type="info" >}}
 还记得之前的数据库信息吗？我们将在这里使用它们。
 - **数据库**: bootcamp
 - **用户名**: dbadmin
 - **密码**: Password
 {{< /callout >}}
 
-## 创建项目
-
-使用以下命令创建你的项目：
-
-```bash
-gf init bootcamp -u
-```
-
-或者将 `bootcamp` 替换为你想创建的项目名称。
-
-{{< callout type="info" >}}
-GoFrame 项目拥有自己的工程结构，稍后我们会讨论一些有关的方法论。
-{{< /callout >}}
-
 ## 配置
 
 ### 命令行工具

diff --git a/go.mod b/go.mod
@@ -1,4 +1,4 @@
-module github.com/imfing/hextra-starter-template
+module GoFrameBootcamp
 
 go 1.21