Commit Graph
100 Commits
Author SHA1 Message Date
zhangwenjian 985a6618a0 Merge branch 'v1-fixbug' into dev
# Conflicts:
#	models/dept.go
2020-07-01 22:57:44 +08:00
zhangwenjian bd161114f0 feat: Department management, if there are users under the Department, it should not be deleted(#103) 2020-07-01 21:47:29 +08:00
zhangwenjian f83ee71745 fix: Invalid password modification function in user center(#137) 2020-07-01 21:28:54 +08:00
zhangwenjian 8b68e98ebf fix: return value 2020-07-01 20:49:19 +08:00
zhangwenjian 58999ef1a4 feat:add CustomMigrate 2020-06-28 22:49:42 +08:00
zhangwenjian 4ce39764bc feat:update db file name to gorm 2020-06-28 22:49:17 +08:00
zhangwenjian 2eb5803432 fix:Correct typos 2020-06-28 22:48:32 +08:00
zhangwenjian ba3f4b7c23 docs: update init 2020-06-28 22:47:49 +08:00
zhangwenjian e05c5e8a8b feat: Add transaction (#124) 2020-06-28 22:14:53 +08:00
zhangwenjian 8407b1ad31 Merge branch 'dev' of https://github.com/wenjianzhang/go-admin into dev 2020-06-21 13:02:35 +08:00
zhangwenjian 9c0941cd37 feat:code gen to dir 2020-06-21 13:02:20 +08:00
wenjianzhang f150f3b10f Merge pull request #131 from wenjianzhang/v1-fixbug
fix: fix update password invalid
2020-06-21 13:00:58 +08:00
zhangwenjian dcd6bc998a fix: fix update password invalid 2020-06-21 12:53:57 +08:00
zhangwenjian d73dbbf73c feat:Add file handling method 2020-06-19 22:47:56 +08:00
wenjianzhang 31bfcb3eda Merge pull request #128 from wenjianzhang/v1-fixbug
feat: add global & logger
2020-06-19 22:23:49 +08:00
zhangwenjian b77f4b5a1b feat: add global & logger 2020-06-19 22:09:49 +08:00
zhangwenjian 7db16d04dd fix[models.Response]: fixed models.Response Invalid definition (#118) 2020-06-12 00:13:33 +08:00
wenjianzhang b0acf85f10 Merge pull request #117 from wenjianzhang/v1
fix[log print]: fixed log writer error (#114)
2020-06-12 00:04:57 +08:00
wenjianzhang b802066670 Add https support 2020-06-12 00:03:29 +08:00
zhangwenjian 1c282c00b5 docs: update readme 2020-06-12 00:01:50 +08:00
zhangwenjian 0177fb17b7 feat[Https]: added https support (#113) 2020-06-11 23:56:05 +08:00
wenjianzhang bc743e2a71 fix[log print]: fixed log writer error (#114) 2020-06-11 16:00:55 +08:00
zhangwenjian 5d69b32119 fix: fixed log writer error (#114) 2020-06-11 15:56:57 +08:00
zhangwenjian 5374394cfd fix[table.TableName]: fixed table.TableName to table.TBName 2020-06-11 15:55:11 +08:00
wenjianzhang 92b0851e25 update readme
update readme
2020-06-07 23:18:53 +08:00
zhangwenjian fef2ffe830 update readme 2020-06-07 23:14:00 +08:00
zhangwenjian 682361774f Menu name field length adjusted to 128 2020-06-07 17:13:29 +08:00
wenjianzhang 68222bddad Merge pull request #108 from wenjianzhang/v1.0.0
V1.0.0
2020-06-05 21:00:20 +08:00
wenjianzhang 4f48e1783a Merge pull request #107 from wenjianzhang/v1.0.0-fixbug
Upgrade code generation supports drop-down box merging and dictionary…
2020-06-05 20:59:34 +08:00
zhangwenjian 259dec9c94 Upgrade code generation supports drop-down box merging and dictionary usage 2020-06-05 20:43:58 +08:00
wenjianzhang 3465135ae5 Merge pull request #99 from wenjianzhang/v1.0.0
Fix problems ,Upgrade route
2020-05-25 21:40:39 +08:00
wenjianzhang 500b5a9cef Merge pull request #98 from wenjianzhang/v1.0.0-fixbug
Fix problems modifying personal information,Upgrade route configuration format
2020-05-25 21:37:18 +08:00
zhangwenjian c0b8199c36 Fix problems modifying personal information,Upgrade route configuration format 2020-05-25 21:30:29 +08:00
wenjianzhang 80fee4d1ef Merge pull request #93 from wenjianzhang/v1.0.0
Repair dictionary data judgment
2020-05-19 15:00:56 +08:00
wenjianzhang 618bda0eb0 Repair dictionary data judgment
Repair dictionary data judgment
2020-05-19 15:00:18 +08:00
zhangwenjian e07cb22255 Repair dictionary data judgment 2020-05-19 14:59:02 +08:00
wenjianzhang f4543a3190 Merge pull request #88 from wenjianzhang/v1.0.0
remove ``
2020-05-17 12:05:12 +08:00
wenjianzhang 31ee219e84 Merge pull request #87 from wenjianzhang/v1.0.0-fixbug
remove ``
2020-05-17 12:04:45 +08:00
zhangwenjian 2579ec9f4b remove `` 2020-05-17 11:53:11 +08:00
wenjianzhang 2d7de4e26d Merge pull request #86 from wenjianzhang/v1.0.0-fixbug
fix deleted_at
2020-05-17 11:46:09 +08:00
zhangwenjian 8ad8cdb966 fix deleted_at 2020-05-17 11:44:26 +08:00
wenjianzhang da5993ab01 Merge pull request #84 from wenjianzhang/v1.0.0
Ignore error validation
2020-05-17 00:29:12 +08:00
wenjianzhang d0b0b301ae Merge pull request #83 from wenjianzhang/v1.0.0-fixbug
Ignore error validation
2020-05-17 00:28:39 +08:00
zhangwenjian aee307dfa0 Ignore error validation 2020-05-17 00:27:19 +08:00
wenjianzhang c85eafc32e Merge pull request #81 from wenjianzhang/v1.0.0-fixbug
V1.0.0 fixbug
2020-05-14 22:40:44 +08:00
wenjianzhang c344177811 Merge pull request #80 from wenjianzhang/v1.0.0-fixbug
V1.0.0 fixbug
Control role_name and tole_key cannot be duplicate
Add key only control
Add count where condition 'deleted' at 'is null
2020-05-14 22:39:39 +08:00
zhangwenjian 1bb0eb150d Add count where condition 'deleted' at 'is null 2020-05-14 22:38:22 +08:00
zhangwenjian 68d3ce0a22 Add key only control 2020-05-14 22:12:51 +08:00
zhangwenjian 6d2c267121 Control role_name and tole_key cannot be duplicate 2020-05-14 21:11:55 +08:00
wenjianzhang cebca5862e Merge pull request #77 from wenjianzhang/v1.0.0
V1.0.0
2020-05-12 23:59:25 +08:00
wenjianzhang 221ee539cd Merge branch 'master' into v1.0.0 2020-05-12 23:59:13 +08:00
wenjianzhang 4343cbefba Merge pull request #76 from wenjianzhang/v1.0.0_fixbug
V1.0.0 fixbug
2020-05-12 23:54:46 +08:00
zhangwenjian f6adb48837 Fix jwt key 2020-05-12 23:53:51 +08:00
zhangwenjian 63184fcd0a Code generation import list add imported data table 2020-05-09 14:51:54 +08:00
zhangwenjian 429bc5fb18 Code generation changed to physical deletion 2020-05-09 14:50:39 +08:00
zhangwenjian 99e038cb35 Fix bulk import data table 2020-05-09 14:50:03 +08:00
zhangwenjian a252264868 Remove configuration that is no longer in use 2020-05-09 01:00:56 +08:00
wenjianzhang 75a9ad79cc Merge pull request #72 from wenjianzhang/v1.0.0_fixbug
V1.0.0 fixbug
2020-05-05 12:26:50 +08:00
zhangwenjian 982af439f2 Unified return structure 2020-05-05 12:25:17 +08:00
zhangwenjian 77a4f183d5 added BatchDelete action 2020-05-05 12:25:17 +08:00
zhangwenjian 38eed4a8fe update vue template 2020-05-05 12:25:17 +08:00
zhangwenjian 570afbbe12 update model template 2020-05-05 12:25:17 +08:00
zhangwenjian 8260581be1 update api template 2020-05-05 12:25:17 +08:00
zhangwenjian 9ea3ccc064 remove demo middleware 2020-05-05 12:25:17 +08:00
wenjianzhang de41e30aa1 Modify unauthorized code 2020-05-05 12:25:17 +08:00
zhangwenjian fa2d88870e fix role control btn isshow 2020-05-05 12:25:17 +08:00
wenjianzhang 7fda92a1b1 Merge pull request #71 from wenjianzhang/v1.0.0_fixbug
Fix init DB error
2020-05-05 12:19:43 +08:00
wenjianzhang 5da8487ea1 Merge pull request #69 from wenjianzhang/master_fixbug
Master fixbug
2020-05-05 03:05:22 +08:00
wenjianzhang f48a955d13 Merge pull request #70 from wenjianzhang/v1.0.0_fixbug
V1.0.0 fixbug
2020-05-05 02:58:01 +08:00
zhangwenjian b2883e9bce fix dept deletion is invalid 2020-05-05 02:52:38 +08:00
zhangwenjian ef26a2b864 added batch delete action 2020-05-05 02:33:35 +08:00
zhangwenjian 41ae5e8282 Unified return structure 2020-05-05 02:15:25 +08:00
zhangwenjian 8d844b00dd added BatchDelete action 2020-05-05 02:02:58 +08:00
wenjianzhang a88ecb5793 Merge pull request #68 from wenjianzhang/master_fixbug
Modify unauthorized code
update api template
update js template
update model template
update vue template
2020-05-04 23:18:14 +08:00
zhangwenjian 9e2726cbbb update vue template 2020-05-04 23:15:40 +08:00
zhangwenjian c4daa50819 update model template 2020-05-04 23:15:32 +08:00
zhangwenjian 5479b95e84 update js template 2020-05-04 23:15:23 +08:00
zhangwenjian 0caf51331f update api template 2020-05-04 23:15:15 +08:00
zhangwenjian a3ac2845ac Modify unauthorized code 2020-05-04 23:15:01 +08:00
wenjianzhang af7af51f07 Merge pull request #67 from wenjianzhang/v1.0.0_fixbug
V1.0.0 fixbug
Modify unauthorized code
remove demo middleware
update api template
update model template
update vue template
2020-05-04 23:01:00 +08:00
zhangwenjian f116859711 update vue template 2020-05-04 22:55:30 +08:00
zhangwenjian 0f82545ddf update model template 2020-05-04 22:55:30 +08:00
zhangwenjian 2720f4f46d update api template 2020-05-04 22:55:30 +08:00
zhangwenjian 037066c81a remove demo middleware 2020-05-04 22:55:30 +08:00
wenjianzhang 8d0f2fe5df Modify unauthorized code 2020-05-04 22:11:40 +08:00
wenjianzhang b792ae7107 Merge pull request #62 from wenjianzhang/master_fixbug
Master fixbug
2020-05-04 16:18:45 +08:00
zhangwenjian 300d64c54d control btn is show 2020-05-04 00:27:52 +08:00
zhangwenjian fdc4c52d68 fix data scope 2020-05-04 00:27:30 +08:00
zhangwenjian 0906d49d09 update base data sql 2020-05-04 00:26:49 +08:00
wenjianzhang 35558f7b06 Merge pull request #61 from wenjianzhang/v1.0.0_fixbug
fix role control btn isshow
2020-05-03 23:37:59 +08:00
zhangwenjian 0b7458b602 fix role control btn isshow 2020-05-03 23:34:50 +08:00
wenjianzhang 10b3e286b7 Merge pull request #60 from wenjianzhang/v1.0.0_fixbug
sql column data change sort
2020-05-03 22:21:52 +08:00
zhangwenjian 0b9976d6b4 sql column data change sort 2020-05-03 22:20:55 +08:00
wenjianzhang 4cb0a69ecd Merge pull request #59 from wenjianzhang/v1.0.0_fixbug
base data sql update
2020-05-03 22:14:01 +08:00
zhangwenjian ce5a969bb2 base data sql update 2020-05-03 22:13:24 +08:00
zhangwenjian 5999a0a158 role added column datascope 2020-05-03 22:10:01 +08:00
zhangwenjian 6b2a59f542 remove log data 2020-05-03 22:08:32 +08:00
zhangwenjian d34d7ec0a8 update mark 2020-05-03 21:57:23 +08:00
zhangwenjian 13b01a09d3 升级sql 2020-05-03 21:56:55 +08:00
wenjianzhang f1084627e6 Merge pull request #58 from wenjianzhang/dev
更新migrate 更名为init
2020-05-01 20:16:18 +08:00