Skip to content
Open

pr #7

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
214 commits
Select commit Hold shift + click to select a range
90549a0
feature:自动化增加前端可控显隐和自定义class。
pixelmaxQm Apr 25, 2024
d23d6c3
feature:自动化增加前端可控显隐。
pixelmaxQm Apr 25, 2024
6c62d73
feature:v2.6.3发布
pixelmaxQm Apr 27, 2024
d9a43ea
feature:自动化代码增加数据源配置功能
pixelmaxQm Apr 27, 2024
ff8344d
feature:自动化代码增加数据源配置功能
pixelmaxQm Apr 27, 2024
5eb0133
feature:升级后端依赖,前端代码调优
pixelmaxQm Apr 28, 2024
e15351e
Update README.md
pixelmaxQm Apr 29, 2024
5fa7bbb
fixed:导出模板顺序一致性调整
pixelmaxQm May 6, 2024
0265801
fixed:表格模板删除查看详情功能。
pixelmaxQm May 6, 2024
ab163fc
Update ci.yaml
pixelmaxQm May 6, 2024
db4c7a8
fixed:修复富文本无法编辑的bug
pixelmaxQm May 9, 2024
9d58390
fix(bug): [api.go.tpl]自动化代码swag路径冲突 (#1732)
wall-js May 9, 2024
df1d68a
新版前端UI,预发布2.6.4版本。 (#1735)
pixelmaxQm May 9, 2024
e259418
Update README.md
pixelmaxQm May 9, 2024
c054840
feature:上线前细节数据调整
pixelmaxQm May 10, 2024
f07a58b
feature:readme版权相关文案调整
pixelmaxQm May 10, 2024
1edb0c5
feature:调整bottomInfo组件位置
pixelmaxQm May 10, 2024
1b38866
feature:水印密集度调整
pixelmaxQm May 10, 2024
0d17a23
Update ci.yaml
pixelmaxQm May 10, 2024
0f9e519
feature:调整侧边栏暗夜模式的hover错误
pixelmaxQm May 10, 2024
043f5c7
feature:调整autoPackage弹窗
pixelmaxQm May 10, 2024
f6314d3
Update README.md
pixelmaxQm May 11, 2024
613ba9b
Update README-en.md
pixelmaxQm May 11, 2024
c515805
fixed:表格增加左右-1px的边距,防止表格边框线导致宽度超出页面从而无限延伸的bug。
pixelmaxQm May 14, 2024
136fb2f
fixed:修复更新api失败的bug
pixelmaxQm May 14, 2024
fb22eb4
fixed:修复生成json类文件关闭弹窗后再开启的错误
pixelmaxQm May 14, 2024
2a0b927
fixed:兼容旧自动化数据
pixelmaxQm May 15, 2024
0d17340
feature:增加数据源一对多关系。
pixelmaxQm May 15, 2024
6b07ffe
feature:增加数据源一对多关系。
pixelmaxQm May 15, 2024
e7c8a9d
feature:增加自动化代码页面暂时存储功能
pixelmaxQm May 15, 2024
5cfcc53
fixed:左侧菜单栏超长支持滚动
pixelmaxQm May 16, 2024
ee00d29
Update: (#1743)
SliverHorn May 16, 2024
58a1b72
fixed:登录页面暗夜模式适配
pixelmaxQm May 16, 2024
e812825
feature:暗夜模式兼容调整,初始化需要手动写入初始密码。
pixelmaxQm May 16, 2024
3c486d9
feature:暗夜模式兼容调整,初始化需要手动写入初始密码。
pixelmaxQm May 16, 2024
de54688
fixed:自动导入功能将根据表内字段自动创建created_at和updated_at的时间
pixelmaxQm May 17, 2024
a21d2a5
feature:优化数据源字段和数组字段展示
pixelmaxQm May 17, 2024
d0393c4
fixed:调整前端打包的base路径,适配history模式路由。
pixelmaxQm May 17, 2024
0fba597
fixed:调整自动化代码swagger文档返回值类型 (#1742)
wall-js May 17, 2024
42de925
fixed: 修复文件分片上传在已选择文件的情况下,再次选择并取消出现控制台飘红且原文件清空的bug (#1746)
calvinchan22 May 18, 2024
fb53d63
添加展示多硬盘用量信息的功能 (#1747)
v1p2nd May 18, 2024
f28570f
feature:新版树组件适配暗夜模式
pixelmaxQm May 18, 2024
b61b9a0
feature:增加首页插件推荐
pixelmaxQm May 18, 2024
a5d43e6
fixed:修复右上角focus-visible状态下会出现outline的bug
pixelmaxQm May 18, 2024
9945a19
state.vue: 修复展示多硬盘信息时无法上下滚动的bug (#1749)
v1p2nd May 20, 2024
9964bfe
fixed:修复特殊符号下无法预览图片的bug
pixelmaxQm May 20, 2024
b10d510
fixed:selectImage组件重构
pixelmaxQm May 20, 2024
1801e5b
fixed:selectImage组件图片偏移的bug
pixelmaxQm May 21, 2024
369f657
fixed:修复自动化代码无法识别json类型,去掉插件路由冗余代码 (#1751)
wall-js May 22, 2024
a6a65ed
fixed:修复自动化生成表格缺少的prop (#1755)
wall-js May 26, 2024
02fc503
v2.6.5版本更新 (#1757)
pixelmaxQm May 26, 2024
23952c5
Update: (#1758)
SliverHorn May 27, 2024
e64be75
优化如果join表时出现重复的字段或者需要有函数时可以导出别名的值 (#1761)
poppingkaka May 31, 2024
2f67c23
feature:在选择图片时候增加删除按钮,可以在媒体库中直接删除图片。
pixelmaxQm Jun 2, 2024
53d0338
feature:修复已知安全问题。
pixelmaxQm Jun 2, 2024
21266be
perf: 优化 api 和 service 中方法注释不正确的问题 (#1765)
coderedeng Jun 5, 2024
f773a02
[fixed] 优化错误判断 (#1762)
DG9Jww Jun 7, 2024
725f6fe
fixed: 自动化请求结构中不应该携带JSON
pixelmaxQm Jun 11, 2024
bbf716b
style(login): 优化登陆部分代码,提升可读性 (#1772)
Azir-11 Jun 12, 2024
b336529
添加通过点击展开/收起控制显示更多的查询条件的功能 (#1771)
v1p2nd Jun 12, 2024
03e5bc5
v2.6.6版本发布 (#1784)
pixelmaxQm Jun 15, 2024
18e9b6d
Fixed system.vue: 日志留存时间json key错误 (#1785)
v1p2nd Jun 16, 2024
fbffbce
fixed:调整顶栏模式自动缩进bug
pixelmaxQm Jun 17, 2024
7df246c
feature: 可以选择不自动迁移表结构
pixelmaxQm Jun 17, 2024
3e55234
feature: 可以选择不自动迁移表结构
pixelmaxQm Jun 17, 2024
8f1692e
fixed: 修复生成代码element-ui接口启用警告问题 (#1787)
wall-js Jun 18, 2024
d6703e8
fixed: 修复自动化代码form模板,find接口调整未调整完全 (#1790)
wall-js Jun 20, 2024
42c6bc1
chore(spell check): rename clamis.go to claims.go
Jun 21, 2024
08606f7
feature: swagdoc调整
pixelmaxQm Jun 21, 2024
01139a2
Merge pull request #1792 from sliboy/main
pixelmaxQm Jun 21, 2024
8ef4f40
feat: 优化自动化代码结构,增加顶栏侧边栏组合式结构 (#1793)
pixelmaxQm Jun 21, 2024
f23cd22
feature:增加静态目录public,调整在线logo地址到public。
pixelmaxQm Jun 22, 2024
b628bd7
调整配置文件默认灰度不生效问题 (#1795)
pixelmaxQm Jun 22, 2024
6e21402
feature:后端路由注册和数据库注册方法与原始框架分离,自定业务不再干扰原始框架内容。
pixelmaxQm Jun 23, 2024
821dd02
feat: 优化布局结构 统一使用 drawer (#1796)
xl495 Jun 25, 2024
640f44f
fixed:修复左侧无法滚动的bug
pixelmaxQm Jun 26, 2024
45f723c
feat: 调整自动化代码逻辑,重复创建的菜单和api需要用户手动取消自动创建 (#1798)
wall-js Jun 27, 2024
bb4e938
fixed: 业务库导出问题调整
pixelmaxQm Jun 27, 2024
e9be009
fixed: 导出模板调整limit为指针
pixelmaxQm Jun 27, 2024
5607702
fixed: 导出模板调整limit为指针
pixelmaxQm Jun 27, 2024
06a0786
Update router_biz.go
jedyang Jun 27, 2024
4ab5088
Merge pull request #1801 from jedyang/patch-1
SliverHorn Jun 27, 2024
737c051
Update: .gitignore (#1800)
SliverHorn Jun 27, 2024
24e4d05
feature:url调整让上传文件支持/模式
pixelmaxQm Jun 28, 2024
6bac462
fixed:图片展示功能调整
pixelmaxQm Jun 28, 2024
aa8ef48
fixed:侧边宽度调整防止出现横向滚动条
pixelmaxQm Jun 28, 2024
e386b28
feature:插件注册功能多给一个engine 准备后续扩展
pixelmaxQm Jun 28, 2024
a4f139f
后端dockerfile正确设置时区 && 忽略后端server/uploads文件夹 (#1803)
xue-ding-e Jul 1, 2024
d497e96
feat: 调整逻辑无论是否创建菜单或API都注册自动化代码历史 (#1804)
wall-js Jul 1, 2024
0c846f0
feature:url调整兼容各类情况下的图片展示
pixelmaxQm Jul 2, 2024
35186b4
feature:调整多图下不换行的问题
pixelmaxQm Jul 2, 2024
bbe9322
Update Makefile
pixelmaxQm Jul 2, 2024
128e810
调整镜像和依赖
pixelmaxQm Jul 2, 2024
59cfe96
增加AI辅助功能 (#1808)
pixelmaxQm Jul 2, 2024
08f3b64
feature:增加AI提问的长度限制
pixelmaxQm Jul 2, 2024
36fed0c
Update: mv system ai-path to autocode
Jul 3, 2024
eebd877
Merge pull request #1809 from SliverHorn/ai
SliverHorn Jul 3, 2024
227755b
Update index.vue (#1810)
zayn-code Jul 4, 2024
02f5d6f
增加同步API功能 (#1811)
pixelmaxQm Jul 4, 2024
fb5d5ea
feature:版本变更v2.6.7
pixelmaxQm Jul 6, 2024
ea1633a
fixed: 修复darkMode失效的bug
pixelmaxQm Jul 10, 2024
954160e
feature: 调整导出的时间格式处理
pixelmaxQm Jul 10, 2024
35efc07
fixed: 增加导出模板特殊字段说明,添加默认darkMode
pixelmaxQm Jul 10, 2024
b484184
Update ci.yaml
pixelmaxQm Jul 17, 2024
6b3a902
README.md: correct typo (#1823)
jameschcc Jul 21, 2024
6e4dc10
文件结构调整,支持插件自动化 (#1824)
pixelmaxQm Jul 21, 2024
01f6814
feature: 调整插件自动注册逻辑。
pixelmaxQm Jul 21, 2024
ac374ba
feature: 调整自动化代码web模板
pixelmaxQm Jul 21, 2024
4fe1f5c
feature:菜单选择文件时自动同步path
pixelmaxQm Jul 21, 2024
db038c2
feature: 修复插件无法安装的bug
pixelmaxQm Jul 22, 2024
5492e0d
feature: 修复插件无法安装的bug
pixelmaxQm Jul 22, 2024
39be2d0
BetaBug修复 (#1825)
pixelmaxQm Jul 22, 2024
b3a0f18
2.7.0Beta Bug修复 (#1826)
pixelmaxQm Jul 22, 2024
a561e7d
feature: 修复自动化插件会创建两个var的bug
pixelmaxQm Jul 23, 2024
ca4118c
feature: 插件enter回滚当数据为空时候删除import
pixelmaxQm Jul 23, 2024
b7c6a7f
feature: 修复package下gorm数据添加和回滚的异常
pixelmaxQm Jul 23, 2024
de782e6
feature: 修复package下gorm数据添加和回滚的异常
pixelmaxQm Jul 23, 2024
4512aa7
feature: 修复下标越界的bug,调整enter ast 代码
pixelmaxQm Jul 23, 2024
1494bc9
2.7.0Beta2 (#1829)
pixelmaxQm Jul 24, 2024
e593ec6
opt: 调整import注入和回滚带别名无法识别的bug
pixelmaxQm Jul 24, 2024
0fc43fc
opt: 调整Viper配置文件路径展示代码
pixelmaxQm Jul 25, 2024
48f3bdc
fixed:前端文件创建路径错误
pixelmaxQm Jul 25, 2024
c973c0c
feature: 调整自动化代码菜单和api注册逻辑
pixelmaxQm Jul 25, 2024
0fc1edf
Dockerfile修复工作路径的问题 (#1833)
lonevle Jul 25, 2024
7f9194f
feater: 可对自动化代码增加空方法 (#1834)
pixelmaxQm Jul 25, 2024
b10c729
feature:方法结束关闭file
pixelmaxQm Jul 25, 2024
397e1e2
opt: 优化模板逻辑
pixelmaxQm Jul 26, 2024
1f962f2
fixed: 修复自动化代码字段名称key编辑时候失去焦点的bug
pixelmaxQm Jul 26, 2024
4814f21
feature: 增加新初始化api
pixelmaxQm Jul 26, 2024
7ad6b9c
feature: 自动关联可能的apiGroup
pixelmaxQm Jul 26, 2024
bb3a54a
feature: 优化添加空方法的apiPath
pixelmaxQm Jul 26, 2024
15d22b7
feature: 增加空方法后续业务逻辑处理
pixelmaxQm Jul 26, 2024
0993e81
fixed: package template api.go.tpl 作用域问题
SliverHorn Jul 26, 2024
055198c
fixed: plugin template api.go.template {{.Abbreviation}}.UpdatedBy re…
SliverHorn Jul 26, 2024
5c7d121
feature: 放弃自己研发的代码定位功能,集成vite官方的devtool工具
pixelmaxQm Jul 26, 2024
63c82cf
feature: 优化pathInfo.json生成功能
pixelmaxQm Jul 26, 2024
432b2f0
fixed: plugin template api.go.template and package template api.go.tpl
SliverHorn Jul 26, 2024
70e3d40
Merge remote-tracking branch 'origin/main'
SliverHorn Jul 26, 2024
84f8b6e
fixed: package template api.go.tpl Update
SliverHorn Jul 26, 2024
26dc3f3
feature: 优化自动化api模板
pixelmaxQm Jul 26, 2024
62b84d4
feature:提取创建claims和token的方法,方便后续插件扩展。
pixelmaxQm Jul 26, 2024
6debb09
Merge remote-tracking branch 'origin/main'
pixelmaxQm Jul 26, 2024
2645dcd
fixed:插件api增加空方法模板调整。
pixelmaxQm Jul 27, 2024
c97b60b
fixed:插件api增加空方法模板调整。
pixelmaxQm Jul 27, 2024
ff41fe0
fixed:对导出关键字进行处理
pixelmaxQm Jul 27, 2024
5a5b86a
fixed:新增方法清空已经输入的内容
pixelmaxQm Jul 27, 2024
2d0b9ec
add cloudflare r2 storage (#1835)
LixvYang Jul 30, 2024
e65be6e
feat: tab支持使用鼠标中键关闭 (#1840)
zhongmax Jul 31, 2024
a4a7b44
feature: Local优化文件删除逻辑
pixelmaxQm Jul 31, 2024
3b93a07
feature: swagger 优化
pixelmaxQm Jul 31, 2024
aebc301
feature: swagger自动化模板优化
pixelmaxQm Jul 31, 2024
ce76408
feature: 修改vite.config.js注释
pixelmaxQm Jul 31, 2024
06bf641
fixed: 修复自动化代码路径不匹配的bug
pixelmaxQm Jul 31, 2024
1207291
fixed: 修复自动化模板多了}的问题
pixelmaxQm Aug 1, 2024
5d04b8d
fixed: 调整autoCode标签
pixelmaxQm Aug 1, 2024
b5c44e4
feature: 调整baseUrl方法
pixelmaxQm Aug 1, 2024
e25cafe
fixed: 调整重复创建代码的提示
pixelmaxQm Aug 2, 2024
15b5083
Update README.md
pixelmaxQm Aug 3, 2024
3c3d948
fixed:修复复用代码无法改变主键的bug
pixelmaxQm Aug 3, 2024
a44133d
fixed: 修复在同时开启多个窗口的情况下刷新页面导致的死循环情况
pixelmaxQm Aug 4, 2024
7121968
2.7.1版本提交 (#1844)
pixelmaxQm Aug 4, 2024
332a8de
fixed: 修复其他数据库类型下无法获取表列表的bug
pixelmaxQm Aug 5, 2024
6fedb97
fix: 代码自动生成选择业务库自动迁移代码生成异常 (#1848)
lbbniu Aug 12, 2024
c3c049b
fixed: casbin 设置空权限无需调用 AddPolicies 方法 (#1850)
SliverHorn Aug 12, 2024
3b5c96d
feat:对象存储支持配置Cloudflare R2 (#1849)
okatu-loli Aug 12, 2024
c9477d3
V2.7.2版本发布 (#1853)
pixelmaxQm Aug 13, 2024
0956edd
feat: 初始化完成后主动获取GVA_ACTIVE_DBNAME。
pixelmaxQm Aug 14, 2024
43d0c29
feature:swagger 接口请求方式优化 (#1854)
Eric54920 Aug 15, 2024
f7ddd8b
chore(user.vue): Update user.vue, alter userInfo username to userName…
sliboy Aug 15, 2024
bec5dc4
fixed: 模板中el-image默认添加preview-teleported,用户在预览时候方式弹出层被遮罩。
pixelmaxQm Aug 15, 2024
cbace6f
feature: 调整全量引入功能对格式化后的代码依然生效
pixelmaxQm Aug 15, 2024
85d7b5f
fixed: 修复addFunction下前端api.js无法创建的bug。
pixelmaxQm Aug 15, 2024
c70fedf
fixed: 修复addFunction下前端api.js无法创建的bug。
pixelmaxQm Aug 15, 2024
7f70e69
fixed: 修复自动化代码产生的详情功能图片不可用的bug
pixelmaxQm Aug 20, 2024
27edfac
fix: add funcName is sure UpperChar (#1860)
clh021 Aug 23, 2024
ed54633
feature: swagger接口请求优化
Eric54920 Aug 24, 2024
87ced16
Merge pull request #1862 from Eric54920/Eric-dev
pixelmaxQm Aug 24, 2024
866fa56
Dev273 (#1868)
pixelmaxQm Aug 27, 2024
aab865b
Update service.go.template (#1867)
clh021 Aug 27, 2024
b26db19
Update model.go.template (#1866)
clh021 Aug 27, 2024
fa3b952
column参数类型是number (#1865)
zayn-code Aug 27, 2024
894cf8e
feature: api默认忽略数据增加 /info/getInfoDataSource 和 /info/getInfoPublic
pixelmaxQm Aug 27, 2024
57f13f5
fixed: 修复loading无法消失的bug
pixelmaxQm Aug 30, 2024
a155bcd
fixed: 修复登陆页面小屏幕下背景色bug
pixelmaxQm Aug 30, 2024
3c7a05b
feature: 增加上传文件组件的成功失败回调事件
piexlmax Aug 31, 2024
df3fc0a
fixed: 修复文件上传失败但是依然加入了文件列表的bug
pixelmaxQm Sep 4, 2024
c20ea7e
publish: 发布2.7.4版本Beta (#1880)
pixelmaxQm Sep 12, 2024
f2a8829
feature: 版本号v2.7.3升级为v2.7.4
pixelmaxQm Sep 12, 2024
b55ecd2
fixed: api.js模板调整
piexlmax Sep 13, 2024
e9e42be
fixed: 修复RedisList不受控制创建的bug
pixelmaxQm Sep 13, 2024
c72ed97
feature: 增加basetype 兼容低版本数据库的json不兼容问题
pixelmaxQm Sep 13, 2024
37b0ef4
fixed: 修复文件监听错误的bug
pixelmaxQm Sep 14, 2024
8733b24
fixed: 清理自动化方法的swagger入参
pixelmaxQm Sep 16, 2024
a8e6dc3
fixed: 修复复用代码高级模式不展示可选项的bug
pixelmaxQm Sep 17, 2024
a6651ff
fixed: 字典页面默认值调整为拉回字典列表的第一个
pixelmaxQm Sep 17, 2024
528d741
Update basetypes.go, fixed origin_setting column read error
v1p2nd Sep 18, 2024
3d58213
Merge pull request #1884 from juneyx/main
pixelmaxQm Sep 18, 2024
f0d91b0
Revert "Update basetypes.go, fixed origin_setting column read error"
pixelmaxQm Sep 18, 2024
66bcd32
Merge pull request #1886 from flipped-aurora/revert-1884-main
pixelmaxQm Sep 18, 2024
0fd9e95
fixed: 对JSONMap进行多数据库不同断言兼容
pixelmaxQm Sep 18, 2024
ad699fa
fixed: 方法名 ==> 方法介绍
pixelmaxQm Sep 18, 2024
3529297
clean: clean header index.vue repeat flex class (#1888)
clh021 Sep 21, 2024
9b26d6c
server: same Author "yourname" for gen Code (#1887)
clh021 Sep 21, 2024
6386034
feat: 调整icon功能的绑定形式 升级vue和svg插件
pixelmaxQm Sep 21, 2024
04cfd0e
feat: edit global.js support plugin svg
clh021 Sep 18, 2024
ed840a9
clean: Update global.js clean console.log svg component name
clh021 Sep 18, 2024
af287dc
生产环境时移除console
Sep 18, 2024
2c7809b
生产环境时移除console
Sep 18, 2024
0333053
feat: 优化图片选择器
pixelmaxQm Sep 22, 2024
b98094c
feat: 修复文件选择组件的bug
pixelmaxQm Sep 25, 2024
4c46bda
feat: 上传文件到 oss 遇到错误时,应该返回错误,避免 panic (#1890)
3vilive Sep 27, 2024
360af93
fix: 增加图片选择器兼容性
piexlmax Sep 29, 2024
a5e8980
fix: 消除swag init的不兼容bug
piexlmax Sep 29, 2024
e325aba
Merge pull request #8 from flipped-aurora/main
helight Sep 29, 2024
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
12 changes: 6 additions & 6 deletions .github/workflows/ci.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ jobs:
runs-on: ubuntu-latest
strategy:
matrix:
node-version: [16.8.0]
node-version: [18.16.0]
steps:
- name: Check out branch
uses: actions/checkout@v2
Expand All @@ -48,7 +48,7 @@ jobs:
runs-on: ubuntu-latest
strategy:
matrix:
go-version: [1.21]
go-version: [1.22]
steps:
- name: Set up Go ${{ matrix.go-version }}
uses: actions/setup-go@v1
Expand Down Expand Up @@ -83,8 +83,8 @@ jobs:
runs-on: ubuntu-latest
strategy:
matrix:
node-version: [16.8.0]
go-version: [1.21]
node-version: [18.16.0]
go-version: [1.22]
steps:
- name: Check out branch
uses: actions/checkout@v2
Expand Down Expand Up @@ -194,8 +194,8 @@ jobs:
name: devops-prod
strategy:
matrix:
node-version: ['16.x']
go-version: ['1.21']
node-version: ['18.x']
go-version: ['1.22']
steps:
- uses: actions/checkout@v2
- name: tag major and minor versions
Expand Down
3 changes: 3 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -22,10 +22,13 @@ yarn-error.log*
*.sln
*.sw?

rm_file/
/server/log/
/server/gva
/server/server
/server/latest_log
/server/__debug_bin*
server/uploads/

*.iml
web/.pnpm-debug.log
Expand Down
4 changes: 2 additions & 2 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@ SHELL = /bin/bash

#SCRIPT_DIR = $(shell pwd)/etc/script
#请选择golang版本
BUILD_IMAGE_SERVER = golang:1.18
BUILD_IMAGE_SERVER = golang:1.22
#请选择node版本
BUILD_IMAGE_WEB = node:16
BUILD_IMAGE_WEB = node:20
#项目名称
PROJECT_NAME = github.com/flipped-aurora/gin-vue-admin/server
#配置文件目录
Expand Down
6 changes: 1 addition & 5 deletions README-en.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@

<div align=center>
<img src="http://qmplusimg.henrongyi.top/gvalogo.jpg" width=300" height="300" />
<img src="http://qmplusimg.henrongyi.top/gvalogo.jpg" width="300" height="300" />
</div>
<div align=center>
<img src="https://img.shields.io/badge/golang-1.18-blue"/>
Expand All @@ -16,10 +16,6 @@ English | [简体中文](./README.md)

[github](https://github.com/flipped-aurora/gin-vue-admin): https://github.com/flipped-aurora/gin-vue-admin

[Vue3 version branch address](https://github.com/flipped-aurora/gin-vue-admin/tree/vue3Develop): https://github.com/flipped-aurora/gin-vue-admin/tree/vue3Develop

[Approval flow branch](https://github.com/flipped-aurora/gin-vue-admin/tree/gva_workflow): https://github.com/flipped-aurora/gin-vue-admin/tree/gva_workflow

# Project Guidelines
[Online Documentation](https://www.gin-vue-admin.com/) : https://www.gin-vue-admin.com/

Expand Down
25 changes: 8 additions & 17 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@

<div align=center>
<img src="http://qmplusimg.henrongyi.top/gvalogo.jpg" width=300" height="300" />
<img src="http://qmplusimg.henrongyi.top/gvalogo.jpg" width="300" height="300" />
</div>
<div align=center>
<img src="https://img.shields.io/badge/golang-1.20-blue"/>
Expand All @@ -12,15 +12,6 @@

[English](./README-en.md) | 简体中文

## 不同版本

我们会对以下四个版本持续维护,请选择适合自己的版本使用。最新技术栈为组合式api版本,已支持多语言(I18N)

[组合式API版(主)](https://github.com/flipped-aurora/gin-vue-admin) |
[组合式API多语言(i18n)版](https://github.com/flipped-aurora/gin-vue-admin/tree/i18n-dev-new) |
[声明式API版](https://github.com/flipped-aurora/gin-vue-admin/tree/v2.4.x) |
[声明式API多语言(i18n)版](https://github.com/flipped-aurora/gin-vue-admin/tree/i18n-dev)

# 项目文档
[在线文档](https://www.gin-vue-admin.com) : https://www.gin-vue-admin.com

Expand All @@ -42,9 +33,11 @@

3.您完全可以通过我们的教程和文档完成一切操作,因此我们不再提供免费的技术服务,如需服务请进行[付费支持](https://www.gin-vue-admin.com/coffee/payment.html)

4.如果您将此项目用于商业用途,请遵守Apache2.0协议并保留作者技术支持声明。您需保留如下版权声明信息,其余信息功能不做任何限制。如需剔除请[购买授权](https://www.gin-vue-admin.com/empower/index.html)
4.如果您将此项目用于商业用途,请遵守Apache2.0协议并保留作者技术支持声明。您需保留如下版权声明信息,以及日志和代码中所包含的版权声明信息。所需保留信息均为文案性质,不会影响任何业务内容,如决定商用且必须剔除请[购买授权](https://www.gin-vue-admin.com/empower/index.html)

<img src="https://qmplusimg.henrongyi.top/openSource/login.jpg" width="1000">

<img src="https://qmplusimg.henrongyi.top/%E6%8E%88%E6%9D%83.png" width="1000">
<img src="https://qmplusimg.henrongyi.top/openSource/dashboard.jpg" width="1000">

## 1. 基本介绍

Expand Down Expand Up @@ -83,7 +76,7 @@ Gin-vue-admin 的成长离不开大家的支持,如果你愿意为 gin-vue-adm

```
- node版本 > v16.8.3
- golang版本 >= v1.16
- golang版本 >= v1.22
- IDE推荐:Goland
```

Expand All @@ -101,11 +94,9 @@ cd server
# 使用 go mod 并安装go依赖包
go generate

# 编译
go build -o server main.go (windows编译命令为go build -o server.exe main.go )
# 运行
go run .

# 运行二进制
./server (windows运行命令为 server.exe)
```

### 2.2 web项目
Expand Down
6 changes: 3 additions & 3 deletions deploy/docker-compose/docker-compose-dev.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ volumes:

services:
web:
image: node:16
image: node:20
container_name: gva-web
hostname: gva-web #可以通过容器名访问
restart: always
Expand All @@ -25,7 +25,7 @@ services:
- server
working_dir: /web # 如果docker 设置了workdir 则此处不需要设置
#若网络不太好,请自行换源,如下
#command: bash -c "yarn config set registry https://registry.npm.taobao.org --global && yarn install && yarn serve"
#command: bash -c "yarn config set registry https://registry.npmmirror.com --global && yarn install && yarn serve"
command: bash -c "yarn install && yarn serve"
volumes:
- ../../web:/web
Expand All @@ -34,7 +34,7 @@ services:
ipv4_address: 177.7.0.11

server:
image: golang:1.18
image: golang:1.22
container_name: gva-server
hostname: gva-server
restart: always
Expand Down
7 changes: 7 additions & 0 deletions server/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -13,12 +13,19 @@ RUN go env -w GO111MODULE=on \
FROM alpine:latest

LABEL MAINTAINER="SliverHorn@[email protected]"
# 设置时区
ENV TZ=Asia/Shanghai
RUN apk update && apk add --no-cache tzdata openntpd \
&& ln -sf /usr/share/zoneinfo/$TZ /etc/localtime && echo $TZ > /etc/timezone

WORKDIR /go/src/github.com/flipped-aurora/gin-vue-admin/server

COPY --from=0 /go/src/github.com/flipped-aurora/gin-vue-admin/server/server ./
COPY --from=0 /go/src/github.com/flipped-aurora/gin-vue-admin/server/resource ./resource/
COPY --from=0 /go/src/github.com/flipped-aurora/gin-vue-admin/server/config.docker.yaml ./

# 挂载目录:如果使用了sqlite数据库,容器命令示例:docker run -d -v /宿主机路径/gva.db:/go/src/github.com/flipped-aurora/gin-vue-admin/server/gva.db -p 8888:8888 --name gva-server-v1 gva-server:1.0
# VOLUME ["/go/src/github.com/flipped-aurora/gin-vue-admin/server"]

EXPOSE 8888
ENTRYPOINT ./server -c config.docker.yaml
4 changes: 2 additions & 2 deletions server/api/v1/enter.go
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,9 @@ import (
"github.com/flipped-aurora/gin-vue-admin/server/api/v1/system"
)

var ApiGroupApp = new(ApiGroup)

type ApiGroup struct {
SystemApiGroup system.ApiGroup
ExampleApiGroup example.ApiGroup
}

var ApiGroupApp = new(ApiGroup)
2 changes: 1 addition & 1 deletion server/api/v1/example/exa_breakpoint_continue.go
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,7 @@ func (b *FileUploadAndDownloadApi) BreakpointContinue(c *gin.Context) {
// @Produce application/json
// @Param file formData file true "Find the file, 查找文件"
// @Success 200 {object} response.Response{data=exampleRes.FileResponse,msg=string} "查找文件,返回包括文件详情"
// @Router /fileUploadAndDownload/findFile [post]
// @Router /fileUploadAndDownload/findFile [get]
func (b *FileUploadAndDownloadApi) FindFile(c *gin.Context) {
fileMd5 := c.Query("fileMd5")
fileName := c.Query("fileName")
Expand Down
27 changes: 25 additions & 2 deletions server/api/v1/example/exa_file_upload_download.go
Original file line number Diff line number Diff line change
Expand Up @@ -32,8 +32,8 @@ func (b *FileUploadAndDownloadApi) UploadFile(c *gin.Context) {
}
file, err = fileUploadAndDownloadService.UploadFile(header, noSave) // 文件上传后拿到文件路径
if err != nil {
global.GVA_LOG.Error("修改数据库链接失败!", zap.Error(err))
response.FailWithMessage("修改数据库链接失败", c)
global.GVA_LOG.Error("上传文件失败!", zap.Error(err))
response.FailWithMessage("上传文件失败", c)
return
}
response.OkWithDetailed(exampleRes.ExaFileResponse{File: file}, "上传成功", c)
Expand Down Expand Up @@ -108,3 +108,26 @@ func (b *FileUploadAndDownloadApi) GetFileList(c *gin.Context) {
PageSize: pageInfo.PageSize,
}, "获取成功", c)
}

// ImportURL
// @Tags ExaFileUploadAndDownload
// @Summary 导入URL
// @Security ApiKeyAuth
// @Produce application/json
// @Param data body example.ExaFileUploadAndDownload true "对象"
// @Success 200 {object} response.Response{msg=string} "导入URL"
// @Router /fileUploadAndDownload/importURL [post]
func (b *FileUploadAndDownloadApi) ImportURL(c *gin.Context) {
var file []example.ExaFileUploadAndDownload
err := c.ShouldBindJSON(&file)
if err != nil {
response.FailWithMessage(err.Error(), c)
return
}
if err := fileUploadAndDownloadService.ImportURL(&file); err != nil {
global.GVA_LOG.Error("导入URL失败!", zap.Error(err))
response.FailWithMessage("导入URL失败", c)
return
}
response.OkWithMessage("导入URL成功", c)
}
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@ package system

import (
"github.com/flipped-aurora/gin-vue-admin/server/global"
"github.com/flipped-aurora/gin-vue-admin/server/model/common/request"
common "github.com/flipped-aurora/gin-vue-admin/server/model/common/request"
"github.com/flipped-aurora/gin-vue-admin/server/model/common/response"
systemReq "github.com/flipped-aurora/gin-vue-admin/server/model/system/request"
request "github.com/flipped-aurora/gin-vue-admin/server/model/system/request"
"github.com/gin-gonic/gin"
"go.uber.org/zap"
)
Expand All @@ -21,13 +21,13 @@ type AutoCodeHistoryApi struct{}
// @Success 200 {object} response.Response{data=map[string]interface{},msg=string} "获取meta信息"
// @Router /autoCode/getMeta [post]
func (a *AutoCodeHistoryApi) First(c *gin.Context) {
var info request.GetById
var info common.GetById
err := c.ShouldBindJSON(&info)
if err != nil {
response.FailWithMessage(err.Error(), c)
return
}
data, err := autoCodeHistoryService.First(&info)
data, err := autoCodeHistoryService.First(c.Request.Context(), info)
if err != nil {
response.FailWithMessage(err.Error(), c)
return
Expand All @@ -45,13 +45,13 @@ func (a *AutoCodeHistoryApi) First(c *gin.Context) {
// @Success 200 {object} response.Response{msg=string} "删除回滚记录"
// @Router /autoCode/delSysHistory [post]
func (a *AutoCodeHistoryApi) Delete(c *gin.Context) {
var info request.GetById
var info common.GetById
err := c.ShouldBindJSON(&info)
if err != nil {
response.FailWithMessage(err.Error(), c)
return
}
err = autoCodeHistoryService.Delete(&info)
err = autoCodeHistoryService.Delete(c.Request.Context(), info)
if err != nil {
global.GVA_LOG.Error("删除失败!", zap.Error(err))
response.FailWithMessage("删除失败", c)
Expand All @@ -66,17 +66,17 @@ func (a *AutoCodeHistoryApi) Delete(c *gin.Context) {
// @Security ApiKeyAuth
// @accept application/json
// @Produce application/json
// @Param data body systemReq.RollBack true "请求参数"
// @Param data body request.SysAutoHistoryRollBack true "请求参数"
// @Success 200 {object} response.Response{msg=string} "回滚自动生成代码"
// @Router /autoCode/rollback [post]
func (a *AutoCodeHistoryApi) RollBack(c *gin.Context) {
var info systemReq.RollBack
var info request.SysAutoHistoryRollBack
err := c.ShouldBindJSON(&info)
if err != nil {
response.FailWithMessage(err.Error(), c)
return
}
err = autoCodeHistoryService.RollBack(&info)
err = autoCodeHistoryService.RollBack(c.Request.Context(), info)
if err != nil {
response.FailWithMessage(err.Error(), c)
return
Expand All @@ -90,17 +90,17 @@ func (a *AutoCodeHistoryApi) RollBack(c *gin.Context) {
// @Security ApiKeyAuth
// @accept application/json
// @Produce application/json
// @Param data body systemReq.SysAutoHistory true "请求参数"
// @Param data body common.PageInfo true "请求参数"
// @Success 200 {object} response.Response{data=response.PageResult,msg=string} "查询回滚记录,返回包括列表,总数,页码,每页数量"
// @Router /autoCode/getSysHistory [post]
func (a *AutoCodeHistoryApi) GetList(c *gin.Context) {
var search systemReq.SysAutoHistory
err := c.ShouldBindJSON(&search)
var info common.PageInfo
err := c.ShouldBindJSON(&info)
if err != nil {
response.FailWithMessage(err.Error(), c)
return
}
list, total, err := autoCodeHistoryService.GetList(search.PageInfo)
list, total, err := autoCodeHistoryService.GetList(c.Request.Context(), info)
if err != nil {
global.GVA_LOG.Error("获取失败!", zap.Error(err))
response.FailWithMessage("获取失败", c)
Expand All @@ -109,7 +109,7 @@ func (a *AutoCodeHistoryApi) GetList(c *gin.Context) {
response.OkWithDetailed(response.PageResult{
List: list,
Total: total,
Page: search.Page,
PageSize: search.PageSize,
Page: info.Page,
PageSize: info.PageSize,
}, "获取成功", c)
}
Loading