xinyin025/new-api
1
0
Fork 0
mirror of https://github.com/linux-do/new-api.git synced 2025-09-17 07:56:38 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity
1,738 Commits 1 Branch 268 Tags 5.5 MiB
main
Commit Graph

345 Commits

Author SHA1 Message Date
wozulong
923c2dee32 merge upstream 
Signed-off-by: wozulong <>
 2024-03-27 18:01:43 +08:00
wozulong
ea17a46d8e fixed pagination issue in the log list 
Signed-off-by: wozulong <>
 2024-03-25 16:36:57 +08:00
wozulong
831ff47254 Merge remote-tracking branch 'upstream/main' 2024-03-24 00:18:02 +08:00
CaIon
6eb30ec3e6 fix: 模型倍率和价格无法设置 2024-03-23 23:24:17 +08:00
CaIon
0b3520e3c8 fix: 修复默认模型倍率未显示 2024-03-23 23:21:14 +08:00
wozulong
c2e4ec25c8 merge upstream 
Signed-off-by: wozulong <>
 2024-03-23 22:51:18 +08:00
wozulong
8537f10412 save stripe custome id 
Signed-off-by: wozulong <>
 2024-03-23 21:59:15 +08:00
CaIon
67332bc8df fix: 模型固定价格为空时错误使用默认价格 2024-03-23 17:19:29 +08:00
wozulong
247ae0988f replace epay with stripe 
Signed-off-by: wozulong <>
 2024-03-22 18:00:20 +08:00
wozulong
0907fa6994 fix next uid 
Signed-off-by: wozulong <>
 2024-03-21 15:02:47 +08:00
wozulong
bd50fde268 Merge remote-tracking branch 'upstream/main' 2024-03-21 13:10:21 +08:00
CaIon
d5e93e788d fix: midjourneys table 2024-03-20 21:49:54 +08:00
CaIon
2db4282666 feat: 保留功能 2024-03-20 20:15:32 +08:00
CaIon
7a663d26ec feat: 初步兼容敏感词过滤 2024-03-20 17:07:42 +08:00
wozulong
f35e63e3f3 limit 'LINUX DO' trust level now available 
Signed-off-by: wozulong <>
 2024-03-20 16:54:38 +08:00
wozulong
e4753e7411 synced with upstream 
Signed-off-by: wozulong <>
 2024-03-20 13:52:10 +08:00
CaIon
f82aa956bd feat: midjourneys表添加索引 2024-03-17 22:56:17 +08:00
CaIon
4917e5a92f feat: 允许开关mj回调 2024-03-14 21:21:37 +08:00
我秦始皇
62afc21ea5
Merge branch 'Calcium-Ion:main' into main 2024-03-14 03:56:31 -07:00
wozulong
7ddb7c586d 1. add LINUX DO oauth 
2. fix oauth reg aff issue

Signed-off-by: wozulong <>
 2024-03-14 18:53:54 +08:00
CaIon
a77fbc0fa2 fix: reroll action error 2024-03-14 00:43:32 +08:00
CaIon
2ad591411e feat: support shorten 2024-03-13 17:46:34 +08:00
CaIon
37c0c8ebdd feat: 初步兼容midjourney-proxy-plus 2024-03-13 15:37:01 +08:00
CaIon
c3a01decd8 chore: drop idx_channels_key on start 2024-03-12 00:35:12 +08:00
CaIon
d4df1960b2 fix: 修复模型映射功能失效 (close #105) 2024-03-11 18:28:51 +08:00
CaIon
97dd80541b fix: 请求阿里通义千问异常 (close #108) 2024-03-11 14:35:46 +08:00
1808837298@qq.com
fe7f42fc2e feat: add "/api/status/test" 2024-03-04 19:32:59 +08:00
1808837298@qq.com
912f46fcd2 feat: 记录请求的token用量 2024-03-04 14:58:30 +08:00
1808837298@qq.com
1ad1112351 feat: 解决渠道密钥长度限制问题 2024-03-04 14:55:26 +08:00
Ehco
02d5a5f16d
Merge branch 'main' into telegram-login 2024-03-03 19:42:06 +08:00
1808837298@qq.com
06b746a740 fix: remove useless code 2024-03-02 23:02:49 +08:00
1808837298@qq.com
4c43012e6c fix: Improve handling of small weights in channel selection logic 2024-03-02 22:46:26 +08:00
1808837298@qq.com
72194bda98 feat: 可自定义支付回调地址及最低购买数量 2024-03-02 22:07:32 +08:00
sljeff
84144306a8 feat: telegram login and bind 2024-03-02 17:15:52 +08:00
1808837298@qq.com
a8f0c5dab2 feat: 可设置默认折叠侧边栏 2024-03-02 02:12:02 +08:00
Ehco1996
194ff1ac57 Update makefile and user model, add Telegram integration 2024-03-01 22:33:30 +08:00
1808837298@qq.com
413d4f0a66 feat: Add channel search by model field (close #72) 2024-03-01 21:57:52 +08:00
Ehco1996
690d2e6ba2 Add Telegram OAuth support 2024-03-01 21:54:24 +08:00
Ehco1996
140e843d93 Add Telegram bot token and name 2024-03-01 20:39:28 +08:00
1808837298@qq.com
ba0c5bb4d9 feat: 优化令牌无效提示 2024-02-22 01:48:35 +08:00
CaIon
5c8f8b4901 feat: 添加成功时自动启用通道功能, close #27 2024-02-01 18:52:39 +08:00
CaIon
4920922929 fix: fix redis error 2024-01-26 16:09:50 +08:00
CaIon
70bdb8ca90 fix: fix redis error 2024-01-26 15:52:23 +08:00
CaIon
ac3e27859c feat: token缓存逻辑更新（实验性） 2024-01-25 20:09:06 +08:00
CaIon
705171e495 chore: change use_time to int 2024-01-22 17:07:18 +08:00
Calcium-Ion
5b2377eea9
Merge pull request #53 from Calcium-Ion/fork/main 
feat: 令牌聊天新增ChatGPT Web & Midjourney支持
 2024-01-21 17:47:55 +08:00
CaIon
cbdce181af feat: 日志优化逻辑，新增请求时间和是否为stream字段 2024-01-21 15:01:59 +08:00
GuoRuqiang
e8db0a2c72 增加了一个超链聊天跳转 
在“运营设置里面”增加了“聊天页面2链接”，方便将项目（https://github.com/Dooy/chatgpt-web-midjourney-proxy） 替换掉原来的AMA问天。

Changes to be committed:
    modified:   common/constants.go
    modified:   controller/misc.go
    modified:   model/option.go
    modified:   web/src/App.js
    modified:   web/src/components/OperationSetting.js
    modified:   web/src/components/TokensTable.js
 2024-01-16 18:15:55 +00:00
CaIon
00306aa142 perf: 数据看板支持选择时间粒度 2024-01-13 00:33:52 +08:00
CaIon
2b3539fcaa fix: 修复渠道一致性问题 2024-01-12 14:57:03 +08:00
CaIon
e2a1caba4c fix: 修复渠道一致性问题 2024-01-12 14:36:15 +08:00
CaIon
febcadb42c chore: add SafeGoroutine 2024-01-12 13:49:53 +08:00
CaIon
6757166de5 Merge remote-tracking branch 'origin/main' 2024-01-12 13:46:08 +08:00
CaIon
2a9c3ac6af fix: 修复mj错误返还费用问题 2024-01-12 13:45:52 +08:00
GAI Group
6aadcf0c78
fix: the Redis problem in the CacheGetUsername function 
fix: the Redis problem in the CacheGetUsername function
 2024-01-12 13:15:43 +08:00
CaIon
ad85792818 fix: user group size 2024-01-11 22:06:30 +08:00
CaIon
f07b9f8ab2 chore: cache username 2024-01-11 18:40:44 +08:00
CaIon
6a24e8953f feat: able to fix channels 2024-01-10 13:23:43 +08:00
CaIon
1618a8c9fc perf: 优化数据看板性能 2024-01-09 16:20:04 +08:00
CaIon
6ed365c267 fix: 修复数据看板筛选用户的时候不能指定时间的问题 2024-01-09 12:11:09 +08:00
CaIon
95e84f2bb1 perf: 优化数据看板性能和显示效果 2024-01-08 18:49:10 +08:00
CaIon
1244963e81 feat: 可设置令牌能调用的模型 2024-01-08 16:25:17 +08:00
CaIon
8f36a995ef perf: 美化数据看板 2024-01-08 11:32:27 +08:00
CaIon
daf0be4915 fix: fix JSON tag in Log struct 2024-01-08 11:25:22 +08:00
CaIon
f3124e7252 fix: 减少username和model_name字段长度为64 2024-01-08 10:11:36 +08:00
CaIon
ebedf2cb7e fix: 减少group和model字段长度为64 2024-01-08 10:08:20 +08:00
CaIon
a5e0f86c65 fix: 索引长度 2024-01-07 22:16:20 +08:00
CaIon
2a995a5da2 fix: 索引名称长度 2024-01-07 22:07:17 +08:00
CaIon
bba6174745 fix: fix gemini panic 2024-01-07 21:27:28 +08:00
CaIon
1c2bba8979 feat: 完善数据看板选择时间区间 2024-01-07 19:47:35 +08:00
CaIon
ce05e7dd86 fix: 优化数据看板更新逻辑 2024-01-07 18:33:41 +08:00
CaIon
bf8794d257 feat: 新增数据看板 2024-01-07 18:31:14 +08:00
Xyfacai
5c747dfee2 optimize: MJ 部分调整、优化 
MJ
增加simple-change、list接口，
变换和重试操作区别出来，价格与绘图一样
优化图片返回
 2024-01-01 22:46:05 +08:00
CaIon
7e4fe14871 更新用户时刷新缓存数据 2023-12-29 00:00:23 +08:00
CaIon
bdd611fd33 feat: 加入渠道加权随机功能 2023-12-27 19:00:47 +08:00
CaIon
c09f3b9282 enable parseTime=true 2023-12-27 16:47:32 +08:00
CaIon
e8bcf60f0a 修复不能删除注销用户的问题 2023-12-27 16:46:18 +08:00
CaIon
6ad2544415 enable mysql parseTime 2023-12-27 15:33:35 +08:00
CaIon
7cd1261a81 Revert "fix delete user" 
This reverts commit 07fe5a02
 2023-12-27 15:31:28 +08:00
CaIon
45ed973f1c fix delete user 2023-12-27 15:15:07 +08:00
CaIon
07fe5a02af fix delete user 2023-12-27 14:36:19 +08:00
CaIon
ad6842da7f 用户注销后禁止再次注册 2023-12-27 00:19:11 +08:00
Xyfacai
fd4ef086dc fix: 优化 mj 获取进度 2023-12-23 23:14:58 +08:00
CaIon
3475643257 支持设置模型按次计费 2023-12-21 20:14:04 +08:00
CaIon
f5a36a05e5 log输出更多有效信息 2023-12-20 20:53:36 +08:00
CaIon
0226d94ea6 修改docker-compose.yml 2023-12-18 23:46:04 +08:00
CaIon
e1da1e31d5 添加批量删除渠道功能 2023-12-14 16:35:03 +08:00
CaIon
44465a398b support gpts 2023-12-11 19:50:43 +08:00
CaIon
79d7758617 充值改为保留两位小数 2023-12-09 22:56:24 +08:00
CaIon
aa07ada0f4 fix pgsql 2023-12-08 13:15:59 +08:00
CaIon
3ee4136256 消费日志添加用户调用前余额 2023-12-07 16:58:24 +08:00
CaIon
7dc8b0ea93 更新渠道管理 2023-12-05 18:15:40 +08:00
CaIon
3121afd2e0 修复令牌添加、搜索bug 2023-11-25 17:30:36 +08:00
CaIon
69f2c41853 fix bug 2023-11-23 19:01:14 +08:00
Calcium-Ion
2ee3dbbc18
Merge pull request #14 from luxlzz6/main 
绘画列表显示统一了风格 添加了渠道
 2023-11-23 18:55:18 +08:00
luxl
3e89112b1c
绘图列表更新 2023-11-23 18:18:03 +08:00
AIASS Group
15d3e9819d
fix the issue of model repetition 2023-11-23 15:36:07 +08:00
CaIon
560753c61f 修复可用模型显示已禁用模型 2023-11-22 23:02:43 +08:00
CaIon
f18f585fc8 修复可用model重复显示bug 2023-11-21 16:58:31 +08:00
CaIon
fd57a1df08 完善个人中心 2023-11-21 16:35:51 +08:00
CaIon
c75a92f6a4 Merge branch 'main' into latest 2023-11-15 21:07:37 +08:00
CaIon
16ad764f9b try to fix email 2023-11-15 18:27:42 +08:00
luxl
08b8b7b980
Update token.go 2023-11-14 16:41:19 +08:00
CaIon
3202ca9f3e 修复余额不足邮件提醒bug 2023-11-12 18:51:26 +08:00
CaIon
46930bc890 完全移除近似估算token功能 2023-11-11 01:55:19 +08:00
CaIon
6ceaf9f6a5 fix log bug 2023-11-10 01:59:16 +08:00
CaIon
e3fca11f99 修复令牌bug 2023-11-10 00:46:17 +08:00
CaIon
44d9eb9d05 完善兑换码界面 2023-11-10 00:10:41 +08:00
CaIon
3ff4210fc4 适配dall-e-3 2023-11-09 17:08:32 +08:00
Calcium-Ion
7688e9f9dd
Merge branch 'songquanpeng:main' into main 2023-10-30 16:12:09 +08:00
Bryan
a398f35968
fix: fix postgresql support (#606) 
* fix postgresql support

fixes #517

* fix: fix pg support

* chore: delete useless code

---------

Co-authored-by: JustSong <songquanpeng@foxmail.com>
 2023-10-22 18:38:29 +08:00
CaIon
fc2ef52366 Merge remote-tracking branch 'origin/main' 
# Conflicts:
#	README.md
#	go.mod
#	go.sum
#	model/log.go
#	web/src/App.js
#	web/src/components/ChannelsTable.js
 2023-10-16 17:31:26 +08:00
JustSong
824444244b feat: able to delete all disabled channels 2023-10-14 17:25:48 +08:00
JustSong
f073592d39 fix: fix request count not updated correctly when using batch update 2023-10-14 15:04:52 +08:00
CaIon
921f1d65ad fix bug 2023-10-11 21:47:59 +08:00
CaIon
a4e269262b feat: 新增充值分组倍率设置 2023-10-11 14:58:09 +08:00
JustSong
8d34b7a77e feat: able to delete all manually disabled channels (close #539) 2023-10-02 13:06:27 +08:00
JustSong
cbd62011b8 chore: add database migration prompt 2023-10-02 12:13:30 +08:00
JustSong
4701897e2e chore: sync database indices with pro version 2023-10-02 12:11:02 +08:00
JustSong
53b2cace0b chore: sync model schema 2023-09-29 18:13:57 +08:00
JustSong
f9b748c2ca chore: add MEMORY_CACHE_ENABLED env variable 2023-09-29 11:38:27 +08:00
CaIon
d429992be2 feat: 优先优先级排序渠道 2023-09-27 01:17:43 +08:00
CaIon
1bb65fa0dd feat: 优先用优先级排序渠道 2023-09-27 01:03:53 +08:00
CaIon
80271b33ba feat: 渠道新可选是否自动禁用功能 2023-09-25 18:44:10 +08:00
CaIon
3d55548c92 Merge remote-tracking branch 'origin/main' 
# Conflicts:
#	model/log.go
 2023-09-24 12:34:29 +08:00
igophper
8651451e53
fix: sum null to 0 (#541) 
Co-authored-by: igophper <admin@jialilgu.cn>
 2023-09-19 22:39:54 +08:00
Calcium-Ion
f82fde9d8a
Merge branch 'songquanpeng:main' into main 2023-09-18 23:41:12 +08:00
JustSong
1c5bb97a42 fix: fix gorm expression 
Co-authored-by: 初音控灬 <xyfacai@gmail.com>
 2023-09-18 23:11:37 +08:00
JustSong
de868e4e4e fix: fix gorm expression 
Co-authored-by: 初音控灬 <xyfacai@gmail.com>
 2023-09-18 23:07:59 +08:00
Calcium-Ion
26f9d25860
Merge branch 'songquanpeng:main' into main 2023-09-18 22:52:10 +08:00
JustSong
1d258cc898 fix: add default value for base url 2023-09-18 22:49:05 +08:00
JustSong
37e09d764c fix: fix random selection is not working when directly using database 2023-09-18 22:39:10 +08:00
JustSong
159b9e3369 fix: fix unable to set zero value for base url & model mapping 2023-09-18 22:07:17 +08:00
JustSong
a5647b1ea7 fix: fix priority not updated & random choice not working 2023-09-18 21:43:45 +08:00
CaIon
985e26fd1b Merge remote-tracking branch 'origin/main' 
# Conflicts:
#	controller/log.go
#	controller/relay-audio.go
#	controller/relay-image.go
#	controller/relay-text.go
#	controller/relay.go
#	middleware/distributor.go
#	model/log.go
#	web/src/components/OperationSetting.js
 2023-09-17 20:59:12 +08:00
Xyfacai
ecf8a6d875
feat: supprt channel priority now & record channel id in log (#484) 
* feat: 支持设置渠道优先级 & 日志中显示使用的渠道ID

* fix: 设置渠道优先级未更新 ability

* chore: update implementation

---------

Co-authored-by: Xiangyuan Liu <xiangyuan.liu@ui.com>
Co-authored-by: JustSong <songquanpeng@foxmail.com>
Co-authored-by: JustSong <39998050+songquanpeng@users.noreply.github.com>
 2023-09-17 19:18:16 +08:00
JustSong
328aa68255 feat: able to delete logs now (close #486) 2023-09-17 17:09:56 +08:00
JustSong
42451d9d02 refactor: update logging related logic 2023-09-17 15:39:46 +08:00
CaIon
cc09dd4f9d feat: 渠道支持指定组织 2023-09-15 17:59:01 +08:00
CaIon
d9deda18c1 feat: 改为转发的方式获取midjourney图片 2023-09-12 03:57:03 +08:00
CaIon
4a836a4cb6 feat: 删除无用功能 2023-09-10 01:13:12 +08:00
CaIon
01a66ff33c 修复充值bug 2023-09-09 05:04:49 +08:00
CaIon
9c08d78349 Merge remote-tracking branch 'origin/main' 
# Conflicts:
#	controller/relay.go
#	main.go
#	middleware/distributor.go
 2023-09-09 03:15:55 +08:00
CaIon
9ab4f7a271 移除不必要的功能 2023-09-09 03:11:42 +08:00
JustSong
621eb91b46 chore: pass through error out 2023-09-03 21:31:58 +08:00
JustSong
c3dc315e75 feat: add batch update support (close #414) 2023-09-03 14:58:20 +08:00
CaIon
c0f0201f5f Merge remote-tracking branch 'origin/main' 
# Conflicts:
#	controller/relay-text.go
#	go.mod
#	web/src/components/PersonalSetting.js
#	web/src/components/TokensTable.js
#	web/src/pages/Home/index.js
 2023-08-25 00:51:02 +08:00
CaIon
3b0f1ae978 修改stat接口返回值 2023-08-25 00:40:11 +08:00
JustSong
86c2627c24 fix: update cache immediately after cache get 
Co-authored-by: chikasaki <1347283135@qq.com>
Co-authored-by: Cruel <157922018@qq.com>
 2023-08-16 23:40:50 +08:00
CaIon
8f2119e410 add epay 2023-08-14 22:16:32 +08:00