From 6e03f4b363a873725c4458b68b651451ffd5f72c Mon Sep 17 00:00:00 2001
From: RockYang <yangjian102621@gmail.com>
Date: Tue, 5 Nov 2024 11:38:32 +0800
Subject: [PATCH] fixed bug for audio and video downloading

---
 CHANGELOG.md                |  3 +++
 api/handler/user_handler.go | 40 ++++++++++++++++++-------------------
 web/src/utils/libs.js       |  3 +++
 web/src/views/MarkMap.vue   |  4 +++-
 web/vue.config.js           |  2 +-
 5 files changed, 30 insertions(+), 22 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index f6720169..b9369673 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,4 +1,7 @@
 # 更新日志
+## v4.1.7
+* Bug修复：手机邮箱相关的注册问题 [#IB0HS5](https://gitee.com/blackfox/geekai/issues/IB0HS5)
+* Bug修复：音乐视频无法下载，思维导图下载后看不清文字[#IB0N2E](https://gitee.com/blackfox/geekai/issues/IB0N2E)
 ## v4.1.6
 * 功能新增：**支持OpenAI实时语音对话功能** :rocket: :rocket: :rocket:, Beta 版，目前没有做算力计费控制，目前只有 VIP 用户可以使用。
 * 功能优化：优化MysQL容器配置文档，解决MysQL容器资源占用过高问题
diff --git a/api/handler/user_handler.go b/api/handler/user_handler.go
index 3b93310b..fd8a8046 100644
--- a/api/handler/user_handler.go
+++ b/api/handler/user_handler.go
@@ -130,29 +130,9 @@ func (h *UserHandler) Register(c *gin.Context) {
 		}
 	}
 
-	// check if the username is existing
-	var item model.User
-	session := h.DB.Session(&gorm.Session{})
-	if data.Mobile != "" {
-		session = session.Where("mobile = ?", data.Mobile)
-		data.Username = data.Mobile
-	} else if data.Email != "" {
-		session = session.Where("email = ?", data.Email)
-		data.Username = data.Email
-	} else if data.Username != "" {
-		session = session.Where("username = ?", data.Username)
-	}
-	session.First(&item)
-	if item.Id > 0 {
-		resp.ERROR(c, "该用户名已经被注册")
-		return
-	}
-
 	salt := utils.RandString(8)
 	user := model.User{
 		Username:   data.Username,
-		Mobile:     data.Mobile,
-		Email:      data.Email,
 		Password:   utils.GenPassword(data.Password, salt),
 		Avatar:     "/images/avatar/user.png",
 		Salt:       salt,
@@ -162,6 +142,26 @@ func (h *UserHandler) Register(c *gin.Context) {
 		Power:      h.App.SysConfig.InitPower,
 	}
 
+	// check if the username is existing
+	var item model.User
+	session := h.DB.Session(&gorm.Session{})
+	if data.Mobile != "" {
+		session = session.Where("mobile = ?", data.Mobile)
+		user.Username = data.Mobile
+		user.Mobile = data.Mobile
+	} else if data.Email != "" {
+		session = session.Where("email = ?", data.Email)
+		user.Username = data.Email
+		user.Email = data.Email
+	} else if data.Username != "" {
+		session = session.Where("username = ?", data.Username)
+	}
+	session.First(&item)
+	if item.Id > 0 {
+		resp.ERROR(c, "该用户名已经被注册")
+		return
+	}
+
 	// 被邀请人也获得赠送算力
 	if data.InviteCode != "" {
 		user.Power += h.App.SysConfig.InvitePower
diff --git a/web/src/utils/libs.js b/web/src/utils/libs.js
index cbb4b098..22d6fa10 100644
--- a/web/src/utils/libs.js
+++ b/web/src/utils/libs.js
@@ -225,6 +225,9 @@ export function showLoginDialog(router) {
 }
 
 export const replaceImg =(img) => {
+    if (!img.startsWith("http")) {
+        img = `${location.protocol}//${location.host}/${img}`
+    }
     const devHost = process.env.VUE_APP_API_HOST
     const localhost = "http://localhost:5678"
     if (img.includes(localhost)) {
diff --git a/web/src/views/MarkMap.vue b/web/src/views/MarkMap.vue
index 927a2f2b..71040f76 100644
--- a/web/src/views/MarkMap.vue
+++ b/web/src/views/MarkMap.vue
@@ -23,7 +23,7 @@
                 请选择生成思维导图的AI模型
               </div>
               <div class="param-line">
-                <el-select v-model="modelID" placeholder="请选择模型" @change="changeModel" style="width:100%">
+                <el-select v-model="modelID" placeholder="请选择模型" style="width:100%">
                   <el-option
                       v-for="item in models"
                       :key="item.id"
@@ -243,6 +243,8 @@ const downloadImage = () => {
   canvas.height = svgElement.offsetHeight
   let context = canvas.getContext('2d')
   context.clearRect(0, 0, canvas.width, canvas.height);
+  context.fillStyle = 'white';
+  context.fillRect(0, 0, canvas.width, canvas.height);
 
   image.onload = function () {
     context.drawImage(image, 0, 0)
diff --git a/web/vue.config.js b/web/vue.config.js
index d6595b62..17f7b0ff 100644
--- a/web/vue.config.js
+++ b/web/vue.config.js
@@ -14,7 +14,7 @@ module.exports = defineConfig({
         ]
     },
 
-    publicPath: process.env.NODE_ENV === 'production' ? '/' : '/',
+    publicPath: '/',
 
     outputDir: 'dist',
     crossorigin: "anonymous",