Skip to content

Commit

Permalink
Release version 1.1.0
Browse files Browse the repository at this point in the history
  • Loading branch information
songang committed Dec 12, 2024
1 parent 9374050 commit dc5de12
Show file tree
Hide file tree
Showing 1,625 changed files with 572 additions and 485,861 deletions.
2 changes: 1 addition & 1 deletion LICENSE
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
MIT License

Copyright (c) 2021 songangweb
Copyright (c) 2024 toolsetlink

Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
Expand Down
3 changes: 3 additions & 0 deletions README.md
View file
Original file line number Diff line number Diff line change
@@ -1,9 +1,12 @@
# 欢迎使用 durl 短链服务

### 更新日志:

##### v1.1.0 更新依赖项目版本, 切换为go mod进行依赖更新, 增加测试使用的mysql镜像
##### v1.0.1 解决若干bug 更新docker-compose及子镜像
##### v1.0.0 版本发布 解决若干bug 更新sql文件 durl_2022-05-03.sql


## durl介绍:
durl 是一个分布式的高性能短链服务,逻辑简单,部署方便.经过多次迭代,现发布正式版本.

Expand Down
2 changes: 1 addition & 1 deletion app/exec/backend-ui/src/router/index.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@ export const constantRoutes = [
component: Layout,
children: [
{
path: 'https://github.com/songangweb/durl',
path: 'https://github.com/toolsetlink/durl',
meta: { title: 'github', icon: 'link' }
}
]
Expand Down
4 changes: 2 additions & 2 deletions app/exec/backend/conf/db.conf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@
# 数据库类型可选项 1.mysql
Db_Type = mysql

Db_Mysql_Master = root:root@tcp(127.0.0.1:3306)/durl?charset=utf8mb4
Db_Mysql_Slave1 = root:root@tcp(127.0.0.1:3306)/durl?charset=utf8mb4
Db_Mysql_Master = root:Rootroot123!@tcp(127.0.0.1:3306)/durl?charset=utf8mb4
Db_Mysql_Slave1 = root:Rootroot123!@tcp(127.0.0.1:3306)/durl?charset=utf8mb4
Db_Mysql_SetMaxOpen = 10
Db_Mysql_SetMaxIdle = 10

Expand Down
4 changes: 2 additions & 2 deletions app/exec/jump/conf/db.conf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@
# 数据库类型可选项 1.mysql
Db_Type = mysql

Db_Mysql_Master = root:root@tcp(127.0.0.1:3306)/durl?charset=utf8mb4
Db_Mysql_Slave1 = root:root@tcp(127.0.0.1:3306)/durl?charset=utf8mb4
Db_Mysql_Master = root:Rootroot123!@tcp(127.0.0.1:3306)/durl?charset=utf8mb4
Db_Mysql_Slave1 = root:Rootroot123!@tcp(127.0.0.1:3306)/durl?charset=utf8mb4
Db_Mysql_SetMaxOpen = 10
Db_Mysql_SetMaxIdle = 10

Expand Down
4 changes: 2 additions & 2 deletions app/exec/openapi/conf/db.conf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@
# 数据库类型可选项 1.mysql
Db_Type = mysql

Db_Mysql_Master = root:root@tcp(127.0.0.1:3306)/durl?charset=utf8mb4
Db_Mysql_Slave1 = root:root@tcp(127.0.0.1:3306)/durl?charset=utf8mb4
Db_Mysql_Master = root:Rootroot123!@tcp(127.0.0.1:3306)/durl?charset=utf8mb4
Db_Mysql_Slave1 = root:Rootroot123!@tcp(127.0.0.1:3306)/durl?charset=utf8mb4
Db_Mysql_SetMaxOpen = 10
Db_Mysql_SetMaxIdle = 10

Expand Down
4 changes: 2 additions & 2 deletions app/exec/portal/conf/db.conf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@
# 数据库类型可选项 1.mysql
Db_Type = mysql

Db_Mysql_Master = root:root@tcp(127.0.0.1:3306)/durl?charset=utf8mb4
Db_Mysql_Slave1 = root:root@tcp(127.0.0.1:3306)/durl?charset=utf8mb4
Db_Mysql_Master = root:Rootroot123!@tcp(127.0.0.1:3306)/durl?charset=utf8mb4
Db_Mysql_Slave1 = root:Rootroot123!@tcp(127.0.0.1:3306)/durl?charset=utf8mb4
Db_Mysql_SetMaxOpen = 10
Db_Mysql_SetMaxIdle = 10

Expand Down
4 changes: 2 additions & 2 deletions build/durl-backend/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,6 @@ EXPOSE 9083
CMD ["/durl/durl-backend/backend"]

## 在根目录执行
## docker build -f build/durl-backend/Dockerfile . -t songangweb/durl-backend:v1.0.4
## test build -f build/durl-backend/Dockerfile . -t songangweb/durl-backend:v1.0.4
## or 使用 buildx 构建多平台 Docker 镜像 https://blog.csdn.net/alex_yangchuansheng/article/details/103343697/
## docker buildx build -t songangweb/durl-backend:v1.0.4 --platform=linux/arm,linux/arm64,linux/amd64 -f build/durl-backend/Dockerfile . --push
## test buildx build -t songangweb/durl-backend:v1.0.4 --platform=linux/arm,linux/arm64,linux/amd64 -f build/durl-backend/Dockerfile . --push
4 changes: 2 additions & 2 deletions build/durl-jump/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,6 @@ EXPOSE 9082
CMD ["/durl/durl-jump/jump"]

## 在根目录执行
## docker build -f build/durl-jump/Dockerfile . -t songangweb/durl-jump:v1.0.4
## test build -f build/durl-jump/Dockerfile . -t songangweb/durl-jump:v1.0.4
## or 使用 buildx 构建多平台 Docker 镜像 https://blog.csdn.net/alex_yangchuansheng/article/details/103343697/
## docker buildx build -t songangweb/durl-jump:v1.0.4 --platform=linux/arm,linux/arm64,linux/amd64 -f build/durl-jump/Dockerfile . --push
## test buildx build -t songangweb/durl-jump:v1.0.4 --platform=linux/arm,linux/arm64,linux/amd64 -f build/durl-jump/Dockerfile . --push
4 changes: 2 additions & 2 deletions build/durl-openapi/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,6 @@ EXPOSE 9091
CMD ["/durl/durl-openapi/openapi"]

## 在根目录执行
## docker build -f build/durl-openapi/Dockerfile . -t durl-openapi:v1.0.4
## test build -f build/durl-openapi/Dockerfile . -t durl-openapi:v1.0.4
## or 使用 buildx 构建多平台 Docker 镜像 https://blog.csdn.net/alex_yangchuansheng/article/details/103343697/
## docker buildx build -t songangweb/durl-openapi:v1.0.4 --platform=linux/arm,linux/arm64,linux/amd64 -f build/durl-openapi/Dockerfile . --push
## test buildx build -t songangweb/durl-openapi:v1.0.4 --platform=linux/arm,linux/arm64,linux/amd64 -f build/durl-openapi/Dockerfile . --push
4 changes: 2 additions & 2 deletions build/durl-portal/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,6 @@ EXPOSE 9080
CMD ["/durl/durl-portal/portal"]

## 在根目录执行
## docker build -f build/durl-portal/Dockerfile . -t durl-portal:v1.0.4
## test build -f build/durl-portal/Dockerfile . -t durl-portal:v1.0.4
## or 使用 buildx 构建多平台 Docker 镜像 https://blog.csdn.net/alex_yangchuansheng/article/details/103343697/
## docker buildx build -t songangweb/durl-portal:v1.0.4 --platform=linux/arm,linux/arm64,linux/amd64 -f build/durl-portal/Dockerfile . --push
## test buildx build -t songangweb/durl-portal:v1.0.4 --platform=linux/arm,linux/arm64,linux/amd64 -f build/durl-portal/Dockerfile . --push
2 changes: 1 addition & 1 deletion build/durl/docker-compose.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -33,4 +33,4 @@ services:
## 可选择自己所需启动的容器、修改端口映射关系
## 更多compose操作请参考：https://docs.docker.com/compose/
## 在当前目录执行
## docker-compose up -d
## test-compose up -d
68 changes: 32 additions & 36 deletions go.mod
View file
Original file line number Diff line number Diff line change
@@ -1,54 +1,50 @@
module durl

go 1.17
go 1.23.4

require (
github.com/beego/beego/v2 v2.0.1
github.com/json-iterator/go v1.1.10
github.com/songangweb/mcache v0.0.0-20210429024408-79c4e950688f
github.com/go-sql-driver/mysql v1.6.0
github.com/beego/beego/v2 v2.3.3
github.com/go-sql-driver/mysql v1.8.1
github.com/json-iterator/go v1.1.12
github.com/songangweb/mcache v0.0.0-20220401113112-9ed892c03452
github.com/xormplus/builder v0.0.0-20200331055651-240ff40009be
github.com/xormplus/xorm v0.0.0-20210107091022-175d736afaae
github.com/xormplus/xorm v0.0.0-20210822100304-4e1d4fcc1e67
)

require (
golang.org/x/sys v0.0.0-20211216021012-1d35b9e2eb4e // indirect
golang.org/x/tools v0.1.8 // indirect
gopkg.in/flosch/pongo2.v3 v3.0.0-20141028000813-5e81b817a0c4 // indirect
github.com/stretchr/testify v1.6.1 // indirect
github.com/tealeg/xlsx v1.0.5 // indirect
github.com/google/go-cmp v0.5.2 // indirect
github.com/bndr/gotabulate v1.1.2 // indirect
github.com/clbanning/mxj v1.8.4 // indirect
github.com/fatih/structs v1.1.0 // indirect
filippo.io/edwards25519 v1.1.0 // indirect
github.com/Chronokeeper/anyxml v0.0.0-20160530174208-54457d8e98c6 // indirect
github.com/CloudyKit/fastprinter v0.0.0-20200109182630-33d98a066a53 // indirect
github.com/CloudyKit/jet v2.1.2+incompatible // indirect
github.com/agrison/go-tablib v0.0.0-20160310143025-4930582c22ee // indirect
github.com/agrison/mxj v0.0.0-20160310142625-1269f8afb3b4 // indirect
github.com/beorn7/perks v1.0.1 // indirect
github.com/cespare/xxhash/v2 v2.1.1 // indirect
github.com/cweill/gotests v1.6.0 // indirect
github.com/fsnotify/fsnotify v1.4.7 // indirect
github.com/golang/protobuf v1.4.2 // indirect
github.com/bndr/gotabulate v1.1.2 // indirect
github.com/cespare/xxhash/v2 v2.2.0 // indirect
github.com/clbanning/mxj v1.8.4 // indirect
github.com/fatih/structs v1.1.0 // indirect
github.com/fsnotify/fsnotify v1.8.0 // indirect
github.com/golang/snappy v0.0.0-20180518054509-2e65f85255db // indirect
github.com/hashicorp/golang-lru v0.5.4 // indirect
github.com/matttproud/golang_protobuf_extensions v1.0.1 // indirect
github.com/mitchellh/mapstructure v1.3.3 // indirect
github.com/kr/text v0.2.0 // indirect
github.com/mitchellh/mapstructure v1.5.0 // indirect
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
github.com/modern-go/reflect2 v1.0.1 // indirect
github.com/pkg/errors v0.9.1 // indirect
github.com/prometheus/client_golang v1.7.0 // indirect
github.com/prometheus/client_model v0.2.0 // indirect
github.com/prometheus/common v0.10.0 // indirect
github.com/prometheus/procfs v0.1.3 // indirect
github.com/shiena/ansicolor v0.0.0-20151119151921-a422bbe96644 // indirect
github.com/syndtr/goleveldb v0.0.0-20181127023241-353a9fca669c // indirect
golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9 // indirect
golang.org/x/mod v0.5.1 // indirect
golang.org/x/net v0.0.0-20211015210444-4f30a5c0130f // indirect
golang.org/x/text v0.3.7 // indirect
golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1 // indirect
google.golang.org/protobuf v1.23.0 // indirect
gopkg.in/yaml.v2 v2.2.8 // indirect
github.com/modern-go/reflect2 v1.0.2 // indirect
github.com/onsi/ginkgo v1.16.5 // indirect
github.com/onsi/gomega v1.36.1 // indirect
github.com/prometheus/client_golang v1.19.0 // indirect
github.com/prometheus/client_model v0.5.0 // indirect
github.com/prometheus/common v0.48.0 // indirect
github.com/prometheus/procfs v0.12.0 // indirect
github.com/shiena/ansicolor v0.0.0-20200904210342-c7312218db18 // indirect
github.com/syndtr/goleveldb v0.0.0-20160425020131-cfa635847112 // indirect
github.com/tealeg/xlsx v1.0.5 // indirect
golang.org/x/crypto v0.28.0 // indirect
golang.org/x/net v0.30.0 // indirect
golang.org/x/sys v0.26.0 // indirect
golang.org/x/text v0.19.0 // indirect
google.golang.org/protobuf v1.35.1 // indirect
gopkg.in/flosch/pongo2.v3 v3.0.0-20141028000813-5e81b817a0c4 // indirect
gopkg.in/yaml.v2 v2.4.0 // indirect
gopkg.in/yaml.v3 v3.0.1 // indirect
)
Loading

0 comments on commit dc5de12

Please sign in to comment.