From 56c225bf20b9795c898517e5ccbbfe30779e9baf Mon Sep 17 00:00:00 2001 From: RockYang Date: Mon, 1 Apr 2024 18:20:00 +0800 Subject: [PATCH] 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$-Ycllvxx3Z5r3eOkhuU)6HKNg{&Tg> zNwpO!eHPuV0yF}c8PNYb;3pkPB&%t&sst>0tBrqFowtqv@}xl8dnIz-D?O zAV(mMSpKcE?lk%8z#^l0oV0N{HOew#dC86Qx%bg8lb0h`SD(*Bq}CgF|!=V zwh810jj`_pSl=tAQw)er?@@q?$Tb?7BLn-J%2E)ekrA|ECM#YcL6?I#8`)kSby^&k!&er;c=Vp41n!`XmrbO z0F#cGog?WTk$}zg8bIDEqTrJVq`6yS-&YDeEZ;zPz7MFLL?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`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`KNx&pK?s#5pcF5rcXJlLD#liakqYFUD1KdgNb35- zV+;64bULQJg2Cfv@VNlUt1(2Ax|*u$1oDdLt&74p77OI ze9CZH?gK;>Z9f)sTg?dM4chcJ2-s2>R)2Cl0Y@wKIwt+E~mqBJL!Q*4^)`R6C#8F9Df0f z7Du9|E5wg#5wPhl0ni4ZZs?;}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*`lnFnn#pc4C<{iU@*&L~`#8m|6@rB18=SfY^xMo?v(T$=;9L>hAG&-^Js? z+v@I^`DVVE*?Ifz35NWVArujIaG1bL!+_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#Px&`$dm;W{dtpT?D^&2t)z1GQK9}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`)wy@n!E*8$qvDA>E9z>%}Hwg!N_Dpz^%eyw#1-Y$nD6TKE5^p{sXj+BU7+Vv4W%&ZxYB(3f-n_u90!Gy!nO1?=`a1-{|Xe0C`S zjH#F&f>HFf5O4~#vXKB86(gB6A+)zo0a#ye;|Dg)ZCwS(s(cX8Siot+!Q!`PRlXn4=RqL`ywORH91j8b|8EW4 zb3SuuKG0QwjNAzV7fM2`(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<&=PJXQu4 za=u=bn^N#*YBqwg&VZg4w6WU8=WLpc``se|)>gOA3%5AD@?<>M zov}&`;D0?afbAYG99xXfQHcRM6UX*v8342&yUvX4`waXGpIbXmENvOD00000NkvXX Hu0mjfF{cXX literal 5198 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 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) } 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 @@
@@ -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('极客学长') 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 @@