Compare commits

...
1639 Commits
Author SHA1 Message Date
奇淼(piexlmax b1c6d26a0f 正式发布2.4.5 2021-10-13 14:43:35 +08:00
qimiao 8f8bef9ea2 发布V2.4.5 RC 2021-09-30 15:54:19 +08:00
奇淼(piexlmax 1457876698 [Feature]:#753 (#754)
[Feature]:#753 (#754)
2021-09-30 10:37:39 +08:00
奇淼(piexlmax 1d52614691 fix:#748 (#752)
fix:#748
2021-09-29 19:34:27 +08:00
奇淼(piexlmax 01eb096920 Fix 731 (#750)
* fix:#731 (#749)
* 代码生成器样式调整
Co-authored-by: songkang1993 <38366752+songkang1993@users.noreply.github.com>
2021-09-29 19:04:21 +08:00
奇淼(piexlmax 5b7c1fb8fe fix:#746
fix:#746
2021-09-26 18:11:25 +08:00
奇淼(piexlmax 7466ef21e5 清理无用的配置文件 web-flow (#743)
清理无用自动化字段 web-flow
2021-09-26 11:56:47 +08:00
奇淼(piexlmax 8cc56c7db5 修正生命周期钩子,将beforeDestroy更改为beforeUnmount (#738) (#742)
优化将beforeDestroy更改为beforeUnmount
2021-09-26 11:37:19 +08:00
songzhibin97 d4914d6eca feat:明确root语义 (#740)
feat:明确root语义 (#740)
2021-09-26 10:39:08 +08:00
奇淼(piexlmax 9dc78174a9 Merge pull request #737 from flipped-aurora/gva-vue3
修复预览自动化代码全选和复制的bug
2021-09-24 17:34:30 +08:00
piexlmax 22df94e6a0 主色调统一 2021-09-24 17:33:51 +08:00
奇淼(piexlmax d78f147889 修复预览自动化代码全选和复制的bug
修复预览自动化代码全选和复制的bug
2021-09-24 15:54:52 +08:00
piexlmax 25ae9f4dd2 修复预览自动化代码全选和复制的bug 2021-09-24 15:08:21 +08:00
奇淼(piexlmax 338664452b 样式细节调整 (#726)
增加健康检查

样式细节调整

规范化插件js模式

增加k8s yaml文件 (#734)
2021-09-24 14:15:16 +08:00
奇淼(piexlmax 98a257b7e3 Merge pull request #724 from flipped-aurora/gva-vue3
调整不同屏幕下的兼容性
2021-09-21 21:09:02 +08:00
蒋吉兆 2f402fe26d 调整不同屏幕下的兼容性 2021-09-21 21:02:40 +08:00
奇淼(piexlmax c5daed4a70 Merge pull request #723 from flipped-aurora/gva-vue3
发布v2.4.5 bate.1
2021-09-21 18:04:12 +08:00
蒋吉兆 46442f4a65 更新代码规范 2021-09-21 18:02:50 +08:00
蒋吉兆 2c06ca34c0 代码规范性调整 2021-09-21 17:55:18 +08:00
蒋吉兆 51e26a00a4 前端性能行以及样式细节调整 2021-09-21 17:40:28 +08:00
奇淼(piexlmax 54e3e5cb90 Merge pull request #722 from flipped-aurora/gva-vue3-fedev
Gva vue3 fedev
2021-09-21 17:24:19 +08:00
奇淼(piexlmax 9ee8c3ca38 Merge pull request #721 from flipped-aurora/revert-718-last
Revert "修改全局 dialog 样式,修改api管理的删除初始化显示问题"
2021-09-21 17:23:53 +08:00
奇淼(piexlmax 0193e61d72 Revert "修改全局 dialog 样式,修改api管理的删除初始化显示问题" 2021-09-21 17:23:42 +08:00
奇淼(piexlmax d4258eea9a Merge pull request #720 from flipped-aurora/gva-vue3-fedev
2.4.5 bate.1 版本
2021-09-21 16:48:40 +08:00
奇淼(piexlmax 634e395902 Merge pull request #719 from SliverHorn/sliver_horn_develop
fixed: Find两次数据库, db := global.GVA_DB加上Model 防止Count报错
2021-09-21 16:47:44 +08:00
奇淼(piexlmax 8ba6eee597 Merge pull request #718 from bypanghu/last
修改全局 dialog 样式,修改api管理的删除初始化显示问题
2021-09-21 16:47:07 +08:00
奇淼(piexlmax cd576a1e02 Merge branch 'gva-vue3-fedev' into last 2021-09-21 16:34:53 +08:00
奇淼(piexlmax 70d9ef63db Update sys_casbin.go 2021-09-21 16:33:37 +08:00
奇淼(piexlmax d69243d720 Update vite.config.js 2021-09-21 16:30:40 +08:00
蒋吉兆 c3480b3c49 修改版本号为 2.4.5 bate.1 2021-09-21 16:26:59 +08:00
蒋吉兆 ff79b2aa0f 修改form模板 调整form基本样式 2021-09-21 16:25:14 +08:00
蒋吉兆 2cbb87baaa 调整前端样式,调整日志记录路由组,调整对应自动化模板 2021-09-20 21:40:23 +08:00
蒋吉兆 6a8e35379a 调整搜索框和提示文字的样式细节 2021-09-20 17:34:44 +08:00
奇淼(piexlmax 203e999ec4 Update README.md 2021-09-19 23:10:02 +08:00
奇淼(piexlmax 528d45e58a Update README.md 2021-09-19 23:09:07 +08:00
蒋吉兆 d04ee96111 样式细节调整 2021-09-19 22:59:13 +08:00
SliverHorn 508691535f fixed: Find两次数据库, db := global.GVA_DB加上Model 防止Count报错 2021-09-19 09:13:13 +08:00
bypanghu@163.com edf38ae8ee 修改全局 dialog 样式,修改api管理的删除初始化显示问题 2021-09-18 23:01:36 +08:00
piexlmax a2f2b4178a 安全距离细节调整 2021-09-18 19:38:42 +08:00
qimiao b297129a26 展示细节调整 2021-09-18 19:00:31 +08:00
piexlmax e3bfa9ccd9 增加重置搜索条件功能 2021-09-18 17:45:54 +08:00
piexlmax 132c1b68b1 细节变更 2021-09-18 17:39:18 +08:00
piexlmax d85b481e68 dashboard调整 2021-09-18 17:09:15 +08:00
piexlmax a5b989d278 样式美化 2021-09-18 12:40:31 +08:00
蒋吉兆 5e3df6c742 修改新版样式 2021-09-18 00:10:17 +08:00
奇淼(piexlmax ea9d6d4e4c Merge pull request #716 from flipped-aurora/gva-vue3
清除多余public文件夹,修复ico替换不生效的问题
2021-09-17 10:43:59 +08:00
piexlmax fbd5fcbefd 清除多余public文件夹,修复ico替换不生效的问题 2021-09-17 10:06:57 +08:00
songzhibin97 9c57f5f877 Update main.go 2021-09-16 14:28:20 +08:00
奇淼(piexlmax 8b08758b85 Merge pull request #713 from flipped-aurora/gva-vue3
代码规范性提升
2021-09-16 10:24:34 +08:00
qimiao 98c5e8d774 代码规范性优化 2021-09-16 10:19:54 +08:00
qimiao bca1bcb42d Merge remote-tracking branch 'origin/gva-vue3' into gva-vue3
# Conflicts:
#	server/core/viper.go
2021-09-16 10:00:31 +08:00
奇淼(piexlmax 55b7003aa9 Merge pull request #710 from bypanghu/master
删除主仓库下无用的包管理文件,添加验证码验证
2021-09-16 09:59:45 +08:00
奇淼(piexlmax fd8f63161f Merge pull request #712 from MZqk/patch-2
Update viper.go
2021-09-16 09:56:56 +08:00
MZZZ c1800b685f Update viper.go
core/viper.go:61:95: syntax error: unexpected newline, expecting comma or )
2021-09-15 20:18:59 +08:00
songzhibin97 0f18854c40 feat:增加测试用例 2021-09-15 18:42:17 +08:00
songzhibin97 d80edb16df Merge branch 'gva-vue3' of https://github.com/flipped-aurora/gin-vue-admin into gva-vue3 2021-09-15 18:06:18 +08:00
songzhibin97 beb39cc5c7 fix:style 2021-09-15 18:06:07 +08:00
songzhibin97 f6155302e8 fix:stype 2021-09-15 17:42:28 +08:00
范庆磊 81b773bee6 删除主仓库目录下无用的前端包管理工具,添加登陆页面的验证函数 2021-09-15 16:43:13 +08:00
ipanghu 725d779682 Merge pull request #1 from flipped-aurora/master
拉取主仓库最新代码
2021-09-15 16:14:20 +08:00
奇淼(piexlmax b903ff7e78 Create .deepsource.toml 2021-09-15 15:13:34 +08:00
奇淼(piexlmax 517c5b60a8 Merge pull request #707 from flipped-aurora/gva-vue3
修复了一些已知bug
2021-09-15 12:21:47 +08:00
qimiao 88fd6c719a Merge branch 'master' of github.com:flipped-aurora/gin-vue-admin into gva-vue3 2021-09-15 12:19:59 +08:00
qimiao 76a6c8c255 Merge branch 'develop' of github.com:flipped-aurora/gin-vue-admin into gva-vue3
 Conflicts:
	server/core/viper.go
2021-09-15 12:19:40 +08:00
奇淼(piexlmax fb57e864e1 Merge pull request #705 from songzhibin97/gva_gormv2_dev
fix: cache初始化时间问题
2021-09-15 12:15:58 +08:00
奇淼(piexlmax 4a1a294658 Merge pull request #704 from iciness/develop
bug修复:jwt黑名单启动时候未加载及未生效
2021-09-15 12:15:43 +08:00
奇淼(piexlmax 6d74d7c9f6 Merge pull request #706 from TrumanH/master
revise file name typo
2021-09-15 12:15:05 +08:00
he 5b56ebb5fd revise file name typo 2021-09-15 12:06:14 +08:00
Benny dd4d42295b fix:在GVA_DB初始化后,从db加载jwt黑名单数据 2021-09-15 12:04:02 +08:00
songzhibin97 56c26e35b5 fix: cache初始化时间问题 2021-09-15 11:53:39 +08:00
蒋吉兆 2bf7b78d39 vue 版本 3.0.0 --> 3.2.0 2021-09-14 22:33:00 +08:00
奇淼(piexlmax 3a5f8f8a1e Merge pull request #702 from flipped-aurora/gva-vue3
解决使用自动二级路由导致的切换tab白屏问题
2021-09-14 22:27:57 +08:00
蒋吉兆 9e17fbb807 解决使用自动二级路由导致的切换tab白屏问题 2021-09-14 22:25:44 +08:00
奇淼(piexlmax 440bc3b730 Merge pull request #701 from flipped-aurora/gva-vue3
Gva vue3
2021-09-14 19:57:05 +08:00
奇淼(piexlmax 863d0826a7 Merge pull request #697 from songzhibin97/gva_gormv2_dev
fix:重复生成判断回滚
2021-09-14 19:56:48 +08:00
奇淼(piexlmax e564eff45a Merge pull request #700 from SliverHorn/sliver_horn_develop
fixed: #699 go build 报错 gcc问题
2021-09-14 19:53:08 +08:00
qimiao 6cb9ab45d9 Merge remote-tracking branch 'origin/gva-vue3' into gva-vue3 2021-09-14 19:49:51 +08:00
piexlmax 3706937d4a 前端ui样式优化 2021-09-14 19:49:06 +08:00
SliverHorn ccce04df1c fixed: #699 go build 报错 gcc问题 2021-09-14 17:41:21 +08:00
songzhibin97 f2e5e56fdb feat:jwt签名初始化 2021-09-14 16:26:55 +08:00
songzhibin97 c993e2d070 fix:重复生成判断回滚 2021-09-13 11:07:59 +08:00
奇淼(piexlmax fffc2b7a57 Update bug_report.yaml 2021-09-10 19:00:07 +08:00
奇淼(piexlmax 59eb684b47 Merge pull request #694 from songzhibin97/gva_gormv2_dev
feat: issues #692
2021-09-10 14:36:52 +08:00
songzhibin97 f0969e09d3 feat: issues #692 2021-09-10 11:57:27 +08:00
qimiao 108959c84c 自动化图片路径由http切换为https 修复安全性报错 2021-09-09 17:56:23 +08:00
奇淼(piexlmax a2bf105ba9 Merge pull request #691 from flipped-aurora/gva-vue3
修复在登录状态下访问白名单路由导致白屏的bug
2021-09-09 10:45:07 +08:00
qimiao ff1b004a2c Merge remote-tracking branch 'origin/gva-vue3' into gva-vue3 2021-09-09 10:44:26 +08:00
piexlmax a54144d4e1 修复在登录状态下访问白名单路由导致白屏的bug 2021-09-09 10:43:58 +08:00
奇淼(piexlmax 81f31a4ba8 Merge pull request #689 from flipped-aurora/gva-vue3
同步 develop
2021-09-08 17:50:23 +08:00
奇淼(piexlmax 8bf77ff52c Merge pull request #688 from flipped-aurora/gva-vue3
去除表名空格
2021-09-08 17:49:42 +08:00
奇淼(piexlmax f16d8455a8 Merge pull request #685 from supine-win/patch-4
tableName添加空格删除
2021-09-08 17:49:01 +08:00
piexlmax aee0fecaed 增加 issueid 2021-09-08 17:42:51 +08:00
piexlmax 4587e49ff6 提交issue模板 2021-09-08 17:33:58 +08:00
奇淼(piexlmax 2dc2ef4f0c Update feature_request.yaml 2021-09-08 17:31:40 +08:00
奇淼(piexlmax 98d0e69173 Update feature_request.yaml 2021-09-08 17:29:18 +08:00
奇淼(piexlmax ceddd99dc4 Create config.yml 2021-09-08 17:23:27 +08:00
piexlmax 833a31ae14 修改后缀 2021-09-08 17:15:50 +08:00
piexlmax 1c4a774765 修改issue模板 2021-09-08 17:10:59 +08:00
奇淼(piexlmax 6f2fcdcf65 Update issue templates 2021-09-08 17:08:32 +08:00
奇淼(piexlmax 3d502b6414 Merge pull request #686 from flipped-aurora/gva-vue3
增加issue模板 修复person页面的跳转bug
2021-09-08 17:06:43 +08:00
piexlmax d275ed1942 issue提供表单结构 修复了person页面的跳转bug 2021-09-08 17:03:22 +08:00
奇淼(piexlmax 5b4e113b71 Update and rename ----bug.ymal to config.ymal 2021-09-08 16:49:58 +08:00
奇淼(piexlmax 2fc2cea1cc Update and rename ----bug.md to ----bug.ymal 2021-09-08 15:35:03 +08:00
奇淼(piexlmax bf37b6a132 Update issue templates 2021-09-08 15:30:33 +08:00
supine-win a16f0cb894 tableName添加空格删除
1.tableName添加空格删除
2.修改拼写错误
2021-09-07 21:54:05 +08:00
SliverHorn d06e2aa5e6 Merge pull request #682 from SliverHorn/sliver_horn_develop
add go.sum and update server/Dockerfile
2021-09-07 20:53:30 +08:00
SliverHorn 2a4f2cf396 fix: docker 使用go generate有问题 2021-09-07 20:49:41 +08:00
SliverHorn b2005ae82a add go.sum 2021-09-07 20:05:48 +08:00
奇淼(piexlmax fbf67e1a34 Merge pull request #681 from flipped-aurora/gva-vue3
修复本地模式下的文件下载问题
2021-09-07 16:50:55 +08:00
piexlmax 63702633a9 修复本地模式下的文件下载问题 2021-09-07 16:50:08 +08:00
piexlmax 5df0fa3853 增加getTableData的请求发起前后钩子 2021-09-07 15:11:36 +08:00
奇淼(piexlmax 2997bccd6c Merge pull request #679 from flipped-aurora/gva-vue3
修复user表切换页面和size后角色消失的bug
2021-09-07 14:58:18 +08:00
qimiao ff2868883d Merge remote-tracking branch 'origin/gva-vue3' into gva-vue3 2021-09-07 14:57:01 +08:00
qimiao 37ea0f5fb6 Merge branch 'master' of github.com:flipped-aurora/gin-vue-admin into gva-vue3 2021-09-07 14:56:35 +08:00
奇淼(piexlmax fd730e32ed Merge pull request #678 from songzhibin97/gva_gormv2_dev
fix:修复可能会绕过删除的漏洞
2021-09-07 14:56:11 +08:00
piexlmax 0c9f05147e 修复user表切换页面和size后角色消失的bug 2021-09-07 14:55:45 +08:00
奇淼(piexlmax 373ac3ec24 修改版本号 进入beta测试 目前内部以跑线上 2021-09-07 14:18:36 +08:00
songzhibin97 e5cf5695ff fix:修复可能会绕过删除的漏洞 2021-09-06 15:00:15 +08:00
奇淼(piexlmax f0f332481a Merge pull request #675 from flipped-aurora/gva-vue3
修复字典逻辑bug
2021-09-05 14:17:29 +08:00
奇淼(piexlmax ed5cb4776c Merge pull request #674 from SliverHorn/sliver_horn_develop
update: service/system/sys_dictionary.go UpdateSysDictionary 方法 代码优化
2021-09-05 14:15:01 +08:00
SliverHorn 6d83b62153 update: LoadAll函数优化 2021-09-05 12:56:59 +08:00
SliverHorn 0971012dca Merge remote-tracking branch 'gva/gva-vue3' into sliver_horn_develop 2021-09-05 12:43:51 +08:00
SliverHorn 1afc5191c4 update: service/system/sys_dictionary.go UpdateSysDictionary 方法 代码优化 2021-09-04 22:59:13 +08:00
奇淼(piexlmax 947433c57c Update README.md 2021-09-04 19:47:35 +08:00
奇淼(piexlmax 42f69f0a5e Merge pull request #673 from flipped-aurora/gva-vue3
前端打包工具更换为vite
2021-09-04 19:39:50 +08:00
奇淼(piexlmax a0f3b79479 Merge pull request #672 from flipped-aurora/gva-vue3-vite
Gva vue3 vite
2021-09-04 19:39:13 +08:00
奇淼(piexlmax 0b19de6d94 Merge pull request #671 from SliverHorn/sliver_horn_develop
update: model/system/sys_user.go comment 错误
2021-09-04 19:38:46 +08:00
蒋吉兆 024e5fa210 自动开启web 修复了user创建用户后信息未清空的bug 2021-09-04 17:12:07 +08:00
蒋吉兆 d0d13aa287 修复自定义指令修改为vue3模式 2021-09-04 16:27:46 +08:00
蒋吉兆 e606cc9323 删除webpack携带内容 2021-09-04 16:22:16 +08:00
蒋吉兆 fa70742a35 适配vite基本完成 2021-09-04 16:21:21 +08:00
蒋吉兆 ebca96d95c 修改vite需要替换的原始配置 2021-09-04 16:04:07 +08:00
SliverHorn 815ebd038e update: model/system/sys_user.go comment 错误 2021-09-04 14:59:20 +08:00
piexlmax a785f12fb3 切换为vite模式 2021-09-03 19:20:08 +08:00
奇淼(piexlmax 2824a946f8 Merge pull request #669 from flipped-aurora/gva-vue3
修改最低版本约束
2021-09-03 11:28:12 +08:00
奇淼(piexlmax d82ac9fc1a 修改最低版本约束 2021-09-03 11:27:17 +08:00
奇淼(piexlmax f76793f50b Merge pull request #668 from flipped-aurora/gva-vue3-2.4.5
修复初始化时跳出的两个bug提示(不影响使用)
2021-09-03 10:29:29 +08:00
奇淼(piexlmax bfd4714df9 Merge pull request #667 from flipped-aurora/gva-vue3-2.4.5
修复初始化时跳出的两个bug提示(不影响使用)
2021-09-03 10:28:59 +08:00
qimiao c94c6c49a8 修复初始化时跳出的两个bug提示(不影响使用) 2021-09-03 10:26:29 +08:00
奇淼(piexlmax 70eb2175d1 Merge pull request #666 from flipped-aurora/gva-vue3-2.4.5
Gva vue3 2.4.5
2021-09-03 09:52:22 +08:00
奇淼(piexlmax e200dd908d Merge pull request #665 from flipped-aurora/gva-vue3-2.4.5
清除cdn打包 调整切换用户角色时出现的bug
2021-09-02 23:48:45 +08:00
蒋吉兆 ff9ab4b0b6 清除cdn打包 调整切换用户角色时出现的bug 2021-09-02 23:47:47 +08:00
奇淼(piexlmax 03c9798e71 Merge pull request #664 from flipped-aurora/gva-vue3-2.4.5
增加背景图 准备发布demo
2021-09-02 22:23:41 +08:00
奇淼(piexlmax 91c015943e Merge pull request #663 from flipped-aurora/gva-vue3-2.4.5
增加背景图 准备发布demo
2021-09-02 22:23:19 +08:00
蒋吉兆 594b3923c3 增加背景图 准备发布demo 2021-09-02 22:20:02 +08:00
奇淼(piexlmax c352735dc8 Merge pull request #662 from flipped-aurora/gva-vue3-2.4.5
Gva vue3 2.4.5
2021-09-02 19:06:37 +08:00
奇淼(piexlmax 0598b5cead Merge pull request #661 from flipped-aurora/gva-vue3-2.4.5
Gva vue3 2.4.5
2021-09-02 19:06:06 +08:00
piexlmax 611026d8ea 清除旧版dashbord 调整新版头图位置 2021-09-02 19:03:45 +08:00
qimiao 11db344a23 增加静态代理注释 2021-09-02 17:54:36 +08:00
qimiao 3a38ad62a6 Merge branch 'develop' of github.com:flipped-aurora/gin-vue-admin into gva-vue3-2.4.5 2021-09-02 17:53:28 +08:00
奇淼(piexlmax cc0dcaa27b Merge pull request #659 from jtyoui/gva-vue3-2.4.5
增加代理静态网页
2021-09-02 17:51:52 +08:00
piexlmax 15ffc705f4 首页优化 2021-09-02 15:11:44 +08:00
张伟 4c6d3008bc 代理前端网页 2021-09-02 14:38:48 +08:00
奇淼(piexlmax e2e8acec3b Merge pull request #657 from bypanghu/gva-vue3-2.4.5
Gva vue3 2.4.5
2021-09-02 11:53:56 +08:00
ipanghu 91be5e57d0 Merge pull request #656 from bypanghu/master
Merge pull request #651 from flipped-aurora/gva-vue3-2.4.5
2021-09-02 11:51:03 +08:00
范庆磊 836a3d0957 美化dashbord 2021-09-02 11:49:22 +08:00
奇淼(piexlmax bcf0d4352a Merge pull request #655 from flipped-aurora/gva-vue3-2.4.5
Gva vue3 2.4.5
2021-09-02 11:44:30 +08:00
奇淼(piexlmax 4998831c1f Merge pull request #654 from flipped-aurora/gva-vue3-2.4.5
Gva vue3 2.4.5
2021-09-01 23:13:21 +08:00
蒋吉兆 076b70d031 清除packagebug 2021-09-01 23:09:31 +08:00
蒋吉兆 f5171528d6 提升性能 修复前端tab页面bug 增加ws插件 2021-09-01 23:06:25 +08:00
奇淼(piexlmax e01bf225c4 Merge pull request #653 from songzhibin97/gva_gormv2_dev
feat:新增定时任务 删除jwt
2021-09-01 21:58:21 +08:00
奇淼(piexlmax 8ec2e5f6b6 Merge branch 'gva-vue3-2.4.5' into gva_gormv2_dev 2021-09-01 21:57:52 +08:00
songzhibin97 f807dc228b Merge branch 'develop' into gva_gormv2_dev 2021-09-01 18:42:14 +08:00
songzhibin97 a98d6fb31a fix:go mod 2021-09-01 18:42:03 +08:00
songzhibin97 14fd932829 feat:black jwt 2021-09-01 18:40:06 +08:00
范庆磊 55ba5d2fef 修改dashbord 样式 2021-09-01 18:00:16 +08:00
songzhibin97 4f98686595 Merge branch 'gva_gormv2_dev' of https://github.com/songzhibin97/gin-vue-admin into gva_gormv2_dev 2021-09-01 17:56:56 +08:00
songzhibin97 b36c58bd03 feat:新增定时任务 删除jwt 2021-09-01 17:56:51 +08:00
piexlmax 8080c38936 增加$CloseThisPage全局方法 2021-09-01 15:20:46 +08:00
奇淼(piexlmax 88a2fd63a8 Merge pull request #651 from flipped-aurora/gva-vue3-2.4.5
增加关闭当前标签方法
2021-09-01 14:30:12 +08:00
piexlmax f5677e6858 增加关闭当前页面方法 2021-09-01 14:29:25 +08:00
qimiao 9838725a3f Merge branches 'gva-vue3-2.4.5' and 'master' of github.com:flipped-aurora/gin-vue-admin into gva-vue3-2.4.5 2021-09-01 14:16:28 +08:00
ipanghu 2ef1205b06 Merge branch 'master' into master 2021-09-01 09:12:17 +08:00
qimiao 92e4ddee93 Merge remote-tracking branch 'origin/gva-vue3-2.4.5' into gva-vue3-2.4.5 2021-08-31 17:42:39 +08:00
krank b83e35adf5 清理无用包 2021-08-31 17:40:58 +08:00
krank 6725f6c73a 错误码报错细分 2021-08-31 14:33:51 +08:00
qimiao b4158075e3 清除无效gomod 2021-08-31 11:02:09 +08:00
奇淼(piexlmax e59e29bf31 Merge branch 'gva-plugins' into gva_gormv2_dev 2021-08-30 23:59:40 +08:00
奇淼(piexlmax bb27385a3a Merge pull request #649 from flipped-aurora/gva-vue3-2.4.5
修复新增用户的bug
2021-08-30 23:51:59 +08:00
蒋吉兆 070e70d801 修复新增用户的bug 2021-08-30 23:49:54 +08:00
songzhibin97 4a2390f147 feat:ws插件 2021-08-29 18:23:52 +08:00
奇淼(piexlmax 6845acd8fa Merge pull request #646 from flipped-aurora/gva-vue3-2.4.5
VUE3版本 提交master测试
2021-08-28 15:25:44 +08:00
蒋吉兆 090a1a0727 前端bug修复 2021-08-28 15:13:39 +08:00
蒋吉兆 3b9e48d305 更新插件仓库 2021-08-28 14:28:47 +08:00
蒋吉兆 26a7b77bf8 Merge remote-tracking branch 'origin/gva-vue3-2.4.5' into gva-vue3-2.4.5 2021-08-28 14:07:01 +08:00
klausY 9a32684dc9 增加首页视频 2021-08-28 13:31:32 +08:00
蒋吉兆 f9fa512ff3 Merge branch 'gva-plugins' of github.com:flipped-aurora/gin-vue-admin into gva-vue3-2.4.5
 Conflicts:
	server/initialize/plugin.go
2021-08-28 13:10:27 +08:00
蒋吉兆 732143b9bb 更新插件仓库 2021-08-28 13:09:17 +08:00
蒋吉兆 5964d70023 规范化插件代码 2021-08-28 12:38:26 +08:00
蒋吉兆 f5e0268d0f 插件优化 2021-08-28 00:00:08 +08:00
奇淼(piexlmax d99efa76b3 Merge pull request #645 from nightsimon/feat/notify-dingding
Feat/notify dingding
2021-08-27 23:21:10 +08:00
奇淼(piexlmax bf0110c94b Merge branch 'gva-plugins' into feat/notify-dingding 2021-08-27 23:20:59 +08:00
Espoir 32363e78f6 fix(): update 2021-08-26 23:32:24 +08:00
Espoir df7163a78e docs(): update readme 2021-08-26 23:12:11 +08:00
Espoir 73b8b9d098 docs(): update readme 2021-08-26 23:05:18 +08:00
Espoir c430ec317a docs(): update readme 2021-08-26 22:58:29 +08:00
Espoir fe57d6adfd fix(): 钉钉通知取消全局配置 2021-08-26 22:44:36 +08:00
Espoir fb1a243db7 fix(): fix config 2021-08-26 21:31:00 +08:00
Espoir 5fe92dcc89 feat(): notify dingding 2021-08-26 21:10:13 +08:00
piexlmax a70b2b67ac 自动化代码提示变更 且符合vue3规则 2021-08-26 15:18:31 +08:00
piexlmax 59ffff1a6a 修改vue3 template 2021-08-26 14:32:50 +08:00
piexlmax 265e42f513 vue3版本初版上线 自测已可用 2021-08-26 12:45:41 +08:00
蒋吉兆 adc7f567f9 插件模式代码优化 2021-08-24 22:15:45 +08:00
奇淼(piexlmax 20876243ed Merge pull request #639 from flipped-aurora/gva_gormv2_dev
Gva gormv2 dev
2021-08-24 20:02:01 +08:00
奇淼(piexlmax c7f4429b67 Merge pull request #638 from flipped-aurora/gva_gormv2_dev
Gva gormv2 dev
2021-08-24 20:00:08 +08:00
qimiao 920b89cf8f Merge branch 'gva_gormv2_dev' of github.com:flipped-aurora/gin-vue-admin into gva_gormv2_dev 2021-08-24 19:59:04 +08:00
qimiao f5717d0361 在线仓模式bug修复 2021-08-24 19:49:27 +08:00
奇淼(piexlmax deddd00d67 Merge pull request #637 from flipped-aurora/gva_gormv2_dev
Gva gormv2 dev
2021-08-24 19:46:53 +08:00
奇淼(piexlmax 3a98ebdbd4 Merge pull request #636 from supine-win/patch-3
Update user.vue
2021-08-24 19:45:31 +08:00
piexlmax a69eeaea15 提交2.4.5插件模式 a测版本 2021-08-24 19:41:12 +08:00
supine-win 5c034fd6b0 Update user.vue
新增用户本地存储路径不正确
2021-08-24 14:12:16 +08:00
蒋吉兆 7e4bfc4034 修复 v8下redis 验证码模式 存在的未传入context的bug
(cherry picked from commit 2342a47c62)
2021-08-24 10:38:54 +08:00
qimiao 14f869bf23 Merge remote-tracking branch 'origin/gva_gormv2_dev' into gva_gormv2_dev 2021-08-24 10:23:38 +08:00
qimiao 548961870f Merge branch 'master' of github.com:flipped-aurora/gin-vue-admin into gva_gormv2_dev 2021-08-24 10:22:55 +08:00
蒋吉兆 65838a4a52 增加在线仓库模式插件示例 2021-08-23 23:35:16 +08:00
蒋吉兆 6afe848210 修改包名称定为至server为插件化提供便利 2021-08-23 23:13:24 +08:00
pixel 8294264f87 操作日志不再记录自己的操作 2021-08-23 18:34:22 +08:00
奇淼(piexlmax ae2fcbb19c Merge pull request #635 from fengchao/develop
[service.go.tpl] Fix typo in time.Time FieldType.
2021-08-23 14:51:30 +08:00
fengchao 3147c7fd74 [service.go.tpl] Fix typo in time.Time FieldType.
There is a typo in service.go.tpl time.Time FieldType code.
2021-08-23 14:15:03 +08:00
蒋吉兆 6638db45a5 email提为插件模式 2021-08-22 12:21:32 +08:00
奇淼(piexlmax fac6671841 Merge pull request #633 from SliverHorn/sliver_horn_develop
update: README.md and README-en.md
2021-08-22 10:26:07 +08:00
奇淼(piexlmax da89d4611a Merge pull request #632 from songzhibin97/gva_gormv2_dev
feat:插件注册&差分so
2021-08-22 10:22:58 +08:00
SliverHorn 86a84fe1c2 update: README.md and README-en.md 2021-08-22 00:11:02 +08:00
songzhibin97 faafe15629 fix:升级go mod 2021-08-21 18:35:30 +08:00
songzhibin97 d75b2ce7d6 fix:go version 2021-08-21 18:23:50 +08:00
songzhibin97 edb8f51fd0 fix:mod 2021-08-21 18:17:07 +08:00
songzhibin97 344dd74874 Revert "Revert "Merge remote-tracking branch 'upstream/gva_gormv2_dev' into gva_gormv2_dev""
This reverts commit 6f751209a5.
2021-08-21 18:07:11 +08:00
songzhibin97 71605850c2 Revert "Merge remote-tracking branch 'upstream/gva_gormv2_dev' into gva_gormv2_dev"
This reverts commit bb33c312b1, reversing
changes made to b9b4bc6b8b.
2021-08-21 17:55:06 +08:00
songzhibin97 ce67438ef0 Merge remote-tracking branch 'upstream/gva_gormv2_dev' into gva_gormv2_dev 2021-08-21 17:38:59 +08:00
songzhibin97 ac18cd6902 fix go mod version 2021-08-21 11:05:25 +08:00
songzhibin97 cbf73f24ae feat:fix go mod 2021-08-21 11:01:34 +08:00
songzhibin97 181b3a985e feat:插件注册&差分so 2021-08-21 10:48:44 +08:00
奇淼(piexlmax 60d8abf816 Merge pull request #631 from songzhibin97/gva_gormv2_dev
feat:插件模式尝鲜
2021-08-20 20:02:48 +08:00
qimiao 32c0fd50dd 提升基础包等级限制 通过action 2021-08-20 19:54:51 +08:00
songzhibin97 513003a8bb fix:main 2021-08-20 19:45:01 +08:00
songzhibin97 c5c8032975 feat:插件模式尝鲜 2021-08-20 19:32:25 +08:00
奇淼(piexlmax f00d1667b8 Merge pull request #629 from flipped-aurora/gva_gormv2_dev
解决360excel包无法下载的问题
2021-08-20 12:18:08 +08:00
qimiao e96f39c652 解决360excel包无法下载的问题 2021-08-19 16:50:28 +08:00
奇淼(piexlmax deccff5d46 Merge pull request #626 from flipped-aurora/gva_gormv2_dev
Gva gormv2 dev
2021-08-17 10:34:34 +08:00
奇淼(piexlmax b60b3ce4ee Merge pull request #625 from flipped-aurora/gva_gormv2_dev
fmt project
2021-08-17 10:33:47 +08:00
qimiao 2e2ad1350d fmt project 2021-08-17 10:23:30 +08:00
奇淼(piexlmax 3fd24d1931 Merge pull request #624 from flipped-aurora/gva_gormv2_dev
config提交错误
2021-08-16 22:51:24 +08:00
蒋吉兆 e747ac52c2 config提交错误 2021-08-16 22:50:59 +08:00
奇淼(piexlmax 6d034776eb Merge pull request #623 from flipped-aurora/gva_gormv2_dev
补充遗漏的json type
2021-08-16 22:47:59 +08:00
蒋吉兆 a85ae1a46a 补充遗漏的json type 2021-08-16 22:44:35 +08:00
奇淼(piexlmax b07de7632f Merge pull request #622 from flipped-aurora/gva_gormv2_dev
Gva gormv2 dev
2021-08-16 19:40:06 +08:00
qimiao 6ee60e3f95 Merge branch 'develop' of github.com:flipped-aurora/gin-vue-admin into gva_gormv2_dev 2021-08-16 19:38:47 +08:00
qimiao 122dcf0324 /menu/GetMenuAuthority -> /menu/getMenuAuthority 2021-08-16 19:37:22 +08:00
奇淼(piexlmax ba0313c54a Merge pull request #620 from fengchao/develop
Develop Fix eslint errors and warnings in auto generated code
2021-08-16 11:21:07 +08:00
fengchao 2a69372caa [web/.eslintrc.js] Change comma-dangle setting to only-multiline.
This change will fix comma-dangle jslint error in auto generated code.
2021-08-13 17:56:57 +08:00
fengchao db25af7ae9 Fix jslint error/warning in auto generated code.
Below errors are fixed in this commit:
* No new line at end of file
* Extra empty line
* Extra white space
* Wrong tab indent
* Use "" to quote string
2021-08-13 17:54:21 +08:00
奇淼(piexlmax 51779ecf80 Update README.md 2021-08-11 12:35:57 +08:00
奇淼(piexlmax 8118b901d7 Update README.md 2021-08-11 12:35:31 +08:00
奇淼(piexlmax 12772763ef Merge pull request #492 from zooqkl/master
新增支持入参正则校验。
2021-08-10 10:43:30 +08:00
奇淼(piexlmax 4aaa3079de Merge branch 'develop' into master 2021-08-10 10:43:19 +08:00
奇淼(piexlmax f0eca216ad Merge pull request #616 from flipped-aurora/gva_gormv2_dev
Gva gormv2 dev
2021-08-07 10:51:39 +08:00
奇淼(piexlmax 9698545b27 Merge pull request #615 from flipped-aurora/gva_gormv2_dev
Gva gormv2 dev
2021-08-07 10:50:34 +08:00
奇淼(piexlmax 70b6a410d4 Merge pull request #611 from rockwang465/master
Update changePassword swagger method
2021-08-07 10:46:58 +08:00
奇淼(piexlmax 9fa293c596 Merge branch 'master' into master 2021-08-07 10:46:13 +08:00
奇淼(piexlmax 197cf21210 Merge pull request #614 from flipped-aurora/gva_gormv2_dev
自动化代码 get类型接收参数修改为query
2021-08-07 10:36:30 +08:00
蒋吉兆 134534dc09 自动化代码 get类型接收参数修改为query 2021-08-07 10:35:27 +08:00
蒋吉兆 3d2c3b508c Merge branch 'master' of https://github.com/flipped-aurora/gin-vue-admin 2021-08-07 10:20:54 +08:00
蒋吉兆 8bcd9e7f65 修复 v8下redis 验证码模式 存在的未传入context的bug 2021-08-07 10:16:11 +08:00
奇淼(piexlmax 3d822c525e Merge pull request #613 from flipped-aurora/gva_gormv2_dev
Gva gormv2 dev
2021-08-05 17:50:26 +08:00
piexlmax 1d11b9a0c0 Merge branch 'gva_gormv2_dev' of https://github.com/flipped-aurora/gin-vue-admin into gva_gormv2_dev 2021-08-05 17:46:28 +08:00
奇淼(piexlmax 3e17357185 Merge pull request #610 from songzhibin97/gva_gormv2_dev
feat:回滚文件迁移到垃圾桶,并非直接删除
2021-08-05 17:45:09 +08:00
piexlmax e9786b53c9 redis-->redis/v8 2021-08-05 17:44:04 +08:00
范庆磊 2c5b9909a2 新增全局关闭当前页面函数 2021-08-05 17:04:31 +08:00
ipanghu b655ea27f9 Merge pull request #5 from flipped-aurora/master
拉取官方最新代码
2021-08-05 16:10:59 +08:00
wangyecheng@yaoyanshe.com 3ba262ac53 Update swagger for changePassword 2021-08-04 17:50:51 +08:00
wangyecheng@yaoyanshe.com 880e1d5c9f Update changePassword swagger method 2021-08-04 17:40:01 +08:00
songzhibin97 2175d2c53d feat:回滚文件迁移到垃圾桶,并非直接删除 2021-08-04 14:25:23 +08:00
奇淼(piexlmax 5d7bbcc034 正式发布V2.4.4版本
正式发布V2.4.4版本
2021-07-31 16:00:37 +08:00
奇淼(piexlmax 7085c6c7db 正式发布V2.4.4版本
正式发布V2.4.4版本
2021-07-31 16:00:08 +08:00
piexlmax 6fe19ab6ae 修改版本号为V2.4.4正式 2021-07-31 15:53:39 +08:00
奇淼(piexlmax 462bc8b5fb Merge pull request #597 from flipped-aurora/gva_gormv2_dev
修复分页器左侧border消失的bug
2021-07-26 21:45:29 +08:00
pixel 051b064f21 修复分页器active右侧左边框消失的bug 2021-07-26 20:05:26 +08:00
songzhibin97 0e8b66b183 fix:配置文件修复 2021-07-22 18:24:01 +08:00
songzhibin97 3c64b12e89 fix:配置文件修复 2021-07-22 18:23:39 +08:00
songzhibin97 444c47f678 fix:配置文件修改 2021-07-22 18:23:03 +08:00
奇淼(piexlmax b5a175b097 Merge pull request #595 from flipped-aurora/master
增加多角色功能和角色切换功能  调整前端获取用户信息方式
2021-07-22 16:55:13 +08:00
奇淼(piexlmax 7477c97b39 Merge pull request #594 from flipped-aurora/gva_gormv2_dev
增加多角色功能和角色切换功能  调整前端获取用户信息方式
2021-07-22 16:54:42 +08:00
pixel aadc3acdec Merge branch 'gva_gormv2_dev' of https://github.com/flipped-aurora/gin-vue-admin into gva_gormv2_dev 2021-07-22 16:53:13 +08:00
pixel 8f9ecebf41 增加多角色功能和角色切换功能
调整前端获取用户信息方式
2021-07-22 16:46:09 +08:00
奇淼(piexlmax da40de9ad2 Merge pull request #592 from flipped-aurora/gva_gormv2_dev
Gva gormv2 dev
2021-07-20 23:43:16 +08:00
奇淼(piexlmax d02b71fe4f Merge pull request #591 from flipped-aurora/gva_gormv2_dev
swag调整适应当前模块化版本
2021-07-20 23:40:36 +08:00
蒋吉兆 4f306ffaab Merge branches 'gva_gormv2_dev' and 'master' of https://github.com/flipped-aurora/gin-vue-admin into gva_gormv2_dev 2021-07-20 23:35:33 +08:00
蒋吉兆 69e9b153b8 调整swagger 2021-07-20 23:29:34 +08:00
奇淼(piexlmax 91d2c2f71e Update server.go 2021-07-20 19:42:43 +08:00
奇淼(piexlmax 957a138df8 Update gin-vue-admin.js 2021-07-20 19:42:15 +08:00
奇淼(piexlmax 60748b4843 Merge pull request #589 from flipped-aurora/gva_gormv2_dev
项目目录支持模块化
2021-07-20 19:38:35 +08:00
songzhibin97 152cb4ec01 Merge branch 'gva_gormv2_dev' into develop 2021-07-20 18:19:05 +08:00
songzhibin97 b758edb28e Merge branch 'master' into develop 2021-07-20 18:15:05 +08:00
songzhibin97 2e2d916b6f Merge branch 'master' into gva_gormv2_dev 2021-07-20 18:08:29 +08:00
奇淼(piexlmax 05983fcfb1 Merge pull request #583 from RickieL/master
新增验证码使用redis存储方式
2021-07-20 14:35:12 +08:00
蒋吉兆 a332527ad3 自动化代码模板bug调整 2021-07-18 19:57:37 +08:00
奇淼(piexlmax f383f025f2 Merge pull request #588 from songzhibin97/gva_gormv2_dev
feat:增加自动注入代码段
2021-07-18 19:11:05 +08:00
songzhibin97 cf4ecd5ff9 feat:优化自动代码段 2021-07-18 14:53:11 +08:00
songzhibin97 b83ad51dd7 fix:增加自动化代码插入点&修复路径配置 2021-07-18 14:16:26 +08:00
songzhibin97 ba05ef0e57 fix:修正mac情况下的文件冲突 2021-07-18 13:13:48 +08:00
pixel 7b6b610a74 代码移动默认配置 2021-07-17 17:07:09 +08:00
pixel 12ac8b6337 模板调整完成 TODO:自动代码移动 2021-07-17 14:45:10 +08:00
pixel c7de76b849 基础架构变更 增加模块化 2021-07-17 14:18:52 +08:00
pixel b5c1babec9 模块化变更 2021-07-16 20:08:11 +08:00
pixel 73a8052c08 模板优化 搜索功能优化 2021-07-15 19:53:30 +08:00
奇淼(piexlmax e69d79cdb8 增加自动化代码回滚功能
增加自动化代码回滚功能
2021-07-14 19:56:51 +08:00
pixel cb8f8ddb16 增加自动化代码回滚功能 2021-07-14 19:54:30 +08:00
pixel d9dde27aa0 增加自动化代码回滚功能 2021-07-14 19:53:23 +08:00
奇淼(piexlmax 2b1ea2947d Merge pull request #585 from flipped-aurora/gva_gormv2_dev
新增自动化代码回滚功能
2021-07-14 19:30:00 +08:00
pixel 065b0d711d 增加自动化代码回滚功能 2021-07-14 19:24:46 +08:00
奇淼(piexlmax f4275d9243 Merge pull request #584 from songzhibin97/gva_gormv2_dev
feat:增加删除历史记录api
2021-07-14 19:10:21 +08:00
songzhibin97 739e8bb06c feat:增加删除历史记录api 2021-07-14 18:25:18 +08:00
pixel 3434b2ba5e 增加自动化代码回滚功能 2021-07-14 14:37:04 +08:00
奇淼(piexlmax 2de1d42a30 Merge pull request #582 from songzhibin97/gva_gormv2_dev
feat:完善前后端回滚交互信息交换
2021-07-14 12:08:15 +08:00
liaoyongfu 83465f4b10 add captcha redis 2021-07-14 10:57:53 +08:00
liaoyongfu e82cfa6d26 add captcha redis 2021-07-14 10:52:36 +08:00
songzhibin97 607022bc08 fix:补充过滤 2021-07-13 20:07:21 +08:00
songzhibin97 b67e17d8ff feat:完善前后端回滚交互信息交换 2021-07-13 19:59:44 +08:00
pixel e0f314d862 增加自动化代码管理页面 2021-07-13 19:45:21 +08:00
ipanghu ced5b914d2 Merge pull request #4 from flipped-aurora/master
拉取最新仓库
2021-07-13 19:18:40 +08:00
pixel 982c4f4d67 Merge branch 'gva_gormv2_dev' of https://github.com/flipped-aurora/gin-vue-admin into gva_gormv2_dev 2021-07-13 19:04:57 +08:00
奇淼(piexlmax df3c6be36c Merge pull request #581 from songzhibin97/gva_gormv2_dev
feat:新存储了meta信息,完善了记录逻辑
2021-07-13 17:38:17 +08:00
pixel 1a665f3c14 Merge remote-tracking branch 'origin/gva_gormv2_dev' into gva_gormv2_dev 2021-07-13 17:30:42 +08:00
songzhibin97 7fcdaa523c feat:新存储了meta信息,完善了记录逻辑 2021-07-13 17:30:30 +08:00
奇淼(piexlmax beedef280c Merge pull request #579 from songzhibin97/gva_gormv2_dev
fix:修改redis包,使用推荐的v8
2021-07-13 17:22:30 +08:00
奇淼(piexlmax b841919e01 Merge pull request #580 from flipped-aurora/SliverHorn-patch-2
fix: web/Dockerfile cnpm install error
2021-07-13 17:20:55 +08:00
pixel ba77a808df 排除当dns为空时候的bug 2021-07-13 16:25:47 +08:00
SliverHorn e160920e53 fix: web/Dockerfile cnpm install error
update file
- web/Dockerfile

fixed:
- cnpm install error
2021-07-12 20:18:45 +08:00
pixel 43e4c76f83 Merge remote-tracking branch 'origin/gva_gormv2_dev' into gva_gormv2_dev 2021-07-12 19:24:27 +08:00
songzhibin97 07ec0841c9 fix:修改redis包,使用推荐的v8 2021-07-12 19:23:56 +08:00
奇淼(piexlmax 2242f57627 Merge pull request #577 from songzhibin97/gva_gormv2_dev
feat:自动迁移代码回滚&对应历史记录查询
2021-07-12 19:21:26 +08:00
songzhibin97 ff506730de feat:完善回滚逻辑,如果勾选api也会创建对应信息 2021-07-12 14:53:25 +08:00
songzhibin97 e01a0aed49 fix:swagger 2021-07-12 11:37:33 +08:00
pixel 194c671ec0 Merge remote-tracking branch 'origin/gva_gormv2_dev' into gva_gormv2_dev 2021-07-12 09:49:34 +08:00
songzhibin97 14371c0e45 feat:增加查询api 2021-07-10 19:01:56 +08:00
songzhibin97 686163808d feat:回滚删除对应api 2021-07-10 18:47:23 +08:00
songzhibin97 76d38c1108 feat:回滚自动化生产代码 2021-07-10 17:39:24 +08:00
奇淼(piexlmax bbf6549490 Merge pull request #576 from flipped-aurora/gva_gormv2_dev
修复了closeTab不生效的bug
2021-07-10 17:16:48 +08:00
蒋吉兆 e2d13aa238 修复了closeTab不生效的bug 2021-07-10 16:20:57 +08:00
奇淼(piexlmax 1f4b265dbc Merge pull request #575 from SliverHorn/master
fix: config.yaml, config.docker.yaml
2021-07-10 14:36:19 +08:00
SliverHorn d520f84ba1 fix: config.yaml, config.docker.yaml 2021-07-10 14:17:40 +08:00
奇淼(piexlmax 8ce6c76a7b Merge pull request #574 from flipped-aurora/gva_gormv2_dev
fix eslint
2021-07-10 12:37:29 +08:00
蒋吉兆 7431457ebe fix eslint 2021-07-10 12:36:33 +08:00
奇淼(piexlmax c13acf641d Merge pull request #573 from flipped-aurora/gva_gormv2_dev
自动化代码可选项优化
2021-07-10 12:30:11 +08:00
蒋吉兆 073994bca7 自动化代码可选项优化 2021-07-10 12:28:52 +08:00
奇淼(piexlmax 34494b00ff v2.4.3发版
v2.4.3发版
2021-07-10 12:13:44 +08:00
蒋吉兆 3d6c0d2a14 调整项目编号 2021-07-10 12:11:48 +08:00
蒋吉兆 3271542a9b 修改上传图片相关bug 2021-07-10 12:08:28 +08:00
奇淼(piexlmax 44e7b643f9 Merge pull request #571 from flipped-aurora/master
分支版本合并
2021-07-10 11:26:02 +08:00
ipanghu b87d9613f5 Merge pull request #3 from flipped-aurora/master
change web/init on method , update web README
2021-07-10 11:19:04 +08:00
bypanghu@163.com 0683c99f00 change web/init on method , update web README 2021-07-10 11:11:13 +08:00
奇淼(piexlmax 0298d1df76 Merge pull request #548 from neo-6/NeoSunDevelop
[修复阿里云OSS图片上传路径不一致错误]
2021-07-10 11:06:10 +08:00
奇淼(piexlmax 0c4ca3ecb0 Merge pull request #569 from SliverHorn/master
update: 自定义gorm的logger优化
2021-07-10 11:04:22 +08:00
奇淼(piexlmax d5e5088778 Merge pull request #570 from SliverHorn/sliver_horn_gva_gormv2_dev_develop
update: server/README.md
2021-07-10 11:04:09 +08:00
ipanghu e7a0bb473a Merge pull request #2 from flipped-aurora/master
拉取最新master
2021-07-10 10:54:11 +08:00
SliverHorn d239aa1f1d update: server/README.md 2021-07-10 10:22:25 +08:00
SliverHorn a4623373a7 update: 自定义gorm的logger优化 2021-07-09 21:52:17 +08:00
pixel af595f9cf0 清理无用debugger 2021-07-09 18:49:06 +08:00
奇淼(piexlmax 2ac327acea Merge pull request #568 from flipped-aurora/gva_gormv2_dev
添加版权信息
2021-07-09 17:29:44 +08:00
pixel f112a056be 添加版权信息 2021-07-09 17:26:43 +08:00
奇淼(piexlmax c05cfada13 Merge pull request #567 from flipped-aurora/gva_gormv2_dev
Gva gormv2 dev
2021-07-09 16:13:55 +08:00
pixel 8f3291e6da 更新sync库版本 2021-07-09 16:01:10 +08:00
奇淼(piexlmax 488332c74d Merge pull request #566 from songzhibin97/gva_gormv2_dev
feat:增加singleFlight并发控制jwt颁发
2021-07-08 17:40:08 +08:00
songzhibin97 6b487a4afd feat:增加singleFlight并发控制jwt颁发 2021-07-07 19:32:05 +08:00
奇淼(piexlmax 6869c9350b Merge pull request #565 from JamieSlome/patch-1
Create SECURITY.md
2021-07-06 16:54:45 +08:00
Jamie Slome b7485f1335 Create SECURITY.md 2021-07-06 09:53:20 +01:00
奇淼(piexlmax 39badd53b1 Merge pull request #560 from iiiusky/fix/commentStyle
修改模板中的注释格式为官方推荐的格式
2021-07-05 10:37:03 +08:00
奇淼(piexlmax e8beb157b9 Merge pull request #563 from flipped-aurora/SliverHorn-patch-1
Update sys_api.go
2021-07-05 10:32:58 +08:00
SliverHorn 0ac3b20736 Update sys_api.go
修改文件
- server/model/sys_api.go
修复问题
- gorm tag 编写错误,使用分号进行分割,而不是写两个gorm tag
2021-07-04 16:01:20 +08:00
奇淼(piexlmax 377501efcf Merge pull request #561 from iiiusky/fix/autoCodeDesc
修改web页面代码生成部分描述信息
2021-07-03 11:37:28 +08:00
奇淼(piexlmax fd4072155b Merge pull request #562 from SliverHorn/master
update: README.md and README-en.md
2021-07-03 10:18:36 +08:00
SliverHorn e31ecc6852 update: README.md and README-en.md 2021-07-03 08:08:39 +08:00
SliverHorn d78185cb64 Update Dockerfile 2021-07-03 00:29:16 +08:00
SliverHorn 4260a2eab9 Update service.go.tpl
回参与入参,我觉得可以去掉,基本调用的时候都知道是什么类型,就没必要写了
2021-07-02 17:18:51 +08:00
sky c7781be21d fix: 修复字段生成代码中文件名称相关的描述信息 2021-07-02 17:03:49 +08:00
sky 73edd03aa4 fix: 修复字段生成代码中API相关的描述信息 2021-07-02 17:01:30 +08:00
sky 6f7a7b7d4c fix: 修改模板中的注释格式为官方推荐的格式.https://github.com/golang/go/wiki/CodeReviewComments#comment-sentences 2021-07-02 15:22:13 +08:00
奇淼(piexlmax 110fb33c24 Merge pull request #558 from flipped-aurora/gva_gormv2_dev
Gva gormv2 dev
2021-07-01 19:02:51 +08:00
pixel 57c6ba3624 修复了标签页右键点击事件被覆盖的bug
调整了左侧默认高度
2021-07-01 18:06:27 +08:00
奇淼(piexlmax fee7165079 Merge pull request #557 from bypanghu/master
add
2021-07-01 17:53:10 +08:00
奇淼(piexlmax 1cc5f53324 Merge pull request #555 from bbqi/master
fix: css中小疏漏rgba
2021-07-01 17:52:45 +08:00
Devil 17a95c45cc add 2021-07-01 17:42:01 +08:00
ipanghu 35a3b3e372 Merge pull request #1 from flipped-aurora/master
拉取代码
2021-07-01 17:17:17 +08:00
bbqi 362f1a5311 fix: css中小疏漏rgba 2021-06-30 14:47:31 +08:00
奇淼(piexlmax eb5298a6bd 修复特殊符号下初始化数据库时报错的bug
修复特殊符号下初始化数据库时报错的bug
2021-06-30 12:42:23 +08:00
pixel c9c8a4ff7a 修复特殊符号下初始化数据库时报错的bug 2021-06-30 12:37:48 +08:00
奇淼(piexlmax 07d7a518c6 Merge pull request #553 from flipped-aurora/gva_gormv2_dev
Gva gormv2 dev
2021-06-29 19:56:35 +08:00
pixel 4b7b07cd57 规范化px 2021-06-29 19:41:08 +08:00
pixel 4d383d53fe 清理编译warning 2021-06-29 19:24:01 +08:00
pixel c0dd212b41 统一样式调整 2021-06-29 19:16:28 +08:00
pixel 37993f3246 统一样式调整 2021-06-29 19:15:04 +08:00
pixel 13ea198fcd 改变主题色配置标签位置 2021-06-29 16:35:47 +08:00
pixel 7a68c5c6cf 暂时屏蔽运行时sass警告 2021-06-29 15:42:37 +08:00
pixel df75dae39d 主题色功能bug修复 2021-06-29 15:28:39 +08:00
pixel 4a39a2f81c 增加自定义皮肤功能 清理无用文件 2021-06-29 14:46:47 +08:00
奇淼(piexlmax e253ee0970 Merge pull request #552 from bypanghu/master
新增侧边栏修改主题
2021-06-29 10:22:07 +08:00
Devil 5599eeb9c9 init 2021-06-28 10:55:37 +08:00
Devil c90d04dbbd 前端新增修改侧边栏主题风格 2021-06-28 10:53:46 +08:00
奇淼(piexlmax 567256160e Merge pull request #551 from flipped-aurora/gva_gormv2_dev
Gva gormv2 dev
2021-06-28 09:54:04 +08:00
奇淼(piexlmax d0ad41c935 Merge pull request #550 from flipped-aurora/revert-546-gva_gormv2_dev
Revert "Gva gormv2 dev"
2021-06-27 16:30:27 +08:00
奇淼(piexlmax cc535b7a0d Revert "Gva gormv2 dev" 2021-06-27 16:30:17 +08:00
奇淼(piexlmax 40d75ce42a Merge pull request #549 from flipped-aurora/revert-544-master
Revert "新增网页侧边栏颜色配置,新增网页主题色配置"
2021-06-27 16:30:02 +08:00
奇淼(piexlmax 16cbb7a03e Revert "新增网页侧边栏颜色配置,新增网页主题色配置" 2021-06-27 16:29:24 +08:00
奇淼(piexlmax 440e13a07b Merge pull request #544 from bypanghu/master
新增网页侧边栏颜色配置,新增网页主题色配置
2021-06-27 15:00:36 +08:00
奇淼(piexlmax 6f8810ec60 Merge pull request #546 from songzhibin97/gva_gormv2_dev
Gva gormv2 dev
2021-06-27 14:59:41 +08:00
csnero fad9733802 [修复阿里云OSS图片上传路径不一致错误] 2021-06-26 20:54:12 +08:00
songzhibin97 8c9170d365 fix:uuid package 2021-06-26 13:56:50 +08:00
songzhibin97 dc79c106e2 feat:适配前端风格存储 2021-06-26 13:53:32 +08:00
Devil 84c430c819 修改侧边栏logo处的bug 2021-06-26 13:44:54 +08:00
ipanghu ca45b3ee01 Merge pull request #3 from flipped-aurora/master
拉取信息
2021-06-26 13:38:51 +08:00
Devil be640251c5 修改readme 2021-06-26 13:37:52 +08:00
Devil 0535f8b55f 修复vue.config.js 2021-06-26 13:34:18 +08:00
Devil 67dcec4c9a 修复logo随着主题色变化的bug 2021-06-26 13:32:42 +08:00
ipanghu 5ed1292503 Merge branch 'master' into master 2021-06-26 12:02:59 +08:00
Devil 9f5b59c4b5 前端新增可配置侧边栏风格,可以配置网页主题色 2021-06-25 17:24:02 +08:00
奇淼(piexlmax dfcf1609ed Merge pull request #542 from flipped-aurora/gva_gormv2_dev
Gva gormv2 dev
2021-06-25 15:29:08 +08:00
奇淼(piexlmax eb6175b2d5 Merge pull request #541 from flipped-aurora/gva_gormv2_dev
Gva gormv2 dev
2021-06-25 15:28:36 +08:00
pixel 74cff901c8 增加空menu的兼容 2021-06-25 12:15:12 +08:00
奇淼(piexlmax 04b3125894 Merge pull request #540 from flipped-aurora/develop
Develop
2021-06-24 17:40:14 +08:00
ipanghu 7e1348cb41 Merge pull request #2 from flipped-aurora/master
拉取请求
2021-06-24 15:59:35 +08:00
奇淼(piexlmax 1772c1ccfc Merge pull request #538 from songzhibin97/gva_gormv2_dev
fix:创建用户初始化权限,确保用户可用
2021-06-24 14:27:33 +08:00
songzhibin97 a2737af68f fix:添加id避免tree重复添加 2021-06-23 12:53:41 +08:00
奇淼(piexlmax ebf7a11ffb Merge pull request #539 from bstdn/develop
modified 统一代码风格
2021-06-23 12:37:05 +08:00
何秀钢 3af12113b2 modified 统一代码风格 2021-06-23 11:36:22 +08:00
pixel c044fcd2dd 文案调整 2021-06-23 10:46:54 +08:00
songzhibin97 a2551e86f4 fix:创建用户初始化权限,确保用户可用
修改了:
- server/api/v1/sys_authority.go
- server/model/request/sys_casbin.go
- server/model/request/sys_menu.go
2021-06-22 12:39:26 +08:00
奇淼(piexlmax ed926452f0 Merge pull request #531 from hxcode/develop
directory.go: fix os.MkdirAll return error
2021-06-21 19:11:35 +08:00
VUCA d824a6b7b0 Merge branch 'flipped-aurora:develop' into develop 2021-06-18 18:51:50 +08:00
奇淼(piexlmax 4cdc9ed6cd Merge pull request #535 from flipped-aurora/master
前端模板eslit修改
2021-06-17 19:57:26 +08:00
奇淼(piexlmax 93b373d37a Merge pull request #534 from flipped-aurora/gva_gormv2_dev
前端模板eslit修改
2021-06-17 19:56:29 +08:00
pixel deee053883 前端模板eslit修改 2021-06-17 19:52:31 +08:00
奇淼(piexlmax 38a5da1cd0 Merge pull request #533 from flipped-aurora/gva_gormv2_dev
Gva gormv2 dev
2021-06-17 17:11:51 +08:00
奇淼(piexlmax d4268e1a54 Merge pull request #532 from flipped-aurora/gva_gormv2_dev
Gva gormv2 dev
2021-06-17 17:09:39 +08:00
黄笑 ac0158605c directory.go: fix os.MkdirAll return error 2021-06-17 16:47:22 +08:00
pixel 4b159fe5f4 初始化流程整体优化,前端报错锁死的情况提供登出操作 2021-06-17 16:02:12 +08:00
pixel b99fe53c6b 初始化流程整体优化,前端报错锁死的情况提供登出操作 2021-06-17 15:54:32 +08:00
pixel da0d5d2413 更改初始化模式 2021-06-17 15:42:09 +08:00
pixel cb85f1c78a Merge branch 'gva_gormv2_dev' of https://github.com/flipped-aurora/gin-vue-admin into gva_gormv2_dev 2021-06-17 15:41:26 +08:00
奇淼(piexlmax 0371765357 Merge pull request #529 from flipped-aurora/develop
Develop
2021-06-17 15:33:22 +08:00
pixel 73ecd371df 初始化不再自动进行 2021-06-17 15:17:26 +08:00
奇淼(piexlmax 1907de840c Merge pull request #528 from hxcode/develop
aliyun_oss,qiniu,tencent_cos:  fix file open close
2021-06-17 15:15:48 +08:00
奇淼(piexlmax 2c29220645 Merge pull request #527 from songzhibin97/gva_gormv2_dev
perf:优化初始化流程
2021-06-17 15:14:08 +08:00
黄笑 04d7aa9ab4 aliyun_oss,qiniu,tencent_cos: fix file open close 2021-06-17 14:51:35 +08:00
pixel 2cffefcf1c 配置文件增加注释提示 2021-06-17 14:36:04 +08:00
pixel 74d6c237cd 自动生成文件名称修改为 前端为小驼峰 后端为下划线 2021-06-17 12:12:31 +08:00
songzhibin97 0cd3555904 perf:优化初始化流程
创建失败不更改config文件保持,前端保持在init界面
修改文件
- server/api/sys_initdb.go
- server/service/sys_initdb.go
2021-06-17 09:03:55 +08:00
奇淼(piexlmax 3eed60996e Merge pull request #525 from flipped-aurora/gva_gormv2_dev
Gva gormv2 dev
2021-06-16 17:00:07 +08:00
pixel f6865ba6ba 清理lock 2021-06-16 16:56:13 +08:00
pixel fc19b81104 前端环境变量文件规范化 2021-06-16 16:55:02 +08:00
奇淼(piexlmax 6b79d7c38d Merge pull request #521 from bypanghu/master
新增网站配置文件
2021-06-16 10:59:19 +08:00
奇淼(piexlmax 9364f2a24a Merge pull request #523 from hxcode/develop
exa_excel_parse.go: fix return err
2021-06-16 10:53:22 +08:00
黄笑 427294ec25 exa_excel_parse.go: fix return err 2021-06-15 15:05:04 +08:00
pixel 86bfa374bb 修复init初始化失败页面跳转到空白的错误
修复model模板string给予长度导致的初始化错误
2021-06-15 11:33:51 +08:00
bypanghu@163.com aac76dcd58 '添加gin-vue-admin的web配置文件,具体文件请看core/config文件' 2021-06-11 21:37:07 +08:00
ipanghu 5cc87c5b6c Merge pull request #1 from flipped-aurora/master
拉取master
2021-06-11 20:50:08 +08:00
奇淼(piexlmax c09533052d 修改node-sass为dart-sass
修改node-sass为dart-sass
2021-06-11 17:28:14 +08:00
奇淼(piexlmax e716a31880 Merge pull request #519 from flipped-aurora/gva_gormv2_dev
修改node-sass为dart-sass
2021-06-11 17:26:23 +08:00
pixel 7c3b0b9b8d Merge remote-tracking branch 'origin/gva_gormv2_dev' into gva_gormv2_dev
# Conflicts:
#	web/package-lock.json
2021-06-11 17:17:35 +08:00
奇淼(piexlmax 44c65a6812 login页面init页面美化
login页面init页面美化
2021-06-11 16:49:14 +08:00
奇淼(piexlmax bea9b5d04d login页面init页面美化
login页面init页面美化
2021-06-11 16:47:15 +08:00
奇淼(piexlmax 3de30b45ed 新版本的login 和 init页面
船新版本的login 和 init页面
2021-06-11 16:27:11 +08:00
Devil ca9579fa6d 全新init页面,适配手机页面,login页面新增logo 2021-06-11 16:22:31 +08:00
Devil 2c9b228eb5 全新init页面,提升用户体验 2021-06-11 16:15:10 +08:00
Devil a2b6bb37bf 新增新的login页面,适配手机端,老的login页面依旧存在 2021-06-11 15:04:56 +08:00
Devil 6943ccb7db 新增新的login页面,适配手机端,老的login页面依旧存在 2021-06-11 15:04:27 +08:00
奇淼(piexlmax 3b563252ff 合并更新至主干
合并更新至主干
2021-06-11 12:12:36 +08:00
奇淼(piexlmax f4e0aa8575 合并更新至主干
合并更新至主干
2021-06-11 12:10:39 +08:00
pixel 34808cae7a Merge branch 'gva_gormv2_dev' of https://github.com/flipped-aurora/gin-vue-admin into develop 2021-06-11 12:07:41 +08:00
pixel d9b7661946 格式化前端代码 2021-06-11 12:01:10 +08:00
奇淼(piexlmax f0369ecf18 整合gin-vue-admin前端框架引入组合,减少main.js代码
整合gin-vue-admin前端框架引入组合,减少main.js代码
2021-06-11 11:31:23 +08:00
奇淼(piexlmax 5a2fb90420 Merge pull request #512 from flipped-aurora/revert-508-master
Revert "增加sqlite数据库的初始化"
2021-06-11 11:14:37 +08:00
奇淼(piexlmax 6bf4a9943c Revert "增加sqlite数据库的初始化" 2021-06-11 11:14:17 +08:00
Devil b9e0a9e126 修复引入time_line的绝对路径错误 2021-06-11 11:04:49 +08:00
奇淼(piexlmax 8ec0eb5166 增加sqlite数据库的初始化
增加sqlite数据库的初始化
2021-06-11 10:56:38 +08:00
Devil f001b518f9 整合gin-vue-admin前端框架引入组合,减少main.js代码 2021-06-11 10:55:59 +08:00
奇淼(piexlmax 4c7c91a2d5 docker-compose 优化
docker-compose 优化
2021-06-11 10:52:20 +08:00
pixel ad785fb3e3 放弃node-sass 替换为 sass(dart-sass) 2021-06-11 10:41:20 +08:00
SliverHorn 8516dbbcaf update: docker-compose 优化 2021-06-10 22:05:14 +08:00
Arthur Liu 4902101cbe 增加sqlite数据库的初始化 2021-06-10 12:15:40 +08:00
奇淼(piexlmax 9b47c8f57c 依照eslint格式化
依照eslint格式化
2021-06-09 11:56:11 +08:00
pixel 1dbba19cac 依照eslint格式化 2021-06-08 12:22:46 +08:00
奇淼(piexlmax a9c9199bf4 规范化代码结构,提升系统使用便捷度。
规范化代码结构,提升系统使用便捷度。
2021-06-08 10:23:39 +08:00
奇淼(piexlmax a84433520d Merge pull request #504 from flipped-aurora/master
pr整理合并
2021-06-08 10:20:04 +08:00
奇淼(piexlmax 9aa34bff89 Merge pull request #503 from flipped-aurora/develop
pr合并
2021-06-08 10:15:14 +08:00
奇淼(piexlmax e4b177f5f7 Merge branch 'gva_gormv2_dev' into develop 2021-06-08 10:12:11 +08:00
奇淼(piexlmax a9946732a2 Merge pull request #497 from bstdn/master
modified 统一代码风格
2021-06-08 10:09:17 +08:00
奇淼(piexlmax 90f4c85034 Merge pull request #499 from bstdn/develop
added ESlint 语法检测
2021-06-08 10:08:35 +08:00
奇淼(piexlmax 72a6b2148f Merge pull request #501 from songzhibin97/gva_gormv2_dev
增加 go generate 懒人模式
2021-06-08 10:08:22 +08:00
奇淼(piexlmax ec393100d0 Merge pull request #500 from SliverHorn/master
fix: docker-compose windows 启动失败
2021-06-08 10:07:53 +08:00
奇淼(piexlmax f521e3fbc9 Merge pull request #502 from allinprogram/patch-1
Fix the inappropriate description
2021-06-08 10:07:41 +08:00
pixel 98a3e9abb2 增加预览代码全选和复制 2021-06-07 19:58:48 +08:00
allinprogram d83da1fa08 Fix the inappropriate description 2021-06-05 09:29:21 +08:00
songzhibin97 c082403868 增加 go generate 懒人模式 2021-06-03 14:44:28 +08:00
SliverHorn b708e70f8f fix: docker-compose 依赖sh命令启动 windows启动失败的bug 2021-06-03 11:44:26 +08:00
何秀钢 2f0465a1a1 added ESlint 语法检测 2021-06-02 14:11:45 +08:00
SliverHorn 3932a8fbf3 Merge branch 'master' of https://github.com/flipped-aurora/gin-vue-admin into develop 2021-06-01 16:32:50 +08:00
SliverHorn 1f4f5a9a2c Merge branch 'gva_gormv2_dev' of https://github.com/flipped-aurora/gin-vue-admin into develop 2021-06-01 16:32:42 +08:00
何秀钢 3ffe0d89d8 modified 统一代码风格 2021-06-01 16:20:46 +08:00
奇淼(piexlmax d3fee1bf3e Merge pull request #496 from flipped-aurora/gva_gormv2_dev
修复casbin map占用问题
2021-05-29 11:26:45 +08:00
奇淼(piexlmax d1009704d8 Merge pull request #493 from qinmin328/master
定时任务配置问题
2021-05-29 11:25:07 +08:00
pixel 4d00bb9d21 2.4.2版本号发布 2021-05-28 19:18:48 +08:00
qinmin328 1dff8eb945 定时任务配置问题
定时任务文档跟使用版本不一致, 导致时间配置上有点差异
2021-05-25 09:50:54 +08:00
列里 f947b3fa60 validator.go : 新增支持正则校验。
verify.go : UUID的正则校验使用示例。
2021-05-24 20:31:39 +08:00
SliverHorn 8eef4717cc fix: Restore config.yaml File 2021-05-21 18:49:35 +08:00
SliverHorn 1de437dc5a fix: Enforcer => SyncedEnforcer Solve Map Preemption 2021-05-21 18:48:26 +08:00
SliverHorn 747ffc43d9 Merge branch 'master' of https://github.com/flipped-aurora/gin-vue-admin into develop 2021-05-20 16:58:30 +08:00
SliverHorn 8f1885f56e fix: remove casbin init single case 2021-05-20 16:54:56 +08:00
奇淼(piexlmax eeac49157f Merge pull request #484 from flipped-aurora/gva_gormv2_dev
修复map竞争问题
2021-05-20 11:29:51 +08:00
奇淼(piexlmax ffc19c7fbf Merge branch 'master' into gva_gormv2_dev 2021-05-20 11:26:24 +08:00
pixel e03f0cc4b0 修复map竞争问题 2021-05-20 11:23:30 +08:00
奇淼(piexlmax 70044a88a0 Merge pull request #483 from flipped-aurora/revert-482-gva_gormv2_dev
Revert "Gva gormv2 dev"
2021-05-20 11:05:53 +08:00
奇淼(piexlmax 4a279ffa29 Revert "Gva gormv2 dev" 2021-05-20 11:05:44 +08:00
奇淼(piexlmax 979c9c193f Merge pull request #482 from flipped-aurora/gva_gormv2_dev
Gva gormv2 dev
2021-05-20 10:56:48 +08:00
奇淼(piexlmax f603ebb09f Merge pull request #481 from songzhibin97/gva_gormv2_dev
fix casbin datarace
2021-05-20 10:56:24 +08:00
songzhibin97 7d93bc7256 fix casbin datarace 2021-05-20 10:49:00 +08:00
奇淼(piexlmax 89fa2c1061 Update README.md 2021-05-20 10:13:33 +08:00
奇淼(piexlmax aba0eeea80 Merge pull request #477 from flipped-aurora/gva_gormv2_dev
Gva gormv2 dev
2021-05-18 16:47:39 +08:00
奇淼(piexlmax 5a0aa6422f Merge pull request #476 from flipped-aurora/gva_gormv2_dev
Gva gormv2 dev
2021-05-18 16:47:17 +08:00
pixel b59f068c7d 媒体库样式优化 2021-05-18 16:38:20 +08:00
pixel ad6311d244 Merge branch 'master' of https://github.com/flipped-aurora/gin-vue-admin into gva_gormv2_dev 2021-05-18 16:30:27 +08:00
奇淼(piexlmax 645d6799b2 Merge pull request #469 from bstdn/master
modified 增加结构体描述,完善自动化文档
2021-05-18 16:30:07 +08:00
pixel 758c1f8306 Merge branch 'develop' of https://github.com/flipped-aurora/gin-vue-admin into gva_gormv2_dev
 Conflicts:
	server/service/sys_casbin.go
2021-05-18 16:26:53 +08:00
pixel 905297907a Merge branch 'master' of https://github.com/flipped-aurora/gin-vue-admin into gva_gormv2_dev 2021-05-18 16:25:45 +08:00
奇淼(piexlmax 6fb241af4b Merge pull request #475 from snowlyg/master
修复删除最后一个列表数据,重新加载数据报错
2021-05-18 16:23:55 +08:00
奇淼(piexlmax 0cf29d7488 Merge pull request #472 from closetool/develop
service/sys_casbin.go: fix casbin runs slowly
2021-05-18 13:58:10 +08:00
snowlyg 615aa3ad23 修复删除最后一个列表数据,重新加载数据报错 2021-05-17 15:38:31 +08:00
closetool c756d26592 service/sys_casbin.go: fix casbin runs slowly 2021-05-15 13:46:34 +08:00
何秀钢 0f45d3830a modified 增加结构体描述,完善自动化文档 2021-05-14 11:33:14 +08:00
奇淼(piexlmax c37ea861eb Merge pull request #463 from mlsjla/master
Update index.vue
2021-05-12 17:53:50 +08:00
奇淼(piexlmax aaa53d9a35 新增自动迁移创建路由后重启
新增自动迁移创建路由后重启
2021-05-12 17:39:15 +08:00
奇淼(piexlmax 3d59181d2a 修复后端重启前端白屏的bug
修复后端重启前端白屏的bug
2021-05-12 17:37:58 +08:00
奇淼(piexlmax ef11b6caa7 Merge pull request #465 from bstdn/master
modified 增加结构体描述,完善自动化文档
2021-05-12 17:37:16 +08:00
奇淼(piexlmax 563a1fc1a4 Merge pull request #466 from WangLeonard/fix-system-config
修复在线修改系统配置的bug
2021-05-12 17:36:12 +08:00
pixel 5625444fbc 修复重启后断后页面白屏问题 2021-05-12 17:13:53 +08:00
songzhibin97 169205f132 新增自动迁移创建路由后重启
修改
- server/api/v1/sys_system.go
- server/config.yaml
- server/config/auto_code.go
- server/service/sys_auto_code.go
新增
- server/utils/reload.go
2021-05-12 11:53:52 +08:00
Leonard Wang 447d824da6 修复在线修改系统配置的bug 2021-05-12 00:54:07 +08:00
何秀钢 c3ad90dde5 modified 增加结构体描述,完善自动化文档 2021-05-11 17:26:06 +08:00
mlsjla f218695bef Update index.vue
修复生产环境部署后,图片路径错误,错误细节: 图路径会变为 /apiuploads/file...  而实际需要的是 /api/uploads/file...
2021-05-10 14:17:57 +08:00
奇淼(piexlmax 9b758084bf 修复了已知bug casbin版本降级提升兼容性
Gva gormv2 dev
2021-05-09 19:29:49 +08:00
蒋吉兆 8159aa1a88 统一登录校验 误删用户登陆菜单后不再白屏 2021-05-09 19:26:08 +08:00
蒋吉兆 18cf39529e Merge branch 'gva_gormv2_dev' of https://github.com/flipped-aurora/gin-vue-admin into gva_gormv2_dev 2021-05-09 18:49:15 +08:00
pixel a54e7a5654 修改casbin版本 防止用户报错 2021-05-07 17:48:19 +08:00
奇淼(piexlmax 4392f0ffac 优化配置 提升新手友好度
优化配置 提升新手友好度
2021-05-06 04:29:33 -05:00
pixel 732cd54578 Merge branch 'master' of https://github.com/flipped-aurora/gin-vue-admin into gva_gormv2_dev
 Conflicts:
	server/model/request/common.go
2021-05-06 13:21:51 +08:00
奇淼(piexlmax 0de1fe1132 增加结构体描述,完善自动化文档
modified 增加结构体描述,完善自动化文档
2021-04-30 01:19:00 -05:00
何秀钢 3e85645e44 modified 增加结构体描述,完善自动化文档 2021-04-30 14:14:00 +08:00
pixel 39fdc43ada 前端配置提取 让开发和上线更加简便 2021-04-26 14:33:47 +08:00
pixel acda4470bc 修复api.vue编辑未变化标题的bug 2021-04-26 11:39:00 +08:00
pixel 0fb3d16c49 修复main.js的包引用问题 2021-04-23 18:09:29 +08:00
pixel 228882d8c4 Merge branch 'develop' of https://github.com/flipped-aurora/gin-vue-admin into gva_gormv2_dev
 Conflicts:
	web/src/view/systemTools/formCreate/index.vue
2021-04-23 17:45:40 +08:00
pixel 186aa89476 将配置提取 2021-04-23 15:47:42 +08:00
奇淼(piexlmax f9296d90d4 Merge pull request #445 from flipped-aurora/gva_gormv2_dev
Gva gormv2 dev
2021-04-22 03:01:33 -05:00
奇淼(piexlmax 258c2afa32 Update config.yaml 2021-04-22 15:59:52 +08:00
奇淼(piexlmax 105adfe7e9 Merge pull request #442 from hzliangbin/patch-1
fix typo in README
2021-04-22 02:11:04 -05:00
pixel d2104fade2 修复casbin导致连接泄露问题 2021-04-22 14:54:52 +08:00
Bin Liang 739eed6a01 fix typo in README
fix some typo for better reading
2021-04-22 14:17:49 +08:00
奇淼(piexlmax bffe222e1b Merge pull request #396 from joewan/test_branch
端口统一配置
2021-04-20 04:20:12 -05:00
奇淼(piexlmax ceb5b9e4d6 Merge branch 'develop' into test_branch 2021-04-20 04:18:22 -05:00
奇淼(piexlmax e49bd514f7 Merge pull request #418 from RoseKissYou/develop
api/v1/sys_api.go api/v1/sys_menu.go api/v1/sys_user.go model/request…
2021-04-20 04:16:49 -05:00
奇淼(piexlmax 39fb8b7c5d Merge pull request #438 from songzhibin97/gva_gormv2_dev
新增定时任务封装以及配置自动清理数据库功能
2021-04-20 04:14:25 -05:00
songzhibin97 2b0a565120 新增定时任务封装以及配置自动清理数据库功能
新增
- server/config/timer.go
- server/initialize/timer.go
- server/utils/db_automation.go
- server/utils/timer/timed_task.go
修改
- server/config.yaml
- server/config/config/go
- server/global/global.go
- server/main.go
2021-04-17 14:50:44 +08:00
奇淼(piexlmax 2399c97c51 Update README.md 2021-04-16 19:08:08 +08:00
songzhibin97 eb1911232b Merge remote-tracking branch 'upstream/gva_gormv2_dev' into gva_gormv2_dev 2021-04-16 17:52:27 +08:00
pixel 0fe70c5e1c Merge branch 'master' of https://github.com/flipped-aurora/gin-vue-admin into gva_gormv2_dev 2021-04-16 10:47:18 +08:00
pixel 483da629e9 修复前端needInit报错导致的逻辑问题 2021-04-16 10:29:32 +08:00
蒋吉兆 129f4e6281 废弃七牛云配置 2021-04-14 23:19:25 +08:00
pixel 683355d773 版本号更改 2021-04-13 11:47:30 +08:00
奇淼(piexlmax cb28f6f438 Merge pull request #433 from A-Zee029/develop
fix:fail to start with docker-compose
2021-04-12 22:27:44 -05:00
奇淼(piexlmax c9f2301335 Merge pull request #432 from closetool/develop
fix: using official casbin gorm-adapter
2021-04-12 22:27:06 -05:00
huangjunwei 751a10d91e fix:fail to start with docker-compose 2021-04-12 16:03:49 +08:00
closetool 7c821bf673 fix: using official casbin gorm-adapter 2021-04-12 14:52:54 +08:00
pixel be2b584cee 修复指令绑定时效问题 修复Image组件未注册问题 2021-04-10 10:28:48 +08:00
pixel f39048fad0 清理 debugger 2021-04-10 09:51:22 +08:00
v_anxiong 4e9ce0de7e 前后端都加入了代码结构,方便学习和理解,也欢迎各位大佬进行补充,方便我这个菜鸟进行学习 2021-04-09 17:10:49 +08:00
SliverHorn 6e78abb34e Update sys_casbin.go 2021-04-08 18:14:21 +08:00
pixel ae5ec006ba 将gorm适配器调整至本地避免windows没有gcc的情况导致系统无法启动 2021-04-06 17:12:51 +08:00
pixel c9d1e424e9 更新表单生成器 2021-04-06 16:41:59 +08:00
pixel f48f39e024 Merge branch 'master' of https://github.com/flipped-aurora/gin-vue-admin into develop 2021-04-06 14:21:25 +08:00
奇淼(piexlmax 3dde9cfdc6 Merge pull request #426 from closetool/master
fix: casbin gorm-adapter has no sqlite3 support
2021-04-06 14:19:15 +08:00
pixel 85d6e954ae 同步swagger 2021-04-06 11:56:49 +08:00
closetool 146b0b2925 fix: casbin gorm-adapter has no sqlite3 support
Signed-off-by: closetool <c299999999@qq.com>
2021-04-04 21:42:22 +08:00
pixel 4faa807c53 增加批量删除功能 调节分页器样式 2021-04-01 17:15:24 +08:00
v_anxiong ea998db824 api/v1/sys_api.go api/v1/sys_menu.go api/v1/sys_user.go model/request/common.go 其中的参数校验代码Id改成ID,修复参数校验的bug 2021-04-01 16:45:18 +08:00
pixel 7334ad9f33 标签代码优化 字典历史bug修复 2021-03-30 14:42:22 +08:00
pixel f32d725773 Merge branch 'master' of https://github.com/flipped-aurora/gin-vue-admin into gva_gormv2_dev 2021-03-30 12:15:13 +08:00
songzhibin97 fb9bec8623 Merge remote-tracking branch 'upstream/gva_gormv2_dev' into gva_gormv2_dev 2021-03-29 16:49:32 +08:00
奇淼(piexlmax b7847e6198 Merge pull request #411 from songzhibin97/gva_gormv2_dev
#409 bug修复
2021-03-29 11:54:56 +08:00
奇淼(piexlmax 4307abf274 Merge pull request #413 from WangLeonard/gva_gormv2_dev-fix-automodelcode
修复代码生成中对gorm的重复检查
2021-03-29 11:54:21 +08:00
LeonardWang 8206e5cbad 修复代码生成中对gorm的重复检查 2021-03-25 23:35:35 +08:00
songzhibin97 73cc49448e #409 bug修复
- 修改
server/model/sys_auto_code.go
server/service/sys_auto_code.go
server/utils/file_operations.go
2021-03-24 14:12:07 +08:00
pixel a2f4d58648 紧急修复初始化会导致config配置文件错误的bug 2021-03-22 16:56:13 +08:00
蒋吉兆 5b290ef0b1 修复已知bug 2021-03-21 22:57:18 +08:00
蒋吉兆 b9a9c5d917 Merge branches 'gva_gormv2_dev' and 'master' of https://github.com/flipped-aurora/gin-vue-admin into gva_gormv2_dev 2021-03-21 22:35:47 +08:00
奇淼(piexlmax 3112f0afe8 Merge pull request #404 from WangLeonard/gva_gormv2_dev-automodelcode
添加代码生成中route和gorm的自动注入
2021-03-21 22:33:16 +08:00
LeonardWang 0a3696ee01 添加代码生成中route和gorm的自动注入 2021-03-19 23:56:40 +08:00
joewan 03431dee58 Merge branch 'develop' into test_branch 2021-03-18 16:52:34 +08:00
奇淼(piexlmax 8f33b3de5e Update README.md 2021-03-18 14:31:28 +08:00
pixel 9e0f95ec48 清理工作流功能 2021-03-18 14:28:52 +08:00
pixel 7668e7fdde 清理工作流功能 2021-03-18 14:27:39 +08:00
pixel 0df2b3ea1c Merge branch 'master' of https://github.com/flipped-aurora/gin-vue-admin into gva_gormv2_dev 2021-03-18 12:21:30 +08:00
pixel 4f726f1eb8 修复 canshowBug 2021-03-18 12:20:20 +08:00
pixel 752e9f917e 前端优化减少体积 2021-03-18 12:19:27 +08:00
pixel a4493021e2 清理多余包 element按需加载 2021-03-18 12:19:27 +08:00
SliverHorn 13d823ec57 swagger 错误修复, swagger文档更新 2021-03-18 12:19:27 +08:00
SliverHorn a6736e6e30 修复v2.4.0的docker-compose的启动异常问题 2021-03-18 12:19:27 +08:00
蒋吉兆 9b26947849 修改form跳转出现的bug 2021-03-18 12:19:27 +08:00
奇淼(piexlmax 0af29cfcae Merge pull request #397 from songzhibin97/gva_gormv2_dev
代码自动迁移动态适配
2021-03-16 19:32:12 +08:00
songzhibin97 c63904aedf 修改动态迁移的一个小bug 2021-03-10 12:00:32 +08:00
pixel 076538a6b6 前端优化减少体积 2021-03-09 19:40:40 +08:00
pixel 8deefff08a 清理多余包 element按需加载 2021-03-09 19:40:40 +08:00
pixel 1cae92b119 修复检测是否初始化时的判断 2021-03-09 19:40:40 +08:00
songzhibin97 b5dbde8ad1 更新测试的mysql mysql配置 2021-03-09 15:17:57 +08:00
songzhibin97 45d552ac8c 代码自动迁移动态适配
修改
- server/config.yaml
- server/config/config.go
- server/config/viper.go
- server/service/sys_auto_code.go
新增
- server/config/auto_code.go
2021-03-09 14:59:20 +08:00
东邪黄药师 bdce16a582 fix error 2021-03-08 23:50:14 +08:00
东邪黄药师 7bf3294113 集中配置端口 2021-03-08 23:43:17 +08:00
SliverHorn 26dbd1446c Merge pull request #393 from SliverHorn/gva_gormv2_dev
修复v2.4.0的docker-compose的启动异常问题, swagger错误修复
2021-03-08 15:33:51 +08:00
SliverHorn 74796f3546 swagger 错误修复, swagger文档更新 2021-03-08 15:23:38 +08:00
pixel 48bb3b6452 修复检测是否初始化时的判断 2021-03-08 13:43:25 +08:00
SliverHorn c4ec7f562a 修复v2.4.0的docker-compose的启动异常问题 2021-03-08 12:53:48 +08:00
蒋吉兆 733874316a 修改form跳转出现的bug 2021-03-07 13:19:16 +08:00
pixel b5efcd251a Merge remote-tracking branch 'origin/master' 2021-03-05 20:33:58 +08:00
pixel b74ea58172 版本号更改提交 2021-03-05 20:30:02 +08:00
pixel 707dbac2ca 自动初始化中间件拦截 防止误操作无法进入初始化功能 2021-03-04 19:48:38 +08:00
pixel 184b1a903f 自动初始化整体调试完成 2021-03-04 19:38:07 +08:00
pixel 4a995a1c56 修复初始apibug 2021-03-04 16:02:17 +08:00
pixel e6768d5e17 cmd剔除 初始数据结构转移 修复初始携带apibug 2021-03-04 16:02:09 +08:00
pixel e3057c4bd9 自动初始化数据库功能后端部分完成 2021-03-04 15:57:07 +08:00
pixel 87f101a7bf 包位置调整 2021-03-02 19:53:26 +08:00
奇淼(piexlmax ab435d131c Merge pull request #387 from songzhibin97/gva_gormv2_dev
新增功能-api生成数据库并初始化回写配置
2021-03-02 19:29:34 +08:00
songzhibin97 674ae4c4a0 补充修改 2021-03-02 16:20:42 +08:00
songzhibin97 f3a84e2ca8 补充修改 2021-03-02 12:33:28 +08:00
songzhibin97 835dd15c47 订正了swagger
修改了
- server/api/v1/sys_initdb.go
- server/api/v1/sys_system.go
迁移了模型
- server/model/sys_init.go -> sysver/model/request/sys_init.go
2021-03-02 12:32:47 +08:00
pixel c983370162 Merge branch 'gva_gormv2_dev' of https://github.com/flipped-aurora/gin-vue-admin into gva_gormv2_dev 2021-03-01 10:33:26 +08:00
songzhibin97 00b5024f20 新增功能-api生成数据库并初始化回写配置
修改gva initdb 判断是否已经创建的一些小问题
新增api生成数据库并初始化回写配置
修改文件:
server/cmd/gva/initdb.go
server/cmd/information/data_authorities.go
server/cmd/information/workflow.go
server/initialize/gorm
server/main.go

新增文件:
server/api/v1/sys.initdb.go
server/middleware/init.go
server/model/sys_init.go
server/service/sys_initdb.go
servcer/utils/init_db.go

迁移文件
server/cmd/gva/mysql.go->server/utils/mysql.go
2021-02-27 17:32:41 +08:00
pixel ae0af55d17 字典样式修改 2021-02-27 12:48:18 +08:00
奇淼(piexlmax f19b398c93 Merge pull request #386 from songzhibin97/gva_gormv2_dev
新增api 重启服务(非windows)
2021-02-27 12:11:36 +08:00
songzhibin97 8743b63869 Update sys_system.go 2021-02-27 12:05:24 +08:00
songzhibin97 4af1627116 新增api重启系统(支持非windows)
修改
- server/api/v1/sys_system.go
- server/router/sys_system.go
2021-02-27 12:03:28 +08:00
pixel 5d4c4d53fc 前端系统配置增加 tencent-cos aliyun-oss 配置 2021-02-27 10:59:53 +08:00
pixel 62bc8092e2 对合并代码进行微调 2021-02-27 10:48:51 +08:00
pixel 4cea6f9f5d 更新了某些文本 让提示更加友好
根据scuxiatian提供的方案 修改了workflow前端组件的一些bug
2021-02-27 10:29:28 +08:00
奇淼(piexlmax decee13bf1 Merge pull request #384 from lauyang/develop
增加阿里云OSS
2021-02-27 10:26:15 +08:00
奇淼(piexlmax 60bfe48307 Merge branch 'develop' into develop 2021-02-27 10:26:00 +08:00
奇淼(piexlmax bca54282c9 Merge pull request #381 from MUHM/develop
为OSS增加腾讯云对象存储支持
2021-02-27 10:23:09 +08:00
pixel db933cecb6 更新了某些文本 让提示更加友好
根据scuxiatian提供的方案 修改了workflow前端组件的一些bug
2021-02-26 12:14:28 +08:00
yang.liu06 3f06c8ba7d add aliyun oss support 2021-02-24 22:07:50 +08:00
pixel f7fb34ec16 Merge remote-tracking branch 'origin/master' 2021-02-24 09:54:03 +08:00
pixel b691d53523 增加快速设置父级菜单功能 修复本地上传文件用户使用头像存在问题的bug 2021-02-24 09:53:45 +08:00
奇淼(piexlmax 5396aa40cb Update FUNDING.yml 2021-02-23 15:50:10 +08:00
pixel 1a43b89674 Merge remote-tracking branch 'origin/master' 2021-02-23 15:00:22 +08:00
奇淼(piexlmax fb570acf7c Merge pull request #376 from xiaoweihong/patch-1
NavigationDuplicated error
2021-02-23 15:00:03 +08:00
pixel 8c5d0ad64b Merge branch 'gva_gormv2_dev' of https://github.com/flipped-aurora/gin-vue-admin 2021-02-23 14:48:47 +08:00
pixel 74a92b08d8 更改 捐赠地址 2021-02-23 14:47:39 +08:00
klausY 3e6a3d97bb 提供一二级路由模板 2021-02-23 14:43:12 +08:00
pixel b3e4666108 Merge remote-tracking branch 'origin/master' 2021-02-23 11:00:56 +08:00
pixel a344f2bdb7 github.com/shirou/gopsutil 包版本修改为 v3.21.1 2021-02-23 10:39:03 +08:00
MUHM 4b6eb80ddb add TencentCOS support to OSS 2021-02-22 16:37:00 +08:00
奇淼(piexlmax 5226a2a26f Update FUNDING.yml 2021-02-20 11:00:04 +08:00
奇淼(piexlmax e8bb532cdc Update FUNDING.yml 2021-02-20 10:59:11 +08:00
pixel 171be652eb excel导入导出功能合并并且细节修改完成 2021-02-19 15:45:55 +08:00
xiaowei c410125c8f NavigationDuplicated error
NavigationDuplicated: Avoided redundant navigation to current location
![](https://img-blog.csdnimg.cn/20200901093646588.png?x-oss-process=image/watermark,type_ZmFuZ3poZW5naGVpdGk,shadow_10,text_aHR0cHM6Ly9ibG9nLmNzZG4ubmV0L3dlaXhpbl80MjQwMjg0NQ==,size_16,color_FFFFFF,t_70)
2021-02-19 13:00:07 +08:00
pixel 0f6613c4a1 Merge branch 'develop' of https://github.com/flipped-aurora/gin-vue-admin into gva_gormv2_dev
 Conflicts:
	web/package.json
2021-02-14 21:41:34 +08:00
奇淼(piexlmax d278344dd4 Merge pull request #370 from hwb2017/develop-feature-excel
增加Excel导入导出示例功能
2021-02-14 21:40:04 +08:00
pixel c47b3eee2c 修复预览代码和生成代码均成为预览的问题 2021-02-14 12:54:17 +08:00
pixel 162b8df569 修复路径分割不同系统分隔符不同导致的panic 2021-02-14 12:53:47 +08:00
pixel 55e2109091 代码自动化生成支持预览功能 2021-02-13 16:24:38 +08:00
pixel 11efbe7699 initdb默认string长度改为191 2021-02-13 16:22:50 +08:00
pixel 329d094e2a Merge branch 'master' of https://github.com/flipped-aurora/gin-vue-admin into gva_gormv2_dev 2021-02-13 14:52:33 +08:00
奇淼(piexlmax 414766001b Merge pull request #374 from songzhibin97/gva_gormv2_dev
提供自动化代码预览功能
2021-02-13 14:51:28 +08:00
songzhibin97 e05e16dce4 抽出重复的内容优化PreviewTemp和CreateTemp 2021-02-11 19:33:11 +08:00
songzhibin97 3549f4cf1f 自动生成代码新增预览接口 2021-02-11 19:00:06 +08:00
pixel bedbd3c872 修复了子路由模式下两个keepalive相互切换 keepalive失效的问题 2021-02-09 19:25:56 +08:00
pixel 296110f969 修复了子路由模式下两个keepalive相互切换 keepalive失效的问题 2021-02-09 19:25:14 +08:00
hwb2017 f60b0f1750 增加Excel导入导出示例功能 2021-01-28 00:48:47 +08:00
SliverHorn 6ad13c5930 添加基础路由 返回错误后,仍然执行创建创建代码bug, 修复bug, #367 2021-01-26 17:12:51 +08:00
SliverHorn 6a1b53e3d4 Merge branch 'gva_gormv2_dev' of https://github.com/flipped-aurora/gin-vue-admin into gva_gormv2_dev 2021-01-26 17:10:07 +08:00
蒋吉兆 21ef7bdcc0 修改版本号 2021-01-24 17:44:00 +08:00
蒋吉兆 718574cdf3 修复了登陆时首页蓝点未点亮的bug 2021-01-24 17:36:38 +08:00
蒋吉兆 18571ca224 修复多次切换菜单后会出现路由地址改变,页面不变的情况 2021-01-24 17:08:35 +08:00
蒋吉兆 41c164a8ef Merge branch 'gva_gormv2_dev' of https://github.com/flipped-aurora/gin-vue-admin 2021-01-24 17:02:01 +08:00
蒋吉兆 f82acdb478 增加menu可配置是否自动关闭功能 增加单页面刷新功能 2021-01-24 17:01:43 +08:00
SliverHorn 40b56b6bf5 Merge pull request #364 from SliverHorn/gva_gormv2_dev
升级gva 工具 支持创建数据库与utf8mb4的sql修正功能, 版本迭代为v0.0.4
2021-01-21 22:54:33 +08:00
SliverHorn f259d69910 升级gva 工具 支持创建数据库与utf8mb4的sql修正功能, 版本迭代为v0.0.4 2021-01-21 19:44:55 +08:00
pixel 3952d5ec14 Merge branch 'develop' of https://github.com/flipped-aurora/gin-vue-admin into gva_gormv2_dev
 Conflicts:
	server/Makefile
	web/src/view/superAdmin/operation/sysOperationRecord.vue
2021-01-14 14:38:25 +08:00
pixel c1745f6f40 Merge branch 'master' of https://github.com/flipped-aurora/gin-vue-admin into gva_gormv2_dev 2021-01-14 14:33:59 +08:00
pixel 0940a70d86 支持默认首页 2021-01-14 12:37:49 +08:00
pixel 7abe6987a5 支持不同角色自定义首页 2021-01-14 12:28:13 +08:00
SliverHorn 7baa2c84a3 Merge branch 'gva_gormv2_dev' of https://github.com/flipped-aurora/gin-vue-admin into gva_gormv2_dev 2021-01-13 12:22:58 +08:00
songzhibin97 6867eb2c05 修复了在代码生成特殊情况下自动迁移文件移动错位置的情况
修改了services/sys_auto_code.go/addAutoMoveFile
修改了
services/sys_auto_code.go/CreateTemp
2021-01-13 12:03:11 +08:00
QM303176530 3d01706fb6 增加文件上传仓库配置注释说明 2021-01-10 23:48:50 +08:00
QM303176530 7707d4c99d 修复了媒体库中本地图片不显示的bug 2021-01-10 23:45:36 +08:00
QM303176530 b66d7a4e7a 解决了权限放在public组也会走权限控制的bug 2021-01-10 23:03:09 +08:00
pixel 8a67795faf 代码规范化整理 2021-01-08 17:34:17 +08:00
pixel 64299e6912 清理多余代码 2021-01-08 17:32:39 +08:00
pixel fdd522e56a 无用代码清理 2021-01-08 16:54:09 +08:00
奇淼(piexlmax 1c257fa830 Merge pull request #344 from 7beCn/master
修复table数据大于50条时页面卡死
2021-01-08 16:33:42 +08:00
SliverHorn 3d9fbbac63 Merge pull request #351 from flipped-aurora/gva_gormv2_dev
紧急修复bug
2021-01-05 23:13:55 +08:00
SliverHorn f83332b2c8 docker-compose shell 脚本更新 2021-01-05 23:02:11 +08:00
SliverHorn b8d187bb35 Makefile修改 4个空格 --> tab 2021-01-05 22:57:42 +08:00
SliverHorn 9567564bf4 Merge branch 'gva_gormv2_dev' of https://github.com/flipped-aurora/gin-vue-admin into gva_gormv2_dev 2020-12-30 20:58:01 +08:00
zzZ007 d05bf07db8 Update table.vue.tpl
修改自动生成代码,当table数据大于50条时,页面会卡死,替换掉 el-popover即可。
2020-12-30 17:20:35 +08:00
奇淼(piexlmax 5adb89694b Merge pull request #339 from flipped-aurora/revert-338-develop
Revert "修复了swag文档自动化生成失败的bug;完善了自动生成代码的swag部分"
2020-12-27 17:47:54 +08:00
奇淼(piexlmax e21146d048 Revert "修复了swag文档自动化生成失败的bug;完善了自动生成代码的swag部分" 2020-12-27 17:46:53 +08:00
QM303176530 4c7f04536d 修复了在当前表格当前页删除为空的情况下页面被锁死的bug 2020-12-27 17:46:11 +08:00
SliverHorn 71d0883c3d 优化gorm的自定义logger代码, 升级gorm的版本为1.20.9, Makefile 添加goproxy代理 2020-12-27 17:46:11 +08:00
pixel ee9022f9e3 user新建用户 bug处理 2020-12-27 17:46:11 +08:00
奇淼(piexlmax cc0a894162 Update README.md 2020-12-27 17:46:11 +08:00
奇淼(piexlmax d27f2ec966 Update README.md 2020-12-27 17:46:11 +08:00
pixel 83b7927c4b 登陆成功不再调用验证码接口 2020-12-27 17:46:11 +08:00
pixel e1975682a9 将JWT过期时间 刷新时间 放置进入config 2020-12-27 17:46:10 +08:00
pixel f914f96b9a 消除初始化时间0值报错 2020-12-27 17:46:10 +08:00
QM303176530 35a21d4e24 清理图标 form table 富文本 示例 2020-12-27 17:46:10 +08:00
奇淼(piexlmax 3e58190112 Update README.md 2020-12-27 17:46:10 +08:00
pixel 39150b2b2b 添加个人中心遮罩,添加自动更改title功能 2020-12-27 17:46:10 +08:00
SliverHorn f2b287f933 自定义logger保留gorm的格式输出控制台, 修改SetUserInfo的校验规则为IdVerify 2020-12-27 17:46:10 +08:00
QM303176530 e458e583ee 修复了在当前表格当前页删除为空的情况下页面被锁死的bug 2020-12-27 17:33:44 +08:00
奇淼(piexlmax 74c1fd5b7d Merge pull request #338 from ljj6218/develop
修复了swag文档自动化生成失败的bug;完善了自动生成代码的swag部分
2020-12-27 17:27:09 +08:00
QM303176530 2547ba88ae 修复了在当前表格当前页删除为空的情况下页面被锁死的bug 2020-12-27 17:20:54 +08:00
QM303176530 5c78ecc2d3 Merge branches 'develop' and 'gva_gormv2_dev' of https://github.com/flipped-aurora/gin-vue-admin into gva_gormv2_dev 2020-12-27 16:47:03 +08:00
奇淼(piexlmax 9c934917d0 Merge pull request #337 from SliverHorn/sliver_develop
优化gorm的自定义logger代码, 升级gorm的版本为1.20.9, Makefile 添加goproxy代理
2020-12-27 16:46:35 +08:00
奇淼(piexlmax 1132723355 Merge pull request #336 from JunIce/develop
chore: 增加自动扫描package.json, 从cdn引入资源
2020-12-27 16:44:29 +08:00
梁俊景 26261001f5 fix bug 2020-12-26 23:59:28 +08:00
梁俊景 2e3a1582ab 完善 2020-12-26 23:51:52 +08:00
梁俊景 5d1bcb3575 autocode 修复swag相关功能 2020-12-26 20:35:26 +08:00
SliverHorn 6c7d49b323 优化gorm的自定义logger代码, 升级gorm的版本为1.20.9, Makefile 添加goproxy代理 2020-12-26 00:52:18 +08:00
volcan0 843a585b7f chore: 增加自动扫描package.json, 从cdn引入资源 2020-12-25 14:03:49 +08:00
pixel 8df6fa6a33 user新建用户 bug处理 2020-12-19 16:05:52 +08:00
pixel 9ccb5439df Merge branch 'gva_gormv2_dev' of https://github.com/flipped-aurora/gin-vue-admin 2020-12-19 15:43:56 +08:00
奇淼(piexlmax 928d816c68 Update README.md 2020-12-16 15:51:25 +08:00
奇淼(piexlmax 27df9862ea Update README.md 2020-12-16 15:50:25 +08:00
pixel d428ed6876 登陆成功不再调用验证码接口 2020-12-16 15:44:37 +08:00
pixel 72fd7beec0 将JWT过期时间 刷新时间 放置进入config 2020-12-16 13:17:00 +08:00
pixel 7613b85271 Merge branch 'gva_gormv2_dev' of https://github.com/flipped-aurora/gin-vue-admin 2020-12-16 11:43:45 +08:00
pixel 23eac98551 消除初始化时间0值报错 2020-12-16 11:43:22 +08:00
SliverHorn 8bd245b1f1 Merge branch 'gva_gormv2_dev' of https://github.com/flipped-aurora/gin-vue-admin into gva_gormv2_dev 2020-12-16 10:40:21 +08:00
QM303176530 b13bbfced1 清理图标 form table 富文本 示例 2020-12-13 12:42:38 +08:00
奇淼(piexlmax 645c788512 Update README.md 2020-12-11 15:12:28 +08:00
pixel 9f6c8f5e22 Merge branch 'gva_gormv2_dev' of https://github.com/flipped-aurora/gin-vue-admin into gva_gormv2_dev 2020-12-09 16:30:17 +08:00
pixel 9a4667fa46 添加个人中心遮罩,添加自动更改title功能 2020-12-09 16:30:06 +08:00
奇淼(piexlmax 338d81e101 Merge pull request #306 from SliverHorn/sliverhorn_dev
自定义logger保留gorm的格式输出控制台, 修改SetUserInfo的校验规则为IdVerify
2020-12-08 23:18:33 -06:00
SliverHorn 336d7473f7 自定义logger保留gorm的格式输出控制台, 修改SetUserInfo的校验规则为IdVerify 2020-12-07 12:11:50 +08:00
SliverHorn 265cd4d885 Merge branch 'gva_gormv2_dev' of https://github.com/flipped-aurora/gin-vue-admin into gva_gormv2_dev 2020-12-07 11:19:08 +08:00
QM303176530 cab8de721f 添加首字母小写方法 增加自动填充按键 2020-12-06 16:23:43 +08:00
QM303176530 4030cd325c Merge branches 'develop', 'gva_gormv2_dev' and 'master' of https://github.com/flipped-aurora/gin-vue-admin into develop 2020-12-06 15:37:36 +08:00
奇淼(piexlmax d796a39aa7 Merge pull request #299 from tingfeng-key/patch-1
Update image.vue
2020-12-06 01:24:42 -06:00
奇淼(piexlmax 04d8303f28 Merge pull request #304 from songzhibin97/gva_gormv2_dev
修改了热更正在运行时重启信号的丢弃
2020-12-06 01:21:10 -06:00
奇淼(piexlmax 5eec28a964 Merge pull request #302 from tingfeng-key/patch-3
添加自动填充功能
2020-12-06 01:20:49 -06:00
songzhibin97 a5e5c588ba Update cmd_Task.go 2020-12-05 22:49:57 +08:00
SliverHorn 34e6ccc6e2 Merge branch 'gva_gormv2_dev' of https://github.com/flipped-aurora/gin-vue-admin into gva_gormv2_dev 2020-12-04 23:20:45 +08:00
奇淼(piexlmax 6a028e13cb Merge pull request #303 from tingfeng-key/patch-4
修复提示权限不足和图片显示问题
2020-12-04 08:50:28 -06:00
听风 176e9d09b6 修复提示权限不足和图片显示问题
修复提示权限不足和图片显示问题
2020-12-04 22:35:25 +08:00
听风 7ddcf97efd 添加自动填充功能
添加自动填充功能。field字段填充json、数据库表,中文填充数据库表字段描述字段
2020-12-04 22:33:12 +08:00
听风 e19bda949b Update image.vue 2020-12-03 19:05:26 +08:00
听风 b09d142091 Update image.vue
修复上传图片组件bug
2020-12-03 18:16:03 +08:00
QM303176530 e102f820c1 修复了流程终止依然显示进行中的bug 2020-11-29 22:12:51 +08:00
QM303176530 36627e4ca5 操作人参数错误 2020-11-28 19:24:08 +08:00
QM303176530 9c6e6ca1b2 Merge branch 'master' of https://github.com/flipped-aurora/gin-vue-admin 2020-11-28 19:04:19 +08:00
QM303176530 f32fdbf543 增加自审批节点,修改待办查询bug,修改角色查询bug 2020-11-28 18:59:02 +08:00
奇淼(piexlmax 7342788339 Update README.md 2020-11-28 11:58:51 +08:00
QM303176530 15d6ff0144 Merge branches 'develop' and 'gva_gormv2_dev' of https://github.com/flipped-aurora/gin-vue-admin into gva_gormv2_dev 2020-11-28 11:47:18 +08:00
QM303176530 9718b16e39 增加首页教学入口 2020-11-28 11:43:54 +08:00
QM303176530 e80842207f 更新版本号 2020-11-28 11:07:54 +08:00
QM303176530 58585afdf6 默认丢出false 防止前端warnning 2020-11-28 11:06:44 +08:00
QM303176530 a3eee91cef 修复几个模板错误 2020-11-28 10:34:30 +08:00
QM303176530 9098eaf22e Merge branches 'gva_gormv2_dev' and 'gva_workflow' of https://github.com/flipped-aurora/gin-vue-admin into gva_gormv2_dev 2020-11-28 10:10:48 +08:00
pixel 2d3b039f71 Merge branch 'gva_gormv2_dev' of https://github.com/flipped-aurora/gin-vue-admin into develop 2020-11-25 17:18:35 +08:00
pixel 864c468440 命名修复 2020-11-25 17:18:07 +08:00
pixel cc295fad32 文件名更改 2020-11-25 17:11:11 +08:00
奇淼(piexlmax b4e0dc800d Merge pull request #290 from songzhibin97/develop
优化基础库的一些错误处理
2020-11-25 03:09:50 -06:00
奇淼(piexlmax 5e7078e3a6 Merge branch 'develop' into develop 2020-11-25 02:55:43 -06:00
songzhibin97 2829d7b653 优化基础库的一些错误处理 2020-11-25 16:24:20 +08:00
songzhibin97 ba834592a7 修改了zipfiles.go中ZipFiles函数可能会造成的goroutine泄露 2020-11-25 15:50:28 +08:00
奇淼(piexlmax 1607e6a0a9 Merge pull request #284 from xiaopenggithub/master
前端发布优化,部分组件使用cdn资源,不打包
2020-11-24 23:21:00 -06:00
奇淼(piexlmax f936029d59 Merge pull request #283 from SliverHorn/sliverhorn_dev
gorm日志收集进log功能
2020-11-24 23:09:16 -06:00
曾阿牛 9f1552f508 前端发布优化,部分组件使用cdn资源,不打包 2020-11-25 02:38:39 +08:00
SliverHorn c00d465709 新增切片越界的检查 2020-11-24 21:17:07 +08:00
SliverHorn c2a55931bb 自定义gorm的logger 2020-11-24 19:27:16 +08:00
SliverHorn e957e5ebc9 Merge branch 'master' of https://github.com/flipped-aurora/gin-vue-admin into gva_gormv2_dev 2020-11-24 19:10:21 +08:00
1319612909 1357e22330 手机端ui 2020-11-24 18:11:32 +08:00
pixel 8a282cd743 增加工作流步骤查看 2020-11-24 18:07:14 +08:00
1319612909 6ca7f62ce6 手机端ui 2020-11-24 17:20:12 +08:00
pixel 6ee7ad8069 隐藏0.01未完成功能 2020-11-24 16:59:31 +08:00
pixel 307b1bf496 工作流前端垃圾代码剔除 2020-11-24 16:08:40 +08:00
pixel 61f50980e1 增加自动化产生的工作流form页面 2020-11-24 16:07:55 +08:00
pixel 5293222ac0 包容网关 流转参数模式设定 2020-11-24 14:57:30 +08:00
奇淼(piexlmax 411a21d0f7 Merge pull request #282 from golyu/master
[utils/zipfiles.go]: 解决for循环中使用defer可能会造成的内存泄露问题
2020-11-23 21:46:11 -06:00
pixel 8a5d788e73 增加排他网关和包容网关 2020-11-24 11:33:16 +08:00
golyu 3e48fa55c7 [utils/zipfiles.go]: 解决for循环中使用defer可能会造成的内存泄露问题 2020-11-23 20:45:15 +08:00
pixel cd735e727e 普通工作流流动完成 2020-11-23 18:15:51 +08:00
pixel 1eb69c696a 普通工作流流动完成 2020-11-23 18:15:23 +08:00
pixel 8208ccf5a3 Merge branch 'master' of https://github.com/flipped-aurora/gin-vue-admin into gva_workflow
 Conflicts:
	server/initialize/router.go
	server/router/sys_workflow.go
2020-11-23 18:14:43 +08:00
pixel 1591944756 普通工作流流动完成 2020-11-23 18:13:46 +08:00
songzhibin97 8e87ae55a9 Revert "pointChange"
This reverts commit fb4dba1616.
2020-11-23 12:02:18 +08:00
QM303176530 85fce8f01e 中间件包导入 2020-11-22 23:27:33 +08:00
QM303176530 7475bc56c9 中间件不再记录二进制文件类型日志 2020-11-22 23:19:36 +08:00
QM303176530 7af2dffb7a 日志记录中间件位置转移 2020-11-22 23:12:50 +08:00
QM303176530 15f2d149df 修改了自动化代码自动化创建api会被禁止的bug 2020-11-22 23:09:34 +08:00
QM303176530 c09924dbdc 修改了自动化代码自动化创建api会被禁止的bug 2020-11-22 23:09:20 +08:00
songzhibin97 1ddd6dac4f pointChange 2020-11-22 18:05:51 +08:00
SliverHorn b45afe9669 当用户不存在时,拉黑前端的token 2020-11-21 11:18:13 +08:00
SliverHorn 1e85e03713 utils备注统一化, 删除多余的函数 2020-11-21 11:07:05 +08:00
SliverHorn 43eef673bc 修复自杀操作bug 2020-11-21 01:26:01 +08:00
SliverHorn 41ce276dbd 添加utils函数注释 2020-11-21 01:15:26 +08:00
SliverHorn d6e078f3d6 路由组鉴权优化 2020-11-20 23:26:17 +08:00
pixel a487266f5b 数据动态查找以及动态赋值方法变更 2020-11-19 17:24:05 +08:00
pixel 0286d56e9c 增加获取工作流详细页面信息的接口和对应调用 2020-11-18 18:06:31 +08:00
songzhibin97 4c2f43b4cf f 2020-11-17 21:20:18 +08:00
songzhibin97 9bbcb62505 热更++ 2020-11-17 20:50:14 +08:00
pixel 5bb840c1ce 调整初始化数据 2020-11-17 18:05:22 +08:00
pixel 8f221b6b0b Merge branch 'gva_gormv2_dev' of https://github.com/flipped-aurora/gin-vue-admin into gva_workflow
 Conflicts:
	server/cmd/datas/init.go
2020-11-17 17:41:12 +08:00
pixel ac4398873b 增加初始化参数 2020-11-17 17:35:23 +08:00
pixel 2fad9035d3 增加工作流使用方法 接口
增加工作流通用完成方法
增加查询待办
查询我发起的工作流功能
增加测试示例
2020-11-17 16:41:43 +08:00
SliverHorn ef03c95f40 锁定gorm-adapter/v3的版本为v3.0.2 2020-11-17 11:50:19 +08:00
songzhibin97 eb7a6411d1 bug log++ 2020-11-16 22:12:44 +08:00
songzhibin97 e02e70ff26 c2 2020-11-16 21:31:38 +08:00
songzhibin97 b6843e04d5 Update cmd_Task.go 2020-11-16 21:07:57 +08:00
songzhibin97 5e4c82b94a 热更新
修改bug 优化增加回显
2020-11-16 20:55:47 +08:00
SliverHorn 1f411ec6e0 From->Form 2020-11-16 20:40:51 +08:00
SliverHorn a890bd2d38 解决err覆盖问题 2020-11-16 18:38:20 +08:00
1319612909 7a47f59945 Merge branch 'gva_gormv2_dev' of https://github.com/flipped-aurora/gin-vue-admin into gva_gormv2_dev 2020-11-16 14:11:19 +08:00
1319612909 830c2cf29b menu 三级菜单样式 2020-11-16 14:11:10 +08:00
SliverHorn 86593943d3 更新获取工作路径代码,修改go.mod的go版本为1.14 2020-11-16 00:11:21 +08:00
songzhibin97 7c188fa7ce 热更新
缺少具体配置 监控文件以及防抖
2020-11-15 15:51:16 +08:00
SliverHorn a9432b5d9c 更新自动化代码api层代码混入service层代码 2020-11-14 23:15:57 +08:00
songzhibin97 0bebb7f65b Update cmd_Task.go
c2
2020-11-14 19:36:22 +08:00
songzhibin97 6536caed75 Hotreload
Hotreload1
2020-11-14 19:21:06 +08:00
pixel 4863b2c5be 添加流转接口 设计流转表 2020-11-12 18:21:03 +08:00
pixel 86afc0ddf4 Merge branch 'gva_gormv2_dev' of https://github.com/flipped-aurora/gin-vue-admin into gva_workflow 2020-11-11 11:34:19 +08:00
pixel bf6f469dad 修复可能产生数据库锁死的事务错误
修复菜单参数无法修改的错误
2020-11-11 10:59:46 +08:00
pixel 68677e1b5b 增加友好提示 2020-11-11 09:59:18 +08:00
pixel f4709f00ab 工作流起始接口以及动态获取view功能 2020-11-10 17:39:29 +08:00
1319612909 8392398b1c Merge branch 'gva_gormv2_dev' of https://github.com/flipped-aurora/gin-vue-admin into gva_gormv2_dev 2020-11-10 14:06:19 +08:00
1319612909 b4355b4399 css整理 2020-11-10 14:06:03 +08:00
pixel b12bbc74ff 更新workflow函数说明 清理无用workflow文件 2020-11-10 11:50:24 +08:00
pixel d3dbca0e00 Merge branch 'gva_gormv2_dev' of https://github.com/flipped-aurora/gin-vue-admin into gva_workflow
 Conflicts:
	server/api/v1/sys_work_flow.go
	server/service/sys_workflow.go
2020-11-10 11:43:56 +08:00
pixel 81e0e4dde7 menu携带参数问题修复 2020-11-10 11:33:28 +08:00
SliverHorn fba9ab0ae6 删除FindSysDictionary的校验 2020-11-09 21:24:23 +08:00
QM303176530 e18518b4d3 版本号更新 2020-11-08 14:47:04 +08:00
QM303176530 074a7145d2 Merge branches 'gva_gormv2_dev' and 'master' of https://github.com/flipped-aurora/gin-vue-admin into gva_gormv2_dev 2020-11-08 14:42:47 +08:00
QM303176530 46372f0e6c Merge remote-tracking branch 'origin/gva_gormv2_dev' into gva_gormv2_dev 2020-11-08 14:20:19 +08:00
QM303176530 1acd2e3238 前端代码优化 修改密码迁移至个人中心内部 2020-11-08 14:15:06 +08:00
SliverHorn a2e7827aa8 模板文件server/sevice层备注的规范化 2020-11-08 14:02:07 +08:00
SliverHorn ac71aafe83 service层注释规范化 2020-11-08 13:34:17 +08:00
SliverHorn 0b1cc913d9 service层注释规范化 2020-11-08 13:30:12 +08:00
QM303176530 84b967ae82 增强自动化代码使用体验 2020-11-08 13:01:28 +08:00
QM303176530 cf9002a377 自动化代码体验优化 2020-11-08 12:47:55 +08:00
songzhibin97 829fa4dac5 re 2020-11-08 11:08:02 +08:00
songzhibin97 5529d5f46d change2 2020-11-08 10:58:17 +08:00
songzhibin97 08e9c6b38a 优化auto 2020-11-08 07:52:15 +08:00
SliverHorn 5c94c73004 修改模板文件,规范化代码 2020-11-08 03:15:27 +08:00
SliverHorn 8ebb1fda77 修复中间件导包错误及代码优化,更新swagger文档 2020-11-08 02:54:14 +08:00
SliverHorn 96380bd031 server/api/v1层代码swagger备注错误修改及代码优化 2020-11-08 02:43:11 +08:00
SliverHorn c342e63e63 修复一些问题 2020-11-07 22:50:01 +08:00
SliverHorn 4fa43c232d Merge branch 'gva_gormv2_dev' of https://github.com/flipped-aurora/gin-vue-admin into gva_gormv2_dev 2020-11-07 18:28:19 +08:00
SliverHorn d07cbc8783 修复bug 2020-11-07 18:28:04 +08:00
SliverHorn f7667ad3e1 修复bug 2020-11-07 18:24:07 +08:00
krank666 5fe66b7abc Merge branch 'gva_gormv2_dev' of https://github.com/flipped-aurora/gin-vue-admin into gva_gormv2_dev 2020-11-07 18:22:32 +08:00
krank666 856c09c38d 个人中心优化 2020-11-07 18:22:26 +08:00
v_zhibsong b947f043ee change2 2020-11-07 18:03:23 +08:00
SliverHorn ebd515f057 add addAutoMoveFile 2020-11-07 17:32:58 +08:00
v_zhibsong 636faaf93b Update file_operations.go 2020-11-07 16:00:55 +08:00
v_zhibsong ed1c6c7a47 change filepath 2020-11-07 16:00:09 +08:00
v_zhibsong e4340641ad change filemove 2020-11-07 15:35:12 +08:00
SliverHorn 35738cfda8 add autoMoveFilePath 字段,修改utils的fileoperations.go-> file_operations.go 2020-11-07 15:09:11 +08:00
SliverHorn e749adaa10 修改初始化数据时的colume->column 2020-11-07 11:54:04 +08:00
SliverHorn 26a1a89d60 Merge branch 'gva_gormv2_dev' of https://github.com/flipped-aurora/gin-vue-admin into gva_gormv2_dev 2020-11-07 11:38:41 +08:00
SliverHorn 2daa65f00d 修复错别单词colume -> column, 删除tag中多余的; 2020-11-07 11:38:36 +08:00
v_zhibsong d2579d390c add filemove
add filemove
2020-11-07 11:32:45 +08:00
SliverHorn 261e34a5c2 添加自动移动文件的boo; 2020-11-07 11:04:54 +08:00
SliverHorn b4bad21e35 修改v1/sys_menu.go的备注错误及代码优化 2020-11-07 10:40:00 +08:00
SliverHorn 699f53e8b2 修复配置文件设置 zap: show-line: true 没有打印文件及行号的bug 2020-11-07 09:07:57 +08:00
SliverHorn 820c9f733f 优化server/api/v1/exa_customer.go的代码及备注错误 2020-11-07 00:32:31 +08:00
SliverHorn 99bd217080 修改错误单词,新增从gin.Context获取用户id,uuid,authority_id的函数 2020-11-07 00:14:36 +08:00
SliverHorn c86c05f380 修改server/api/v1/sys_user.go的备注错误 2020-11-06 23:45:33 +08:00
pixel 544901bf45 Merge remote-tracking branch 'origin/gva_gormv2_dev' into gva_gormv2_dev 2020-11-06 18:51:51 +08:00
pixel 8db0e2fb06 连接池最大链接数修改为100 2020-11-06 16:54:23 +08:00
pixel c5ed47192e 自动化代码中 批量删除功能增加未选择条目时提醒功能 2020-11-06 16:52:06 +08:00
klausY 3d56cb7eb2 修改scrollBar样式 2020-11-06 16:09:30 +08:00
pixel ada8818960 增加自动化生成表单功能,修改自动化生成文件的文件夹名称更加规范化,css样式调整。 2020-11-06 16:01:09 +08:00
pixel 2f97f4b979 自动填充API功能不再需要手动清理垃圾数据 2020-11-06 14:42:26 +08:00
pixel 0a4e81138a css增加悬浮效果 2020-11-05 17:25:10 +08:00
1319612909 c61350643a index css 2020-11-03 22:28:04 +08:00
1319612909 9f59275652 css 2020-11-05 10:03:01 +08:00
1319612909 1da644b96a css 2020-11-04 18:23:32 +08:00
1319612909 1de825ee43 css 2020-11-04 17:58:14 +08:00
1319612909 2e18f3f5e1 css aside 2020-11-04 11:55:23 +08:00
1319612909 653f73b989 更换ip 2020-11-03 18:12:23 +08:00
1319612909 9c5b9729d8 aside + header css 2020-11-03 18:05:44 +08:00
1319612909 6950e493f2 aside + header css 2020-11-03 18:04:59 +08:00
1319612909 286f0b74da css 整理 2020-11-02 21:59:13 +08:00
pixel a1191abc43 自动化代码不再记录日志 2020-11-02 11:19:29 +08:00
pixel 75799b81e8 Merge branch 'gva_gormv2_dev' of https://github.com/flipped-aurora/gin-vue-admin into gva_gormv2_dev 2020-11-02 11:02:51 +08:00
pixel 511a187f49 当自动化代码报错时不下载 2020-11-02 11:02:25 +08:00
QM303176530 01ecfcdf8d Merge branches 'gva_gormv2_dev' and 'master' of https://github.com/flipped-aurora/gin-vue-admin into gva_gormv2_dev 2020-11-01 19:58:29 +08:00
SliverHorn 14a55fcb83 修改断点续传的提交方式代码 2020-11-01 19:50:34 +08:00
奇淼(piexlmax 49c146b3dc Update README.md 2020-10-31 16:17:03 +08:00
QM303176530 e2c5988bea 修复自动化代码bug 2020-10-31 15:09:13 +08:00
QM303176530 4828dc3dae 增加节点视图配置 2020-10-31 14:00:12 +08:00
QM303176530 8413f0e8d3 Merge branches 'gva_gormv2_dev' and 'gva_workflow' of https://github.com/flipped-aurora/gin-vue-admin into gva_workflow 2020-10-31 00:11:55 +08:00
QM303176530 3d2e9ef063 Merge branches 'develop' and 'gva_gormv2_dev' of https://github.com/flipped-aurora/gin-vue-admin into develop 2020-10-31 00:09:09 +08:00
QM303176530 28c7d178c4 模板按钮美化 2020-10-31 00:08:05 +08:00
QM303176530 5bfc5563b3 工作流增删改查功能完善 2020-10-31 00:04:42 +08:00
QM303176530 d6bc0572c2 工作流增删改查功能完善 2020-10-31 00:03:49 +08:00
QM303176530 32abd69c16 Merge branches 'gva_gormv2_dev', 'gva_workflow' and 'master' of https://github.com/flipped-aurora/gin-vue-admin into gva_workflow
 Conflicts:
	server/cmd/datas/init.go
2020-10-29 22:30:04 +08:00
QM303176530 024f461e94 date 错别字修复 2020-10-29 22:12:42 +08:00
QM303176530 a25823f5b5 修复minxs路径,调整前端结构 2020-10-29 22:08:21 +08:00
QM303176530 4d4d8e4955 修复mixins路径,调整目录结构 2020-10-29 22:08:08 +08:00
SliverHorn 7488db81c1 add err := and delete postgresql initdb 2020-10-29 22:13:24 +08:00
QM303176530 e8c6d388f2 自动化代码可以自动创建form,前端样式修复,前端mixin位置转移 2020-10-29 22:06:09 +08:00
pixel 02f155f497 整体结构变更 新增方法数据错乱问题修复 2020-10-29 17:57:29 +08:00
pixel c570c095b9 Merge branch 'gva_gormv2_dev' of https://github.com/flipped-aurora/gin-vue-admin into gva_workflow
 Conflicts:
	server/cmd/datas/apis.go
	server/cmd/datas/menus.go
	server/model/sys_workflow.go
	server/model/sys_workflow_process.go
2020-10-29 11:41:38 +08:00
pixel 10d8d7f28a 修改gorm.Model为自定义的全局global.GVA_MODEL 方便自定义基础参数 2020-10-29 11:23:34 +08:00
pixel 0e1a820c3a 工作流入库功能 2020-10-29 09:37:02 +08:00
pixel bf21fec50e 工作流录入 根据id查询方法增加 2020-10-27 18:59:51 +08:00
pixel 4e514dc83e 自动化接口填充以及初始化数据制作 2020-10-27 17:38:13 +08:00
pixel 3f52783b30 Merge branch 'gva_workflow' of https://github.com/flipped-aurora/gin-vue-admin into gva_workflow 2020-10-27 16:39:56 +08:00
pixel 16bab848e1 增加description 2020-10-27 16:39:48 +08:00
奇淼(piexlmax 986406a880 Merge pull request #261 from Enginebeck/develop
jwt.go: fix localStorage spell error
2020-10-27 14:53:23 +08:00
奇淼(piexlmax 2946c8ce34 Merge pull request #262 from Zh1Cheung/master
[fix] Unhandled error
2020-10-27 14:51:58 +08:00
奇淼(piexlmax fef12cb747 Merge pull request #257 from Junvary/own_dev
多了一个转义,后端跨域不生效
2020-10-26 21:22:40 +08:00
QM303176530 b710f6a5df 增加快捷键复制粘贴 2020-10-26 20:57:48 +08:00
QM303176530 840723c592 Merge branch 'gva_workflow' of https://github.com/flipped-aurora/gin-vue-admin into gva_workflow 2020-10-26 20:45:28 +08:00
QM303176530 6f63290e74 取消无用节点 2020-10-26 20:44:55 +08:00
张子恒 4d8d4b77c1 Update jwt.go 2020-10-26 20:15:30 +08:00
pixel 10b009bb7e 增加ctrl+z ctrl+y 2020-10-26 18:52:41 +08:00
SliverHorn 7cb172d60a rename data->date 2020-10-26 18:33:45 +08:00
pixel 8350dfe2c9 增加delete删除node功能 2020-10-26 18:21:01 +08:00
SliverHorn 970b2d21a9 add server/api/v1/exa_breakpoint_continue.go error response message 2020-10-26 17:30:23 +08:00
pixel e9c5ac6ec0 修改 workflow数据结构 2020-10-26 16:51:24 +08:00
SliverHorn f7804b627e add gva error message 2020-10-26 15:55:55 +08:00
pixel 247487529b 设计workflow数据结构 2020-10-26 13:37:55 +08:00
pixel 5ef5af4723 侧边更新 2020-10-26 13:31:11 +08:00
pixel 2188f79e77 Merge branch 'master' of https://github.com/flipped-aurora/gin-vue-admin into gva_workflow 2020-10-26 12:44:43 +08:00
pixel a7bb4a7ac4 Merge remote-tracking branch 'origin/gva_gormv2_dev' into gva_gormv2_dev 2020-10-26 12:39:27 +08:00
pixel 06c67c1024 修改 注册接口地址 2020-10-26 12:37:20 +08:00
SliverHorn 03024f192a Merge branch 'gva_gormv2_dev' of https://github.com/flipped-aurora/gin-vue-admin into gva_gormv2_dev 2020-10-26 11:33:28 +08:00
SliverHorn b1baccf0a5 update docker-compose related and update server/Dockerfile 2020-10-26 11:33:17 +08:00
pixel ad047f4c06 gorm 版本升级为 1.20.5 2020-10-26 11:22:40 +08:00
pixel dc1cc2ec10 前端添加默认数据 2020-10-26 11:19:04 +08:00
Beck Qin 6f589d7af9 jwt.go: fix localStorage spell error 2020-10-26 09:27:52 +08:00
SliverHorn eeaaa40259 add Makefile help information 2020-10-25 11:37:15 +08:00
QM303176530 e394a3afdf 忽略某些js文件的eslint 2020-10-25 11:27:38 +08:00
QM303176530 45cc0aec93 版本号更新 2020-10-25 10:42:34 +08:00
QM303176530 0bd80ad900 Merge branches 'gva_gormv2_dev' and 'master' of https://github.com/flipped-aurora/gin-vue-admin into gva_gormv2_dev 2020-10-25 10:36:53 +08:00
QM303176530 1214241dab 版本号更新发版 2020-10-25 10:36:23 +08:00
QM303176530 28dbad6c1f Merge branches 'gva_gormv2_dev' and 'gva_workflow' of https://github.com/flipped-aurora/gin-vue-admin into gva_workflow 2020-10-24 17:05:13 +08:00
QM303176530 84e35753cf 工作流插件参与进入项目本体 2020-10-24 17:04:04 +08:00
QM303176530 6a03008ac9 修改bat文件名 表达正确含义 2020-10-24 16:20:20 +08:00
奇淼(piexlmax cc215d6ad0 Update README.md 2020-10-23 21:14:19 +08:00
Junvary e28217e5ec Update cors.go
多了一个转义,后端跨域不生效
2020-10-23 16:08:50 +08:00
pixel cebb9b3002 修改默认数据 2020-10-23 14:29:09 +08:00
SliverHorn 0d8edbbb64 update initdb 2020-10-23 14:05:36 +08:00
pixel 4abcbeb420 Merge branch 'gva_gormv2_dev' of https://github.com/flipped-aurora/gin-vue-admin into gva_workflow 2020-10-23 14:02:47 +08:00
pixel 77aea09d5f 修改目录结构 2020-10-23 13:58:48 +08:00
SliverHorn 2baf392129 system add middleware, update markfile, add data 2020-10-23 13:57:41 +08:00
pixel c56e0416f2 Merge branch 'gva_gormv2_dev' of https://github.com/flipped-aurora/gin-vue-admin into gva_workflow
 Conflicts:
	server/gva/init_data/init_data.go
2020-10-23 13:27:06 +08:00
pixel d478246edc Merge branch 'master' of https://github.com/piexlmax/QMPlus into gva_gormv2_dev 2020-10-23 13:20:41 +08:00
SliverHorn ea375a026d add windows bat and change mysql password 2020-10-23 13:18:43 +08:00
奇淼(piexlmax 9101d5bdb8 Update README.md 2020-10-23 13:13:59 +08:00
SliverHorn 811df12524 Fix the error that windows cannot create soft connection 2020-10-23 11:04:29 +08:00
SliverHorn 3ee469aef3 add Makefile 2020-10-22 18:18:40 +08:00
SliverHorn 7b503337b1 add .gitignore ignore gva files, and optimization zap.go:Repair split file is windows error 2020-10-22 16:50:20 +08:00
SliverHorn dd65a4a716 Migrate the gva project to the cmd folder, delete other redundant database configurations, optimize the initialization method of viper, zap, and gorm 2020-10-22 16:28:51 +08:00
QM303176530 45f2bd4a15 删除注册页面 为注册接口修改为需要权限 防止业务漏洞 2020-10-18 12:49:18 +08:00
QM303176530 1848ceb8f7 删除注册页面 为注册接口修改为需要权限 防止业务漏洞 2020-10-18 12:26:34 +08:00
pixel 938c598cfb Merge branch 'master' of https://github.com/piexlmax/QMPlus into gva_gormv2_dev 2020-10-15 15:23:39 +08:00
pixel bea9ede941 为富文本编辑器增加标题 2020-10-15 15:20:53 +08:00
SliverHorn 6c4b217b1b repair config env error 2020-10-15 11:55:55 +08:00
奇淼(piexlmax f1de3e6b84 Update README-en.md 2020-10-13 17:37:59 +08:00
奇淼(piexlmax 6cc9a420bf Update README.md 2020-10-13 17:37:16 +08:00
SliverHorn 5b1eb546fd add ss.Dbname 2020-10-13 15:29:08 +08:00
SliverHorn 3c9d81756b 修改body字段类型为longtext 2020-10-12 13:23:45 +08:00
pixel 51b6c1086e 局部更新和自动打开文档 2020-10-12 12:06:00 +08:00
QM303176530 63012b31ac 暂时屏蔽前端自动打开页面功能 2020-10-11 16:18:56 +08:00
QM303176530 9865d53ea7 Merge branches 'gva_workflow' and 'master' of https://github.com/flipped-aurora/gin-vue-admin into gva_workflow
 Conflicts:
	web/package.json
2020-10-11 12:24:11 +08:00
QM303176530 f5c6f95b27 修复warning 前端启动自动打开文档 2020-10-11 11:42:58 +08:00
QM303176530 b7fd730c5e Merge branch 'develop' of https://github.com/flipped-aurora/gin-vue-admin into gva_gormv2_dev 2020-10-11 11:04:56 +08:00
QM303176530 3df918ef00 Merge branches 'gva_gormv2_dev' and 'master' of https://github.com/flipped-aurora/gin-vue-admin into gva_gormv2_dev 2020-10-11 11:04:37 +08:00
QM303176530 a200c2ebe0 更新版本号 2020-10-11 10:58:18 +08:00
QM303176530 a471bae727 修复多点登录拦截失效问题 2020-10-11 10:56:01 +08:00
QM303176530 9f73219c85 Merge remote-tracking branch 'origin/gva_gormv2_dev' into gva_gormv2_dev 2020-10-11 10:53:27 +08:00
QM303176530 5a474585b5 修复添加子菜单不输入内容无法添加参数的问题 2020-10-11 10:53:01 +08:00
QM303176530 213d1a700f 更新gva-wfd的前端版本 2020-10-10 20:29:58 +08:00
pixel c48048bd32 增加屏蔽loading功能 2020-10-10 13:33:48 +08:00
pixel 8fd8296c69 增加屏蔽loading功能 2020-10-10 13:33:33 +08:00
pixel e18f0cae1a 修改工作流基础功能 2020-10-09 17:42:11 +08:00
pixel 973da4df7e Merge branch 'gva_gormv2_dev' of https://github.com/piexlmax/QMPlus into gva_workflow 2020-10-09 16:16:36 +08:00
pixel 130910308d 增加系统信息轮询 2020-10-09 16:15:45 +08:00
pixel b9f7783878 增加工作流前端页面 2020-10-09 16:11:46 +08:00
奇淼(piexlmax 56cc369a77 Merge pull request #243 from ccfish86/develop_image_upload
图片上传压缩(前端)及示例
2020-10-09 13:36:38 +08:00
ccfish 8aee3b27af 图片上传压缩(前端)及示例 2020-10-09 13:22:28 +08:00
pixel 63edd741ba Merge remote-tracking branch 'origin/gva_gormv2_dev' into gva_gormv2_dev 2020-10-09 10:48:27 +08:00
SliverHorn d7007eec59 修复用户不存在的时jwt可使用的问题 2020-10-07 11:14:27 +08:00
SliverHorn 277a732df0 优化oss的初始化方式 2020-10-07 11:02:37 +08:00
SliverHorn a4b15b4731 增加备注与调整一些细节 2020-10-06 15:00:13 +08:00
SliverHorn 07c6bbd7e1 优化docker-compose的配置文件 2020-10-06 12:00:13 +08:00
SliverHorn ad504a17e0 update server-handle.sh 2020-10-06 11:34:07 +08:00
SliverHorn d16ca6967f 优化配置文件的结构体,优化文件上传与下载功能,系统配置的前端展示更友好及其他的优化 2020-10-06 11:30:50 +08:00
SliverHorn 785fde0eaf delete sql and update docker-compose.yaml 2020-10-06 10:24:13 +08:00
Granty1 af761f7472 upgrade action's go version 2020-10-05 22:57:26 +08:00
Granty1 5235511041 front end: server state info 2020-10-05 22:47:40 +08:00
SliverHorn 272f6c7b39 添加os的Compiler的获取 2020-10-05 13:34:39 +08:00
SliverHorn 22bc9f43bd 完成获取服务器信息的功能接口 2020-10-05 13:09:55 +08:00
奇淼(piexlmax c2747590e0 Update README-en.md 2020-09-29 14:07:11 +08:00
奇淼(piexlmax 794f8a631c Update README.md 2020-09-29 14:03:54 +08:00
pixel 04c0071b83 Merge branch 'master' of https://github.com/piexlmax/QMPlus into gva_gormv2_dev
 Conflicts:
	server/gva/init_data/init_data.go
2020-09-28 15:03:23 +08:00
pixel e5de639757 增加版本号功能 2020-09-28 11:32:16 +08:00
SliverHorn 553980cf73 添加issues模板 2020-09-26 17:29:12 +08:00
SliverHorn ff7390f1e6 修复文件上传记录body太大导致的数据库报错 2020-09-25 16:37:15 +08:00
SliverHorn 4927f414f7 优化上传与下载文件示例的上传与删除的api层与service层代码 2020-09-25 13:23:31 +08:00
SliverHorn 329d3fc622 新增服务器参数工具文件,修改8000->8888,删除多余的依赖文件 2020-09-24 16:35:38 +08:00
奇淼(piexlmax 1b6d80dfe9 Merge pull request #228 from maplepie/master
默认使用兼容模式
2020-09-23 21:18:32 +08:00
奇淼(piexlmax dd45558e6a Update README-en.md 2020-09-23 21:07:30 +08:00
奇淼(piexlmax dc273edf3c Update README.md 2020-09-23 21:05:40 +08:00
SliverHorn 621069eee7 优化 优先级: 命令行 > 环境变量 > 默认值 功能 2020-09-23 19:04:24 +08:00
pixel a385d41cc3 Merge remote-tracking branch 'origin/master' 2020-09-23 11:29:30 +08:00
pixel 9e6414fcb1 根据gorm调整初始化数据 sys_data_authority_ids -> sys_data_authority_id 2020-09-23 11:29:05 +08:00
SliverHorn f6a3c65129 修改ErrorToEmail中间件的请求方式错误 2020-09-23 11:25:38 +08:00
SliverHorn d930a9e95a 对gorm生成的外键表多s问题作出兼容代码 2020-09-23 11:14:08 +08:00
SliverHorn 3dea48b54e 完善ErrorToEmail中间件 2020-09-23 11:07:50 +08:00
maplepie f1c00c6b20 默认使用兼容模式
默认使用兼容模式,避免扯皮。
2020-09-23 09:42:29 +08:00
SliverHorn 099ff42404 修复config的错误,调整记录日志中间件的获取用户id逻辑,优先从jwt里取,新增状态码不为200时发送邮件到指定邮箱功能 2020-09-22 18:45:24 +08:00
SliverHorn f8e1832172 新增postgresql的Host配置 2020-09-22 17:53:20 +08:00
QM303176530 9e19684d40 取消 xlsx类型返回 后续作为单独接口示例 修复前端配置文件form表单内容 2020-09-20 12:28:20 +08:00
QM303176530 56c226919e 取消 OkWithXlsx方法 后期会新增示例接口 此处不通用 2020-09-19 23:23:35 +08:00
QM303176530 c6d6180c3c Merge branches 'develop' and 'gva_gormv2_dev' of https://github.com/flipped-aurora/gin-vue-admin into gva_gormv2_dev 2020-09-19 23:20:06 +08:00
QM303176530 9265397f29 casbin修改性能优化 2020-09-19 23:19:18 +08:00
QM303176530 7aea8d71aa Merge branch 'gva_gormv2_dev' of https://github.com/flipped-aurora/gin-vue-admin into gva_gormv2_dev 2020-09-19 22:55:51 +08:00
SliverHorn 40f8ab6101 更新docker-compose的脚本文件 2020-09-19 14:34:17 +08:00
奇淼(piexlmax d7f490a0e8 Merge pull request #219 from HuLuWang/master
cors.go: fix部分浏览器不支持*的格式
2020-09-19 10:37:43 +08:00
汪先森 01a5b859a9 global/response/response.go: add download xlsx method 2020-09-18 18:15:27 +08:00
汪先森 bafe18f6e1 cors.go: fix部分浏览器不支持*的格式 2020-09-18 17:38:14 +08:00
pixel cd310eac17 Merge remote-tracking branch 'origin/gva_gormv2_dev' into gva_gormv2_dev 2020-09-18 15:41:44 +08:00
pixel cbdf1cd92e 取消comment后携带的'' 2020-09-18 15:41:26 +08:00
SliverHorn 759dd34c76 优化zap.go代码,修改dubg输出为info输出 2020-09-16 10:31:56 +08:00
pixel 3fbb2ab0ca 修复前端打包404的问题 2020-09-15 18:09:45 +08:00
pixel ad107aadf1 修复打包过后404的bug 2020-09-15 18:08:26 +08:00
pixel e6e0f1d5db Merge branch 'develop' of https://github.com/piexlmax/QMPlus into gva_gormv2_dev 2020-09-15 16:21:47 +08:00
pixel d3dfdace9f Merge branch 'master' of https://github.com/piexlmax/QMPlus into gva_gormv2_dev 2020-09-15 16:20:13 +08:00
SliverHorn 88abbc26d1 更新配置文件的统一化,并修改zap的level为info 2020-09-15 15:20:07 +08:00
pixel 095b2ff27e 重新整理readme结构 2020-09-15 15:11:53 +08:00
SliverHorn 28f03c3d7e 更新文档(docker-compose的部署说明,swag的安装方式,zap的使用与配置说明) 2020-09-15 11:42:34 +08:00
SliverHorn 3db0cedf7e 修改docker-compose的init.sql的COLLATE由utf8mb4_0900_ai_ci改为utf8mb4_unicode_ci 2020-09-15 10:33:50 +08:00
QM303176530 11fdd96352 修改前端用户信息修改位置,防止报错 2020-09-14 20:39:14 +08:00
pixel b6dfb393a1 替换开发者信息至官网内部链接 2020-09-14 13:38:10 +08:00
pixel 268af2e84e 替换开发者信息至官网内部链接 2020-09-14 13:37:31 +08:00
奇淼(piexlmax 225ef0fc8d Merge pull request #208 from maplepie/master
Update config.go
2020-09-12 21:36:23 +08:00
maplepie d382d15f78 Update config.go
支持自定义配置文件位置
2020-09-12 12:05:49 +08:00
pixel 0833c09e98 Merge branch 'develop' of https://github.com/piexlmax/QMPlus into gva_gormv2_dev 2020-09-11 17:27:05 +08:00
pixel 3e62007e6a Merge remote-tracking branch 'origin/gva_gormv2_dev' into gva_gormv2_dev 2020-09-11 14:21:50 +08:00
pixel d5550bf99c gorm 版本修改 mysql驱动版本修改 2020-09-11 14:21:26 +08:00
SliverHorn 1bdf0cb2ea 更新文档 2020-09-11 11:58:47 +08:00
SliverHorn e3ccccd1f3 更新文档,优化docker-compose的网络自定义 2020-09-11 11:43:17 +08:00
SliverHorn ecfc8cd1e7 更新文档 2020-09-10 19:25:20 +08:00
SliverHorn ba0bcefec4 优化docker-compose的前端项目不依赖于Gin,使用nginx 2020-09-10 19:15:44 +08:00
SliverHorn 93d1fdae31 gorm降回v0.2.35 2020-09-10 11:04:11 +08:00
SliverHorn 35d0ab10a9 Merge pull request #204 from maplepie/master
优化图标列表代码
2020-09-09 18:36:02 +08:00
maplepie d9db6c1b36 Update index.vue
优化代码
2020-09-09 18:23:58 +08:00
pixel 096fa511f4 Merge branch 'develop' of https://github.com/piexlmax/QMPlus into gva_gormv2_dev 2020-09-09 16:17:43 +08:00
pixel df69c96bd3 默认readme修改为中文 2020-09-09 16:17:26 +08:00
pixel 9b40ea5913 默认readme修改为中文 2020-09-09 16:03:36 +08:00
pixel c9b484bec2 取消头像地址配置 2020-09-09 16:01:28 +08:00
SliverHorn c6700a72bc 适配了Gorm的v1.20.0版本,迁移初始表的注册函数至gorm.go并优化了代码,注释了sqlite的初始化,需要的自行打开注释,默认使用mysql 2020-09-09 14:48:33 +08:00
pixel 630300cf37 修改email基础配置数据 2020-09-08 17:00:14 +08:00
奇淼(piexlmax fd0f741a01 Merge pull request #201 from maplepie/master
增加邮件发送功能
2020-09-08 16:16:48 +08:00
maplepie 6631aa35db add email module 2020-09-08 15:57:46 +08:00
SliverHorn e9ef8f7882 完成GORM的支持四个数据库的配置 2020-09-07 18:17:27 +08:00
pixel be9c85ae42 删除无用函数,整洁结构目录 2020-09-07 13:56:21 +08:00
pixel a8b01b6314 开启初始化配置 暂时修改为 配置文件控制 2020-09-07 13:18:02 +08:00
pixel 513259f65f 自动初始化单独建包 为 命令行做基础 2020-09-07 13:10:53 +08:00
pixel 11cde72962 Merge remote-tracking branch 'origin/gva_gormv2_dev' into gva_gormv2_dev
# Conflicts:
#	server/go.mod
#	server/initialize/data.go
#	server/model/sys_base_menu.go
#	server/service/sys_db_initialize.go
2020-09-07 11:38:46 +08:00
pixel fb6dfcbd72 自动初始化单独建仓 为 命令行做基础 2020-09-07 11:33:28 +08:00
SliverHorn 734ff79890 更新docker-compose的server-handle.sh 2020-09-07 09:55:15 +08:00
QM303176530 2fdb014717 增加官方网站 2020-09-05 12:28:32 +08:00
QM303176530 377777e2c1 gormv2版本不再提供db初始化数据 2020-09-05 12:05:27 +08:00
SliverHorn e810a08c0e go-logging(停止维护了)替换成zap, zap的配置完善优化,gva的日志更换zap后的处理 2020-09-05 11:55:51 +08:00
QM303176530 14ea27749c 增加侧边栏配置其他网站功能(name以:http://开头或者https://开头即可) 2020-09-05 11:40:45 +08:00
SliverHorn 012f2569b1 zap日志的配置优化及初始化优化 2020-09-03 16:25:52 +08:00
SliverHorn 01c4206443 新增zap日志库的支持,并提供Recovery的中间件 2020-09-02 15:13:54 +08:00
SliverHorn a46859987e 修改docker-compose的mysql镜像源为官方的mysql,脚本和初始数据迁移到.docker-compose文件夹下,为docker-server添加ls -al方便使用docker-compose的时候调试错误 2020-09-02 10:50:57 +08:00
QM303176530 34bc072efd gormv2版本不再提供db初始化数据 2020-08-31 23:48:02 +08:00
QM303176530 d7813c3507 用户头像由上传模式改为 媒体库选择模式 2020-08-31 23:33:28 +08:00
QM303176530 0403ec3ffe 用户头像由上传模式改为 媒体库选择模式 2020-08-31 23:04:53 +08:00
QM303176530 f8cb44b51d 调整gorm2版本对应模板细节 2020-08-31 21:23:25 +08:00
pixel b31a8d34d6 清理无用方法FileCreateComplete 2020-08-31 18:05:40 +08:00
pixel 2c5a19fe8f errors.Is相关代码嵌套层级简化 2020-08-31 18:03:54 +08:00
SliverHorn 67ec569fc1 更新测试文档 2020-08-31 16:10:19 +08:00
SliverHorn ccdb695c06 更新文档,修复新增菜单的name重复问题,修复sys_user注册,删除更新记录与casb RBAC RESTFUL测试,多余数据的删除 2020-08-31 16:05:26 +08:00
pixel db0bddf1d4 取消对插件的支持 2020-08-31 15:29:08 +08:00
pixel c1dc629daf Merge remote-tracking branch 'origin/gva_gormv2_dev' into gva_gormv2_dev
# Conflicts:
#	server/db/qmplus.sql
2020-08-31 15:27:41 +08:00
QM303176530 dd789b3991 Merge branches 'gva_gormv2_dev' and 'master' of https://github.com/flipped-aurora/gin-vue-admin into gva_gormv2_dev
 Conflicts:
	server/core/install_plugs.go
	server/initialize/plug.go
	server/model/sys_authority.go
2020-08-29 21:30:55 +08:00
QM303176530 be8bac1ea1 取消插件模式 不再对插件提供支持 2020-08-29 21:26:45 +08:00
奇淼(piexlmax 602a64b879 Update FUNDING.yml 2020-08-29 21:23:22 +08:00
QM303176530 3a8ea28ea2 清理垃圾数据 默认七牛上传 2020-08-29 16:30:30 +08:00
QM303176530 39e7b641ea 清理垃圾数据 2020-08-29 16:30:09 +08:00
QM303176530 a104453aae Merge branches 'develop' and 'gva_gormv2_dev' of https://github.com/flipped-aurora/gin-vue-admin into gva_gormv2_dev
 Conflicts:
	server/db/qmplus.sql
	server/service/sys_menu.go
2020-08-29 16:29:24 +08:00
QM303176530 59af022125 默认使用七牛上传 2020-08-29 16:24:57 +08:00
QM303176530 e92df293d5 Merge branches 'develop' and 'gin-vue-admin_v2_dev' of https://github.com/flipped-aurora/gin-vue-admin into gin-vue-admin_v2_dev 2020-08-29 16:20:42 +08:00
QM303176530 4805879702 向gormv2过度 自定义类型长度使用size进行限制 2020-08-29 16:19:15 +08:00
QM303176530 f90d4745c1 视图 格式化 2020-08-29 16:15:44 +08:00
QM303176530 f53f8ddc65 增加mysql过滤,修改角色id长度 模板长度修改为size模式 2020-08-29 15:55:35 +08:00
QM303176530 6ec20fce3a 增加mysql过滤,修改角色id长度 2020-08-29 15:11:20 +08:00
pixel 88e7b46f32 防止自动建表失败 角色id主键长度限制为100 2020-08-27 12:56:14 +08:00
pixel f707f70f80 Merge branch 'develop' of https://github.com/piexlmax/QMPlus into gva_gormv2_dev
 Conflicts:
	server/db/qmplus.sql
	server/service/sys_menu.go
2020-08-27 11:19:03 +08:00
奇淼(piexlmax 16722ccd31 Merge pull request #189 from azunia/own_dev
修改了头像组件 增加了本地上传功能
2020-08-26 17:49:43 +08:00
azunia 7e1cfc6f09 可切换本地与七牛云上传,增加头像与图片组件 2020-08-26 17:26:03 +08:00
azunia d6fe1339b2 可切换本地与七牛云上传,增加头像与图片组建 2020-08-26 17:16:49 +08:00
SliverHorn aab91dec6c 更新测试文档及初始数据的错误,修复in条件查询, gormv2取消()的占位符,更新模板文件的()占位符 2020-08-26 13:46:03 +08:00
SliverHorn 40e2344629 api管理测试完成,修复casbin的API更新随动map[string]string改为map[string]interface{} 2020-08-26 11:23:40 +08:00
SliverHorn 8fb0df69b9 注释初始化函数,按需打开 2020-08-25 18:39:53 +08:00
SliverHorn 8a45a686a0 修复视图执行失败的bug 2020-08-25 18:39:10 +08:00
SliverHorn d4101f7f34 修复一些数据同步问题,更新文档,取消在配置文件读取值作为同步数据的标志,改为方法注释的方式 2020-08-25 18:17:33 +08:00
SliverHorn cf73dbd0d9 数据初始化完成 2020-08-25 16:34:45 +08:00
pixel 6c9f8b5eba Association相关问题修复 2020-08-25 14:41:28 +08:00
pixel 5a9247509a 修改 authority 关联删除的问题 2020-08-25 13:56:48 +08:00
QM303176530 98d5cab1d5 文档更新 2020-08-24 21:53:50 +08:00
SliverHorn 87ee4436ea 添加测试文档,Find替换为First方法 2020-08-24 15:54:21 +08:00
QM303176530 2bbb51c41e utf8->utf8mb4 2020-08-23 19:26:52 +08:00
QM303176530 7fca9c7ce0 gormv2升级 阶段2 2020-08-23 16:41:22 +08:00
QM303176530 aee6748c49 gormv2升级 阶段2 2020-08-23 16:29:26 +08:00
QM303176530 ee9b19bb0b gormv2升级 阶段2 2020-08-23 16:28:20 +08:00
QM303176530 f69b40a532 重大bug紧急修复,获取本角色菜单查询条件丢失! 2020-08-23 15:38:03 +08:00
QM303176530 48e6ac39e2 gormv2升级 第一阶段 2020-08-23 15:27:00 +08:00
QM303176530 363ff3ba70 gormv2升级 第一阶段 2020-08-23 15:13:23 +08:00
QM303176530 f130aec168 断点续传添加事务回滚 2020-08-22 12:28:35 +08:00
pixel 10ea953bfd 修复中间件跨域问题 2020-08-20 12:01:52 +08:00
pixel 9f1504e88a 修复swag参数错误 2020-08-20 12:00:17 +08:00
pixel 0239f7b97c 增加令牌自动续期功能 2020-08-17 14:04:02 +08:00
QM303176530 9679616935 清理warning相关信息 2020-08-16 20:27:56 +08:00
QM303176530 2022a417ab 修复了tab右键相关操作的bug 2020-08-16 20:21:38 +08:00
QM303176530 980436807c 修复菜单参数导致tab栏点击切换出现错误的问题 2020-08-16 19:53:47 +08:00
QM303176530 fd74cc719d Merge remote-tracking branch 'origin/gin-vue-admin_v2_dev' into gin-vue-admin_v2_dev 2020-08-15 23:15:29 +08:00
QM303176530 d1502d2b7d 增加了断点续传插件版 保留原始版本供学习原理使用 2020-08-15 23:14:49 +08:00
SliverHorn a5558badf1 修复三首歌曲无法播放的问题 2020-08-15 17:45:20 +08:00
QM303176530 f99bfe2c84 增加菜单参数配置功能
移除视图中复杂sql更改为model映射模式
2020-08-11 23:41:47 +08:00
QM303176530 834a233d19 增加菜单参数配置功能
移除视图中复杂sql更改为model映射模式
2020-08-11 23:23:37 +08:00
SliverHorn 61fdaefe24 Merge branch 'gin-vue-admin_v2_dev' of https://github.com/flipped-aurora/gin-vue-admin into gin-vue-admin_v2_dev 2020-08-07 10:41:56 +08:00
SliverHorn cf217bde03 恢复web的前端production配置文件的v1代理,server的config.yaml以及core文件夹下的server.go文件恢复原样,新增两个命令行脚本自定义配置及文件变动,修改mysql的3306端口为13306 2020-08-07 10:41:21 +08:00
QM303176530 e6e99d0b52 修改sys_operation_records表的body字段和resp字段的属性为longtext 2020-08-06 22:03:26 +08:00
QM303176530 73d55910e5 Merge branches 'gin-vue-admin_v2_dev' and 'master' of https://github.com/flipped-aurora/gin-vue-admin into gin-vue-admin_v2_dev 2020-08-06 21:09:08 +08:00
SliverHorn f643abd549 README.md新增docker-compose的使用文档 2020-08-06 17:26:56 +08:00
rainyan fe40c28814 Update Readme 2020-08-06 16:50:00 +08:00
rainyan 5233bf2e5b Update Readme 2020-08-06 16:48:30 +08:00
rainyan 971dafbb8d update Readme 2020-08-06 16:47:39 +08:00
SliverHorn 8ae25dc264 新增docker-compose的支持,文档说明取消gopm,改用Go Modules主流的代理模式 2020-08-06 16:09:49 +08:00
rainyan a8524fa30f Update ReadMe 2020-08-05 22:29:28 +08:00
rainyan b9b3a30f75 Update ReadMe 2020-08-05 22:27:27 +08:00
rainyan d97b49c950 Update ReadMe 2020-08-05 22:26:32 +08:00
rainyan d303955747 Update ReadMe 2020-08-05 22:25:41 +08:00
蒋吉兆 211ba42fed Update README-zh_CN.md 2020-08-03 17:11:57 +08:00
蒋吉兆 f61f4d6b77 Update README.md 2020-08-03 17:08:58 +08:00
蒋吉兆 152ec2423c Update README.md 2020-08-03 16:56:35 +08:00
蒋吉兆 fee4af62c4 Merge pull request #170 from WangLeonard/pack-static-files
打包静态文件到二进制
2020-07-29 10:51:13 +08:00
Leonard Wang 2483581158 打包静态文件到二进制 2020-07-28 22:27:49 +08:00
pixel 9cb7ae871d Merge branch 'gin-vue-admin_v2_dev' of https://github.com/piexlmax/QMPlus into gin-vue-admin_v2_dev 2020-07-28 15:24:16 +08:00
pixel 06cbc9c3a3 消灭了小图标状态下Maximum的问题 2020-07-28 15:24:01 +08:00
QM303176530 fb0ac5356e Merge remote-tracking branch 'origin/gin-vue-admin_v2_dev' into gin-vue-admin_v2_dev 2020-07-26 20:35:18 +08:00
QM303176530 8dfdb21c36 添加指令:v-auth,根据当前角色来选择是否展示页面某些元素 2020-07-26 20:27:39 +08:00
klausY 60341e2881 版权标识细节调整 2020-07-21 11:18:02 +08:00
pixel d53fe1f32c Merge branches 'gin-vue-admin_v2_dev' and 'master' of https://github.com/piexlmax/QMPlus into gin-vue-admin_v2_dev 2020-07-20 18:05:28 +08:00
QM303176530 41c4b8f0a5 代码生成器支持直接使用字典
修复查询涉及sql关键字时sql语句报错问题
2020-07-18 14:39:03 +08:00
蒋吉兆 fbca3eaa7b Merge pull request #155 from SliverHorn/patch-1
Update sys_dictionary.go
2020-07-18 14:38:27 +08:00
QM303176530 de1d090c31 代码生成器支持直接使用字典
修复查询涉及sql关键字时sql语句报错问题
2020-07-18 14:27:03 +08:00
SliverHorn 6be75b61a8 Update sys_dictionary.go
添加``,解决mysql关键字冲突
2020-07-17 23:21:50 +08:00
pixel 0f7a6a548f 增加贡献者列表 修复系统设置mysqllog问题和创建用户最低6个字符限制 2020-07-17 16:07:59 +08:00
pixel 9a12fbf48c 增加详细教程 2020-07-16 18:16:11 +08:00
pixel 2f8c532713 增加开发步骤教学 2020-07-16 18:13:34 +08:00
pixel 6ddda9f77e Merge branches 'gin-vue-admin_v2_dev' and 'master' of https://github.com/piexlmax/QMPlus into gin-vue-admin_v2_dev 2020-07-15 10:57:43 +08:00
pixel 174a300172 修复 操作日志当结构不为json时的参数展示形式 2020-07-15 10:55:22 +08:00
QM303176530 7ca11b979a 更换在线预览地址 2020-07-11 01:34:07 +08:00
pixel a586375724 Merge branches 'gin-vue-admin_v2_dev' and 'master' of https://github.com/piexlmax/QMPlus into gin-vue-admin_v2_dev 2020-07-10 18:04:18 +08:00
pixel 4d9da856f7 Merge branch 'gin-vue-admin_v2_dev' of https://github.com/piexlmax/QMPlus into gin-vue-admin_v2_dev 2020-07-10 18:03:41 +08:00
pixel cea3618e74 修改重复校验 2020-07-10 18:03:35 +08:00
蒋吉兆 aec64e4e79 Create FUNDING.yml 2020-07-10 16:23:32 +08:00
蒋吉兆 4adf2f1b04 Update README-zh_CN.md 2020-07-09 15:26:21 +08:00
蒋吉兆 eeb9f0aae6 Update README.md 2020-07-09 15:25:24 +08:00
蒋吉兆 cea8a12a37 Merge pull request #137 from xy6409068/develop
Update system.vue
2020-07-08 19:48:09 +08:00
安徽许彦祖 c2c8d4fa3b Update system.vue
修复端口号修改失败问题
2020-07-08 18:28:00 +08:00
安徽许彦祖 55cea812b5 Update system.vue
修复更改端口号时清零问题
2020-07-08 18:21:04 +08:00
pixel 555dd46296 Merge branches 'master' and 'operation-record' of https://github.com/piexlmax/QMPlus into operation-record 2020-07-08 16:59:24 +08:00
pixel 86ad612884 Merge branches 'develop' and 'operation-record' of https://github.com/piexlmax/QMPlus into operation-record 2020-07-08 11:24:12 +08:00
pixel df0312e60e 2020/07/08 数据库更新 数据库版本补丁 2020-07-08 11:23:21 +08:00
granty1 1a75f23615 Fixed bug: log will not appear in log file 2020-07-07 19:39:25 +08:00
pixel f8c0896775 数据库脚本替换 2020-07-07 17:40:49 +08:00
pixel 71ba8e7b55 删除测试代码 2020-07-07 16:49:59 +08:00
pixel 0e256bc912 增加状态码标签样式 2020-07-07 16:46:47 +08:00
pixel 943913b443 自动化代码增加 批量删除功能 2020-07-07 16:39:36 +08:00
pixel a7e2ef171f 更改日志功能样式 2020-07-07 15:41:40 +08:00
pixel 152946ac42 文档更新 2020-07-07 10:21:17 +08:00
pixel 35b507204c 修改查询table sql语句 兼容性 2020-07-07 10:02:20 +08:00
pixel 7a31de2960 menu鉴权模式代码书写重复 2020-07-07 09:41:54 +08:00
QM303176530 e27066d9ac 从数据库获取表结构直接生成代码 2020-07-05 22:07:22 +08:00
QM303176530 9068ca6ea7 数据库更新,从table构建代码模式更新 2020-07-05 16:48:26 +08:00
QM303176530 8f21a2158f Merge branch 'operation-record' of https://github.com/flipped-aurora/gin-vue-admin into operation-record
 Conflicts:
	server/router/sys_auto_code.go
2020-07-05 16:31:06 +08:00
QM303176530 fe7364b301 可从数据库获取字段 2020-07-05 16:29:45 +08:00
Granty1 783e355501 update method of operation record 2020-07-05 14:45:05 +08:00
QM303176530 9a582877ea 增加body列 2020-07-04 18:54:30 +08:00
granty1 537e7ced45 Add user id support for operation record. 2020-07-03 16:45:58 +08:00
蒋吉兆 ceeb00043a Update README-zh_CN.md 2020-07-02 21:54:01 +08:00
蒋吉兆 79c2d33a01 Update README.md 2020-07-02 21:53:31 +08:00
QM303176530 1c99c3a377 头部信息增加用户id 2020-07-02 15:24:02 +08:00
QM303176530 44c4b2764e 进行日志相关样式修改,删除无用接口 2020-07-02 15:06:20 +08:00
QM303176530 06976adb00 屏蔽七牛云相关配置 2020-07-02 15:05:31 +08:00
QM303176530 ec53501431 Merge branches 'master' and 'operation-record' of https://github.com/flipped-aurora/gin-vue-admin into operation-record
 Conflicts:
	server/config.yaml
2020-07-02 14:34:08 +08:00
蒋吉兆 92f82af3d2 Merge pull request #128 from JuwanXu/develop
非 Windows 操作系统使用endless启动服务
2020-07-02 14:06:33 +08:00
QM303176530 4153eb9435 屏蔽七牛云相关配置 2020-07-01 15:44:23 +08:00
蒋吉兆 ecab8cf918 Merge pull request #132 from jimmy201602/master
fix qiniu go mod bug
2020-07-01 15:45:32 +08:00
jimmy201602 46e0960c3a fix qiniu go mod bug 2020-07-01 14:56:43 +08:00
granty1 974b7c7b81 Add operation record, and the user ID is not well thought out how to parse~ 2020-06-30 13:55:43 +08:00
徐志伟 9a0c74e04c 修复Windows下编译endless失败问题 2020-06-30 12:43:21 +08:00
QM303176530 bd45ec083f 修正角色id为空的bug 2020-06-30 11:50:02 +08:00
granty1 ce013d31c2 add operation primary realization 2020-06-29 21:58:53 +08:00
Granty1 33340c2eb8 add base operation record code 2020-06-28 22:04:54 +08:00
QM303176530 7b1a87116c 增加字典提示 2020-06-28 21:36:30 +08:00
QM303176530 6adfab6d8a 增加示例注释 2020-06-28 21:29:07 +08:00
QM303176530 02df16d2f0 前端文件变化,数据库文件变更 2020-06-28 21:26:52 +08:00
QM303176530 30f1ee77e0 前端utils中封装了前端获取字典并缓存到内存的方法getDict 2020-06-28 21:23:06 +08:00
QM303176530 f6c951dd13 验证码配置参数修改进配置文件,前端角色id不再允许输入英文字符 2020-06-26 21:40:26 +08:00
QM303176530 9c40447071 修复客户管理示例文件的查询bug 2020-06-26 17:26:54 +08:00
徐志伟 990fd1f4f3 非Windows操作系统使用endless启动服务 2020-06-25 19:02:09 +08:00
徐志伟 a9961f1f19 update go.mod 2020-06-25 18:53:23 +08:00
徐志伟 413f4bca17 update go.mod 2020-06-25 18:52:07 +08:00
QM303176530 472e5039fb Merge branches 'develop', 'gin-vue-admin_v2_dev' and 'master' of https://github.com/flipped-aurora/gin-vue-admin into develop
 Conflicts:
	server/resource/template/te/model.go.tpl
2020-06-24 21:57:10 +08:00
QM303176530 fa3b53d1fd 增加字典管理 2020-06-24 21:53:54 +08:00
QM303176530 96bd856405 字典细节调整 2020-06-24 20:45:49 +08:00
QM303176530 08301fde62 增加字典管理功能 2020-06-24 20:41:36 +08:00
蒋吉兆 0e72e9f9f9 Merge pull request #127 from hansonyu183/fix-bug-and-new-feature
修复:AutoCode生成的表格不显示bool值
2020-06-23 18:38:44 +08:00
hansonyu183 666ad8c14e Merge branch 'fix-bug-and-new-feature' of github.com:hansonyu183/gin-vue-admin into fix-bug-and-new-feature 2020-06-22 22:41:47 +08:00
hansonyu183 3791e573d3 修复:AutoCode生成的表格不显示bool值
修复:多了个}
2020-06-22 22:39:38 +08:00
hansonyu183 fab3d5402f 修复:AutoCode生成的表格不显示bool值 2020-06-22 22:13:06 +08:00
蒋吉兆 f09c081b5d Update model.go.tpl
自动化代码bug修复
2020-06-21 13:00:28 +08:00
QM303176530 27e5c1786c 二维码模式更换 2020-06-20 16:38:33 +08:00
QM303176530 f54c6f2124 Merge branches 'develop' and 'master' of https://github.com/flipped-aurora/gin-vue-admin into develop 2020-06-20 15:47:32 +08:00
蒋吉兆 88aab4666d Merge pull request #125 from hansonyu183/fix-bug-and-new-feature
修复优化自动代码中对bool类型搜索字段的支持
2020-06-20 15:33:30 +08:00
hansonyu183 937239b7ba 修复优化自动代码中对bool类型搜索字段的支持 2020-06-20 13:01:08 +08:00
QM303176530 6411c5cb9c Merge branches 'gin-vue-admin_v2_dev' and 'plug' of https://github.com/flipped-aurora/gin-vue-admin into plug 2020-06-16 13:55:49 +08:00
QM303176530 052534210b 隐藏代码注入方式的插件模式 2020-06-16 13:54:54 +08:00
QM303176530 0da10baf19 修改数量查询方法 2020-06-16 13:54:07 +08:00
pixel 8853992c1a gvaplug 版本号更新 2020-06-12 17:01:47 +08:00
pixel 17d73b1262 插件功能修改 2020-06-12 16:43:47 +08:00
Granty1 561b20efe2 Add some log & remove useless func 2020-06-12 16:20:38 +08:00
QM303176530 8ec30ac3b7 插件功能更新 修改插件包的实现方案 2020-06-11 23:52:25 +08:00
QM303176530 98eb6bd796 Merge branch 'master' of https://github.com/flipped-aurora/gin-vue-admin into plug 2020-06-11 23:13:28 +08:00
QM303176530 aa2d304682 屏蔽开发中的插件功能 2020-06-11 23:13:04 +08:00
蒋吉兆 738175a9d8 Update README-zh_CN.md 2020-06-11 22:16:21 +08:00
蒋吉兆 884c8a433e Update README.md 2020-06-11 22:15:56 +08:00
蒋吉兆 5f5e105c87 Update README-zh_CN.md 2020-06-11 18:03:18 +08:00
蒋吉兆 682d92e00b Update README.md 2020-06-11 16:06:17 +08:00
pixel 2d01841b9e Merge branches 'gin-vue-admin_v2_dev', 'master' and 'plug' of https://github.com/piexlmax/QMPlus into plug 2020-06-11 11:50:03 +08:00
Granty1 7e574cb525 Format project code & upgrade some dependence 2020-06-11 11:40:21 +08:00
pixel eca0a38678 增加表格注释 2020-06-11 09:39:44 +08:00
蒋吉兆 fe3256175d Merge pull request #117 from DaiZero/master
fix fullscreen bug
2020-06-09 04:43:44 -05:00
DZero e5fd2fa1a7 fix fullscreen bug
修复点击全屏后,按Esc键退出全屏,全屏按钮图标没有改变的问题
2020-06-09 14:38:01 +08:00
pixel c7ea8ccb7d 角色管理新增角色bug修复 2020-06-08 12:52:48 +08:00
pixel 3b18442e76 自动生成代码按钮列加宽 2020-06-07 15:31:09 +08:00
pixel 7ad73a09b3 按钮美化 2020-06-07 15:08:51 +08:00
pixel 2da199145d Merge branches 'develop' and 'plug' of https://github.com/piexlmax/QMPlus into plug 2020-06-07 15:07:10 +08:00
蒋吉兆 671e450a99 Merge pull request #111 from 957651480/master
数据表操作美化按钮
2020-06-07 02:06:45 -05:00
pixel fde276e159 增加自动创建搜索功能 增加搜索条件 增加数据库注释 增加插件功能(0.0.1版 请勿用于生产) 2020-06-07 14:56:37 +08:00
yangtaihua bb64ea839b 数据表操作按钮美化 2020-06-07 07:46:43 +08:00
pixel 8173ff6fc2 插件功能开发完整度 +1 2020-06-07 00:04:56 +08:00
QM303176530 c4a6b33f62 修复角色新增时携带信息问题 2020-06-01 21:02:32 +08:00
pixel db26f5b8f5 冗余代码修复 2020-06-01 17:43:02 +08:00
pixel 5d411c021e Merge branches 'gin-vue-admin_v2_dev' and 'master' of https://github.com/piexlmax/QMPlus into gin-vue-admin_v2_dev 2020-06-01 12:05:48 +08:00
pixel 1597eeacfc icon warning修复 2020-06-01 11:53:56 +08:00
pixel d94d7c4c29 上移 下载美化 2020-06-01 11:48:33 +08:00
pixel 3cd2ea25e5 Merge branches 'develop' and 'gin-vue-admin_v2_dev' of https://github.com/piexlmax/QMPlus into gin-vue-admin_v2_dev
 Conflicts:
	server/resource/template/te/model.go.tpl
2020-06-01 11:22:00 +08:00
pixel fb2794adde Merge remote-tracking branch 'origin/gin-vue-admin_v2_dev' into gin-vue-admin_v2_dev
# Conflicts:
#	server/resource/template/te/model.go.tpl
2020-06-01 11:18:45 +08:00
pixel 318f688259 Merge branch 'gin-vue-admin_v2_dev' of G:\QMPlus with conflicts. 2020-06-01 11:18:13 +08:00
蒋吉兆 e51e8aef73 Merge pull request #102 from WangLeonard/refactor-CreateTemp
重构CreateTemp
2020-05-31 22:13:03 -05:00
蒋吉兆 f237557b99 Update README.md 2020-05-30 15:32:21 +08:00
蒋吉兆 291c30cfed Update README-zh_CN.md 2020-05-30 15:18:24 +08:00
QM303176530 518bdba578 tag添加form 前端icon不存在的属性增加 2020-05-29 20:59:17 +08:00
pixel 5cb3d7bc86 全局样式bug修复 2020-05-28 22:16:41 +08:00
pixel 7b52618f53 增加路由搜索功能 左侧菜单栏增加图标 2020-05-28 22:08:26 +08:00
Leonard Wang a7141feff7 重构CreateTemp 2020-05-28 00:48:27 +08:00
pixel f2a0f9776d Merge branches 'gin-vue-admin_v2_dev' and 'master' of https://github.com/piexlmax/QMPlus into gin-vue-admin_v2_dev 2020-05-26 16:47:08 +08:00
蒋吉兆 9bfb5eba97 Merge pull request #100 from DaiZero/master
field列表添加上移和下移的功能
2020-05-25 22:43:56 -05:00
Grant 0de756512f Merge pull request #67 from flipped-aurora/action-ci
Add code build test
2020-05-26 10:11:58 +08:00
Granty1 68296e6f4f Delete backend_deploy.yml 2020-05-26 10:07:15 +08:00
Granty1 3d9837b7e3 Remove deploy script & reset config file 2020-05-26 10:05:04 +08:00
Granty1 6c991962fc Merge branch 'master' of https://github.com/flipped-aurora/gin-vue-admin into action-ci 2020-05-26 10:02:16 +08:00
DZero 75432c45ba field列表添加上移和下移的功能 2020-05-26 08:37:40 +08:00
klausY c96a7732b4 Merge branch 'gin-vue-admin_v2_dev' of https://github.com/flipped-aurora/gin-vue-admin into gin-vue-admin_v2_dev 2020-05-25 16:55:38 +08:00
klausY 8c5ae61a13 顶部搜索功能添加及生成代码功能去重校验 2020-05-25 16:55:27 +08:00
QM303176530 af3b6919be system组件修复 2020-05-22 22:08:19 +08:00
klausY ad4562b026 Merge branch 'gin-vue-admin_v2_dev' of https://github.com/flipped-aurora/gin-vue-admin into gin-vue-admin_v2_dev 2020-05-22 17:34:42 +08:00
jinlan.du 0f7cb13821 添加全屏切换 2020-05-22 16:36:22 +08:00
pixel 8186d9ef3a 左侧菜单优化 2020-05-21 17:22:07 +08:00
jinlan.du 625bd91b94 添加导航项目名称 2020-05-21 14:39:31 +08:00
jinlan.du 67fb113648 Merge branch 'gin-vue-admin_v2_dev' of https://github.com/flipped-aurora/gin-vue-admin into gin-vue-admin_v2_dev 2020-05-20 18:30:18 +08:00
jinlan.du c958853c14 表格css冲突修正 2020-05-20 18:30:10 +08:00
klausY 1d38214fe5 Merge branch 'gin-vue-admin_v2_dev' of
https://github.com/flipped-aurora/gin-vue-admin into
gin-vue-admin_v2_dev
2020-05-20 17:44:50 +08:00
klausY bcdc7b266a 上传图片跳转审核页面的问题修改 2020-05-20 17:44:43 +08:00
pixel 7544b9dcf6 Merge remote-tracking branch 'origin/gin-vue-admin_v2_dev' into gin-vue-admin_v2_dev 2020-05-20 16:11:42 +08:00
pixel dd699b1546 支持path添加参数 2020-05-20 16:11:19 +08:00
pixel cfb6f5038b 修改配置path灵活度 可增加路由参数 2020-05-20 16:01:48 +08:00
jinlan.du 927c8ab248 断点续传input隐藏 2020-05-20 15:11:12 +08:00
jinlan.du e63394a355 Merge branch 'gin-vue-admin_v2_dev' of https://github.com/flipped-aurora/gin-vue-admin into gin-vue-admin_v2_dev 2020-05-20 15:02:17 +08:00
蒋吉兆 1264272ff8 Merge pull request #92 from WangLeonard/fix-format-problems
Fix format problems
2020-05-20 00:53:34 -05:00
Leonard Wang b09e54c205 修复格式问题,重构嵌套层数过深的函数 2020-05-19 23:46:07 +08:00
Leonard Wang 5e2687a742 修复 go fmt 问题 2020-05-19 22:08:45 +08:00
jinlan.du 905ad0e2d2 表格折行优化 2020-05-18 14:53:30 +08:00
jinlan.du 56ff0c69cb 表格折行优化 2020-05-18 13:29:48 +08:00
jinlan.du 1110a3f7dc Merge branch 'gin-vue-admin_v2_dev' of https://github.com/flipped-aurora/gin-vue-admin into gin-vue-admin_v2_dev 2020-05-18 10:43:26 +08:00
pixel f567ce80e6 仪表盘细节调整 2020-05-15 16:09:10 +08:00
pixel fa50c11a67 404不再全屏展示 方便退出和修改配置 2020-05-15 14:45:14 +08:00
jinlan.du e878d35b6f Merge branch 'gin-vue-admin_v2_dev' of https://github.com/flipped-aurora/gin-vue-admin into gin-vue-admin_v2_dev 2020-05-15 13:39:10 +08:00
pixel dc27fe21b2 样式美化 2020-05-15 11:38:00 +08:00
pixel 00077b6b85 动画视觉效果优化 2020-05-15 10:40:02 +08:00
pixel 2cbd21635d 修复关闭右侧的bug 2020-05-15 10:34:19 +08:00
pixel cb51890c25 css样式美化 2020-05-15 10:19:52 +08:00
pixel 9d9404b3c5 修复表单生成器加载问题 2020-05-15 10:10:19 +08:00
1319612909 10a5390327 全局css 2020-05-14 21:54:00 +08:00
pixel d04acfd39b 修改掉线登出的时机 2020-05-14 17:37:49 +08:00
jinlan.du 865b66b3db Merge branch 'gin-vue-admin_v2_dev' of https://github.com/flipped-aurora/gin-vue-admin into gin-vue-admin_v2_dev 2020-05-12 09:00:12 +08:00
sun_song_1203 73e31c6d23 modify register.vue 2020-05-11 21:44:10 +08:00
sun_song_1203 db9b3dce10 modify login.vue 2020-05-11 21:41:53 +08:00
pixel 7072d7e981 修改字段方便配置 2020-05-11 13:46:26 +08:00
QM303176530 95781e858d 前端icon细节优化 2020-05-10 21:40:48 +08:00
QM303176530 cec6f164fb 增加表格内icon 2020-05-10 21:32:10 +08:00
QM303176530 e58cf2544b Merge branch 'gin-vue-admin_v2_dev' of https://github.com/flipped-aurora/gin-vue-admin into gin-vue-admin_v2_dev 2020-05-10 21:12:47 +08:00
QM303176530 b81ea1a22e 增加表格内icon 2020-05-10 21:12:37 +08:00
klausY 6ac8fe871b Merge branch 'gin-vue-admin_v2_dev' of https://github.com/flipped-aurora/gin-vue-admin into gin-vue-admin_v2_dev 2020-05-10 20:09:29 +08:00
klausY 9c9f4d1244 编辑菜单-icon功能完善 2020-05-10 20:09:21 +08:00
QM303176530 07b030d9a8 修改文字说明错误 2020-05-10 19:17:29 +08:00
klausY efe539dbd2 Merge branch 'gin-vue-admin_v2_dev' of https://github.com/flipped-aurora/gin-vue-admin into gin-vue-admin_v2_dev 2020-05-10 17:24:04 +08:00
klausY 0306efb866 编辑菜单-icon功能完善 2020-05-10 17:23:52 +08:00
QM303176530 262c6b1594 增加验证规则复用 2020-05-10 16:55:42 +08:00
QM303176530 5e7570e557 增加验证规则复用 2020-05-10 16:34:21 +08:00
QM303176530 bf4344323d 增加验证规则复用 2020-05-10 16:21:00 +08:00
QM303176530 760a242118 Merge branches 'master' and 'verify' of https://github.com/flipped-aurora/gin-vue-admin into verify 2020-05-09 21:42:10 +08:00
pixel c059390538 增加后台表单校验工具以及添加校验 2020-05-09 17:53:32 +08:00
pixel 2756d2041c 增加校验工具以及后台校验拦截 2020-05-09 17:48:31 +08:00
klausY 8699d6f534 Merge branch 'gin-vue-admin_v2_dev' of https://github.com/flipped-aurora/gin-vue-admin into gin-vue-admin_v2_dev 2020-05-09 16:16:31 +08:00
klausY 625ca336e7 yx 2020-05-09 16:16:24 +08:00
蒋吉兆 e424421585 Update README-zh_CN.md 2020-05-08 23:27:56 +08:00
蒋吉兆 731e8ec609 Update README.md 2020-05-08 23:27:20 +08:00
QM303176530 235c2a75a8 表单校验工具封装以及使用 2020-05-08 23:17:20 +08:00
rainyan b95db1de3b Merge pull request #83 from flipped-aurora/gin-vue-admin_v2_dev
Add project layout to README.
2020-05-08 17:07:28 +08:00
rainyan 133b1c3bb7 Add project layout to README. 2020-05-08 17:03:57 +08:00
rainyan e3920f4ee9 Merge pull request #82 from flipped-aurora/gin-vue-admin_v2_dev
Fix some texts in README.md.
2020-05-08 17:02:07 +08:00
rainyan ef0c5f3b24 Fix some texts in README.md. 2020-05-08 17:01:21 +08:00
pixel 098705e48e 增加前端工程图 2020-05-08 16:26:23 +08:00
klausY f415428740 Merge branch 'gin-vue-admin_v2_dev' of https://github.com/flipped-aurora/gin-vue-admin into gin-vue-admin_v2_dev 2020-05-08 15:03:18 +08:00
klausY 717bc28b5d gengxin 2020-05-08 15:03:09 +08:00
pixel 828dc6cfe8 增加前端工程图 2020-05-08 09:45:43 +08:00
pixel 10b943c57c 删除地区编码数据 2020-05-07 17:49:50 +08:00
jinlan.du 9fe459afe1 Merge branch 'gin-vue-admin_v2_dev' of https://github.com/flipped-aurora/gin-vue-admin into gin-vue-admin_v2_dev 2020-05-07 15:25:31 +08:00
klausY 5fe8a85be3 Merge branch 'gin-vue-admin_v2_dev' of https://github.com/flipped-aurora/gin-vue-admin into gin-vue-admin_v2_dev 2020-05-07 15:04:04 +08:00
pixel 06c2e5639c 删除地区编码数据 2020-05-06 18:00:53 +08:00
pixel 462e396486 修复user API组的中间件未开放问题 2020-05-06 16:05:38 +08:00
pixel 7e9d32651b 修改了menu的查询次数 增强了菜单查询时的性能 2020-05-06 11:19:35 +08:00
klausY a58330c0ff Merge branch 'gin-vue-admin_v2_dev' of https://github.com/flipped-aurora/gin-vue-admin into gin-vue-admin_v2_dev 2020-05-06 09:58:23 +08:00
klausY eb2361f9ac yx 2020-05-06 09:58:08 +08:00
QM303176530 b44c5f76e1 Merge remote-tracking branch 'origin/gin-vue-admin_v2_dev' into gin-vue-admin_v2_dev 2020-05-05 16:43:51 +08:00
QM303176530 890adbfa4e 修复api自动入库获取列表的分组不正确的bug 2020-05-05 16:43:33 +08:00
sun_song_1203 315e71e851 modify login.vue 2020-05-04 21:51:17 +08:00
sun_song_1203 a48910f696 modify login.vue and register.vue 2020-05-04 21:46:33 +08:00
QM303176530 5878ffe937 Merge branches 'gin-vue-admin_v2_dev' and 'master' of https://github.com/flipped-aurora/gin-vue-admin into gin-vue-admin_v2_dev 2020-05-03 21:57:20 +08:00
QM303176530 c20a266662 增加是否自动创建api入库的开关 可自动产生api入库 2020-05-03 21:55:49 +08:00
QM303176530 6d53a47b59 增加了自动添加api入库选项 修改了某些已知的bug 2020-05-03 21:55:14 +08:00
QM303176530 9510177350 增加是否自动创建api入库的开关 可自动产生api入库 2020-05-03 21:52:14 +08:00
蒋吉兆 ba1dd82988 Update README.md 2020-05-03 17:45:29 +08:00
蒋吉兆 cafc344def Update README-zh_CN.md 2020-05-03 17:43:33 +08:00
QM303176530 6ce439597b Merge branches 'gin-vue-admin_v2_dev' and 'master' of https://github.com/flipped-aurora/gin-vue-admin into gin-vue-admin_v2_dev 2020-05-03 17:25:02 +08:00
QM303176530 c731b87f90 登录验证码灰色 模板内容修改 2020-05-03 17:17:12 +08:00
rainyan 71c57ec382 Merge pull request #77 from flipped-aurora/gin-vue-admin_v2_dev
Gin vue admin v2 dev
2020-05-03 14:35:09 +08:00
rainyan 08e21621d7 Merge branch 'gin-vue-admin_v2_dev' of https://github.com/flipped-aurora/gin-vue-admin into gin-vue-admin_v2_dev 2020-05-03 14:31:53 +08:00
rainyan 8c605efdbe package.json更新 2020-05-03 14:31:38 +08:00
Granty1 a3110de71f Modify login logo and background svg 2020-05-02 21:32:27 +08:00
QM303176530 019e28fb13 修改模板默认绑定key 2020-05-02 20:06:37 +08:00
QM303176530 166d73b124 css 样式调节 2020-05-02 17:55:22 +08:00
QM303176530 215c955e19 自动化模板中注释废弃 2020-05-02 17:29:31 +08:00
QM303176530 0044f1da1f 登录界面美化 2020-05-02 16:26:24 +08:00
QM303176530 53de9c7511 Merge remote-tracking branch 'origin/gin-vue-admin_v2_dev' into gin-vue-admin_v2_dev 2020-05-02 16:11:31 +08:00
QM303176530 431e53cb45 角色权限自动切换保存 提示信息友好修改 2020-05-02 16:11:06 +08:00
Granty1 f9764fcebf Remove notify 2020-05-02 09:33:47 +08:00
Granty1 9290b3b68c Modify login page 2020-05-02 01:06:08 +08:00
QM303176530 bb42fc86eb 修复仪表盘横向拖动问题 2020-05-01 22:45:59 +08:00
QM303176530 5745afaea8 顶部页签右键bug修复 2020-05-01 18:20:02 +08:00
QM303176530 7dd0512e67 修复top栏样式问题 2020-05-01 18:10:45 +08:00
QM303176530 113d59fdf9 menu弹窗美化 2020-04-30 21:12:43 +08:00
pixel 3ae83b25ff Merge remote-tracking branch 'origin/gin-vue-admin_v2_dev' into gin-vue-admin_v2_dev 2020-04-30 20:49:56 +08:00
pixel 0468584851 列表布局修改 2020-04-30 20:49:31 +08:00
QM303176530 5bce3a1567 Merge remote-tracking branch 'origin/gin-vue-admin_v2_dev' into gin-vue-admin_v2_dev 2020-04-30 19:18:30 +08:00
QM303176530 4bf6371bee 代码生成器增加前端table.vue的自动生成 前端fd修改 2020-04-30 19:05:11 +08:00
klausY 36b07a3006 首页样式优化 2020-04-30 18:01:59 +08:00
pixel 29fe71b482 增加图标页 menu增加icon前缀 2020-04-30 17:53:18 +08:00
pixel 176362448a 标签页右键功能 2020-04-30 17:29:48 +08:00
pixel 0afed943a5 table模板修复 2020-04-30 11:34:11 +08:00
QM303176530 40a78d8228 代码生成器增加前端table.vue的自动生成 2020-04-30 00:00:24 +08:00
pixel 9185d573ab iconList 组件修复 2020-04-29 17:22:05 +08:00
pixel 9b2acbae11 Merge branches 'gin-vue-admin_v2_dev' and 'master' of https://github.com/piexlmax/QMPlus into gin-vue-admin_v2_dev 2020-04-29 17:16:35 +08:00
sun_song_1203 4b07123509 Modified iconList 2020-04-29 17:15:23 +08:00
sun_song_1203 b7a0a6ee08 add iconList 2020-04-29 15:56:06 +08:00
rainyan 666b79f584 Create CONTRIBUTING.md 2020-04-28 21:31:44 +08:00
Granty1 34faaf8c19 Spelling correction 2020-04-28 20:50:20 +08:00
rainyan af4f83d4cb Deploy server using Docker successfully. 2020-04-28 19:34:24 +08:00
rainyan 377241276c Merge pull request #74 from flipped-aurora/gin-vue-admin_v2_dev
Gin vue admin v2 dev
2020-04-28 00:17:46 +08:00
rainyan 1077e8e40f Merge branch 'gin-vue-admin_v2_dev' of https://github.com/flipped-aurora/gin-vue-admin into gin-vue-admin_v2_dev 2020-04-28 00:16:39 +08:00
rainyan fee540735a Modify readme. 2020-04-28 00:16:07 +08:00
QM303176530 3d91c3768d 顶栏吸顶 侧边栏收起时不能正常显示的bug修复 2020-04-27 22:59:58 +08:00
QM303176530 b1fe359cd5 Merge branches 'gin-vue-admin_v2_dev' and 'master' of https://github.com/flipped-aurora/gin-vue-admin into gin-vue-admin_v2_dev 2020-04-27 22:16:14 +08:00
pixel c2454d998f 解决文件上传存在的bug 2020-04-27 18:11:12 +08:00
Granty1 8369584880 Update flipped-aurora.png 2020-04-27 12:17:31 +08:00
Granty1 2680da2873 Add style for org img 2020-04-26 22:16:18 +08:00
Granty1 0bd9a21318 Add some github information 2020-04-26 22:07:20 +08:00
rainyan ca7d06780f Merge pull request #72 from flipped-aurora/gin-vue-admin_v2_dev
Gin vue admin v2 dev
2020-04-26 16:31:03 +08:00
rainyan eba0f4f495 提交dockerfile 2020-04-26 16:15:44 +08:00
pixel 09e06dd278 Merge remote-tracking branch 'origin/gin-vue-admin_v2_dev' into gin-vue-admin_v2_dev 2020-04-26 11:50:05 +08:00
pixel 6ace32ee78 解决文件上传存在的bug 2020-04-26 11:48:40 +08:00
rainyan 6da7424fcd 分支说明更新
分支说明更新
2020-04-26 10:40:33 +08:00
rainyan 5e63794cbd translate to English
- master: 2.0 开发版代码,生产环境

- develop: 2.0 开发版代码,测试环境
2020-04-26 10:39:10 +08:00
Granty1 a815c1b599 Add 'enter' event for login & format login.vue 2020-04-26 10:13:50 +08:00
Granty1 de2f19ae50 Handle nil pointer dereference panic after db connect fail 2020-04-25 20:54:49 +08:00
Granty1 386a4d38b4 Fixed callback bug in front end file upload & move some constants to config.yaml 2020-04-25 10:14:17 +08:00
QM303176530 283830fc53 更新代码生成器 2020-04-24 21:20:44 +08:00
QM303176530 5375234c23 更新代码生成器 2020-04-24 21:17:49 +08:00
rainyan 784c8705b7 Merge branch 'gin-vue-admin_v2_dev' of https://github.com/flipped-aurora/gin-vue-admin into gin-vue-admin_v2_dev 2020-04-24 21:08:23 +08:00
rainyan 68a853b755 Dockerfile 2020-04-24 21:08:06 +08:00
Granty1 c65732d0e1 Remove action-ci branch in trigger list 2020-04-24 11:05:23 +08:00
Granty1 0533c6b01a Merge branch 'gin-vue-admin_v2_dev' of https://github.com/flipped-aurora/gin-vue-admin into action-ci 2020-04-24 10:58:00 +08:00
pixel 2acbde21b8 更新中文版readme 2020-04-24 10:38:41 +08:00
pixel 3c87b3d449 更新中文版readme 2020-04-24 10:36:07 +08:00
pixel dcd0420892 数据库增加拷贝角色相关api和权限 2020-04-24 10:29:02 +08:00
pixel 03e14142e3 修复前端项目代码丢失,问题,修复角色拷贝功能 2020-04-24 10:23:40 +08:00
rainyan e0f2153172 Merge pull request #66 from flipped-aurora/gin-vue-admin_v2_dev
Gin vue admin v2 dev
2020-04-24 01:08:27 +08:00
rainyan ee6d5883b1 Merge branch 'gin-vue-admin_v2_dev' of https://github.com/flipped-aurora/gin-vue-admin into gin-vue-admin_v2_dev 2020-04-24 01:07:10 +08:00
rainyan 0f6bc8dc31 Modify dockerfile 2020-04-24 01:06:53 +08:00
sun_song_1203 26820458d1 modify authority.vue's listApi 2020-04-24 00:32:22 +08:00
sun_song_1203 3a3be3b23f 1. authority.js export const copyAuthority
2. authority.vue  add a method
2020-04-24 00:25:46 +08:00
rainyan 5834f19746 Merge pull request #65 from flipped-aurora/gin-vue-admin_v2_dev
Gin vue admin v2 dev
2020-04-23 23:23:45 +08:00
rainyan 8034ca5e13 Add Docker 2020-04-23 23:22:32 +08:00
pixel 4f94e846c9 修复total返回为0的bug 2020-04-23 17:23:16 +08:00
pixel 5305bf3680 Merge branches 'develop' and 'gin-vue-admin_v2_dev' of https://github.com/piexlmax/QMPlus into gin-vue-admin_v2_dev
 Conflicts:
	server/config.yaml
	server/service/sys_menu.go
2020-04-23 17:18:03 +08:00
蒋吉兆 aba79bb3d0 Merge pull request #62 from FWangZil/develop
README.md: fix text bug
2020-04-23 17:15:08 +08:00
klausY a2b12cf37a Merge branch 'gin-vue-admin_v2_dev' of https://github.com/flipped-aurora/gin-vue-admin into gin-vue-admin_v2_dev 2020-04-22 15:53:18 +08:00
klausY 10ef49e4e8 首页新增播放器/ToDoList 2020-04-22 15:53:04 +08:00
pixel dd4563c9e4 修复total返回为0的bug 2020-04-22 15:40:07 +08:00
FWangZil 75352f45cd Merge pull request #2 from FWangZil/FWangZil-patch-2
README.md: fix text bug
2020-04-22 14:33:16 +08:00
FWangZil 25b5947587 README.md: fix text bug 2020-04-22 14:32:20 +08:00
pixel 2eab2a6a22 解决了登陆页面会请求一次 404的bug 2020-04-22 13:39:39 +08:00
QM303176530 78670f79af 修改config set时导致config.yamlkey改变的bug 2020-04-21 00:12:47 +08:00
pixel 0be0ec9a2f 增加角色复制后台功能 修复swagger不能带token的问题 2020-04-20 16:21:50 +08:00
jinlan.du a55d5e2f1a Merge branch 'gin-vue-admin_v2_dev' of https://github.com/flipped-aurora/gin-vue-admin into gin-vue-admin_v2_dev 2020-04-20 13:26:53 +08:00
pixel eea245e405 Merge branch 'master' of https://github.com/piexlmax/QMPlus into gin-vue-admin_v2_dev 2020-04-20 12:11:03 +08:00
pixel 75035b9038 修复菜单展示下级只有一个隐藏菜单时候的交互错误 2020-04-20 12:10:50 +08:00
蒋吉兆 538c8ba0df Update README-zh_CN.md 2020-04-20 11:46:27 +08:00
蒋吉兆 e3aae896ad Update README.md 2020-04-20 11:44:07 +08:00
QM303176530 645d0fd842 修改api编辑保存时出现的bug 2020-04-19 12:28:53 +08:00
QM303176530 72f725bb4f 删除多余函数调用 2020-04-18 10:15:03 +08:00
QM303176530 992b8446cf 暂时隐藏音乐播放器 修改全局css 2020-04-17 23:31:08 +08:00
QM303176530 a766be61d8 还原dbname 2020-04-17 21:45:29 +08:00
klausY ff82bc47e6 Merge branch 'gin-vue-admin_v2_dev' of https://github.com/flipped-aurora/gin-vue-admin into gin-vue-admin_v2_dev 2020-04-17 18:11:04 +08:00
klausY 093cde16c2 首页美化 2020-04-17 18:10:54 +08:00
pixel 04536fe226 Merge remote-tracking branch 'origin/gin-vue-admin_v2_dev' into gin-vue-admin_v2_dev 2020-04-17 14:16:42 +08:00
pixel 832100f39d 菜单 角色选择更改为树形选择 2020-04-17 14:15:41 +08:00
jinlan.du 02bee9b6f2 Merge branch 'gin-vue-admin_v2_dev' of https://github.com/flipped-aurora/gin-vue-admin into gin-vue-admin_v2_dev 2020-04-17 13:20:18 +08:00
Granty1 a837638672 Merge branch 'gin-vue-admin_v2_dev' of https://github.com/flipped-aurora/gin-vue-admin into gin-vue-admin_v2_dev 2020-04-17 10:56:52 +08:00
pixel 569abbeb53 增加删除用户功能 修正一些细节bug 2020-04-16 20:16:19 +08:00
pixel 5698c207a1 form表单重置bug修复 2020-04-16 09:48:18 +08:00
pixel 57167b6c38 提供了keepalive支持 需要导入新的数据库表 2020-04-15 17:49:30 +08:00
pixel cd0b1e0336 menu和authority修改父级变为选择模式 2020-04-15 16:37:53 +08:00
pixel ea3f49d68a menu和authority修改父级变为选择模式 2020-04-15 16:37:17 +08:00
jinlan.du 91a3b5b3ce Merge branch 'gin-vue-admin_v2_dev' of https://github.com/flipped-aurora/gin-vue-admin into gin-vue-admin_v2_dev 2020-04-15 10:47:03 +08:00
pixel 6a03835d66 swagger修复完成 2020-04-15 09:37:39 +08:00
pixel 2fbbde2581 恢复断点续传页面 2020-04-14 16:24:32 +08:00
jinlan.du 6b61abdf96 Merge branch 'gin-vue-admin_v2_dev' of https://github.com/flipped-aurora/gin-vue-admin into gin-vue-admin_v2_dev 2020-04-14 13:31:24 +08:00
jinlan.du f1c92e5b96 断点续传UI 2020-04-14 13:31:01 +08:00
rainyan 20156e2a34 英文注释 2020-04-13 22:30:40 +08:00
rainyan 8804ef6b67 中文版本号 2020-04-13 22:29:11 +08:00
rainyan 6ac385f45a Merge pull request #55 from rikugun/feature/docker-support
feat: 增加docker 支持
2020-04-13 20:37:04 +08:00
pixel be2bef5600 Merge branches 'gin-vue-admin_v2_dev' and 'master' of https://github.com/piexlmax/QMPlus into gin-vue-admin_v2_dev 2020-04-13 17:46:15 +08:00
pixel f68947d50e 修复了api唯一key关联的bug,修复了角色删除失败的bug 2020-04-13 17:45:33 +08:00
rikugun 1632c6361f Merge branch 'develop' into feature/docker-support 2020-04-13 14:37:27 +08:00
pixel 959aa9cd38 Merge remote-tracking branch 'origin/gin-vue-admin_v2_dev' into gin-vue-admin_v2_dev 2020-04-13 11:31:09 +08:00
rainyan 7b9f8f19c0 Merge pull request #58 from flipped-aurora/gin-vue-admin_v2_dev
README.md: fix head.
2020-04-13 11:30:01 +08:00
rainyan f1d225375f README.md: fix head. 2020-04-13 11:28:43 +08:00
rainyan 58ca2231e1 Merge pull request #57 from flipped-aurora/gin-vue-admin_v2_dev
README.md: add Contributing Guide.
2020-04-13 11:27:42 +08:00
rainyan f71bf74c48 README.md: add Contributing Guide.
README-zh_CN.md: add Contributing Guide.
2020-04-13 11:26:57 +08:00
rainyan 6003728944 Update README-zh_CN.md
可以参考用户管理模块中的示例API。
2020-04-13 10:51:22 +08:00
rainyan 001f7a2676 update README.md
You can see sample APIs in user management module.
2020-04-13 10:48:14 +08:00
pixel 2f0b39af3d 注释sqlite 防止gcc错误 需要使用自行打开注释即可 感谢 sqlitet提供者 [rikugun] 作者github: https://github.com/rikugun 2020-04-13 10:30:26 +08:00
rikugun 836e4aad86 Merge branch 'master' into feature/docker-support 2020-04-13 10:28:23 +08:00
rikugun ba46a6effd 默认使用mysql 数据库 2020-04-13 10:26:45 +08:00
rikugun 05cbc853f7 修改错误的修改使用试图查询菜单的问题 2020-04-13 10:25:21 +08:00
pixel c9bf4e6e72 修复首页404情况,sqlite数据库如果缺少gcc依赖请自行安装或注释sqlit相关功能 2020-04-13 09:50:04 +08:00
rikugun f5e29733e0 feat: 增加docker 支持 2020-04-12 21:58:20 +08:00
蒋吉兆 571df5a415 Update README-zh_CN.md 2020-04-12 16:54:32 +08:00
蒋吉兆 98455325cb Update README.md 2020-04-12 16:53:14 +08:00
QM303176530 dfa4ef100a 增加对sqlite数据库的支持 默认模式为mysql数据库 2020-04-12 13:44:11 +08:00
QM303176530 c6a8a47932 增加对sqlite数据库的支持 默认模式为mysql数据库 2020-04-12 13:34:29 +08:00
蒋吉兆 0ff3bdc64f 增加对sqlite数据库的支持
增加对sqlite数据库的支持
2020-04-12 13:33:56 +08:00
rikugun 71fd0eb9ad feat: 系统配置界面增加sqlite 配置 2020-04-12 11:39:16 +08:00
rikugun 47a45e2d67 feat: 增加sqlite 支持 2020-04-12 11:19:28 +08:00
rikugun 3ebbd7690f fix: 获取菜单失败的错误 2020-04-12 11:19:20 +08:00
rikugun 7c48de76c4 feat: 增加sqlite sql 脚本 2020-04-12 11:18:58 +08:00
rainyan ae3b3b3579 Merge pull request #52 from flipped-aurora/gin-vue-admin_v2_dev
Gin vue admin v2 dev
2020-04-10 16:17:38 +08:00
sun_song_1203 339490e20d Merge branch 'gin-vue-admin_v2_dev' of https://github.com/flipped-aurora/gin-vue-admin into gin-vue-admin_v2_dev 2020-04-10 14:32:14 +08:00
sun_song_1203 ed289aeb49 Modify No.12 of the file README.md 2020-04-10 14:17:52 +08:00
pixel 7b6eea6974 Merge branches 'gin-vue-admin_v2_dev' and 'master' of https://github.com/piexlmax/QMPlus into gin-vue-admin_v2_dev 2020-04-10 14:16:01 +08:00
pixel b35169ca20 提供restful示例 参考 customer 客户管理(资源示例)版块 涉及到权限变动 请更新数据库 sys_api和casbin表 2020-04-10 14:15:29 +08:00
pixel c11f6d428a 提供restful示例 参考 customer 客户管理(资源示例)版块 涉及到权限变动 请更新数据库 sys_api和casbin表 2020-04-10 13:49:58 +08:00
pixel da8a1c20b6 修改customer文件位restful模式 提供示例 2020-04-10 13:47:52 +08:00
rainyan 8a2f903576 Merge pull request #51 from flipped-aurora/gin-vue-admin_v2_dev
correct all comments of functions in service
2020-04-10 11:33:34 +08:00
rainyan 849f0dcf43 correct all comments of functions in service 2020-04-10 10:36:15 +08:00
Granty1 63e23ff367 Add path ignore for md file 2020-04-10 09:52:19 +08:00
Granty1 a2bef96512 Update build_test.yml 2020-04-10 09:48:53 +08:00
Granty1 d6fbe7c8de Format script 2020-04-10 09:47:22 +08:00
Granty1 b15fe4493e Modified some grammar problems 2020-04-10 09:45:23 +08:00
Granty1 013a44f480 Refine the ci script 2020-04-10 09:40:21 +08:00
rainyan d27b152a09 Merge pull request #50 from flipped-aurora/gin-vue-admin_v2_dev
add /web/dist to .gitignore
2020-04-10 09:28:26 +08:00
rainyan e0916eeb63 add /web/dist to .gitignore 2020-04-10 09:24:29 +08:00
Granty1 b5197b0013 Add build test ci script 2020-04-10 09:18:14 +08:00
Granty1 74201dfcd0 Add permission when move file 2020-04-09 21:50:18 +08:00
Granty1 641adca61f Refine ci script 2020-04-09 21:33:13 +08:00
QM303176530 ee24387a79 增加开发者模式 配置文件env 修改为develop就可跳过鉴权 2020-04-09 21:28:19 +08:00
蒋吉兆 b308c6e416 Update LICENSE 2020-04-09 21:13:19 +08:00
pixel 7993e878cc 默认验证码长度设置为4位 2020-04-09 17:41:13 +08:00
Granty1 5b753f2e72 Reduction the runner name 2020-04-09 17:39:21 +08:00
Granty1 26bba8ead8 Test self-runner label 2020-04-09 17:35:52 +08:00
Granty1 4399994b80 Format config file and ci script 2020-04-09 17:34:17 +08:00
Granty1 19548446e2 Remove useless command 2020-04-09 17:03:22 +08:00
Granty1 6bf46327bc Modify run script 2020-04-09 16:52:51 +08:00
Granty1 f683d89517 Test for env variables 2020-04-09 16:46:11 +08:00
Granty1 4d2c13d83a Test env variables in github action 2020-04-09 14:58:34 +08:00
Granty1 aabf7c0656 Add working-directory tag 2020-04-09 12:36:57 +08:00
Granty1 f93bd6020a Modify the sort of cd command 2020-04-09 12:22:31 +08:00
蒋吉兆 d2bc6ba615 Merge pull request #46 from xiaomiba0904/master
优化GetUserInfoList逻辑
2020-04-09 12:12:33 +08:00
pixel 6f3e3188b2 消除冗余代码 细节提示修复 2020-04-09 12:03:29 +08:00
Granty1 443922c7de Fixed error that can not use 'uses' and 'run' both 2020-04-09 11:50:43 +08:00
pixel 3a778ccdf1 修改编辑方法逻辑,前端细节调整 2020-04-09 11:49:15 +08:00
Granty1 a68628efbe Rename ci script 2020-04-09 11:48:11 +08:00
Granty1 ea9bd37fe8 Update go.yml 2020-04-09 11:37:15 +08:00
Granty1 f87ae7a2ea Update go.yml 2020-04-09 11:35:03 +08:00
Granty1 060961e312 Test ci 2020-04-09 11:15:03 +08:00
pixel 73a141d2b4 修復部分創建bug,數據庫api更新權限更改 2020-04-09 11:14:21 +08:00
pixel 0a832dfe24 修復部分創建bug,數據庫api更新權限更改 2020-04-09 11:09:52 +08:00
pixel d447913056 修復部分創建bug,數據庫api更新權限更改 2020-04-09 11:07:43 +08:00
xiaomibaghb 5586f1ddc3 优化GetUserInfoList逻辑 2020-04-09 10:39:25 +08:00
Granty1 cbe2e9a729 Create go.yml 2020-04-09 10:23:56 +08:00
QM303176530 5b29b661dc jwt异地登陆bug修复 2020-04-08 20:15:13 +08:00
Grant 71095f3e2e Merge pull request #45 from flipped-aurora/gin-vue-admin_v2_dev-restruct-service
Fixed bug that can not create jwt black record
2020-04-08 19:39:01 +08:00
Granty1 a9651d1ce4 Fixed bug that can not create jwt black record 2020-04-08 19:37:38 +08:00
pixel d198856633 统一分页回传结构体 2020-04-08 14:35:45 +08:00
pixel 1051db5d4c 统一分页回传结构体 2020-04-08 14:31:22 +08:00
Granty1 4277505c6a Unifies the output of the routing layer and the isolated response structure 2020-04-08 14:00:08 +08:00
Granty1 5d222585dd Migrate all methods in the model package to the service package 2020-04-08 11:07:27 +08:00
QM303176530 2c35adaffc 提出api中的model到单独model分组 修改dashboard 拼写错误 2020-04-07 22:26:00 +08:00
QM303176530 137db98ee4 Merge branches 'gin-vue-admin_v2_dev' and 'master' of https://github.com/piexlmax/gin-vue-admin into gin-vue-admin_v2_dev 2020-04-07 21:56:33 +08:00
QM303176530 433bd0dd03 增加排序功能,修改错别字 dashbord->dashboard 需更新数据库中base_menu表中 所有的dashbord改为dashboard 2020-04-07 21:56:05 +08:00
QM303176530 604d6dcd42 增加排序功能,修改错别字 dashbord->dashboard 需更新数据库中base_menu表中 所有的dashbord改为dashboard 2020-04-07 21:54:02 +08:00
Granty1 38ccce5182 Update README.md 2020-04-07 18:54:47 +08:00
pixel 55d96245c2 order test 2020-04-07 18:02:29 +08:00
rainyan 13ead70368 Merge pull request #43 from flipped-aurora/gin-vue-admin_v2_dev
nick name mixed: krank666 granty1
2020-04-07 16:31:54 +08:00
rainyan 2d7cd2e61a nick name mixed: krank666 granty1 2020-04-07 16:30:16 +08:00
pixel 1e70d266ac Merge branches 'gin-vue-admin_v2_dev' and 'master' of https://github.com/piexlmax/QMPlus into gin-vue-admin_v2_dev
 Conflicts:
	README-zh_CN.md
2020-04-07 16:06:17 +08:00
pixel 688742aa42 add ercode 2020-04-07 16:03:53 +08:00
rainyan 3dcdd36d76 Delete donation QR code, add wechat QR code of all members. 2020-04-07 13:34:01 +08:00
rainyan de8557781e Show error fix 2020-04-07 10:20:00 +08:00
rainyan 5dac0b17b0 ##### (2)无法翻墙
##### (2)无法翻墙显示错误
2020-04-07 10:17:26 +08:00
rainyan 7318e0cfae Merge pull request #41 from piexlmax/gin-vue-admin_v2_dev
Gin vue admin v2 dev
2020-04-07 10:16:07 +08:00
rainyan 0401b2c00b Show error fix:in Line '#####(2)无法翻墙' 2020-04-07 10:13:27 +08:00
rainyan 1f2c77a49b Spelling fix: README.md ever->server, urtils->utils 2020-04-07 10:07:01 +08:00
rainyan 43994c7bfd Merge pull request #40 from piexlmax/gin-vue-admin_v2_dev
Spelling fix: erver->server, urtils->utils
2020-04-07 10:04:49 +08:00
rainyan 4332607f40 Spelling fix: erver->server, urtils->utils 2020-04-07 10:01:28 +08:00
Grant df76e190fb Merge pull request #39 from piexlmax/gin-vue-admin_v2_dev
Update .gitignore and readme
2020-04-07 08:00:32 +08:00
Granty1 8d24342a90 Update .gitignore and readme 2020-04-07 07:34:43 +08:00
QM303176530 12f90505b1 Merge branches 'gin-vue-admin_v2_dev' and 'master' of https://github.com/piexlmax/gin-vue-admin into gin-vue-admin_v2_dev
 Conflicts:
	QMPlusServer/db/jwt_blacklists.sql
	QMPlusServer/db/sys_base_menus.sql
	QMPlusServer/db/sys_menus.sql
	QMPlusServer/tpl/te/router.go.tpl
	README.md
	server/db/qmplus.sql
2020-04-07 00:18:15 +08:00
QM303176530 7da3980c78 bug:Menu SQL repair 2020-04-07 00:13:50 +08:00
QM303176530 11691cdd13 bug:Menu SQL repair 2020-04-07 00:12:22 +08:00
QM303176530 209db0c4c3 Merge branch 'gin-vue-admin_v2_dev' of https://github.com/piexlmax/gin-vue-admin into gin-vue-admin_v2_dev 2020-04-07 00:09:01 +08:00
QM303176530 f9c80aed27 bug:Menu SQL repair 2020-04-07 00:08:37 +08:00
rainyan e22af46d92 Delete: http://doc.henrongyi.top/, link 'Online Documentation' to http://doc.henrongyi.top/ 2020-04-06 23:39:22 +08:00
rainyan 8bd8b54993 modify: in -> Yin 2020-04-06 23:33:20 +08:00
rainyan 8bd1bf0b22 Merge branch 'gin-vue-admin_v2_dev' of https://github.com/piexlmax/gin-vue-admin into gin-vue-admin_v2_dev
# Add version list to README.md
# Conflicts:
#	README-zh_CN.md
2020-04-06 23:22:43 +08:00
rainyan 44cd748ee4 Modify: speliing fix 2020-04-06 23:14:31 +08:00
QM303176530 90d371124e Modify:Add version list 2020-04-06 23:08:19 +08:00
QM303176530 1b47200a42 Modify:Modify Tencent video to be bilibilibili 2020-04-06 22:59:16 +08:00
rainyan 3996cb8e82 -- 拼写错误修改 2020-04-06 22:40:05 +08:00
rainyan 6373800be2 拼错修改 2020-04-06 22:25:42 +08:00
rainyan 9495215d07 Merge branch 'gin-vue-admin_v2_dev' of https://github.com/piexlmax/gin-vue-admin into gin-vue-admin_v2_dev
# Conflicts:
#	README.md
2020-04-06 22:18:24 +08:00
rainyan a2a439c45a 新增英文注释,修改部分中文注释 2020-04-06 22:17:27 +08:00
QM303176530 bc00db8d1b 开放2.0测试入口 2020-04-06 15:02:00 +08:00
QM303176530 0e5b3e638a update:Teaching video update 2020-04-06 15:01:20 +08:00
QM303176530 fb45acc42b update:Teaching video update 2020-04-06 15:00:20 +08:00
QM303176530 f6e38d5cd1 更新文档视频 提供2.0测试版入口 2020-04-06 14:57:43 +08:00
QM303176530 002f6d4159 update:Teaching video update 2020-04-06 14:50:17 +08:00
QM303176530 29be427f5f update:Teaching video update 2020-04-06 14:49:09 +08:00
QM303176530 640e5feb6f Merge branch 'gin-vue-admin_v2_dev' of https://github.com/piexlmax/gin-vue-admin into gin-vue-admin_v2_dev 2020-04-06 14:02:29 +08:00
QM303176530 2415cb26fa update:Repair code generator 2020-04-06 14:02:10 +08:00
蒋吉兆 478cce60c8 Update README.md 2020-04-06 14:01:48 +08:00
蒋吉兆 e6ea76e03e Update README.md 2020-04-06 14:00:31 +08:00
QM303176530 4b5a102cb5 Merge branch 'gin-vue-admin_v2_dev' of https://github.com/piexlmax/gin-vue-admin into gin-vue-admin_v2_dev 2020-04-06 13:52:46 +08:00
QM303176530 fbf4a33a31 update:Login failure refresh verification code 2020-04-06 13:52:18 +08:00
QM303176530 79254bd64c bug: the latest database table, modify the associated deletion method of menu and authority 2020-04-06 13:42:41 +08:00
QM303176530 2467522d30 Merge branches 'gin-vue-admin_v1_stable' and 'master' of https://github.com/piexlmax/gin-vue-admin into gin-vue-admin_v1_stable 2020-04-06 12:51:12 +08:00
QM303176530 733d062683 修改menu表排序字段为int 2020-04-06 12:50:34 +08:00
sun_song_1203 3a4b729b8e Merge branch 'gin-vue-admin_v2_dev' of https://github.com/piexlmax/gin-vue-admin into gin-vue-admin_v2_dev
# Conflicts:
#	README.md
2020-04-06 11:06:44 +08:00
sun_song_1203 b076ae5704 README文档规范化 2020-04-06 11:03:01 +08:00
rainyan f538e7b99a ReadMe.md开发者名称修改 2020-04-06 10:32:09 +08:00
Granty1 1e4daaba4e Remove useless notes 2020-04-06 08:40:36 +08:00
Granty1 9766f12016 Fixed bug that log soft link can not point to the correct log file 2020-04-06 08:39:33 +08:00
rainyan fddfdf44a1 更新README.md,部分错误注释修改 2020-04-06 02:40:08 +08:00
rainyan dc4ebc5851 Merge branch 'gin-vue-admin_v2_dev' of https://github.com/piexlmax/gin-vue-admin into gin-vue-admin_v2_dev
# Conflicts:
#	server/model/sys_authority.go
#	server/model/sys_authority_menu.go
#	server/model/sys_base_menu.go
2020-04-06 00:47:46 +08:00
rainyan 13c30d4c55 方法添加注释,中文版注释 2020-04-05 22:23:17 +08:00
QM303176530 39f256b4b7 Merge branch 'gin-vue-admin_v2_dev' of https://github.com/piexlmax/gin-vue-admin into gin-vue-admin_v2_dev 2020-04-05 20:58:08 +08:00
QM303176530 63fe673169 bug: Fix bug in form reset 2020-04-05 20:57:11 +08:00
Granty1 9d99777b1f Refine db password 2020-04-05 20:36:54 +08:00
Granty1 7c52c05280 Migrating configuration files from json to yaml 2020-04-05 20:35:52 +08:00
QM303176530 81a54b5a44 update: menu relation transformation completed 2020-04-05 20:14:15 +08:00
QM303176530 c755120c8d update: The code structure is finished, and the project can run successfully 2020-04-05 16:19:34 +08:00
QM303176530 08ff55ffce update: The code structure is finished, and the project can run successfully 2020-04-05 16:18:19 +08:00
Granty1 1891c1bcbc Refine some structs and handle cycle import 2020-04-05 09:18:25 +08:00
QM303176530 6db275ca39 gin-vue-admin 2.0代码重构 2020-04-04 21:39:27 +08:00
QM303176530 1b9adea284 gin-vue-admin 2.0代码重构 2020-04-04 21:39:07 +08:00
pixel d1e0ab1db9 修复模板字符串多一个空格的bug 2020-04-03 14:38:18 +08:00
pixel 54bdc9b834 tab历史记录细节修复(刷新或重新登录的bug) 2020-04-03 13:35:10 +08:00
蒋吉兆 ffdd677d8f Merge pull request #37 from gpYang/master
登录失败后刷新验证码
2020-04-03 11:33:33 +08:00
gpYang a1583ad2a4 登录失败后刷新验证码
防止被暴力破解
2020-04-03 09:57:17 +08:00
QM303176530 5ed41ddd8c 增加总数据库sql和单表sql 此次拼写错误设计到 sys_api casbin两个表 2020-04-02 22:37:58 +08:00
QM303176530 f545048e60 拼写错误修改 updata->update regist->register 更新需更新数据库 建议更新数据库文件 数据库将单表数据录入 方便选择性更新 2020-04-02 22:31:48 +08:00
QM303176530 1c30ae1080 拼写错误修改 2020-04-02 22:12:05 +08:00
蒋吉兆 f32c1d93bb Merge pull request #36 from Ruio9244/gin-vue-admin-develop
updata->update,Updata->Update
2020-04-02 22:12:34 +08:00
rainyan 40ef40afa8 updata->update
Updata->Update
2020-04-02 20:35:19 +08:00
pixel abc88cdbe0 修复了api设置时候可以重复path的bug 2020-04-02 18:10:09 +08:00
gpYang 5810791099 登录失败刷新验证码
失败了需要刷新验证码,不然更容易暴力破解
2020-04-02 14:56:37 +08:00
pixel 507d4620ca 重新开放配置管理功能 2020-04-02 14:34:21 +08:00
pixel 29dee32b47 增加文档 调整readme 修复已知bug 2020-04-02 13:46:43 +08:00
pixel 825ffa2dcb 修复已知bug提升体验 2020-04-02 09:42:48 +08:00
pixel c08b8fdc49 修复已知bug 2020-04-01 17:04:13 +08:00
pixel 13295bb9e7 修复了一些已知的bug 2020-04-01 16:32:22 +08:00
pixel 1ea720093a 美化登陆页面 2020-04-01 16:19:43 +08:00
pixel c2e90af0c9 删除无用方法 2020-04-01 16:05:30 +08:00
pixel 11c3ff681a 四月一日更新日志 2020-04-01 16:02:07 +08:00
pixel 42bec5811c 增加历史页签功能 2020-04-01 15:56:39 +08:00
pixel 7f5504f840 增加api查询模式 修改后台查询方法示例 2020-04-01 11:53:49 +08:00
pixel aa145bc905 gin-vue-admin LOGO上传 2020-03-31 18:07:23 +08:00
621 changed files with 55707 additions and 25754 deletions
+12
View File
@@ -0,0 +1,12 @@
# These are supported funding model platforms
github: # Replace with up to 4 GitHub Sponsors-enabled usernames e.g., [user1, user2]
patreon: # Replace with a single Patreon username
open_collective: gin-vue-admin
ko_fi: # Replace with a single Ko-fi username
tidelift: # Replace with a single Tidelift platform-name/package-name e.g., npm/babel
community_bridge: # Replace with a single Community Bridge project-name e.g., cloud-foundry
liberapay: # Replace with a single Liberapay username
issuehunt: # Replace with a single IssueHunt username
otechie: # Replace with a single Otechie username
custom: https://www.gin-vue-admin.com/docs/coffee
+60
View File
@@ -0,0 +1,60 @@
name: 🐛 Bug report
description: Report a bug to help us improve Gin-Vue-Admin
title: "[Bug]: "
labels: [bug]
assignees:
- piexlmax
- songzhibin97
- SliverHorn
- bypanghu
body:
- type: input
id: gva
attributes:
label: gin-vue-admin 版本
description: 请输入您当前使用的项目版本?
placeholder: 2.4.5Beta
validations:
required: true
- type: input
id: node
attributes:
label: Node 版本
description: 请输入您当前使用的NODE版本?
placeholder: v14.16.0
validations:
required: true
- type: input
id: golang
attributes:
label: Golang 版本
description: 请输入您当前使用的GOLANG版本?
placeholder: go 1.16
validations:
required: true
- type: dropdown
id: reappearance
attributes:
label: 是否依旧存在
description: 是否可以在master分支复现此bug?
options:
- 可以
- 不可以
- 未测试
validations:
required: true
- type: textarea
id: desc
attributes:
label: bug描述
description: 请简要描述bug以及复现过程.
placeholder: |
1. 首先...
2. 然后...
validations:
required: true
- type: textarea
id: advise
attributes:
label: 修改建议
description: 您有好的建议或者修改方案可以提供给我们。
+5
View File
@@ -0,0 +1,5 @@
blank_issues_enabled: false
contact_links:
- name: Document
url: https://www.gin-vue-admin.com
about: If you have any questions about the use, you can check our official documents first
@@ -0,0 +1,22 @@
name: 🚀 Feature request
description: Suggest an idea for Gin-Vue-Admin
title: "[Feature]: "
labels: [feature]
assignees:
- piexlmax
body:
- type: textarea
id: desc
attributes:
label: 功能描述以及必要性描述
description: 您觉得此新功能会为框架带来什么便利.
placeholder: |
1. 首先...
2. 然后...
validations:
required: true
- type: textarea
id: advise
attributes:
label: 建议和方案
description: 您有好的建议或者修改方案可以提供给我们。
+64
View File
@@ -0,0 +1,64 @@
name: gin-vue-admin build test
on:
push:
branches:
- "*"
paths-ignore:
- "./db/**"
- "**.md"
pull_request:
branches:
- "*"
paths-ignore:
- "./db/**"
- "**.md"
jobs:
frontend:
name: Frontend build
runs-on: ubuntu-latest
strategy:
matrix:
node-version: [12.x]
steps:
- name: Check out branch
uses: actions/checkout@v2
- name: Use Node.js ${{ matrix.node-version }}
uses: actions/setup-node@v1
with:
node-version: ${{ matrix.node-version }}
- name: Build test
run: |
npm install
npm run build
working-directory: ./web
backend:
name: Backend build
runs-on: ubuntu-latest
steps:
- name: Set up Go 1.6
uses: actions/setup-go@v1
with:
go-version: 1.16
id: go
- name: Check out branch
uses: actions/checkout@v2
- name: Download dependencies
run: |
go get -v -t -d ./...
if [ -f Gopkg.toml ]; then
curl https://raw.githubusercontent.com/golang/dep/master/install.sh | sh
dep ensure
fi
working-directory: ./server
- name: Test and Build
run: |
go build -v -race
working-directory: ./server
+28
View File
@@ -1 +1,29 @@
.idea/
/web/node_modules
/web/dist
.DS_Store
# local env files
.env.local
.env.*.local
# Log files
npm-debug.log*
yarn-debug.log*
yarn-error.log*
# Editor directories and files
.idea
.vscode
*.suo
*.ntvs*
*.njsproj
*.sln
*.sw?
/server/log/
/server/gva
/server/latest_log
*.iml
+19
View File
@@ -0,0 +1,19 @@
### Contributing Guide
#### 1 Issue Guidelines
- Issues are exclusively for bug reports, feature requests and design-related topics. Other questions may be closed directly. If any questions come up when you are using Element, please hit [Gitter](https://gitter.im/element-en/Lobby) for help.
- Before submitting an issue, please check if similar problems have already been issued.
#### 2 Pull Request Guidelines
- Fork this repository to your own account. Do not create branches here.
- Commit info should be formatted as `[File Name]: Info about commit.` (e.g. `README.md: Fix xxx bug`)
- <font color=red>Make sure PRs are created to `develop` branch instead of `master` branch.</font>
- If your PR fixes a bug, please provide a description about the related bug.
- Merging a PR takes two maintainers: one approves the changes after reviewing, and then the other reviews and merges.
+1 -1
View File
@@ -186,7 +186,7 @@
same "printed page" as the copyright notice for easier
identification within third-party archives.
Copyright [yyyy] [name of copyright owner]
Copyright 2019 JiZhao Jiang
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
-3
View File
@@ -1,3 +0,0 @@
go.sum
.idea/
log/
-16
View File
@@ -1,16 +0,0 @@
FROM golang:1.12 AS build
WORKDIR /go/src/gin-vue-admin
COPY . .
ENV GO111MODULE=on
ENV GOPROXY=https://goproxy.cn
RUN go get ./... \
&& go build -o gin-vue-admin
FROM golang:1.12 AS serve
COPY --from=build /go/src/gin-vue-admin /go/src/gin-vue-admin
EXPOSE 8080
ENTRYPOINT [ "./gin-vue-admin" ]
-31
View File
@@ -1,31 +0,0 @@
package cmd
import (
"fmt"
"gin-vue-admin/config"
"gin-vue-admin/init/initlog"
"github.com/gin-gonic/gin"
"net/http"
"time"
)
func RunWindowsServer(Router *gin.Engine) {
address := fmt.Sprintf(":%d", config.GinVueAdminconfig.System.Addr)
s := &http.Server{
Addr: address,
Handler: Router,
ReadTimeout: 10 * time.Second,
WriteTimeout: 10 * time.Second,
MaxHeaderBytes: 1 << 20,
}
time.Sleep(10 * time.Microsecond)
log.L.Debug("server run success on ", address)
fmt.Printf(`欢迎使用 Gin-Vue-Admin
作者:奇淼 And Spike666
微信:shouzi_1994
默认自动化文档地址:http://127.0.0.1%s/swagger/index.html
默认前端文件运行地址:http://127.0.0.1:8080
`, s.Addr)
_ = s.ListenAndServe()
}
-105
View File
@@ -1,105 +0,0 @@
package config
import (
"fmt"
"github.com/fsnotify/fsnotify"
"github.com/spf13/viper"
)
type Config struct {
MysqlAdmin MysqlAdmin `json:"mysqlAdmin"`
Qiniu Qiniu `json:"qiniu"`
CasbinConfig CasbinConfig `json:"casbinConfig"`
RedisAdmin RedisAdmin `json:"redisAdmin"`
System System `json:"system"`
JWT JWT `json:"jwt"`
Captcha Captcha `json:"captcha"`
Log Log `json:"log"`
}
type System struct { // 系统配置
UseMultipoint bool `json:"useMultipoint"`
Env string `json:"env"`
Addr int `json:"addr"`
}
type JWT struct { // jwt签名
SigningKey string `json:"signingKey"`
}
type CasbinConfig struct { //casbin配置
ModelPath string `json:"modelPath"` // casbin model地址配置
}
type MysqlAdmin struct { // mysql admin 数据库配置
Username string `json:"username"`
Password string `json:"password"`
Path string `json:"path"`
Dbname string `json:"dbname"`
Config string `json:"config"`
MaxIdleConns int `json:"maxIdleConns"`
MaxOpenConns int `json:"maxOpenConns"`
LogMode bool `json:"maxOpenConns"`
}
type RedisAdmin struct { // Redis admin 数据库配置
Addr string `json:"addr"`
Password string `json:"password"`
DB int `json:"db"`
}
type Qiniu struct { // 七牛 密钥配置
AccessKey string `json:"accessKey"`
SecretKey string `json:"secretKey"`
}
type Captcha struct { // 验证码配置
KeyLong int `json:"keyLong"`
ImgWidth int `json:"imgWidth"`
ImgHeight int `json:"imgHeight"`
}
/**
Log Config
"CRITICAL"
"ERROR"
"WARNING"
"NOTICE"
"INFO"
"DEBUG"
*/
type Log struct {
// log 打印的前缀
Prefix string `json:"prefix"`
// 是否显示打印log的文件具体路径
LogFile bool `json:"logFile"`
// 在控制台打印log的级别, []默认不打印
Stdout []string `json:"stdout"`
// 在文件中打印log的级别 []默认不打印
File []string `json:"file"`
}
var GinVueAdminconfig Config
var VTool *viper.Viper
func init() {
v := viper.New()
v.SetConfigName("config") // 设置配置文件名 (不带后缀)
v.AddConfigPath("./static/config/") // 第一个搜索路径
v.SetConfigType("json")
err := v.ReadInConfig() // 搜索路径,并读取配置数据
if err != nil {
panic(fmt.Errorf("Fatal error config file: %s \n", err))
}
v.WatchConfig()
v.OnConfigChange(func(e fsnotify.Event) {
fmt.Println("config file changed:", e.Name)
if err := v.Unmarshal(&GinVueAdminconfig); err != nil {
fmt.Println(err)
}
})
if err := v.Unmarshal(&GinVueAdminconfig); err != nil {
fmt.Println(err)
}
VTool = v
}
@@ -1,117 +0,0 @@
package api
import (
"fmt"
"gin-vue-admin/controller/servers"
"gin-vue-admin/model/dbModel"
"github.com/gin-gonic/gin"
"io/ioutil"
"strconv"
)
// @Tags ExaFileUploadAndDownload
// @Summary 断点续传到服务器
// @Security ApiKeyAuth
// @accept multipart/form-data
// @Produce application/json
// @Param file formData file true "断点续传示例"
// @Success 200 {string} string "{"success":true,"data":{},"msg":"上传成功"}"
// @Router /fileUploadAndDownload/breakpointContinue [post]
func BreakpointContinue(c *gin.Context) {
fileMd5 := c.Request.FormValue("fileMd5")
fileName := c.Request.FormValue("fileName")
chunkMd5 := c.Request.FormValue("chunkMd5")
chunkNumber, _ := strconv.Atoi(c.Request.FormValue("chunkNumber"))
chunkTotal, _ := strconv.Atoi(c.Request.FormValue("chunkTotal"))
_, FileHeader, err := c.Request.FormFile("file")
if err != nil {
servers.ReportFormat(c, false, fmt.Sprintf("%v", err), gin.H{})
} else {
f, err := FileHeader.Open()
if err != nil {
servers.ReportFormat(c, false, fmt.Sprintf("%v", err), gin.H{})
} else {
cen, _ := ioutil.ReadAll(f)
defer f.Close()
if flag := servers.CheckMd5(cen, chunkMd5); flag {
err, file := new(dbModel.ExaFile).FindOrCreateFile(fileMd5, fileName, chunkTotal)
if err != nil {
servers.ReportFormat(c, false, fmt.Sprintf("%v", err), gin.H{})
} else {
err, pathc := servers.BreakPointContinue(cen, fileName, chunkNumber, chunkTotal, fileMd5)
if err != nil {
servers.ReportFormat(c, false, fmt.Sprintf("%v", err), gin.H{})
} else {
err = file.CreateFileChunk(pathc, chunkNumber)
if err != nil {
servers.ReportFormat(c, false, fmt.Sprintf("%v", err), gin.H{})
} else {
servers.ReportFormat(c, true, "切片创建成功", gin.H{})
}
}
}
} else {
}
}
}
}
// @Tags ExaFileUploadAndDownload
// @Summary 查找文件
// @Security ApiKeyAuth
// @accept multipart/form-data
// @Produce application/json
// @Param file formData file true "查找文件"
// @Success 200 {string} string "{"success":true,"data":{},"msg":"查找成功"}"
// @Router /fileUploadAndDownload/findFile [post]
func FindFile(c *gin.Context) {
fileMd5 := c.Query("fileMd5")
fileName := c.Query("fileName")
chunkTotal, _ := strconv.Atoi(c.Query("chunkTotal"))
err, file := new(dbModel.ExaFile).FindOrCreateFile(fileMd5, fileName, chunkTotal)
if err != nil {
servers.ReportFormat(c, false, fmt.Sprintf("查找失败:%v", err), gin.H{})
} else {
servers.ReportFormat(c, true, "查找成功", gin.H{"file": file})
}
}
// @Tags ExaFileUploadAndDownload
// @Summary 查找文件
// @Security ApiKeyAuth
// @accept multipart/form-data
// @Produce application/json
// @Param file formData file true "查找文件"
// @Success 200 {string} string "{"success":true,"data":{},"msg":"查找成功"}"
// @Router /fileUploadAndDownload/findFile [post]
func BreakpointContinueFinish(c *gin.Context) {
fileMd5 := c.Query("fileMd5")
fileName := c.Query("fileName")
err, filePath := servers.MakeFile(fileName, fileMd5)
if err != nil {
servers.ReportFormat(c, true, fmt.Sprintf("文件创建失败:%v", err), gin.H{})
} else {
servers.ReportFormat(c, true, "文件创建成功", gin.H{"filePath": filePath})
}
}
// @Tags ExaFileUploadAndDownload
// @Summary 删除切片
// @Security ApiKeyAuth
// @accept multipart/form-data
// @Produce application/json
// @Param file formData file true "查找文件"
// @Success 200 {string} string "{"success":true,"data":{},"msg":"查找成功"}"
// @Router /fileUploadAndDownload/removeChunk [post]
func RemoveChunk(c *gin.Context) {
fileMd5 := c.Query("fileMd5")
fileName := c.Query("fileName")
filePath := c.Query("filePath")
err := servers.RemoveChunk(fileMd5)
err = new(dbModel.ExaFile).DeleteFileChunk(fileMd5, fileName, filePath)
if err != nil {
servers.ReportFormat(c, true, fmt.Sprintf("缓存切片删除失败:%v", err), gin.H{})
} else {
servers.ReportFormat(c, true, "缓存切片删除成功", gin.H{})
}
}
-120
View File
@@ -1,120 +0,0 @@
package api
import (
"fmt"
"gin-vue-admin/controller/servers"
"gin-vue-admin/middleware"
"gin-vue-admin/model/dbModel"
"gin-vue-admin/model/modelInterface"
"github.com/gin-gonic/gin"
)
// @Tags SysApi
// @Summary 创建客户
// @Security ApiKeyAuth
// @accept application/json
// @Produce application/json
// @Param data body dbModel.ExaCustomer true "创建客户"
// @Success 200 {string} string "{"success":true,"data":{},"msg":"获取成功"}"
// @Router /customer/createExaCustomer [post]
func CreateExaCustomer(c *gin.Context) {
var cu dbModel.ExaCustomer
_ = c.ShouldBindJSON(&cu)
claims, _ := c.Get("claims")
waitUse := claims.(*middleware.CustomClaims)
cu.SysUserID = waitUse.ID
cu.SysUserAuthorityID = waitUse.AuthorityId
err := cu.CreateExaCustomer()
if err != nil {
servers.ReportFormat(c, false, fmt.Sprintf("创建失败:%v", err), gin.H{})
} else {
servers.ReportFormat(c, true, "创建成功", gin.H{})
}
}
// @Tags SysApi
// @Summary 删除客户
// @Security ApiKeyAuth
// @accept application/json
// @Produce application/json
// @Param data body dbModel.ExaCustomer true "删除客户"
// @Success 200 {string} string "{"success":true,"data":{},"msg":"获取成功"}"
// @Router /customer/deleteExaCustomer [post]
func DeleteExaCustomer(c *gin.Context) {
var cu dbModel.ExaCustomer
_ = c.ShouldBindJSON(&cu)
err := cu.DeleteExaCustomer()
if err != nil {
servers.ReportFormat(c, false, fmt.Sprintf("创建失败:%v", err), gin.H{})
} else {
servers.ReportFormat(c, true, "创建成功", gin.H{})
}
}
// @Tags SysApi
// @Summary 更新客户信息
// @Security ApiKeyAuth
// @accept application/json
// @Produce application/json
// @Param data body dbModel.ExaCustomer true "创建客户"
// @Success 200 {string} string "{"success":true,"data":{},"msg":"获取成功"}"
// @Router /customer/updataExaCustomer [post]
func UpdataExaCustomer(c *gin.Context) {
var cu dbModel.ExaCustomer
_ = c.ShouldBindJSON(&cu)
err := cu.UpdataExaCustomer()
if err != nil {
servers.ReportFormat(c, false, fmt.Sprintf("创建失败:%v", err), gin.H{})
} else {
servers.ReportFormat(c, true, "创建成功", gin.H{})
}
}
// @Tags SysApi
// @Summary 获取单一客户信息
// @Security ApiKeyAuth
// @accept application/json
// @Produce application/json
// @Param data body dbModel.ExaCustomer true "获取单一客户信息"
// @Success 200 {string} string "{"success":true,"data":{},"msg":"获取成功"}"
// @Router /customer/getExaCustomer [post]
func GetExaCustomer(c *gin.Context) {
var cu dbModel.ExaCustomer
_ = c.ShouldBindJSON(&cu)
err, customer := cu.GetExaCustomer()
if err != nil {
servers.ReportFormat(c, false, fmt.Sprintf("创建失败:%v", err), gin.H{})
} else {
servers.ReportFormat(c, true, "创建成功", gin.H{
"customer": customer,
})
}
}
// @Tags SysApi
// @Summary 获取权限客户列表
// @Security ApiKeyAuth
// @accept application/json
// @Produce application/json
// @Param data body modelInterface.PageInfo true "获取权限客户列表"
// @Success 200 {string} string "{"success":true,"data":{},"msg":"获取成功"}"
// @Router /customer/getExaCustomerList [post]
func GetExaCustomerList(c *gin.Context) {
claims, _ := c.Get("claims")
waitUse := claims.(*middleware.CustomClaims)
var cu dbModel.ExaCustomer
cu.SysUserAuthorityID = waitUse.AuthorityId
var pageInfo modelInterface.PageInfo
_ = c.ShouldBindJSON(&pageInfo)
err, customerList, total := cu.GetInfoList(pageInfo)
if err != nil {
servers.ReportFormat(c, false, fmt.Sprintf("创建失败:%v", err), gin.H{})
} else {
servers.ReportFormat(c, true, "创建成功", gin.H{
"customer": customerList,
"total": total,
"page": pageInfo.Page,
"pageSize": pageInfo.PageSize,
})
}
}
@@ -1,100 +0,0 @@
package api
import (
"fmt"
"gin-vue-admin/controller/servers"
"gin-vue-admin/model/dbModel"
"gin-vue-admin/model/modelInterface"
"github.com/gin-gonic/gin"
"strings"
)
// @Tags ExaFileUploadAndDownload
// @Summary 上传文件示例
// @Security ApiKeyAuth
// @accept multipart/form-data
// @Produce application/json
// @Param file formData file true "上传文件示例"
// @Success 200 {string} string "{"success":true,"data":{},"msg":"上传成功"}"
// @Router /fileUploadAndDownload/upload [post]
func UploadFile(c *gin.Context) {
noSave := c.DefaultQuery("noSave", "0")
_, header, err := c.Request.FormFile("file")
if err != nil {
servers.ReportFormat(c, false, fmt.Sprintf("上传文件失败,%v", err), gin.H{})
} else {
//文件上传后拿到文件路径
err, filePath, key := servers.Upload(header, USER_HEADER_BUCKET, USER_HEADER_IMG_PATH)
if err != nil {
servers.ReportFormat(c, false, fmt.Sprintf("接收返回值失败,%v", err), gin.H{})
} else {
//修改数据库后得到修改后的user并且返回供前端使用
var file dbModel.ExaFileUploadAndDownload
file.Url = filePath
file.Name = header.Filename
s := strings.Split(file.Name, ".")
file.Tag = s[len(s)-1]
file.Key = key
if noSave == "0" {
err = file.Upload()
}
if err != nil {
servers.ReportFormat(c, false, fmt.Sprintf("修改数据库链接失败,%v", err), gin.H{})
} else {
servers.ReportFormat(c, true, "上传成功", gin.H{"file": file})
}
}
}
}
// @Tags ExaFileUploadAndDownload
// @Summary 删除文件
// @Security ApiKeyAuth
// @Produce application/json
// @Param data body dbModel.ExaFileUploadAndDownload true "传入文件里面id即可"
// @Success 200 {string} string "{"success":true,"data":{},"msg":"返回成功"}"
// @Router /fileUploadAndDownload/deleteFile [post]
func DeleteFile(c *gin.Context) {
var file dbModel.ExaFileUploadAndDownload
_ = c.ShouldBindJSON(&file)
err, f := file.FindFile()
if err != nil {
servers.ReportFormat(c, false, fmt.Sprintf("删除失败,%v", err), gin.H{})
} else {
err = servers.DeleteFile(USER_HEADER_BUCKET, f.Key)
if err != nil {
servers.ReportFormat(c, false, fmt.Sprintf("删除失败,%v", err), gin.H{})
} else {
err = f.DeleteFile()
if err != nil {
servers.ReportFormat(c, false, fmt.Sprintf("删除失败,%v", err), gin.H{})
} else {
servers.ReportFormat(c, true, fmt.Sprintf("删除成功,%v", err), gin.H{})
}
}
}
}
// @Tags ExaFileUploadAndDownload
// @Summary 分页文件列表
// @Security ApiKeyAuth
// @accept application/json
// @Produce application/json
// @Param data body modelInterface.PageInfo true "分页获取文件户列表"
// @Success 200 {string} string "{"success":true,"data":{},"msg":"获取成功"}"
// @Router /fileUploadAndDownload/getFileList [post]
func GetFileList(c *gin.Context) {
var pageInfo modelInterface.PageInfo
_ = c.ShouldBindJSON(&pageInfo)
err, list, total := new(dbModel.ExaFileUploadAndDownload).GetInfoList(pageInfo)
if err != nil {
servers.ReportFormat(c, false, fmt.Sprintf("获取数据失败,%v", err), gin.H{})
} else {
servers.ReportFormat(c, true, "获取数据成功", gin.H{
"list": list,
"total": total,
"page": pageInfo.Page,
"pageSize": pageInfo.PageSize,
})
}
}
-152
View File
@@ -1,152 +0,0 @@
package api
import (
"fmt"
"gin-vue-admin/controller/servers"
"gin-vue-admin/model/modelInterface"
"gin-vue-admin/model/sysModel"
"github.com/gin-gonic/gin"
)
type CreateApiParams struct {
Path string `json:"path"`
Description string `json:"description"`
}
type DeleteApiParams struct {
ID uint `json:"id"`
}
// @Tags SysApi
// @Summary 创建基础api
// @Security ApiKeyAuth
// @accept application/json
// @Produce application/json
// @Param data body api.CreateApiParams true "创建api"
// @Success 200 {string} string "{"success":true,"data":{},"msg":"获取成功"}"
// @Router /api/createApi [post]
func CreateApi(c *gin.Context) {
var api sysModel.SysApi
_ = c.ShouldBindJSON(&api)
err := api.CreateApi()
if err != nil {
servers.ReportFormat(c, false, fmt.Sprintf("创建失败:%v", err), gin.H{})
} else {
servers.ReportFormat(c, true, "创建成功", gin.H{})
}
}
// @Tags SysApi
// @Summary 删除指定api
// @Security ApiKeyAuth
// @accept application/json
// @Produce application/json
// @Param data body sysModel.SysApi true "删除api"
// @Success 200 {string} string "{"success":true,"data":{},"msg":"获取成功"}"
// @Router /api/deleteApi [post]
func DeleteApi(c *gin.Context) {
var a sysModel.SysApi
_ = c.ShouldBindJSON(&a)
err := a.DeleteApi()
if err != nil {
servers.ReportFormat(c, false, fmt.Sprintf("删除失败:%v", err), gin.H{})
} else {
servers.ReportFormat(c, true, "删除成功", gin.H{})
}
}
type AuthAndPathIn struct {
AuthorityId string `json:"authorityId"`
ApiIds []uint `json:"apiIds"`
}
//条件搜索后端看此api
// @Tags SysApi
// @Summary 分页获取API列表
// @Security ApiKeyAuth
// @accept application/json
// @Produce application/json
// @Param data body modelInterface.PageInfo true "分页获取API列表"
// @Success 200 {string} string "{"success":true,"data":{},"msg":"获取成功"}"
// @Router /api/getApiList [post]
func GetApiList(c *gin.Context) {
// 此结构体仅本方法使用
type searchParams struct {
sysModel.SysApi
modelInterface.PageInfo
}
var sp searchParams
_ = c.ShouldBindJSON(&sp)
err, list, total := sp.SysApi.GetInfoList(sp.PageInfo)
if err != nil {
servers.ReportFormat(c, false, fmt.Sprintf("获取数据失败,%v", err), gin.H{})
} else {
servers.ReportFormat(c, true, "获取数据成功", gin.H{
"list": list,
"total": total,
"page": sp.PageInfo.Page,
"pageSize": sp.PageInfo.PageSize,
})
}
}
// @Tags SysApi
// @Summary 根据id获取api
// @Security ApiKeyAuth
// @accept application/json
// @Produce application/json
// @Param data body modelInterface.PageInfo true "分页获取用户列表"
// @Success 200 {string} string "{"success":true,"data":{},"msg":"获取成功"}"
// @Router /api/getApiById [post]
func GetApiById(c *gin.Context) {
var idInfo GetById
_ = c.ShouldBindJSON(&idInfo)
err, api := new(sysModel.SysApi).GetApiById(idInfo.Id)
if err != nil {
servers.ReportFormat(c, false, fmt.Sprintf("获取数据失败,%v", err), gin.H{})
} else {
servers.ReportFormat(c, true, "获取数据成功", gin.H{
"api": api,
})
}
}
// @Tags SysApi
// @Summary 创建基础api
// @Security ApiKeyAuth
// @accept application/json
// @Produce application/json
// @Param data body api.CreateApiParams true "创建api"
// @Success 200 {string} string "{"success":true,"data":{},"msg":"获取成功"}"
// @Router /api/updataApi [post]
func UpdataApi(c *gin.Context) {
var api sysModel.SysApi
_ = c.ShouldBindJSON(&api)
err := api.UpdataApi()
if err != nil {
servers.ReportFormat(c, false, fmt.Sprintf("修改数据失败,%v", err), gin.H{})
} else {
servers.ReportFormat(c, true, "修改数据成功", gin.H{})
}
}
// @Tags SysApi
// @Summary 获取所有的Api 不分页
// @Security ApiKeyAuth
// @accept application/json
// @Produce application/json
// @Success 200 {string} string "{"success":true,"data":{},"msg":"获取成功"}"
// @Router /api/getAllApis [post]
func GetAllApis(c *gin.Context) {
err, apis := new(sysModel.SysApi).GetAllApis()
if err != nil {
servers.ReportFormat(c, false, fmt.Sprintf("获取数据失败,%v", err), gin.H{})
} else {
servers.ReportFormat(c, true, "获取数据成功", gin.H{
"apis": apis,
})
}
}
@@ -1,95 +0,0 @@
package api
import (
"fmt"
"gin-vue-admin/controller/servers"
"gin-vue-admin/model/modelInterface"
"gin-vue-admin/model/sysModel"
"github.com/gin-gonic/gin"
)
// @Tags authority
// @Summary 创建角色
// @Security ApiKeyAuth
// @accept application/json
// @Produce application/json
// @Param data body sysModel.SysAuthority true "创建角色"
// @Success 200 {string} string "{"success":true,"data":{},"msg":"获取成功"}"
// @Router /authority/createAuthority [post]
func CreateAuthority(c *gin.Context) {
var auth sysModel.SysAuthority
_ = c.ShouldBindJSON(&auth)
err, authBack := auth.CreateAuthority()
if err != nil {
servers.ReportFormat(c, false, fmt.Sprintf("创建失败:%v", err), gin.H{
"authority": authBack,
})
} else {
servers.ReportFormat(c, true, "创建成功", gin.H{
"authority": authBack,
})
}
}
// @Tags authority
// @Summary 删除角色
// @Security ApiKeyAuth
// @accept application/json
// @Produce application/json
// @Param data body sysModel.SysAuthority true "删除角色"
// @Success 200 {string} string "{"success":true,"data":{},"msg":"获取成功"}"
// @Router /authority/deleteAuthority [post]
func DeleteAuthority(c *gin.Context) {
var a sysModel.SysAuthority
_ = c.ShouldBindJSON(&a)
//删除角色之前需要判断是否有用户正在使用此角色
err := a.DeleteAuthority()
if err != nil {
servers.ReportFormat(c, false, fmt.Sprintf("删除失败:%v", err), gin.H{})
} else {
servers.ReportFormat(c, true, "删除成功", gin.H{})
}
}
// @Tags authority
// @Summary 分页获取角色列表
// @Security ApiKeyAuth
// @accept application/json
// @Produce application/json
// @Param data body modelInterface.PageInfo true "分页获取用户列表"
// @Success 200 {string} string "{"success":true,"data":{},"msg":"获取成功"}"
// @Router /authority/getAuthorityList [post]
func GetAuthorityList(c *gin.Context) {
var pageInfo modelInterface.PageInfo
_ = c.ShouldBindJSON(&pageInfo)
err, list, total := new(sysModel.SysAuthority).GetInfoList(pageInfo)
if err != nil {
servers.ReportFormat(c, false, fmt.Sprintf("获取数据失败,%v", err), gin.H{})
} else {
servers.ReportFormat(c, true, "获取数据成功", gin.H{
"list": list,
"total": total,
"page": pageInfo.Page,
"pageSize": pageInfo.PageSize,
})
}
}
// @Tags authority
// @Summary 设置角色资源权限
// @Security ApiKeyAuth
// @accept application/json
// @Produce application/json
// @Param data body sysModel.SysAuthority true "设置角色资源权限"
// @Success 200 {string} string "{"success":true,"data":{},"msg":"设置成功"}"
// @Router /authority/setDataAuthority [post]
func SetDataAuthority(c *gin.Context) {
var auth sysModel.SysAuthority
_ = c.ShouldBindJSON(&auth)
err := auth.SetDataAuthority()
if err != nil {
servers.ReportFormat(c, false, fmt.Sprintf("设置关联失败,%v", err), gin.H{})
} else {
servers.ReportFormat(c, true, "设置关联成功", gin.H{})
}
}
@@ -1,33 +0,0 @@
package api
import (
"fmt"
"gin-vue-admin/controller/servers"
"gin-vue-admin/model/autoCodeModel"
"github.com/gin-gonic/gin"
"os"
)
// @Tags SysApi
// @Summary 自动代码模板
// @Security ApiKeyAuth
// @accept application/json
// @Produce application/json
// @Param data body autoCodeModel.AutoCodeStruct true "创建自动代码"
// @Success 200 {string} string "{"success":true,"data":{},"msg":"创建成功"}"
// @Router /autoCode/createTemp [post]
func CreateTemp(c *gin.Context) {
var a autoCodeModel.AutoCodeStruct
_ = c.ShouldBindJSON(&a)
err := a.CreateTemp()
if err != nil {
servers.ReportFormat(c, false, fmt.Sprintf("创建失败:%v", err), gin.H{})
os.Remove("./ginvueadmin.zip")
} else {
c.Writer.Header().Add("Content-Disposition", fmt.Sprintf("attachment; filename=%s", "ginvueadmin.zip")) //fmt.Sprintf("attachment; filename=%s", filename)对下载的文件重命名
c.Writer.Header().Add("Content-Type", "application/json")
c.Writer.Header().Add("success", "true")
c.File("./ginvueadmin.zip")
os.Remove("./ginvueadmin.zip")
}
}
@@ -1,35 +0,0 @@
package api
import (
"gin-vue-admin/config"
"gin-vue-admin/controller/servers"
"github.com/dchest/captcha"
"github.com/gin-gonic/gin"
)
// 获取图片验证码id
// @Tags base
// @Summary 生成验证码
// @Security ApiKeyAuth
// @accept application/json
// @Produce application/json
// @Success 200 {string} string "{"success":true,"data":{},"msg":"获取成功"}"
// @Router /base/captcha [post]
func Captcha(c *gin.Context) {
captchaId := captcha.NewLen(config.GinVueAdminconfig.Captcha.KeyLong)
servers.ReportFormat(c, true, "验证码获取成功", gin.H{
"captchaId": captchaId,
"picPath": "/base/captcha/" + captchaId + ".png",
})
}
// @Tags base
// @Summary 生成验证码图片路径
// @Security ApiKeyAuth
// @accept application/json
// @Produce application/json
// @Success 200 {string} string "{"success":true,"data":{},"msg":"获取成功"}"
// @Router /base/captcha/:captchaId [get]
func CaptchaImg(c *gin.Context) {
servers.GinCapthcaServeHTTP(c.Writer, c.Request)
}
-57
View File
@@ -1,57 +0,0 @@
package api
import (
"fmt"
"gin-vue-admin/controller/servers"
"gin-vue-admin/model/sysModel"
"github.com/gin-gonic/gin"
)
// @Tags casbin
// @Summary 更改角色api权限
// @Security ApiKeyAuth
// @accept application/json
// @Produce application/json
// @Param data body sysModel.CasbinInReceive true "更改角色api权限"
// @Success 200 {string} string "{"success":true,"data":{},"msg":"获取成功"}"
// @Router /casbin/casbinPUpdata [post]
func CasbinPUpdata(c *gin.Context) {
var cmr sysModel.CasbinInReceive
_ = c.ShouldBindJSON(&cmr)
err := new(sysModel.CasbinModel).CasbinPUpdata(cmr.AuthorityId, cmr.CasbinInfos)
if err != nil {
servers.ReportFormat(c, false, fmt.Sprintf("添加规则失败,%v", err), gin.H{})
} else {
servers.ReportFormat(c, true, "添加规则成功", gin.H{})
}
}
// @Tags casbin
// @Summary 获取权限列表
// @Security ApiKeyAuth
// @accept application/json
// @Produce application/json
// @Param data body api.CreateAuthorityParams true "获取权限列表"
// @Success 200 {string} string "{"success":true,"data":{},"msg":"获取成功"}"
// @Router /casbin/getPolicyPathByAuthorityId [post]
func GetPolicyPathByAuthorityId(c *gin.Context) {
var cmr sysModel.CasbinInReceive
_ = c.ShouldBindJSON(&cmr)
paths := new(sysModel.CasbinModel).GetPolicyPathByAuthorityId(cmr.AuthorityId)
servers.ReportFormat(c, true, "获取规则成功", gin.H{"paths": paths})
}
// @Tags casbin
// @Summary casb RBAC RESTFUL测试路由
// @Security ApiKeyAuth
// @accept application/json
// @Produce application/json
// @Param data body api.CreateAuthorityParams true "获取权限列表"
// @Success 200 {string} string "{"success":true,"data":{},"msg":"获取成功"}"
// @Router /casbin/CasbinTest [get]
func CasbinTest(c *gin.Context) {
// 测试restful以及占位符代码 随意书写
pathParam := c.Param("pathParam")
query := c.Query("query")
servers.ReportFormat(c, true, "获取规则成功", gin.H{"pathParam": pathParam, "query": query})
}
@@ -1,28 +0,0 @@
package api
import (
"fmt"
"gin-vue-admin/controller/servers"
"gin-vue-admin/model/sysModel"
"github.com/gin-gonic/gin"
)
// @Tags jwt
// @Summary jwt加入黑名单
// @Security ApiKeyAuth
// @accept application/json
// @Produce application/json
// @Success 200 {string} string "{"success":true,"data":{},"msg":"拉黑成功"}"
// @Router /jwt/jsonInBlacklist [post]
func JsonInBlacklist(c *gin.Context){
token := c.Request.Header.Get("x-token")
ModelJwt := sysModel.JwtBlacklist{
Jwt:token,
}
err := ModelJwt.JsonInBlacklist()
if err != nil {
servers.ReportFormat(c, false, fmt.Sprintf("jwt作废失败,%v", err), gin.H{})
} else {
servers.ReportFormat(c, true, "jwt作废成功", gin.H{})
}
}
-199
View File
@@ -1,199 +0,0 @@
package api
import (
"fmt"
"gin-vue-admin/controller/servers"
"gin-vue-admin/middleware"
"gin-vue-admin/model/modelInterface"
"gin-vue-admin/model/sysModel"
"github.com/gin-gonic/gin"
)
// @Tags authorityAndMenu
// @Summary 获取用户动态路由
// @Security ApiKeyAuth
// @Produce application/json
// @Param data body api.RegistAndLoginStuct true "可以什么都不填"
// @Success 200 {string} string "{"success":true,"data":{},"msg":"返回成功"}"
// @Router /menu/getMenu [post]
func GetMenu(c *gin.Context) {
claims, _ := c.Get("claims")
waitUse := claims.(*middleware.CustomClaims)
err, menus := new(sysModel.SysMenu).GetMenuTree(waitUse.AuthorityId)
if err != nil {
servers.ReportFormat(c, false, fmt.Sprintf("获取失败:%v", err), gin.H{"menus": menus})
} else {
servers.ReportFormat(c, true, "获取成功", gin.H{"menus": menus})
}
}
// @Tags menu
// @Summary 分页获取基础menu列表
// @Security ApiKeyAuth
// @accept application/json
// @Produce application/json
// @Param data body modelInterface.PageInfo true "分页获取基础menu列表"
// @Success 200 {string} string "{"success":true,"data":{},"msg":"获取成功"}"
// @Router /menu/getMenuList [post]
func GetMenuList(c *gin.Context) {
var pageInfo modelInterface.PageInfo
_ = c.ShouldBindJSON(&pageInfo)
err, menuList, total := new(sysModel.SysBaseMenu).GetInfoList(pageInfo)
if err != nil {
servers.ReportFormat(c, false, fmt.Sprintf("获取数据失败,%v", err), gin.H{})
} else {
servers.ReportFormat(c, true, "获取数据成功", gin.H{
"list": menuList,
"total": total,
"page": pageInfo.Page,
"pageSize": pageInfo.PageSize,
})
}
}
// @Tags menu
// @Summary 新增菜单
// @Security ApiKeyAuth
// @accept application/json
// @Produce application/json
// @Param data body sysModel.SysBaseMenu true "新增菜单"
// @Success 200 {string} string "{"success":true,"data":{},"msg":"获取成功"}"
// @Router /menu/addBaseMenu [post]
func AddBaseMenu(c *gin.Context) {
var addMenu sysModel.SysBaseMenu
_ = c.ShouldBindJSON(&addMenu)
err := addMenu.AddBaseMenu()
if err != nil {
servers.ReportFormat(c, false, fmt.Sprintf("添加失败,%v", err), gin.H{})
} else {
servers.ReportFormat(c, true, fmt.Sprintf("添加成功,%v", err), gin.H{})
}
}
// @Tags authorityAndMenu
// @Summary 获取用户动态路由
// @Security ApiKeyAuth
// @Produce application/json
// @Param data body api.RegistAndLoginStuct true "可以什么都不填"
// @Success 200 {string} string "{"success":true,"data":{},"msg":"返回成功"}"
// @Router /menu/getBaseMenuTree [post]
func GetBaseMenuTree(c *gin.Context) {
err, menus := new(sysModel.SysBaseMenu).GetBaseMenuTree()
if err != nil {
servers.ReportFormat(c, false, fmt.Sprintf("获取失败:%v", err), gin.H{"menus": menus})
} else {
servers.ReportFormat(c, true, "获取成功", gin.H{"menus": menus})
}
}
type AddMenuAuthorityInfo struct {
Menus []sysModel.SysBaseMenu
AuthorityId string
}
// @Tags authorityAndMenu
// @Summary 增加menu和角色关联关系
// @Security ApiKeyAuth
// @accept application/json
// @Produce application/json
// @Param data body api.AddMenuAuthorityInfo true "增加menu和角色关联关系"
// @Success 200 {string} string "{"success":true,"data":{},"msg":"获取成功"}"
// @Router /menu/addMenuAuthority [post]
func AddMenuAuthority(c *gin.Context) {
var addMenuAuthorityInfo AddMenuAuthorityInfo
_ = c.ShouldBindJSON(&addMenuAuthorityInfo)
err := new(sysModel.SysMenu).AddMenuAuthority(addMenuAuthorityInfo.Menus, addMenuAuthorityInfo.AuthorityId)
if err != nil {
servers.ReportFormat(c, false, fmt.Sprintf("添加失败,%v", err), gin.H{})
} else {
servers.ReportFormat(c, true, fmt.Sprintf("添加成功,%v", err), gin.H{})
}
}
type AuthorityIdInfo struct {
AuthorityId string
}
// @Tags authorityAndMenu
// @Summary 获取指定角色menu
// @Security ApiKeyAuth
// @accept application/json
// @Produce application/json
// @Param data body api.AuthorityIdInfo true "增加menu和角色关联关系"
// @Success 200 {string} string "{"success":true,"data":{},"msg":"获取成功"}"
// @Router /menu/addMenuAuthority [post]
func GetMenuAuthority(c *gin.Context) {
var authorityIdInfo AuthorityIdInfo
_ = c.ShouldBindJSON(&authorityIdInfo)
err, menus := new(sysModel.SysMenu).GetMenuAuthority(authorityIdInfo.AuthorityId)
if err != nil {
servers.ReportFormat(c, false, fmt.Sprintf("获取失败:%v", err), gin.H{"menus": menus})
} else {
servers.ReportFormat(c, true, "获取成功", gin.H{"menus": menus})
}
}
type IdInfo struct {
Id float64
}
// @Tags menu
// @Summary 删除菜单
// @Security ApiKeyAuth
// @accept application/json
// @Produce application/json
// @Param data body api.IdInfo true "删除菜单"
// @Success 200 {string} string "{"success":true,"data":{},"msg":"获取成功"}"
// @Router /menu/deleteBaseMenu [post]
func DeleteBaseMenu(c *gin.Context) {
var idInfo IdInfo
_ = c.ShouldBindJSON(&idInfo)
err := new(sysModel.SysBaseMenu).DeleteBaseMenu(idInfo.Id)
if err != nil {
servers.ReportFormat(c, false, fmt.Sprintf("删除失败:%v", err), gin.H{})
} else {
servers.ReportFormat(c, true, "删除成功", gin.H{})
}
}
// @Tags menu
// @Summary 更新菜单
// @Security ApiKeyAuth
// @accept application/json
// @Produce application/json
// @Param data body sysModel.SysBaseMenu true "更新菜单"
// @Success 200 {string} string "{"success":true,"data":{},"msg":"获取成功"}"
// @Router /menu/updataBaseMen [post]
func UpdataBaseMenu(c *gin.Context) {
var menu sysModel.SysBaseMenu
_ = c.ShouldBindJSON(&menu)
err := menu.UpdataBaseMenu()
if err != nil {
servers.ReportFormat(c, false, fmt.Sprintf("修改失败:%v", err), gin.H{})
} else {
servers.ReportFormat(c, true, "修改成功", gin.H{})
}
}
type GetById struct {
Id float64 `json:"id"`
}
// @Tags menu
// @Summary 根据id获取菜单
// @Security ApiKeyAuth
// @accept application/json
// @Produce application/json
// @Param data body api.GetById true "根据id获取菜单"
// @Success 200 {string} string "{"success":true,"data":{},"msg":"获取成功"}"
// @Router /menu/getBaseMenuById [post]
func GetBaseMenuById(c *gin.Context) {
var idInfo GetById
_ = c.ShouldBindJSON(&idInfo)
err, menu := new(sysModel.SysBaseMenu).GetBaseMenuById(idInfo.Id)
if err != nil {
servers.ReportFormat(c, false, fmt.Sprintf("查询失败:%v", err), gin.H{})
} else {
servers.ReportFormat(c, true, "查询成功", gin.H{"menu": menu})
}
}
-61
View File
@@ -1,61 +0,0 @@
package api
import (
"fmt"
"gin-vue-admin/controller/servers"
"gin-vue-admin/model/sysModel"
"github.com/gin-gonic/gin"
)
// @Tags system
// @Summary 获取配置文件内容
// @Security ApiKeyAuth
// @Produce application/json
// @Success 200 {string} string "{"success":true,"data":{},"msg":"返回成功"}"
// @Router /system/getSystemConfig [post]
func GetSystemConfig(c *gin.Context) {
err, config := new(sysModel.System).GetSystemConfig()
if err != nil {
servers.ReportFormat(c, false, fmt.Sprintf("获取失败:%v", err), gin.H{})
} else {
servers.ReportFormat(c, true, "获取成功", gin.H{"config": config})
}
}
// @Tags system
// @Summary 设置配置文件内容
// @Security ApiKeyAuth
// @Produce application/json
// @Param data body sysModel.System true "设置配置文件内容"
// @Success 200 {string} string "{"success":true,"data":{},"msg":"返回成功"}"
// @Router /system/setSystemConfig [post]
func SetSystemConfig(c *gin.Context) {
var sys sysModel.System
_ = c.ShouldBindJSON(&sys)
err := sys.SetSystemConfig()
if err != nil {
servers.ReportFormat(c, false, fmt.Sprintf("设置失败:%v", err), gin.H{})
} else {
servers.ReportFormat(c, true, "设置成功", gin.H{})
}
}
//本方法开发中 开发者windows系统 缺少linux系统所需的包 因此搁置
// @Tags system
// @Summary 设置配置文件内容
// @Security ApiKeyAuth
// @Produce application/json
// @Param data body sysModel.System true "设置配置文件内容"
// @Success 200 {string} string "{"success":true,"data":{},"msg":"返回成功"}"
// @Router /system/ReloadSystem [post]
func ReloadSystem(c *gin.Context) {
var sys sysModel.System
_ = c.ShouldBindJSON(&sys)
err := sys.SetSystemConfig()
if err != nil {
servers.ReportFormat(c, false, fmt.Sprintf("设置失败:%v", err), gin.H{})
} else {
servers.ReportFormat(c, true, "设置成功", gin.H{})
}
}
-247
View File
@@ -1,247 +0,0 @@
package api
import (
"fmt"
"gin-vue-admin/config"
"gin-vue-admin/controller/servers"
"gin-vue-admin/middleware"
"gin-vue-admin/model/modelInterface"
"gin-vue-admin/model/sysModel"
"github.com/dchest/captcha"
"github.com/dgrijalva/jwt-go"
"github.com/gin-gonic/gin"
"github.com/go-redis/redis"
uuid "github.com/satori/go.uuid"
"mime/multipart"
"time"
)
var (
USER_HEADER_IMG_PATH string = "http://qmplusimg.henrongyi.top"
USER_HEADER_BUCKET string = "qm-plus-img"
)
type RegistAndLoginStuct struct {
Username string `json:"username"`
Password string `json:"password"`
Captcha string `json:"captcha"`
CaptchaId string `json:"captchaId"`
}
type RegestStuct struct {
Username string `json:"userName"`
Password string `json:"passWord"`
NickName string `json:"nickName" gorm:"default:'QMPlusUser'"`
HeaderImg string `json:"headerImg" gorm:"default:'http://www.henrongyi.top/avatar/lufu.jpg'"`
AuthorityId string `json:"authorityId" gorm:"default:888"`
}
// @Tags Base
// @Summary 用户注册账号
// @Produce application/json
// @Param data body sysModel.SysUser true "用户注册接口"
// @Success 200 {string} string "{"success":true,"data":{},"msg":"注册成功"}"
// @Router /base/regist [post]
func Regist(c *gin.Context) {
var R RegestStuct
_ = c.ShouldBindJSON(&R)
user := &sysModel.SysUser{Username: R.Username, NickName: R.NickName, Password: R.Password, HeaderImg: R.HeaderImg, AuthorityId: R.AuthorityId}
err, user := user.Regist()
if err != nil {
servers.ReportFormat(c, false, fmt.Sprintf("%v", err), gin.H{
"user": user,
})
} else {
servers.ReportFormat(c, true, "创建成功", gin.H{
"user": user,
})
}
}
// @Tags Base
// @Summary 用户登录
// @Produce application/json
// @Param data body api.RegistAndLoginStuct true "用户登录接口"
// @Success 200 {string} string "{"success":true,"data":{},"msg":"登陆成功"}"
// @Router /base/login [post]
func Login(c *gin.Context) {
var L RegistAndLoginStuct
_ = c.ShouldBindJSON(&L)
if captcha.VerifyString(L.CaptchaId, L.Captcha) {
U := &sysModel.SysUser{Username: L.Username, Password: L.Password}
if err, user := U.Login(); err != nil {
servers.ReportFormat(c, false, fmt.Sprintf("用户名密码错误或%v", err), gin.H{})
} else {
tokenNext(c, *user)
}
} else {
servers.ReportFormat(c, false, "验证码错误", gin.H{})
}
}
//登录以后签发jwt
func tokenNext(c *gin.Context, user sysModel.SysUser) {
j := &middleware.JWT{
[]byte(config.GinVueAdminconfig.JWT.SigningKey), // 唯一签名
}
clams := middleware.CustomClaims{
UUID: user.UUID,
ID: user.ID,
NickName: user.NickName,
AuthorityId: user.AuthorityId,
StandardClaims: jwt.StandardClaims{
NotBefore: int64(time.Now().Unix() - 1000), // 签名生效时间
ExpiresAt: int64(time.Now().Unix() + 60*60*24*7), // 过期时间 一周
Issuer: "qmPlus", //签名的发行者
},
}
token, err := j.CreateToken(clams)
if err != nil {
servers.ReportFormat(c, false, "获取token失败", gin.H{})
} else {
if config.GinVueAdminconfig.System.UseMultipoint {
var loginJwt sysModel.JwtBlacklist
loginJwt.Jwt = token
err, jwtStr := loginJwt.GetRedisJWT(user.Username)
if err == redis.Nil {
err2 := loginJwt.SetRedisJWT(user.Username)
if err2 != nil {
servers.ReportFormat(c, false, "设置登录状态失败", gin.H{})
} else {
servers.ReportFormat(c, true, "登录成功", gin.H{"user": user, "token": token, "expiresAt": clams.StandardClaims.ExpiresAt * 1000})
}
} else if err != nil {
servers.ReportFormat(c, false, fmt.Sprintf("%v", err), gin.H{})
} else {
var blackjWT sysModel.JwtBlacklist
blackjWT.Jwt = jwtStr
err3 := blackjWT.JsonInBlacklist()
if err3 != nil {
servers.ReportFormat(c, false, "jwt作废失败", gin.H{})
} else {
err2 := loginJwt.SetRedisJWT(user.Username)
if err2 != nil {
servers.ReportFormat(c, false, "设置登录状态失败", gin.H{})
} else {
servers.ReportFormat(c, true, "登录成功", gin.H{"user": user, "token": token, "expiresAt": clams.StandardClaims.ExpiresAt * 1000})
}
}
}
} else {
servers.ReportFormat(c, true, "登录成功", gin.H{"user": user, "token": token, "expiresAt": clams.StandardClaims.ExpiresAt * 1000})
}
}
}
type ChangePasswordStutrc struct {
Username string `json:"username"`
Password string `json:"password"`
NewPassword string `json:"newPassword"`
}
// @Tags SysUser
// @Summary 用户修改密码
// @Security ApiKeyAuth
// @Produce application/json
// @Param data body api.ChangePasswordStutrc true "用户修改密码"
// @Success 200 {string} string "{"success":true,"data":{},"msg":"修改成功"}"
// @Router /user/changePassword [post]
func ChangePassword(c *gin.Context) {
var params ChangePasswordStutrc
_ = c.ShouldBindJSON(&params)
U := &sysModel.SysUser{Username: params.Username, Password: params.Password}
if err, _ := U.ChangePassword(params.NewPassword); err != nil {
servers.ReportFormat(c, false, "修改失败,请检查用户名密码", gin.H{})
} else {
servers.ReportFormat(c, true, "修改成功", gin.H{})
}
}
type UserHeaderImg struct {
HeaderImg multipart.File `json:"headerImg"`
}
// @Tags SysUser
// @Summary 用户上传头像
// @Security ApiKeyAuth
// @accept multipart/form-data
// @Produce application/json
// @Param headerImg formData file true "用户上传头像"
// @Param username formData string true "用户上传头像"
// @Success 200 {string} string "{"success":true,"data":{},"msg":"上传成功"}"
// @Router /user/uploadHeaderImg [post]
func UploadHeaderImg(c *gin.Context) {
claims, _ := c.Get("claims")
//获取头像文件
// 这里我们通过断言获取 claims内的所有内容
waitUse := claims.(*middleware.CustomClaims)
uuid := waitUse.UUID
_, header, err := c.Request.FormFile("headerImg")
//便于找到用户 以后从jwt中取
if err != nil {
servers.ReportFormat(c, false, fmt.Sprintf("上传文件失败,%v", err), gin.H{})
} else {
//文件上传后拿到文件路径
err, filePath, _ := servers.Upload(header, USER_HEADER_BUCKET, USER_HEADER_IMG_PATH)
if err != nil {
servers.ReportFormat(c, false, fmt.Sprintf("接收返回值失败,%v", err), gin.H{})
} else {
//修改数据库后得到修改后的user并且返回供前端使用
err, user := new(sysModel.SysUser).UploadHeaderImg(uuid, filePath)
if err != nil {
servers.ReportFormat(c, false, fmt.Sprintf("修改数据库链接失败,%v", err), gin.H{})
} else {
servers.ReportFormat(c, true, "上传成功", gin.H{"user": user})
}
}
}
}
// @Tags SysUser
// @Summary 分页获取用户列表
// @Security ApiKeyAuth
// @accept application/json
// @Produce application/json
// @Param data body modelInterface.PageInfo true "分页获取用户列表"
// @Success 200 {string} string "{"success":true,"data":{},"msg":"获取成功"}"
// @Router /user/getUserList [post]
func GetUserList(c *gin.Context) {
var pageInfo modelInterface.PageInfo
_ = c.ShouldBindJSON(&pageInfo)
err, list, total := new(sysModel.SysUser).GetInfoList(pageInfo)
if err != nil {
servers.ReportFormat(c, false, fmt.Sprintf("获取数据失败,%v", err), gin.H{})
} else {
servers.ReportFormat(c, true, "获取数据成功", gin.H{
"userList": list,
"total": total,
"page": pageInfo.Page,
"pageSize": pageInfo.PageSize,
})
}
}
type SetUserAuth struct {
UUID uuid.UUID `json:"uuid"`
AuthorityId string `json:"authorityId"`
}
// @Tags SysUser
// @Summary 设置用户权限
// @Security ApiKeyAuth
// @accept application/json
// @Produce application/json
// @Param data body api.SetUserAuth true "设置用户权限"
// @Success 200 {string} string "{"success":true,"data":{},"msg":"修改成功"}"
// @Router /user/setUserAuthority [post]
func SetUserAuthority(c *gin.Context) {
var sua SetUserAuth
_ = c.ShouldBindJSON(&sua)
err := new(sysModel.SysUser).SetUserAuthority(sua.UUID, sua.AuthorityId)
if err != nil {
servers.ReportFormat(c, false, fmt.Sprintf("修改失败,%v", err), gin.H{})
} else {
servers.ReportFormat(c, true, "修改成功", gin.H{})
}
}
@@ -1,25 +0,0 @@
package api
import (
"fmt"
"gin-vue-admin/controller/servers"
"gin-vue-admin/model/sysModel"
"github.com/gin-gonic/gin"
)
// @Tags workflow
// @Summary 注册工作流
// @Produce application/json
// @Param data body sysModel.SysWorkflow true "注册工作流接口"
// @Success 200 {string} string "{"success":true,"data":{},"msg":"注册成功"}"
// @Router /workflow/createWorkFlow [post]
func CreateWorkFlow(c *gin.Context) {
var wk sysModel.SysWorkflow
_ = c.ShouldBindJSON(&wk)
err := wk.Create()
if err != nil {
servers.ReportFormat(c, false, fmt.Sprintf("获取失败:%v", err), gin.H{})
} else {
servers.ReportFormat(c, true, "获取成功", gin.H{})
}
}
@@ -1,55 +0,0 @@
package servers
import (
"bytes"
"fmt"
"gin-vue-admin/config"
"github.com/dchest/captcha"
"net/http"
"path"
"strings"
"time"
)
// 这里需要自行实现captcha 的gin模式
func GinCapthcaServeHTTP(w http.ResponseWriter, r *http.Request) {
dir, file := path.Split(r.URL.Path)
ext := path.Ext(file)
id := file[:len(file)-len(ext)]
if ext == "" || id == "" {
http.NotFound(w, r)
return
}
fmt.Println("reload : " + r.FormValue("reload"))
if r.FormValue("reload") != "" {
captcha.Reload(id)
}
lang := strings.ToLower(r.FormValue("lang"))
download := path.Base(dir) == "download"
if Serve(w, r, id, ext, lang, download, config.GinVueAdminconfig.Captcha.ImgWidth, config.GinVueAdminconfig.Captcha.ImgHeight) == captcha.ErrNotFound {
http.NotFound(w, r)
}
}
func Serve(w http.ResponseWriter, r *http.Request, id, ext, lang string, download bool, width, height int) error {
w.Header().Set("Cache-Control", "no-cache, no-store, must-revalidate")
w.Header().Set("Pragma", "no-cache")
w.Header().Set("Expires", "0")
var content bytes.Buffer
switch ext {
case ".png":
w.Header().Set("Content-Type", "image/png")
captcha.WriteImage(&content, id, width, height)
case ".wav":
w.Header().Set("Content-Type", "audio/x-wav")
captcha.WriteAudio(&content, id, lang)
default:
return captcha.ErrNotFound
}
if download {
w.Header().Set("Content-Type", "application/octet-stream")
}
http.ServeContent(w, r, id+ext, time.Time{}, bytes.NewReader(content.Bytes()))
return nil
}
-16
View File
@@ -1,16 +0,0 @@
package servers
import (
"gin-vue-admin/init/qmsql"
"gin-vue-admin/model/modelInterface"
"github.com/jinzhu/gorm"
)
//获取分页功能 接收实现了分页接口的结构体 返回搜索完成的结果 许需要自行scan 或者find
func PagingServer(paging modelInterface.Paging, info modelInterface.PageInfo) (err error, db *gorm.DB, total int) {
limit := info.PageSize
offset := info.PageSize * (info.Page - 1)
err = qmsql.DEFAULTDB.Model(paging).Count(&total).Error
db = qmsql.DEFAULTDB.Limit(limit).Offset(offset).Order("id desc")
return err, db, total
}
@@ -1,16 +0,0 @@
package servers
import (
"net/http"
"github.com/gin-gonic/gin"
)
func ReportFormat(c *gin.Context, success bool, msg string, json gin.H) {
// 开始时间
c.JSON(http.StatusOK, gin.H{
"success": success,
"msg": msg,
"data": json,
})
}
-70
View File
@@ -1,70 +0,0 @@
package servers
import (
"context"
"fmt"
"gin-vue-admin/config"
"github.com/qiniu/api.v7/auth/qbox"
"github.com/qiniu/api.v7/storage"
"mime/multipart"
"time"
)
var accessKey string = config.GinVueAdminconfig.Qiniu.AccessKey // 你在七牛云的accessKey 这里是我个人测试号的key 仅供测试使用 恳请大家不要乱传东西
var secretKey string = config.GinVueAdminconfig.Qiniu.SecretKey // 你在七牛云的secretKey 这里是我个人测试号的key 仅供测试使用 恳请大家不要乱传东西
// 接收两个参数 一个文件流 一个 bucket 你的七牛云标准空间的名字
func Upload(file *multipart.FileHeader, bucket string, urlPath string) (err error, path string, key string) {
putPolicy := storage.PutPolicy{
Scope: bucket,
}
mac := qbox.NewMac(accessKey, secretKey)
upToken := putPolicy.UploadToken(mac)
cfg := storage.Config{}
// 空间对应的机房
cfg.Zone = &storage.ZoneHuadong
// 是否使用https域名
cfg.UseHTTPS = false
// 上传是否使用CDN上传加速
cfg.UseCdnDomains = false
formUploader := storage.NewFormUploader(&cfg)
ret := storage.PutRet{}
putExtra := storage.PutExtra{
Params: map[string]string{
"x:name": "github logo",
},
}
f, e := file.Open()
if e != nil {
fmt.Println(e)
return e, "", ""
}
dataLen := file.Size
fileKey := fmt.Sprintf("%d%s", time.Now().Unix(), file.Filename) // 文件名格式 自己可以改 建议保证唯一性
err = formUploader.Put(context.Background(), &ret, upToken, fileKey, f, dataLen, &putExtra)
if err != nil {
fmt.Println(err)
//qmlog.QMLog.Info(err)
return err, "", ""
}
return err, urlPath + "/" + ret.Key, ret.Key
}
func DeleteFile(bucket string, key string) error {
mac := qbox.NewMac(accessKey, secretKey)
cfg := storage.Config{
// 是否使用https域名进行资源管理
UseHTTPS: false,
}
// 指定空间所在的区域,如果不指定将自动探测
// 如果没有特殊需求,默认不需要指定
//cfg.Zone=&storage.ZoneHuabei
bucketManager := storage.NewBucketManager(mac, &cfg)
err := bucketManager.Delete(bucket, key)
if err != nil {
fmt.Println(err)
return err
}
return nil
}
File diff suppressed because it is too large Load Diff
File diff suppressed because it is too large Load Diff
File diff suppressed because it is too large Load Diff
File diff suppressed because it is too large Load Diff
-50
View File
@@ -1,50 +0,0 @@
module gin-vue-admin
go 1.12
require (
github.com/alecthomas/template v0.0.0-20190718012654-fb15b899a751
github.com/casbin/casbin v1.9.1
github.com/casbin/gorm-adapter v1.0.0
github.com/dchest/captcha v0.0.0-20170622155422-6a29415a8364
github.com/dgrijalva/jwt-go v3.2.0+incompatible
github.com/fastly/go-utils v0.0.0-20180712184237-d95a45783239 // indirect
github.com/fsnotify/fsnotify v1.4.9
github.com/gin-gonic/gin v1.6.1
github.com/go-openapi/spec v0.19.7 // indirect
github.com/go-openapi/swag v0.19.8 // indirect
github.com/go-redis/redis v6.15.7+incompatible
github.com/go-sql-driver/mysql v1.5.0 // indirect
github.com/golang/protobuf v1.3.5 // indirect
github.com/jehiah/go-strftime v0.0.0-20171201141054-1d33003b3869 // indirect
github.com/jinzhu/gorm v1.9.12
github.com/lestrrat/go-envload v0.0.0-20180220120943-6ed08b54a570 // indirect
github.com/lestrrat/go-file-rotatelogs v0.0.0-20180223000712-d3151e2a480f
github.com/lestrrat/go-strftime v0.0.0-20180220042222-ba3bf9c1d042 // indirect
github.com/lib/pq v1.3.0 // indirect
github.com/mailru/easyjson v0.7.1 // indirect
github.com/mitchellh/mapstructure v1.2.2 // indirect
github.com/onsi/ginkgo v1.7.0 // indirect
github.com/onsi/gomega v1.4.3 // indirect
github.com/op/go-logging v0.0.0-20160315200505-970db520ece7
github.com/pelletier/go-toml v1.6.0 // indirect
github.com/pkg/errors v0.9.1
github.com/qiniu/api.v7 v7.2.5+incompatible
github.com/qiniu/x v7.0.8+incompatible // indirect
github.com/satori/go.uuid v1.2.0
github.com/spf13/afero v1.2.2 // indirect
github.com/spf13/cast v1.3.1 // indirect
github.com/spf13/jwalterweatherman v1.1.0 // indirect
github.com/spf13/pflag v1.0.5 // indirect
github.com/spf13/viper v1.6.2
github.com/swaggo/gin-swagger v1.2.0
github.com/swaggo/swag v1.6.5
github.com/tebeka/strftime v0.1.3 // indirect
github.com/unrolled/secure v1.0.7
golang.org/x/crypto v0.0.0-20200323165209-0ec3e9974c59 // indirect
golang.org/x/net v0.0.0-20200320220750-118fecf932d8 // indirect
golang.org/x/sys v0.0.0-20200323222414-85ca7c5b95cd // indirect
golang.org/x/tools v0.0.0-20200324003944-a576cf524670 // indirect
gopkg.in/ini.v1 v1.55.0 // indirect
qiniupkg.com/x v7.0.8+incompatible // indirect
)
-25
View File
@@ -1,25 +0,0 @@
package initRedis
import (
"gin-vue-admin/config"
"gin-vue-admin/init/initlog"
"github.com/go-redis/redis"
)
var DEFAULTREDIS *redis.Client
func InitRedis() (client *redis.Client) {
client = redis.NewClient(&redis.Options{
Addr: config.GinVueAdminconfig.RedisAdmin.Addr,
Password: config.GinVueAdminconfig.RedisAdmin.Password, // no password set
DB: config.GinVueAdminconfig.RedisAdmin.DB, // use default DB
})
pong, err := client.Ping().Result()
if err != nil {
log.L.Error(err)
} else {
log.L.Info("redis connect ping response:", pong)
DEFAULTREDIS = client
}
return client
}
@@ -1,42 +0,0 @@
package initRouter
import (
_ "gin-vue-admin/docs"
"gin-vue-admin/init/initlog"
"gin-vue-admin/middleware"
"gin-vue-admin/router"
"github.com/gin-gonic/gin"
"github.com/swaggo/gin-swagger"
"github.com/swaggo/gin-swagger/swaggerFiles"
)
//初始化总路由
func InitRouter() *gin.Engine {
var Router = gin.Default()
//Router.Use(middleware.LoadTls()) // 打开就能玩https了
// 如果不需要日志 请关闭这里
Router.Use(middleware.Logger())
log.L.Debug("use middleware logger")
// 跨域
Router.Use(middleware.Cors())
log.L.Debug("use middleware cors")
Router.GET("/swagger/*any", ginSwagger.WrapHandler(swaggerFiles.Handler))
log.L.Debug("register swagger handler")
// 方便统一添加路由组前缀 多服务器上线使用
ApiGroup := Router.Group("")
router.InitUserRouter(ApiGroup) // 注册用户路由
router.InitBaseRouter(ApiGroup) // 注册基础功能路由 不做鉴权
router.InitMenuRouter(ApiGroup) // 注册menu路由
router.InitAuthorityRouter(ApiGroup) // 注册角色路由
router.InitApiRouter(ApiGroup) // 注册功能api路由
router.InitFileUploadAndDownloadRouter(ApiGroup) // 文件上传下载功能路由
router.InitWorkflowRouter(ApiGroup) // 工作流相关路由
router.InitCasbinRouter(ApiGroup) // 权限相关路由
router.InitJwtRouter(ApiGroup) // jwt相关路由
router.InitSystemRouter(ApiGroup) // system相关路由
router.InitCustomerRouter(ApiGroup) // 客户路由
router.InitAutoCodeRouter(ApiGroup) // 创建自动化代码
log.L.Info("router register success")
return Router
}
-17
View File
@@ -1,17 +0,0 @@
package log
// Custom Logger
type Logger interface {
Debug(v ...interface{})
Info(v ...interface{})
Warning(v ...interface{})
Error(v ...interface{})
Critical(v ...interface{})
Fatal(v ...interface{})
}
var L Logger
func SetLogger(logger Logger) {
L = logger
}
-146
View File
@@ -1,146 +0,0 @@
package qmlog
// Register logger
import (
"errors"
"fmt"
"gin-vue-admin/config"
"gin-vue-admin/init/initlog"
"gin-vue-admin/tools"
rotatelogs "github.com/lestrrat/go-file-rotatelogs"
oplogging "github.com/op/go-logging"
"io"
"os"
"strings"
"time"
)
const (
logDir = "log"
logSoftLink = "api.log"
module = "gin-vue-admin"
)
var (
configNotFound = errors.New("logger prefix not found")
defaultFormatter = `%{time:2006/01/02 - 15:04:05.000} %{longfile} %{color:bold}▶ [%{level:.6s}] %{message}%{color:reset}`
)
type Logger struct{
logger *oplogging.Logger
}
func NewLogger() error {
c := config.GinVueAdminconfig.Log
if c.Prefix == "" {
return configNotFound
}
logger := oplogging.MustGetLogger(module)
var backends []oplogging.Backend
backends = registerStdout(c, backends)
backends = registerFile(c, backends)
oplogging.SetBackend(backends...)
log.SetLogger(logger)
return nil
}
func registerStdout(c config.Log, backends []oplogging.Backend) []oplogging.Backend {
for _, v := range c.Stdout {
level, err := oplogging.LogLevel(v)
if err != nil {
fmt.Println(err)
continue
}
backends = append(backends, createBackend(os.Stdout, c, level))
}
return backends
}
func registerFile(c config.Log, backends []oplogging.Backend) []oplogging.Backend {
if len(c.File) > 0 {
if ok, _ := tools.PathExists(logDir); !ok {
// directory not exist
fmt.Println("create log directory")
_ = os.Mkdir(logDir, os.ModePerm)
}
apiLogPath := logDir + string(os.PathSeparator) + logSoftLink
fileWriter, err := rotatelogs.New(
apiLogPath+".%Y-%m-%d-%H-%M.log",
// generate soft link, point to latest log file
rotatelogs.WithLinkName(apiLogPath),
// maximum time to save log files
rotatelogs.WithMaxAge(7*24*time.Hour),
// time period of log file switching
rotatelogs.WithRotationTime(24*time.Hour),
)
if err != nil {
fmt.Println(err)
return backends
}
for _, v := range c.File {
level, err := oplogging.LogLevel(v)
if err != nil {
fmt.Println(err)
continue
}
backends = append(backends, createBackend(fileWriter, c, level))
}
}
return backends
}
func createBackend(w io.Writer, c config.Log, level oplogging.Level) oplogging.Backend {
backend := oplogging.NewLogBackend(w, c.Prefix, 0)
stdoutWriter := false
if w == os.Stdout {
stdoutWriter = true
}
format := getLogFormatter(c, stdoutWriter)
backendLeveled := oplogging.AddModuleLevel(oplogging.NewBackendFormatter(backend, format))
backendLeveled.SetLevel(level, module)
return backendLeveled
}
func getLogFormatter(c config.Log, stdoutWriter bool) oplogging.Formatter {
pattern := defaultFormatter
if !stdoutWriter {
// Color is only required for console output
// Other writers don't need %{color} tag
pattern = strings.Replace(pattern, "%{color:bold}", "", -1)
pattern = strings.Replace(pattern, "%{color:reset}", "", -1)
}
if !c.LogFile {
// Remove %{logfile} tag
pattern = strings.Replace(pattern, "%{longfile}", "", -1)
}
return oplogging.MustStringFormatter(pattern)
}
func (l Logger) Debug(v ...interface{}) {
l.logger.Debug(v)
}
func (l Logger) Info(v ...interface{}) {
l.logger.Info(v)
}
func (l Logger) Warning(v ...interface{}) {
l.logger.Warning(v)
}
func (l Logger) Error(v ...interface{}) {
l.logger.Error(v)
}
func (l Logger) Critical(v ...interface{}) {
l.logger.Critical(v)
}
func (l Logger) Fatal(v ...interface{}) {
l.logger.Fatal(v)
}
-23
View File
@@ -1,23 +0,0 @@
package qmsql
import (
"gin-vue-admin/config"
"gin-vue-admin/init/initlog"
"github.com/jinzhu/gorm"
_ "github.com/jinzhu/gorm/dialects/mysql"
)
var DEFAULTDB *gorm.DB
//初始化数据库并产生数据库全局变量
func InitMysql(admin config.MysqlAdmin) *gorm.DB {
if db, err := gorm.Open("mysql", admin.Username+":"+admin.Password+"@("+admin.Path+")/"+admin.Dbname+"?"+admin.Config); err != nil {
log.L.Error("DEFAULTDB数据库启动异常",err)
} else {
DEFAULTDB = db
DEFAULTDB.DB().SetMaxIdleConns(admin.MaxIdleConns)
DEFAULTDB.DB().SetMaxOpenConns(admin.MaxOpenConns)
DEFAULTDB.LogMode(admin.LogMode)
}
return DEFAULTDB
}
@@ -1,26 +0,0 @@
package registTable
import (
"gin-vue-admin/init/initlog"
"gin-vue-admin/model/dbModel"
"gin-vue-admin/model/sysModel"
"github.com/jinzhu/gorm"
)
//注册数据库表专用
func RegistTable(db *gorm.DB) {
db.AutoMigrate(sysModel.SysUser{},
sysModel.SysAuthority{},
sysModel.SysMenu{},
sysModel.SysApi{},
sysModel.SysBaseMenu{},
sysModel.JwtBlacklist{},
sysModel.SysWorkflow{},
sysModel.SysWorkflowStepInfo{},
dbModel.ExaFileUploadAndDownload{},
dbModel.ExaFile{},
dbModel.ExaFileChunk{},
dbModel.ExaCustomer{},
)
log.L.Debug("register table success")
}
-63
View File
@@ -1,63 +0,0 @@
package main
import (
"gin-vue-admin/cmd"
"gin-vue-admin/config"
"gin-vue-admin/init/initRedis"
"gin-vue-admin/init/initRouter"
"gin-vue-admin/init/initlog/qmlog"
"gin-vue-admin/init/qmsql"
"gin-vue-admin/init/registTable"
"os"
//"runtime"
)
// @title Swagger Example API
// @version 0.0.1
// @description This is a sample Server pets
// @securityDefinitions.apikey ApiKeyAuth
// @in header
// @name x-token
// @BasePath /
var (
mysqlHost = os.Getenv("MYSQLHOST")
mysqlPort = os.Getenv("MYSQLPORT")
)
func main() {
if err := qmlog.NewLogger(); err != nil {
panic(err)
}
// 可以通过环境变量来覆盖配置值
// 未设定有效的环境变量时,使用配置值
mysqlConfig := config.GinVueAdminconfig.MysqlAdmin
if mysqlHost != "" && mysqlPort != "" {
mysqlConfig.Path = mysqlHost + ":" + mysqlPort
}
// 链接初始化数据库
db := qmsql.InitMysql(mysqlConfig) // 链接初始化数据库
if config.GinVueAdminconfig.System.UseMultipoint {
// 初始化redis服务
_ = initRedis.InitRedis()
}
// 注册数据库表
registTable.RegistTable(db)
// 程序结束前关闭数据库链接
defer qmsql.DEFAULTDB.Close()
// 注册路由
Router := initRouter.InitRouter()
Router.Static("/form-generator", "./static/form-generator")
//Router.RunTLS(":443","ssl.pem", "ssl.key") // https支持 需要添加中间件
//sysType := runtime.GOOS
//
//if sysType == "linux" {
// // LINUX系统
// // 借助endless开发无感知重启后台 以及前端接口重启后台功能
//}
//if sysType == "windows" {
// WIN系统
cmd.RunWindowsServer(Router)
//}
}
-31
View File
@@ -1,31 +0,0 @@
package middleware
import (
"fmt"
"gin-vue-admin/controller/servers"
"gin-vue-admin/model/sysModel"
"github.com/gin-gonic/gin"
)
//拦截器
func CasbinHandler() gin.HandlerFunc {
return func(c *gin.Context) {
claims, _ := c.Get("claims")
waitUse := claims.(*CustomClaims)
//获取请求的URI
obj := c.Request.URL.RequestURI()
//获取请求方法
act := c.Request.Method
//获取用户的角色
sub := waitUse.AuthorityId
e := sysModel.Casbin()
//判断策略中是否存在
if e.Enforce(sub, obj, act) {
c.Next()
} else {
servers.ReportFormat(c, false, fmt.Sprintf("权限不足"), gin.H{})
c.Abort()
return
}
}
}
-137
View File
@@ -1,137 +0,0 @@
package middleware
import (
"errors"
"gin-vue-admin/config"
"gin-vue-admin/controller/servers"
"gin-vue-admin/model/sysModel"
"github.com/dgrijalva/jwt-go"
"github.com/gin-gonic/gin"
uuid "github.com/satori/go.uuid"
"time"
)
func JWTAuth() gin.HandlerFunc {
return func(c *gin.Context) {
// 我们这里jwt鉴权取头部信息 x-token 登录时回返回token信息 这里前端需要把token存储到cookie或者本地localSstorage中 不过需要跟后端协商过期时间 可以约定刷新令牌或者重新登录
token := c.Request.Header.Get("x-token")
ModelToken := sysModel.JwtBlacklist{
Jwt: token,
}
if token == "" {
servers.ReportFormat(c, false, "未登录或非法访问", gin.H{
"reload": true,
})
c.Abort()
return
}
if ModelToken.IsBlacklist(token) {
servers.ReportFormat(c, false, "您的帐户异地登陆或令牌失效", gin.H{
"reload": true,
})
c.Abort()
return
}
j := NewJWT()
// parseToken 解析token包含的信息
claims, err := j.ParseToken(token)
if err != nil {
if err == TokenExpired {
servers.ReportFormat(c, false, "授权已过期", gin.H{
"reload": true,
})
c.Abort()
return
}
servers.ReportFormat(c, false, err.Error(), gin.H{
"reload": true,
})
c.Abort()
return
}
c.Set("claims", claims)
c.Next()
}
}
type JWT struct {
SigningKey []byte
}
var (
TokenExpired error = errors.New("Token is expired")
TokenNotValidYet error = errors.New("Token not active yet")
TokenMalformed error = errors.New("That's not even a token")
TokenInvalid error = errors.New("Couldn't handle this token:")
)
type CustomClaims struct {
UUID uuid.UUID
ID uint
NickName string
AuthorityId string
jwt.StandardClaims
}
func NewJWT() *JWT {
return &JWT{
[]byte(config.GinVueAdminconfig.JWT.SigningKey),
}
}
//创建一个token
func (j *JWT) CreateToken(claims CustomClaims) (string, error) {
token := jwt.NewWithClaims(jwt.SigningMethodHS256, claims)
return token.SignedString(j.SigningKey)
}
//解析 token
func (j *JWT) ParseToken(tokenString string) (*CustomClaims, error) {
token, err := jwt.ParseWithClaims(tokenString, &CustomClaims{}, func(token *jwt.Token) (i interface{}, e error) {
return j.SigningKey, nil
})
if err != nil {
if ve, ok := err.(*jwt.ValidationError); ok {
if ve.Errors&jwt.ValidationErrorMalformed != 0 {
return nil, TokenMalformed
} else if ve.Errors&jwt.ValidationErrorExpired != 0 {
// Token is expired
return nil, TokenExpired
} else if ve.Errors&jwt.ValidationErrorNotValidYet != 0 {
return nil, TokenNotValidYet
} else {
return nil, TokenInvalid
}
}
}
if token != nil {
if claims, ok := token.Claims.(*CustomClaims); ok && token.Valid {
return claims, nil
}
return nil, TokenInvalid
} else {
return nil, TokenInvalid
}
}
// 更新token
func (j *JWT) RefreshToken(tokenString string) (string, error) {
jwt.TimeFunc = func() time.Time {
return time.Unix(0, 0)
}
token, err := jwt.ParseWithClaims(tokenString, &CustomClaims{}, func(token *jwt.Token) (interface{}, error) {
return j.SigningKey, nil
})
if err != nil {
return "", err
}
if claims, ok := token.Claims.(*CustomClaims); ok && token.Valid {
jwt.TimeFunc = time.Now
claims.StandardClaims.ExpiresAt = time.Now().Add(1 * time.Hour).Unix()
return j.CreateToken(*claims)
}
return "", TokenInvalid
}
-64
View File
@@ -1,64 +0,0 @@
package middleware
import (
"bytes"
"gin-vue-admin/init/initlog"
"net/http/httputil"
"strings"
"time"
"github.com/gin-gonic/gin"
)
func Logger() gin.HandlerFunc {
return func(c *gin.Context) {
// request time
start := time.Now()
// request path
path := c.Request.URL.Path
logFlag := true
if strings.Contains(path, "swagger") {
logFlag = false
}
// request ip
clientIP := c.ClientIP()
// method
method := c.Request.Method
// copy request content
req, _ := httputil.DumpRequest(c.Request, true)
if logFlag {
log.L.Debug(
"Request:", method, clientIP, path, string(req))
}
// replace writer
cusWriter := &responseBodyWriter{
ResponseWriter: c.Writer,
body: bytes.NewBufferString(""),
}
c.Writer = cusWriter
// handle request
c.Next()
// ending time
end := time.Now()
//execute time
latency := end.Sub(start)
statusCode := c.Writer.Status()
if logFlag {
log.L.Debug(
"Response:",
statusCode,
latency,
cusWriter.body.String())
}
}
}
type responseBodyWriter struct {
gin.ResponseWriter
body *bytes.Buffer
}
func (w responseBodyWriter) Write(b []byte) (int, error) {
w.body.Write(b)
return w.ResponseWriter.Write(b)
}
@@ -1,150 +0,0 @@
package autoCodeModel
import (
"gin-vue-admin/tools"
"html/template"
"os"
)
// 初始版本自动化代码工具
type AutoCodeStruct struct {
StructName string `json:"structName"`
PackageName string `json:"packageName"`
Abbreviation string `json:"abbreviation"`
Fields []Field `json:"fields"`
}
type Field struct {
FieldName string `json:"fieldName"`
FieldType string `json:"fieldType"`
FieldJson string `json:"fieldJson"`
ColumnName string `json:"columnName"`
}
func (a *AutoCodeStruct) CreateTemp() (err error) {
basePath := "./tpl"
modelTmpl, err := template.ParseFiles(basePath + "/te/model.go.tpl")
if err != nil {
return err
}
apiTmpl, err := template.ParseFiles(basePath + "/te/api.go.tpl")
if err != nil {
return err
}
routerTmpl, err := template.ParseFiles(basePath + "/te/router.go.tpl")
if err != nil {
return err
}
feapiTmpl, err := template.ParseFiles(basePath + "/fe/api.js.tpl")
if err != nil {
return err
}
readmeTmpl, err := template.ParseFiles(basePath + "/readme.txt.tpl")
if err != nil {
return err
}
//自动化总目录
_autoCode := "./autoCode/"
//自动化后台代码目录
_te := "./autoCode/te/"
_dir := _te + a.PackageName
_modeldir := _te + a.PackageName + "/model"
_apidir := _te + a.PackageName + "/api"
_routerdir := _te + a.PackageName + "/router"
//自动化前台代码目录
_fe := "./autoCode/fe/"
_fe_dir := _fe + a.PackageName
_fe_apidir := _fe + a.PackageName + "/api"
err = createDir(_autoCode, _te, _dir, _modeldir, _apidir, _routerdir, _fe, _fe_dir, _fe_apidir)
if err != nil {
return err
}
model, err := os.OpenFile(_te+a.PackageName+"/model/model.go", os.O_CREATE|os.O_WRONLY, 0755)
if err != nil {
return err
}
api, err := os.OpenFile(_te+a.PackageName+"/api/api.go", os.O_CREATE|os.O_WRONLY, 0755)
if err != nil {
return err
}
router, err := os.OpenFile(_te+a.PackageName+"/router/router.go", os.O_CREATE|os.O_WRONLY, 0755)
if err != nil {
return err
}
feapi, err := os.OpenFile(_fe+a.PackageName+"/api/api.js", os.O_CREATE|os.O_WRONLY, 0755)
if err != nil {
return err
}
readme, err := os.OpenFile(_autoCode+"readme.txt", os.O_CREATE|os.O_WRONLY, 0755)
if err != nil {
return err
}
// 生成代码
{
err = modelTmpl.Execute(model, a)
if err != nil {
return err
}
err = apiTmpl.Execute(api, a)
if err != nil {
return err
}
err = routerTmpl.Execute(router, a)
if err != nil {
return err
}
err = feapiTmpl.Execute(feapi, a)
if err != nil {
return err
}
err = readmeTmpl.Execute(readme, a)
if err != nil {
return err
}
}
_ = model.Close()
_ = api.Close()
_ = router.Close()
_ = feapi.Close()
_ = readme.Close()
fileList := []string{
_te + a.PackageName + "/model/model.go",
_te + a.PackageName + "/api/api.go",
_te + a.PackageName + "/router/router.go",
_fe + a.PackageName + "/api/api.js",
_autoCode + "readme.txt",
}
err = tools.ZipFiles("./ginvueadmin.zip", fileList, ".", ".")
if err != nil {
return err
}
err = os.RemoveAll(_autoCode)
if err != nil {
return err
}
return nil
}
//批量创建文件夹
func createDir(dirs ...string) (err error) {
for _, v := range dirs {
exist, err := tools.PathExists(v)
if err != nil {
//log.L.Info(fmt.Sprintf("get dir error![%v]\n", err))
return err
}
if exist {
//log.L.Info(fmt.Sprintf("has dir![%v]\n"+_dir))
} else {
//log.L.Info(fmt.Sprintf("no dir![%v]\n"+_dir))
// 创建文件夹
err = os.Mkdir(v, os.ModePerm)
if err != nil {
//log.L.Error(fmt.Sprintf("mkdir error![%v]\n",err))
} else {
//log.L.Info("mkdir success!\n")
}
}
}
return err
}
@@ -1,72 +0,0 @@
package dbModel
import (
"gin-vue-admin/init/qmsql"
"github.com/jinzhu/gorm"
)
//文件结构体
type ExaFile struct {
gorm.Model
FileName string
FileMd5 string
FilePath string
ExaFileChunk []ExaFileChunk
ChunkTotal int
IsFinish bool
}
//切片结构体
type ExaFileChunk struct {
gorm.Model
ExaFileId uint
FileChunkNumber int
FileChunkPath string
}
//文件合成完成
func (f *ExaFile) FileCreateComplete(FileMd5 string, FileName string, FilePath string) error {
var file ExaFile
upDateFile := make(map[string]interface{})
upDateFile["FilePath"] = FilePath
upDateFile["IsFinish"] = true
err := qmsql.DEFAULTDB.Where("file_md5 = ? AND file_name = ?", FileMd5, FileName).First(&file).Updates(upDateFile).Error
return err
}
//第一次上传或者断点续传时候检测当前文件属性,没有则创建,有则返回文件的当前切片
func (f *ExaFile) FindOrCreateFile(FileMd5 string, FileName string, ChunkTotal int) (err error, file ExaFile) {
var cfile ExaFile
cfile.FileMd5 = FileMd5
cfile.FileName = FileName
cfile.ChunkTotal = ChunkTotal
notHaveSameMd5Finish := qmsql.DEFAULTDB.Where("file_md5 = ? AND is_finish = ?", FileMd5, true).First(&file).RecordNotFound()
if notHaveSameMd5Finish {
err = qmsql.DEFAULTDB.Where("file_md5 = ? AND file_name = ?", FileMd5, FileName).Preload("ExaFileChunk").FirstOrCreate(&file, cfile).Error
return err, file
} else {
cfile.IsFinish = true
cfile.FilePath = file.FilePath
err = qmsql.DEFAULTDB.Create(&cfile).Error
return err, cfile
}
}
// 创建文件切片记录
func (f *ExaFile) CreateFileChunk(FileChunkPath string, FileChunkNumber int) error {
var chunk ExaFileChunk
chunk.FileChunkPath = FileChunkPath
chunk.ExaFileId = f.ID
chunk.FileChunkNumber = FileChunkNumber
err := qmsql.DEFAULTDB.Create(&chunk).Error
return err
}
// 删除文件切片记录
func (f *ExaFile) DeleteFileChunk(fileMd5 string, fileName string, filePath string) error {
var chunks []ExaFileChunk
var file ExaFile
err := qmsql.DEFAULTDB.Where("file_md5 = ? AND file_name = ?", fileMd5, fileName).First(&file).Update("IsFinish", true).Update("file_path", filePath).Error
err = qmsql.DEFAULTDB.Where("exa_file_id = ?", file.ID).Delete(&chunks).Unscoped().Error
return err
}
@@ -1,68 +0,0 @@
package dbModel
import (
"gin-vue-admin/controller/servers"
"gin-vue-admin/init/qmsql"
"gin-vue-admin/model/modelInterface"
"gin-vue-admin/model/sysModel"
"github.com/jinzhu/gorm"
)
type ExaCustomer struct {
gorm.Model
CustomerName string `json:"customerName"`
CustomerPhoneData string `json:"customerPhoneData"`
SysUserID uint `json:"sysUserId"`
SysUserAuthorityID string `json:"sysUserAuthorityID"`
SysUser sysModel.SysUser `json:"sysUser"`
}
//创建用户
func (e *ExaCustomer)CreateExaCustomer()(err error){
err = qmsql.DEFAULTDB.Create(e).Error
return err
}
//删除用户
func (e *ExaCustomer)DeleteExaCustomer()(err error){
err = qmsql.DEFAULTDB.Delete(e).Error
return err
}
//更新用户
func (e *ExaCustomer)UpdataExaCustomer()(err error){
err = qmsql.DEFAULTDB.Save(e).Error
return err
}
//获取用户信息
func (e *ExaCustomer)GetExaCustomer()(err error,customer ExaCustomer){
err= qmsql.DEFAULTDB.Where("id = ?",e.ID).First(&customer).Error
return
}
//获取用户列表
// 分页获取数据 需要分页实现这个接口即可
func (e *ExaCustomer) GetInfoList(info modelInterface.PageInfo) (err error, list interface{}, total int) {
// 封装分页方法 调用即可 传入 当前的结构体和分页信息
err, db, total := servers.PagingServer(e, info)
if err != nil {
return
} else {
var a sysModel.SysAuthority
a.AuthorityId = e.SysUserAuthorityID
err,auth := a.GetAuthorityInfo()
var dataId []string
for _,v := range auth.DataAuthorityId{
dataId = append(dataId, v.AuthorityId)
}
var CustomerList []ExaCustomer
err = db.Where("sys_user_authority_id in (?)",dataId).Find(&CustomerList).Count(&total).Error
if err!=nil{
return err, CustomerList, total
}else{
err = db.Preload("SysUser").Where("sys_user_authority_id in (?)",dataId).Find(&CustomerList).Error
}
return err, CustomerList, total
}
}
@@ -1,45 +0,0 @@
package dbModel
import (
"gin-vue-admin/controller/servers"
"gin-vue-admin/init/qmsql"
"gin-vue-admin/model/modelInterface"
"github.com/jinzhu/gorm"
)
type ExaFileUploadAndDownload struct {
gorm.Model
Name string `json:"name"`
Url string `json:"url"`
Tag string `json:"tag"`
Key string `json:"key"`
}
func (f *ExaFileUploadAndDownload) Upload() error {
err := qmsql.DEFAULTDB.Create(f).Error
return err
}
func (f *ExaFileUploadAndDownload) DeleteFile() error {
err := qmsql.DEFAULTDB.Where("id = ?", f.ID).Unscoped().Delete(f).Error
return err
}
func (f *ExaFileUploadAndDownload) FindFile() (error, ExaFileUploadAndDownload) {
var file ExaFileUploadAndDownload
err := qmsql.DEFAULTDB.Where("id = ?", f.ID).First(&file).Error
return err, file
}
// 分页获取数据 需要分页实现这个接口即可
func (f *ExaFileUploadAndDownload) GetInfoList(info modelInterface.PageInfo) (err error, list interface{}, total int) {
// 封装分页方法 调用即可 传入 当前的结构体和分页信息
err, db, total := servers.PagingServer(f, info)
if err != nil {
return
} else {
var fileLists []ExaFileUploadAndDownload
err = db.Order("updated_at desc").Find(&fileLists).Error
return err, fileLists, total
}
}
@@ -1,14 +0,0 @@
package modelInterface
// 因为我也不确定项目要不要多人维护 所以定义了CURD接口 作为接口参考
// 由于很多接口使用Restful模式 暂时不用泛型 有需要可以iss提供示例
type PageInfo struct {
Page int
PageSize int
}
//分页接口
type Paging interface {
GetInfoList(PageInfo) (err error, list interface{}, total int)
}
-82
View File
@@ -1,82 +0,0 @@
package sysModel
import (
"gin-vue-admin/controller/servers"
"gin-vue-admin/init/qmsql"
"gin-vue-admin/model/modelInterface"
"github.com/jinzhu/gorm"
"github.com/pkg/errors"
)
type SysApi struct {
gorm.Model
Path string `json:"path"`
Description string `json:"description"`
Group string `json:"group"`
Method string `json:"method" gorm:"default:'POST'"`
}
//新增基础api
func (a *SysApi) CreateApi() (err error) {
findOne := qmsql.DEFAULTDB.Where("path = ?", a.Path).Find(&SysMenu{}).Error
if findOne == nil {
return errors.New("存在相同api")
} else {
err = qmsql.DEFAULTDB.Create(a).Error
}
return err
}
//删除基础api
func (a *SysApi) DeleteApi() (err error) {
err = qmsql.DEFAULTDB.Delete(a).Error
new(CasbinModel).clearCasbin(1, a.Path)
return err
}
//更新api
func (a *SysApi) UpdataApi() (err error) {
var oldA SysApi
err = qmsql.DEFAULTDB.Where("id = ?", a.ID).First(&oldA).Error
if err != nil {
return err
} else {
err = new(CasbinModel).CasbinApiUpdata(oldA.Path, a.Path)
if err != nil {
return err
} else {
err = qmsql.DEFAULTDB.Save(a).Error
}
}
return err
}
//获取选中角色所拥有的api
func (a *SysApi) GetApiById(id float64) (err error, api SysApi) {
err = qmsql.DEFAULTDB.Where("id = ?", id).First(&api).Error
return
}
// 获取所有api信息
func (a *SysApi) GetAllApis() (err error, apis []SysApi) {
err = qmsql.DEFAULTDB.Find(&apis).Error
return
}
// 分页获取数据 需要分页实现这个接口即可
func (a *SysApi) GetInfoList(info modelInterface.PageInfo) (err error, list interface{}, total int) {
// 封装分页方法 调用即可 传入 当前的结构体和分页信息
err, db, total := servers.PagingServer(a, info)
if err != nil {
return
} else {
var apiList []SysApi
err = qmsql.DEFAULTDB.Where("path LIKE ?", "%"+a.Path+"%").Find(&apiList).Count(&total).Error
if err!=nil{
return err, apiList, total
}else{
err = db.Order("group", true).Where("path LIKE ?", "%"+a.Path+"%").Find(&apiList).Error
}
return err, apiList, total
}
}
@@ -1,81 +0,0 @@
package sysModel
import (
"gin-vue-admin/controller/servers"
"gin-vue-admin/init/qmsql"
"gin-vue-admin/model/modelInterface"
"github.com/jinzhu/gorm"
"github.com/pkg/errors"
)
type SysAuthority struct {
gorm.Model
AuthorityId string `json:"authorityId" gorm:"not null;unique"`
AuthorityName string `json:"authorityName"`
ParentId string `json:"parentId"`
DataAuthorityId []SysAuthority `json:"dataAuthorityId" gorm:"many2many:sys_data_authority_id;association_jointable_foreignkey:data_id"`
Children []SysAuthority `json:"children"`
}
// 创建角色
func (a *SysAuthority) CreateAuthority() (err error, authority *SysAuthority) {
err = qmsql.DEFAULTDB.Create(a).Error
return err, a
}
// 删除角色
func (a *SysAuthority) DeleteAuthority() (err error) {
err = qmsql.DEFAULTDB.Where("authority_id = ?", a.AuthorityId).Find(&SysUser{}).Error
if err != nil {
err = qmsql.DEFAULTDB.Where("parent_id = ?", a.AuthorityId).Find(&SysAuthority{}).Error
if err != nil {
err = qmsql.DEFAULTDB.Where("authority_id = ?", a.AuthorityId).First(a).Unscoped().Delete(a).Error
new(CasbinModel).clearCasbin(0, a.AuthorityId)
} else {
err = errors.New("此角色存在子角色不允许删除")
}
} else {
err = errors.New("此角色有用户正在使用禁止删除")
}
return err
}
// 分页获取数据 需要分页实现这个接口即可
func (a *SysAuthority) GetInfoList(info modelInterface.PageInfo) (err error, list interface{}, total int) {
// 封装分页方法 调用即可 传入 当前的结构体和分页信息
err, db, total := servers.PagingServer(a, info)
if err != nil {
return
} else {
var authority []SysAuthority
err = db.Preload("DataAuthorityId").Where("parent_id = 0").Find(&authority).Error
if len(authority) > 0 {
for k, _ := range authority {
err = findChildrenAuthority(&authority[k])
}
}
return err, authority, total
}
}
func findChildrenAuthority(authority *SysAuthority) (err error) {
err = qmsql.DEFAULTDB.Preload("DataAuthorityId").Where("parent_id = ?", authority.AuthorityId).Find(&authority.Children).Error
if len(authority.Children) > 0 {
for k, _ := range authority.Children {
err = findChildrenAuthority(&authority.Children[k])
}
}
return err
}
func (a *SysAuthority) SetDataAuthority() error {
var s SysAuthority
qmsql.DEFAULTDB.Preload("DataAuthorityId").First(&s, "id = ?", a.ID)
err := qmsql.DEFAULTDB.Model(&s).Association("DataAuthorityId").Replace(&a.DataAuthorityId).Error
return err
}
func (a *SysAuthority) GetAuthorityInfo() (err error, sa SysAuthority) {
err = qmsql.DEFAULTDB.Preload("DataAuthorityId").Where("authority_id = ?", a.AuthorityId).First(&sa).Error
return err, sa
}
@@ -1,105 +0,0 @@
package sysModel
import (
"fmt"
"gin-vue-admin/controller/servers"
"gin-vue-admin/init/qmsql"
"gin-vue-admin/model/modelInterface"
"github.com/jinzhu/gorm"
"github.com/pkg/errors"
)
type SysBaseMenu struct {
gorm.Model
MenuLevel uint `json:"-"`
ParentId string `json:"parentId"`
Path string `json:"path"`
Name string `json:"name"`
Hidden bool `json:"hidden"`
Component string `json:"component"`
Sort string `json:"sort"`
Meta `json:"meta"`
NickName string `json:"nickName"`
Children []SysBaseMenu `json:"children"`
}
//增加基础路由
func (b *SysBaseMenu) AddBaseMenu() (err error) {
findOne := qmsql.DEFAULTDB.Where("name = ?", b.Name).Find(&SysBaseMenu{}).Error
if findOne != nil {
b.NickName = b.Title
err = qmsql.DEFAULTDB.Create(b).Error
} else {
err = errors.New("存在重复name,请修改name")
}
return err
}
//删除基础路由
func (b *SysBaseMenu) DeleteBaseMenu(id float64) (err error) {
err = qmsql.DEFAULTDB.Where("parent_id = ?", id).First(&SysBaseMenu{}).Error
if err != nil {
err = qmsql.DEFAULTDB.Where("id = ?", id).Delete(&b).Error
err = qmsql.DEFAULTDB.Where("menu_id = ?", id).Unscoped().Delete(&SysMenu{}).Error
} else {
return errors.New("此菜单存在子菜单不可删除")
}
return err
}
//更新路由
func (b *SysBaseMenu) UpdataBaseMenu() (err error) {
upDataMap := make(map[string]interface{})
upDataMap["parent_id"] = b.ParentId
upDataMap["path"] = b.Path
upDataMap["name"] = b.Name
upDataMap["hidden"] = b.Hidden
upDataMap["component"] = b.Component
upDataMap["title"] = b.Title
upDataMap["icon"] = b.Icon
upDataMap["sort"] = b.Sort
upDataMap["nick_name"] = b.Title
err = qmsql.DEFAULTDB.Where("id = ?", b.ID).Find(&SysBaseMenu{}).Updates(upDataMap).Error
err1 := qmsql.DEFAULTDB.Where("menu_id = ?", b.ID).Find(&[]SysMenu{}).Updates(upDataMap).Error
fmt.Printf("菜单修改时候,关联菜单err1:%v,err:%v", err1, err)
return err
}
//当前选中角色所拥有的路由
func (b *SysBaseMenu) GetBaseMenuById(id float64) (err error, menu SysBaseMenu) {
err = qmsql.DEFAULTDB.Where("id = ?", id).First(&menu).Error
return
}
//获取路由分页
func (b *SysBaseMenu) GetInfoList(info modelInterface.PageInfo) (err error, list interface{}, total int) {
// 封装分页方法 调用即可 传入 当前的结构体和分页信息
err, db, total := servers.PagingServer(b, info)
if err != nil {
return
} else {
var menuList []SysBaseMenu
err = db.Where("parent_id = 0").Order("sort", true).Find(&menuList).Error
for i := 0; i < len(menuList); i++ {
err = getBaseChildrenList(&menuList[i])
}
return err, menuList, total
}
}
//获取基础路由树
func (m *SysBaseMenu) GetBaseMenuTree() (err error, menus []SysBaseMenu) {
err = qmsql.DEFAULTDB.Where(" parent_id = ?", 0).Order("sort", true).Find(&menus).Error
for i := 0; i < len(menus); i++ {
err = getBaseChildrenList(&menus[i])
}
return err, menus
}
func getBaseChildrenList(menu *SysBaseMenu) (err error) {
err = qmsql.DEFAULTDB.Where("parent_id = ?", menu.ID).Order("sort", true).Find(&menu.Children).Error
for i := 0; i < len(menu.Children); i++ {
err = getBaseChildrenList(&menu.Children[i])
}
return err
}
-105
View File
@@ -1,105 +0,0 @@
package sysModel
import (
"errors"
"gin-vue-admin/config"
"gin-vue-admin/init/qmsql"
"github.com/casbin/casbin"
"github.com/casbin/casbin/util"
gormadapter "github.com/casbin/gorm-adapter"
"strings"
)
type CasbinModel struct {
ID uint `json:"id" gorm:"column:_id"`
Ptype string `json:"ptype" gorm:"column:ptype"`
AuthorityId string `json:"rolename" gorm:"column:v0"`
Path string `json:"path" gorm:"column:v1"`
Method string `json:"method" gorm:"column:v2"`
}
// 供入参使用
type CasbinInfo struct {
Path string `json:"path"`
Method string `json:"method"`
}
// 供入参使用
type CasbinInReceive struct {
AuthorityId string `json:"authorityId"`
CasbinInfos []CasbinInfo `json:"casbinInfos"`
}
// 更新权限
func (c *CasbinModel) CasbinPUpdata(AuthorityId string, casbinInfos []CasbinInfo) error {
c.clearCasbin(0, AuthorityId)
for _, v := range casbinInfos {
cm := CasbinModel{
ID: 0,
Ptype: "p",
AuthorityId: AuthorityId,
Path: v.Path,
Method: v.Method,
}
addflag := c.AddCasbin(cm)
if addflag == false {
return errors.New("存在相同api,添加失败,请联系管理员")
}
}
return nil
}
// API更新随动
func (c *CasbinModel) CasbinApiUpdata(oldPath string, newPath string) error {
var cs []CasbinModel
err := qmsql.DEFAULTDB.Table("casbin_rule").Where("v1 = ?", oldPath).Find(&cs).Update("v1", newPath).Error
return err
}
//添加权限
func (c *CasbinModel) AddCasbin(cm CasbinModel) bool {
e := Casbin()
return e.AddPolicy(cm.AuthorityId, cm.Path, cm.Method)
}
//获取权限列表
func (c *CasbinModel) GetPolicyPathByAuthorityId(AuthorityId string) []string {
e := Casbin()
var pathList []string
list := e.GetFilteredPolicy(0, AuthorityId)
for _, v := range list {
pathList = append(pathList, v[1])
}
return pathList
}
//清除匹配的权限
func (c *CasbinModel) clearCasbin(v int, p string) bool {
e := Casbin()
return e.RemoveFilteredPolicy(v, p)
}
// 自定义规则函数
func ParamsMatch(fullNameKey1 string, key2 string) bool {
key1 := strings.Split(fullNameKey1, "?")[0]
//剥离路径后再使用casbin的keyMatch2
return util.KeyMatch2(key1, key2)
}
// 自定义规则函数
func ParamsMatchFunc(args ...interface{}) (interface{}, error) {
name1 := args[0].(string)
name2 := args[1].(string)
return (bool)(ParamsMatch(name1, name2)), nil
}
//持久化到数据库 引入自定义规则
func Casbin() *casbin.Enforcer {
a := gormadapter.NewAdapterByDB(qmsql.DEFAULTDB)
e := casbin.NewEnforcer(config.GinVueAdminconfig.CasbinConfig.ModelPath, a)
e.AddFunction("ParamsMatch", ParamsMatchFunc)
e.LoadPolicy()
return e
}
@@ -1,35 +0,0 @@
package sysModel
import (
"gin-vue-admin/init/initRedis"
"gin-vue-admin/init/qmsql"
"github.com/jinzhu/gorm"
)
type JwtBlacklist struct {
gorm.Model
Jwt string `gorm:"type:text"`
}
func (j *JwtBlacklist) JsonInBlacklist() (err error) {
err = qmsql.DEFAULTDB.Create(j).Error
return
}
//判断JWT是否在黑名单内部
func (j *JwtBlacklist) IsBlacklist(Jwt string) bool {
isNotFound := qmsql.DEFAULTDB.Where("jwt = ?", Jwt).First(j).RecordNotFound()
return !isNotFound
}
//判断当前用户是否在线
func (j *JwtBlacklist) GetRedisJWT(userName string) (err error, RedisJWT string) {
RedisJWT, err = initRedis.DEFAULTREDIS.Get(userName).Result()
return err, RedisJWT
}
//设置当前用户在线
func (j *JwtBlacklist) SetRedisJWT(userName string) (err error) {
err = initRedis.DEFAULTREDIS.Set(userName, j.Jwt, 1000*1000*1000*60*60*24*7).Err()
return err
}
@@ -1,59 +0,0 @@
package sysModel
import (
"fmt"
"gin-vue-admin/init/qmsql"
)
// menu需要构建的点有点多 这里关联关系表直接把所有数据拿过来 用代码实现关联 后期实现主外键模式
type SysMenu struct {
SysBaseMenu
MenuId string `json:"menuId"`
AuthorityId string `json:"-"`
Children []SysMenu `json:"children"`
}
type Meta struct {
Title string `json:"title"`
Icon string `json:"icon"`
}
// 为角色增加menu树
func (m *SysMenu) AddMenuAuthority(menus []SysBaseMenu, authorityId string) (err error) {
var menu SysMenu
qmsql.DEFAULTDB.Where("authority_id = ? ", authorityId).Unscoped().Delete(&SysMenu{})
for _, v := range menus {
menu.SysBaseMenu = v
menu.AuthorityId = authorityId
menu.MenuId = fmt.Sprintf("%v", v.ID)
menu.ID = 0
err = qmsql.DEFAULTDB.Create(&menu).Error
if err != nil {
return err
}
}
return nil
}
// 查看当前角色树
func (m *SysMenu) GetMenuAuthority(authorityId string) (err error, menus []SysMenu) {
err = qmsql.DEFAULTDB.Where("authority_id = ?", authorityId).Find(&menus).Error
return err, menus
}
//获取动态路由树
func (m *SysMenu) GetMenuTree(authorityId string) (err error, menus []SysMenu) {
err = qmsql.DEFAULTDB.Where("authority_id = ? AND parent_id = ?", authorityId, 0).Order("sort", true).Find(&menus).Error
for i := 0; i < len(menus); i++ {
err = getChildrenList(&menus[i])
}
return err, menus
}
func getChildrenList(menu *SysMenu) (err error) {
err = qmsql.DEFAULTDB.Where("authority_id = ? AND parent_id = ?", menu.AuthorityId, menu.MenuId).Order("sort", true).Find(&menu.Children).Error
for i := 0; i < len(menu.Children); i++ {
err = getChildrenList(&menu.Children[i])
}
return err
}
-26
View File
@@ -1,26 +0,0 @@
package sysModel
import (
"gin-vue-admin/config"
"gin-vue-admin/tools"
)
//配置文件结构体
type System struct {
Config config.Config
}
//读取配置文件
func (s *System) GetSystemConfig() (err error, conf config.Config) {
return nil, config.GinVueAdminconfig
}
//设置配置文件
func (s *System) SetSystemConfig() (err error) {
confs := tools.StructToMap(s.Config)
for k, v := range confs {
config.VTool.Set(k, v)
}
err = config.VTool.WriteConfig()
return err
}
-90
View File
@@ -1,90 +0,0 @@
package sysModel
import (
"gin-vue-admin/controller/servers"
"gin-vue-admin/init/qmsql"
"gin-vue-admin/model/modelInterface"
"gin-vue-admin/tools"
"github.com/jinzhu/gorm"
"github.com/pkg/errors"
uuid "github.com/satori/go.uuid"
)
type SysUser struct {
gorm.Model
UUID uuid.UUID `json:"uuid"`
Username string `json:"userName"`
Password string `json:"-"`
NickName string `json:"nickName" gorm:"default:'QMPlusUser'"`
HeaderImg string `json:"headerImg" gorm:"default:'http://www.henrongyi.top/avatar/lufu.jpg'"`
Authority SysAuthority `json:"authority" gorm:"ForeignKey:AuthorityId;AssociationForeignKey:AuthorityId"`
AuthorityId string `json:"authorityId" gorm:"default:888"`
}
//type Propertie struct {
// gorm.Model
//}
//注册接口model方法
func (u *SysUser) Regist() (err error, userInter *SysUser) {
var user SysUser
//判断用户名是否注册
notResigt := qmsql.DEFAULTDB.Where("username = ?", u.Username).First(&user).RecordNotFound()
//notResigt为false表明读取到了 不能注册
if !notResigt {
return errors.New("用户名已注册"), nil
} else {
// 否则 附加uuid 密码md5简单加密 注册
u.Password = tools.MD5V([]byte(u.Password))
u.UUID = uuid.NewV4()
err = qmsql.DEFAULTDB.Create(u).Error
}
return err, u
}
//修改用户密码
func (u *SysUser) ChangePassword(newPassword string) (err error, userInter *SysUser) {
var user SysUser
//后期修改jwt+password模式
u.Password = tools.MD5V([]byte(u.Password))
err = qmsql.DEFAULTDB.Where("username = ? AND password = ?", u.Username, u.Password).First(&user).Update("password", tools.MD5V([]byte(newPassword))).Error
return err, u
}
//用户更新接口
func (u *SysUser) SetUserAuthority(uuid uuid.UUID, AuthorityId string) (err error) {
err = qmsql.DEFAULTDB.Where("uuid = ?", uuid).First(&SysUser{}).Update("authority_id", AuthorityId).Error
return err
}
//用户登录
func (u *SysUser) Login() (err error, userInter *SysUser) {
var user SysUser
u.Password = tools.MD5V([]byte(u.Password))
err = qmsql.DEFAULTDB.Where("username = ? AND password = ?", u.Username, u.Password).First(&user).Error
if err != nil {
return err, &user
}
err = qmsql.DEFAULTDB.Where("authority_id = ?", user.AuthorityId).First(&user.Authority).Error
return err, &user
}
// 用户头像上传更新地址
func (u *SysUser) UploadHeaderImg(uuid uuid.UUID, filePath string) (err error, userInter *SysUser) {
var user SysUser
err = qmsql.DEFAULTDB.Where("uuid = ?", uuid).First(&user).Update("header_img", filePath).First(&user).Error
return err, &user
}
// 分页获取数据 需要分页实现这个接口即可
func (u *SysUser) GetInfoList(info modelInterface.PageInfo) (err error, list interface{}, total int) {
// 封装分页方法 调用即可 传入 当前的结构体和分页信息
err, db, total := servers.PagingServer(u, info)
if err != nil {
return
} else {
var userList []SysUser
err = db.Preload("Authority").Find(&userList).Error
return err, userList, total
}
}
@@ -1,32 +0,0 @@
package sysModel
import (
"gin-vue-admin/init/qmsql"
"github.com/jinzhu/gorm"
)
//工作流属性表
type SysWorkflow struct {
gorm.Model
WorkflowNickName string `json:"workflowNickName"` // 工作流名称
WorkflowName string `json:"workflowName"` // 工作流英文id
WorkflowDescription string `json:"workflowDescription"` // 工作流描述
WorkflowStepInfo []SysWorkflowStepInfo `json:"workflowStep"` // 工作流步骤
}
// 工作流状态表
type SysWorkflowStepInfo struct {
gorm.Model
SysWorkflowID uint `json:"workflowID"` // 所属工作流ID
IsStrat bool `json:"isStrat"` // 是否是开始流节点
StepName string `json:"stepName"` // 工作流名称
StepNo float64 `json:"stepNo"` // 步骤id (第几步)
StepAuthorityID string `json:"stepAuthorityID"` // 操作者级别id
IsEnd bool `json:"isEnd"` // 是否是完结流节点
}
//创建工作流
func (wk *SysWorkflow) Create() error {
err := qmsql.DEFAULTDB.Create(&wk).Error
return err
}
@@ -1,14 +0,0 @@
package sysModel
import "github.com/jinzhu/gorm"
// 工作流流转表
type SysWorkFlowProcess struct {
gorm.Model
ApplicationID uint // 当前工作流所属申请的ID
CurrentNode string // 当前进度节点
HistoricalNode string //上一个进度节点
CurrentUser string // 当前进度操作人
HistoricalUser string // 上一个进度的操作人
State bool // 状态 是否是正在进行的状态
}
-18
View File
@@ -1,18 +0,0 @@
package router
import (
"gin-vue-admin/controller/api"
"gin-vue-admin/middleware"
"github.com/gin-gonic/gin"
)
func InitCustomerRouter(Router *gin.RouterGroup) {
ApiRouter := Router.Group("customer").Use(middleware.JWTAuth()).Use(middleware.CasbinHandler())
{
ApiRouter.POST("createExaCustomer", api.CreateExaCustomer) // 创建客户
ApiRouter.POST("updataExaCustomer", api.UpdataExaCustomer) // 更新客户
ApiRouter.POST("deleteExaCustomer", api.DeleteExaCustomer) // 删除客户
ApiRouter.POST("getExaCustomer", api.GetExaCustomer) // 获取单一客户信息
ApiRouter.POST("getExaCustomerList", api.GetExaCustomerList) // 获取客户列表
}
}
@@ -1,20 +0,0 @@
package router
import (
"gin-vue-admin/controller/api"
"github.com/gin-gonic/gin"
)
func InitFileUploadAndDownloadRouter(Router *gin.RouterGroup) {
FileUploadAndDownloadGroup := Router.Group("fileUploadAndDownload")
//.Use(middleware.JWTAuth()).Use(middleware.CasbinHandler())
{
FileUploadAndDownloadGroup.POST("/upload", api.UploadFile) // 上传文件
FileUploadAndDownloadGroup.POST("/getFileList", api.GetFileList) // 获取上传文件列表
FileUploadAndDownloadGroup.POST("/deleteFile", api.DeleteFile) // 删除指定文件
FileUploadAndDownloadGroup.POST("/breakpointContinue", api.BreakpointContinue) // 断点续传
FileUploadAndDownloadGroup.GET("/findFile", api.FindFile) // 查询当前文件成功的切片
FileUploadAndDownloadGroup.POST("/breakpointContinueFinish", api.BreakpointContinueFinish) // 查询当前文件成功的切片
FileUploadAndDownloadGroup.POST("/removeChunk", api.RemoveChunk) // 查询当前文件成功的切片
}
}
-19
View File
@@ -1,19 +0,0 @@
package router
import (
"gin-vue-admin/controller/api"
"gin-vue-admin/middleware"
"github.com/gin-gonic/gin"
)
func InitApiRouter(Router *gin.RouterGroup) {
ApiRouter := Router.Group("api").Use(middleware.JWTAuth()).Use(middleware.CasbinHandler())
{
ApiRouter.POST("createApi", api.CreateApi) //创建Api
ApiRouter.POST("deleteApi", api.DeleteApi) //删除Api
ApiRouter.POST("getApiList", api.GetApiList) //获取Api列表
ApiRouter.POST("getApiById", api.GetApiById) //获取单条Api消息
ApiRouter.POST("updataApi", api.UpdataApi) //更新api
ApiRouter.POST("getAllApis", api.GetAllApis) // 获取所有api
}
}
-17
View File
@@ -1,17 +0,0 @@
package router
import (
"gin-vue-admin/controller/api"
"gin-vue-admin/middleware"
"github.com/gin-gonic/gin"
)
func InitAuthorityRouter(Router *gin.RouterGroup) {
AuthorityRouter := Router.Group("authority").Use(middleware.JWTAuth()).Use(middleware.CasbinHandler())
{
AuthorityRouter.POST("createAuthority", api.CreateAuthority) //创建角色
AuthorityRouter.POST("deleteAuthority", api.DeleteAuthority) //删除角色
AuthorityRouter.POST("getAuthorityList", api.GetAuthorityList) //获取角色列表
AuthorityRouter.POST("setDataAuthority", api.SetDataAuthority) //设置角色资源权限
}
}
-14
View File
@@ -1,14 +0,0 @@
package router
import (
"gin-vue-admin/controller/api"
"gin-vue-admin/middleware"
"github.com/gin-gonic/gin"
)
func InitAutoCodeRouter(Router *gin.RouterGroup) {
AutoCodeRouter := Router.Group("autoCode").Use(middleware.JWTAuth()).Use(middleware.CasbinHandler())
{
AutoCodeRouter.POST("createTemp", api.CreateTemp) //创建自动化代码
}
}
-17
View File
@@ -1,17 +0,0 @@
package router
import (
"gin-vue-admin/controller/api"
"github.com/gin-gonic/gin"
)
func InitBaseRouter(Router *gin.RouterGroup) (R gin.IRoutes) {
BaseRouter := Router.Group("base")
{
BaseRouter.POST("regist", api.Regist)
BaseRouter.POST("login", api.Login)
BaseRouter.POST("captcha",api.Captcha)
BaseRouter.GET("captcha/:captchaId",api.CaptchaImg)
}
return BaseRouter
}
-16
View File
@@ -1,16 +0,0 @@
package router
import (
"gin-vue-admin/controller/api"
"gin-vue-admin/middleware"
"github.com/gin-gonic/gin"
)
func InitCasbinRouter(Router *gin.RouterGroup) {
CasbinRouter := Router.Group("casbin").Use(middleware.JWTAuth()).Use(middleware.CasbinHandler())
{
CasbinRouter.POST("casbinPUpdata", api.CasbinPUpdata)
CasbinRouter.POST("getPolicyPathByAuthorityId", api.GetPolicyPathByAuthorityId)
CasbinRouter.GET("casbinTest/:pathParam", api.CasbinTest)
}
}
-14
View File
@@ -1,14 +0,0 @@
package router
import (
"gin-vue-admin/controller/api"
"gin-vue-admin/middleware"
"github.com/gin-gonic/gin"
)
func InitJwtRouter(Router *gin.RouterGroup) {
ApiRouter := Router.Group("jwt").Use(middleware.JWTAuth()).Use(middleware.CasbinHandler())
{
ApiRouter.POST("jsonInBlacklist", api.JsonInBlacklist) //jwt加入黑名单
}
}
-23
View File
@@ -1,23 +0,0 @@
package router
import (
"gin-vue-admin/controller/api"
"gin-vue-admin/middleware"
"github.com/gin-gonic/gin"
)
func InitMenuRouter(Router *gin.RouterGroup) (R gin.IRoutes) {
MenuRouter := Router.Group("menu").Use(middleware.JWTAuth()).Use(middleware.CasbinHandler())
{
MenuRouter.POST("getMenu", api.GetMenu) //获取菜单树
MenuRouter.POST("getMenuList", api.GetMenuList) // 分页获取基础menu列表
MenuRouter.POST("addBaseMenu", api.AddBaseMenu) // 新增菜单
MenuRouter.POST("getBaseMenuTree", api.GetBaseMenuTree) // 获取用户动态路由
MenuRouter.POST("addMenuAuthority", api.AddMenuAuthority) // 增加menu和角色关联关系
MenuRouter.POST("getMenuAuthority", api.GetMenuAuthority) // 获取指定角色menu
MenuRouter.POST("deleteBaseMenu", api.DeleteBaseMenu) // 删除菜单
MenuRouter.POST("updataBaseMenu", api.UpdataBaseMenu) // 更新菜单
MenuRouter.POST("getBaseMenuById", api.GetBaseMenuById) //根据id获取菜单
}
return MenuRouter
}
-15
View File
@@ -1,15 +0,0 @@
package router
import (
"gin-vue-admin/controller/api"
"gin-vue-admin/middleware"
"github.com/gin-gonic/gin"
)
func InitSystemRouter(Router *gin.RouterGroup) {
UserRouter := Router.Group("system").Use(middleware.JWTAuth()).Use(middleware.CasbinHandler())
{
UserRouter.POST("getSystemConfig", api.GetSystemConfig) // 获取配置文件内容
UserRouter.POST("setSystemConfig", api.SetSystemConfig) // 设置配置文件内容
}
}
-17
View File
@@ -1,17 +0,0 @@
package router
import (
"gin-vue-admin/controller/api"
"gin-vue-admin/middleware"
"github.com/gin-gonic/gin"
)
func InitUserRouter(Router *gin.RouterGroup) {
UserRouter := Router.Group("user").Use(middleware.JWTAuth()).Use(middleware.CasbinHandler())
{
UserRouter.POST("changePassword", api.ChangePassword) // 修改密码
UserRouter.POST("uploadHeaderImg", api.UploadHeaderImg) //上传头像
UserRouter.POST("getUserList", api.GetUserList) // 分页获取用户列表
UserRouter.POST("setUserAuthority", api.SetUserAuthority) //设置用户权限
}
}
-14
View File
@@ -1,14 +0,0 @@
package router
import (
"gin-vue-admin/controller/api"
"gin-vue-admin/middleware"
"github.com/gin-gonic/gin"
)
func InitWorkflowRouter(Router *gin.RouterGroup) {
WorkflowRouter := Router.Group("workflow").Use(middleware.JWTAuth()).Use(middleware.CasbinHandler())
{
WorkflowRouter.POST("createWorkFlow", api.CreateWorkFlow) // 创建工作流
}
}
-43
View File
@@ -1,43 +0,0 @@
{
"casbinconfig": {
"modelPath": "./static/rbacmodel/rbac_model.conf"
},
"jwt": {
"signingKey": "qmPlus"
},
"mysqladmin": {
"username": "root",
"password": "Aa@6447985",
"path": "127.0.0.1:3306",
"dbname": "qmPlus",
"config": "charset=utf8\u0026parseTime=True\u0026loc=Local",
"maxIdleConns": 10,
"maxOpenConns": 100,
"logMode": true
},
"qiniu": {
"accessKey": "25j8dYBZ2wuiy0yhwShytjZDTX662b8xiFguwxzZ",
"secretKey": "pgdbqEsf7ooZh7W3xokP833h3dZ_VecFXPDeG5JY"
},
"redisadmin": {
"addr": "127.0.0.1:6379",
"password": "",
"db": 0
},
"system": {
"useMultipoint": false,
"env": "develop",
"addr": 8888
},
"captcha": {
"keyLong": 6,
"imgWidth": 120,
"imgHeight": 40
},
"log": {
"prefix": "[GIN-VUE-ADMIN]",
"logFile": false,
"stdout": ["DEBUG"],
"file": ["WARNING"]
}
}
File diff suppressed because one or more lines are too long
Binary file not shown.

Before

Width:  |  Height:  |  Size: 8.4 KiB

File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
-10
View File
@@ -1,10 +0,0 @@
package tools
import (
"fmt"
"strings"
)
func ArrayToString(array []interface{}) string {
return strings.Replace(strings.Trim(fmt.Sprint(array), "[]"), " ", ",", -1)
}
-41
View File
@@ -1,41 +0,0 @@
package tools
import (
"bytes"
"crypto/cipher"
"crypto/des"
)
func padding(src []byte, blocksize int) []byte {
n := len(src)
padnum := blocksize - n%blocksize
pad := bytes.Repeat([]byte{byte(padnum)}, padnum)
dst := append(src, pad...)
return dst
}
func unpadding(src []byte) []byte {
n := len(src)
unpadnum := int(src[n-1])
dst := src[:n-unpadnum]
return dst
}
func EncryptDES(src []byte) []byte {
key := []byte("qimiao66")
block, _ := des.NewCipher(key)
src = padding(src, block.BlockSize())
blockmode := cipher.NewCBCEncrypter(block, key)
blockmode.CryptBlocks(src, src)
return src
}
func DecryptDES(src []byte) []byte {
key := []byte("qimiao66")
block, _ := des.NewCipher(key)
blockmode := cipher.NewCBCDecrypter(block, key)
blockmode.CryptBlocks(src, src)
src = unpadding(src)
return src
}
-14
View File
@@ -1,14 +0,0 @@
package tools
import "os"
func PathExists(path string) (bool, error) {
_, err := os.Stat(path)
if err == nil {
return true, nil
}
if os.IsNotExist(err) {
return false, nil
}
return false, err
}
-38
View File
@@ -1,38 +0,0 @@
// 空值校验工具 仅用于检验空字符串 其余类型请勿使用
package tools
import (
"errors"
"fmt"
"reflect"
)
func HasGap(input interface{}) error {
getType := reflect.TypeOf(input)
getValue := reflect.ValueOf(input)
// 获取方法字段
for i := 0; i < getType.NumField(); i++ {
field := getType.Field(i)
value := getValue.Field(i).Interface()
switch value.(type) {
case string:
if value == "" {
fmt.Printf("%s为空", field.Name)
return errors.New(fmt.Sprintf("%s为空", field.Name))
}
default:
if value == nil {
fmt.Printf("%s为空", field.Name)
return errors.New(fmt.Sprintf("%s为空", field.Name))
}
}
}
// 获取方法
// 1. 先获取interface的reflect.Type,然后通过.NumMethod进行遍历
//for i := 0; i < getType.NumMethod(); i++ {
// m := getType.Method(i)
// fmt.Printf("%s: %v\n", m.Name, m.Type)
//}
return nil
}
-12
View File
@@ -1,12 +0,0 @@
package tools
import (
"crypto/md5"
"encoding/hex"
)
func MD5V(str []byte) string {
h := md5.New()
h.Write(str)
return hex.EncodeToString(h.Sum(nil))
}
-15
View File
@@ -1,15 +0,0 @@
package tools
import "reflect"
// 利用反射将结构体转化为map
func StructToMap(obj interface{}) map[string]interface{}{
obj1 := reflect.TypeOf(obj)
obj2 := reflect.ValueOf(obj)
var data = make(map[string]interface{})
for i := 0; i < obj1.NumField(); i++ {
data[obj1.Field(i).Name] = obj2.Field(i).Interface()
}
return data
}
-57
View File
@@ -1,57 +0,0 @@
package tools
import (
"archive/zip"
"io"
"os"
"strings"
)
func ZipFiles(filename string, files []string, oldform, newform string) error {
newZipFile, err := os.Create(filename)
if err != nil {
return err
}
defer newZipFile.Close()
zipWriter := zip.NewWriter(newZipFile)
defer zipWriter.Close()
// 把files添加到zip中
for _, file := range files {
zipfile, err := os.Open(file)
if err != nil {
return err
}
defer zipfile.Close()
// 获取file的基础信息
info, err := zipfile.Stat()
if err != nil {
return err
}
header, err := zip.FileInfoHeader(info)
if err != nil {
return err
}
//使用上面的FileInforHeader() 就可以把文件保存的路径替换成我们自己想要的了,如下面
header.Name = strings.Replace(file, oldform, newform, -1)
// 优化压缩
// 更多参考see http://golang.org/pkg/archive/zip/#pkg-constants
header.Method = zip.Deflate
writer, err := zipWriter.CreateHeader(header)
if err != nil {
return err
}
if _, err = io.Copy(writer, zipfile); err != nil {
return err
}
}
return nil
}
-84
View File
@@ -1,84 +0,0 @@
import service from '@/utils/request'
// @Tags {{.StructName}}
// @Summary 创建{{.StructName}}
// @Security ApiKeyAuth
// @accept application/json
// @Produce application/json
// @Param data body {{.PackageName}}.{{.StructName}} true "创建{{.StructName}}"
// @Success 200 {string} string "{"success":true,"data":{},"msg":"获取成功"}"
// @Router /{{.Abbreviation}}/create{{.StructName}} [post]
export const create{{.StructName}} = (data) => {
return service({
url: "/{{.Abbreviation}}/create{{.StructName}}",
method: 'post',
data
})
}
// @Tags {{.StructName}}
// @Summary 删除{{.StructName}}
// @Security ApiKeyAuth
// @accept application/json
// @Produce application/json
// @Param data body {{.PackageName}}.{{.StructName}} true "删除{{.StructName}}"
// @Success 200 {string} string "{"success":true,"data":{},"msg":"删除成功"}"
// @Router /{{.Abbreviation}}/delete{{.StructName}} [post]
export const delete{{.StructName}} = (data) => {
return service({
url: "/{{.Abbreviation}}/delete{{.StructName}}",
method: 'post',
data
})
}
// @Tags {{.StructName}}
// @Summary 更新{{.StructName}}
// @Security ApiKeyAuth
// @accept application/json
// @Produce application/json
// @Param data body {{.PackageName}}.{{.StructName}} true "更新{{.StructName}}"
// @Success 200 {string} string "{"success":true,"data":{},"msg":"更新成功"}"
// @Router /{{.Abbreviation}}/update{{.StructName}} [post]
export const update{{.StructName}} = (data) => {
return service({
url: "/{{.Abbreviation}}/update{{.StructName}}",
method: 'post',
data
})
}
// @Tags {{.StructName}}
// @Summary 用id查询{{.StructName}}
// @Security ApiKeyAuth
// @accept application/json
// @Produce application/json
// @Param data body {{.PackageName}}.{{.StructName}} true "用id查询{{.StructName}}"
// @Success 200 {string} string "{"success":true,"data":{},"msg":"查询成功"}"
// @Router /{{.Abbreviation}}/find{{.StructName}} [post]
export const find{{.StructName}} = (data) => {
return service({
url: "/{{.Abbreviation}}/find{{.StructName}}",
method: 'post',
data
})
}
// @Tags {{.StructName}}
// @Summary 分页获取{{.StructName}}列表
// @Security ApiKeyAuth
// @accept application/json
// @Produce application/json
// @Param data body modelInterface.PageInfo true "分页获取{{.StructName}}列表"
// @Success 200 {string} string "{"success":true,"data":{},"msg":"获取成功"}"
// @Router /{{.Abbreviation}}/get{{.StructName}}List [post]
export const get{{.StructName}}List = (data) => {
return service({
url: "/{{.Abbreviation}}/get{{.StructName}}List",
method: 'post',
data
})
}
-118
View File
@@ -1,118 +0,0 @@
package api
import (
"fmt"
"gin-vue-admin/controller/servers"
"gin-vue-admin/model/modelInterface"
// 请自行引入model路径
"github.com/gin-gonic/gin"
)
// @Tags {{.StructName}}
// @Summary 创建{{.StructName}}
// @Security ApiKeyAuth
// @accept application/json
// @Produce application/json
// @Param data body {{.PackageName}}.{{.StructName}} true "创建{{.StructName}}"
// @Success 200 {string} string "{"success":true,"data":{},"msg":"获取成功"}"
// @Router /{{.Abbreviation}}/create{{.StructName}} [post]
func Create{{.StructName}}(c *gin.Context) {
var {{.Abbreviation}} {{.PackageName}}.{{.StructName}}
_ = c.ShouldBindJSON(&{{.Abbreviation}})
err := {{.Abbreviation}}.Create{{.StructName}}()
if err != nil {
servers.ReportFormat(c, false, fmt.Sprintf("创建失败:%v", err), gin.H{})
} else {
servers.ReportFormat(c, true, "创建成功", gin.H{})
}
}
// @Tags {{.StructName}}
// @Summary 删除{{.StructName}}
// @Security ApiKeyAuth
// @accept application/json
// @Produce application/json
// @Param data body {{.PackageName}}.{{.StructName}} true "删除{{.StructName}}"
// @Success 200 {string} string "{"success":true,"data":{},"msg":"删除成功"}"
// @Router /{{.Abbreviation}}/delete{{.StructName}} [post]
func Delete{{.StructName}}(c *gin.Context) {
var {{.Abbreviation}} {{.PackageName}}.{{.StructName}}
_ = c.ShouldBindJSON(&{{.Abbreviation}})
err := {{.Abbreviation}}.Delete{{.StructName}}()
if err != nil {
servers.ReportFormat(c, false, fmt.Sprintf("删除失败:%v", err), gin.H{})
} else {
servers.ReportFormat(c, true, "创建成功", gin.H{})
}
}
// @Tags {{.StructName}}
// @Summary 更新{{.StructName}}
// @Security ApiKeyAuth
// @accept application/json
// @Produce application/json
// @Param data body {{.PackageName}}.{{.StructName}} true "更新{{.StructName}}"
// @Success 200 {string} string "{"success":true,"data":{},"msg":"更新成功"}"
// @Router /{{.Abbreviation}}/update{{.StructName}} [post]
func Update{{.StructName}}(c *gin.Context) {
var {{.Abbreviation}} {{.PackageName}}.{{.StructName}}
_ = c.ShouldBindJSON(&{{.Abbreviation}})
err,re{{.Abbreviation}} := {{.Abbreviation}}.Update{{.StructName}}()
if err != nil {
servers.ReportFormat(c, false, fmt.Sprintf("更新失败:%v", err), gin.H{})
} else {
servers.ReportFormat(c, true, "更新成功", gin.H{
"re{{.Abbreviation}}":re{{.Abbreviation}},
})
}
}
// @Tags {{.StructName}}
// @Summary 用id查询{{.StructName}}
// @Security ApiKeyAuth
// @accept application/json
// @Produce application/json
// @Param data body {{.PackageName}}.{{.StructName}} true "用id查询{{.StructName}}"
// @Success 200 {string} string "{"success":true,"data":{},"msg":"查询成功"}"
// @Router /{{.Abbreviation}}/find{{.StructName}} [post]
func Find{{.StructName}}(c *gin.Context) {
var {{.Abbreviation}} {{.PackageName}}.{{.StructName}}
_ = c.ShouldBindJSON(&{{.Abbreviation}})
err,re{{.Abbreviation}} := {{.Abbreviation}}.FindById()
if err != nil {
servers.ReportFormat(c, false, fmt.Sprintf("查询失败:%v", err), gin.H{})
} else {
servers.ReportFormat(c, true, "查询成功", gin.H{
"re{{.Abbreviation}}":re{{.Abbreviation}},
})
}
}
// @Tags {{.StructName}}
// @Summary 分页获取{{.StructName}}列表
// @Security ApiKeyAuth
// @accept application/json
// @Produce application/json
// @Param data body modelInterface.PageInfo true "分页获取{{.StructName}}列表"
// @Success 200 {string} string "{"success":true,"data":{},"msg":"获取成功"}"
// @Router /{{.Abbreviation}}/get{{.StructName}}List [post]
func Get{{.StructName}}List(c *gin.Context) {
var pageInfo modelInterface.PageInfo
_ = c.ShouldBindJSON(&pageInfo)
err, list, total := new({{.PackageName}}.{{.StructName}}).GetInfoList(pageInfo)
if err != nil {
servers.ReportFormat(c, false, fmt.Sprintf("获取数据失败,%v", err), gin.H{})
} else {
servers.ReportFormat(c, true, "获取数据成功", gin.H{
"{{.PackageName}}List": list,
"total": total,
"page": pageInfo.Page,
"pageSize": pageInfo.PageSize,
})
}
}
-51
View File
@@ -1,51 +0,0 @@
// 自动生成模板{{.StructName}}
package {{.PackageName}}
import (
"gin-vue-admin/controller/servers"
"gin-vue-admin/init/qmsql"
"gin-vue-admin/model/modelInterface"
"github.com/jinzhu/gorm"
)
type {{.StructName}} struct {
gorm.Model {{range .Fields}}
{{.FieldName}} {{.FieldType}} `json:"{{.FieldJson}}"{{if .ColumnName}} gorm:"column:{{.ColumnName}}"{{end}}`{{ end }}
}
// 创建{{.StructName}}
func ({{.Abbreviation}} *{{.StructName}})Create{{.StructName}}()(err error){
err = qmsql.DEFAULTDB.Create({{.Abbreviation}}).Error
return err
}
// 删除{{.StructName}}
func ({{.Abbreviation}} *{{.StructName}})Delete{{.StructName}}()(err error){
err = qmsql.DEFAULTDB.Delete({{.Abbreviation}}).Error
return err
}
// 更新{{.StructName}}
func ({{.Abbreviation}} *{{.StructName}})Update{{.StructName}}()(err error, re{{.Abbreviation}} {{.StructName}}){
err = qmsql.DEFAULTDB.Save({{.Abbreviation}}).Error
return err, *{{.Abbreviation}}
}
// 根据ID查看单条{{.StructName}}
func ({{.Abbreviation}} *{{.StructName}})FindById()(err error,re{{.Abbreviation}} {{.StructName}}){
err = qmsql.DEFAULTDB.Where("id = ?",{{.Abbreviation}}.ID).First(&re{{.Abbreviation}}).Error
return err,re{{.Abbreviation}}
}
// 分页获取{{.StructName}}
func ({{.Abbreviation}} *{{.StructName}})GetInfoList(info modelInterface.PageInfo)(err error, list interface{}, total int){
// 封装分页方法 调用即可 传入 当前的结构体和分页信息
err, db, total := servers.PagingServer({{.Abbreviation}}, info)
if err != nil {
return
} else {
var re{{.StructName}}List []{{.StructName}}
err = db.Find(&re{{.StructName}}List).Error
return err, re{{.StructName}}List, total
}
}
-18
View File
@@ -1,18 +0,0 @@
package router
import (
"gin-vue-admin/controller/api"
"gin-vue-admin/middleware"
"github.com/gin-gonic/gin"
)
func Init{{.StructName}}Router(Router *gin.RouterGroup) {
{{.StructName}}Router := Router.Group("{{.Abbreviation}}").Use(middleware.JWTAuth()).Use(middleware.CasbinHandler())
{
{{.StructName}}Router.POST("create{{.StructName}}", api.Create{{.StructName}}) // 新建{{.StructName}}
{{.StructName}}Router.POST("delete{{.StructName}}", api.Delete{{.StructName}}) //删除{{.StructName}}
{{.StructName}}Router.POST("update{{.StructName}}", api.Update{{.StructName}}) //更新{{.StructName}}
{{.StructName}}Router.POST("find{{.StructName}} ", api.Find{{.StructName}}) // 根据ID获取{{.StructName}}
{{.StructName}}Router.POST("get{{.StructName}}List", api.Get{{.StructName}}List) //获取{{.StructName}}列表
}
}
-2
View File
@@ -1,2 +0,0 @@
ENV = 'development'
VUE_APP_BASE_API = '/api'
-2
View File
@@ -1,2 +0,0 @@
ENV = 'production'
VUE_APP_BASE_API = '/v1'
-21
View File
@@ -1,21 +0,0 @@
.DS_Store
node_modules
/dist
# local env files
.env.local
.env.*.local
# Log files
npm-debug.log*
yarn-debug.log*
yarn-error.log*
# Editor directories and files
.idea
.vscode
*.suo
*.ntvs*
*.njsproj
*.sln
*.sw?
-29
View File
@@ -1,29 +0,0 @@
# qm-plus-vue-page
## Project setup
```
npm install
```
### Compiles and hot-reloads for development
```
npm run serve
```
### Compiles and minifies for production
```
npm run build
```
### Run your tests
```
npm run test
```
### Lints and fixes files
```
npm run lint
```
### Customize configuration
See [Configuration Reference](https://cli.vuejs.org/config/).
-5
View File
@@ -1,5 +0,0 @@
module.exports = {
presets: [
'@vue/app'
]
}
-62
View File
@@ -1,62 +0,0 @@
{
"name": "qm-plus-vue-page",
"version": "0.1.0",
"private": true,
"scripts": {
"serve": "vue-cli-service serve",
"build": "vue-cli-service build",
"lint": "vue-cli-service lint"
},
"dependencies": {
"axios": "^0.19.0",
"core-js": "^2.6.5",
"element-ui": "^2.12.0",
"mavon-editor": "^2.7.7",
"node-sass": "^4.12.0",
"path": "^0.12.7",
"qs": "^6.8.0",
"quill": "^1.3.7",
"sass-loader": "^8.0.0",
"script-ext-html-webpack-plugin": "^2.1.4",
"spark-md5": "^3.0.1",
"vue": "^2.6.10",
"vue-particle-line": "^0.1.4",
"vue-quill-editor": "^3.0.6",
"vue-router": "^3.1.3",
"vuescroll": "^4.14.4",
"vuex": "^3.1.1",
"vuex-persist": "^2.1.0"
},
"devDependencies": {
"@vue/cli-plugin-babel": "^3.11.0",
"@vue/cli-plugin-eslint": "^3.11.0",
"@vue/cli-service": "^3.11.0",
"babel-eslint": "^10.0.1",
"eslint": "^5.16.0",
"eslint-plugin-vue": "^5.0.0",
"vue-template-compiler": "^2.6.10"
},
"eslintConfig": {
"root": true,
"env": {
"node": true
},
"extends": [
"plugin:vue/essential",
"eslint:recommended"
],
"rules": {},
"parserOptions": {
"parser": "babel-eslint"
}
},
"postcss": {
"plugins": {
"autoprefixer": {}
}
},
"browserslist": [
"> 1%",
"last 2 versions"
]
}
Binary file not shown.

Before

Width:  |  Height:  |  Size: 6.5 KiB

-17
View File
@@ -1,17 +0,0 @@
<!DOCTYPE html>
<html lang="en">
<head>
<meta charset="utf-8">
<meta http-equiv="X-UA-Compatible" content="IE=edge">
<meta name="viewport" content="width=device-width,initial-scale=1.0">
<link rel="icon" href="<%= BASE_URL %>favicon.ico">
<title>qm-plus-vue-page</title>
</head>
<body>
<noscript>
<strong>We're sorry but qm-plus-vue-page doesn't work properly without JavaScript enabled. Please enable it to continue.</strong>
</noscript>
<div id="app"></div>
<!-- built files will be auto injected -->
</body>
</html>
-62
View File
@@ -1,62 +0,0 @@
import service from '@/utils/request'
// @Summary 用户登录
// @Produce application/json
// @Param {
// page int
// pageSize int
// }
// @Router /authority/getAuthorityList [post]
export const getAuthorityList = (data) => {
return service({
url: "/authority/getAuthorityList",
method: 'post',
data
})
}
// @Summary 删除角色
// @Security ApiKeyAuth
// @accept application/json
// @Produce application/json
// @Param data body {authorityId uint} true "删除角色"
// @Success 200 {string} json "{"success":true,"data":{},"msg":"获取成功"}"
// @Router /authority/deleteAuthority [post]
export const deleteAuthority = (data) => {
return service({
url: "/authority/deleteAuthority",
method: 'post',
data
})
}
// @Summary 创建角色
// @Security ApiKeyAuth
// @accept application/json
// @Produce application/json
// @Param data body api.CreateAuthorityPatams true "创建角色"
// @Success 200 {string} json "{"success":true,"data":{},"msg":"获取成功"}"
// @Router /authority/createAuthority [post]
export const createAuthority = (data) => {
return service({
url: "/authority/createAuthority",
method: 'post',
data
})
}
// @Summary 设置角色资源权限
// @Security ApiKeyAuth
// @accept application/json
// @Produce application/json
// @Param data body sysModel.SysAuthority true "设置角色资源权限"
// @Success 200 {string} string "{"success":true,"data":{},"msg":"设置成功"}"
// @Router /authority/setDataAuthority [post]
export const setDataAuthority = (data) => {
return service({
url: "/authority/setDataAuthority",
method: 'post',
data
})
}
-21
View File
@@ -1,21 +0,0 @@
import service from '@/utils/request'
// @Tags api
// @Summary 分页获取角色列表
// @Security ApiKeyAuth
// @accept application/json
// @Produce application/json
// @Param data body modelInterface.PageInfo true "分页获取用户列表"
// @Success 200 {string} json "{"success":true,"data":{},"msg":"获取成功"}"
// @Router /api/getApiList [post]
// {
// page int
// pageSize int
// }
export const createTemp = (data) => {
return service({
url: "/autoCode/createTemp",
method: 'post',
data,
responseType: 'blob'
})
}
-80
View File
@@ -1,80 +0,0 @@
import service from '@/utils/request'
// @Summary 用户登录
// @Produce application/json
// @Param data body {username:"string",password:"string"}
// @Router /base/login [post]
export const login = (data) => {
return service({
url: "/base/login",
method: 'post',
data: data
})
}
// @Summary 获取验证码
// @Produce application/json
// @Param data body {username:"string",password:"string"}
// @Router /base/captcha [post]
export const captcha = (data) => {
return service({
url: "/base/captcha",
method: 'post',
data: data
})
}
// @Summary 用户注册
// @Produce application/json
// @Param data body {username:"string",password:"string"}
// @Router /base/resige [post]
export const regist = (data) => {
return service({
url: "/base/regist",
method: 'post',
data: data
})
}
// @Summary 修改密码
// @Produce application/json
// @Param data body {username:"string",password:"string",newPassword:"string"}
// @Router /user/changePassword [post]
export const changePassword = (data) => {
return service({
url: "/user/changePassword",
method: 'post',
data: data
})
}
// @Tags User
// @Summary 分页获取用户列表
// @Security ApiKeyAuth
// @accept application/json
// @Produce application/json
// @Param data body modelInterface.PageInfo true "分页获取用户列表"
// @Success 200 {string} json "{"success":true,"data":{},"msg":"获取成功"}"
// @Router /user/getUserList [post]
export const getUserList = (data) => {
return service({
url: "/user/getUserList",
method: 'post',
data: data
})
}
// @Tags User
// @Summary 设置用户权限
// @Security ApiKeyAuth
// @accept application/json
// @Produce application/json
// @Param data body api.SetUserAuth true "设置用户权限"
// @Success 200 {string} json "{"success":true,"data":{},"msg":"修改成功"}"
// @Router /user/setUserAuthority [post]
export const setUserAuthority = (data) => {
return service({
url: "/user/setUserAuthority",
method: 'post',
data: data
})
}
-15
View File
@@ -1,15 +0,0 @@
import service from '@/utils/request'
// @Summary 删除角色
// @Security ApiKeyAuth
// @accept application/json
// @Produce application/json
// @Param data body {authorityId uint} true "删除角色"
// @Success 200 {string} json "{"success":true,"data":{},"msg":"获取成功"}"
// @Router /authority/deleteAuthority [post]
export const createWorkFlow = (data) => {
return service({
url: "/workflow/createWorkFlow",
method: 'post',
data
})
}

Some files were not shown because too many files have changed in this diff Show More