diff --git a/CHANGELOG.md b/CHANGELOG.md
index 68e82937..373fdcb8 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,12 +1,16 @@
# 更新日志
+## 4.0.2
+* 功能新增:支持前端菜单可以配置
+* 功能优化:手机端支持免登录预览功能
+* 功能新增:手机端支持 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 绘画
* Bug修复:修复 iphone 手机无法通过图形验证码的Bug,使用滑动验证码替换
+* Bug修复:修复手机端 MidJourney 绘画页面滚动条无法滚动的Bug
## v4.0.0
非兼容版本,重大重构,引入算力概念,将系统中所有的能力(AI对话,MJ绘画,SD绘画,DALL绘画)全部使用算力来兑换。
diff --git a/api/handler/admin/power_log_handler.go b/api/handler/admin/power_log_handler.go
index 80ce8879..3f15108e 100644
--- a/api/handler/admin/power_log_handler.go
+++ b/api/handler/admin/power_log_handler.go
@@ -67,5 +67,11 @@ func (h *PowerLogHandler) List(c *gin.Context) {
list = append(list, log)
}
}
- resp.SUCCESS(c, vo.NewPage(total, data.Page, data.PageSize, list))
+
+ // 统计消费算力总和
+ var totalPower float64
+ if len(data.Date) == 2 {
+ session.Where("mark", 0).Select("SUM(amount) as total_sum").Scan(&totalPower)
+ }
+ resp.SUCCESS(c, gin.H{"data": vo.NewPage(total, data.Page, data.PageSize, list), "stat": totalPower})
}
diff --git a/api/handler/captcha_handler.go b/api/handler/captcha_handler.go
index e0ffbfe9..fe186d15 100644
--- a/api/handler/captcha_handler.go
+++ b/api/handler/captcha_handler.go
@@ -45,3 +45,33 @@ func (h *CaptchaHandler) Check(c *gin.Context) {
}
}
+
+// SlideGet 获取滑动验证图片
+func (h *CaptchaHandler) SlideGet(c *gin.Context) {
+ data, err := h.service.SlideGet()
+ if err != nil {
+ resp.ERROR(c, err.Error())
+ return
+ }
+
+ resp.SUCCESS(c, data)
+}
+
+// SlideCheck 滑动验证结果校验
+func (h *CaptchaHandler) SlideCheck(c *gin.Context) {
+ var data struct {
+ Key string `json:"key"`
+ X int `json:"x"`
+ }
+ if err := c.ShouldBindJSON(&data); err != nil {
+ resp.ERROR(c, types.InvalidArgs)
+ return
+ }
+
+ if h.service.SlideCheck(data) {
+ resp.SUCCESS(c)
+ } else {
+ resp.ERROR(c)
+ }
+
+}
diff --git a/api/main.go b/api/main.go
index ff43cdf7..c5ce4baa 100644
--- a/api/main.go
+++ b/api/main.go
@@ -238,6 +238,8 @@ func main() {
group := s.Engine.Group("/api/captcha/")
group.GET("get", h.Get)
group.POST("check", h.Check)
+ group.GET("slide/get", h.SlideGet)
+ group.POST("slide/check", h.SlideCheck)
}),
fx.Invoke(func(s *core.AppServer, h *handler.RewardHandler) {
group := s.Engine.Group("/api/reward/")
diff --git a/api/service/captcha_service.go b/api/service/captcha_service.go
index c4b784ac..4efbfe55 100644
--- a/api/service/captcha_service.go
+++ b/api/service/captcha_service.go
@@ -60,3 +60,44 @@ func (s *CaptchaService) Check(data interface{}) bool {
return true
}
+
+func (s *CaptchaService) SlideGet() (interface{}, error) {
+ if s.config.Token == "" {
+ return nil, errors.New("无效的 API Token")
+ }
+
+ url := fmt.Sprintf("%s/api/captcha/slide/get", s.config.ApiURL)
+ var res types.BizVo
+ r, err := s.client.R().
+ SetHeader("AppId", s.config.AppId).
+ SetHeader("Authorization", fmt.Sprintf("Bearer %s", s.config.Token)).
+ SetSuccessResult(&res).Get(url)
+ if err != nil || r.IsErrorState() {
+ return nil, fmt.Errorf("请求 API 失败:%v", err)
+ }
+
+ if res.Code != types.Success {
+ return nil, fmt.Errorf("请求 API 失败:%s", res.Message)
+ }
+
+ return res.Data, nil
+}
+
+func (s *CaptchaService) SlideCheck(data interface{}) bool {
+ url := fmt.Sprintf("%s/api/captcha/slide/check", s.config.ApiURL)
+ var res types.BizVo
+ r, err := s.client.R().
+ SetHeader("AppId", s.config.AppId).
+ SetHeader("Authorization", fmt.Sprintf("Bearer %s", s.config.Token)).
+ SetBodyJsonMarshal(data).
+ SetSuccessResult(&res).Post(url)
+ if err != nil || r.IsErrorState() {
+ return false
+ }
+
+ if res.Code != types.Success {
+ return false
+ }
+
+ return true
+}
diff --git a/deploy/conf/config.toml b/deploy/conf/config.toml
index c4ed68c3..31add5a9 100644
--- a/deploy/conf/config.toml
+++ b/deploy/conf/config.toml
@@ -42,7 +42,7 @@ WeChatBot = false
CodeTempId = ""
[OSS] # OSS 配置,用于存储 MJ 绘画图片
- Active = "local" # 默认使用本地文件存储引擎
+ Active = "Local" # 默认使用本地文件存储引擎
[OSS.Local]
BasePath = "./static/upload" # 本地文件上传根路径
BaseURL = "/static/upload" # 本地上传文件根 URL 如果是线上,则直接设置为 /static/upload 即可
diff --git a/deploy/conf/xxl-job/application.properties b/deploy/conf/xxl-job/application.properties
index 8fcd5b2f..b25e3fe1 100644
--- a/deploy/conf/xxl-job/application.properties
+++ b/deploy/conf/xxl-job/application.properties
@@ -23,9 +23,9 @@ mybatis.mapper-locations=classpath:/mybatis-mapper/*Mapper.xml
#mybatis.type-aliases-package=com.xxl.job.admin.core.model
### xxl-job, datasource
-spring.datasource.url=jdbc:mysql://172.22.11.200:3306/xxl_job?useUnicode=true&characterEncoding=UTF-8&autoReconnect=true&serverTimezone=Asia/Shanghai
+spring.datasource.url=jdbc:mysql://chatgpt-plus-mysql:3306/xxl_job?useUnicode=true&characterEncoding=UTF-8&autoReconnect=true&serverTimezone=Asia/Shanghai
spring.datasource.username=root
-spring.datasource.password=mysql_pass
+spring.datasource.password=12345678
spring.datasource.driver-class-name=com.mysql.cj.jdbc.Driver
### datasource-pool
diff --git a/deploy/docker-compose.yaml b/deploy/docker-compose.yaml
index fc184daa..a3702040 100644
--- a/deploy/docker-compose.yaml
+++ b/deploy/docker-compose.yaml
@@ -38,6 +38,8 @@ services:
volumes:
- ./logs/xxl-job:/data/applogs
- ./conf/xxl-job/application.properties:/application.properties
+ depends_on:
+ - chatgpt-plus-mysql
# 后端 API 程序
chatgpt-plus-api:
diff --git a/web/src/components/SendMsg.vue b/web/src/components/SendMsg.vue
index 2f0f5122..d419bd2a 100644
--- a/web/src/components/SendMsg.vue
+++ b/web/src/components/SendMsg.vue
@@ -10,7 +10,17 @@
:show-close="false"
style="width:90%;max-width: 360px;"
>
+
+
-
@@ -32,6 +41,8 @@ import {validateEmail, validateMobile} from "@/utils/validate";
import {ElMessage} from "element-plus";
import {httpGet, httpPost} from "@/utils/http";
import CaptchaPlus from "@/components/CaptchaPlus.vue";
+import SlideCaptcha from "@/components/SlideCaptcha.vue";
+import {isIphone} from "@/utils/libs";
const props = defineProps({
receiver: String,
@@ -87,7 +98,12 @@ const loadCaptcha = () => {
}
showCaptcha.value = true
- handleRequestCaptCode() // 每次点开都刷新验证码
+ // iphone 手机用滑动验证码
+ if (isIphone()) {
+ getSlideCaptcha()
+ } else {
+ handleRequestCaptCode()
+ }
}
const sendMsg = () => {
@@ -116,6 +132,34 @@ const sendMsg = () => {
})
}
+// 滑动验证码
+const bgImg = ref('')
+const bkImg = ref('')
+const result = ref(0)
+
+const getSlideCaptcha = () => {
+ result.value = 0
+ httpGet("/api/captcha/slide/get").then(res => {
+ bkImg.value = res.data.bkImg
+ bgImg.value = res.data.bgImg
+ captKey.value = res.data.key
+ }).catch(e => {
+ ElMessage.error('获取人机验证数据失败:' + e.message)
+ })
+}
+
+const handleSlideConfirm = (x) => {
+ httpPost("/api/captcha/slide/check", {
+ key: captKey.value,
+ x: x
+ }).then(() => {
+ result.value = 1
+ showCaptcha.value = false
+ sendMsg()
+ }).catch(() => {
+ result.value = 2
+ })
+}
\ No newline at end of file
diff --git a/web/src/utils/libs.js b/web/src/utils/libs.js
index cdf2a95e..646608e6 100644
--- a/web/src/utils/libs.js
+++ b/web/src/utils/libs.js
@@ -220,23 +220,7 @@ export function escapeHTML(html) {
.replace(/>/g, ">");
}
-// 处理数学公式
-export function processMathFormula(input) {
- const arr = []
- const lines = input.split("\n")
- if (lines.length <= 1) {
- return input
- }
- // 定义匹配数学公式的正则表达式
- const mathFormulaRegex = /[+\-*/^()\d.]/;
- for (let i = 0; i < lines.length; i++) {
- if (i > 0 && mathFormulaRegex.test(lines) && lines[i - 1].indexOf("$$") === -1) {
- arr.push("$$")
- arr.push(lines[i])
- arr.push("$$")
- } else {
- arr.push(lines[i])
- }
- }
- return arr.join("\n")
+// 判断是否为 iphone 设备
+export function isIphone() {
+ return /iPhone/i.test(navigator.userAgent) && !/iPad/i.test(navigator.userAgent);
}
diff --git a/web/src/views/admin/PowerLog.vue b/web/src/views/admin/PowerLog.vue
index eac6d37c..fff0c7de 100644
--- a/web/src/views/admin/PowerLog.vue
+++ b/web/src/views/admin/PowerLog.vue
@@ -19,7 +19,9 @@
value-format="YYYY-MM-DD"
style="margin: 0 10px;width: 200px; position: relative;top:3px;"
/>
- 搜索
+ 搜索
+
+ 算力总额:{{ totalPower }}
@@ -82,6 +84,8 @@ const query = ref({
date: [],
type: 0
})
+const totalPower = ref(0)
+
const tagColors = ref(["", "success", "primary", "danger", "info", "warning"])
onMounted(() => {
@@ -96,6 +100,12 @@ onMounted(() => {
})
})
+// 搜索
+const search = () => {
+ page.value = 1
+ fetchData()
+}
+
// 获取数据
const fetchData = () => {
loading.value = true
@@ -106,12 +116,14 @@ const fetchData = () => {
page: page.value,
page_size: pageSize.value
}).then((res) => {
- if (res.data) {
- items.value = res.data.items
- total.value = res.data.total
- page.value = res.data.page
- pageSize.value = res.data.page_size
+ const data = res.data.data
+ if (data) {
+ items.value = data.items
+ total.value = data.total
+ page.value = data.page
+ pageSize.value = data.page_size
}
+ totalPower.value = res.data.stat
loading.value = false
}).catch(e => {
loading.value = false