From 282f55c7a3c55c9a73a29c364b26b06dc81da271 Mon Sep 17 00:00:00 2001
From: RockYang <yangjian102621@gmail.com>
Date: Mon, 15 Jul 2024 18:44:14 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E7=89=88=E6=9D=83=E6=98=BE?=
 =?UTF-8?q?=E7=A4=BA=E9=80=BB=E8=BE=91=EF=BC=8C=E5=85=81=E8=AE=B8=E6=BF=80?=
 =?UTF-8?q?=E6=B4=BB=E7=94=A8=E6=88=B7=E6=9B=B4=E6=94=B9=E8=87=AA=E5=AE=9A?=
 =?UTF-8?q?=E4=B9=89=E7=89=88=E6=9D=83?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 api/config.sample.toml              |  2 +-
 api/core/types/config.go            |  1 +
 api/handler/admin/config_handler.go |  7 ++++++
 deploy/conf/config.toml             |  2 +-
 web/.env.development                |  2 +-
 web/.env.production                 |  3 +--
 web/src/components/FooterBar.vue    | 35 +++++++++++++++++++++++------
 web/src/components/LoginDialog.vue  |  5 ++++-
 web/src/router.js                   | 14 +-----------
 web/src/utils/http.js               |  6 ++++-
 web/src/views/Index.vue             | 10 ++++-----
 web/src/views/Login.vue             |  6 ++---
 web/src/views/MarkMap.vue           | 32 +++++++++++++++-----------
 web/src/views/admin/SysConfig.vue   | 10 +++++++--
 14 files changed, 83 insertions(+), 52 deletions(-)

diff --git a/api/config.sample.toml b/api/config.sample.toml
index 4f2819a6..eb33a5d7 100644
--- a/api/config.sample.toml
+++ b/api/config.sample.toml
@@ -18,7 +18,7 @@ TikaHost = "http://tika:9998"
   DB = 0
 
 [ApiConfig] # 微博热搜，今日头条等函数服务 API 配置，此为第三方插件服务，如需使用请联系作者开通
-  ApiURL = ""
+  ApiURL = "https://sapi.geekai.me"
   AppId = ""
   Token = ""
 
diff --git a/api/core/types/config.go b/api/core/types/config.go
index a31be482..1158b684 100644
--- a/api/core/types/config.go
+++ b/api/core/types/config.go
@@ -228,4 +228,5 @@ type SystemConfig struct {
 	SdNegPrompt string `json:"sd_neg_prompt"` // SD 默认反向提示词
 
 	IndexBgURL string `json:"index_bg_url"` // 前端首页背景图片
+	Copyright  string `json:"copyright"`    // 版权信息
 }
diff --git a/api/handler/admin/config_handler.go b/api/handler/admin/config_handler.go
index 584b026b..66ee2a27 100644
--- a/api/handler/admin/config_handler.go
+++ b/api/handler/admin/config_handler.go
@@ -50,6 +50,7 @@ func (h *ConfigHandler) Update(c *gin.Context) {
 			Content string `json:"content,omitempty"`
 			Updated bool   `json:"updated,omitempty"`
 		} `json:"config"`
+		ConfigBak types.SystemConfig `json:"config_bak,omitempty"`
 	}
 
 	if err := c.ShouldBindJSON(&data); err != nil {
@@ -57,6 +58,12 @@ func (h *ConfigHandler) Update(c *gin.Context) {
 		return
 	}
 
+	// ONLY authorized user can change the copyright
+	if (data.Key == "system" && data.Config.Copyright != data.ConfigBak.Copyright) && !h.licenseService.GetLicense().Configs.DeCopy {
+		resp.ERROR(c, "您无权修改版权信息，请先联系作者获取授权")
+		return
+	}
+
 	value := utils.JsonEncode(&data.Config)
 	config := model.Config{Key: data.Key, Config: value}
 	res := h.DB.FirstOrCreate(&config, model.Config{Key: data.Key})
diff --git a/deploy/conf/config.toml b/deploy/conf/config.toml
index fee98bc8..2b834a43 100644
--- a/deploy/conf/config.toml
+++ b/deploy/conf/config.toml
@@ -21,7 +21,7 @@ TikaHost = "http://tika:9998"
   DB = 0
 
 [ApiConfig]
-  ApiURL = "http://service.r9it.com:9001"
+  ApiURL = "http://sapi.geekai.me"
   AppId = ""
   Token = ""
 
diff --git a/web/.env.development b/web/.env.development
index 23f5535c..ba889b03 100644
--- a/web/.env.development
+++ b/web/.env.development
@@ -6,6 +6,6 @@ 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.1.0
+VUE_APP_VERSION=v4.1.1
 VUE_APP_DOCS_URL=https://docs.geekai.me
 VUE_APP_GIT_URL=https://github.com/yangjian102621/geekai
diff --git a/web/.env.production b/web/.env.production
index 6a07e76e..6e3a7049 100644
--- a/web/.env.production
+++ b/web/.env.production
@@ -1,7 +1,6 @@
 VUE_APP_API_HOST=
 VUE_APP_WS_HOST=
 VUE_APP_KEY_PREFIX=ChatPLUS_
-VUE_APP_TITLE="Geek-AI 创作系统"
-VUE_APP_VERSION=v4.1.0
+VUE_APP_VERSION=v4.1.1
 VUE_APP_DOCS_URL=https://docs.geekai.me
 VUE_APP_GIT_URL=https://github.com/yangjian102621/geekai
diff --git a/web/src/components/FooterBar.vue b/web/src/components/FooterBar.vue
index f2e106a5..671adf31 100644
--- a/web/src/components/FooterBar.vue
+++ b/web/src/components/FooterBar.vue
@@ -1,22 +1,43 @@
 <template>
   <div class="foot-container">
     <div class="footer">
-      Powered by {{ author }} @
-      <el-link type="primary" :href="gitURL" target="_blank" style="--el-link-text-color:#ffffff">
-        {{ title }} -
-        {{ version }}
-      </el-link>
+      <div v-if="license.de_copy">{{copyRight}}</div>
+      <div v-else>
+        <span>{{copyRight}}</span>
+        <el-link type="primary" :href="gitURL" target="_blank" style="--el-link-text-color:#ffffff">
+          {{ title }} -
+          {{ version }}
+        </el-link>
+      </div>
     </div>
   </div>
 </template>
 <script setup>
 
 import {ref} from "vue";
+import {httpGet} from "@/utils/http";
+import {showMessageError} from "@/utils/dialog";
 
-const title = ref(process.env.VUE_APP_TITLE)
+const title = ref("")
 const version = ref(process.env.VUE_APP_VERSION)
 const gitURL = ref(process.env.VUE_APP_GIT_URL)
-const author = ref('极客学长')
+const copyRight = ref('')
+const license = ref({})
+
+
+// 获取系统配置
+httpGet("/api/config/get?key=system").then(res => {
+  title.value = res.data.title??process.env.VUE_APP_TITLE
+  copyRight.value = res.data.copyright??'极客学长 © 2023 - '+new Date().getFullYear()+' All rights reserved.'
+}).catch(e => {
+  showMessageError("获取系统配置失败：" + e.message)
+})
+
+httpGet("/api/config/license").then(res => {
+  license.value = res.data
+}).catch(e => {
+  showMessageError("获取 License 失败：" + e.message)
+})
 </script>
 
 <style scoped lang="stylus">
diff --git a/web/src/components/LoginDialog.vue b/web/src/components/LoginDialog.vue
index e82a0d62..a279b005 100644
--- a/web/src/components/LoginDialog.vue
+++ b/web/src/components/LoginDialog.vue
@@ -251,7 +251,7 @@ const enableMobile = ref(false)
 const enableEmail = ref(false)
 const enableUser = ref(false)
 const enableRegister = ref(false)
-const activeName = ref("mobile")
+const activeName = ref("")
 const wxImg = ref("/images/wx.png")
 // eslint-disable-next-line no-undef
 const emits = defineEmits(['hide', 'success']);
@@ -261,12 +261,15 @@ httpGet("/api/config/get?key=system").then(res => {
     const registerWays = res.data['register_ways']
     if (arrayContains(registerWays, "mobile")) {
       enableMobile.value = true
+      activeName.value = activeName.value === "" ? "mobile" : activeName.value
     }
     if (arrayContains(registerWays, "email")) {
       enableEmail.value = true
+      activeName.value = activeName.value === "" ? "email" : activeName.value
     }
     if (arrayContains(registerWays, "username")) {
       enableUser.value = true
+      activeName.value = activeName.value === "" ? "username" : activeName.value
     }
     // 是否启用注册
     enableRegister.value = res.data['enabled_register']
diff --git a/web/src/router.js b/web/src/router.js
index 4b534968..1b826350 100644
--- a/web/src/router.js
+++ b/web/src/router.js
@@ -280,23 +280,11 @@ const router = createRouter({
     routes: routes,
 })
 
-const active = ref(false)
-const title = ref('')
-httpGet("/api/config/license").then(res => {
-    active.value = res.data.de_copy
-}).catch(() => {})
-httpGet("/api/config/get?key=system").then(res => {
-    title.value = res.data.title
-}).catch(()=>{})
 
 let prevRoute = null
 // dynamic change the title when router change
 router.beforeEach((to, from, next) => {
-    if (!active.value) {
-        document.title = `${to.meta.title} | ${process.env.VUE_APP_TITLE}`
-    } else {
-        document.title = `${to.meta.title} | ${title.value}`
-    }
+    document.title = to.meta.title
     prevRoute = from
     next()
 })
diff --git a/web/src/utils/http.js b/web/src/utils/http.js
index 7ee7b399..a7d66715 100644
--- a/web/src/utils/http.js
+++ b/web/src/utils/http.js
@@ -36,7 +36,11 @@ axios.interceptors.response.use(
             }
             return Promise.reject(error.response.data)
         }
-        return Promise.reject(error)
+        if (error.response.status === 400) {
+            return Promise.reject(new Error(error.response.data.message))
+        } else {
+            return Promise.reject(error)
+        }
     })
 
 
diff --git a/web/src/views/Index.vue b/web/src/views/Index.vue
index e46196f8..ecccd03c 100644
--- a/web/src/views/Index.vue
+++ b/web/src/views/Index.vue
@@ -11,7 +11,7 @@
           <div class="title">{{ title }}</div>
         </div>
         <div class="menu-item">
-          <span v-if="!licenseConfig.de_copy">
+          <span v-if="!license.de_copy">
             <a :href="docsURL" target="_blank">
             <el-button type="primary" round>
               <i class="iconfont icon-book"></i>
@@ -57,9 +57,7 @@
       <!--      <div id="animation-container"></div>-->
     </div>
 
-    <div class="footer" v-if="!licenseConfig.de_copy">
-      <footer-bar />
-    </div>
+    <footer-bar />
   </div>
 </template>
 
@@ -82,7 +80,7 @@ if (isMobile()) {
 const title = ref("Geek-AI 创作系统")
 const logo = ref("/images/logo.png")
 const slogan = ref("我辈之人，先干为敬，陪您先把 AI 用起来")
-const licenseConfig = ref({})
+const license = ref({})
 const winHeight = window.innerHeight - 150
 const bgImgUrl = ref('')
 const isLogin = ref(false)
@@ -106,7 +104,7 @@ onMounted(() => {
   })
 
   httpGet("/api/config/license").then(res => {
-    licenseConfig.value = res.data
+    license.value = res.data
   }).catch(e => {
     ElMessage.error("获取 License 配置：" + e.message)
   })
diff --git a/web/src/views/Login.vue b/web/src/views/Login.vue
index 76ae9e12..74703858 100644
--- a/web/src/views/Login.vue
+++ b/web/src/views/Login.vue
@@ -55,10 +55,8 @@
       </div>
 
       <reset-pass @hide="showResetPass = false" :show="showResetPass"/>
-
-      <footer class="footer"  v-if="!licenseConfig.de_copy">
-        <footer-bar/>
-      </footer>
+      
+      <footer-bar/>
     </div>
   </div>
 </template>
diff --git a/web/src/views/MarkMap.vue b/web/src/views/MarkMap.vue
index 044d5cc5..020c6e2c 100644
--- a/web/src/views/MarkMap.vue
+++ b/web/src/views/MarkMap.vue
@@ -106,19 +106,10 @@ import {useSharedStore} from "@/store/sharedata";
 
 const leftBoxHeight = ref(window.innerHeight - 105)
 const rightBoxHeight = ref(window.innerHeight - 115)
+const title = ref("")
 
 const prompt = ref("")
-const text = ref(`# Geek-AI 助手
-
-- 完整的开源系统，前端应用和后台管理系统皆可开箱即用。
-- 基于 Websocket 实现，完美的打字机体验。
-- 内置了各种预训练好的角色应用,轻松满足你的各种聊天和应用需求。
-- 支持 OPenAI，Azure，文心一言，讯飞星火，清华 ChatGLM等多个大语言模型。
-- 支持 MidJourney / Stable Diffusion AI 绘画集成，开箱即用。
-- 支持使用个人微信二维码作为充值收费的支付渠道，无需企业支付通道。
-- 已集成支付宝支付功能，微信支付，支持多种会员套餐和点卡购买功能。
-- 集成插件 API 功能，可结合大语言模型的 function 功能开发各种强大的插件。
-`)
+const text = ref("")
 const md = require('markdown-it')({breaks: true});
 const content = ref(text.value)
 const html = ref("")
@@ -135,7 +126,20 @@ const models = ref([])
 const modelID = ref(0)
 const loading = ref(false)
 
-onMounted(() => {
+httpGet("/api/config/get?key=system").then(res => {
+  title.value = res.data.title??process.env.VUE_APP_TITLE
+  text.value = `# ${title.value}
+
+- 完整的开源系统，前端应用和后台管理系统皆可开箱即用。
+- 基于 Websocket 实现，完美的打字机体验。
+- 内置了各种预训练好的角色应用,轻松满足你的各种聊天和应用需求。
+- 支持 OPenAI，Azure，文心一言，讯飞星火，清华 ChatGLM等多个大语言模型。
+- 支持 MidJourney / Stable Diffusion AI 绘画集成，开箱即用。
+- 支持使用个人微信二维码作为充值收费的支付渠道，无需企业支付通道。
+- 已集成支付宝支付功能，微信支付，支持多种会员套餐和点卡购买功能。
+- 集成插件 API 功能，可结合大语言模型的 function 功能开发各种强大的插件。
+`
+  content.value = text.value
   initData()
   try {
     markMap.value = Markmap.create(svgRef.value)
@@ -145,7 +149,9 @@ onMounted(() => {
   } catch (e) {
     console.error(e)
   }
-});
+}).catch(e => {
+  ElMessage.error("获取系统配置失败：" + e.message)
+})
 
 const initData = () => {
   httpGet("/api/model/list").then(res => {
diff --git a/web/src/views/admin/SysConfig.vue b/web/src/views/admin/SysConfig.vue
index af979b2e..973daf38 100644
--- a/web/src/views/admin/SysConfig.vue
+++ b/web/src/views/admin/SysConfig.vue
@@ -53,6 +53,10 @@
                   </div>
                 </el-form-item>
 
+                <el-form-item label="版权信息" prop="copyright">
+                  <el-input v-model="system['copyright']" placeholder="更改此选项需要获取 License 授权"/>
+                </el-form-item>
+
                 <el-form-item label="开放注册" prop="enabled_register">
                   <div class="tip-input">
                     <el-switch v-model="system['enabled_register']"/>
@@ -391,11 +395,12 @@ import {InfoFilled, UploadFilled,Select,CloseBold} from "@element-plus/icons-vue
 import MdEditor from "md-editor-v3";
 import 'md-editor-v3/lib/style.css';
 import Menu from "@/views/admin/Menu.vue";
-import {dateFormat} from "@/utils/libs";
+import {copyObj, dateFormat} from "@/utils/libs";
 import AIDrawing from "@/views/admin/AIDrawing.vue";
 
 const activeName = ref('basic')
 const system = ref({models: []})
+const configBak = ref({})
 const loading = ref(true)
 const systemFormRef = ref(null)
 const models = ref([])
@@ -407,6 +412,7 @@ onMounted(() => {
   // 加载系统配置
   httpGet('/api/admin/config/get?key=system').then(res => {
     system.value = res.data
+    configBak.value = copyObj(system.value)
   }).catch(e => {
     ElMessage.error("加载系统配置失败: " + e.message)
   })
@@ -447,7 +453,7 @@ const save = function (key) {
     systemFormRef.value.validate((valid) => {
       if (valid) {
         system.value['power_price'] = parseFloat(system.value['power_price']) ?? 0
-        httpPost('/api/admin/config/update', {key: key, config: system.value}).then(() => {
+        httpPost('/api/admin/config/update', {key: key, config: system.value, config_bak: configBak.value}).then(() => {
           ElMessage.success("操作成功！")
         }).catch(e => {
           ElMessage.error("操作失败：" + e.message)