diff --git a/api/service/license_service.go b/api/service/license_service.go
index b96c394d..74ed9938 100644
--- a/api/service/license_service.go
+++ b/api/service/license_service.go
@@ -79,6 +79,10 @@ func (s *LicenseService) ActiveLicense(license string, machineId string) error {
return fmt.Errorf("激活失败：%v", res.Message)
}
+ if res.Data.ExpiredAt > 0 && res.Data.ExpiredAt < time.Now().Unix() {
+ return fmt.Errorf("License 已过期")
+ }
+
s.license = &types.License{
Key: license,
MachineId: machineId,
@@ -130,13 +134,13 @@ func (s *LicenseService) fetchLicense() (*types.License, error) {
SetBody(map[string]string{"license": s.license.Key, "machine_id": s.machineId}).
SetSuccessResult(&res).Post(apiURL)
if err != nil {
- return nil, fmt.Errorf("发送激活请求失败: %v", err)
+ return nil, fmt.Errorf("License 同步失败: %v", err)
}
if response.IsErrorState() {
- return nil, fmt.Errorf("激活失败：%v", response.Status)
+ return nil, fmt.Errorf("License 同步失败：%v", response.Status)
}
if res.Code != types.Success {
- return nil, fmt.Errorf("激活失败：%v", res.Message)
+ return nil, fmt.Errorf("License 同步失败：%v", res.Message)
}
return &types.License{
diff --git a/api/store/model/chat_message.go b/api/store/model/chat_message.go
index b5257951..eccb832b 100644
--- a/api/store/model/chat_message.go
+++ b/api/store/model/chat_message.go
@@ -6,7 +6,7 @@ import (
type ChatMessage struct {
Id uint `gorm:"column:id;primaryKey;autoIncrement" json:"id"`
- UserId uint `gorm:"column:user_id;type:int(11);not null;comment:用户 ID" json:"user_id"`
+ UserId uint `gorm:"column:user_id;type:int(11);not null;index;comment:用户 ID" json:"user_id"`
ChatId string `gorm:"column:chat_id;type:char(40);not null;index;comment:会话 ID" json:"chat_id"`
Type string `gorm:"column:type;type:varchar(10);not null;comment:类型：prompt|reply" json:"type"`
Icon string `gorm:"column:icon;type:varchar(255);not null;comment:角色图标" json:"icon"`
diff --git a/web/.env.development b/web/.env.development
index e56329b9..9992ffb4 100644
--- a/web/.env.development
+++ b/web/.env.development
@@ -6,7 +6,7 @@ VITE_ADMIN_USER=admin
VITE_ADMIN_PASS=admin123
VITE_KEY_PREFIX=GeekAI_DEV_
VITE_TITLE="Geek-AI 创作系统"
-VITE_VERSION=v4.2.5
+VITE_VERSION=v4.2.6
VITE_DOCS_URL=https://docs.geekai.me
VITE_GITHUB_URL=https://github.com/yangjian102621/geekai
VITE_GITEE_URL=https://gitee.com/blackfox/geekai
diff --git a/web/.env.production b/web/.env.production
index 108dda66..2dfcb19f 100644
--- a/web/.env.production
+++ b/web/.env.production
@@ -1,7 +1,7 @@
VITE_API_HOST=
VITE_WS_HOST=
VITE_KEY_PREFIX=GeekAI_
-VITE_VERSION=v4.2.5
+VITE_VERSION=v4.2.6
VITE_DOCS_URL=https://docs.geekai.me
VITE_GITHUB_URL=https://github.com/yangjian102621/geekai
VITE_GITEE_URL=https://gitee.com/blackfox/geekai
diff --git a/web/src/views/ChatPlus.vue b/web/src/views/ChatPlus.vue
index 89009cce..f7aec1ad 100644
--- a/web/src/views/ChatPlus.vue
+++ b/web/src/views/ChatPlus.vue
@@ -406,6 +406,7 @@ import 'highlight.js/styles/a11y-dark.css'
import { computed, nextTick, onMounted, ref, watch } from 'vue'
import { useRouter } from 'vue-router'
import { getUserToken } from '../store/session'
+import { substr } from '../utils/libs'
const title = ref('GeekAI-智能助手')
const logo = ref('')
@@ -758,6 +759,21 @@ const sendSSERequest = async (message) => {
.catch(() => {})
isNewMsg.value = true
tmpChatTitle.value = message.prompt
+ console.log('chatData.value', chatData.value)
+ // 判断 chatlist 中指定的 chat_id 是否存在
+ const chat = chatList.value.find((chat) => chat.chat_id === chatId.value)
+ if (!chat) {
+ const _role = getRoleById(roleId.value)
+ chatList.value.unshift({
+ chat_id: chatId.value,
+ title: substr(message.prompt, 15),
+ role_id: roleId.value,
+ model_id: modelID.value,
+ icon: _role.icon,
+ created_at: new Date().getTime(),
+ updated_at: new Date().getTime(),
+ })
+ }
return
}
diff --git a/web/src/views/Dalle.vue b/web/src/views/Dalle.vue
index 4bea6bfc..d7e60f99 100644
--- a/web/src/views/Dalle.vue
+++ b/web/src/views/Dalle.vue
@@ -88,13 +88,13 @@
maxlength="1024"
show-word-limit
placeholder="请在此输入绘画提示词，您也可以点击下面的提示词助手生成绘画提示词"
- v-loading="isGenerating"
+ v-loading="promptGenerating"
/>
-
-
+
+
生成专业绘画指令
@@ -120,8 +120,9 @@
class="w-full py-3 bg-gradient-to-r from-blue-500 to-purple-600 text-white rounded-xl disabled:from-gray-400 disabled:to-gray-400 disabled:cursor-not-allowed hover:from-blue-600 hover:to-purple-700 transition-all duration-200 flex items-center justify-center space-x-2 text-base"
@click="generate"
>
-
- 立即生成
+
+
+ {{ isGenerating ? '创作中...' : '立即生成' }}
@@ -492,7 +493,11 @@ const fetchFinishJobs = () => {
// 创建绘图任务
const promptRef = ref(null)
+const isGenerating = ref(false)
const generate = () => {
+ if (isGenerating.value) {
+ return
+ }
if (params.value.prompt === '') {
promptRef.value.focus()
return ElMessage.error('请输入绘画提示词！')
@@ -502,6 +507,7 @@ const generate = () => {
store.setShowLoginDialog(true)
return
}
+ isGenerating.value = true
httpPost('/api/dall/image', params.value)
.then(() => {
ElMessage.success('任务执行成功！')
@@ -517,6 +523,9 @@ const generate = () => {
.catch((e) => {
ElMessage.error('任务执行失败：' + e.message)
})
+ .finally(() => {
+ isGenerating.value = false
+ })
}
const removeImage = (item) => {
@@ -562,20 +571,20 @@ const publishImage = (item, action) => {
})
}
-const isGenerating = ref(false)
+const promptGenerating = ref(false)
const generatePrompt = () => {
if (params.value.prompt === '') {
return showMessageError('请输入原始提示词')
}
- isGenerating.value = true
+ promptGenerating.value = true
httpPost('/api/prompt/image', { prompt: params.value.prompt })
.then((res) => {
params.value.prompt = res.data
- isGenerating.value = false
+ promptGenerating.value = false
})
.catch((e) => {
showMessageError('生成提示词失败：' + e.message)
- isGenerating.value = false
+ promptGenerating.value = false
})
}
diff --git a/web/src/views/ImageMj.vue b/web/src/views/ImageMj.vue
index 8a7a6617..0eb0970e 100644
--- a/web/src/views/ImageMj.vue
+++ b/web/src/views/ImageMj.vue
@@ -203,7 +203,9 @@
-
+
如需自定义比例，在绘画指令最后加一个空格然后加上指令(宽高比) --ar w:h
例如: 1 cat --ar 21:9
@@ -221,14 +223,14 @@
show-word-limit
type="textarea"
ref="promptRef"
- v-loading="isGenerating"
+ v-loading="promptGenerating"
placeholder="请在此输入绘画提示词，您也可以点击下面的提示词助手生成绘画提示词"
/>
-
-
+
+
生成专业绘画指令
@@ -345,7 +347,7 @@
:autosize="{ minRows: 4, maxRows: 6 }"
type="textarea"
ref="promptRef"
- v-loading="isGenerating"
+ v-loading="promptGenerating"
placeholder="请在此输入绘画提示词，系统会自动翻译中文提示词，高手请直接输入英文提示词"
/>
@@ -356,7 +358,7 @@
size="small"
@click="generatePrompt"
color="#5865f2"
- :disabled="isGenerating"
+ :disabled="promptGenerating"
>
生成专业绘画指令
@@ -615,8 +617,9 @@
class="px-10 py-3 bg-gradient-to-r from-blue-500 to-purple-600 text-white rounded-xl disabled:from-gray-400 disabled:to-gray-400 disabled:cursor-not-allowed hover:from-blue-600 hover:to-purple-700 transition-all duration-200 flex items-center justify-center space-x-2 text-base"
@click="generate"
>
-
-
立即生成
+
+
+
{{ isGenerating ? '创作中...' : '立即生成' }}
-
-
+
+
生成专业绘画指令
@@ -305,8 +305,9 @@
class="w-full py-3 bg-gradient-to-r from-blue-500 to-purple-600 text-white rounded-xl disabled:from-gray-400 disabled:to-gray-400 disabled:cursor-not-allowed hover:from-blue-600 hover:to-purple-700 transition-all duration-200 flex items-center justify-center space-x-2 text-base"
@click="generate"
>
-
- 立即生成
+
+
+ {{ isGenerating ? '创作中...' : '立即生成' }}
@@ -657,7 +658,12 @@ const fetchFinishJobs = () => {
// 创建绘图任务
const promptRef = ref(null)
+const isGenerating = ref(false)
const generate = () => {
+ if (isGenerating.value) {
+ return
+ }
+
if (params.value.prompt === '') {
promptRef.value.focus()
return ElMessage.error('请输入绘画提示词！')
@@ -672,6 +678,7 @@ const generate = () => {
params.value.seed = -1
}
params.value.session_id = getSessionId()
+ isGenerating.value = true
httpPost('/api/sd/image', params.value)
.then(() => {
ElMessage.success('绘画任务推送成功，请耐心等待任务执行...')
@@ -685,6 +692,9 @@ const generate = () => {
.catch((e) => {
ElMessage.error('任务推送失败：' + e.message)
})
+ .finally(() => {
+ isGenerating.value = false
+ })
}
const showTask = (row) => {
@@ -737,20 +747,20 @@ const publishImage = (item, action) => {
})
}
-const isGenerating = ref(false)
+const promptGenerating = ref(false)
const generatePrompt = () => {
if (params.value.prompt === '') {
return showMessageError('请输入原始提示词')
}
- isGenerating.value = true
+ promptGenerating.value = true
httpPost('/api/prompt/image', { prompt: params.value.prompt })
.then((res) => {
params.value.prompt = res.data
- isGenerating.value = false
+ promptGenerating.value = false
})
.catch((e) => {
showMessageError('生成提示词失败：' + e.message)
- isGenerating.value = false
+ promptGenerating.value = false
})
}
diff --git a/web/src/views/Jimeng.vue b/web/src/views/Jimeng.vue
index c366e4fc..38c29ad5 100644
--- a/web/src/views/Jimeng.vue
+++ b/web/src/views/Jimeng.vue
@@ -310,7 +310,7 @@