Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

pull #328

Open
wants to merge 30 commits into
base: main
Choose a base branch
from
Open

pull #328

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
30 commits
Select commit Hold shift + click to select a range
5c326c6
Initial commit of deployment process
QiuWeiAI Jun 7, 2023
4a2cab5
优化部署
Jun 8, 2023
986f8d0
添加17
Jun 8, 2023
afd9a89
修改port
Jun 8, 2023
13a23e1
添加redis配置
Jun 9, 2023
037fb1e
优化
Jun 11, 2023
f8220b9
优化
Jun 11, 2023
a5712ee
Merge pull request #1 from novicezk/main
allentofight Jun 12, 2023
322170b
Merge branch 'main' of https://github.com/novicezk/midjourney-proxy
Jun 15, 2023
663a331
Merge pull request #2 from novicezk/main
allentofight Jun 15, 2023
5903d44
test
Jun 15, 2023
2cedec7
升级版本
Jun 15, 2023
6468f79
Merge branch 'main' of https://github.com/novicezk/midjourney-proxy
Jun 16, 2023
9d300fa
Merge pull request #3 from novicezk/main
allentofight Jun 16, 2023
8a448f1
Merge pull request #4 from novicezk/main
allentofight Jun 27, 2023
20ee181
Merge branch 'main' of https://github.com/novicezk/midjourney-proxy
Jun 27, 2023
6a29f6b
Merge branch 'main' of https://github.com/novicezk/midjourney-proxy
Jul 2, 2023
67f3528
升级版本
Jul 2, 2023
e14bbbc
移除关键词
Jul 3, 2023
501f85c
Update banned-words.txt
allentofight Jul 3, 2023
ec899f0
Merge pull request #5 from novicezk/main
allentofight Jul 5, 2023
71d0d45
Merge pull request #6 from novicezk/main
allentofight Jul 7, 2023
def512e
Merge branch 'main' of https://github.com/novicezk/midjourney-proxy
Jul 7, 2023
4b1ed9c
升级
Jul 7, 2023
bf8f311
更新heroku
Jul 11, 2023
4dd899a
敏感词过滤
Jul 14, 2023
d13e624
Merge branch 'main' of https://github.com/novicezk/midjourney-proxy
Aug 1, 2023
375e441
升级
Aug 2, 2023
b51d15a
Merge branch 'main' of https://github.com/allentofight/midjourney-proxy
Aug 2, 2023
ac68e51
Merge branch 'main' into main
allentofight Nov 8, 2023
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Empty file added .octopus/deployment_process.ocl
Empty file.
7 changes: 7 additions & 0 deletions .octopus/deployment_settings.ocl
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
connectivity_policy {
allow_deployments_to_no_targets = true
}

versioning_strategy {
template = "#{Octopus.Version.LastMajor}.#{Octopus.Version.LastMinor}.#{Octopus.Version.NextPatch}"
}
1 change: 1 addition & 0 deletions .octopus/schema_version.ocl
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
version = 6
Empty file added .octopus/variables.ocl
Empty file.
1 change: 1 addition & 0 deletions Procfile
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
web: java -jar target/midjourney-proxy-2.4.jar
16 changes: 15 additions & 1 deletion src/main/resources/application.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,19 @@
mj:
discord:
guild-id: 1112940597846749225
channel-id: 1112940597846749228
user-token: MTEwNDY1NDYyNTI1NDE0NjE0OA.GbrBOv.zHlGkv8IGum99BHr082iyaC46m-k3YQo7Xf8NM
user-agent: Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_7) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/112.0.0.0 Safari/537.36
task-store:
type: in_memory
type: redis
timeout: 30d
translate-way: null
queue:
timeout-minutes: 5
core-size: 3
queue-size: 10
spring:
redis:
port: 18099
host: redis-18099.c57.us-east-1-4.ec2.cloud.redislabs.com
password: y3vqtzrmKMr760JDtO3kJHW16oBgsL4l
Loading