Commit Graph

1828 Commits

Author SHA1 Message Date
liyang
274f18e0eb 修改错误信息格式
Former-commit-id: d4b44bcc763ab92ff2255544989ae31d41f8152b [formerly 10bcc9cdd49ee115b547077b88d2b158bf37a5eb] [formerly d4b44bcc763ab92ff2255544989ae31d41f8152b [formerly 10bcc9cdd49ee115b547077b88d2b158bf37a5eb] [formerly d4b44bcc763ab92ff2255544989ae31d41f8152b [formerly 10bcc9cdd49ee115b547077b88d2b158bf37a5eb] [formerly 10bcc9cdd49ee115b547077b88d2b158bf37a5eb [formerly f5e4db4dc9fa44c35bf35f67ad96c6370dfc592d [formerly 1785b00ac90bca8e12ad3998ddd2690c5b02ad80]]]]]
Former-commit-id: 40afddc47a653bf8f2bd03e2a0f0804fc68f4008
Former-commit-id: 1d5f76043f53a622cbadbd0995e8b2196250dc94
Former-commit-id: 15742c11fc7e7e2858494f7f28c0a1bf28b14cfe [formerly e2c7899accfa0870779cff6face7541064e0f300]
Former-commit-id: b9de9d7ec9cb2d79f36b191f3ad5088466c6f692
Former-commit-id: fc608ea7c88a774e0bf64f21353231f35cedc28c
Former-commit-id: f347e4e0abc076c372aab758273166734861af34
Former-commit-id: 63f2a71adebf549962d21b743c12d383f7c943b4
Former-commit-id: f75d1b738079fbb62af1f73c644d715bf16a1d1a
2018-08-27 10:48:46 +08:00
liyang
e1257a084f 状态码判断以及自动添加到日志
Former-commit-id: 1befd09802269c61539a27ef2fd4ac86fd6c9b6f [formerly 1befd09802269c61539a27ef2fd4ac86fd6c9b6f [formerly 1befd09802269c61539a27ef2fd4ac86fd6c9b6f [formerly 1befd09802269c61539a27ef2fd4ac86fd6c9b6f [formerly a213ae2d21d86093399baa832146d6c72e7bbe04 [formerly 092ca0610f12674937184af3e325dd1942ea8da5]]]]]
Former-commit-id: be65bfb06d778ba61a1730ec9bf99f4d08c5a815
Former-commit-id: de8047c7fa1b0a4f73b0f8287af0154b895b643a
Former-commit-id: 9b61b9e04a5c6f5f61e248d299799520dcdfba95 [formerly 5e7b6390d23f20f0648b14ed934762068aed9623]
Former-commit-id: 05679a88d3b99e10d9abacb81c500c1ffe7210d5
Former-commit-id: 9c7d82216e4ed70c3621b17c64dbbc239ece84d7
Former-commit-id: 1c8984d4a3b819b4a23eaab0d80df2b8480f8c7a
Former-commit-id: 32635935c307b8af906ad12bd5f18006fc67ce78
Former-commit-id: 37ee780a2e409cfcd8d247b9f44ed80d66dc68db
2018-08-27 10:47:01 +08:00
liyang
b6448966e6 指定接口返回格式
Former-commit-id: cecb249658d88621883d41111e27cafa8fff1c16 [formerly cecb249658d88621883d41111e27cafa8fff1c16 [formerly cecb249658d88621883d41111e27cafa8fff1c16 [formerly cecb249658d88621883d41111e27cafa8fff1c16 [formerly 0313b6b30ba57c3d746d55bae04ce0155150d983 [formerly c444a9dc9809f2e3c4aaa2263543f39a1d889ad8]]]]]
Former-commit-id: 2c176d51cf5f5c5b733b82c59c914aa1be4c1ea6
Former-commit-id: 96c28290eee4242d69f78109a03f535929d09b18
Former-commit-id: 5eea3eceaac422cf969bb4faac466572d3d92b0a [formerly 5beed5d7fbf4023c37aec42826e39309c76b8663]
Former-commit-id: eae4a65099c92ab9894db31bfbc98030022db2d9
Former-commit-id: 7760cadd99b92c032504897d62bfba3d2c1f5632
Former-commit-id: 942e214e53bee6c3142c6dfa490c972a6abbed8d
Former-commit-id: 1cd6734220f665448f4fd295fe7ca28e9eed361c
Former-commit-id: a0386b7bf1cfdf9aca4cbfee42518a4b485f42ea
2018-08-27 09:10:30 +08:00
liyang
3fb34c3517 简化log
Former-commit-id: b567a5884d7486a05dafefa4684e4a070c1b79a0 [formerly 0eb70507cace99d7f975b96ee093faab763f9243] [formerly b567a5884d7486a05dafefa4684e4a070c1b79a0 [formerly 0eb70507cace99d7f975b96ee093faab763f9243] [formerly b567a5884d7486a05dafefa4684e4a070c1b79a0 [formerly 0eb70507cace99d7f975b96ee093faab763f9243] [formerly 0eb70507cace99d7f975b96ee093faab763f9243 [formerly 9a3a99c96ca755180bb1d23418dc6be78ae7edeb [formerly 8bc752a109c90c90f9840190a941eeda7fb7e349]]]]]
Former-commit-id: 82af028bfed70d0110c853053bb852dd3914ba3c
Former-commit-id: a28ad64a09775dae6ac917c07acba696a9a69277
Former-commit-id: 8ef921a405f7610c2adb9aedbd6e261f01370b8b [formerly f84c23341a4685f3a8c04638bc2af24b7bec36f2]
Former-commit-id: 18facece683f42160ee36c7b5d2f0e115d7f8d1f
Former-commit-id: 607ec284d93e5c8c8b1fc10496a21afdb409ab09
Former-commit-id: b45a22f1f6dfaead3c321a956aa2d6fea7ea0572
Former-commit-id: 86037e36790fe979c834ddd27c2d94478d67d3dc
Former-commit-id: 2d92a9136ad31753400e977c494d03f6fb2592e5
2018-08-26 22:16:53 +08:00
liyang
d8163d9060 注释改为了中文
Former-commit-id: 0638decf143f87f2c1aeff34d43cf338f2a5d4f3 [formerly 0638decf143f87f2c1aeff34d43cf338f2a5d4f3 [formerly 0638decf143f87f2c1aeff34d43cf338f2a5d4f3 [formerly 0638decf143f87f2c1aeff34d43cf338f2a5d4f3 [formerly f770eb4aeb1c550cf684665e4b3bac85220e1186 [formerly 80077c842ace79ce03f3aa708547a40f91710c7a]]]]]
Former-commit-id: 872c061c94f1265a75ad998279f6db06b935f835
Former-commit-id: f9120bb207fe46b72784aea7ccf6eb5d9fbfedd0
Former-commit-id: 4094ab34db6853c334dceaf76e284cfd6343f0c8 [formerly 18b2705f5cbd72b56027f15c635be16f39240824]
Former-commit-id: 846cfa0919115bea7ddbc7bdea368ec3001aa7eb
Former-commit-id: d884e764b35d0f5bb03515a0c5d7edf20c1624f1
Former-commit-id: 05ca8681b9e32f01cafc6f1910ce51a919e9aa06
Former-commit-id: ddeecf9653388372dc41a8fa6293df1e4722b68b
Former-commit-id: 1f603d99fdc273b87a16a7df683e917f22f8fa06
2018-08-26 22:07:26 +08:00
孙昊翔
993e54d64b d2-crud doc 基本表格
Former-commit-id: acf80443284f668a8f9fa3fdbcbb32161168cd6e [formerly acf80443284f668a8f9fa3fdbcbb32161168cd6e [formerly acf80443284f668a8f9fa3fdbcbb32161168cd6e [formerly acf80443284f668a8f9fa3fdbcbb32161168cd6e [formerly 6c6dda19796960d898f505804108986aa7114185 [formerly 608b16426fa9dfd7d39068c35d060164b2f27baf]]]]]
Former-commit-id: 3da8dc3d3681adb92d6bd21b0e982f40bfdb17a0
Former-commit-id: 996adfebb0359eaf4f286a4cb03ee855347dd0d4
Former-commit-id: 7404f9647294dd8fa7c1efbda0d7fc8ab7bf5cae [formerly e98e5d3ddeaf2216c9b4e3e8bf83f7a31bedf25a]
Former-commit-id: b592545fe6a45c6a79eed8badf612275e54cdc31
Former-commit-id: 285a183c0bed15c2fae96247f19e9e3ec854b037
Former-commit-id: 496e9e1362e1c407c0593826ca604c35f74866ba
Former-commit-id: b3225c89b32a7a44fcbc29c0c43c7cc82c0286bd
Former-commit-id: 9514dc2c0ea2ffda7bd324e05e71a1c54516d200
2018-08-26 21:22:04 +08:00
孙昊翔
0ab200fab1 入口文件引入d2-crud
Former-commit-id: c26def84038f9c6ef876bfaecfeda6ad960a7128 [formerly c26def84038f9c6ef876bfaecfeda6ad960a7128 [formerly c26def84038f9c6ef876bfaecfeda6ad960a7128 [formerly c26def84038f9c6ef876bfaecfeda6ad960a7128 [formerly ac51bf426398ead7798bc75e47c225d4e4373c01 [formerly d109b59405dd2496434eb6136b44ce1116c48fd7]]]]]
Former-commit-id: 14287833957f8edd7f85c2b59cd0e52dc959d78c
Former-commit-id: e477c4156173bd2927cbcc5a38e3163a57aa6286
Former-commit-id: 31689fdb97e62c2e954a39c8a08a3795c3ad239b [formerly 902e7338b00529afc1b34d6b8945a4778fc1d312]
Former-commit-id: 55fd7e3549b2cc391aa15984a31b9817c4e849dd
Former-commit-id: f26bd67675a2117554ff62633ce05c73d0e86c06
Former-commit-id: 7e834316ca05e6073fc05add9ff9086f014f5a81
Former-commit-id: b12837f121821961c7f9ecb52604308990875ced
Former-commit-id: 2ea5c80ed0937d6d154cbc9f331e0cb4277523c9
2018-08-26 18:30:35 +08:00
孙昊翔
ffbb2dffca 添加d2-crud包到项目中
Former-commit-id: a1040e9ff6f9073e483d1ee33686d55ba2bc66ab [formerly a1040e9ff6f9073e483d1ee33686d55ba2bc66ab [formerly a1040e9ff6f9073e483d1ee33686d55ba2bc66ab [formerly a1040e9ff6f9073e483d1ee33686d55ba2bc66ab [formerly 0752dcc245f460721fd1d2572b35a4208b67396a [formerly 1e55e5f2f708a65a2b05679fbd1eb13b1bf6c58c]]]]]
Former-commit-id: e9d62b728379beb86408da0f78516ffa3cdee4af
Former-commit-id: 8f00571287d2a726ed795b9cbe03a7653a3ca30a
Former-commit-id: 0f933a852f72a353cba0e94bd1d0f556c5b70851 [formerly a56c67133c1697b74f9dec5aab3f2f2115e87855]
Former-commit-id: 26380e73701ef194d7a2a3d8ebddc3f61a774388
Former-commit-id: ceed5e24af039985c397535ad5cba23aca3f0344
Former-commit-id: 4234126354e5ddea2a9356e5f91377037789ae8c
Former-commit-id: c6ec9bef1794463242ffab72c4c786a06859ba1e
Former-commit-id: a93d28113e809127723fab95db122c50d40067c7
2018-08-26 18:23:52 +08:00
孙昊翔
d9cb31eb98 d2-crud doc 安装和使用
Former-commit-id: 683f264fa376ee3b34ba74a68a0620a38cf9ee06 [formerly 0aeb04b6927b6c7c115e8863e5adee72d0206876] [formerly 683f264fa376ee3b34ba74a68a0620a38cf9ee06 [formerly 0aeb04b6927b6c7c115e8863e5adee72d0206876] [formerly 683f264fa376ee3b34ba74a68a0620a38cf9ee06 [formerly 0aeb04b6927b6c7c115e8863e5adee72d0206876] [formerly 0aeb04b6927b6c7c115e8863e5adee72d0206876 [formerly 33bfc3cac1e556d1504786849fef9b98bc0a96b6 [formerly 62c564466c0ec6697988ec2f7acfef4e41f96b97]]]]]
Former-commit-id: 9116106f10c5bf73663e39e047ca9229307270b3
Former-commit-id: 36d47b96ff92a07f18827daeb1c9a1c1039c760a
Former-commit-id: ec26069a13f6207bc523cb94ac966048db2462bd [formerly 11a080148056553025a32528de4949dcdeb8d2a3]
Former-commit-id: 22557a8ad0a29f0cb274e017b1850f00d57320ba
Former-commit-id: e1460fe83483f046420770d660cc229638cd93b4
Former-commit-id: ced50fcee5d3601181d66758e38abcbd158a7c1c
Former-commit-id: e4e0dee70597bef87b652c5c2658625ece9e1362
Former-commit-id: d7e62ca343273fa20dd3ceb53bfb39ec72073261
2018-08-26 18:23:15 +08:00
孙昊翔
b287427587 Merge branch 'master' of github.com:d2-projects/d2-admin into feature/crud
Former-commit-id: 10bfd15382c39ef96f1a1e84cfb02a242edc9935 [formerly 81d05ac3f5cbb9b59306504e782262b55459221d] [formerly 10bfd15382c39ef96f1a1e84cfb02a242edc9935 [formerly 81d05ac3f5cbb9b59306504e782262b55459221d] [formerly 10bfd15382c39ef96f1a1e84cfb02a242edc9935 [formerly 81d05ac3f5cbb9b59306504e782262b55459221d] [formerly 81d05ac3f5cbb9b59306504e782262b55459221d [formerly 0bc2f68bba264b429fcadab099721f3225e431fb [formerly 6c40265df75b12affc58777a182f8c400228aaad]]]]]
Former-commit-id: 9da4063c488067a19fa21c52ba11a8d1f88d0f8e
Former-commit-id: 67b96181015d522c5b4cd2e4015d789e5034af8b
Former-commit-id: 76d833bdaded3568f3051f090d0a225f0a5ed5e8 [formerly f5022694704ffb411392068ef4f5d92000b18bde]
Former-commit-id: fb1b5abde826d4fd98efac4fc20ed01c8c492a7e
Former-commit-id: 3bb43b65d0a1589c3be8ccd1437072e217dc2565
Former-commit-id: 51bb85a2511abee8dcd0bd16c51a6c1150b96da6
Former-commit-id: 2542b2f40a9ef75852754958982a993f87793537
Former-commit-id: 316f54b095bee521f99139fecd1d711bbb2fbb13
2018-08-26 18:21:43 +08:00
李杨
27c889d3a5 Update README.md
Former-commit-id: 0ad936b810427773be606f5877ac7c1b4f989f1a [formerly 0ad936b810427773be606f5877ac7c1b4f989f1a [formerly 0ad936b810427773be606f5877ac7c1b4f989f1a [formerly 0ad936b810427773be606f5877ac7c1b4f989f1a [formerly eb54496d0c1e2ed07f744f12714100ca8434bffb [formerly 0ffaa1d4ef48afbd32f1a8cc7e71e4ae65f77b42]]]]]
Former-commit-id: 108db949e1f8534bbb60e7679551ca1d9df6827d
Former-commit-id: 4d8e8f3f57499131daeb08dedee2d72a91a3b956
Former-commit-id: 41792c816718611ce27570c68e1f2f4fce86a7a6 [formerly 8886532171ca26015d2c3dcaea4613b2057525ee]
Former-commit-id: 61fa56875dbc1f326e7309b38c69e28db1b99086
Former-commit-id: 77634f0a44b62ea16508d4cf428cf647d30992c6
Former-commit-id: 59c8fc7a3dfe463d5693a71e14a7ff630beb4c5b
Former-commit-id: bde0e6e4864f615f1e6a2cb213879a5cda57bbd7
Former-commit-id: b5e14315bd550189471214171b55255eb8072c23
2018-08-26 17:09:42 +08:00
liyang
90456bac6a Merge branch 'hotfix/doc-url' into develop
Former-commit-id: 570f97038f6accfdb672d95dea475ae14d1afdc1 [formerly 570f97038f6accfdb672d95dea475ae14d1afdc1 [formerly 570f97038f6accfdb672d95dea475ae14d1afdc1 [formerly 570f97038f6accfdb672d95dea475ae14d1afdc1 [formerly 8d65153daa16e8d73702e088700b4a5d668798e6 [formerly 9d8035fb53521a39cd09128f54145c4e151fe32a]]]]]
Former-commit-id: cfacb6edbfb818f20d1dcf3662167c9a392906f7
Former-commit-id: e18db884ba909302b59fc98abeb70fb90fd79b6b
Former-commit-id: 23cfbb758795d58cff3fdcc6cde43449f92d9675 [formerly 50dcda0be681791da830098229d0782584e925e9]
Former-commit-id: 037e004eeba77c3f14b4683e64ef7c2e305c002e
Former-commit-id: 7ac0e1e759403a6853ae9a5e0b5b571bad6038c3
Former-commit-id: 82befd052e92932f9a3f23c32bf42c793bbbaa40
Former-commit-id: 8c860b0a99382635aedc86fb04f9a16f1bb6e5a1
Former-commit-id: 4378927de4c666b4861353d531cdcaf07cc5866a
2018-08-26 17:03:33 +08:00
liyang
be84ff71d7 Merge branch 'hotfix/doc-url'
Former-commit-id: 628f8dcdd81de35e72239399d21ccaaf06be144b [formerly 628f8dcdd81de35e72239399d21ccaaf06be144b [formerly 628f8dcdd81de35e72239399d21ccaaf06be144b [formerly 628f8dcdd81de35e72239399d21ccaaf06be144b [formerly 45da64cc9c9bb03f0a836d6f3cf06a2fc4dd8a2d [formerly b95e0d0ac96f936c482c066690119edb0ea5779a]]]]]
Former-commit-id: 798676f341b50ca0a9f4f5ca01926727b5fadf43
Former-commit-id: fa24a247fc0cbef9100a20ac7e7a7a27554fb2b8
Former-commit-id: fed3dd259fb3660ae3f6aeed45f17488affa38fa [formerly bd69030c57919912a37c75ad1fa1bbf12dda0343]
Former-commit-id: 4381b82b5a8e8ae856cb145d4c8fc087f9881182
Former-commit-id: 569ab598c25c63f0299eb7ecd22b24fb0b618248
Former-commit-id: 020d29143349343a2012e88bfd52ce8bc086b72d
Former-commit-id: 9e8da1a46fd733603ed6dd1f9d0aa05067fc773b
Former-commit-id: f0c8d527a0f79aaad2cc6c82d7d99d6621941c00
2018-08-26 17:03:33 +08:00
liyang
d7cfbbdfcd doc update
Former-commit-id: 8f191aa24ed845cfb3b23b9d6b5230c2b3ffe956 [formerly 8f191aa24ed845cfb3b23b9d6b5230c2b3ffe956 [formerly 8f191aa24ed845cfb3b23b9d6b5230c2b3ffe956 [formerly 8f191aa24ed845cfb3b23b9d6b5230c2b3ffe956 [formerly 6d7d6f17bd51d5a9499be3a39c685e694e7a7c03 [formerly c388e890fbf98e4d88a252c99aa3c5edb881c050]]]]]
Former-commit-id: a0666cc0544f9881eae627e3824ca2717461d875
Former-commit-id: cafa37f1176899ccbd090f91a2a66d1bdb08b4bd
Former-commit-id: 6a5a759eb99cbeca9c44eaf8c8e8414ef1757ea9 [formerly ec39b697884894817c12d483946a3efbc93b15b6]
Former-commit-id: 88f16722b8954832c00811891fde7dc5336bdde1
Former-commit-id: c07704f6924ec110c937faef97a1a386c18a8fb1
Former-commit-id: 07e50e7e4f5130c9c94a86e4dd6f794a9325f1aa
Former-commit-id: 5bb1bc3043adc8fbd0099bfedb7f67065af5633a
Former-commit-id: a55479a37f62fd32022530fcd0a4fc61e79a43e2
2018-08-26 17:03:25 +08:00
liyang
7b1f5c1f62 Merge branch 'hotfix/doc_ice_update' into develop
Former-commit-id: fcf1acc8bdcfec882d5c20b01cfd77d93ee0ad72 [formerly 025389be543ba2568c2ffb0d8a8b793633b67a1f] [formerly fcf1acc8bdcfec882d5c20b01cfd77d93ee0ad72 [formerly 025389be543ba2568c2ffb0d8a8b793633b67a1f] [formerly fcf1acc8bdcfec882d5c20b01cfd77d93ee0ad72 [formerly 025389be543ba2568c2ffb0d8a8b793633b67a1f] [formerly 025389be543ba2568c2ffb0d8a8b793633b67a1f [formerly 3986bd0d7752ba562e8e2f092dde73a3c54d4491 [formerly e3f04cef13d134a71ffb290ea79115d902d0245f]]]]]
Former-commit-id: f8c08b74b320007be3995132d90a0938ecb2ceba
Former-commit-id: 4bcb204e84f13f5f84b4c5a02cc82d0caf5b5f7e
Former-commit-id: 2aac8f4e9fc60edb028a10ed6b82a317d94cf421 [formerly 835f6c723c682a255fd7b440535336fca97bb762]
Former-commit-id: e260f39936c98b98617c0098ef55bb7545b7e22b
Former-commit-id: 9f5f3d15828c1cfede0568de348511a614e90063
Former-commit-id: fb867b9dd66c9d7ff929accf438eca0e6728e3a2
Former-commit-id: 7e7aea9f9223a41a208003678d09861c84dd1072
Former-commit-id: b279da55d4dee339ce266de3fd67bcc5a7d9406f
2018-08-26 16:55:24 +08:00
liyang
f63130ffc2 Merge branch 'hotfix/doc_ice_update'
Former-commit-id: 0ec348242861d5e98861e4a3c361ebd235620097 [formerly 0ec348242861d5e98861e4a3c361ebd235620097 [formerly 0ec348242861d5e98861e4a3c361ebd235620097 [formerly 0ec348242861d5e98861e4a3c361ebd235620097 [formerly 643c797c70fe86cff3e2beab7e5adb259ad1c924 [formerly e08f806a82241da9bde8f1a0940e090ac94c5a32]]]]]
Former-commit-id: 63618d9f1c552dd01eef7e3669494c0e5e59f8f7
Former-commit-id: f3fa6342dc8cb497fbc7521b8bdd3aec2535e63c
Former-commit-id: 11969d14c5ee4a56c5b3fc271d6433c60af7a4e9 [formerly b07918d5cc6fcdb4d04ae6ab04e5bf5e7c7e2266]
Former-commit-id: ad4036976832db27eb297ec285550849fa399d02
Former-commit-id: 33203ac8afa7a5dfd3d58e6dcde772a92b896fb0
Former-commit-id: 723b4163970a4f3620d2a01eac640407512a66e4
Former-commit-id: b12fbb0bbd989c20ac39405f68843be8105cb16f
Former-commit-id: 20e4a00486edbd5bc15ba3d587fc1c6e47192c5d
2018-08-26 16:55:24 +08:00
liyang
d314a7e0c6 doc update
Former-commit-id: cb298b728c04e8aa97605a46e44ab7483e37059b [formerly cb298b728c04e8aa97605a46e44ab7483e37059b [formerly cb298b728c04e8aa97605a46e44ab7483e37059b [formerly cb298b728c04e8aa97605a46e44ab7483e37059b [formerly 911ee0a8b3092d8349533da6fb045b7edf3cae9e [formerly e4becd3f2e6959a3bc61c45e240c29f5f617d585]]]]]
Former-commit-id: 71eb37e74b0b115e9a22bd8bb0133f0b94b78ee2
Former-commit-id: a7e272d87f5f146343988c6d860e2b9fcc73ddb9
Former-commit-id: 69c6ffd3b7dea123c9c63a1a51428dc427531cfe [formerly 98910e533e636d6d5a2c67f35fb9322b79a7b430]
Former-commit-id: 83a15430a9a355911460e50f97b4d3bb3f399893
Former-commit-id: 9a6cf38ef701ef35e1139b33f1d3731d8d69e598
Former-commit-id: 25ed7e57bfa00b63a23ed16363956bc83e0ab23d
Former-commit-id: 115feb871277d0d4e5957bba14db27abcf28e107
Former-commit-id: 957b684755ff1ab7275143e4de71f10901b6eda7
2018-08-26 16:55:12 +08:00
liyang
60786bc15a 增加贡献者
Former-commit-id: 03acd94304b247daf1a936b4d3a5ba2e527a9d15 [formerly 03acd94304b247daf1a936b4d3a5ba2e527a9d15 [formerly 03acd94304b247daf1a936b4d3a5ba2e527a9d15 [formerly 03acd94304b247daf1a936b4d3a5ba2e527a9d15 [formerly 6d92c74ffe6255248e448d3bb5b926d42722e14c [formerly bc100ba9f85ace181d3ac36764a4134294ee2331]]]]]
Former-commit-id: 71416d37e1912fb2d0d7fa7bc9b4dac77d4c0670
Former-commit-id: 7ecfd2887d6ffcac456fa3ef139a69102718dfc6
Former-commit-id: 52be3085eaf4b82662968101c8e466452ac2ff02 [formerly 287368ccfbc9ae4dacc1929f7430517802a8fdbe]
Former-commit-id: 0424cf59e4f4d3cd58dd7c914e8683ee61f2e675
Former-commit-id: 849290bd487b37278aee17c4d6cb2d5de0f4a809
Former-commit-id: a3688ab42b178b69dd8f852b2a0c1f092b31e50c
Former-commit-id: 8fc7e4779989656bb8d2c0d34fd110cad7a0908d
Former-commit-id: d211b1969016adc4e7270efec83ce6acac2bb9b0
2018-08-26 10:53:09 +08:00
李杨
7c3047ca81 Merge pull request #88 from rongxingsun/develop
axios封装

Former-commit-id: 699a97411a8cd105bb3f1c93002545811376ebba [formerly 699a97411a8cd105bb3f1c93002545811376ebba [formerly 699a97411a8cd105bb3f1c93002545811376ebba [formerly 699a97411a8cd105bb3f1c93002545811376ebba [formerly c2ae44d664354d69de8a4786c2a5a8875cb525aa [formerly 8f36bb1cf63aab56816fd996a36f771784d51941]]]]]
Former-commit-id: 987985ee9cdacd1d2075a89b6a2b4f922d40fa2d
Former-commit-id: 3de671c00016bcf817b5951d5fad967c4af2a101
Former-commit-id: 1f3b1b4f43b5c6594b82f51418b950b95e03d211 [formerly 61b20c9c2e3af33c65b4b6e84fea6d82e943f859]
Former-commit-id: 4b5b88cd5e0e251d0d3380ea3dd06b5108f9b386
Former-commit-id: fcb821a77d3c9f20d7423209fb306f4c33e169d5
Former-commit-id: 06785c42327d6cf53224d0e4c8ea413176b10317
Former-commit-id: c2b5d08b8d6a07a7d6b99a33d1b36b1252f5202c
Former-commit-id: 6ba3142559faec8aac82df124e1274ba3d8ab888
2018-08-26 10:47:45 +08:00
rongxingsun
1f2d17a7ec axios fix
Former-commit-id: 4e67b101d7613dc5a908a9710a298ab452e3a73e [formerly 4e67b101d7613dc5a908a9710a298ab452e3a73e [formerly 4e67b101d7613dc5a908a9710a298ab452e3a73e [formerly 4e67b101d7613dc5a908a9710a298ab452e3a73e [formerly e18674e079add9386877561fd5ff11e26d8a444d [formerly 9eea4ceea3d3b77eab71336bd5a35f3865865a7a]]]]]
Former-commit-id: 309a390168260b7182beb6cefb1d3fce25f41ad7
Former-commit-id: 2357580897c1c29d440ef3df6f59ccf8ecf6c898
Former-commit-id: 4dec8fba40d4f2d2c38e214281019b42cb937d0f [formerly d5986fb5b1d943e920a5e9f298bcfe2f39db84a6]
Former-commit-id: 2f5e3bf693e575217a377d633480e214609a257b
Former-commit-id: 67a233f1a96a698c8a303437bd350eef012f426a
Former-commit-id: 3529a8cb845e843a7971eaa2ae108e8c4abd7859
Former-commit-id: 75fdfbf8e6258c417b6f187dc4d5a4be1090aa56
Former-commit-id: b089d7b7d80123e876bf9b03d5bf9593fd79f780
2018-08-26 10:28:26 +08:00
孙昊翔
4b30ae64f0 d2-crud doc 安装与使用
Former-commit-id: ad5a24f1fcdb7355158afe90a220b89d10effbc1 [formerly ad5a24f1fcdb7355158afe90a220b89d10effbc1 [formerly ad5a24f1fcdb7355158afe90a220b89d10effbc1 [formerly ad5a24f1fcdb7355158afe90a220b89d10effbc1 [formerly e178e288b2633c4518e4a384c600988f59a01718 [formerly cee2ebe37a1479b0e8fa7bad445a9cee66e0cd0d]]]]]
Former-commit-id: e53c0c3cf06dbce9e022379ba1aee0c38063042f
Former-commit-id: 4e930e5991ff25c34e9c4fa2468ed2e1e9fff384
Former-commit-id: b7fe2a305aa1bcd662a6a3761e2ce2106f0f799f [formerly 9c531ecc0cbcfac05d4a62a3e46f76fa59536f87]
Former-commit-id: e25370af0e242a6790669585c9a5cc1adcb474c6
Former-commit-id: 0b8437a9836c0ed14b8afd7e906bc4f8c1674929
Former-commit-id: 1932505cf83478252b19c2a1d2f2d45087ed2010
Former-commit-id: 43e6c08bd6104e50f42ea3a11f2fb2b957290d9d
Former-commit-id: b7c6c39ce7b6d6b5510ae617c969e640aaac18ee
2018-08-25 11:08:23 +08:00
孙昊翔
63aeb7177b d2-crud doc 介绍
Former-commit-id: f9fd9abdf2253e3e8cbf882b5e23de88fe89c2bb [formerly f9fd9abdf2253e3e8cbf882b5e23de88fe89c2bb [formerly f9fd9abdf2253e3e8cbf882b5e23de88fe89c2bb [formerly f9fd9abdf2253e3e8cbf882b5e23de88fe89c2bb [formerly 1a85b364273d84fd65b402fc26b5380ae6a5abf3 [formerly ddb8c5ebdcc602e2d5dcdfc8b7b0120e4588fe6b]]]]]
Former-commit-id: 1adfa36f63a34e9e9299574b4d17a7182b106686
Former-commit-id: 462c8643eaf845c3f8ad54803149c5f5bb68bf0f
Former-commit-id: 0fc2923ebdf457830a57fe25225a8d549953d64e [formerly 0ae139f0a3cabc6ffaae2fdc1f250fd8e1724b2f]
Former-commit-id: 7278a500c12fada59e857d5488fd10bfd176a8fc
Former-commit-id: d1acec67e5288f7a34e78c5e6c0f2b4e68e003ec
Former-commit-id: 8c0483b67c445eca1dae40f3a9473e571d764a10
Former-commit-id: b6def100df4860e3e7032f46d71e3cd7d10d049f
Former-commit-id: 9feacdfe682f32882b708c5e01b529f68b150b88
2018-08-25 10:43:24 +08:00
rongxingsun
d7f3a97f0c Update index.vue
Former-commit-id: 0ec59fa9e3b733759514151b1a90fb2b22c4da9c [formerly 9733055d0d130d8e94cfc697e08ebb2f70f93205] [formerly 0ec59fa9e3b733759514151b1a90fb2b22c4da9c [formerly 9733055d0d130d8e94cfc697e08ebb2f70f93205] [formerly 0ec59fa9e3b733759514151b1a90fb2b22c4da9c [formerly 9733055d0d130d8e94cfc697e08ebb2f70f93205] [formerly 9733055d0d130d8e94cfc697e08ebb2f70f93205 [formerly 0e0e45d28bba2353218141e49aa52805757df6d7 [formerly 1fd149b601e3ba17abb4fc0abc73480fbc1ddb07]]]]]
Former-commit-id: 25b56b18591974b4bc626a1bc900159355e9d4e9
Former-commit-id: 3470882e4ca881ff58f3e7dcbc266f65d9061208
Former-commit-id: 1d78fe0a8c7c17911488e060374a5966f3132e0b [formerly 7f54589e062f5881c12992df678347771207a985]
Former-commit-id: 35ee7ead7617857a4fe0dc1780a4da4461e8c59f
Former-commit-id: de66045e0f24d58b406cc4df331379afb3fbd627
Former-commit-id: b2a07e18bacd0da16909f4aa13c26bec7466e528
Former-commit-id: 0314405d3defb90b10fc77c08209dafd9ea6e0dd
Former-commit-id: 09b70ca29eb75ab17a0c05a1bc8d7b666b214dfb
2018-08-24 11:35:58 +00:00
rongxingsun
d7fcbcaa28 Update index.vue
Former-commit-id: 8004454a874f75694f88d8eebd37cff06828e2e1 [formerly 8004454a874f75694f88d8eebd37cff06828e2e1 [formerly 8004454a874f75694f88d8eebd37cff06828e2e1 [formerly 8004454a874f75694f88d8eebd37cff06828e2e1 [formerly 74344de3508cb42a17ab6d4e194964e8c786cacb [formerly fd859e76f8d42ac7d1e57054a93cd6bb51523d01]]]]]
Former-commit-id: bb3053de99201da3fa6499dda0d90d196e699a2c
Former-commit-id: a90dbd47e259cae5b9479c1d74e0db2dcdc7b559
Former-commit-id: 74d893743fb050944cefac3e9c963c8e9487e768 [formerly 66fcd9f8f5e1642d7930ac1123b750dd4cccc110]
Former-commit-id: 159a54d45f4c9b7c324864986067197d1f6ab81f
Former-commit-id: d68f21e49eda7d15fdf73a9d6c646ca23fd3fbc0
Former-commit-id: d0c008ca0887b9a552312eaa9acfad1ab2788b02
Former-commit-id: d41d1e7848f8d4c495926de44477e59afd196cf8
Former-commit-id: ce98a3bb1e9fac3f3e5df4ee03a071086ca7fded
2018-08-24 10:01:27 +00:00
rongxingsun
bc2027da0d axios封装
axios封装


Former-commit-id: 4dc0646a8509fe9cb6c5218e9dfc864b0af59143 [formerly eaee9b788f359a10ad0b8b199dcdd8c82765855f] [formerly 4dc0646a8509fe9cb6c5218e9dfc864b0af59143 [formerly eaee9b788f359a10ad0b8b199dcdd8c82765855f] [formerly 4dc0646a8509fe9cb6c5218e9dfc864b0af59143 [formerly eaee9b788f359a10ad0b8b199dcdd8c82765855f] [formerly eaee9b788f359a10ad0b8b199dcdd8c82765855f [formerly 0dad01580037e9ada6f7f9201eab7e28bafbadd4 [formerly 97a660059b807afdf8c0c518d4f40be4ce7eceec]]]]]
Former-commit-id: 95e753d1626ce41c1465bac635687ce5989877a5
Former-commit-id: 2e567e9e2bb7d07e9cf52dbfe29b140c24c76b48
Former-commit-id: 37e5cef6e554af37fc7d55785552160ff086c03d [formerly 14edcd31bc67642337f8eddf2ec7cbdec23ecc2c]
Former-commit-id: 08a71cba6653878d9accae5a7ecfcf1122d3515a
Former-commit-id: a1731726720512ae8a5a7fd5973f4c90a62ac448
Former-commit-id: 3838dfd576136f0ac217d9a97d631f9a88191d31
Former-commit-id: fa2416a4c270dce89a33e0486569374c5c7b6a63
Former-commit-id: b03e226c26ea5495e1d7d6a2206b89c8f4e17815
2018-08-24 17:05:32 +08:00
liyang
5df0073b02 Merge branch 'hotfix/add_doc_url2' into develop
Former-commit-id: bbef5b39912f154725f4ee9754384366ea9d6f6e [formerly bbef5b39912f154725f4ee9754384366ea9d6f6e [formerly bbef5b39912f154725f4ee9754384366ea9d6f6e [formerly bbef5b39912f154725f4ee9754384366ea9d6f6e [formerly af886a37469f70a85a2b2dee0a59a07704236d17 [formerly c606e9d64277bdebf7e87633fe9688ba06ccaf15]]]]]
Former-commit-id: e8606facd9dbd24ce82d8027a4654b7b7180633c
Former-commit-id: d1df7b87b188ee4bda8a13ad10dd1819df07297f
Former-commit-id: d6404fd94e9e48a967bebc70a3e1cf7140f34e4b [formerly 44eae1905dde1bc491fff12d47f70892a1bd0a1b]
Former-commit-id: 58bd9910b74b1c0da00d68b7ff2d843916d16b2f
Former-commit-id: ff92261fdf13fe7c6da74a2d27e3828a7db4a9b0
Former-commit-id: 5999ea7f9e5fbba5cc44863140867d5da99ced6c
Former-commit-id: c361073f8a8987a4bf175977c607f735e896a08e
Former-commit-id: 697908a9e6609d26b5e7aeeab8a87c648bb63f4a
2018-08-23 08:38:05 +08:00
liyang
2277a764e5 Merge branch 'hotfix/add_doc_url2'
Former-commit-id: 86ce305621a65a85eb01d5c60665e3a5cca1db67 [formerly 86ce305621a65a85eb01d5c60665e3a5cca1db67 [formerly 86ce305621a65a85eb01d5c60665e3a5cca1db67 [formerly 86ce305621a65a85eb01d5c60665e3a5cca1db67 [formerly 8f3e86da11d3f20f2ecb7c63107ee97c73ca6058 [formerly 028a93d83e2245b43fb6b7218712d1647bfe1822]]]]]
Former-commit-id: 848678ce50400907d50601f783f156ed7eb144f8
Former-commit-id: 0f9174b23bd595dd552f40593071553d491fde72
Former-commit-id: 9625f73c639302c00de6b0072f28da44caf42463 [formerly 2c220290081e8da1e9f7bcb61f22b3066473f93b]
Former-commit-id: 63ad849308908db5f7804af264f920d3b9cc00aa
Former-commit-id: 15b4862fccb75715a73811099039902803882cda
Former-commit-id: 71c75227d08f9effb978e55eebce883390bba58c
Former-commit-id: 6424515b6c794da094a1948f4cde57d6f8bde7b3
Former-commit-id: f1ea09716c1ed030515962b08504e5972cd30283
2018-08-23 08:38:05 +08:00
liyang
ad42e63596 更新文档地址
Former-commit-id: 4137f480abbafb30b042aa6c22bdf65eb262076c [formerly 77bbdb1c240c6923e5068c4c9e61996b9550de05] [formerly 4137f480abbafb30b042aa6c22bdf65eb262076c [formerly 77bbdb1c240c6923e5068c4c9e61996b9550de05] [formerly 4137f480abbafb30b042aa6c22bdf65eb262076c [formerly 77bbdb1c240c6923e5068c4c9e61996b9550de05] [formerly 77bbdb1c240c6923e5068c4c9e61996b9550de05 [formerly 12daffb58a923498833c5fca09de792678b175b3 [formerly 5cb54b7121fc0a4c8c77aa38df2d1633adf9532c]]]]]
Former-commit-id: a74369eb2392e1d6ea02a435b06d1bdd8304fa0d
Former-commit-id: 77371d307e6cd49b4c18d1bab0943cd7e67047ea
Former-commit-id: de489644e77e5948db9df9fea279ac1ba12b021c [formerly 204feb9ec86fb13ca6c7af4a2242f72ce7350d72]
Former-commit-id: db5c30d31c859e4ab4ceaff9b146b2e67827b0c9
Former-commit-id: 3092dd0c1d6c449dcb150b1010c4452840d1d795
Former-commit-id: aaa367b2c8b26551fcb642677f96d2d9acb9f28d
Former-commit-id: 3ba07266e1c2171c9c575d2e4de211d992ff609f
Former-commit-id: dae3a815ec27a509186ee88225732ec7bcb35b87
2018-08-23 08:37:46 +08:00
liyang
732a71c149 Merge branch 'hotfix/增加备用文档地址' into develop
Former-commit-id: 0f292ebe74bbc0767729fa4b6e985c7b7271d196 [formerly 0f292ebe74bbc0767729fa4b6e985c7b7271d196 [formerly 0f292ebe74bbc0767729fa4b6e985c7b7271d196 [formerly 0f292ebe74bbc0767729fa4b6e985c7b7271d196 [formerly f0b4a9dda8acd8d0c8e3c59670af0572d3b7cfd6 [formerly 5135eb6be044d8603bb917afc832889bc99c4e6e]]]]]
Former-commit-id: 00303c4bdf927bc3b597f5629985a328269087d0
Former-commit-id: 687aa0b6dcf4e9964412a4fc70b0137a0078fd74
Former-commit-id: 82cc6879f9f3238c0f32e88c459863a8f09fc839 [formerly 58e0cc58b018b087684e682ff9fc740164b16805]
Former-commit-id: f062060bea1f0cc26c1237102ca45007f91f4eb8
Former-commit-id: 6ad7a2b784eaba063563f5d400f413d34844e3a5
Former-commit-id: 1d572303f19ec911283ba4756b028240106c995d
Former-commit-id: abb82494b11fb0615a40e644dbb7f40dd0777617
Former-commit-id: d86e59fa4538f5dcc04865215e6ccd31f2d08b5a
2018-08-23 01:37:17 +08:00
liyang
4ada51adb0 Merge branch 'hotfix/增加备用文档地址'
Former-commit-id: a7ff5b314766d515ed65f9364062f458973f712a [formerly a7ff5b314766d515ed65f9364062f458973f712a [formerly a7ff5b314766d515ed65f9364062f458973f712a [formerly a7ff5b314766d515ed65f9364062f458973f712a [formerly 1f5ca73781a6302f26c047838ab23d8c1d5a2095 [formerly b6f86d4faf58283e83c72160cba2b1560fc72b61]]]]]
Former-commit-id: 00053c33e7c8f24018e515062861e4ec7a055641
Former-commit-id: 4b24c7d1eda6ded980fbb6381eec0e42e4ed7a11
Former-commit-id: 4ca57bed66d383b8c083efe24ee378321aef071b [formerly cae7eef20c1b49d81b4bd22d847ca5a46fb5c5e6]
Former-commit-id: 957654739040b773f5f2f4d8768ab936288e7a54
Former-commit-id: 738e1b15efc3f77fdd51063beb08d17746a7acf8
Former-commit-id: 1afeac5e9a402037c8de14bf7c0ce899c029e822
Former-commit-id: 9f3a1c829a057ddc04087d491c904a3211a8a471
Former-commit-id: 9ccda8842a68074a0931a04618c360c0ee759614
2018-08-23 01:37:17 +08:00
liyang
ec0f3b82ab 更新 readme
Former-commit-id: 122646ec18f05b99c3a73eeb2401e82042434511 [formerly 122646ec18f05b99c3a73eeb2401e82042434511 [formerly 122646ec18f05b99c3a73eeb2401e82042434511 [formerly 122646ec18f05b99c3a73eeb2401e82042434511 [formerly 95a8314e293b0661c22adb07659f7ff95124e7e4 [formerly 5076381c1504ba15666efab521dab5bcac3112df]]]]]
Former-commit-id: fe4ef29d8d09a71eba92560f077454ef918c3fd9
Former-commit-id: f48baef30883c66a66e417dd2b456205897c9854
Former-commit-id: d759687998f1844c0cdc73a0824b19ed433e9b96 [formerly 1a6228d68d169291eb275237fc3dd68c446c6d50]
Former-commit-id: cd268b52692c92f27112ddcd84e1c6ba0b3ec52f
Former-commit-id: 761739fa726312f294e5c1cffd42119c0b827a29
Former-commit-id: d8fb2b4290ae6392a437bbbe3e639ac3a09e8aba
Former-commit-id: 7d858591964bac1b47e9a9d4eea9c7da897c7ad1
Former-commit-id: 6996f93b49d50d4fd73d54e4fd080457fbc4e5e3
2018-08-23 01:37:04 +08:00
liyang
07aca6ceed Merge branch 'release/v1.2.1'
Former-commit-id: 68b748d899564a26d053003b834353327b9ce71d [formerly 68b748d899564a26d053003b834353327b9ce71d [formerly 68b748d899564a26d053003b834353327b9ce71d [formerly 68b748d899564a26d053003b834353327b9ce71d [formerly 1ac2ac6c7acd290ef48845ab3df699d7aeff3da9 [formerly 74812f1a9d568992e7ac8ea838bdf2079868c8ce]]]]]
Former-commit-id: d0fd974412d21b44a6958cd3cfaf9a34b360aacf
Former-commit-id: 8171890f1515be59f3425fb853e72110c32c61d4
Former-commit-id: 782c8889f761456cd2b8216fa7fd28dad0122eb3 [formerly d2113bcd4f54eca1662576a199e5ab891d37eeac]
Former-commit-id: 81800260abcc627d348be81003320e22365ef9df
Former-commit-id: 56c704859e25863e33c10b62d60bae015e82a7a0
Former-commit-id: 97532ea3927ca30252976c56e416f16467b58856
Former-commit-id: 755bde97549c07f9649133871bab7212f19990e1
Former-commit-id: 664fa8a592d6aef8973d2f7cdeb27b7ec2a96773
2018-08-23 01:35:02 +08:00
liyang
e899f965f4 更新文档
Former-commit-id: 26b6bb4573076d1c1399fbef8f569384159fabf3 [formerly 26b6bb4573076d1c1399fbef8f569384159fabf3 [formerly 26b6bb4573076d1c1399fbef8f569384159fabf3 [formerly 26b6bb4573076d1c1399fbef8f569384159fabf3 [formerly 6f809525b3af2af8d5baa6867a22beb70284e51f [formerly ace0ebbede89aa18ddf98540e3378799e6024374]]]]]
Former-commit-id: 2005c6288c0051a3cc54c28556df26026197c1e3
Former-commit-id: ac38d93d2f3d4606789a96f6d498ce831230c00f
Former-commit-id: 3467dfc30056d668e59a7017c92f49d59b7873c1 [formerly c93566c926de46b1262fedd54444aa3067b7af32]
Former-commit-id: c232696614928e6f5e2b5de419aeab8326b8b64c
Former-commit-id: 4d747f7e25dd274167b60ef33ebfb36badb174a1
Former-commit-id: 370c67dde80932fad02113b8e1d4fc8c54b64c57
Former-commit-id: cd57afa59768d7519f4809c386a260c390e77e69
Former-commit-id: 4dd1e3f35b35b0f1d5a0c81fcaf59aac3ae6b25d
2018-08-23 01:31:17 +08:00
liyang
2a8e20e9ed doc update
Former-commit-id: fa84c200e2ca76acf1986544c1381b0324a1385a [formerly fa84c200e2ca76acf1986544c1381b0324a1385a [formerly fa84c200e2ca76acf1986544c1381b0324a1385a [formerly fa84c200e2ca76acf1986544c1381b0324a1385a [formerly bc24974d8d62c41a9b55d448b66ce08f65a82fa6 [formerly e9788a2fd218ff3c34b80d4de331f0a0c6befed8]]]]]
Former-commit-id: 25a2bcf3e309173162ac649d724694bfde900484
Former-commit-id: 238df5486c330cbbf7f293868c1baefda5da9983
Former-commit-id: 847b0887bf9957f67525d56865084fbbfb52d895 [formerly ef5429925f651a0ce180ee41a744f8a005bb2059]
Former-commit-id: 5edfb067b270f7a8db7d6945bb2aa624450e3827
Former-commit-id: b91de751059fb998b257512afeb929dcb607ded3
Former-commit-id: 792801cdb1ed60a5a15538815c1820e174994c13
Former-commit-id: c26e57c2dc81178efcb94c6e4da34aa3ba63a237
Former-commit-id: c5dc867f945818ef8dff7689ef8f3879e19c12fe
2018-08-22 22:44:54 +08:00
liyang
a03b5a6c40 基本文件创建
Former-commit-id: 6c81510ba7f2b764f260a2d83a206c6114eb8924 [formerly 6c81510ba7f2b764f260a2d83a206c6114eb8924 [formerly 6c81510ba7f2b764f260a2d83a206c6114eb8924 [formerly 6c81510ba7f2b764f260a2d83a206c6114eb8924 [formerly da3bffe6cb5f4c8e5460ffff8b2d24912a1eca6a [formerly 74f20da195f1bba4e8ba50ceb4760bc92d85de56]]]]]
Former-commit-id: 88b3d286a981b43de86cc56b968bd290abf3e1bc
Former-commit-id: 84a7018334067c21dca398c3d791b517e4e07882
Former-commit-id: 85c1692d38095029c67a788ba353f842e4709f57 [formerly 0ef458e86faef7189e6f1264f2621fd7f3cef49c]
Former-commit-id: 65c90339852c903c2dee65ccdf1d098e30c25c0c
Former-commit-id: 325a0f780d7cd68d0fe8da378bde8857524dbb8c
Former-commit-id: dd5c0c22f00bff0bfc44e8a9819d2bfc0a229a9c
Former-commit-id: 82d946c1130070a54ccaad40c59a86f832f36a68
Former-commit-id: 8911cee5b21115d285cc0fb9b71b2b525fba4bb0
2018-08-22 19:41:00 +08:00
liyang
baed2cd323 Merge branch 'hotfix/修复版本号'
Former-commit-id: e38a051e5026291bf166fd6aa246a352260a9be5 [formerly e38a051e5026291bf166fd6aa246a352260a9be5 [formerly e38a051e5026291bf166fd6aa246a352260a9be5 [formerly e38a051e5026291bf166fd6aa246a352260a9be5 [formerly f104c36a01b59afc2b7e180f649fdedb2b0b19e7 [formerly 3a3edb00595505ae8f320c75791e434da5ac6649]]]]]
Former-commit-id: 53250e7e9ada08d753794f20017629ae5b79db93
Former-commit-id: af2c6d41389ad0228510b0e7ab59f752dc047c55
Former-commit-id: 7b97d7225b3240b2276f82f36b1c8a37697a57af [formerly 313e6f39ee63bd6c8514ff0f9dec8fd6892833f0]
Former-commit-id: 1abf502b8afed2f34614b4ead3b9225a9da3f415
Former-commit-id: 9e8e9020f6192b0ead3f493d1bce771937193586
Former-commit-id: cf4e63369a7ea930d0d15b2e395b404af9fb7f54
Former-commit-id: 321da3c996c909900dd33e537bcbb76b9a848051
Former-commit-id: 0dfba6ee726f323a90a45611e980f590badeb3a9
2018-08-22 14:35:00 +08:00
liyang
80ec47a092 Merge branch 'hotfix/修复版本号' into develop
Former-commit-id: 96f4759c5e12ff6447b65cf9c9a68e79f48759e9 [formerly 96f4759c5e12ff6447b65cf9c9a68e79f48759e9 [formerly 96f4759c5e12ff6447b65cf9c9a68e79f48759e9 [formerly 96f4759c5e12ff6447b65cf9c9a68e79f48759e9 [formerly 4c28d4bcae9c3d904a68d8b3d1c276cde814c062 [formerly a1a6e740fe2df4fbe8817fd74ef1b0481cfd9a5f]]]]]
Former-commit-id: e320a1e43ca07f13beb0babceffbd4f1c0f026bd
Former-commit-id: 419b12e2a162f9c42b3d4ca56fda5e879a4009fb
Former-commit-id: c8ee0649c21ff3f975e44f1a5018937f8275bed7 [formerly 25bd18665176fef230b9fefb865d456f29f24ed6]
Former-commit-id: a738a065b496a0a06928ffac94864f6eb0b462f1
Former-commit-id: 853fe9ca467ef4850489dbafe0256f9b38b11a40
Former-commit-id: c3ac054bef6a1326dae6ae9d35e8a0b563d922cb
Former-commit-id: 1ad21515c9aa4058b9338f989c781edff4ef51b7
Former-commit-id: 5a0b86c9a93d1c461c366279e6bd292a07e723ee
2018-08-22 14:35:00 +08:00
liyang
848399afe2 修复版本号
Former-commit-id: 5c3dbc478a7c34621428fef569a5caa7cb02b401 [formerly 5c3dbc478a7c34621428fef569a5caa7cb02b401 [formerly 5c3dbc478a7c34621428fef569a5caa7cb02b401 [formerly 5c3dbc478a7c34621428fef569a5caa7cb02b401 [formerly 8cc3f88dbbf9f4439021b46cd79db6d130ffaf9e [formerly aa38ba9b2bbbbacdd265e627a270f1d7698bbfdb]]]]]
Former-commit-id: cef1dd593341c654d11fe42712c1d29d0c412b5e
Former-commit-id: f48d18a1952442a9612fc9d310b8f05e91d74f65
Former-commit-id: 867044f36a9fe847d0f19098cacd61fe454d3844 [formerly 80582e7b8e77ec80797686c689161698d6a29b76]
Former-commit-id: 38cc9addbf05ddc1e491c76a6af2dd7a880bf08b
Former-commit-id: db02101ad352bf382f3dfb37894cc1f0b2e3cb00
Former-commit-id: d2a17a216d66bc5ac7e61b5f2f2f1cc630f06316
Former-commit-id: c2658e34a2499265a475f77f93ea3e665b2687d4
Former-commit-id: 58b73948497ccf446dc392f4807b77d4dade1ce2
2018-08-22 14:34:41 +08:00
liyang
3ed5bbdab0 Merge branch 'release/v1.2.0'
Former-commit-id: 914e3bc601f1b448526a9201d8057fdcf5b65374 [formerly 914e3bc601f1b448526a9201d8057fdcf5b65374 [formerly 914e3bc601f1b448526a9201d8057fdcf5b65374 [formerly 914e3bc601f1b448526a9201d8057fdcf5b65374 [formerly f1da0d3525c03c8ad764fb7f5e958903878ec56f [formerly 25d81c4f3740c1347fe0c46c2f0a74c469013343]]]]]
Former-commit-id: d926fb259f7ab85e0a26087810c5c4ba8a1d085b
Former-commit-id: 5900cfbb141514c620f13b19fea8ec2fbaab1481
Former-commit-id: b57d5aa85cc5f036c1e2bea6a6d20a7bb8dbeeb3 [formerly 845b5a8f1beb44be3b13220a2f9a1035266a82c2]
Former-commit-id: 2f4427e07ad172504b7d4dc74bff6e1af6f7faee
Former-commit-id: db529685a6633e8f258f8b2498f989fa8ce7210b
Former-commit-id: 843487bf2e0dfaa1f0c0d622e50f40a6b9cda014
Former-commit-id: 24205b8e54bf1540f36a89762dbaf4790892f93b
Former-commit-id: e839f078eb142baca0b026ed600b9f3bdc764b41
2018-08-22 14:33:31 +08:00
liyang
fba9cf7b05 完善文档
Former-commit-id: 88c59a52be74910b074eaf6815ff1e3dba78b83e [formerly 88c59a52be74910b074eaf6815ff1e3dba78b83e [formerly 88c59a52be74910b074eaf6815ff1e3dba78b83e [formerly 88c59a52be74910b074eaf6815ff1e3dba78b83e [formerly 88e888b6bb5163c99cdc7fc07aff08cd359e613f [formerly 13c830b99763ffdc4dd8e0b8cb30173bfa9f43fe]]]]]
Former-commit-id: d65b5298fec86374a80428af05c5c903937b2c46
Former-commit-id: 372052b1cb81ce1751ab945e7918cef529ef4dc8
Former-commit-id: f64f4a8e9afecd0e0cbed9b7bb96412f0d03c251 [formerly a566310925705a0c450670efe802db828bfc20d0]
Former-commit-id: 2e026648cd1aa0bbdfb2b7135790a660a26a4d1e
Former-commit-id: 93e864620546e0f8f5c96174df734b2c741451d7
Former-commit-id: 0f4a8ad087b31546c2bb8c0e81fa1ee2ccaed2d7
Former-commit-id: 33742dca8aa73fd1fddbea3e53e8738ab3f592ee
Former-commit-id: 4c6cb7bf0dddf4d765b0c2700ecfe25d6d01bded
2018-08-22 14:32:29 +08:00
liyang
20318ec98a Merge branch 'feature/菜单图标增加svg支持' into develop
Former-commit-id: 8950fc28d8e89b97b99491d8a21c99816b3ed0e0 [formerly 8950fc28d8e89b97b99491d8a21c99816b3ed0e0 [formerly 8950fc28d8e89b97b99491d8a21c99816b3ed0e0 [formerly 8950fc28d8e89b97b99491d8a21c99816b3ed0e0 [formerly c54b7d4f97b4875aa96acb1e6a13f34828267a4e [formerly 3a41d697006c4084178c73d96f6ca944922041d8]]]]]
Former-commit-id: 9a26037bc3c3b00d7e592859f56fe4959cf1b363
Former-commit-id: 6e81c8c7bfa6798be733637e8f433148ab7ab849
Former-commit-id: 05f48b7b17731944d6ff049067be03be2d056903 [formerly 9ebba098e3836608f2551cb63cd0b055191d4522]
Former-commit-id: 94033eee67685682225fa41cb7596886f4244538
Former-commit-id: c9dad57bfe34b8e7d90ff338e204d6277c8906a3
Former-commit-id: 75159715247cb084e2c938907a968c892dfe7604
Former-commit-id: 09bb7384021149a35002f2892b5e8946a0f1ecec
Former-commit-id: cb5233fbbd4f5aec7dd2d6bbd38ed23d6cca6fa2
2018-08-22 14:10:14 +08:00
liyang
9b832e04c3 更新文档
Former-commit-id: 93233103cbfba5a5a4791cfb4613d8e1a04918d8 [formerly 93233103cbfba5a5a4791cfb4613d8e1a04918d8 [formerly 93233103cbfba5a5a4791cfb4613d8e1a04918d8 [formerly 93233103cbfba5a5a4791cfb4613d8e1a04918d8 [formerly e2d0edf6cbbae0b8c6df466e169fc07c2115f16f [formerly 1f111fb9bcaa130bea1e3307832fbeaf93d93d76]]]]]
Former-commit-id: 25f816ca7fed18c5c19cd865092ee4f4fda3689d
Former-commit-id: c082440f69beaf17b1f4a83a4e8c109c69e91241
Former-commit-id: 6b8ee78a4114a70c7c57a4e9227e41c947c8966e [formerly 2b3282b5cbb921c16177cc26a7b811e60f852cb2]
Former-commit-id: d4a97ed7346ccc5224bd764f388ddf83d1964d06
Former-commit-id: 7279232df2faaf0dd05545d71b7a9e9e35a3a9a7
Former-commit-id: 2ae588e94f3e98a40556a28ee0345fbda7558b9c
Former-commit-id: 3e3b6f53240cfc31380bf92dbbbb2648365dc79f
Former-commit-id: b9a36d5b5a890fd8395df17b9c1832554f1be6ed
2018-08-22 14:09:55 +08:00
liyang
f382007a9c 菜单项目支持 svg 图标
Former-commit-id: b3702e427c3b2d234cbdbb7f77464dfe208f20fb [formerly b3702e427c3b2d234cbdbb7f77464dfe208f20fb [formerly b3702e427c3b2d234cbdbb7f77464dfe208f20fb [formerly b3702e427c3b2d234cbdbb7f77464dfe208f20fb [formerly f9b19e9cdf0ec9d5c42aee32575adc01db8ab09e [formerly 4cf6aea5284279fdfb0502f5b0c7c5bb854827e6]]]]]
Former-commit-id: d0d179e1590a38e5d5d375e6c37377b3b631e100
Former-commit-id: 2f0d716b8d8b712e722caa106af55eecacd13789
Former-commit-id: 4e12f33311ea1c7d9fe1561206e6617c11911703 [formerly 875af1eb6cdbbe7023bb19d0badec4c0e3a7e9f5]
Former-commit-id: 496ddd4334d5496b8562cd94dd63b359852b9ffd
Former-commit-id: 469b1d7d4ab423d6308e6b7208d8c2cfc9872224
Former-commit-id: 2761c79dbaab3c873afcde8e093e0b9b32d54a68
Former-commit-id: 0986feb8b02ed0c87a370f8925f8c0d111620c81
Former-commit-id: 30d6e70ee15350b3745df49b58161f700822511b
2018-08-22 14:03:33 +08:00
liyang
6a49189db5 更改图标名称
Former-commit-id: 311e0ce11f674a4c965351588a2dca7064559cbd [formerly 311e0ce11f674a4c965351588a2dca7064559cbd [formerly 311e0ce11f674a4c965351588a2dca7064559cbd [formerly 311e0ce11f674a4c965351588a2dca7064559cbd [formerly d4869ce64d8c8b56e2fd9ec5310367fe42dbe8d4 [formerly e50fdbb459a90a790feeb0aaac3781cc852239a7]]]]]
Former-commit-id: 3ce88a78957ad0707be6f007b3c42dd4475c3d53
Former-commit-id: 4f51402f43676d80434d0fde86218a0caacedfca
Former-commit-id: 00a87dd29d7ef858a2c4a378aeb13a5f09c56a23 [formerly 66bba13e22cf084bfe490b9876f809c96754291a]
Former-commit-id: 9407c5d2a2f8b90c89929e097a3a3b7ca311c85b
Former-commit-id: 119b581be98072b93e13a5addc5ec93757031b83
Former-commit-id: 273b05ef6cefd95d6a8dca707053a7062d0dab05
Former-commit-id: 75a8452c3c04af7987cd4c5055ce84c7e629dda2
Former-commit-id: 700dd4adc148308ebebe8edc82fbb5799a4b90a2
2018-08-22 11:40:41 +08:00
liyang
e87b6acdd1 D2HelpBtn
Former-commit-id: a7dd1be72ac958a0c2f401782a239102b443c3ff [formerly a7dd1be72ac958a0c2f401782a239102b443c3ff [formerly a7dd1be72ac958a0c2f401782a239102b443c3ff [formerly a7dd1be72ac958a0c2f401782a239102b443c3ff [formerly 436ef20759522cbb16f83d891ee0f193e4911a37 [formerly 73d3b31caf5fd235cdee4ae6fdc8220998ced0ff]]]]]
Former-commit-id: b9731997ded1b64024760e8322736b18f08a9409
Former-commit-id: d68af5e74ae619a1b2c254e6804399ca52ffed52
Former-commit-id: a682b49f033f6e6ed17ae153e2b777e83823583c [formerly 5c55cf3b74b5061230aaefbe234add07a98c079e]
Former-commit-id: 2961ccf1b0e6d89c1cac942e001c30710441a402
Former-commit-id: 40489856153542befc7da3cc24dbf7c3f44d99a5
Former-commit-id: 0675b50418bb028ff404558d20a2b74aa85f8f46
Former-commit-id: 9e9851f277d1c9ea7c3f128e356626d654dde90b
Former-commit-id: 42d1dee45b6caa8088caf118997b53f078b5d681
2018-08-22 11:24:36 +08:00
liyang
2d17d09d61 D2ErrorLogList 放在了 layout 文件夹内
Former-commit-id: e7c5073e750de6659873bf827575e67d60fda6cc [formerly e7c5073e750de6659873bf827575e67d60fda6cc [formerly e7c5073e750de6659873bf827575e67d60fda6cc [formerly e7c5073e750de6659873bf827575e67d60fda6cc [formerly 73408af989e90a4f3fb9d7dcf87115d115784a85 [formerly 25c75956a932431724fc33b1076e72edd3bad64a]]]]]
Former-commit-id: efb244c3b1729ce3ce80fefcc2116b5682c544f8
Former-commit-id: 33cbec8cac3b464ba50691a0301816a14c92c507
Former-commit-id: 0d402138f2324a28d52f685049c3299197c2292d [formerly 715be3a1af8c720d3102a7556dd709dbb106f102]
Former-commit-id: 574cfa22abbb883db5a1bb9d83abbb59ccc15d21
Former-commit-id: 0f2ed4796206d30f827600b14603972a9a6db594
Former-commit-id: 1d1543d63a76cff518a8a6122b489395c5de8052
Former-commit-id: 10202d438c9adfa300ba3603895bab17f17d2372
Former-commit-id: 5a4bc16655a86dabed9a235699ed945466895032
2018-08-22 11:12:52 +08:00
liyang
42fd3dcb9c 调整了代码位置
Former-commit-id: 549c5b1ad8b4f9f8b376385b5b972925fd8e170a [formerly 549c5b1ad8b4f9f8b376385b5b972925fd8e170a [formerly 549c5b1ad8b4f9f8b376385b5b972925fd8e170a [formerly 549c5b1ad8b4f9f8b376385b5b972925fd8e170a [formerly e0c95651b296a45cbd77271a0441709eb50c8e9c [formerly e3747847b1b699310983d3fd207af37960bc4290]]]]]
Former-commit-id: 509bd3a6aa5704448a8e64132abbbb838dd50020
Former-commit-id: e365f43ff16f03b83dc438db063c0f8dc5b16cfa
Former-commit-id: 83be7d968cf08bcdb75a54652cc78d64b09c87af [formerly d71e13fb77cc6d046dcb21540fc702027f19b119]
Former-commit-id: 7ee3bec15e4fb50bbdc314556d6da88167f73d82
Former-commit-id: da6d9954f9ef3d5f5918296722ddabbb97748bd5
Former-commit-id: d1627a5c6f5a132be24330cba74fc805162675b6
Former-commit-id: d238a128de69e6d4751aa5c91e77680cb6d8872a
Former-commit-id: b57be3815b963fbd1e0cc5803bda59d9251348ce
2018-08-22 10:57:59 +08:00
liyang
70059884c7 actions.checkUpdate
Former-commit-id: b21e5b3f80ddc4d65422b3655ab77e756dd27509 [formerly b21e5b3f80ddc4d65422b3655ab77e756dd27509 [formerly b21e5b3f80ddc4d65422b3655ab77e756dd27509 [formerly b21e5b3f80ddc4d65422b3655ab77e756dd27509 [formerly 25b6a52afe46b14406da2640e046c4c52cad27f7 [formerly 1f6e9e0f44ca8c2d7d98edf99df1e3ba873f19b7]]]]]
Former-commit-id: f98d3f32b680142903da84bb518f3c446e163736
Former-commit-id: dda12f419b13dfe2e1b29eace4177bfed2ae05cf
Former-commit-id: c069967e556925152ab128d9f6349787e498aa59 [formerly 0d065445943c65f295fc4750660b0c5a57e88724]
Former-commit-id: 2fec81e2651cd30dcf5335c4c0799f674c76a17a
Former-commit-id: 548a3b014394bddf87eb7d377f54be6c98de446b
Former-commit-id: 40a5dbda7deb0f0a851dc44a2c57a37af7d152e2
Former-commit-id: 4780fa67c8c242e75e7bb28e28a558482b81802e
Former-commit-id: 8996939f52a99e7ee99073c3eafefbe412ca8e3d
2018-08-22 10:55:23 +08:00
liyang
c4ff9e1e8e plugin/d2admin 注册顺序修改为和文件顺序一致
Former-commit-id: d8f078d6528d7c80c1e07ca35b651b376ae549fd [formerly d8f078d6528d7c80c1e07ca35b651b376ae549fd [formerly d8f078d6528d7c80c1e07ca35b651b376ae549fd [formerly d8f078d6528d7c80c1e07ca35b651b376ae549fd [formerly 25d8070695b8a58c3a63c3c6a7509625744e0648 [formerly d2080bbeb78259dcfa9d26183ef87041b4aa1afe]]]]]
Former-commit-id: b2f6631d1652c8b47fd695f6704a409c28d87b6b
Former-commit-id: 94f90b0e64b3baab3efbf901343b52d7a37cf188
Former-commit-id: faca69f6fe54a6f5a8231c9c3b6f4067ee344190 [formerly f843f0b213e6795117a1bce99c32c66fbb7b6da1]
Former-commit-id: e07722bc6fa5713c531cee53b93595ed344f4664
Former-commit-id: dc925b17f2a0897d9601c7cb20903b0fa9992d48
Former-commit-id: 7656ade3ced75024449694437bfaac6bc91a3dd4
Former-commit-id: 8028c47cea16553c8dda17a45c8712aa282d012f
Former-commit-id: 289e1f70c5a42bfcf322c9c1cfa971c412ff77ec
2018-08-22 10:48:00 +08:00
liyang
82697842b2 main.js 优化
Former-commit-id: 4cb1e9af0b08ebfbf97efd5e2e7a2cb819a332b9 [formerly 4cb1e9af0b08ebfbf97efd5e2e7a2cb819a332b9 [formerly 4cb1e9af0b08ebfbf97efd5e2e7a2cb819a332b9 [formerly 4cb1e9af0b08ebfbf97efd5e2e7a2cb819a332b9 [formerly e254bcf3cdf2b40e948a23b2370885a464905c0f [formerly 01d986b56c31f8aa8ee4e13e241b9ba426fe00b7]]]]]
Former-commit-id: 097fc55d7db9b7e3ce96ca23c951395212ea71be
Former-commit-id: 621fcd5324b359e14ecdcf88e64e1c3084cf43b8
Former-commit-id: 457be02fce559b89a8ecb74a91f90830df18a6ea [formerly 441f492cf8dbeb06ec5f07a02d7876ab61ed71f3]
Former-commit-id: dae57059054ebc568b9f3f7ca59efb0490f931d8
Former-commit-id: 10a164b8be9abec52e079112495712a6f0eda3c0
Former-commit-id: 843d70343d6ed0952e9cb6ff436279f2135d9698
Former-commit-id: d11cf0cc370bbdf1ff51bb3e61054c3cc0895570
Former-commit-id: 21392111c54dc42027d2180e5ea6d2f09f1fb750
2018-08-22 10:24:02 +08:00