From 7d5428f77586754bc18f6f2e48663b3a09da592a Mon Sep 17 00:00:00 2001
From: RockYang <yangjian102621@gmail.com>
Date: Thu, 28 Mar 2024 21:41:49 +0800
Subject: [PATCH 01/12] add tip for mj image buttons

---
 web/src/views/ImageMj.vue | 80 +++++++++++++++++++++++++++++++++++----
 1 file changed, 72 insertions(+), 8 deletions(-)

diff --git a/web/src/views/ImageMj.vue b/web/src/views/ImageMj.vue
index 49542d48..e2da7daa 100644
--- a/web/src/views/ImageMj.vue
+++ b/web/src/views/ImageMj.vue
@@ -373,10 +373,42 @@
                       <div class="opt" v-if="scope.item['can_opt']">
                         <div class="opt-line">
                           <ul>
-                            <li><a @click="upscale(1, scope.item)">U1</a></li>
-                            <li><a @click="upscale(2, scope.item)">U2</a></li>
-                            <li><a @click="upscale(3, scope.item)">U3</a></li>
-                            <li><a @click="upscale(4, scope.item)">U4</a></li>
+                            <li>
+                              <el-tooltip
+                                  class="box-item"
+                                  effect="light"
+                                  content="放大第一张"
+                                  placement="top">
+                                <a @click="upscale(1, scope.item)">U1</a>
+                              </el-tooltip>
+                            </li>
+                            <li>
+                              <el-tooltip
+                                  class="box-item"
+                                  effect="light"
+                                  content="放大第二张"
+                                  placement="top">
+                                <a @click="upscale(2, scope.item)">U2</a>
+                              </el-tooltip>
+                            </li>
+                            <li>
+                              <el-tooltip
+                                  class="box-item"
+                                  effect="light"
+                                  content="放大第三张"
+                                  placement="top">
+                                <a @click="upscale(3, scope.item)">U3</a>
+                              </el-tooltip>
+                            </li>
+                            <li>
+                              <el-tooltip
+                                  class="box-item"
+                                  effect="light"
+                                  content="放大第四张"
+                                  placement="top">
+                                <a @click="upscale(4, scope.item)">U4</a>
+                              </el-tooltip>
+                            </li>
                             <li class="show-prompt">
 
                               <el-popover placement="left" title="提示词" :width="240" trigger="hover">
@@ -402,10 +434,42 @@
 
                         <div class="opt-line">
                           <ul>
-                            <li><a @click="variation(1, scope.item)">V1</a></li>
-                            <li><a @click="variation(2, scope.item)">V2</a></li>
-                            <li><a @click="variation(3, scope.item)">V3</a></li>
-                            <li><a @click="variation(4, scope.item)">V4</a></li>
+                            <li>
+                              <el-tooltip
+                                  class="box-item"
+                                  effect="light"
+                                  content="变化第一张"
+                                  placement="top">
+                                <a @click="variation(1, scope.item)">V1</a>
+                              </el-tooltip>
+                            </li>
+                            <li>
+                              <el-tooltip
+                                  class="box-item"
+                                  effect="light"
+                                  content="变化第二张"
+                                  placement="top">
+                                <a @click="variation(2, scope.item)">V2</a>
+                              </el-tooltip>
+                            </li>
+                            <li>
+                              <el-tooltip
+                                  class="box-item"
+                                  effect="light"
+                                  content="变化第三张"
+                                  placement="top">
+                                <a @click="variation(3, scope.item)">V3</a>
+                              </el-tooltip>
+                            </li>
+                            <li>
+                              <el-tooltip
+                                  class="box-item"
+                                  effect="light"
+                                  content="变化第四张"
+                                  placement="top">
+                                <a @click="variation(4, scope.item)">V4</a>
+                              </el-tooltip>
+                            </li>
                           </ul>
                         </div>
                       </div>

From 76106e4504d7942071a5270da258a4be0c595980 Mon Sep 17 00:00:00 2001
From: RockYang <yangjian102621@gmail.com>
Date: Sat, 30 Mar 2024 11:57:23 +0800
Subject: [PATCH 02/12] remove dead code

---
 web/src/views/Home.vue | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/web/src/views/Home.vue b/web/src/views/Home.vue
index 43687e56..aecf0915 100644
--- a/web/src/views/Home.vue
+++ b/web/src/views/Home.vue
@@ -7,9 +7,6 @@
       </div>
       <ul class="nav-items">
         <li v-for="item in navs" :key="item.path">
-          <!--          <el-tooltip effect="light" :content="item.title" placement="right">-->
-          <!--            -->
-          <!--          </el-tooltip>-->
           <a @click="changeNav(item)" :class="item.path === curPath ? 'active' : ''">
             <el-image :src="item.icon" :width="20"/>
           </a>

From a5299b52d47c0602bb90b528be992d5dd6c80b6e Mon Sep 17 00:00:00 2001
From: RockYang <yangjian102621@gmail.com>
Date: Sun, 31 Mar 2024 17:45:22 +0800
Subject: [PATCH 03/12] opt: change the relative path with absolute path for
 midjourney image uploading

---
 api/handler/mj_handler.go  | 7 +++++++
 web/src/views/ChatPlus.vue | 6 ++++++
 2 files changed, 13 insertions(+)

diff --git a/api/handler/mj_handler.go b/api/handler/mj_handler.go
index d2f9a107..f1b5e3e1 100644
--- a/api/handler/mj_handler.go
+++ b/api/handler/mj_handler.go
@@ -145,6 +145,13 @@ func (h *MidJourneyHandler) Image(c *gin.Context) {
 		prompt = fmt.Sprintf("%s:%s", data.TaskType, strings.Join(data.ImgArr, ","))
 	}
 
+	// 如果本地图片上传的是相对地址，处理成绝对地址
+	for k, v := range data.ImgArr {
+		if !strings.HasPrefix(v, "http") {
+			data.ImgArr[k] = fmt.Sprintf("http://localhost:5678/%s", strings.TrimLeft(v, "/"))
+		}
+	}
+
 	idValue, _ := c.Get(types.LoginUserID)
 	userId := utils.IntValue(utils.InterfaceToString(idValue), 0)
 	// generate task id
diff --git a/web/src/views/ChatPlus.vue b/web/src/views/ChatPlus.vue
index 0914358f..8dfdcd63 100644
--- a/web/src/views/ChatPlus.vue
+++ b/web/src/views/ChatPlus.vue
@@ -479,9 +479,15 @@ const changeChat = (chat) => {
 }
 
 const loadChat = function (chat) {
+  if (!isLogin.value) {
+    showLoginDialog.value = true
+    return;
+  }
+
   if (activeChat.value['chat_id'] === chat.chat_id) {
     return;
   }
+  
   activeChat.value = chat
   newChatItem.value = null;
   roleId.value = chat.role_id;

From 8b68bfb28c75ad6d89b92aad704c6bc6787ce66c Mon Sep 17 00:00:00 2001
From: RockYang <yangjian102621@gmail.com>
Date: Sun, 31 Mar 2024 20:49:12 +0800
Subject: [PATCH 04/12] show power for chat and imaging page

---
 web/src/assets/css/image-sd.styl  |  8 ++++++++
 web/src/assets/css/task-list.styl | 16 +++++++++-------
 web/src/views/ChatPlus.vue        | 10 ++++++++--
 web/src/views/ImageMj.vue         |  8 +++++---
 web/src/views/ImageSd.vue         |  6 ++++--
 5 files changed, 34 insertions(+), 14 deletions(-)

diff --git a/web/src/assets/css/image-sd.styl b/web/src/assets/css/image-sd.styl
index edd7ef5f..904eced8 100644
--- a/web/src/assets/css/image-sd.styl
+++ b/web/src/assets/css/image-sd.styl
@@ -65,6 +65,14 @@
           padding-top 5px
           padding-bottom 5px
         }
+
+        .text-info {
+          padding 10px
+
+          .el-tag {
+            margin-right 10px
+          }
+        }
       }
 
       .submit-btn {
diff --git a/web/src/assets/css/task-list.styl b/web/src/assets/css/task-list.styl
index b836f26f..211d4830 100644
--- a/web/src/assets/css/task-list.styl
+++ b/web/src/assets/css/task-list.styl
@@ -116,6 +116,15 @@
       }
     }
 
+    .el-row.text-info {
+      width 100%
+      padding 10px 0
+
+      .el-tag {
+        margin-right 10px
+      }
+    }
+
     // 提交按钮
 
     .submit-btn {
@@ -125,13 +134,6 @@
       .el-button {
         width 200px
       }
-
-      .text-info {
-        width 100%
-        display flex
-        justify-content right
-        align-items center
-      }
     }
 
 
diff --git a/web/src/views/ChatPlus.vue b/web/src/views/ChatPlus.vue
index 8dfdcd63..0605f194 100644
--- a/web/src/views/ChatPlus.vue
+++ b/web/src/views/ChatPlus.vue
@@ -103,7 +103,13 @@
                   :key="item.id"
                   :label="item.name"
                   :value="item.id"
-              />
+              >
+                <span>{{ item.name }}</span>
+                <el-tag style="margin-left: 5px; position: relative; top:-2px" type="info" size="small">{{
+                    item.power
+                  }}算力
+                </el-tag>
+              </el-option>
             </el-select>
             <el-button type="primary" @click="newChat">
               <el-icon>
@@ -487,7 +493,7 @@ const loadChat = function (chat) {
   if (activeChat.value['chat_id'] === chat.chat_id) {
     return;
   }
-  
+
   activeChat.value = chat
   newChatItem.value = null;
   roleId.value = chat.role_id;
diff --git a/web/src/views/ImageMj.vue b/web/src/views/ImageMj.vue
index e2da7daa..8f09240e 100644
--- a/web/src/views/ImageMj.vue
+++ b/web/src/views/ImageMj.vue
@@ -287,11 +287,13 @@
                 </el-tab-pane>
               </el-tabs>
 
+              <el-row class="text-info">
+                <el-tag>每次绘图消耗{{ mjPower }}算力，U/V 操作消耗{{ mjActionPower }}算力</el-tag>
+                <el-tag type="success">当前可用算力：{{ power }}</el-tag>
+              </el-row>
+
               <div class="submit-btn">
                 <el-button color="#47fff1" :dark="false" @click="generate" round>立即生成</el-button>
-                <div class="text-info">
-                  <el-tag type="success">当前可用算力：{{ power }}</el-tag>
-                </div>
               </div>
             </el-form>
           </div>
diff --git a/web/src/views/ImageSd.vue b/web/src/views/ImageSd.vue
index 66b289e6..ad0f7b1d 100644
--- a/web/src/views/ImageSd.vue
+++ b/web/src/views/ImageSd.vue
@@ -253,9 +253,11 @@
                 />
               </div>
 
-              <div class="param-line" style="padding: 10px">
+              <div class="text-info">
+                <el-tag>每次绘图消耗{{ sdPower }}算力</el-tag>
                 <el-tag type="success">当前可用算力：{{ power }}</el-tag>
               </div>
+
             </el-form>
           </div>
           <div class="submit-btn">
@@ -479,7 +481,7 @@
 
 <script setup>
 import {onMounted, onUnmounted, ref} from "vue"
-import {Delete, DocumentCopy, InfoFilled, Orange, Picture, Refresh} from "@element-plus/icons-vue";
+import {Delete, DocumentCopy, InfoFilled, Orange, Picture} from "@element-plus/icons-vue";
 import {httpGet, httpPost} from "@/utils/http";
 import {ElMessage, ElMessageBox, ElNotification} from "element-plus";
 import ItemList from "@/components/ItemList.vue";

From 56c225bf20b9795c898517e5ccbbfe30779e9baf Mon Sep 17 00:00:00 2001
From: RockYang <yangjian102621@gmail.com>
Date: Mon, 1 Apr 2024 18:20:00 +0800
Subject: [PATCH 05/12] feat: update menu icons, add version in site titles

---
 api/handler/chatimpl/chat_handler.go      |   2 +-
 api/handler/function_handler.go           |   2 +-
 api/utils/openai.go                       |   2 +-
 web/.env.development                      |   1 +
 web/.env.production                       |   1 +
 web/public/images/menu/app.png            | Bin 741 -> 1511 bytes
 web/public/images/menu/chat.png           | Bin 5198 -> 1089 bytes
 web/public/images/menu/mj.png             | Bin 4688 -> 2676 bytes
 web/public/images/menu/sd.png             | Bin 11920 -> 2200 bytes
 web/src/assets/css/image-mj.css           |  13 +++++++------
 web/src/assets/css/image-sd.css           |  19 +++++++++++++------
 web/src/components/FileSelect.vue         |   4 ++++
 web/src/components/FooterBar.vue          |   5 ++++-
 web/src/components/Welcome.vue            |   3 ++-
 web/src/components/admin/AdminSidebar.vue |   3 ++-
 web/src/views/ChatPlus.vue                |   6 ++++++
 web/src/views/Home.vue                    |  17 ++++++++++-------
 web/src/views/Login.vue                   |  13 +++++++++++--
 web/src/views/Register.vue                |   4 +++-
 19 files changed, 67 insertions(+), 28 deletions(-)

diff --git a/api/handler/chatimpl/chat_handler.go b/api/handler/chatimpl/chat_handler.go
index af69e717..c60df32e 100644
--- a/api/handler/chatimpl/chat_handler.go
+++ b/api/handler/chatimpl/chat_handler.go
@@ -478,7 +478,7 @@ func (h *ChatHandler) doRequest(ctx context.Context, req types.ApiRequest, platf
 	request = request.WithContext(ctx)
 	request.Header.Set("Content-Type", "application/json")
 	var proxyURL string
-	if apiKey.ProxyURL != "" { // 使用代理
+	if len(apiKey.ProxyURL) > 5 { // 使用代理
 		proxy, _ := url.Parse(apiKey.ProxyURL)
 		client = &http.Client{
 			Transport: &http.Transport{
diff --git a/api/handler/function_handler.go b/api/handler/function_handler.go
index cecbf057..e9eb57df 100644
--- a/api/handler/function_handler.go
+++ b/api/handler/function_handler.go
@@ -220,7 +220,7 @@ func (h *FunctionHandler) Dall3(c *gin.Context) {
 	var res imgRes
 	var errRes ErrRes
 	var request *req.Request
-	if apiKey.ProxyURL != "" {
+	if len(apiKey.ProxyURL) > 5 {
 		request = req.C().SetProxyURL(apiKey.ProxyURL).R()
 	} else {
 		request = req.C().R()
diff --git a/api/utils/openai.go b/api/utils/openai.go
index 9842e07e..584f0435 100644
--- a/api/utils/openai.go
+++ b/api/utils/openai.go
@@ -61,7 +61,7 @@ func OpenAIRequest(db *gorm.DB, prompt string) (string, error) {
 	var response apiRes
 	var errRes apiErrRes
 	client := req.C()
-	if apiKey.ProxyURL != "" {
+	if len(apiKey.ProxyURL) > 5 {
 		client.SetProxyURL(apiKey.ApiURL)
 	}
 	r, err := client.R().SetHeader("Content-Type", "application/json").
diff --git a/web/.env.development b/web/.env.development
index d10ac654..330da87b 100644
--- a/web/.env.development
+++ b/web/.env.development
@@ -6,3 +6,4 @@ VUE_APP_ADMIN_USER=admin
 VUE_APP_ADMIN_PASS=admin123
 VUE_APP_KEY_PREFIX=ChatPLUS_DEV_
 VUE_APP_TITLE="Geek-AI 创作系统"
+VUE_APP_VERSION=v4.0.2
diff --git a/web/.env.production b/web/.env.production
index d558e88d..c6581695 100644
--- a/web/.env.production
+++ b/web/.env.production
@@ -2,3 +2,4 @@ VUE_APP_API_HOST=
 VUE_APP_WS_HOST=
 VUE_APP_KEY_PREFIX=ChatPLUS_
 VUE_APP_TITLE="Geek-AI 创作系统"
+VUE_APP_VERSION=v4.0.2
diff --git a/web/public/images/menu/app.png b/web/public/images/menu/app.png
index 2785231cbe4a00d7541899a7459fa78d324842c7..f0307dd0a7e79b26e16fdfd5f5914f7d1ada865b 100644
GIT binary patch
delta 1481
zcmV;)1vdKS1?LNpFn<N1Nkl<ZXhZE<ZHQE56n@Sf6$)qWj3xvUeNl*8zp}FIJH2;T
zlcba&$x5)mN*CPKRixD-X=SHfTosExz$8KmsdRVmC}afwh=M@WJ_#!5N6OB<V~LA%
zpZ0BM+Pin&*_qj$*_PP*^S<Xj=Xu_9&U?>$-Ycllvxx3Z5r3eOkhuU)6HKNg{&Tg>
zNwpO!eHPuV0yF}c8PNYb;3pkPB&%t&sst>0tBrqFowtqv@}xl8dnI<b8bqo>z-D?O
zA<Y6<<$@w`fbf&YB=JqTb98cJBCwRavLBf}0H4t*C$K9e=6aiM7l0QvGJgR`W|2)E
zml^J8h>V(mMSpKcE?lk%8z#^l0oV0N{HOew#dC86Qx%bg8lb0h`SD(*Bq}CgF|!=V
zwh810jj`_pSl=tAQw)er?@@q?$Tb?7BL<B29*KTlE|IbcJj8Rer()`d0PZPNE|&#V
z!1tDG*k*bYAg>n-J%2E)ekrA|ECM#YcL6?I#8`)kSby^&k!&er;c=Vp41n!`XmrbO
z0F#cGog?WTk$}zg8bIDEqTrJVq`6yS-&YDeEZ;zPz7M<s;4Y1>FLL?uaoM|&%}gEO
z9|v%?CS254wK*kb&sc$n=Ueoi7ElqHq0zlRf=GL}Og|MIEAW8L^kG1jX%t)n(Bz1@
zyV}4DiGQSb2xN1i9bOnLNfO)gW5WnobXN*+Km)MTK&+)lM3ESmr-A7keHd*3AJ-UM
z>4^D(dLJgxI`AUM?o)x$(j(C`<APdaq@M0#f^C4@k{>3pEhXl54S~LG0;4rA=!jX?
zE>&xC_3V3qFg_b1;BU`|QOE=Ta{_}a5os0hOn(;WJSOH3)mnXv-rWLh1Yi>Wj+DfY
z<#ku!0e4sqghR-t`xSuOa*EFr>_|!cwXu*`!gL}FV<W+qAw6=!k=TR935+raEP4k8
zToD9J@RY#la3of7A!gHEHK0pv8rKhB1X<%q?Cnu_pmYw{Om7rOGl8o@EAK?Wt=$q=
zUVj?#vFYA1umh@Hq&_70<zV>`KNx&pK?s#5pcF5rcXJlLD#liakqYFUD1KdgNb35-
zV+;64bULQJg2Cfv@VNlUt1(2Ax|*u$1oD<GdP@y(6M+RGKz|CbrB}>dLt&74p77OI
ze9CZH?gK;>Z9f)sTg?dM4chcJ2-s2>R)2C<kX=hiSMWoWn|Bgmt0Qq$bB*}aoPe^v
zjErA|yAzN#CGcDTjAloo`$_??NfMVbYSFzDpgOVLUnt9cQ-Cc;CEiy`Pfe4!9OE|K
zrvU8F%M!96C9#v`%ni$oO9+)RI+nU>l0Y@wKIwt+E~mqBJL!Q*4^)`R6C#8F9Df0f
z7Du9|E5wg#5wPhl0ni4ZZs?;}<V;*ocP)WEVXy*p31ZEav{lARAXl=hZiKE!waO9m
zeT7rg*z!IC_*mhJ%OxVaIVFjXa=bAX0`>HEs_vhrmKwRSm7lPf7q88tzZbw94cKo1
zzr~S+wpUrKf-GknwU~ZR20PXXjep(pT8qJn7TpE`x{IuMPZq|8;}Siq8*gA{mJeU$
z&MW|5J7Uf&<~f_*z3M0l;C78n<;~r&5_Mo1Y=di@3heDiZ2bw5%Z2m$HUN=F1ljGq
zk~k3_f0*9PDWE#FJ*f%VvA5TQN^=L6r0yIHK-~?f#_x!|{GdLY?#sD@eSZOVb+=a4
z3yz?LMNH2VNS6TfH4ahd+D1prqs79-VtTm&qm$rljZE#Xn8L;^rk@bVo2rwh0pj?;
zOTo@v12c1da5unz8&-jN<9Epy1iONq<{{GrP}`kT-;Z7~*V%McH{t~i(f{t6H3+7G
z=jZx}H0kfU^uaVCF1icD%0gQzfbz(F#d2WaSBi=Et3l!R={5?aDU_%a|7VXNk$U!B
jM;J}H*xysD-);T|5fC?Cu$=Rc00000NkvXXu0mjfrc1v*

delta 705
zcmV;y0zUoc3*`lnFn<D{Nkl<ZXhZE;J!lkB5dP-QG#0yFM6gI9qNdWupV}1OE~21_
zf&?rQE3wleR>n#pc4C<{iU@*&L~`#8m|6@rB18=SfY^xMo?v(T$=;9L>hAG&-^Js?
z+v@I^`DVVE*?Ifz35NWVA<rL{z@R(0xjW#qc9wt-6n5)WT7Q6_1l}rfW|Hj7{4pyi
z?guccg9qRv(fCxA(rlW2Y6n`u3fDCQ#mofwRuOkc_m3XyPXM0Eg9pfp5@#aGH<5tH
zzz49DFIdZqkVjQ<&PAV1iqXk|2yY~HB85QxHoz+;1R~!NjEpVH)-N7|R{##0;mKnq
z&Y8b4(g?f&cz@I^ARq`QDpFeU7|;|eZHz2|UX`^Si0`(<O=L&Nj*#|xN<Pf&2-y+Z
zh!HBYHY1Rm+SuuadzHBFeb%26JZXq`Pl<a$>rujIaG1bL!+_6}xF;eEpTQ*pcMb6-
zmADVI2=w6z@_7S|i_0?lxf9T5aG$_r4idkJa4t;~^nX-jKEEFzwj3cEV>*Fbf~L4u
z6=yNY{upazfs6y;c0IhpdI8~^B`Lj5v)|m3Qm0CTw&~e{NJ#;Oae?gAOO#)U@Lk%x
z{#Q-xF^KN?^LmNLtps>j5jW;*qKT96IuR2)P-cBf!1+AMcYFw$u8Ok|efJpL0dTor
zc-=S~`F||5s>D6iCh!5kE<*x;UJ_^!=!b>{l(@|T4L}oH0?jVl4#aMnOoGOakR73a
zSFRnQ?8lJZLV34PpET^c5_eDgBwhosFMAJT9+@<;v4$1Mt%^9;q7;1A<_NiJNFbXg
zHqfxq|1%3pwoP{@?6Ecv$W#szCYm@nPVh8PXgZF9#<dD?S&3Uovh|q_j|f!}R8|vf
nRDNJ4_N~OgO5YAV^d0yO`~<K-)4hM&00000NkvXXu0mjf&4x^d

diff --git a/web/public/images/menu/chat.png b/web/public/images/menu/chat.png
index bb484b5a82d6d2986dca85e1173fc2963c2c167b..12e9f903ed5273d723485cd3076ec42b58f2e77d 100644
GIT binary patch
literal 1089
zcmV-H1it%;P)<h;3K|Lk000e1NJLTq001xm001xu1^@s6R|5Hm00001b5ch_0Itp)
z=>Px&`$<GWRA@u(nO%q*WfX?rccLuV?Mzk>dm;W{dtpT?D^&2t)z<t-tDv=tD6K+!
zX<aX@DB>1GQK9}6FGRg5dLgx_h~3OAOAA7wXj`G}BD6@oP^=)yB#J-X&MVVw%w%@5
znP!sg29vvd-}%1tKIhE$GiQiC|FO^YV*s$&8C);}S(P3Hj8Q;q050pbSV1#{z7ufF
zVftv4|44v!`u*w@ygh^->b2-*{s`<T(0VG|9|@3^tED2mQHOTgOurs%n+K4UyBEOY
z0i!9vI3>)wy@n!E*8$qvDA>E9z>%}Hwg!N_Dpz^%eyw#1-Y$nD6TKE5^p{s<wFmE1
zT@zn*Xg(hakW+C?Fb>Xj+BU7+Vv4W%&ZxYB(3f-n_u90!Gy!nO1?=`a1-{|Xe0C`S
zjH#F&f>HFf5O4~#vXKB86(<Per7FPUKR&_W)i)L%vT5Em0O<9jHON4(BOdlQ$UrzE
zd1+{p{CmO7NCrr+Rrc~aJv7Nx3(nQC3}jTkgV6f`Rs)z3xXqz?cz()D9|C+5z+V90
zv1#rM+uWm4#sJ?1uoA%W6jECbaQH+NaK`|0D(@4tslE^M(*n(gTWemGJ3V-Zf<k7Y
z8>gB6A+)zo0a#ye;|Dg)ZCwS(s(cX8Siot+!Q!`PRlXn4=RqL`ywORH91j8b|8EW4
zb3SuuKG0QwjNAzV7f<WziH!+|)~=w_ynegJ!)1Q7FQ04w(WZ5MSXf5xZUW<hQ}vkw
ztv9<0;7^{D`<MrBr2*qif!0US4ojoHDPf#H4{v|?@u`i;s{DkYYXReXhs!@{w%|Lq
z23qYX-Rd6zbStuP=N)7qZlt<p_y5R1PD}rl62MnBtqp;*qn`Bsc&X<rHq93z0s5h=
z0%()X^!`YI>M2`(Ptf+jVr*L25_ouuX(zaFb1H82fO*%3b{2QIuqAMxLvwR*uB4^K
zvx0HE!{rx?VZo|KJAzw{nMG>FG>6Z%1n>>Aa^C{5qt&DU#%)@@t$zzW3Fzh+V=mR?
z>l9L(4{-RG@W2G+_5ZHa-`KR)=2X5<&=<Y~K|c}3=}T4FXs<G$BYuh9;Yh>PJXQu4
za=u=bn^N#*YBqwg&VZg4w6WU8=WLp<B?E{zy6sO)S-IZ=xNXjje+_=P4)o`+!xewT
zlaS0R3BaQOK8|odY16tlnXLGu+XmREpRf1_%PIhjpgTd2I7~NvF^MlNo@Ltr)os&#
zn?Ufh&l#K6s(7wDW0eq~bT`52niK*r7ihiM8ENrmNd!>c``se|)>gOA3%5AD@?<>M
zov}&`;D0?afbAYG99xXfQHcRM6UX*v8342&yUvX4`waXGpIbXmENvOD00000NkvXX
Hu0mjfF{cXX

literal 5198
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
IM6N<$g7*6(lmGw#

diff --git a/web/public/images/menu/mj.png b/web/public/images/menu/mj.png
index 60f08535f0c89639f9ac561a7b790911c14d9758..97d919540bf1cefdb79dffe562413cc3e7882bd6 100644
GIT binary patch
literal 2676
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

literal 4688
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
L)F2gL)8PLB0rVuF

diff --git a/web/public/images/menu/sd.png b/web/public/images/menu/sd.png
index 5b0d3815fec4879bb5d9f16f3b8cbc1c05bc31fe..fd918fbed4a185e8de5b3e2a038a6d7aa40931f5 100644
GIT binary patch
literal 2200
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
a0{;Vj!Ju9+#zma~0000<MNUMnLSTX$Krp-j

literal 11920
zcmV;BE^pC^P)<h;3K|Lk000e1NJLTq002t>002t}1^@s6I8J)%00009a7bBm000ie
z000ie0hKEb8vp<<LP<nHRCt{2ym_#t$5r6@%gk@R`@L`9>(#z$EA6{%A=~nXZHyae
zH`rrr4=_E9Spqyg;OHg-2SdXE6Kw_)jR6}ksBLJ=vb<qgTS=v=l4{@Uy{fmbcfa>r
zGv|+2GPaSBOxsNm!HKx>zI!9y_htUR%#-JwJbA=YoSKXf{HwgOSUD;1|CQCN5~<BU
zcN6~Qi2Ubnz`rE<S6JVN{0oI8u73XK%0Dx#7dxysx~~Oj14d&sq@+X$QX??NfH8<v
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
WTV%JYGgwvt0000<MNUMnLSTZbZ~`>|

diff --git a/web/src/assets/css/image-mj.css b/web/src/assets/css/image-mj.css
index 346f198c..9d362952 100644
--- a/web/src/assets/css/image-mj.css
+++ b/web/src/assets/css/image-mj.css
@@ -275,6 +275,13 @@
   width: 20px;
   height: 20px;
 }
+.page-mj .inner .task-list-box .task-list-inner .el-row.text-info {
+  width: 100%;
+  padding: 10px 0;
+}
+.page-mj .inner .task-list-box .task-list-inner .el-row.text-info .el-tag {
+  margin-right: 10px;
+}
 .page-mj .inner .task-list-box .task-list-inner .submit-btn {
   display: flex;
   margin: 20px 0;
@@ -282,12 +289,6 @@
 .page-mj .inner .task-list-box .task-list-inner .submit-btn .el-button {
   width: 200px;
 }
-.page-mj .inner .task-list-box .task-list-inner .submit-btn .text-info {
-  width: 100%;
-  display: flex;
-  justify-content: right;
-  align-items: center;
-}
 .page-mj .inner .task-list-box .task-list-inner .job-list-box .running-job-list .job-item {
   width: 100%;
   padding: 2px;
diff --git a/web/src/assets/css/image-sd.css b/web/src/assets/css/image-sd.css
index 5ac1d564..00177432 100644
--- a/web/src/assets/css/image-sd.css
+++ b/web/src/assets/css/image-sd.css
@@ -53,6 +53,12 @@
   padding-top: 5px;
   padding-bottom: 5px;
 }
+.page-sd .inner .sd-box .sd-params .text-info {
+  padding: 10px;
+}
+.page-sd .inner .sd-box .sd-params .text-info .el-tag {
+  margin-right: 10px;
+}
 .page-sd .inner .sd-box .submit-btn {
   padding: 10px 15px 0 15px;
   text-align: center;
@@ -159,6 +165,13 @@
   width: 20px;
   height: 20px;
 }
+.page-sd .inner .task-list-box .task-list-inner .el-row.text-info {
+  width: 100%;
+  padding: 10px 0;
+}
+.page-sd .inner .task-list-box .task-list-inner .el-row.text-info .el-tag {
+  margin-right: 10px;
+}
 .page-sd .inner .task-list-box .task-list-inner .submit-btn {
   display: flex;
   margin: 20px 0;
@@ -166,12 +179,6 @@
 .page-sd .inner .task-list-box .task-list-inner .submit-btn .el-button {
   width: 200px;
 }
-.page-sd .inner .task-list-box .task-list-inner .submit-btn .text-info {
-  width: 100%;
-  display: flex;
-  justify-content: right;
-  align-items: center;
-}
 .page-sd .inner .task-list-box .task-list-inner .job-list-box .running-job-list .job-item {
   width: 100%;
   padding: 2px;
diff --git a/web/src/components/FileSelect.vue b/web/src/components/FileSelect.vue
index 74d1e0ce..7fc05d0b 100644
--- a/web/src/components/FileSelect.vue
+++ b/web/src/components/FileSelect.vue
@@ -120,6 +120,10 @@ const removeFile = (file) => {
 
 const insertURL = (url) => {
   show.value = false
+  // 如果是相对路径，处理成绝对路径
+  if (url.indexOf("http") === -1) {
+    url = location.protocol + "//" + location.host + url
+  }
   emits('selected', url)
 }
 </script>
diff --git a/web/src/components/FooterBar.vue b/web/src/components/FooterBar.vue
index ce5d8173..15165d69 100644
--- a/web/src/components/FooterBar.vue
+++ b/web/src/components/FooterBar.vue
@@ -2,7 +2,9 @@
   <div class="container">
     <div class="footer">
       Powered by {{ author }} @
-      <el-link type="primary" href="https://github.com/yangjian102621/chatgpt-plus" target="_blank">{{ title }}
+      <el-link type="primary" href="https://github.com/yangjian102621/chatgpt-plus" target="_blank">
+        {{ title }} -
+        {{ version }}
       </el-link>
     </div>
   </div>
@@ -12,6 +14,7 @@
 import {ref} from "vue";
 
 const title = ref(process.env.VUE_APP_TITLE)
+const version = ref(process.env.VUE_APP_VERSION)
 const author = ref('极客学长')
 </script>
 
diff --git a/web/src/components/Welcome.vue b/web/src/components/Welcome.vue
index 91311aee..6af6c7f8 100644
--- a/web/src/components/Welcome.vue
+++ b/web/src/components/Welcome.vue
@@ -1,7 +1,7 @@
 <template>
   <div class="welcome">
     <div class="container">
-      <h1 class="title">{{ title }}</h1>
+      <h1 class="title">{{ title }}-{{ version }}</h1>
 
       <el-row :gutter="20">
         <el-col :span="8">
@@ -60,6 +60,7 @@ import {httpGet} from "@/utils/http";
 import {ElMessage} from "element-plus";
 
 const title = ref(process.env.VUE_APP_TITLE)
+const version = ref(process.env.VUE_APP_VERSION)
 
 const samples = ref([
   "用小学生都能听懂的术语解释什么是量子纠缠",
diff --git a/web/src/components/admin/AdminSidebar.vue b/web/src/components/admin/AdminSidebar.vue
index 0393c984..f2bbbc1b 100644
--- a/web/src/components/admin/AdminSidebar.vue
+++ b/web/src/components/admin/AdminSidebar.vue
@@ -2,7 +2,7 @@
   <div class="sidebar">
     <div class="logo">
       <el-image :src="logo"/>
-      <span class="text" v-show="!sidebar.collapse">{{ title }}</span>
+      <span class="text" v-show="!sidebar.collapse">{{ title }} - {{ version }}</span>
     </div>
 
     <el-menu
@@ -60,6 +60,7 @@ import {ElMessage} from "element-plus";
 
 const title = ref('Chat-Plus-Admin')
 const logo = ref('/images/logo.png')
+const version = ref(process.env.VUE_APP_VERSION)
 
 // 加载系统配置
 httpGet('/api/admin/config/get?key=system').then(res => {
diff --git a/web/src/views/ChatPlus.vue b/web/src/views/ChatPlus.vue
index 0605f194..e14bac7b 100644
--- a/web/src/views/ChatPlus.vue
+++ b/web/src/views/ChatPlus.vue
@@ -451,6 +451,12 @@ const newChat = () => {
     showLoginDialog.value = true
     return;
   }
+  const role = getRoleById(roleId.value)
+  if (role.key === 'gpt') {
+    showHello.value = true
+  } else {
+    showHello.value = false
+  }
   // 已有新开的会话
   if (newChatItem.value !== null && newChatItem.value['role_id'] === roles.value[0]['role_id']) {
     return;
diff --git a/web/src/views/Home.vue b/web/src/views/Home.vue
index aecf0915..c960ec76 100644
--- a/web/src/views/Home.vue
+++ b/web/src/views/Home.vue
@@ -6,9 +6,9 @@
         <div class="divider"></div>
       </div>
       <ul class="nav-items">
-        <li v-for="item in navs" :key="item.path">
-          <a @click="changeNav(item)" :class="item.path === curPath ? 'active' : ''">
-            <el-image :src="item.icon" :width="20"/>
+        <li v-for="item in navs" :key="item.url">
+          <a @click="changeNav(item)" :class="item.url === curPath ? 'active' : ''">
+            <el-image :src="item.icon" style="width: 30px;height: 30px"/>
           </a>
           <div :class="item.url === curPath ? 'title active' : 'title'">{{ item.name }}</div>
         </li>
@@ -66,7 +66,7 @@ onMounted(() => {
   .navigator {
     display flex
     flex-flow column
-    width 70px
+    width 60px
     padding 10px 6px
     border-right: 1px solid #3c3c3c
     background-color: #25272D
@@ -76,6 +76,10 @@ onMounted(() => {
       flex-flow column
       align-items center
 
+      .el-image {
+        width 50px
+        height 50px
+      }
 
       .divider {
         border-bottom 1px solid #4A4A4A
@@ -86,15 +90,13 @@ onMounted(() => {
 
     .nav-items {
       margin-top: 20px;
-      padding-left: 10px;
-      padding-right: 10px;
+      padding 0 5px
 
       li {
         margin-bottom 15px
 
         a {
           color #DADBDC
-          background-color #40444A
           border-radius 10px
           width 48px
           height 48px
@@ -114,6 +116,7 @@ onMounted(() => {
 
         a:hover, a.active {
           color #47fff1
+          background-color #0F7A71
         }
 
         .title {
diff --git a/web/src/views/Login.vue b/web/src/views/Login.vue
index c021b5f2..71064ad6 100644
--- a/web/src/views/Login.vue
+++ b/web/src/views/Login.vue
@@ -4,7 +4,7 @@
     <div class="main">
       <div class="contain">
         <div class="logo">
-          <el-image src="images/logo.png" fit="cover"/>
+          <el-image :src="logo" fit="cover"/>
         </div>
         <div class="header">{{ title }}</div>
         <div class="content">
@@ -54,7 +54,7 @@
 
 import {ref} from "vue";
 import {Lock, UserFilled} from "@element-plus/icons-vue";
-import {httpPost} from "@/utils/http";
+import {httpGet, httpPost} from "@/utils/http";
 import {ElMessage} from "element-plus";
 import {useRouter} from "vue-router";
 import FooterBar from "@/components/FooterBar.vue";
@@ -69,6 +69,15 @@ const title = ref('ChatPlus 用户登录');
 const username = ref(process.env.VUE_APP_USER);
 const password = ref(process.env.VUE_APP_PASS);
 const showResetPass = ref(false)
+const logo = ref("/images/logo.png")
+
+// 获取系统配置
+httpGet("/api/config/get?key=system").then(res => {
+  logo.value = res.data.logo
+}).catch(e => {
+  ElMessage.error("获取系统配置失败：" + e.message)
+})
+
 
 checkSession().then(() => {
   if (isMobile()) {
diff --git a/web/src/views/Register.vue b/web/src/views/Register.vue
index 87012382..f37c17b0 100644
--- a/web/src/views/Register.vue
+++ b/web/src/views/Register.vue
@@ -5,7 +5,7 @@
       <div class="page-inner">
         <div class="contain" v-if="enableRegister">
           <div class="logo">
-            <el-image src="images/logo.png" fit="cover"/>
+            <el-image :src="logo" fit="cover"/>
           </div>
 
           <div class="header">{{ title }}</div>
@@ -141,6 +141,7 @@ const enableRegister = ref(true)
 const wxImg = ref("/images/wx.png")
 const ways = []
 const placeholder = ref("用户名：")
+const logo = ref("/images/logo.png")
 
 httpGet("/api/config/get?key=system").then(res => {
   if (res.data) {
@@ -160,6 +161,7 @@ httpGet("/api/config/get?key=system").then(res => {
     if (res.data['wechat_card_url'] !== '') {
       wxImg.value = res.data['wechat_card_url']
     }
+    logo.value = res.data.logo
   }
 }).catch(e => {
   ElMessage.error("获取系统配置失败：" + e.message)

From 3f1ad4b7dcba440e012f569b62903e7859c260b1 Mon Sep 17 00:00:00 2001
From: RockYang <yangjian102621@gmail.com>
Date: Tue, 2 Apr 2024 14:59:53 +0800
Subject: [PATCH 06/12] feat: support midjourney --cref and --sref for role
 consistency

---
 CHANGELOG.md                   |   3 +
 README.md                      |   2 +-
 api/core/types/task.go         |   1 +
 api/handler/mj_handler.go      |  58 +++++----
 api/main.go                    |  15 ++-
 api/service/mj/plus_client.go  |   2 +-
 api/service/mj/proxy_client.go |   4 +-
 api/service/mj/service.go      |   2 +-
 web/src/views/ImageMj.vue      | 211 +++++++++++++++++++++++++++++----
 web/src/views/ImageSd.vue      |   2 +-
 10 files changed, 247 insertions(+), 53 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 373fdcb8..3d9110a0 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,7 +1,10 @@
 # 更新日志
 ## 4.0.2 
 * 功能新增：支持前端菜单可以配置
+* 功能优化：在登录和注册界面标题显示软件版本号
+* 功能优化：MJ 绘画支持 --sref 和 --cref 图片一致性参数
 * 功能优化：手机端支持免登录预览功能
+* Bug修复：解决因为图片上传使用相对路径而导致融图失败的问题。
 * 功能新增：手机端支持 Stable-Diffusion 绘画
 * 功能新增：管理后台登录页面增加行为验证码，防止爆破
 
diff --git a/README.md b/README.md
index 303fc242..c47877fe 100644
--- a/README.md
+++ b/README.md
@@ -91,7 +91,7 @@ KEY。
 
 ![](https://ai.r9it.com/docs/images/env/admin_api_keys.png)
 
-另外，如果您目前还没有 OpenAI 的 API KEY的，推荐您去 https://gpt.bemore.lol 购买，**无需魔法，高速稳定，且价格还远低于 OpenAI
+另外，如果您目前还没有 OpenAI 的 API KEY的，推荐您去 https://api.chat-plus.net 购买，**无需魔法，高速稳定，且价格还远低于 OpenAI
 官方**。
 
 ## 使用须知
diff --git a/api/core/types/task.go b/api/core/types/task.go
index 0120c739..36142736 100644
--- a/api/core/types/task.go
+++ b/api/core/types/task.go
@@ -25,6 +25,7 @@ type MjTask struct {
 	Type        TaskType `json:"type"`
 	UserId      int      `json:"user_id"`
 	Prompt      string   `json:"prompt,omitempty"`
+	Params      string   `json:"full_prompt"`
 	Index       int      `json:"index,omitempty"`
 	MessageId   string   `json:"message_id,omitempty"`
 	MessageHash string   `json:"message_hash,omitempty"`
diff --git a/api/handler/mj_handler.go b/api/handler/mj_handler.go
index f1b5e3e1..5ca0bcb5 100644
--- a/api/handler/mj_handler.go
+++ b/api/handler/mj_handler.go
@@ -98,7 +98,10 @@ func (h *MidJourneyHandler) Image(c *gin.Context) {
 		ImgArr    []string `json:"img_arr"`
 		Tile      bool     `json:"tile"`
 		Quality   float32  `json:"quality"`
-		Weight    float32  `json:"weight"`
+		Iw        float32  `json:"iw"`
+		CRef      string   `json:"cref"` //生成角色一致的图像
+		SRef      string   `json:"sref"` //生成风格一致的图像
+		Cw        int      `json:"cw"`   // 参考程度
 	}
 	if err := c.ShouldBindJSON(&data); err != nil {
 		resp.ERROR(c, types.InvalidArgs)
@@ -108,41 +111,53 @@ func (h *MidJourneyHandler) Image(c *gin.Context) {
 		return
 	}
 
-	var prompt = data.Prompt
-	if data.Rate != "" && !strings.Contains(prompt, "--ar") {
-		prompt += " --ar " + data.Rate
+	var params = ""
+	if data.Rate != "" && !strings.Contains(params, "--ar") {
+		params += " --ar " + data.Rate
 	}
-	if data.Seed > 0 && !strings.Contains(prompt, "--seed") {
-		prompt += fmt.Sprintf(" --seed %d", data.Seed)
+	if data.Seed > 0 && !strings.Contains(params, "--seed") {
+		params += fmt.Sprintf(" --seed %d", data.Seed)
 	}
-	if data.Stylize > 0 && !strings.Contains(prompt, "--s") && !strings.Contains(prompt, "--stylize") {
-		prompt += fmt.Sprintf(" --s %d", data.Stylize)
+	if data.Stylize > 0 && !strings.Contains(params, "--s") && !strings.Contains(params, "--stylize") {
+		params += fmt.Sprintf(" --s %d", data.Stylize)
 	}
-	if data.Chaos > 0 && !strings.Contains(prompt, "--c") && !strings.Contains(prompt, "--chaos") {
-		prompt += fmt.Sprintf(" --c %d", data.Chaos)
+	if data.Chaos > 0 && !strings.Contains(params, "--c") && !strings.Contains(params, "--chaos") {
+		params += fmt.Sprintf(" --c %d", data.Chaos)
 	}
-	if data.Weight > 0 {
-		prompt += fmt.Sprintf(" --iw %f", data.Weight)
+	if len(data.ImgArr) > 0 && data.Iw > 0 {
+		params += fmt.Sprintf(" --iw %f", data.Iw)
 	}
 	if data.Raw {
-		prompt += " --style raw"
+		params += " --style raw"
 	}
 	if data.Quality > 0 {
-		prompt += fmt.Sprintf(" --q %.2f", data.Quality)
+		params += fmt.Sprintf(" --q %.2f", data.Quality)
 	}
 	if data.NegPrompt != "" {
-		prompt += fmt.Sprintf(" --no %s", data.NegPrompt)
+		params += fmt.Sprintf(" --no %s", data.NegPrompt)
 	}
 	if data.Tile {
-		prompt += " --tile "
+		params += " --tile "
 	}
-	if data.Model != "" && !strings.Contains(prompt, "--v") && !strings.Contains(prompt, "--niji") {
-		prompt += fmt.Sprintf(" %s", data.Model)
+	if data.CRef != "" {
+		params += fmt.Sprintf(" --cref %s", data.CRef)
+		if data.Cw > 0 {
+			params += fmt.Sprintf(" --cw %d", data.Cw)
+		} else {
+			params += " --cw 100"
+		}
+	}
+
+	if data.SRef != "" {
+		params += fmt.Sprintf(" --sref %s", data.CRef)
+	}
+	if data.Model != "" && !strings.Contains(params, "--v") && !strings.Contains(params, "--niji") {
+		params += fmt.Sprintf(" %s", data.Model)
 	}
 
 	// 处理融图和换脸的提示词
 	if data.TaskType == types.TaskSwapFace.String() || data.TaskType == types.TaskBlend.String() {
-		prompt = fmt.Sprintf("%s:%s", data.TaskType, strings.Join(data.ImgArr, ","))
+		params = fmt.Sprintf("%s:%s", data.TaskType, strings.Join(data.ImgArr, ","))
 	}
 
 	// 如果本地图片上传的是相对地址，处理成绝对地址
@@ -165,7 +180,7 @@ func (h *MidJourneyHandler) Image(c *gin.Context) {
 		UserId:    userId,
 		TaskId:    taskId,
 		Progress:  0,
-		Prompt:    prompt,
+		Prompt:    fmt.Sprintf("%s %s", data.Prompt, params),
 		Power:     h.App.SysConfig.MjPower,
 		CreatedAt: time.Now(),
 	}
@@ -188,7 +203,8 @@ func (h *MidJourneyHandler) Image(c *gin.Context) {
 		TaskId:    taskId,
 		SessionId: data.SessionId,
 		Type:      types.TaskType(data.TaskType),
-		Prompt:    prompt,
+		Prompt:    data.Prompt,
+		Params:    params,
 		UserId:    userId,
 		ImgArr:    data.ImgArr,
 	})
diff --git a/api/main.go b/api/main.go
index 6d82fccb..8b3c1ed1 100644
--- a/api/main.go
+++ b/api/main.go
@@ -53,6 +53,10 @@ func (l *AppLifecycle) OnStop(context.Context) error {
 	return nil
 }
 
+func NewAppLifeCycle() *AppLifecycle {
+	return &AppLifecycle{}
+}
+
 func main() {
 	configFile := os.Getenv("CONFIG_FILE")
 	if configFile == "" {
@@ -432,11 +436,14 @@ func main() {
 			group.GET("list", h.List)
 		}),
 		fx.Invoke(func(s *core.AppServer, db *gorm.DB) {
-			err := s.Run(db)
-			if err != nil {
-				log.Fatal(err)
-			}
+			go func() {
+				err := s.Run(db)
+				if err != nil {
+					log.Fatal(err)
+				}
+			}()
 		}),
+		fx.Provide(NewAppLifeCycle),
 		// 注册生命周期回调函数
 		fx.Invoke(func(lifecycle fx.Lifecycle, lc *AppLifecycle) {
 			lifecycle.Append(fx.Hook{
diff --git a/api/service/mj/plus_client.go b/api/service/mj/plus_client.go
index 38c3265e..31029a22 100644
--- a/api/service/mj/plus_client.go
+++ b/api/service/mj/plus_client.go
@@ -26,7 +26,7 @@ func (c *PlusClient) Imagine(task types.MjTask) (ImageRes, error) {
 	apiURL := fmt.Sprintf("%s/mj-%s/mj/submit/imagine", c.apiURL, c.Config.Mode)
 	body := ImageReq{
 		BotType:     "MID_JOURNEY",
-		Prompt:      task.Prompt,
+		Prompt:      fmt.Sprintf("%s %s", task.Prompt, task.Params),
 		Base64Array: make([]string, 0),
 	}
 	// 生成图片 Base64 编码
diff --git a/api/service/mj/proxy_client.go b/api/service/mj/proxy_client.go
index c6f66c64..41bb31d1 100644
--- a/api/service/mj/proxy_client.go
+++ b/api/service/mj/proxy_client.go
@@ -23,7 +23,7 @@ func NewProxyClient(config types.MjProxyConfig) *ProxyClient {
 func (c *ProxyClient) Imagine(task types.MjTask) (ImageRes, error) {
 	apiURL := fmt.Sprintf("%s/mj/submit/imagine", c.apiURL)
 	body := ImageReq{
-		Prompt:      task.Prompt,
+		Prompt:      fmt.Sprintf("%s %s", task.Prompt, task.Params),
 		Base64Array: make([]string, 0),
 	}
 	// 生成图片 Base64 编码
@@ -46,8 +46,6 @@ func (c *ProxyClient) Imagine(task types.MjTask) (ImageRes, error) {
 		SetErrorResult(&errRes).
 		Post(apiURL)
 	if err != nil {
-		all, err := io.ReadAll(r.Body)
-		logger.Info(string(all))
 		return ImageRes{}, fmt.Errorf("请求 API %s 出错：%v", apiURL, err)
 	}
 
diff --git a/api/service/mj/service.go b/api/service/mj/service.go
index f73a9c63..17ffe454 100644
--- a/api/service/mj/service.go
+++ b/api/service/mj/service.go
@@ -68,7 +68,7 @@ func (s *Service) Run() {
 		}
 
 		// 如果是 mj-proxy 则自动翻译提示词
-		if utils.HasChinese(task.Prompt) && strings.HasPrefix(s.Name, "mj-proxy-service") {
+		if utils.HasChinese(task.Prompt) {
 			content, err := utils.OpenAIRequest(s.db, fmt.Sprintf(service.TranslatePromptTemplate, task.Prompt))
 			if err == nil {
 				task.Prompt = content
diff --git a/web/src/views/ImageMj.vue b/web/src/views/ImageMj.vue
index 8f09240e..62b70833 100644
--- a/web/src/views/ImageMj.vue
+++ b/web/src/views/ImageMj.vue
@@ -168,7 +168,48 @@
           <div class="extra-params">
             <el-form>
               <el-tabs v-model="activeName" class="title-tabs" @tabChange="tabChange">
-                <el-tab-pane label="文生图(可选)" name="image">
+                <el-tab-pane label="文生图" name="txt2img">
+                  <div class="prompt-box">
+                    <div class="param-line pt">
+                      <div class="flex-row justify-between items-center">
+                        <div class="flex-row justify-start items-center">
+                          <span>提示词：</span>
+                          <el-tooltip effect="light" content="输入你想要的内容，用逗号分割" placement="right">
+                            <el-icon>
+                              <InfoFilled/>
+                            </el-icon>
+                          </el-tooltip>
+                        </div>
+                      </div>
+                    </div>
+
+                    <div class="param-line pt">
+                      <el-input v-model="params.prompt" :autosize="{ minRows: 4, maxRows: 6 }" type="textarea"
+                                ref="promptRef"
+                                placeholder="请在此输入绘画提示词，系统会自动翻译中文提示词，高手请直接输入英文提示词"/>
+                    </div>
+
+                    <div class="param-line pt">
+                      <div class="flex-row justify-between items-center">
+                        <div class="flex-row justify-start items-center">
+                          <span>不希望出现的内容：（可选）</span>
+                          <el-tooltip effect="light" content="不想出现在图片上的元素(例如：树，建筑)" placement="right">
+                            <el-icon>
+                              <InfoFilled/>
+                            </el-icon>
+                          </el-tooltip>
+                        </div>
+                      </div>
+                    </div>
+
+                    <div class="param-line pt">
+                      <el-input v-model="params.neg_prompt" :autosize="{ minRows: 4, maxRows: 6 }" type="textarea"
+                                ref="promptRef"
+                                placeholder="请在此输入你不希望出现在图片上的内容，系统会自动翻译中文提示词"/>
+                    </div>
+                  </div>
+                </el-tab-pane>
+                <el-tab-pane label="图生图" name="img2img">
                   <div class="text">图生图：以某张图片为底稿参考来创作绘画，生成类似风格或类型图像，支持 PNG 和 JPG 格式图片；
                   </div>
                   <div class="param-line">
@@ -190,15 +231,15 @@
                   </div>
 
                   <div class="param-line" style="padding-top: 10px">
-                    <el-form-item label="图像权重:">
+                    <el-form-item label="参考权重：">
                       <template #default>
                         <div class="form-item-inner">
-                          <el-slider v-model.number="params.weight" :max="1" :step="0.01"
+                          <el-slider v-model.number="params.iw" :max="1" :step="0.01"
                                      style="width: 180px;--el-slider-main-bg-color:#47fff1"/>
                           <el-tooltip effect="light"
                                       content="使用图像权重参数--iw来调整图像 URL 与文本的重要性 <br/>权重较高时意味着图像提示将对完成的作业产生更大的影响"
                                       raw-content placement="right">
-                            <el-icon style="margin-top: 9px">
+                            <el-icon>
                               <InfoFilled/>
                             </el-icon>
                           </el-tooltip>
@@ -248,7 +289,7 @@
                   </div>
                 </el-tab-pane>
 
-                <el-tab-pane label="融图(可选)" name="blend">
+                <el-tab-pane label="融图" name="blend">
                   <div class="text">请上传两张以上的图片，最多不超过五张，超过五张图片请使用文生图功能</div>
                   <div class="img-inline">
                     <div class="img-list-box">
@@ -267,7 +308,7 @@
                   </div>
                 </el-tab-pane>
 
-                <el-tab-pane label="换脸(可选)" name="swapFace">
+                <el-tab-pane label="换脸" name="swapFace">
                   <div class="text">请上传两张有脸部的图片，用右边图片的脸替换左边图片的脸</div>
                   <div class="img-inline">
                     <div class="img-list-box">
@@ -285,6 +326,115 @@
                     </el-upload>
                   </div>
                 </el-tab-pane>
+
+                <el-tab-pane name="cref">
+                  <template #label>
+                    <el-badge value="New">
+                      <span>一致性</span>
+                    </el-badge>
+                  </template>
+
+                  <div class="text">注意：只有于 niji6 和 v6 模型支持一致性功能，如果选择其他模型此功能将不起作用。</div>
+                  <div class="param-line">
+                    <el-form-item label="角色一致性：" prop="cref">
+                      <el-input v-model="params.cref" placeholder="请输入图片URL或者上传图片"
+                                style="--el-input-focus-border-color:#47fff1;--el-input-text-color:#ffffff; max-width: 500px; width: 100%"
+                                size="small">
+                        <template #append>
+                          <el-upload
+                              :auto-upload="true"
+                              :show-file-list="false"
+                              @click="beforeUpload('cref')"
+                              :http-request="uploadImg"
+                          >
+                            <el-icon class="uploader-icon">
+                              <UploadFilled/>
+                            </el-icon>
+                          </el-upload>
+                        </template>
+                      </el-input>
+                    </el-form-item>
+                  </div>
+
+                  <div class="param-line">
+                    <el-form-item label="风格一致性：" prop="sref">
+                      <el-input v-model="params.sref" placeholder="请输入图片URL或者上传图片"
+                                style="--el-input-focus-border-color:#47fff1; --el-input-text-color:#ffffff; max-width: 500px; width: 100%"
+                                size="small">
+                        <template #append>
+                          <el-upload
+                              :auto-upload="true"
+                              :show-file-list="false"
+                              @click="beforeUpload('sref')"
+                              :http-request="uploadImg"
+                          >
+                            <el-icon class="uploader-icon">
+                              <UploadFilled/>
+                            </el-icon>
+                          </el-upload>
+                        </template>
+                      </el-input>
+                    </el-form-item>
+                  </div>
+
+                  <div class="param-line" style="padding-top: 10px">
+                    <el-form-item label="参考权重：">
+                      <template #default>
+                        <div class="form-item-inner">
+                          <el-slider v-model.number="params.cw" :max="100" :step="1"
+                                     style="width: 180px;--el-slider-main-bg-color:#47fff1"/>
+                          <el-tooltip effect="light"
+                                      content="取值范围 0-100 <br/>默认值100参考原图的脸部、头发和衣服<br/>0则表示只换脸"
+                                      raw-content placement="right">
+                            <el-icon>
+                              <InfoFilled/>
+                            </el-icon>
+                          </el-tooltip>
+                        </div>
+                      </template>
+                    </el-form-item>
+                  </div>
+
+                  <div class="prompt-box">
+                    <div class="param-line pt">
+                      <div class="flex-row justify-between items-center">
+                        <div class="flex-row justify-start items-center">
+                          <span>提示词：</span>
+                          <el-tooltip effect="light" content="输入你想要的内容，用逗号分割" placement="right">
+                            <el-icon>
+                              <InfoFilled/>
+                            </el-icon>
+                          </el-tooltip>
+                        </div>
+                      </div>
+                    </div>
+
+                    <div class="param-line pt">
+                      <el-input v-model="params.prompt" :autosize="{ minRows: 4, maxRows: 6 }" type="textarea"
+                                ref="promptRef"
+                                placeholder="请在此输入绘画提示词，系统会自动翻译中文提示词，高手请直接输入英文提示词"/>
+                    </div>
+
+                    <div class="param-line pt">
+                      <div class="flex-row justify-between items-center">
+                        <div class="flex-row justify-start items-center">
+                          <span>不希望出现的内容：（可选）</span>
+                          <el-tooltip effect="light" content="不想出现在图片上的元素(例如：树，建筑)" placement="right">
+                            <el-icon>
+                              <InfoFilled/>
+                            </el-icon>
+                          </el-tooltip>
+                        </div>
+                      </div>
+                    </div>
+
+                    <div class="param-line pt">
+                      <el-input v-model="params.neg_prompt" :autosize="{ minRows: 4, maxRows: 6 }" type="textarea"
+                                ref="promptRef"
+                                placeholder="请在此输入你不希望出现在图片上的内容，系统会自动翻译中文提示词"/>
+                    </div>
+                  </div>
+                </el-tab-pane>
               </el-tabs>
 
               <el-row class="text-info">
@@ -343,7 +493,7 @@
             </div>
 
             <h2>创作记录</h2>
-            <div class="finish-job-list" v-loading="loading" element-loading-background="rgba(255, 255, 255, 0.5)">
+            <div class="finish-job-list" v-loading="loading" element-loading-background="rgba(0, 0, 0, 0.5)">
               <div v-if="finishedJobs.length > 0">
                 <ItemList :items="finishedJobs" :width="240" :gap="16">
                   <template #default="scope">
@@ -508,7 +658,7 @@
 
 <script setup>
 import {nextTick, onMounted, onUnmounted, ref} from "vue"
-import {ChromeFilled, Delete, DocumentCopy, InfoFilled, Picture, Plus} from "@element-plus/icons-vue";
+import {ChromeFilled, Delete, DocumentCopy, InfoFilled, Picture, Plus, UploadFilled} from "@element-plus/icons-vue";
 import Compressor from "compressorjs";
 import {httpGet, httpPost} from "@/utils/http";
 import {ElMessage, ElMessageBox, ElNotification} from "element-plus";
@@ -517,7 +667,7 @@ import Clipboard from "clipboard";
 import {checkSession} from "@/action/session";
 import {useRouter} from "vue-router";
 import {getSessionId} from "@/store/session";
-import {removeArrayItem} from "@/utils/libs";
+import {copyObj, removeArrayItem} from "@/utils/libs";
 import LoginDialog from "@/components/LoginDialog.vue";
 
 const listBoxHeight = ref(window.innerHeight - 40)
@@ -545,11 +695,12 @@ const models = [
   {text: "优质模式MJ-5.1", value: " --v 5.1", img: "/images/mj/mj-v5.1.jpg"},
   {text: "虚幻模式MJ-5", value: " --v 5", img: "/images/mj/mj-v5.jpg"},
   {text: "真实模式MJ-4", value: " --v 4", img: "/images/mj/mj-v4.jpg"},
-  {text: "动漫风niji5 原始", value: " --niji 5", img: "/images/mj/mj-niji.png"},
-  {text: "动漫风niji5 可爱", value: " --niji 5 --style cute", img: "/images/mj/nj1.jpg"},
-  {text: "动漫风niji5 风景", value: " --niji 5 --style scenic", img: "/images/mj/nj2.jpg"},
-  {text: "动漫风niji5 表现力", value: " --niji 5 --style expressive", img: "/images/mj/nj3.jpg"},
-  {text: "动漫风niji4", value: " --niji 4", img: "/images/mj/nj4.jpg"},
+  {text: "动漫风-niji4", value: " --niji 4", img: "/images/mj/nj4.jpg"},
+  {text: "动漫风-niji5", value: " --niji 5", img: "/images/mj/mj-niji.png"},
+  {text: "动漫风-niji5 可爱", value: " --niji 5 --style cute", img: "/images/mj/nj1.jpg"},
+  {text: "动漫风-niji5 风景", value: " --niji 5 --style scenic", img: "/images/mj/nj2.jpg"},
+  {text: "动漫风-niji6", value: " --niji 6", img: "/images/mj/nj3.jpg"},
+
 ]
 
 const options = [
@@ -581,17 +732,20 @@ const initParams = {
   seed: 0,
   img_arr: [],
   raw: false,
-  weight: 0.25,
+  iw: 0,
   prompt: router.currentRoute.value.params["prompt"] ?? "",
   neg_prompt: "",
   tile: false,
-  quality: 0
+  quality: 0,
+  cref: "",
+  sref: "",
+  cw: 0,
 }
-const params = ref(initParams)
+const params = ref(copyObj(initParams))
 
 const imgList = ref([])
 
-const activeName = ref('image')
+const activeName = ref('txt2img')
 
 const runningJobs = ref([])
 const finishedJobs = ref([])
@@ -780,6 +934,11 @@ const changeModel = (item) => {
   params.value.model = item.value
 }
 
+const imgKey = ref("")
+const beforeUpload = (key) => {
+  imgKey.value = key
+}
+
 // 图片上传
 const uploadImg = (file) => {
   if (!isLogin.value) {
@@ -795,7 +954,12 @@ const uploadImg = (file) => {
       formData.append('file', result, result.name);
       // 执行上传操作
       httpPost('/api/upload', formData).then((res) => {
-        imgList.value.push(res.data.url)
+        if (imgKey.value === '') {
+          imgList.value.push(res.data.url)
+        } else { // 单张图片上传
+          params.value[imgKey.value] = res.data.url
+          imgKey.value = ''
+        }
         ElMessage.success('上传成功')
       }).catch((e) => {
         ElMessage.error('上传失败:' + e.message)
@@ -830,7 +994,8 @@ const generate = () => {
   httpPost("/api/mj/image", params.value).then(() => {
     ElMessage.success("绘画任务推送成功，请耐心等待任务执行...")
     power.value -= mjPower.value
-    params.value = initParams
+    params.value = copyObj(initParams)
+    imgList.value = []
   }).catch(e => {
     ElMessage.error("任务推送失败：" + e.message)
   })
@@ -897,7 +1062,11 @@ const publishImage = (item, action) => {
 
 // 切换菜单
 const tabChange = (tab) => {
-  params.value.task_type = tab
+  if (tab === "txt2img" || tab === "img2img" || tab === "cref") {
+    params.value.task_type = "image"
+  } else {
+    params.value.task_type = tab
+  }
 }
 
 // 删除已上传图片
diff --git a/web/src/views/ImageSd.vue b/web/src/views/ImageSd.vue
index ad0f7b1d..75cdc24c 100644
--- a/web/src/views/ImageSd.vue
+++ b/web/src/views/ImageSd.vue
@@ -222,7 +222,7 @@
                 </div>
               </div>
 
-              <div class="param-line" v-loading="translating" element-loading-background="rgba(122, 122, 122, 0.8)">
+              <div class="param-line" v-loading="translating" element-loading-background="rgba(0, 0, 0, 0.5)">
                 <el-input
                     v-model="params.prompt"
                     :autosize="{ minRows: 4, maxRows: 6 }"

From 9cc2ea412bdb151d6ae93c70cd44afa7893b7520 Mon Sep 17 00:00:00 2001
From: RockYang <yangjian102621@gmail.com>
Date: Tue, 2 Apr 2024 17:24:38 +0800
Subject: [PATCH 07/12] feat: image preview for stable-diffusion task is ready

---
 CHANGELOG.md                     |   1 +
 api/go.mod                       |   2 +
 api/go.sum                       |  16 +++++
 api/handler/sd_handler.go        |  12 ++--
 api/main.go                      |   1 +
 api/service/sd/pool.go           |   4 +-
 api/service/sd/service.go        |  11 +++-
 api/store/leveldb.go             | 110 +++++++++++++++++++++++++++++++
 api/test/test.go                 |   9 ++-
 deploy/docker-compose.yaml       |   1 +
 web/src/assets/css/image-mj.css  |   5 ++
 web/src/assets/css/image-mj.styl |   6 ++
 web/src/views/ImageSd.vue        |   6 +-
 13 files changed, 171 insertions(+), 13 deletions(-)
 create mode 100644 api/store/leveldb.go

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 3d9110a0..06851171 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -3,6 +3,7 @@
 * 功能新增：支持前端菜单可以配置
 * 功能优化：在登录和注册界面标题显示软件版本号
 * 功能优化：MJ 绘画支持 --sref 和 --cref 图片一致性参数
+* 功能优化：使用 leveldb 解决 SD 绘图进度图片预览问题
 * 功能优化：手机端支持免登录预览功能
 * Bug修复：解决因为图片上传使用相对路径而导致融图失败的问题。
 * 功能新增：手机端支持 Stable-Diffusion 绘画
diff --git a/api/go.mod b/api/go.mod
index ff63a4a6..fc131837 100644
--- a/api/go.mod
+++ b/api/go.mod
@@ -28,10 +28,12 @@ require github.com/xxl-job/xxl-job-executor-go v1.2.0
 require (
 	github.com/mojocn/base64Captcha v1.3.1
 	github.com/shopspring/decimal v1.3.1
+	github.com/syndtr/goleveldb v1.0.0
 )
 
 require (
 	github.com/golang/freetype v0.0.0-20170609003504-e2365dfdc4a0 // indirect
+	github.com/golang/snappy v0.0.0-20180518054509-2e65f85255db // indirect
 	golang.org/x/image v0.0.0-20190501045829-6d32002ffd75 // indirect
 )
 
diff --git a/api/go.sum b/api/go.sum
index b94c92a0..e5c987ce 100644
--- a/api/go.sum
+++ b/api/go.sum
@@ -27,6 +27,7 @@ github.com/dustin/go-humanize v1.0.1 h1:GzkhY7T5VNhEkwH0PVJgjz+fX1rhBrR7pRT3mDkp
 github.com/dustin/go-humanize v1.0.1/go.mod h1:Mu1zIs6XwVuF/gI1OepvI0qD18qycQx+mFykh5fBlto=
 github.com/eatmoreapple/openwechat v1.2.1 h1:ez4oqF/Y2NSEX/DbPV8lvj7JlfkYqvieeo4awx5lzfU=
 github.com/eatmoreapple/openwechat v1.2.1/go.mod h1:61HOzTyvLobGdgWhL68jfGNwTJEv0mhQ1miCXQrvWU8=
+github.com/fsnotify/fsnotify v1.4.7/go.mod h1:jwhsz4b93w/PPRr/qN1Yymfu8t87LnFCMoQvtojpjFo=
 github.com/fsnotify/fsnotify v1.4.9 h1:hsms1Qyu0jgnwNXIxa+/V/PDsU6CfLf6CNO8H7IWoS4=
 github.com/gabriel-vasile/mimetype v1.4.2 h1:w5qFW6JKBz9Y393Y4q372O9A7cUSequkh1Q7OhCmWKU=
 github.com/gabriel-vasile/mimetype v1.4.2/go.mod h1:zApsH/mKG4w07erKIaJPFiX0Tsq9BFQgN3qGY5GnNgA=
@@ -67,8 +68,11 @@ github.com/golang/freetype v0.0.0-20170609003504-e2365dfdc4a0 h1:DACJavvAHhabrF0
 github.com/golang/freetype v0.0.0-20170609003504-e2365dfdc4a0/go.mod h1:E/TSTwGwJL78qG/PmXZO1EjYhfJinVAhrmmHX6Z8B9k=
 github.com/golang/mock v1.6.0 h1:ErTB+efbowRARo13NNdxyJji2egdxLGQhRaY+DUumQc=
 github.com/golang/mock v1.6.0/go.mod h1:p6yTPP+5HYm5mzsMV8JkE6ZKdX+/wYM6Hr+LicevLPs=
+github.com/golang/protobuf v1.2.0/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U=
 github.com/golang/protobuf v1.5.0/go.mod h1:FsONVRAS9T7sI+LIUmWTfcYkHO4aIWwzhcaSAoJOfIk=
 github.com/golang/protobuf v1.5.3 h1:KhyjKVUg7Usr/dYsdSqoFveMYd5ko72D+zANwlG1mmg=
+github.com/golang/snappy v0.0.0-20180518054509-2e65f85255db h1:woRePGFeVFfLKN/pOkfl+p/TAqKOfFu+7KPlMVpok/w=
+github.com/golang/snappy v0.0.0-20180518054509-2e65f85255db/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q=
 github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
 github.com/google/go-cmp v0.5.9 h1:O2Tfq5qg4qc4AmwVlvv0oLiVAGB7enBSJ2x2DqQFi38=
 github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg=
@@ -83,6 +87,7 @@ github.com/hashicorp/errwrap v1.1.0 h1:OxrOeh75EUXMY8TBjag2fzXGZ40LB6IKw45YeGUDY
 github.com/hashicorp/errwrap v1.1.0/go.mod h1:YH+1FKiLXxHSkmPseP+kNlulaMuP3n2brvKWEqk/Jc4=
 github.com/hashicorp/go-multierror v1.1.1 h1:H5DkEtf6CXdFp0N0Em5UCwQpXMWke8IA0+lD48awMYo=
 github.com/hashicorp/go-multierror v1.1.1/go.mod h1:iw975J/qwKPdAO1clOe2L8331t/9/fmwbPZ6JB6eMoM=
+github.com/hpcloud/tail v1.0.0/go.mod h1:ab1qPbhIpdTxEkNHXyeSf5vhxWSCs/tWer42PpOxQnU=
 github.com/imroc/req/v3 v3.37.2 h1:vEemuA0cq9zJ6lhe+mSRhsZm951bT0CdiSH47+KTn6I=
 github.com/imroc/req/v3 v3.37.2/go.mod h1:DECzjVIrj6jcUr5n6e+z0ygmCO93rx4Jy0RjOEe1YCI=
 github.com/jinzhu/inflection v1.0.0 h1:K317FqzuhWc8YvSVlFMCCUb36O/S9MCKRDI7QkRKD/E=
@@ -133,9 +138,12 @@ github.com/mojocn/base64Captcha v1.3.1/go.mod h1:wAQCKEc5bDujxKRmbT6/vTnTt5CjStQ
 github.com/nfnt/resize v0.0.0-20180221191011-83c6a9932646 h1:zYyBkD/k9seD2A7fsi6Oo2LfFZAehjjQMERAvZLEDnQ=
 github.com/nfnt/resize v0.0.0-20180221191011-83c6a9932646/go.mod h1:jpp1/29i3P1S/RLdc7JQKbRpFeM1dOBd8T9ki5s+AY8=
 github.com/nxadm/tail v1.4.8 h1:nPr65rt6Y5JFSKQO7qToXr7pePgD6Gwiw05lkbyAQTE=
+github.com/onsi/ginkgo v1.6.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE=
+github.com/onsi/ginkgo v1.7.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE=
 github.com/onsi/ginkgo v1.16.5 h1:8xi0RTUf59SOSfEtZMvwTvXYMzG4gV23XVHOZiXNtnE=
 github.com/onsi/ginkgo/v2 v2.10.0 h1:sfUl4qgLdvkChZrWCYndY2EAu9BRIw1YphNAzy1VNWs=
 github.com/onsi/ginkgo/v2 v2.10.0/go.mod h1:UDQOh5wbQUlMnkLfVaIUMtQ1Vus92oM+P2JX1aulgcE=
+github.com/onsi/gomega v1.4.3/go.mod h1:ex+gbHU/CVuBBDIJjb2X0qEXbFg53c61hWP/1CpauHY=
 github.com/onsi/gomega v1.27.7 h1:fVih9JD6ogIiHUN6ePK7HJidyEDpWGVB5mzM7cWNXoU=
 github.com/opentracing/opentracing-go v1.2.1-0.20220228012449-10b1cf09e00b h1:FfH+VrHHk6Lxt9HdVS0PXzSXFyS2NbZKXv33FYPol0A=
 github.com/opentracing/opentracing-go v1.2.1-0.20220228012449-10b1cf09e00b/go.mod h1:AC62GU6hc0BrNm+9RK9VSiwa/EUe1bkIeFORAMcHvJU=
@@ -193,6 +201,8 @@ github.com/stretchr/testify v1.8.1/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o
 github.com/stretchr/testify v1.8.2/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4=
 github.com/stretchr/testify v1.8.3 h1:RP3t2pwF7cMEbC1dqtB6poj3niw/9gnV4Cjg5oW5gtY=
 github.com/stretchr/testify v1.8.3/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo=
+github.com/syndtr/goleveldb v1.0.0 h1:fBdIW9lB4Iz0n9khmH8w27SJ3QEJ7+IgjPEwGSZiFdE=
+github.com/syndtr/goleveldb v1.0.0/go.mod h1:ZVVdQEZoIme9iO1Ch2Jdy24qqXrMMOU6lpPAyBWyWuQ=
 github.com/twitchyliquid64/golang-asm v0.15.1 h1:SU5vSMR7hnwNxj24w34ZyCi/FmDZTkS4MhqMhdFk5YI=
 github.com/twitchyliquid64/golang-asm v0.15.1/go.mod h1:a1lVb/DtPvCB8fslRZhAngC2+aY1QWCk3Cedj/Gdt08=
 github.com/uber/jaeger-client-go v2.30.0+incompatible h1:D6wyKGCecFaSRUpo8lCVbaOOb6ThwMmTEbhRwtKR97o=
@@ -235,6 +245,7 @@ golang.org/x/mod v0.4.2/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
 golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4/go.mod h1:jJ57K6gSWd91VN4djpZkiMVwK6gcyfeH4XE8wZrZaV4=
 golang.org/x/mod v0.11.0 h1:bUO06HqtnRcc/7l71XBe4WcqTZ+3AH1J59zWDDwLKgU=
 golang.org/x/mod v0.11.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs=
+golang.org/x/net v0.0.0-20180906233101-161cd47e91fd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
 golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
 golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
 golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg=
@@ -243,11 +254,13 @@ golang.org/x/net v0.0.0-20220722155237-a158d28d115b/go.mod h1:XRhObCWvk6IyKnWLug
 golang.org/x/net v0.1.0/go.mod h1:Cx3nUiGt4eDBEyega/BKRp+/AlGL8hYe7U9odMt2Cco=
 golang.org/x/net v0.14.0 h1:BONx9s002vGdD9umnlX1Po8vOZmrgH34qlHcD1MfK14=
 golang.org/x/net v0.14.0/go.mod h1:PpSgVXXLK0OxS0F31C1/tv6XNguvCrnXIDrFMspZIUI=
+golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sync v0.0.0-20210220032951-036812b2e83c/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sync v0.0.0-20220722155255-886fb9371eb4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sync v0.3.0 h1:ftCYgMx6zT/asHUrPw8BLLscYtGznsLAnjq5RH9P66E=
 golang.org/x/sync v0.3.0/go.mod h1:FU7BRWz2tNW+3quACPkgCx/L+uEAv1htQ0V83Z9Rj+Y=
+golang.org/x/sys v0.0.0-20180909124046-d0be0721c37e/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
 golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
 golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
@@ -294,12 +307,15 @@ gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod h1:Co6ibVJAznAaIkqp8
 gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c h1:Hei/4ADfdWqJk1ZMxUNpqntNwaWcugrBjAiHlqqRiVk=
 gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c/go.mod h1:JHkPIbrfpd72SG/EVd6muEfDQjcINNoR0C8j2r3qZ4Q=
 gopkg.in/errgo.v2 v2.1.0/go.mod h1:hNsd1EY+bozCKY1Ytp96fpM3vjJbqLJn88ws8XvfDNI=
+gopkg.in/fsnotify.v1 v1.4.7/go.mod h1:Tz8NjZHkW78fSQdbUxIjBTcgA1z1m8ZHf0WmKUhAMys=
 gopkg.in/ini.v1 v1.66.2/go.mod h1:pNLf8WUiyNEtQjuu5G5vTm06TEv9tsIgeAvK8hOrP4k=
 gopkg.in/ini.v1 v1.67.0 h1:Dgnx+6+nfE+IfzjUEISNeydPJh9AXNNsWbGP9KzCsOA=
 gopkg.in/ini.v1 v1.67.0/go.mod h1:pNLf8WUiyNEtQjuu5G5vTm06TEv9tsIgeAvK8hOrP4k=
 gopkg.in/natefinch/lumberjack.v2 v2.2.1 h1:bBRl1b0OH9s/DuPhuXpNl+VtCaJXFZ5/uEFST95x9zc=
 gopkg.in/natefinch/lumberjack.v2 v2.2.1/go.mod h1:YD8tP3GAjkrDg1eZH7EGmyESg/lsYskCTPBJVb9jqSc=
 gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7 h1:uRGJdciOHaEIrze2W8Q3AKkepLTh2hOroT7a+7czfdQ=
+gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7/go.mod h1:dt/ZhP58zS4L8KSrWDmTeBkI65Dw0HsyUHuEVlX15mw=
+gopkg.in/yaml.v2 v2.2.1/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
 gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
 gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
 gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=
diff --git a/api/handler/sd_handler.go b/api/handler/sd_handler.go
index 09b35d49..ca1e9650 100644
--- a/api/handler/sd_handler.go
+++ b/api/handler/sd_handler.go
@@ -6,11 +6,11 @@ import (
 	"chatplus/service"
 	"chatplus/service/oss"
 	"chatplus/service/sd"
+	"chatplus/store"
 	"chatplus/store/model"
 	"chatplus/store/vo"
 	"chatplus/utils"
 	"chatplus/utils/resp"
-	"encoding/base64"
 	"fmt"
 	"net/http"
 	"time"
@@ -28,13 +28,15 @@ type SdJobHandler struct {
 	pool      *sd.ServicePool
 	uploader  *oss.UploaderManager
 	snowflake *service.Snowflake
+	leveldb   *store.LevelDB
 }
 
-func NewSdJobHandler(app *core.AppServer, db *gorm.DB, pool *sd.ServicePool, manager *oss.UploaderManager, snowflake *service.Snowflake) *SdJobHandler {
+func NewSdJobHandler(app *core.AppServer, db *gorm.DB, pool *sd.ServicePool, manager *oss.UploaderManager, snowflake *service.Snowflake, levelDB *store.LevelDB) *SdJobHandler {
 	return &SdJobHandler{
 		pool:      pool,
 		uploader:  manager,
 		snowflake: snowflake,
+		leveldb:   levelDB,
 		BaseHandler: BaseHandler{
 			App: app,
 			DB:  db,
@@ -257,10 +259,10 @@ func (h *SdJobHandler) getData(finish bool, userId uint, page int, pageSize int,
 		}
 
 		if item.Progress < 100 {
-			// 正在运行中任务使用代理访问图片
-			image, err := utils.DownloadImage(item.ImgURL, "")
+			// 从 leveldb 中获取图片预览数据
+			imageData, err := h.leveldb.Get(item.TaskId)
 			if err == nil {
-				job.ImgURL = "data:image/png;base64," + base64.StdEncoding.EncodeToString(image)
+				job.ImgURL = "data:image/png;base64," + string(imageData)
 			}
 		}
 		jobs = append(jobs, job)
diff --git a/api/main.go b/api/main.go
index 8b3c1ed1..24efc68e 100644
--- a/api/main.go
+++ b/api/main.go
@@ -96,6 +96,7 @@ func main() {
 		fx.Provide(store.NewGormConfig),
 		fx.Provide(store.NewMysql),
 		fx.Provide(store.NewRedisClient),
+		fx.Provide(store.NewLevelDB),
 
 		fx.Provide(func() embed.FS {
 			return xdbFS
diff --git a/api/service/sd/pool.go b/api/service/sd/pool.go
index 2661edd1..3033b548 100644
--- a/api/service/sd/pool.go
+++ b/api/service/sd/pool.go
@@ -20,7 +20,7 @@ type ServicePool struct {
 	Clients     *types.LMap[uint, *types.WsClient] // UserId => Client
 }
 
-func NewServicePool(db *gorm.DB, redisCli *redis.Client, manager *oss.UploaderManager, appConfig *types.AppConfig) *ServicePool {
+func NewServicePool(db *gorm.DB, redisCli *redis.Client, manager *oss.UploaderManager, appConfig *types.AppConfig, levelDB *store.LevelDB) *ServicePool {
 	services := make([]*Service, 0)
 	taskQueue := store.NewRedisQueue("StableDiffusion_Task_Queue", redisCli)
 	notifyQueue := store.NewRedisQueue("StableDiffusion_Queue", redisCli)
@@ -32,7 +32,7 @@ func NewServicePool(db *gorm.DB, redisCli *redis.Client, manager *oss.UploaderMa
 
 		// create sd service
 		name := fmt.Sprintf("StableDifffusion Service-%s", config.Model)
-		service := NewService(name, config, taskQueue, notifyQueue, db, manager)
+		service := NewService(name, config, taskQueue, notifyQueue, db, manager, levelDB)
 		// run sd service
 		go func() {
 			service.Run()
diff --git a/api/service/sd/service.go b/api/service/sd/service.go
index f87067a3..b2baccca 100644
--- a/api/service/sd/service.go
+++ b/api/service/sd/service.go
@@ -24,9 +24,10 @@ type Service struct {
 	db            *gorm.DB
 	uploadManager *oss.UploaderManager
 	name          string // service name
+	leveldb       *store.LevelDB
 }
 
-func NewService(name string, config types.StableDiffusionConfig, taskQueue *store.RedisQueue, notifyQueue *store.RedisQueue, db *gorm.DB, manager *oss.UploaderManager) *Service {
+func NewService(name string, config types.StableDiffusionConfig, taskQueue *store.RedisQueue, notifyQueue *store.RedisQueue, db *gorm.DB, manager *oss.UploaderManager, levelDB *store.LevelDB) *Service {
 	config.ApiURL = strings.TrimRight(config.ApiURL, "/")
 	return &Service{
 		name:          name,
@@ -35,6 +36,7 @@ func NewService(name string, config types.StableDiffusionConfig, taskQueue *stor
 		taskQueue:     taskQueue,
 		notifyQueue:   notifyQueue,
 		db:            db,
+		leveldb:       levelDB,
 		uploadManager: manager,
 	}
 }
@@ -167,15 +169,20 @@ func (s *Service) Txt2Img(task types.SdTask) error {
 			}
 			s.db.Model(&model.SdJob{Id: uint(task.Id)}).UpdateColumn("progress", 100)
 			s.notifyQueue.RPush(task.UserId)
+			// 从 leveldb 中删除预览图片数据
+			_ = s.leveldb.Delete(task.Params.TaskId)
 			return nil
 		default:
 			err, resp := s.checkTaskProgress()
 			// 更新任务进度
 			if err == nil && resp.Progress > 0 {
-				logger.Debugf("Check task progress: %+v", resp.Progress)
 				s.db.Model(&model.SdJob{Id: uint(task.Id)}).UpdateColumn("progress", int(resp.Progress*100))
 				// 发送更新状态信号
 				s.notifyQueue.RPush(task.UserId)
+				// 保存预览图片数据
+				if resp.CurrentImage != "" {
+					_ = s.leveldb.Put(task.Params.TaskId, resp.CurrentImage)
+				}
 			}
 			time.Sleep(time.Second)
 		}
diff --git a/api/store/leveldb.go b/api/store/leveldb.go
new file mode 100644
index 00000000..c74d4090
--- /dev/null
+++ b/api/store/leveldb.go
@@ -0,0 +1,110 @@
+package store
+
+import (
+	"encoding/json"
+
+	"github.com/syndtr/goleveldb/leveldb"
+	"github.com/syndtr/goleveldb/leveldb/util"
+)
+
+type LevelDB struct {
+	driver *leveldb.DB
+}
+
+func NewLevelDB() (*LevelDB, error) {
+	db, err := leveldb.OpenFile("data", nil)
+	if err != nil {
+		return nil, err
+	}
+	return &LevelDB{
+		driver: db,
+	}, nil
+}
+
+func (db *LevelDB) Put(key string, value interface{}) error {
+	var byteData []byte
+	if v, ok := value.(string); ok {
+		byteData = []byte(v)
+	} else {
+		b, err := json.Marshal(value)
+		if err != nil {
+			return err
+		}
+		byteData = b
+	}
+	return db.driver.Put([]byte(key), byteData, nil)
+}
+
+func (db *LevelDB) Get(key string) ([]byte, error) {
+	bytes, err := db.driver.Get([]byte(key), nil)
+	if err != nil {
+		return nil, err
+	}
+
+	return bytes, nil
+}
+
+func (db *LevelDB) Search(prefix string) []string {
+	var items = make([]string, 0)
+	iter := db.driver.NewIterator(util.BytesPrefix([]byte(prefix)), nil)
+	defer iter.Release()
+
+	for iter.Next() {
+		items = append(items, string(iter.Value()))
+	}
+	return items
+}
+
+type PageVo struct {
+	Items     []string
+	Page      int
+	PageSize  int
+	Total     int
+	TotalPage int
+}
+
+func (db *LevelDB) SearchPage(prefix string, page int, pageSize int) *PageVo {
+	var items = make([]string, 0)
+	iter := db.driver.NewIterator(util.BytesPrefix([]byte(prefix)), nil)
+	defer iter.Release()
+
+	res := &PageVo{Page: page, PageSize: pageSize}
+	// 计算数据总数和总页数
+	total := 0
+	for iter.Next() {
+		total++
+	}
+	res.TotalPage = (total + pageSize - 1) / pageSize
+	res.Total = total
+
+	// 计算目标页码的起始和结束位置
+	start := (page - 1) * pageSize
+	if start > total {
+		return nil
+	}
+	end := start + pageSize
+	if end > total {
+		end = total
+	}
+
+	// 跳转到目标页码的起始位置
+	count := 0
+	for iter.Next() {
+		if count >= start {
+			items = append(items, string(iter.Value()))
+		}
+		count++
+	}
+	iter.Release()
+	res.Items = items
+	return res
+}
+
+func (db *LevelDB) Delete(key string) error {
+	return db.driver.Delete([]byte(key), nil)
+}
+
+// Close release resources
+func (db *LevelDB) Close() error {
+	return db.driver.Close()
+}
diff --git a/api/test/test.go b/api/test/test.go
index 79058077..cc826def 100644
--- a/api/test/test.go
+++ b/api/test/test.go
@@ -1,5 +1,12 @@
 package main
 
-func main() {
+import (
+	"fmt"
+	"reflect"
+)
 
+func main() {
+	text := 1
+	bytes := reflect.ValueOf(text).Bytes()
+	fmt.Println(bytes)
 }
diff --git a/deploy/docker-compose.yaml b/deploy/docker-compose.yaml
index 7c74477d..2a2c2c63 100644
--- a/deploy/docker-compose.yaml
+++ b/deploy/docker-compose.yaml
@@ -72,6 +72,7 @@ services:
       - ./conf/config.toml:/var/www/app/config.toml
       - ./logs/app:/var/www/app/logs
       - ./static:/var/www/app/static
+      - ./data/leveldb:/var/www/app/data
 
   # 前端应用
   chatgpt-plus-web:
diff --git a/web/src/assets/css/image-mj.css b/web/src/assets/css/image-mj.css
index 9d362952..f595bc43 100644
--- a/web/src/assets/css/image-mj.css
+++ b/web/src/assets/css/image-mj.css
@@ -182,6 +182,11 @@
 .page-mj .inner .el-form .el-slider {
   width: 180px;
 }
+.page-mj .inner .el-form .uploader-icon {
+  font-size: 24px;
+  position: relative;
+  top: 3px;
+}
 .page-mj .inner .task-list-box {
   width: 100%;
   padding: 10px;
diff --git a/web/src/assets/css/image-mj.styl b/web/src/assets/css/image-mj.styl
index 4d16d2f5..d42935c0 100644
--- a/web/src/assets/css/image-mj.styl
+++ b/web/src/assets/css/image-mj.styl
@@ -225,6 +225,12 @@
       .el-input, .el-slider {
         width 180px
       }
+
+      .uploader-icon {
+        font-size 24px
+        position relative
+        top 3px
+      }
     }
 
     @import "task-list.styl"
diff --git a/web/src/views/ImageSd.vue b/web/src/views/ImageSd.vue
index 75cdc24c..7443a50f 100644
--- a/web/src/views/ImageSd.vue
+++ b/web/src/views/ImageSd.vue
@@ -559,7 +559,7 @@ const connect = () => {
     });
   }
 
-  const _socket = new WebSocket(host + `/api/sd/client?user_id=${userId.value}`);
+  const _socket = new WebSocket(host + `/api/sd/client`);
   _socket.addEventListener('open', () => {
     socket.value = _socket;
 
@@ -621,9 +621,9 @@ const initData = () => {
   });
 }
 
-const fetchRunningJobs = (userId) => {
+const fetchRunningJobs = () => {
   // 获取运行中的任务
-  httpGet(`/api/sd/jobs?status=0&user_id=${userId}`).then(res => {
+  httpGet(`/api/sd/jobs?status=0`).then(res => {
     const jobs = res.data
     const _jobs = []
     for (let i = 0; i < jobs.length; i++) {

From ed286c8894361049915fb08181fc2eb4f6c8baf2 Mon Sep 17 00:00:00 2001
From: RockYang <yangjian102621@gmail.com>
Date: Tue, 2 Apr 2024 19:01:28 +0800
Subject: [PATCH 08/12] feat: midjourney role and style consistency is ready

---
 web/src/assets/css/mobile/image-mj.css  |   5 +
 web/src/assets/css/mobile/image-mj.styl |   7 ++
 web/src/views/ImageMj.vue               |   2 +-
 web/src/views/ImageSd.vue               |   2 +-
 web/src/views/mobile/ImageMj.vue        | 152 +++++++++++++++++++-----
 5 files changed, 139 insertions(+), 29 deletions(-)

diff --git a/web/src/assets/css/mobile/image-mj.css b/web/src/assets/css/mobile/image-mj.css
index a28c1753..839ba770 100644
--- a/web/src/assets/css/mobile/image-mj.css
+++ b/web/src/assets/css/mobile/image-mj.css
@@ -55,6 +55,11 @@
   display: flex;
   justify-content: right;
 }
+.mobile-mj .content .tip-text {
+  padding: 10px;
+  line-height: 1.5;
+  color: #c1c1c1;
+}
 .mobile-mj .content .running-job-list .van-grid .van-grid-item .van-grid-item__content {
   padding: 0;
   position: relative;
diff --git a/web/src/assets/css/mobile/image-mj.styl b/web/src/assets/css/mobile/image-mj.styl
index 948854bd..acdbd38f 100644
--- a/web/src/assets/css/mobile/image-mj.styl
+++ b/web/src/assets/css/mobile/image-mj.styl
@@ -74,6 +74,13 @@
       }
     }
 
+
+    .tip-text {
+      padding 10px
+      line-height 1.5
+      color #c1c1c1
+    }
+
     .running-job-list {
       .van-grid {
         .van-grid-item {
diff --git a/web/src/views/ImageMj.vue b/web/src/views/ImageMj.vue
index 62b70833..868268bb 100644
--- a/web/src/views/ImageMj.vue
+++ b/web/src/views/ImageMj.vue
@@ -290,7 +290,7 @@
                 </el-tab-pane>
 
                 <el-tab-pane label="融图" name="blend">
-                  <div class="text">请上传两张以上的图片，最多不超过五张，超过五张图片请使用文生图功能</div>
+                  <div class="text">请上传两张以上的图片，最多不超过五张，超过五张图片请使用图生图功能</div>
                   <div class="img-inline">
                     <div class="img-list-box">
                       <div class="img-item" v-for="imgURL in imgList">
diff --git a/web/src/views/ImageSd.vue b/web/src/views/ImageSd.vue
index 7443a50f..7c3a23a9 100644
--- a/web/src/views/ImageSd.vue
+++ b/web/src/views/ImageSd.vue
@@ -309,7 +309,7 @@
                 <el-empty :image-size="100" v-else/>
               </div>
               <h2>创作记录</h2>
-              <div class="finish-job-list" v-loading="loading" element-loading-background="rgba(255, 255, 255, 0.5)">
+              <div class="finish-job-list" v-loading="loading" element-loading-background="rgba(0, 0, 0, 0.5)">
                 <div v-if="finishedJobs.length > 0">
                   <ItemList :items="finishedJobs" :width="240" :gap="16">
                     <template #default="scope">
diff --git a/web/src/views/mobile/ImageMj.vue b/web/src/views/mobile/ImageMj.vue
index 030dcaf9..33a02f8b 100644
--- a/web/src/views/mobile/ImageMj.vue
+++ b/web/src/views/mobile/ImageMj.vue
@@ -62,36 +62,113 @@
         </div>
 
         <div class="text-line">
-          <van-field v-model="params.prompt"
-                     rows="3"
-                     label="提示词"
-                     autosize
-                     type="textarea"
-                     placeholder="请在此输入绘画提示词，系统会自动翻译中文提示词，高手请直接输入英文提示词"/>
+          <van-tabs v-model:active="activeName" @change="tabChange">
+            <van-tab title="文生图" name="txt2img">
+              <div class="text-line">
+                <van-field v-model="params.prompt"
+                           rows="3"
+                           autosize
+                           type="textarea"
+                           placeholder="请在此输入绘画提示词，系统会自动翻译中文提示词，高手请直接输入英文提示词"/>
+              </div>
+            </van-tab>
+            <van-tab title="图生图" name="img2img">
+              <div class="text-line">
+                <van-field v-model="params.prompt"
+                           rows="3"
+                           autosize
+                           type="textarea"
+                           placeholder="请在此输入绘画提示词，系统会自动翻译中文提示词，高手请直接输入英文提示词"/>
+              </div>
+
+              <div class="text-line">
+                <van-uploader v-model="imgList" :after-read="uploadImg"/>
+              </div>
+              <div class="text-line">
+                <van-field label="垫图权重">
+                  <template #input>
+                    <van-slider v-model.number="params.iw" :max="1" :step="0.01"
+                                @update:model-value="showToast('当前值：' + params.iw)"/>
+                  </template>
+                </van-field>
+              </div>
+
+              <van-cell-group>
+                <van-field
+                    v-model="params.cref"
+                    center
+                    clearable
+                    label="角色一致性"
+                    placeholder="请输入图片URL或者上传图片"
+                >
+                  <template #button>
+                    <van-uploader @click="beforeUpload('cref')" :after-read="uploadImg">
+                      <van-button size="mini" type="primary" icon="plus"/>
+                    </van-uploader>
+                  </template>
+                </van-field>
+              </van-cell-group>
+
+              <van-cell-group>
+                <van-field
+                    v-model="params.sref"
+                    center
+                    clearable
+                    label="风格一致性"
+                    placeholder="请输入图片URL或者上传图片"
+                >
+                  <template #button>
+                    <van-uploader @click="beforeUpload('sref')" :after-read="uploadImg">
+                      <van-button size="mini" type="primary" icon="plus"/>
+                    </van-uploader>
+                  </template>
+                </van-field>
+              </van-cell-group>
+
+              <div class="text-line">
+                <van-field label="一致性权重">
+                  <template #input>
+                    <van-slider v-model.number="params.cw" :max="100" :step="1"
+                                @update:model-value="showToast('当前值：' + params.cw)"/>
+                  </template>
+                </van-field>
+              </div>
+            </van-tab>
+            <van-tab title="融图" name="blend">
+              <div class="tip-text">请上传两张以上的图片，最多不超过五张，超过五张图片请使用图生图功能。</div>
+              <div class="text-line">
+                <van-uploader v-model="imgList" :after-read="uploadImg"/>
+              </div>
+            </van-tab>
+            <van-tab title="换脸" name="swapFace">
+              <div class="tip-text">请上传两张有脸部的图片，用右边图片的脸替换左边图片的脸。</div>
+              <div class="text-line">
+                <van-uploader v-model="imgList" :after-read="uploadImg"/>
+              </div>
+            </van-tab>
+          </van-tabs>
         </div>
 
-        <van-collapse v-model="activeColspan">
-          <van-collapse-item title="垫图" name="img">
-            <van-field>
-              <template #input>
-                <van-uploader v-model="imgList" :after-read="uploadImg"/>
-              </template>
-            </van-field>
-          </van-collapse-item>
-          <van-collapse-item title="反向提示词" name="neg_prompt">
-            <van-field
-                v-model="params.prompt"
-                rows="3"
-                autosize
-                type="textarea"
-                placeholder="不想出现在图片上的元素(例如：树，建筑)"
-            />
-          </van-collapse-item>
-        </van-collapse>
+        <div class="text-line">
+          <van-collapse v-model="activeColspan">
+            <van-collapse-item title="反向提示词" name="neg_prompt">
+              <van-field
+                  v-model="params.prompt"
+                  rows="3"
+                  autosize
+                  type="textarea"
+                  placeholder="不想出现在图片上的元素(例如：树，建筑)"
+              />
+            </van-collapse-item>
+          </van-collapse>
+        </div>
+
+        <div class="text-line">
+          <el-tag>绘图消耗{{ mjPower }}算力，U/V 操作消耗{{ mjActionPower }}算力，当前算力：{{ power }}</el-tag>
+        </div>
 
         <div class="text-line">
           <van-button round block type="primary" native-type="submit">
-            <van-tag type="success">可用算力额度:{{ power }}</van-tag>
             立即生成
           </van-button>
         </div>
@@ -247,11 +324,14 @@ const params = ref({
   seed: 0,
   img_arr: [],
   raw: false,
-  weight: 0.25,
+  iw: 0,
   prompt: "",
   neg_prompt: "",
   tile: false,
-  quality: 0
+  quality: 0,
+  cref: "",
+  sref: "",
+  cw: 0,
 })
 const userId = ref(0)
 const router = useRouter()
@@ -259,6 +339,7 @@ const runningJobs = ref([])
 const finishedJobs = ref([])
 const socket = ref(null)
 const power = ref(0)
+const activeName = ref("txt2img")
 
 onMounted(() => {
   checkSession().then(user => {
@@ -414,6 +495,10 @@ const changeModel = (item) => {
   params.value.model = item.value
 }
 
+const imgKey = ref("")
+const beforeUpload = (key) => {
+  imgKey.value = key
+}
 
 // 图片上传
 const uploadImg = (file) => {
@@ -427,6 +512,10 @@ const uploadImg = (file) => {
       // 执行上传操作
       httpPost('/api/upload', formData).then(res => {
         file.url = res.data.url
+        if (imgKey.value !== "") { // 单张图片上传
+          params.value[imgKey.value] = res.data.url
+          imgKey.value = ''
+        }
         file.status = "done"
       }).catch(e => {
         file.status = 'failed'
@@ -524,6 +613,15 @@ const showPrompt = (item) => {
 const imageView = (item) => {
   showImagePreview([item['img_url']]);
 }
+
+// 切换菜单
+const tabChange = (tab) => {
+  if (tab === "txt2img" || tab === "img2img") {
+    params.value.task_type = "image"
+  } else {
+    params.value.task_type = tab
+  }
+}
 </script>
 
 <style lang="stylus">

From a9adc0c1a2aceaf57dc68752101fcc376eb650c4 Mon Sep 17 00:00:00 2001
From: RockYang <yangjian102621@gmail.com>
Date: Wed, 3 Apr 2024 18:13:48 +0800
Subject: [PATCH 09/12] feat: stable diffusion image drawing on mobile is ready

---
 api/core/types/task.go                  |  31 +-
 api/handler/mj_handler.go               |   4 +-
 api/handler/payment_handler.go          |  26 +-
 api/handler/sd_handler.go               |  30 +-
 api/service/mj/plus_client.go           |  24 +-
 api/service/mj/proxy_client.go          |   6 +-
 api/service/mj/service.go               |  11 +-
 api/service/sd/service.go               |  17 +-
 web/src/assets/css/mobile/image-mj.css  |  60 +--
 web/src/assets/css/mobile/image-mj.styl | 352 ++++++++--------
 web/src/assets/css/mobile/image-sd.css  | 133 ++++++
 web/src/assets/css/mobile/image-sd.styl | 184 ++++++++
 web/src/router.js                       |   8 +-
 web/src/views/ImageMj.vue               |   4 +-
 web/src/views/ImageSd.vue               |  13 +-
 web/src/views/mobile/Home.vue           |   7 +-
 web/src/views/mobile/Image.vue          |  33 ++
 web/src/views/mobile/ImageMj.vue        | 536 ++++++++++++------------
 web/src/views/mobile/ImageSd.vue        | 523 +++++++++++++++++++++++
 19 files changed, 1457 insertions(+), 545 deletions(-)
 create mode 100644 web/src/assets/css/mobile/image-sd.css
 create mode 100644 web/src/assets/css/mobile/image-sd.styl
 create mode 100644 web/src/views/mobile/Image.vue
 create mode 100644 web/src/views/mobile/ImageSd.vue

diff --git a/api/core/types/task.go b/api/core/types/task.go
index 36142736..cd4b516e 100644
--- a/api/core/types/task.go
+++ b/api/core/types/task.go
@@ -25,6 +25,7 @@ type MjTask struct {
 	Type        TaskType `json:"type"`
 	UserId      int      `json:"user_id"`
 	Prompt      string   `json:"prompt,omitempty"`
+	NegPrompt   string   `json:"neg_prompt,omitempty"`
 	Params      string   `json:"full_prompt"`
 	Index       int      `json:"index,omitempty"`
 	MessageId   string   `json:"message_id,omitempty"`
@@ -42,19 +43,19 @@ type SdTask struct {
 }
 
 type SdTaskParams struct {
-	TaskId         string  `json:"task_id"`
-	Prompt         string  `json:"prompt"`          // 提示词
-	NegativePrompt string  `json:"negative_prompt"` // 反向提示词
-	Steps          int     `json:"steps"`           // 迭代步数，默认20
-	Sampler        string  `json:"sampler"`         // 采样器
-	FaceFix        bool    `json:"face_fix"`        // 面部修复
-	CfgScale       float32 `json:"cfg_scale"`       //引导系数，默认 7
-	Seed           int64   `json:"seed"`            // 随机数种子
-	Height         int     `json:"height"`
-	Width          int     `json:"width"`
-	HdFix          bool    `json:"hd_fix"`         // 启用高清修复
-	HdRedrawRate   float32 `json:"hd_redraw_rate"` // 高清修复重绘幅度
-	HdScale        int     `json:"hd_scale"`       // 放大倍数
-	HdScaleAlg     string  `json:"hd_scale_alg"`   // 放大算法
-	HdSteps        int     `json:"hd_steps"`       // 高清修复迭代步数
+	TaskId       string  `json:"task_id"`
+	Prompt       string  `json:"prompt"`     // 提示词
+	NegPrompt    string  `json:"neg_prompt"` // 反向提示词
+	Steps        int     `json:"steps"`      // 迭代步数，默认20
+	Sampler      string  `json:"sampler"`    // 采样器
+	FaceFix      bool    `json:"face_fix"`   // 面部修复
+	CfgScale     float32 `json:"cfg_scale"`  //引导系数，默认 7
+	Seed         int64   `json:"seed"`       // 随机数种子
+	Height       int     `json:"height"`
+	Width        int     `json:"width"`
+	HdFix        bool    `json:"hd_fix"`         // 启用高清修复
+	HdRedrawRate float32 `json:"hd_redraw_rate"` // 高清修复重绘幅度
+	HdScale      int     `json:"hd_scale"`       // 放大倍数
+	HdScaleAlg   string  `json:"hd_scale_alg"`   // 放大算法
+	HdSteps      int     `json:"hd_steps"`       // 高清修复迭代步数
 }
diff --git a/api/handler/mj_handler.go b/api/handler/mj_handler.go
index 5ca0bcb5..7988a380 100644
--- a/api/handler/mj_handler.go
+++ b/api/handler/mj_handler.go
@@ -133,9 +133,6 @@ func (h *MidJourneyHandler) Image(c *gin.Context) {
 	if data.Quality > 0 {
 		params += fmt.Sprintf(" --q %.2f", data.Quality)
 	}
-	if data.NegPrompt != "" {
-		params += fmt.Sprintf(" --no %s", data.NegPrompt)
-	}
 	if data.Tile {
 		params += " --tile "
 	}
@@ -204,6 +201,7 @@ func (h *MidJourneyHandler) Image(c *gin.Context) {
 		SessionId: data.SessionId,
 		Type:      types.TaskType(data.TaskType),
 		Prompt:    data.Prompt,
+		NegPrompt: data.NegPrompt,
 		Params:    params,
 		UserId:    userId,
 		ImgArr:    data.ImgArr,
diff --git a/api/handler/payment_handler.go b/api/handler/payment_handler.go
index 3f888c83..2b8f5dce 100644
--- a/api/handler/payment_handler.go
+++ b/api/handler/payment_handler.go
@@ -424,27 +424,21 @@ func (h *PaymentHandler) notify(orderNo string, tradeNo string) error {
 
 	var opt string
 	var power int
-	if user.Vip { // 已经是 VIP 用户
-		if remark.Days > 0 { // 只延期 VIP，不增加调用次数
+	if remark.Days > 0 { // VIP 充值
+		if user.ExpiredTime >= time.Now().Unix() {
 			user.ExpiredTime = time.Unix(user.ExpiredTime, 0).AddDate(0, 0, remark.Days).Unix()
-		} else { // 充值点卡，直接增加次数即可
-			user.Power += remark.Power
-			opt = "点卡充值"
-			power = remark.Power
-		}
-
-	} else {                 // 非 VIP 用户
-		if remark.Days > 0 { // vip 套餐：days > 0, power == 0
+			opt = "VIP充值，VIP 没到期，只延期不增加算力"
+		} else {
 			user.ExpiredTime = time.Now().AddDate(0, 0, remark.Days).Unix()
 			user.Power += h.App.SysConfig.VipMonthPower
-			user.Vip = true
-			opt = "VIP充值"
 			power = h.App.SysConfig.VipMonthPower
-		} else { //点卡：days == 0, calls > 0
-			user.Power += remark.Power
-			opt = "点卡充值"
-			power = remark.Power
+			opt = "VIP充值"
 		}
+		user.Vip = true
+	} else { // 充值点卡，直接增加次数即可
+		user.Power += remark.Power
+		opt = "点卡充值"
+		power = remark.Power
 	}
 
 	// 更新用户信息
diff --git a/api/handler/sd_handler.go b/api/handler/sd_handler.go
index ca1e9650..b9c3625e 100644
--- a/api/handler/sd_handler.go
+++ b/api/handler/sd_handler.go
@@ -127,21 +127,21 @@ func (h *SdJobHandler) Image(c *gin.Context) {
 		return
 	}
 	params := types.SdTaskParams{
-		TaskId:         taskId,
-		Prompt:         data.Prompt,
-		NegativePrompt: data.NegativePrompt,
-		Steps:          data.Steps,
-		Sampler:        data.Sampler,
-		FaceFix:        data.FaceFix,
-		CfgScale:       data.CfgScale,
-		Seed:           data.Seed,
-		Height:         data.Height,
-		Width:          data.Width,
-		HdFix:          data.HdFix,
-		HdRedrawRate:   data.HdRedrawRate,
-		HdScale:        data.HdScale,
-		HdScaleAlg:     data.HdScaleAlg,
-		HdSteps:        data.HdSteps,
+		TaskId:       taskId,
+		Prompt:       data.Prompt,
+		NegPrompt:    data.NegPrompt,
+		Steps:        data.Steps,
+		Sampler:      data.Sampler,
+		FaceFix:      data.FaceFix,
+		CfgScale:     data.CfgScale,
+		Seed:         data.Seed,
+		Height:       data.Height,
+		Width:        data.Width,
+		HdFix:        data.HdFix,
+		HdRedrawRate: data.HdRedrawRate,
+		HdScale:      data.HdScale,
+		HdScaleAlg:   data.HdScaleAlg,
+		HdSteps:      data.HdSteps,
 	}
 
 	job := model.SdJob{
diff --git a/api/service/mj/plus_client.go b/api/service/mj/plus_client.go
index 31029a22..89bca627 100644
--- a/api/service/mj/plus_client.go
+++ b/api/service/mj/plus_client.go
@@ -8,6 +8,7 @@ import (
 	"fmt"
 	"github.com/imroc/req/v3"
 	"io"
+	"time"
 
 	"github.com/gin-gonic/gin"
 )
@@ -16,17 +17,26 @@ import (
 type PlusClient struct {
 	Config types.MjPlusConfig
 	apiURL string
+	client *req.Client
 }
 
 func NewPlusClient(config types.MjPlusConfig) *PlusClient {
-	return &PlusClient{Config: config, apiURL: config.ApiURL}
+	return &PlusClient{
+		Config: config,
+		apiURL: config.ApiURL,
+		client: req.C().SetTimeout(time.Minute).SetUserAgent("Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/123.0.0.0 Safari/537.36"),
+	}
 }
 
 func (c *PlusClient) Imagine(task types.MjTask) (ImageRes, error) {
 	apiURL := fmt.Sprintf("%s/mj-%s/mj/submit/imagine", c.apiURL, c.Config.Mode)
+	prompt := fmt.Sprintf("%s %s", task.Prompt, task.Params)
+	if task.NegPrompt != "" {
+		prompt += fmt.Sprintf(" --no %s", task.NegPrompt)
+	}
 	body := ImageReq{
 		BotType:     "MID_JOURNEY",
-		Prompt:      fmt.Sprintf("%s %s", task.Prompt, task.Params),
+		Prompt:      prompt,
 		Base64Array: make([]string, 0),
 	}
 	// 生成图片 Base64 编码
@@ -42,7 +52,7 @@ func (c *PlusClient) Imagine(task types.MjTask) (ImageRes, error) {
 	logger.Info("API URL: ", apiURL)
 	var res ImageRes
 	var errRes ErrRes
-	r, err := req.C().R().
+	r, err := c.client.R().
 		SetHeader("Authorization", "Bearer "+c.Config.ApiKey).
 		SetBody(body).
 		SetSuccessResult(&res).
@@ -81,7 +91,7 @@ func (c *PlusClient) Blend(task types.MjTask) (ImageRes, error) {
 	}
 	var res ImageRes
 	var errRes ErrRes
-	r, err := req.C().R().
+	r, err := c.client.R().
 		SetHeader("Authorization", "Bearer "+c.Config.ApiKey).
 		SetBody(body).
 		SetSuccessResult(&res).
@@ -130,7 +140,7 @@ func (c *PlusClient) SwapFace(task types.MjTask) (ImageRes, error) {
 	}
 	var res ImageRes
 	var errRes ErrRes
-	r, err := req.C().R().
+	r, err := c.client.SetTimeout(time.Minute).R().
 		SetHeader("Authorization", "Bearer "+c.Config.ApiKey).
 		SetBody(body).
 		SetSuccessResult(&res).
@@ -156,7 +166,7 @@ func (c *PlusClient) Upscale(task types.MjTask) (ImageRes, error) {
 	apiURL := fmt.Sprintf("%s/mj/submit/action", c.apiURL)
 	var res ImageRes
 	var errRes ErrRes
-	r, err := req.C().R().
+	r, err := c.client.R().
 		SetHeader("Authorization", "Bearer "+c.Config.ApiKey).
 		SetBody(body).
 		SetSuccessResult(&res).
@@ -202,7 +212,7 @@ func (c *PlusClient) Variation(task types.MjTask) (ImageRes, error) {
 func (c *PlusClient) QueryTask(taskId string) (QueryRes, error) {
 	apiURL := fmt.Sprintf("%s/mj/task/%s/fetch", c.apiURL, taskId)
 	var res QueryRes
-	r, err := req.C().R().SetHeader("Authorization", "Bearer "+c.Config.ApiKey).
+	r, err := c.client.R().SetHeader("Authorization", "Bearer "+c.Config.ApiKey).
 		SetSuccessResult(&res).
 		Get(apiURL)
 
diff --git a/api/service/mj/proxy_client.go b/api/service/mj/proxy_client.go
index 41bb31d1..b8df3211 100644
--- a/api/service/mj/proxy_client.go
+++ b/api/service/mj/proxy_client.go
@@ -22,8 +22,12 @@ func NewProxyClient(config types.MjProxyConfig) *ProxyClient {
 
 func (c *ProxyClient) Imagine(task types.MjTask) (ImageRes, error) {
 	apiURL := fmt.Sprintf("%s/mj/submit/imagine", c.apiURL)
+	prompt := fmt.Sprintf("%s %s", task.Prompt, task.Params)
+	if task.NegPrompt != "" {
+		prompt += fmt.Sprintf(" --no %s", task.NegPrompt)
+	}
 	body := ImageReq{
-		Prompt:      fmt.Sprintf("%s %s", task.Prompt, task.Params),
+		Prompt:      prompt,
 		Base64Array: make([]string, 0),
 	}
 	// 生成图片 Base64 编码
diff --git a/api/service/mj/service.go b/api/service/mj/service.go
index 17ffe454..3c870a17 100644
--- a/api/service/mj/service.go
+++ b/api/service/mj/service.go
@@ -67,7 +67,7 @@ func (s *Service) Run() {
 			continue
 		}
 
-		// 如果是 mj-proxy 则自动翻译提示词
+		// translate prompt
 		if utils.HasChinese(task.Prompt) {
 			content, err := utils.OpenAIRequest(s.db, fmt.Sprintf(service.TranslatePromptTemplate, task.Prompt))
 			if err == nil {
@@ -76,6 +76,15 @@ func (s *Service) Run() {
 				logger.Warnf("error with translate prompt: %v", err)
 			}
 		}
+		// translate negative prompt
+		if task.NegPrompt != "" && utils.HasChinese(task.NegPrompt) {
+			content, err := utils.OpenAIRequest(s.db, fmt.Sprintf(service.TranslatePromptTemplate, task.NegPrompt))
+			if err == nil {
+				task.NegPrompt = content
+			} else {
+				logger.Warnf("error with translate prompt: %v", err)
+			}
+		}
 
 		var job model.MidJourneyJob
 		tx := s.db.Where("id = ?", task.Id).First(&job)
diff --git a/api/service/sd/service.go b/api/service/sd/service.go
index b2baccca..4f68f3e0 100644
--- a/api/service/sd/service.go
+++ b/api/service/sd/service.go
@@ -49,11 +49,24 @@ func (s *Service) Run() {
 			logger.Errorf("taking task with error: %v", err)
 			continue
 		}
-		// 翻译提示词
+
+		// translate prompt
 		if utils.HasChinese(task.Params.Prompt) {
 			content, err := utils.OpenAIRequest(s.db, fmt.Sprintf(service.RewritePromptTemplate, task.Params.Prompt))
 			if err == nil {
 				task.Params.Prompt = content
+			} else {
+				logger.Warnf("error with translate prompt: %v", err)
+			}
+		}
+
+		// translate negative prompt
+		if task.Params.NegPrompt != "" && utils.HasChinese(task.Params.NegPrompt) {
+			content, err := utils.OpenAIRequest(s.db, fmt.Sprintf(service.TranslatePromptTemplate, task.Params.NegPrompt))
+			if err == nil {
+				task.Params.NegPrompt = content
+			} else {
+				logger.Warnf("error with translate prompt: %v", err)
 			}
 		}
 
@@ -110,7 +123,7 @@ type TaskProgressResp struct {
 func (s *Service) Txt2Img(task types.SdTask) error {
 	body := Txt2ImgReq{
 		Prompt:         task.Params.Prompt,
-		NegativePrompt: task.Params.NegativePrompt,
+		NegativePrompt: task.Params.NegPrompt,
 		Steps:          task.Params.Steps,
 		CfgScale:       task.Params.CfgScale,
 		Width:          task.Params.Width,
diff --git a/web/src/assets/css/mobile/image-mj.css b/web/src/assets/css/mobile/image-mj.css
index 839ba770..15db23df 100644
--- a/web/src/assets/css/mobile/image-mj.css
+++ b/web/src/assets/css/mobile/image-mj.css
@@ -1,8 +1,8 @@
-.mobile-mj .content .text-line {
+.mobile-mj .text-line {
   padding: 6px;
   font-size: 14px;
 }
-.mobile-mj .content .text-line .van-row .van-col .rate {
+.mobile-mj .text-line .van-row .van-col .rate {
   display: flex;
   justify-content: center;
   background-color: #f5f5f5;
@@ -11,17 +11,17 @@
   border-radius: 5px;
   flex-flow: column;
 }
-.mobile-mj .content .text-line .van-row .van-col .rate .icon {
+.mobile-mj .text-line .van-row .van-col .rate .icon {
   text-align: center;
 }
-.mobile-mj .content .text-line .van-row .van-col .rate .icon .van-image {
+.mobile-mj .text-line .van-row .van-col .rate .icon .van-image {
   max-width: 20px;
 }
-.mobile-mj .content .text-line .van-row .van-col .rate .text {
+.mobile-mj .text-line .van-row .van-col .rate .text {
   text-align: center;
   color: #555;
 }
-.mobile-mj .content .text-line .van-row .van-col .model {
+.mobile-mj .text-line .van-row .van-col .model {
   display: flex;
   justify-content: center;
   background-color: #f5f5f5;
@@ -30,45 +30,45 @@
   border-radius: 5px;
   flex-flow: column;
 }
-.mobile-mj .content .text-line .van-row .van-col .model .icon {
+.mobile-mj .text-line .van-row .van-col .model .icon {
   text-align: center;
 }
-.mobile-mj .content .text-line .van-row .van-col .model .icon .van-image {
+.mobile-mj .text-line .van-row .van-col .model .icon .van-image {
   width: 100%;
   height: 50px;
 }
-.mobile-mj .content .text-line .van-row .van-col .model .text {
+.mobile-mj .text-line .van-row .van-col .model .text {
   text-align: center;
   color: #555;
 }
-.mobile-mj .content .text-line .van-row .van-col .active {
+.mobile-mj .text-line .van-row .van-col .active {
   background-color: #e5e5e5;
 }
-.mobile-mj .content .text-line .van-button {
+.mobile-mj .text-line .van-button {
   position: relative;
 }
-.mobile-mj .content .text-line .van-button .van-tag {
+.mobile-mj .text-line .van-button .van-tag {
   position: absolute;
   right: 20px;
 }
-.mobile-mj .content .text-line .align-right {
+.mobile-mj .text-line .align-right {
   display: flex;
   justify-content: right;
 }
-.mobile-mj .content .tip-text {
+.mobile-mj .tip-text {
   padding: 10px;
   line-height: 1.5;
   color: #c1c1c1;
 }
-.mobile-mj .content .running-job-list .van-grid .van-grid-item .van-grid-item__content {
+.mobile-mj .running-job-list .van-grid .van-grid-item .van-grid-item__content {
   padding: 0;
   position: relative;
 }
-.mobile-mj .content .running-job-list .van-grid .van-grid-item .van-grid-item__content .van-image,
-.mobile-mj .content .running-job-list .van-grid .van-grid-item .van-grid-item__content .task-in-queue {
+.mobile-mj .running-job-list .van-grid .van-grid-item .van-grid-item__content .van-image,
+.mobile-mj .running-job-list .van-grid .van-grid-item .van-grid-item__content .task-in-queue {
   min-height: 100px;
 }
-.mobile-mj .content .running-job-list .van-grid .van-grid-item .van-grid-item__content .progress {
+.mobile-mj .running-job-list .van-grid .van-grid-item .van-grid-item__content .progress {
   display: flex;
   justify-content: center;
   align-items: center;
@@ -79,36 +79,36 @@
   left: 0;
   top: 0;
 }
-.mobile-mj .content .running-job-list .van-grid .van-grid-item .van-grid-item__content .progress .van-circle__text {
+.mobile-mj .running-job-list .van-grid .van-grid-item .van-grid-item__content .progress .van-circle__text {
   color: #fff;
 }
-.mobile-mj .content .running-job-list .van-grid .van-grid-item .van-grid-item__content .task-in-queue {
+.mobile-mj .running-job-list .van-grid .van-grid-item .van-grid-item__content .task-in-queue {
   display: flex;
   flex-flow: column;
   justify-content: center;
   color: #c1c1c1;
 }
-.mobile-mj .content .running-job-list .van-grid .van-grid-item .van-grid-item__content .task-in-queue .icon {
+.mobile-mj .running-job-list .van-grid .van-grid-item .van-grid-item__content .task-in-queue .icon {
   text-align: center;
 }
-.mobile-mj .content .running-job-list .van-grid .van-grid-item .van-grid-item__content .task-in-queue .icon .iconfont {
+.mobile-mj .running-job-list .van-grid .van-grid-item .van-grid-item__content .task-in-queue .icon .iconfont {
   font-size: 24px;
 }
-.mobile-mj .content .running-job-list .van-grid .van-grid-item .van-grid-item__content .task-in-queue .text {
+.mobile-mj .running-job-list .van-grid .van-grid-item .van-grid-item__content .task-in-queue .text {
   font-size: 14px;
   margin-top: 5px;
 }
-.mobile-mj .content .finish-job-list .van-grid .van-grid-item .van-grid-item__content {
+.mobile-mj .finish-job-list .van-grid .van-grid-item .van-grid-item__content {
   padding: 0;
 }
-.mobile-mj .content .finish-job-list .van-grid .van-grid-item .van-grid-item__content .job-item {
+.mobile-mj .finish-job-list .van-grid .van-grid-item .van-grid-item__content .job-item {
   overflow: hidden;
   border-radius: 6px;
   position: relative;
   height: 100%;
   width: 100%;
 }
-.mobile-mj .content .finish-job-list .van-grid .van-grid-item .van-grid-item__content .job-item .opt .opt-btn {
+.mobile-mj .finish-job-list .van-grid .van-grid-item .van-grid-item__content .job-item .opt .opt-btn {
   padding: 2px 0;
   text-align: center;
   border-radius: 5px;
@@ -120,20 +120,20 @@
   font-size: 14px;
   width: 100%;
 }
-.mobile-mj .content .finish-job-list .van-grid .van-grid-item .van-grid-item__content .job-item .van-image {
+.mobile-mj .finish-job-list .van-grid .van-grid-item .van-grid-item__content .job-item .van-image {
   width: 100%;
   height: 200px;
 }
-.mobile-mj .content .finish-job-list .van-grid .van-grid-item .van-grid-item__content .job-item .upscale {
+.mobile-mj .finish-job-list .van-grid .van-grid-item .van-grid-item__content .job-item .upscale {
   height: 260px;
   width: 100%;
 }
-.mobile-mj .content .finish-job-list .van-grid .van-grid-item .van-grid-item__content .job-item .remove {
+.mobile-mj .finish-job-list .van-grid .van-grid-item .van-grid-item__content .job-item .remove {
   position: absolute;
   right: 5px;
   top: 5px;
 }
-.mobile-mj .content .finish-job-list .van-grid .van-grid-item .van-grid-item__content .job-item .remove .el-button {
+.mobile-mj .finish-job-list .van-grid .van-grid-item .van-grid-item__content .job-item .remove .el-button {
   margin-left: 5px;
   height: auto;
   padding: 5px;
diff --git a/web/src/assets/css/mobile/image-mj.styl b/web/src/assets/css/mobile/image-mj.styl
index acdbd38f..76022f0f 100644
--- a/web/src/assets/css/mobile/image-mj.styl
+++ b/web/src/assets/css/mobile/image-mj.styl
@@ -1,194 +1,192 @@
 .mobile-mj {
-  .content {
-    .text-line {
-      padding 6px
-      font-size 14px
+  .text-line {
+    padding 6px
+    font-size 14px
 
-      .van-row {
-        .van-col {
-          .rate {
-            display: flex;
+    .van-row {
+      .van-col {
+        .rate {
+          display: flex;
+          justify-content center
+          background-color #f5f5f5
+          padding 5px 10px
+          margin 5px 0
+          border-radius 5px
+          flex-flow column
+
+          .icon {
+            text-align center
+
+            .van-image {
+              max-width 20px
+            }
+          }
+
+          .text {
+            text-align center
+            color #555555
+          }
+        }
+
+        .model {
+          display: flex;
+          justify-content center
+          background-color #f5f5f5
+          padding 6px
+          margin 5px 0
+          border-radius 5px
+          flex-flow column
+
+          .icon {
+            text-align center
+
+            .van-image {
+              width 100%
+              height 50px
+            }
+          }
+
+          .text {
+            text-align center
+            color #555555
+          }
+        }
+
+        .active {
+          background-color #e5e5e5
+        }
+      }
+    }
+
+    .van-button {
+      position relative
+
+      .van-tag {
+        position absolute
+        right 20px
+      }
+    }
+
+    .align-right {
+      display flex
+      justify-content right
+    }
+  }
+
+
+  .tip-text {
+    padding 10px
+    line-height 1.5
+    color #c1c1c1
+  }
+
+  .running-job-list {
+    .van-grid {
+      .van-grid-item {
+        .van-grid-item__content {
+          padding 0
+          position relative
+
+          .van-image, .task-in-queue {
+            min-height 100px
+          }
+
+          .progress {
+            display flex
             justify-content center
-            background-color #f5f5f5
-            padding 5px 10px
-            margin 5px 0
-            border-radius 5px
+            align-items center
+            width 100%
+            height 100%
+            background rgba(50, 50, 50, 0.5)
+            position absolute
+            left 0
+            top 0
+
+            .van-circle__text {
+              color #ffffff
+            }
+          }
+
+          // end progress
+
+          .task-in-queue {
+            display flex
             flex-flow column
+            justify-content center
+            color #c1c1c1
 
             .icon {
               text-align center
 
-              .van-image {
-                max-width 20px
+              .iconfont {
+                font-size 24px
               }
             }
 
             .text {
-              text-align center
-              color #555555
+              font-size 14px
+              margin-top 5px
             }
           }
-
-          .model {
-            display: flex;
-            justify-content center
-            background-color #f5f5f5
-            padding 6px
-            margin 5px 0
-            border-radius 5px
-            flex-flow column
-
-            .icon {
-              text-align center
-
-              .van-image {
-                width 100%
-                height 50px
-              }
-            }
-
-            .text {
-              text-align center
-              color #555555
-            }
-          }
-
-          .active {
-            background-color #e5e5e5
-          }
-        }
-      }
-
-      .van-button {
-        position relative
-
-        .van-tag {
-          position absolute
-          right 20px
-        }
-      }
-
-      .align-right {
-        display flex
-        justify-content right
-      }
-    }
-
-
-    .tip-text {
-      padding 10px
-      line-height 1.5
-      color #c1c1c1
-    }
-
-    .running-job-list {
-      .van-grid {
-        .van-grid-item {
-          .van-grid-item__content {
-            padding 0
-            position relative
-
-            .van-image, .task-in-queue {
-              min-height 100px
-            }
-
-            .progress {
-              display flex
-              justify-content center
-              align-items center
-              width 100%
-              height 100%
-              background rgba(50, 50, 50, 0.5)
-              position absolute
-              left 0
-              top 0
-
-              .van-circle__text {
-                color #ffffff
-              }
-            }
-
-            // end progress
-
-            .task-in-queue {
-              display flex
-              flex-flow column
-              justify-content center
-              color #c1c1c1
-
-              .icon {
-                text-align center
-
-                .iconfont {
-                  font-size 24px
-                }
-              }
-
-              .text {
-                font-size 14px
-                margin-top 5px
-              }
-            }
-          }
-        }
-      }
-    }
-
-    //end running jobs
-
-    .finish-job-list {
-      .van-grid {
-        .van-grid-item {
-          .van-grid-item__content {
-            padding 0
-
-            .job-item {
-              overflow hidden
-              border-radius 6px
-              position relative
-              height 100%
-              width 100%
-
-              .opt {
-                .opt-btn {
-                  padding 2px 0
-                  text-align center
-                  border-radius 5px
-                  margin 3px 0
-                  display block
-                  cursor pointer
-                  background-color #4E5058
-                  color #ffffff
-                  font-size 14px
-                  width 100%
-                }
-              }
-
-              .van-image {
-                width 100%
-                height 200px
-              }
-
-              .upscale {
-                height 260px
-                width 100%
-              }
-
-              .remove {
-                position absolute
-                right 5px
-                top 5px
-
-                .el-button {
-                  margin-left 5px
-                  height auto
-                  padding 5px
-                }
-              }
-            }
-
-
-          }
+        }
+      }
+    }
+  }
+
+  //end running jobs
+
+  .finish-job-list {
+    .van-grid {
+      .van-grid-item {
+        .van-grid-item__content {
+          padding 0
+
+          .job-item {
+            overflow hidden
+            border-radius 6px
+            position relative
+            height 100%
+            width 100%
+
+            .opt {
+              .opt-btn {
+                padding 2px 0
+                text-align center
+                border-radius 5px
+                margin 3px 0
+                display block
+                cursor pointer
+                background-color #4E5058
+                color #ffffff
+                font-size 14px
+                width 100%
+              }
+            }
+
+            .van-image {
+              width 100%
+              height 200px
+            }
+
+            .upscale {
+              height 260px
+              width 100%
+            }
+
+            .remove {
+              position absolute
+              right 5px
+              top 5px
+
+              .el-button {
+                margin-left 5px
+                height auto
+                padding 5px
+              }
+            }
+          }
+
+
         }
       }
     }
diff --git a/web/src/assets/css/mobile/image-sd.css b/web/src/assets/css/mobile/image-sd.css
new file mode 100644
index 00000000..0189f1ac
--- /dev/null
+++ b/web/src/assets/css/mobile/image-sd.css
@@ -0,0 +1,133 @@
+.mobile-sd .text-line {
+  padding: 0 6px;
+  font-size: 14px;
+}
+.mobile-sd .text-line .van-row {
+  width: 100%;
+}
+.mobile-sd .text-line .van-row .van-col .rate {
+  display: flex;
+  justify-content: center;
+  background-color: #f5f5f5;
+  padding: 5px 10px;
+  margin: 5px 0;
+  border-radius: 5px;
+  flex-flow: column;
+}
+.mobile-sd .text-line .van-row .van-col .rate .icon {
+  text-align: center;
+}
+.mobile-sd .text-line .van-row .van-col .rate .icon .van-image {
+  max-width: 20px;
+}
+.mobile-sd .text-line .van-row .van-col .rate .text {
+  text-align: center;
+  color: #555;
+}
+.mobile-sd .text-line .van-row .van-col .el-input__inner {
+  text-align: center;
+}
+.mobile-sd .text-line .van-row .van-col .model {
+  display: flex;
+  justify-content: center;
+  background-color: #f5f5f5;
+  padding: 6px;
+  margin: 5px 0;
+  border-radius: 5px;
+  flex-flow: column;
+}
+.mobile-sd .text-line .van-row .van-col .model .icon {
+  text-align: center;
+}
+.mobile-sd .text-line .van-row .van-col .model .icon .van-image {
+  width: 100%;
+  height: 50px;
+}
+.mobile-sd .text-line .van-row .van-col .model .text {
+  text-align: center;
+  color: #555;
+}
+.mobile-sd .text-line .van-row .van-col .active {
+  background-color: #e5e5e5;
+}
+.mobile-sd .text-line .van-button {
+  position: relative;
+}
+.mobile-sd .text-line .van-button .van-tag {
+  position: absolute;
+  right: 20px;
+}
+.mobile-sd .text-line .align-right {
+  display: flex;
+  justify-content: right;
+}
+.mobile-sd .pt-6 {
+  padding: 10px;
+}
+.mobile-sd .tip-text {
+  padding: 10px;
+  line-height: 1.5;
+  color: #c1c1c1;
+}
+.mobile-sd .running-job-list .van-grid .van-grid-item .van-grid-item__content {
+  padding: 0;
+  position: relative;
+}
+.mobile-sd .running-job-list .van-grid .van-grid-item .van-grid-item__content .van-image,
+.mobile-sd .running-job-list .van-grid .van-grid-item .van-grid-item__content .task-in-queue {
+  min-height: 100px;
+}
+.mobile-sd .running-job-list .van-grid .van-grid-item .van-grid-item__content .progress {
+  display: flex;
+  justify-content: center;
+  align-items: center;
+  width: 100%;
+  height: 100%;
+  background: rgba(50,50,50,0.5);
+  position: absolute;
+  left: 0;
+  top: 0;
+}
+.mobile-sd .running-job-list .van-grid .van-grid-item .van-grid-item__content .progress .van-circle__text {
+  color: #fff;
+}
+.mobile-sd .running-job-list .van-grid .van-grid-item .van-grid-item__content .task-in-queue {
+  display: flex;
+  flex-flow: column;
+  justify-content: center;
+  color: #c1c1c1;
+}
+.mobile-sd .running-job-list .van-grid .van-grid-item .van-grid-item__content .task-in-queue .icon {
+  text-align: center;
+}
+.mobile-sd .running-job-list .van-grid .van-grid-item .van-grid-item__content .task-in-queue .icon .iconfont {
+  font-size: 24px;
+}
+.mobile-sd .running-job-list .van-grid .van-grid-item .van-grid-item__content .task-in-queue .text {
+  font-size: 14px;
+  margin-top: 5px;
+}
+.mobile-sd .finish-job-list .van-grid .van-grid-item .van-grid-item__content {
+  padding: 0;
+}
+.mobile-sd .finish-job-list .van-grid .van-grid-item .van-grid-item__content .job-item {
+  overflow: hidden;
+  border-radius: 6px;
+  position: relative;
+  height: 100%;
+  width: 100%;
+}
+.mobile-sd .finish-job-list .van-grid .van-grid-item .van-grid-item__content .job-item .van-image {
+  width: 100%;
+  height: 200px;
+}
+.mobile-sd .finish-job-list .van-grid .van-grid-item .van-grid-item__content .job-item .remove {
+  position: absolute;
+  right: 5px;
+  top: 5px;
+}
+.mobile-sd .finish-job-list .van-grid .van-grid-item .van-grid-item__content .job-item .remove .el-button {
+  margin-left: 5px;
+  height: auto;
+  padding: 5px;
+}
diff --git a/web/src/assets/css/mobile/image-sd.styl b/web/src/assets/css/mobile/image-sd.styl
new file mode 100644
index 00000000..d5c1a1b8
--- /dev/null
+++ b/web/src/assets/css/mobile/image-sd.styl
@@ -0,0 +1,184 @@
+.mobile-sd {
+  .text-line {
+    padding 0 6px
+    font-size 14px
+
+    .van-row {
+      width 100%
+
+      .van-col {
+        .rate {
+          display: flex;
+          justify-content center
+          background-color #f5f5f5
+          padding 5px 10px
+          margin 5px 0
+          border-radius 5px
+          flex-flow column
+
+          .icon {
+            text-align center
+
+            .van-image {
+              max-width 20px
+            }
+          }
+
+          .text {
+            text-align center
+            color #555555
+          }
+        }
+
+        .el-input__inner {
+          text-align center
+        }
+
+        .model {
+          display: flex;
+          justify-content center
+          background-color #f5f5f5
+          padding 6px
+          margin 5px 0
+          border-radius 5px
+          flex-flow column
+
+          .icon {
+            text-align center
+
+            .van-image {
+              width 100%
+              height 50px
+            }
+          }
+
+          .text {
+            text-align center
+            color #555555
+          }
+        }
+
+        .active {
+          background-color #e5e5e5
+        }
+      }
+    }
+
+    .van-button {
+      position relative
+
+      .van-tag {
+        position absolute
+        right 20px
+      }
+    }
+
+    .align-right {
+      display flex
+      justify-content right
+    }
+  }
+
+
+  .pt-6 {
+    padding 10px
+  }
+
+  .tip-text {
+    padding 10px
+    line-height 1.5
+    color #c1c1c1
+  }
+
+  .running-job-list {
+    .van-grid {
+      .van-grid-item {
+        .van-grid-item__content {
+          padding 0
+          position relative
+
+          .van-image, .task-in-queue {
+            min-height 100px
+          }
+
+          .progress {
+            display flex
+            justify-content center
+            align-items center
+            width 100%
+            height 100%
+            background rgba(50, 50, 50, 0.5)
+            position absolute
+            left 0
+            top 0
+
+            .van-circle__text {
+              color #ffffff
+            }
+          }
+
+          // end progress
+
+          .task-in-queue {
+            display flex
+            flex-flow column
+            justify-content center
+            color #c1c1c1
+
+            .icon {
+              text-align center
+
+              .iconfont {
+                font-size 24px
+              }
+            }
+
+            .text {
+              font-size 14px
+              margin-top 5px
+            }
+          }
+        }
+      }
+    }
+  }
+
+  //end running jobs
+
+  .finish-job-list {
+    .van-grid {
+      .van-grid-item {
+        .van-grid-item__content {
+          padding 0
+
+          .job-item {
+            overflow hidden
+            border-radius 6px
+            position relative
+            height 100%
+            width 100%
+
+            .van-image {
+              width 100%
+              height 200px
+            }
+
+            .remove {
+              position absolute
+              right 5px
+              top 5px
+
+              .el-button {
+                margin-left 5px
+                height auto
+                padding 5px
+              }
+            }
+          }
+
+
+        }
+      }
+    }
+  }
+}
\ No newline at end of file
diff --git a/web/src/router.js b/web/src/router.js
index 968b0690..b17f6c51 100644
--- a/web/src/router.js
+++ b/web/src/router.js
@@ -181,7 +181,7 @@ const routes = [
     {
         name: 'mobile',
         path: '/mobile',
-        meta: {title: 'ChatPlus-智能助手V3'},
+        meta: {title: 'Geek-AI v4.0'},
         component: () => import('@/views/mobile/Home.vue'),
         redirect: '/mobile/chat',
         children: [
@@ -191,9 +191,9 @@ const routes = [
                 component: () => import('@/views/mobile/ChatList.vue'),
             },
             {
-                path: '/mobile/mj',
-                name: 'mobile-mj',
-                component: () => import('@/views/mobile/ImageMj.vue'),
+                path: '/mobile/image',
+                name: 'mobile-image',
+                component: () => import('@/views/mobile/Image.vue'),
             },
             {
                 path: '/mobile/profile',
diff --git a/web/src/views/ImageMj.vue b/web/src/views/ImageMj.vue
index 868268bb..a34d729d 100644
--- a/web/src/views/ImageMj.vue
+++ b/web/src/views/ImageMj.vue
@@ -309,7 +309,7 @@
                 </el-tab-pane>
 
                 <el-tab-pane label="换脸" name="swapFace">
-                  <div class="text">请上传两张有脸部的图片，用右边图片的脸替换左边图片的脸</div>
+                  <div class="text">请上传两张有脸部的图片，用左边图片的脸替换右边图片的脸</div>
                   <div class="img-inline">
                     <div class="img-list-box">
                       <div class="img-item" v-for="imgURL in imgList">
@@ -334,7 +334,7 @@
                     </el-badge>
                   </template>
 
-                  <div class="text">注意：只有于 niji6 和 v6 模型支持一致性功能，如果选择其他模型此功能将不起作用。</div>
+                  <div class="text">注意：只有于 niji6 和 v6 模型支持一致性功能，如果选择其他模型此功能将会生成失败。</div>
                   <div class="param-line">
                     <el-form-item label="角色一致性：" prop="cref">
                       <el-input v-model="params.cref" placeholder="请输入图片URL或者上传图片"
diff --git a/web/src/views/ImageSd.vue b/web/src/views/ImageSd.vue
index 7c3a23a9..990fa400 100644
--- a/web/src/views/ImageSd.vue
+++ b/web/src/views/ImageSd.vue
@@ -222,7 +222,7 @@
                 </div>
               </div>
 
-              <div class="param-line" v-loading="translating" element-loading-background="rgba(0, 0, 0, 0.5)">
+              <div class="param-line">
                 <el-input
                     v-model="params.prompt"
                     :autosize="{ minRows: 4, maxRows: 6 }"
@@ -246,7 +246,7 @@
               </div>
               <div class="param-line">
                 <el-input
-                    v-model="params.negative_prompt"
+                    v-model="params.neg_prompt"
                     :autosize="{ minRows: 4, maxRows: 6 }"
                     type="textarea"
                     placeholder="反向提示词"
@@ -389,8 +389,8 @@
                   反向提示词
                 </el-divider>
                 <div class="prompt">
-                  <span>{{ item.params.negative_prompt }}</span>
-                  <el-icon class="copy-prompt-sd" :data-clipboard-text="item.params.negative_prompt">
+                  <span>{{ item.params.neg_prompt }}</span>
+                  <el-icon class="copy-prompt-sd" :data-clipboard-text="item.params.neg_prompt">
                     <DocumentCopy/>
                   </el-icon>
                 </div>
@@ -496,7 +496,6 @@ const mjBoxHeight = ref(window.innerHeight - 150)
 const fullImgHeight = ref(window.innerHeight - 60)
 const showTaskDialog = ref(false)
 const item = ref({})
-const translating = ref(false)
 const showLoginDialog = ref(false)
 const isLogin = ref(false)
 
@@ -519,7 +518,7 @@ const params = ref({
   hd_scale_alg: scaleAlg[0],
   hd_steps: 0,
   prompt: "",
-  negative_prompt: "nsfw, paintings,low quality,easynegative,ng_deepnegative ,lowres,bad anatomy,bad hands,bad feet",
+  neg_prompt: "nsfw, paintings,low quality,easynegative,ng_deepnegative ,lowres,bad anatomy,bad hands,bad feet",
 })
 
 const runningJobs = ref([])
@@ -559,7 +558,7 @@ const connect = () => {
     });
   }
 
-  const _socket = new WebSocket(host + `/api/sd/client`);
+  const _socket = new WebSocket(host + `/api/sd/client?user_id=${userId.value}`);
   _socket.addEventListener('open', () => {
     socket.value = _socket;
 
diff --git a/web/src/views/mobile/Home.vue b/web/src/views/mobile/Home.vue
index b056fb7b..f500a301 100644
--- a/web/src/views/mobile/Home.vue
+++ b/web/src/views/mobile/Home.vue
@@ -5,7 +5,7 @@
 
       <van-tabbar route v-model="active" @change="onChange">
         <van-tabbar-item to="/mobile/chat" name="home" icon="chat-o">对话</van-tabbar-item>
-        <van-tabbar-item to="/mobile/mj" name="imageMj" icon="photo-o">绘图</van-tabbar-item>
+        <van-tabbar-item to="/mobile/image" name="image" icon="photo-o">绘图</van-tabbar-item>
         <van-tabbar-item to="/mobile/img-wall" name="apps" icon="apps-o">广场</van-tabbar-item>
         <van-tabbar-item to="/mobile/profile" name="profile" icon="user-o">我的</van-tabbar-item>
       </van-tabbar>
@@ -64,6 +64,11 @@ const onChange = (index) => {
   color #f56c6c
 }
 
+.van-toast--success {
+  background #D6FBCC
+  color #07C160
+}
+
 .van-nav-bar {
   position fixed
   width 100%
diff --git a/web/src/views/mobile/Image.vue b/web/src/views/mobile/Image.vue
new file mode 100644
index 00000000..08ac7d6f
--- /dev/null
+++ b/web/src/views/mobile/Image.vue
@@ -0,0 +1,33 @@
+<template>
+  <div class="mobile-image container">
+    <van-tabs v-model:active="activeName" class="my-tab" animated sticky>
+      <van-tab title="MidJourney" name="mj">
+        <image-mj/>
+      </van-tab>
+      <van-tab title="Stable-Diffusion" name="sd">
+        <image-sd/>
+      </van-tab>
+      <van-tab title="DALL-E" name="dall">
+        <van-empty description="功能正在开发中"/>
+      </van-tab>
+    </van-tabs>
+  </div>
+</template>
+
+<script setup>
+import {ref} from "vue";
+import ImageMj from "@/views/mobile/ImageMj.vue";
+import ImageSd from "@/views/mobile/ImageSd.vue";
+
+const activeName = ref("sd")
+</script>
+
+<style lang="stylus">
+.mobile-image {
+  .my-tab {
+    .van-tab__panel {
+      padding 10px
+    }
+  }
+}
+</style>
\ No newline at end of file
diff --git a/web/src/views/mobile/ImageMj.vue b/web/src/views/mobile/ImageMj.vue
index 33a02f8b..bd08e494 100644
--- a/web/src/views/mobile/ImageMj.vue
+++ b/web/src/views/mobile/ImageMj.vue
@@ -1,278 +1,275 @@
 <template>
-  <div class="mobile-mj container">
-    <van-nav-bar :title="title"/>
-
-    <div class="content">
-      <van-form @submit="generate">
-        <div class="text-line">图片比例</div>
-        <div class="text-line">
-          <van-row :gutter="10">
-            <van-col :span="4" v-for="item in rates" :key="item.value">
-              <div
-                  :class="item.value === params.rate ? 'rate active' : 'rate'"
-                  @click="changeRate(item)">
-                <div class="icon">
-                  <van-image :src="item.img" fit="cover"></van-image>
-                </div>
-                <div class="text">{{ item.text }}</div>
+  <div class="mobile-mj">
+    <van-form @submit="generate">
+      <div class="text-line">图片比例</div>
+      <div class="text-line">
+        <van-row :gutter="10">
+          <van-col :span="4" v-for="item in rates" :key="item.value">
+            <div
+                :class="item.value === params.rate ? 'rate active' : 'rate'"
+                @click="changeRate(item)">
+              <div class="icon">
+                <van-image :src="item.img" fit="cover"></van-image>
               </div>
-            </van-col>
-          </van-row>
-        </div>
-        <div class="text-line">模型选择</div>
-        <div class="text-line">
-          <van-row :gutter="10">
-            <van-col :span="8" v-for="item in models" :key="item.value">
-              <div :class="item.value === params.model ? 'model active' : 'model'"
-                   @click="changeModel(item)">
-                <div class="icon">
-                  <van-image :src="item.img" fit="cover"></van-image>
-                </div>
-                <div class="text">
-                  <van-text-ellipsis :content="item.text"/>
-                </div>
+              <div class="text">{{ item.text }}</div>
+            </div>
+          </van-col>
+        </van-row>
+      </div>
+      <div class="text-line">模型选择</div>
+      <div class="text-line">
+        <van-row :gutter="10">
+          <van-col :span="8" v-for="item in models" :key="item.value">
+            <div :class="item.value === params.model ? 'model active' : 'model'"
+                 @click="changeModel(item)">
+              <div class="icon">
+                <van-image :src="item.img" fit="cover"></van-image>
               </div>
-            </van-col>
-          </van-row>
-        </div>
-        <div class="text-line">
-          <van-field label="创意度">
-            <template #input>
-              <van-slider v-model.number="params.chaos" :max="100" :step="1"
-                          @update:model-value="showToast('当前值：' + params.chaos)"/>
-            </template>
-          </van-field>
-        </div>
-
-        <div class="text-line">
-          <van-field label="风格化">
-            <template #input>
-              <van-slider v-model.number="params.stylize" :max="1000" :step="1"
-                          @update:model-value="showToast('当前值：' + params.stylize)"/>
-            </template>
-          </van-field>
-        </div>
-
-        <div class="text-line">
-          <van-field label="原始模式">
-            <template #input>
-              <van-switch v-model="params.raw"/>
-            </template>
-          </van-field>
-        </div>
-
-        <div class="text-line">
-          <van-tabs v-model:active="activeName" @change="tabChange">
-            <van-tab title="文生图" name="txt2img">
-              <div class="text-line">
-                <van-field v-model="params.prompt"
-                           rows="3"
-                           autosize
-                           type="textarea"
-                           placeholder="请在此输入绘画提示词，系统会自动翻译中文提示词，高手请直接输入英文提示词"/>
-              </div>
-            </van-tab>
-            <van-tab title="图生图" name="img2img">
-              <div class="text-line">
-                <van-field v-model="params.prompt"
-                           rows="3"
-                           autosize
-                           type="textarea"
-                           placeholder="请在此输入绘画提示词，系统会自动翻译中文提示词，高手请直接输入英文提示词"/>
+              <div class="text">
+                <van-text-ellipsis :content="item.text"/>
               </div>
+            </div>
+          </van-col>
+        </van-row>
+      </div>
+      <div class="text-line">
+        <van-field label="创意度">
+          <template #input>
+            <van-slider v-model.number="params.chaos" :max="100" :step="1"
+                        @update:model-value="showToast('当前值：' + params.chaos)"/>
+          </template>
+        </van-field>
+      </div>
 
-              <div class="text-line">
-                <van-uploader v-model="imgList" :after-read="uploadImg"/>
-              </div>
-              <div class="text-line">
-                <van-field label="垫图权重">
-                  <template #input>
-                    <van-slider v-model.number="params.iw" :max="1" :step="0.01"
-                                @update:model-value="showToast('当前值：' + params.iw)"/>
-                  </template>
-                </van-field>
-              </div>
+      <div class="text-line">
+        <van-field label="风格化">
+          <template #input>
+            <van-slider v-model.number="params.stylize" :max="1000" :step="1"
+                        @update:model-value="showToast('当前值：' + params.stylize)"/>
+          </template>
+        </van-field>
+      </div>
 
-              <van-cell-group>
-                <van-field
-                    v-model="params.cref"
-                    center
-                    clearable
-                    label="角色一致性"
-                    placeholder="请输入图片URL或者上传图片"
-                >
-                  <template #button>
-                    <van-uploader @click="beforeUpload('cref')" :after-read="uploadImg">
-                      <van-button size="mini" type="primary" icon="plus"/>
-                    </van-uploader>
-                  </template>
-                </van-field>
-              </van-cell-group>
+      <div class="text-line">
+        <van-field label="原始模式">
+          <template #input>
+            <van-switch v-model="params.raw"/>
+          </template>
+        </van-field>
+      </div>
 
-              <van-cell-group>
-                <van-field
-                    v-model="params.sref"
-                    center
-                    clearable
-                    label="风格一致性"
-                    placeholder="请输入图片URL或者上传图片"
-                >
-                  <template #button>
-                    <van-uploader @click="beforeUpload('sref')" :after-read="uploadImg">
-                      <van-button size="mini" type="primary" icon="plus"/>
-                    </van-uploader>
-                  </template>
-                </van-field>
-              </van-cell-group>
+      <div class="text-line">
+        <van-tabs v-model:active="activeName" @change="tabChange" animated>
+          <van-tab title="文生图" name="txt2img">
+            <div class="text-line">
+              <van-field v-model="params.prompt"
+                         rows="3"
+                         autosize
+                         type="textarea"
+                         placeholder="请在此输入绘画提示词，系统会自动翻译中文提示词，高手请直接输入英文提示词"/>
+            </div>
+          </van-tab>
+          <van-tab title="图生图" name="img2img">
+            <div class="text-line">
+              <van-field v-model="params.prompt"
+                         rows="3"
+                         autosize
+                         type="textarea"
+                         placeholder="请在此输入绘画提示词，系统会自动翻译中文提示词，高手请直接输入英文提示词"/>
+            </div>
 
-              <div class="text-line">
-                <van-field label="一致性权重">
-                  <template #input>
-                    <van-slider v-model.number="params.cw" :max="100" :step="1"
-                                @update:model-value="showToast('当前值：' + params.cw)"/>
-                  </template>
-                </van-field>
-              </div>
-            </van-tab>
-            <van-tab title="融图" name="blend">
-              <div class="tip-text">请上传两张以上的图片，最多不超过五张，超过五张图片请使用图生图功能。</div>
-              <div class="text-line">
-                <van-uploader v-model="imgList" :after-read="uploadImg"/>
-              </div>
-            </van-tab>
-            <van-tab title="换脸" name="swapFace">
-              <div class="tip-text">请上传两张有脸部的图片，用右边图片的脸替换左边图片的脸。</div>
-              <div class="text-line">
-                <van-uploader v-model="imgList" :after-read="uploadImg"/>
-              </div>
-            </van-tab>
-          </van-tabs>
-        </div>
+            <div class="text-line">
+              <van-uploader v-model="imgList" :after-read="uploadImg"/>
+            </div>
+            <div class="text-line">
+              <van-field label="垫图权重">
+                <template #input>
+                  <van-slider v-model.number="params.iw" :max="1" :step="0.01"
+                              @update:model-value="showToast('当前值：' + params.iw)"/>
+                </template>
+              </van-field>
+            </div>
 
-        <div class="text-line">
-          <van-collapse v-model="activeColspan">
-            <van-collapse-item title="反向提示词" name="neg_prompt">
+            <div class="tip-text">提示：只有于 niji6 和 v6 模型支持一致性功能，如果选择其他模型此功能将会生成失败。</div>
+            <van-cell-group>
               <van-field
-                  v-model="params.prompt"
-                  rows="3"
-                  autosize
-                  type="textarea"
-                  placeholder="不想出现在图片上的元素(例如：树，建筑)"
+                  v-model="params.cref"
+                  center
+                  clearable
+                  label="角色一致性"
+                  placeholder="请输入图片URL或者上传图片"
+              >
+                <template #button>
+                  <van-uploader @click="beforeUpload('cref')" :after-read="uploadImg">
+                    <van-button size="mini" type="primary" icon="plus"/>
+                  </van-uploader>
+                </template>
+              </van-field>
+            </van-cell-group>
+
+            <van-cell-group>
+              <van-field
+                  v-model="params.sref"
+                  center
+                  clearable
+                  label="风格一致性"
+                  placeholder="请输入图片URL或者上传图片"
+              >
+                <template #button>
+                  <van-uploader @click="beforeUpload('sref')" :after-read="uploadImg">
+                    <van-button size="mini" type="primary" icon="plus"/>
+                  </van-uploader>
+                </template>
+              </van-field>
+            </van-cell-group>
+
+            <div class="text-line">
+              <van-field label="一致性权重">
+                <template #input>
+                  <van-slider v-model.number="params.cw" :max="100" :step="1"
+                              @update:model-value="showToast('当前值：' + params.cw)"/>
+                </template>
+              </van-field>
+            </div>
+          </van-tab>
+          <van-tab title="融图" name="blend">
+            <div class="tip-text">请上传两张以上的图片，最多不超过五张，超过五张图片请使用图生图功能。</div>
+            <div class="text-line">
+              <van-uploader v-model="imgList" :after-read="uploadImg"/>
+            </div>
+          </van-tab>
+          <van-tab title="换脸" name="swapFace">
+            <div class="tip-text">请上传两张有脸部的图片，用左边图片的脸替换右边图片的脸。</div>
+            <div class="text-line">
+              <van-uploader v-model="imgList" :after-read="uploadImg"/>
+            </div>
+          </van-tab>
+        </van-tabs>
+      </div>
+
+      <div class="text-line">
+        <van-collapse v-model="activeColspan">
+          <van-collapse-item title="反向提示词" name="neg_prompt">
+            <van-field
+                v-model="params.neg_prompt"
+                rows="3"
+                autosize
+                type="textarea"
+                placeholder="不想出现在图片上的元素(例如：树，建筑)"
+            />
+          </van-collapse-item>
+        </van-collapse>
+      </div>
+
+      <div class="text-line">
+        <el-tag>绘图消耗{{ mjPower }}算力，U/V 操作消耗{{ mjActionPower }}算力，当前算力：{{ power }}</el-tag>
+      </div>
+
+      <div class="text-line">
+        <van-button round block type="primary" native-type="submit">
+          立即生成
+        </van-button>
+      </div>
+    </van-form>
+
+    <h3>任务列表</h3>
+    <div class="running-job-list">
+      <van-empty v-if="runningJobs.length ===0"
+                 image="https://fastly.jsdelivr.net/npm/@vant/assets/custom-empty-image.png"
+                 image-size="80"
+                 description="暂无记录"
+      />
+      <van-grid :gutter="10" :column-num="3" v-else>
+        <van-grid-item v-for="item in runningJobs">
+          <div v-if="item.progress > 0">
+            <van-image :src="item['img_url']">
+              <template v-slot:error>加载失败</template>
+            </van-image>
+            <div class="progress">
+              <van-circle
+                  v-model:current-rate="item.progress"
+                  :rate="item.progress"
+                  :speed="100"
+                  :text="item.progress+'%'"
+                  :stroke-width="60"
+                  size="90px"
               />
-            </van-collapse-item>
-          </van-collapse>
-        </div>
+            </div>
+          </div>
 
-        <div class="text-line">
-          <el-tag>绘图消耗{{ mjPower }}算力，U/V 操作消耗{{ mjActionPower }}算力，当前算力：{{ power }}</el-tag>
-        </div>
+          <div v-else class="task-in-queue">
+            <span class="icon"><i class="iconfont icon-quick-start"></i></span>
+            <span class="text">排队中</span>
+          </div>
 
-        <div class="text-line">
-          <van-button round block type="primary" native-type="submit">
-            立即生成
-          </van-button>
-        </div>
-      </van-form>
+        </van-grid-item>
+      </van-grid>
+    </div>
 
-      <h3>任务列表</h3>
-      <div class="running-job-list">
-        <van-empty v-if="runningJobs.length ===0"
-                   image="https://fastly.jsdelivr.net/npm/@vant/assets/custom-empty-image.png"
-                   image-size="80"
-                   description="暂无记录"
-        />
-        <van-grid :gutter="10" :column-num="3" v-else>
-          <van-grid-item v-for="item in runningJobs">
-            <div v-if="item.progress > 0">
-              <van-image :src="item['img_url']">
-                <template v-slot:error>加载失败</template>
+    <h3>创作记录</h3>
+    <div class="finish-job-list">
+      <van-empty v-if="finishedJobs.length ===0"
+                 image="https://fastly.jsdelivr.net/npm/@vant/assets/custom-empty-image.png"
+                 image-size="80"
+                 description="暂无记录"
+      />
+
+      <van-list v-else
+                v-model:error="error"
+                v-model:loading="loading"
+                :finished="finished"
+                error-text="请求失败，点击重新加载"
+                finished-text="没有更多了"
+                @load="onLoad"
+      >
+        <van-grid :gutter="10" :column-num="2">
+          <van-grid-item v-for="item in finishedJobs">
+            <div class="job-item">
+              <van-image
+                  :src="item['thumb_url']"
+                  :class="item['can_opt'] ? '' : 'upscale'"
+                  lazy-load
+                  @click="imageView(item)"
+                  fit="cover">
+                <template v-slot:loading>
+                  <van-loading type="spinner" size="20"/>
+                </template>
               </van-image>
-              <div class="progress">
-                <van-circle
-                    v-model:current-rate="item.progress"
-                    :rate="item.progress"
-                    :speed="100"
-                    :text="item.progress+'%'"
-                    :stroke-width="60"
-                    size="90px"
-                />
+
+              <div class="opt" v-if="item['can_opt']">
+
+                <van-grid :gutter="3" :column-num="4">
+                  <van-grid-item><a @click="upscale(1, item)" class="opt-btn">U1</a></van-grid-item>
+                  <van-grid-item><a @click="upscale(2, item)" class="opt-btn">U2</a></van-grid-item>
+                  <van-grid-item><a @click="upscale(3, item)" class="opt-btn">U3</a></van-grid-item>
+                  <van-grid-item><a @click="upscale(4, item)" class="opt-btn">U4</a></van-grid-item>
+                  <van-grid-item><a @click="variation(1, item)" class="opt-btn">V1</a></van-grid-item>
+                  <van-grid-item><a @click="variation(2, item)" class="opt-btn">V2</a></van-grid-item>
+                  <van-grid-item><a @click="variation(3, item)" class="opt-btn">V3</a></van-grid-item>
+                  <van-grid-item><a @click="variation(4, item)" class="opt-btn">V4</a></van-grid-item>
+                </van-grid>
+              </div>
+
+              <div class="remove">
+                <el-button type="danger" :icon="Delete" @click="removeImage(item)" circle/>
+                <el-button type="warning" v-if="item.publish" @click="publishImage(item, false)"
+                           circle>
+                  <i class="iconfont icon-cancel-share"></i>
+                </el-button>
+                <el-button type="success" v-else @click="publishImage(item, true)" circle>
+                  <i class="iconfont icon-share-bold"></i>
+                </el-button>
+                <el-button type="primary" @click="showPrompt(item)" circle>
+                  <i class="iconfont icon-prompt"></i>
+                </el-button>
               </div>
             </div>
-
-            <div v-else class="task-in-queue">
-              <span class="icon"><i class="iconfont icon-quick-start"></i></span>
-              <span class="text">排队中</span>
-            </div>
-
           </van-grid-item>
         </van-grid>
-      </div>
-
-      <h3>创作记录</h3>
-      <div class="finish-job-list">
-        <van-empty v-if="finishedJobs.length ===0"
-                   image="https://fastly.jsdelivr.net/npm/@vant/assets/custom-empty-image.png"
-                   image-size="80"
-                   description="暂无记录"
-        />
-
-        <van-list v-else
-                  v-model:error="error"
-                  v-model:loading="loading"
-                  :finished="finished"
-                  error-text="请求失败，点击重新加载"
-                  finished-text="没有更多了"
-                  @load="onLoad"
-        >
-          <van-grid :gutter="10" :column-num="2">
-            <van-grid-item v-for="item in finishedJobs">
-              <div class="job-item">
-                <van-image
-                    :src="item['thumb_url']"
-                    :class="item['can_opt'] ? '' : 'upscale'"
-                    lazy-load
-                    @click="imageView(item)"
-                    fit="cover">
-                  <template v-slot:loading>
-                    <van-loading type="spinner" size="20"/>
-                  </template>
-                </van-image>
-
-                <div class="opt" v-if="item['can_opt']">
-
-                  <van-grid :gutter="3" :column-num="4">
-                    <van-grid-item><a @click="upscale(1, item)" class="opt-btn">U1</a></van-grid-item>
-                    <van-grid-item><a @click="upscale(2, item)" class="opt-btn">U2</a></van-grid-item>
-                    <van-grid-item><a @click="upscale(3, item)" class="opt-btn">U3</a></van-grid-item>
-                    <van-grid-item><a @click="upscale(4, item)" class="opt-btn">U4</a></van-grid-item>
-                    <van-grid-item><a @click="variation(1, item)" class="opt-btn">V1</a></van-grid-item>
-                    <van-grid-item><a @click="variation(2, item)" class="opt-btn">V2</a></van-grid-item>
-                    <van-grid-item><a @click="variation(3, item)" class="opt-btn">V3</a></van-grid-item>
-                    <van-grid-item><a @click="variation(4, item)" class="opt-btn">V4</a></van-grid-item>
-                  </van-grid>
-                </div>
-
-                <div class="remove">
-                  <el-button type="danger" :icon="Delete" @click="removeImage(item)" circle/>
-                  <el-button type="warning" v-if="item.publish" @click="publishImage(item, false)"
-                             circle>
-                    <i class="iconfont icon-cancel-share"></i>
-                  </el-button>
-                  <el-button type="success" v-else @click="publishImage(item, true)" circle>
-                    <i class="iconfont icon-share-bold"></i>
-                  </el-button>
-                  <el-button type="primary" @click="showPrompt(item)" circle>
-                    <i class="iconfont icon-prompt"></i>
-                  </el-button>
-                </div>
-              </div>
-            </van-grid-item>
-          </van-grid>
-        </van-list>
-
-      </div>
+      </van-list>
 
     </div>
+
   </div>
 </template>
 
@@ -289,13 +286,11 @@ import {
 } from "vant";
 import {httpGet, httpPost} from "@/utils/http";
 import Compressor from "compressorjs";
-import {ElMessage} from "element-plus";
 import {getSessionId} from "@/store/session";
 import {checkSession} from "@/action/session";
 import {useRouter} from "vue-router";
 import {Delete} from "@element-plus/icons-vue";
 
-const title = ref('MidJourney 绘画')
 const activeColspan = ref([""])
 
 const rates = [
@@ -309,10 +304,10 @@ const rates = [
 const models = [
   {text: "MJ-6.0", value: " --v 6", img: "/images/mj/mj-v6.png"},
   {text: "MJ-5.2", value: " --v 5.2", img: "/images/mj/mj-v5.2.png"},
-  {text: "Niji5 原始", value: " --niji 5", img: "/images/mj/mj-niji.png"},
+  {text: "Niji5", value: " --niji 5", img: "/images/mj/mj-niji.png"},
   {text: "Niji5 可爱", value: " --niji 5 --style cute", img: "/images/mj/nj1.jpg"},
   {text: "Niji5 风景", value: " --niji 5 --style scenic", img: "/images/mj/nj2.jpg"},
-  {text: "Niji5 表现力", value: " --niji 5 --style expressive", img: "/images/mj/nj3.jpg"},
+  {text: "Niji6", value: " --niji 6", img: "/images/mj/nj3.jpg"},
 ]
 const imgList = ref([])
 const params = ref({
@@ -365,7 +360,7 @@ httpGet("/api/config/get?key=system").then(res => {
   mjPower.value = res.data["mj_power"]
   mjActionPower.value = res.data["mj_action_power"]
 }).catch(e => {
-  ElMessage.error("获取系统配置失败：" + e.message)
+  showNotify({type: "danger", message: "获取系统配置失败：" + e.message})
 })
 
 const heartbeatHandle = ref(null)
@@ -436,7 +431,7 @@ const fetchRunningJobs = (userId) => {
     }
     runningJobs.value = _jobs
   }).catch(e => {
-    ElMessage.error("获取任务失败：" + e.message)
+    showNotify({type: "danger", message: "获取任务失败：" + e.message})
   })
 }
 
@@ -451,6 +446,19 @@ const fetchFinishJobs = (page) => {
   httpGet(`/api/mj/jobs?status=1&page=${page}&page_size=${pageSize.value}`).then(res => {
     const jobs = res.data
     for (let i = 0; i < jobs.length; i++) {
+      if (jobs[i].progress === -1) {
+        showNotify({
+          message: `任务ID：${jobs[i]['task_id']} 原因：${jobs[i]['err_msg']}`,
+          type: 'danger',
+        })
+        if (jobs[i].type === 'image') {
+          power.value += mjPower.value
+        } else {
+          power.value += mjActionPower.value
+        }
+        continue
+      }
+
       if (jobs[i]['use_proxy']) {
         jobs[i]['thumb_url'] = jobs[i]['img_url'] + '?x-oss-process=image/quality,q_60&format=webp'
       } else {
@@ -538,10 +546,10 @@ const send = (url, index, item) => {
     session_id: getSessionId(),
     prompt: item.prompt,
   }).then(() => {
-    ElMessage.success("任务推送成功，请耐心等待任务执行...")
+    showSuccessToast("任务推送成功，请耐心等待任务执行...")
     power.value -= mjActionPower.value
   }).catch(e => {
-    ElMessage.error("任务推送失败：" + e.message)
+    showFailToast("任务推送失败：" + e.message)
   })
 }
 
@@ -579,9 +587,9 @@ const removeImage = (item) => {
         '此操作将会删除任务和图片，继续操作码?',
   }).then(() => {
     httpPost("/api/mj/remove", {id: item.id, img_url: item.img_url, user_id: userId.value}).then(() => {
-      ElMessage.success("任务删除成功")
+      showSuccessToast("任务删除成功")
     }).catch(e => {
-      ElMessage.error("任务删除失败：" + e.message)
+      showFailToast("任务删除失败：" + e.message)
     })
   }).catch(() => {
     showToast("您取消了操作")
diff --git a/web/src/views/mobile/ImageSd.vue b/web/src/views/mobile/ImageSd.vue
new file mode 100644
index 00000000..b310a0a1
--- /dev/null
+++ b/web/src/views/mobile/ImageSd.vue
@@ -0,0 +1,523 @@
+<template>
+  <div class="mobile-sd">
+    <van-form @submit="generate">
+      <van-cell-group inset>
+        <div>
+          <van-field
+              v-model="params.sampler"
+              is-link
+              readonly
+              label="采样方法"
+              placeholder="选择采样方法"
+              @click="showSamplerPicker = true"
+          />
+          <van-popup v-model:show="showSamplerPicker" position="bottom" teleport="#app">
+            <van-picker
+                :columns="samplers"
+                @cancel="showSamplerPicker = false"
+                @confirm="samplerConfirm"
+            />
+          </van-popup>
+        </div>
+
+        <van-field label="图片尺寸">
+          <template #input>
+            <van-row gutter="20">
+              <van-col span="12">
+                <el-input v-model="params.width" size="small" placeholder="宽"/>
+              </van-col>
+              <van-col span="12">
+                <el-input v-model="params.height" size="small" placeholder="高"/>
+              </van-col>
+            </van-row>
+          </template>
+        </van-field>
+
+        <van-field v-model.number="params.steps" label="迭代步数"
+                   placeholder="">
+          <template #right-icon>
+            <van-icon name="info-o"
+                      @click="showInfo('值越大则代表细节越多，同时也意味着出图速度越慢，一般推荐20-30')"/>
+          </template>
+        </van-field>
+        <van-field v-model.number="params.cfg_scale" label="引导系数" placeholder="">
+          <template #right-icon>
+            <van-icon name="info-o"
+                      @click="showInfo('提示词引导系数，图像在多大程度上服从提示词，较低值会产生更有创意的结果')"/>
+          </template>
+        </van-field>
+        <van-field v-model.number="params.seed" label="随机因子" placeholder="">
+          <template #right-icon>
+            <van-icon name="info-o"
+                      @click="showInfo('随机数种子，相同的种子会得到相同的结果，设置为 -1 则每次随机生成种子')"/>
+          </template>
+        </van-field>
+
+        <van-field label="高清修复">
+          <template #input>
+            <van-switch v-model="params.hd_fix"/>
+          </template>
+        </van-field>
+
+        <div v-if="params.hd_fix">
+          <div>
+            <van-field
+                v-model="params.hd_scale_alg"
+                is-link
+                readonly
+                label="放大算法"
+                placeholder="选择放大算法"
+                @click="showUpscalePicker = true"
+            />
+            <van-popup v-model:show="showUpscalePicker" position="bottom" teleport="#app">
+              <van-picker
+                  :columns="upscaleAlgArr"
+                  @cancel="showUpscalePicker = false"
+                  @confirm="upscaleConfirm"
+              />
+            </van-popup>
+          </div>
+
+          <van-field v-model.number="params.hd_scale" label="放大倍数"/>
+          <van-field v-model.number="params.hd_steps" label="迭代步数"/>
+
+          <van-field label="重绘幅度">
+            <template #input>
+              <van-slider v-model.number="params.hd_redraw_rate" :max="1" :step="0.1"
+                          @update:model-value="showToast('当前值：' + params.hd_redraw_rate)"/>
+            </template>
+            <template #right-icon>
+              <van-icon name="info-o"
+                        @click="showInfo('决定算法对图像内容的影响程度，较大的值将得到越有创意的图像')"/>
+            </template>
+          </van-field>
+        </div>
+
+        <van-field
+            v-model="params.prompt"
+            rows="3"
+            autosize
+            type="textarea"
+            placeholder="请在此输入绘画提示词，系统会自动翻译中文提示词，高手请直接输入英文提示词"
+        />
+
+        <van-collapse v-model="activeColspan">
+          <van-collapse-item title="反向提示词" name="neg_prompt">
+            <van-field
+                v-model="params.neg_prompt"
+                rows="3"
+                autosize
+                type="textarea"
+                placeholder="不想出现在图片上的元素(例如：树，建筑)"
+            />
+          </van-collapse-item>
+        </van-collapse>
+
+        <div class="text-line pt-6">
+          <el-tag>绘图消耗{{ sdPower }}算力，当前算力：{{ power }}</el-tag>
+        </div>
+
+        <div class="text-line">
+          <van-button round block type="primary" native-type="submit">
+            立即生成
+          </van-button>
+        </div>
+      </van-cell-group>
+    </van-form>
+
+    <h3>任务列表</h3>
+    <div class="running-job-list">
+      <van-empty v-if="runningJobs.length ===0"
+                 image="https://fastly.jsdelivr.net/npm/@vant/assets/custom-empty-image.png"
+                 image-size="80"
+                 description="暂无记录"
+      />
+      <van-grid :gutter="10" :column-num="3" v-else>
+        <van-grid-item v-for="item in runningJobs">
+          <div v-if="item.progress > 0">
+            <van-image :src="item['img_url']">
+              <template v-slot:error>加载失败</template>
+            </van-image>
+            <div class="progress">
+              <van-circle
+                  v-model:current-rate="item.progress"
+                  :rate="item.progress"
+                  :speed="100"
+                  :text="item.progress+'%'"
+                  :stroke-width="60"
+                  size="90px"
+              />
+            </div>
+          </div>
+
+          <div v-else class="task-in-queue">
+            <span class="icon"><i class="iconfont icon-quick-start"></i></span>
+            <span class="text">排队中</span>
+          </div>
+
+        </van-grid-item>
+      </van-grid>
+    </div>
+
+    <h3>创作记录</h3>
+    <div class="finish-job-list">
+      <van-empty v-if="finishedJobs.length ===0"
+                 image="https://fastly.jsdelivr.net/npm/@vant/assets/custom-empty-image.png"
+                 image-size="80"
+                 description="暂无记录"
+      />
+
+      <van-list v-else
+                v-model:error="error"
+                v-model:loading="loading"
+                :finished="finished"
+                error-text="请求失败，点击重新加载"
+                finished-text="没有更多了"
+                @load="onLoad"
+      >
+        <van-grid :gutter="10" :column-num="2">
+          <van-grid-item v-for="item in finishedJobs">
+            <div class="job-item">
+              <van-image
+                  :src="item['img_url']"
+                  :class="item['can_opt'] ? '' : 'upscale'"
+                  lazy-load
+                  @click="imageView(item)"
+                  fit="cover">
+                <template v-slot:loading>
+                  <van-loading type="spinner" size="20"/>
+                </template>
+              </van-image>
+
+              <div class="remove">
+                <el-button type="danger" :icon="Delete" @click="removeImage($event, item)" circle/>
+                <el-button type="warning" v-if="item.publish" @click="publishImage($event,item, false)"
+                           circle>
+                  <i class="iconfont icon-cancel-share"></i>
+                </el-button>
+                <el-button type="success" v-else @click="publishImage($event, item, true)" circle>
+                  <i class="iconfont icon-share-bold"></i>
+                </el-button>
+                <el-button type="primary" @click="showTask(item)" circle>
+                  <i class="iconfont icon-prompt"></i>
+                </el-button>
+              </div>
+            </div>
+          </van-grid-item>
+        </van-grid>
+      </van-list>
+
+    </div>
+
+  </div>
+</template>
+
+<script setup>
+import {onMounted, onUnmounted, ref} from "vue"
+import {Delete} from "@element-plus/icons-vue";
+import {httpGet, httpPost} from "@/utils/http";
+import Clipboard from "clipboard";
+import {checkSession} from "@/action/session";
+import {useRouter} from "vue-router";
+import {getSessionId} from "@/store/session";
+import {
+  showConfirmDialog, showDialog,
+  showFailToast,
+  showImagePreview,
+  showNotify,
+  showSuccessToast,
+  showToast
+} from "vant";
+
+const listBoxHeight = ref(window.innerHeight - 40)
+const mjBoxHeight = ref(window.innerHeight - 150)
+const showTaskDialog = ref(false)
+const item = ref({})
+const showLoginDialog = ref(false)
+const isLogin = ref(false)
+const activeColspan = ref([""])
+
+window.onresize = () => {
+  listBoxHeight.value = window.innerHeight - 40
+  mjBoxHeight.value = window.innerHeight - 150
+}
+const samplers = ref([
+  {text: "Euler a", value: "Euler a"},
+  {text: "DPM++ 2S a Karras", value: "DPM++ 2S a Karras"},
+  {text: "DPM++ 2M Karras", value: "DPM++ 2M Karras"},
+  {text: "DPM++ 2M SDE Karras", value: "DPM++ 2M SDE Karras"},
+  {text: "DPM++ 2M Karras", value: "DPM++ 2M Karras"},
+  {text: "DPM++ 3M SDE Karras", value: "DPM++ 3M SDE Karras"},
+])
+const showSamplerPicker = ref(false)
+
+const upscaleAlgArr = ref([
+  {text: "Latent", value: "Latent"},
+  {text: "ESRGAN_4x", value: "ESRGAN_4x"},
+  {text: "ESRGAN 4x+", value: "ESRGAN 4x+"},
+  {text: "SwinIR_4x", value: "SwinIR_4x"},
+  {text: "LDSR", value: "LDSR"},
+])
+const showUpscalePicker = ref(false)
+
+const params = ref({
+  width: 1024,
+  height: 1024,
+  sampler: samplers.value[0].value,
+  seed: -1,
+  steps: 20,
+  cfg_scale: 7,
+  hd_fix: false,
+  hd_redraw_rate: 0.7,
+  hd_scale: 2,
+  hd_scale_alg: upscaleAlgArr.value[0].value,
+  hd_steps: 0,
+  prompt: "",
+  neg_prompt: "nsfw, paintings,low quality,easynegative,ng_deepnegative ,lowres,bad anatomy,bad hands,bad feet",
+})
+
+const runningJobs = ref([])
+const finishedJobs = ref([])
+const router = useRouter()
+// 检查是否有画同款的参数
+const _params = router.currentRoute.value.params["copyParams"]
+if (_params) {
+  params.value = JSON.parse(_params)
+}
+const power = ref(0)
+const sdPower = ref(0) // 画一张 SD 图片消耗算力
+
+const socket = ref(null)
+const userId = ref(0)
+const heartbeatHandle = ref(null)
+const connect = () => {
+  let host = process.env.VUE_APP_WS_HOST
+  if (host === '') {
+    if (location.protocol === 'https:') {
+      host = 'wss://' + location.host;
+    } else {
+      host = 'ws://' + location.host;
+    }
+  }
+
+  // 心跳函数
+  const sendHeartbeat = () => {
+    clearTimeout(heartbeatHandle.value)
+    new Promise((resolve, reject) => {
+      if (socket.value !== null) {
+        socket.value.send(JSON.stringify({type: "heartbeat", content: "ping"}))
+      }
+      resolve("success")
+    }).then(() => {
+      heartbeatHandle.value = setTimeout(() => sendHeartbeat(), 5000)
+    });
+  }
+
+  const _socket = new WebSocket(host + `/api/sd/client?user_id=${userId.value}`);
+  _socket.addEventListener('open', () => {
+    socket.value = _socket;
+
+    // 发送心跳消息
+    sendHeartbeat()
+  });
+
+  _socket.addEventListener('message', event => {
+    if (event.data instanceof Blob) {
+      fetchRunningJobs()
+      finished.value = false
+      page.value = 1
+      fetchFinishJobs(page.value)
+    }
+  });
+
+  _socket.addEventListener('close', () => {
+    if (socket.value !== null) {
+      connect()
+    }
+  });
+}
+
+const clipboard = ref(null)
+onMounted(() => {
+  initData()
+  clipboard.value = new Clipboard('.copy-prompt-sd');
+  clipboard.value.on('success', () => {
+    showNotify({type: "success", message: "复制成功！"});
+  })
+
+  clipboard.value.on('error', () => {
+    showNotify({type: "danger", message: '复制失败！'});
+  })
+
+  httpGet("/api/config/get?key=system").then(res => {
+    sdPower.value = res.data["sd_power"]
+  }).catch(e => {
+    showNotify({type: "danger", message: "获取系统配置失败：" + e.message})
+  })
+})
+
+onUnmounted(() => {
+  clipboard.value.destroy()
+  socket.value = null
+})
+
+
+const initData = () => {
+  checkSession().then(user => {
+    power.value = user['power']
+    userId.value = user.id
+    isLogin.value = true
+    fetchRunningJobs()
+    fetchFinishJobs(1)
+    connect()
+  }).catch(() => {
+    loading.value = false
+  });
+}
+
+const fetchRunningJobs = () => {
+  // 获取运行中的任务
+  httpGet(`/api/sd/jobs?status=0`).then(res => {
+    const jobs = res.data
+    const _jobs = []
+    for (let i = 0; i < jobs.length; i++) {
+      if (jobs[i].progress === -1) {
+        showNotify({
+          message: `任务ID：${jobs[i]['task_id']} 原因：${jobs[i]['err_msg']}`,
+          type: 'danger',
+        })
+        power.value += sdPower.value
+        continue
+      }
+      _jobs.push(jobs[i])
+    }
+    runningJobs.value = _jobs
+  }).catch(e => {
+    showNotify({type: "danger", message: "获取任务失败：" + e.message})
+  })
+}
+
+const loading = ref(false)
+const finished = ref(false)
+const error = ref(false)
+const page = ref(0)
+const pageSize = ref(10)
+// 获取已完成的任务
+const fetchFinishJobs = (page) => {
+  loading.value = true
+  httpGet(`/api/sd/jobs?status=1&page=${page}&page_size=${pageSize.value}`).then(res => {
+    if (res.data.length < pageSize.value) {
+      finished.value = true
+    }
+    if (page === 1) {
+      finishedJobs.value = res.data
+    } else {
+      finishedJobs.value = finishedJobs.value.concat(res.data)
+    }
+    loading.value = false
+  }).catch(e => {
+    loading.value = false
+    showNotify({type: "danger", message: "获取任务失败：" + e.message})
+  })
+}
+
+const onLoad = () => {
+  page.value += 1
+  fetchFinishJobs(page.value)
+}
+
+// 创建绘图任务
+const promptRef = ref(null)
+const generate = () => {
+  if (params.value.prompt === '') {
+    promptRef.value.focus()
+    return showToast("请输入绘画提示词！")
+  }
+
+  if (!isLogin.value) {
+    showLoginDialog.value = true
+    return
+  }
+
+  if (params.value.seed === '') {
+    params.value.seed = -1
+  }
+  params.value.session_id = getSessionId()
+  httpPost("/api/sd/image", params.value).then(() => {
+    showSuccessToast("绘画任务推送成功，请耐心等待任务执行...")
+    power.value -= sdPower.value
+  }).catch(e => {
+    showFailToast("任务推送失败：" + e.message)
+  })
+}
+
+const showTask = (row) => {
+  item.value = row
+  showTaskDialog.value = true
+}
+
+const copyParams = (row) => {
+  params.value = row.params
+  showTaskDialog.value = false
+}
+
+const removeImage = (event, item) => {
+  event.stopPropagation()
+  showConfirmDialog({
+    title: '标题',
+    message:
+        '此操作将会删除任务和图片，继续操作码?',
+  }).then(() => {
+    httpPost("/api/sd/remove", {id: item.id, img_url: item.img_url, user_id: userId.value}).then(() => {
+      showSuccessToast("任务删除成功")
+    }).catch(e => {
+      showFailToast("任务删除失败：" + e.message)
+    })
+  }).catch(() => {
+    showToast("您取消了操作")
+  });
+}
+
+// 发布图片到作品墙
+const publishImage = (event, item, action) => {
+  event.stopPropagation()
+  let text = "图片发布"
+  if (action === false) {
+    text = "取消发布"
+  }
+  httpPost("/api/sd/publish", {id: item.id, action: action}).then(() => {
+    showSuccessToast(text + "成功")
+    item.publish = action
+  }).catch(e => {
+    showFailToast(text + "失败：" + e.message)
+  })
+}
+
+const imageView = (item) => {
+  showImagePreview([item['img_url']]);
+}
+
+
+const samplerConfirm = (item) => {
+  params.value.sampler = item.selectedOptions[0].text;
+  showSamplerPicker.value = false
+}
+
+const upscaleConfirm = (item) => {
+  params.value.hd_scale_alg = item.selectedOptions[0].text;
+  showUpscalePicker.value = false
+}
+
+const showInfo = (message) => {
+  showDialog({
+    title: "参数说明",
+    message: message,
+  }).then(() => {
+    // on close
+  });
+}
+</script>
+
+<style lang="stylus">
+@import "@/assets/css/mobile/image-sd.styl"
+</style>
\ No newline at end of file

From 8c924ca98f5c92e49d66f16a90e5f7e849005a96 Mon Sep 17 00:00:00 2001
From: RockYang <yangjian102621@gmail.com>
Date: Fri, 5 Apr 2024 06:58:13 +0800
Subject: [PATCH 10/12] update change log

---
 CHANGELOG.md | 24 +++++++++++++++++-------
 1 file changed, 17 insertions(+), 7 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 06851171..5ef712bf 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,24 +1,30 @@
 # 更新日志
-## 4.0.2 
+
+## 4.0.2
+
 * 功能新增：支持前端菜单可以配置
 * 功能优化：在登录和注册界面标题显示软件版本号
 * 功能优化：MJ 绘画支持 --sref 和 --cref 图片一致性参数
 * 功能优化：使用 leveldb 解决 SD 绘图进度图片预览问题
-* 功能优化：手机端支持免登录预览功能
 * Bug修复：解决因为图片上传使用相对路径而导致融图失败的问题。
 * 功能新增：手机端支持 Stable-Diffusion 绘画
 * 功能新增：管理后台登录页面增加行为验证码，防止爆破
 
 ## v4.0.1
-* 功能重构：重构 Stable-Diffusion 绘画实现，使用 SDAPI 替换之前的 websocket 接口，SDAPI 兼容各种 stable-diffusion 发行版，稳定性更强一些
-* 功能优化：使用 [midjouney-proxy](https://github.com/novicezk/midjourney-proxy) 项目替换内置的原生 MidJourney API，兼容 MJ-Plus 中转
+
+* 功能重构：重构 Stable-Diffusion 绘画实现，使用 SDAPI 替换之前的 websocket 接口，SDAPI 兼容各种 stable-diffusion
+  发行版，稳定性更强一些
+* 功能优化：使用 [midjouney-proxy](https://github.com/novicezk/midjourney-proxy) 项目替换内置的原生 MidJourney API，兼容
+  MJ-Plus 中转
 * 功能新增：用户算力消费日志增加统计功能，统计一段时间内用户消费的算力
 * Bug修复：修复 iphone 手机无法通过图形验证码的Bug，使用滑动验证码替换
 * Bug修复：修复手机端 MidJourney 绘画页面滚动条无法滚动的Bug
 
 ## v4.0.0
+
 非兼容版本，重大重构，引入算力概念，将系统中所有的能力（AI对话，MJ绘画，SD绘画，DALL绘画）全部使用算力来兑换。
-只要你的算力值余额不为0，你就可以进行任何操作。比如一次 GPT3.5 对话消耗1个单位算力，一次 GPT4 对话消耗10个算力。一次 MJ 对话消耗15个算力...
+只要你的算力值余额不为0，你就可以进行任何操作。比如一次 GPT3.5 对话消耗1个单位算力，一次 GPT4 对话消耗10个算力。一次 MJ
+对话消耗15个算力...
 
 * 功能重构：重构整体系统，全部采用算力来进行结算
 * 功能优化：SD 绘画页面采用 websocket 替换 http 轮询机制，节省带宽
@@ -33,6 +39,7 @@
 * 功能新增：管理后台新增7日内新增用户和新增订单统计
 
 ## v3.2.7
+
 * 功能重构：采用 Vant 重构移动页面，新增 MidJourney 功能
 * 功能优化：优化 PC 端 MidJourney 页面布局，新增融图和换脸功能
 * Bug修复：修复 issue [
@@ -47,6 +54,7 @@
 * 功能新增：后台管理新怎对话查看和检索功能
 
 ## v3.2.6
+
 * 功能优化：恢复关闭注册系统配置项，管理员可以在后台关闭用户注册，只允许内部添加账号
 * 功能优化：兼用旧版本微信收款消息解析
 * 功能优化：优化订单扫码支付状态轮询功能，当关闭二维码时取消轮询，节约网络资源
@@ -60,16 +68,18 @@
 * 功能优化：给所有的 websocket 连接加上心跳，解决 "close 1006 (abnormal closure): unexpected EOF" Bug
 * 功能新增：新增短信宝短信平台发送平台集成
 
-
 ## v3.2.5
+
 * 功能新增：**重磅更新！！！** 新增 MidJourney-Plus API 支持，一秒配置，开箱即用，高效稳定。
-* 功能新增：**重磅更新！！！** 新增 GPT4-ALL 和 GPTs 模型支持，你只需花几块钱，可以丝滑享受 ChatGPT-Plus 会员的所有功能，无需再订阅 Plus 账号了！！！
+* 功能新增：**重磅更新！！！** 新增 GPT4-ALL 和 GPTs 模型支持，你只需花几块钱，可以丝滑享受 ChatGPT-Plus 会员的所有功能，无需再订阅
+  Plus 账号了！！！
 * 功能优化：增强 markdown 图片和引用块解析。
 * 功能新增：新增用户文件管理，目前一支持上传文件跟 GPT 进行多态对话。
 * 功能优化：function call 兼用中转 API。
 * Bug修复：修复部分已知的 Bug。
 
 ## v3.2.4.1
+
 * 功能新增：新增 PayJs 支付通道
 * Bug修复：紧急修复后台添加用户失败问题
 * Bug修复：紧急修复使用中转 API-KEY 无法绘图的问题

From 7277cb289f02aee7e6a872ec02c4de4f1c6ec82d Mon Sep 17 00:00:00 2001
From: RockYang <yangjian102621@gmail.com>
Date: Sun, 7 Apr 2024 08:01:25 +0800
Subject: [PATCH 11/12] fix 404 error with remove api keys

---
 api/main.go | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/api/main.go b/api/main.go
index 24efc68e..e5b8f3cf 100644
--- a/api/main.go
+++ b/api/main.go
@@ -297,7 +297,7 @@ func main() {
 			group.POST("save", h.Save)
 			group.GET("list", h.List)
 			group.POST("set", h.Set)
-			group.POST("remove", h.Remove)
+			group.GET("remove", h.Remove)
 		}),
 		fx.Invoke(func(s *core.AppServer, h *admin.UserHandler) {
 			group := s.Engine.Group("/api/admin/user/")

From 7a9f45c96bf35ee395546f20488a51669811e5cc Mon Sep 17 00:00:00 2001
From: RockYang <yangjian102621@gmail.com>
Date: Sun, 7 Apr 2024 08:02:47 +0800
Subject: [PATCH 12/12] optimize ngin configuration for chat-plus.conf

---
 deploy/conf/nginx/conf.d/chatgpt-plus.conf | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/deploy/conf/nginx/conf.d/chatgpt-plus.conf b/deploy/conf/nginx/conf.d/chatgpt-plus.conf
index e4d85e3a..8442af6b 100644
--- a/deploy/conf/nginx/conf.d/chatgpt-plus.conf
+++ b/deploy/conf/nginx/conf.d/chatgpt-plus.conf
@@ -15,8 +15,8 @@ server {
 #     ssl_prefer_server_ciphers on;
 
     # 日志地址
-    access_log  /var/log/access.log;
-    error_log /var/log/error.log;
+    access_log  /var/log/nginx/access.log;
+    error_log /var/log/nginx/error.log;
 
     index index.html;
     root /var/www/app/dist; # 这里改成前端静态页面的地址