From 86599f2027e5f6047b27e66170427cbc52a37156 Mon Sep 17 00:00:00 2001 From: QiuRunZe Date: Sun, 10 Nov 2019 23:13:24 +0800 Subject: [PATCH] tijiao --- Readme2.md | 92 +------------------ pom.xml | 2 +- .../com/geekq/miaosha/utils/MD5Utils.java | 2 +- src/main/resources/application.properties | 2 +- .../config/application-test.properties | 2 +- 5 files changed, 5 insertions(+), 95 deletions(-) diff --git a/Readme2.md b/Readme2.md index 55040e4..bf5ad27 100644 --- a/Readme2.md +++ b/Readme2.md @@ -1,91 +1 @@ -![LeetCode Animation All in One](https://upload-images.jianshu.io/upload_images/1940317-e837182a805cecce.png?imageMogr2/auto-orient/strip%7CimageView2/2/w/1240) - -[![Travis](https://img.shields.io/badge/language-C++-red.svg)](https://developer.apple.com/) -[![Travis](https://img.shields.io/badge/language-Java-yellow.svg)](https://developer.apple.com/) - - -[There is an English version of README here. just click it！](https://github.com/MisterBooo/LeetCodeAnimation/blob/master/README-En.md) - -我会尽力将LeetCode上所有的题目都用动画的形式演示出来，计划用3到4年时间去完成它，期待与你见证这一天！ - -文章最新首发于微信公众号 **五分钟学算法** ，您可以关注获取最新的文章。 - - - -## Problems - - -| ID | Problem | Article | Animation | -| --- | --- | :--- |:--- | -| 000 |十大经典排序算法 | [十大经典排序算法动画与解析，看我就够了！（配代码完全版）](https://mp.weixin.qq.com/s/vn3KiV-ez79FmbZ36SX9lg) | ![归并排序.gif](https://upload-images.jianshu.io/upload_images/1940317-92f62b62af03e233.gif?imageMogr2/auto-orient/strip)| -| 001 |两数之和 | [每天一算：Two Sum](https://mp.weixin.qq.com/s?__biz=MzUyNjQxNjYyMg==&mid=2247483740&idx=1&sn=1950545589ea9b86ee65fbb6be1f4290&chksm=fa0e6eddcd79e7cb542b7d4dc1304eead516994315fa4f52b575230f0f022c9e0a88ede3714e&scene=21#wechat_redirect) |![](https://bucket-1257126549.cos.ap-guangzhou.myqcloud.com/20181206161033.gif) | -| 002 |两个数字相加 | [图解LeetCode第 2 号问题：两个数字相加](https://mp.weixin.qq.com/s?__biz=MzUyNjQxNjYyMg==&mid=2247484231&idx=2&sn=6a9eb4fd0619c822e4dede69b8d841c8&chksm=fa0e6cc6cd79e5d0c03fffcd65b665fed62db9dca9c97771898f388ea292ce806bfd6eb908b5&token=934487935&lang=zh_CN#rd) |![](https://bucket-1257126549.cos.ap-guangzhou.myqcloud.com/20181210092831.gif)| -| 003 |无重复字符的最长子串| 每天一算：Longest Substring Without Repeating Characters|![](https://bucket-1257126549.cos.ap-guangzhou.myqcloud.com/20181210092855.gif)| -| 019| 删除链表的倒数第N个节点 |[每天一算：Remove Nth Node From End of List](http://mp.weixin.qq.com/s?__biz=MzUyNjQxNjYyMg==&mid=2247483821&idx=1&sn=11ecccab76cd53163e9dedb75effeb93&chksm=fa0e6e2ccd79e73ae9137c0d91b3533df4ea4ead4ad081834b8d91ff364c0d55c350ddcfa6c4&scene=21#wechat_redirect) |![](https://bucket-1257126549.cos.ap-guangzhou.myqcloud.com/20181206161058.gif)| -| 020|有效的括号 | [每天一算：Valid Parentheses](http://mp.weixin.qq.com/s?__biz=MzUyNjQxNjYyMg==&mid=2247483824&idx=1&sn=ab9362e125dc5e2b3ef1611cad9448c2&chksm=fa0e6e31cd79e727c6e1e0e3c467e193edb6ae841a41e5dc8eef39d0bf3141cc53f63b019cba&scene=21#wechat_redirect) |![](https://bucket-1257126549.cos.ap-guangzhou.myqcloud.com/20181206161106.gif)| -| 024| 两两交换链表中的节点 | [每天一算：Swap Nodes in Pairs](http://mp.weixin.qq.com/s?__biz=MzUyNjQxNjYyMg==&mid=2247483773&idx=1&sn=db6cf272df968cd6571eb0bb50ecc721&chksm=fa0e6efccd79e7ea26810d335e6ece9ac23b8e3ac31be00dbd534018737ccb3ef9a00f22aff3&scene=21#wechat_redirect) |![](https://bucket-1257126549.cos.ap-guangzhou.myqcloud.com/20181206161115.gif)| -| 026| 删除排序数组中的重复项| 每天一算：Remove Duplicates from Sorted Array |![](https://bucket-1257126549.cos.ap-guangzhou.myqcloud.com/20181206161124.gif)| -| 075| 颜色分类| [每天一算：Sort Colors](http://mp.weixin.qq.com/s?__biz=MzUyNjQxNjYyMg==&mid=2247483706&idx=1&sn=905f43c882a91b55fd169d812620f277&chksm=fa0e6ebbcd79e7ad8857b0dad9ad14dbaf17fe557ef56ba600cec26b2bb668df2e171431d74c&scene=21#wechat_redirect) |![](https://bucket-1257126549.cos.ap-guangzhou.myqcloud.com/20181206161136.gif)| -| 086| 分隔链表| [每天一算：Partition List](http://mp.weixin.qq.com/s?__biz=MzUyNjQxNjYyMg==&mid=2247483781&idx=1&sn=f31548ebbb2cf9ba56d979d3e51ddde2&chksm=fa0e6e04cd79e712d6cc7ff8e8b7631b7300ac0fa1a3e4c4e3b836de7a01fb5d0d6428a18bc4&scene=21#wechat_redirect) |![](https://bucket-1257126549.cos.ap-guangzhou.myqcloud.com/20181206161147.gif)| -|092 |反转链表 II | [每天一算：Reverse Linked List II](http://mp.weixin.qq.com/s?__biz=MzUyNjQxNjYyMg==&mid=2247483820&idx=1&sn=113e87b55c8ac8e22e9db00673798118&chksm=fa0e6e2dcd79e73b5835a262599b935783de3317a453bc0ed8df9fa5d1532785a085ea663e59&scene=21#wechat_redirect) |![](https://bucket-1257126549.cos.ap-guangzhou.myqcloud.com/20181206161156.gif)| -| 094|二叉树的中序遍历 | [每天一算：Binary Tree Inorder Traversal ](http://mp.weixin.qq.com/s?__biz=MzUyNjQxNjYyMg==&mid=2247483853&idx=1&sn=94cd4b4ee8dc2268290a72334c6af57b&chksm=fa0e6e4ccd79e75a41a6b78397b80cdfccda332823874475b516f997f89e786488599fc5cc1e&scene=21#wechat_redirect)|![](https://bucket-1257126549.cos.ap-guangzhou.myqcloud.com/20181206161208.gif)| -|102 |二叉树的层序遍历| [每天一算：Binary Tree Level Order Traveral](http://mp.weixin.qq.com/s?__biz=MzUyNjQxNjYyMg==&mid=2247483868&idx=1&sn=d50041789fcd13a75a2296f620b69d71&chksm=fa0e6e5dcd79e74b0030ac5129f10ec4ba87c98da63c5904affe9f06e06ecf28695c410d3ec7&scene=21#wechat_redirect)|![](https://bucket-1257126549.cos.ap-guangzhou.myqcloud.com/20181206161232.gif)| -|103 | 二叉树的锯齿形层次遍历| 每天一算：Binary Tree Zigzag Level Order Traversal|![](https://bucket-1257126549.cos.ap-guangzhou.myqcloud.com/20181210092922.gif)| -|107 | 二叉树的层次遍历 II | 每天一算： Binary Tree Level Order Traversal II|![](https://bucket-1257126549.cos.ap-guangzhou.myqcloud.com/20181210092949.gif)| -|144 | 二叉树的前序遍历| [每天一算：Binary Tree Preorder Traversal](http://mp.weixin.qq.com/s?__biz=MzUyNjQxNjYyMg==&mid=2247483843&idx=1&sn=994bf0d42dd9941a879a3a3ed500a4d6&chksm=fa0e6e42cd79e75472404eb5da7ee98f20d303efe230eb4f41efec57164630f555e7111e62ff&scene=21#wechat_redirect)|![](https://bucket-1257126549.cos.ap-guangzhou.myqcloud.com/20181207112441.gif)| -| 145| 二叉树的后序遍历 | [每天一算：Binary Tree Postorder Traversal](http://mp.weixin.qq.com/s?__biz=MzUyNjQxNjYyMg==&mid=2247483853&idx=1&sn=94cd4b4ee8dc2268290a72334c6af57b&chksm=fa0e6e4ccd79e75a41a6b78397b80cdfccda332823874475b516f997f89e786488599fc5cc1e&scene=21#wechat_redirect)|![](https://bucket-1257126549.cos.ap-guangzhou.myqcloud.com/20181206161255.gif)| -| 150| 逆波兰表达式求值 | [每天一算：Evaluate Reverse Polish Notation](http://mp.weixin.qq.com/s?__biz=MzUyNjQxNjYyMg==&mid=2247483834&idx=1&sn=27cbff99f10dfcdb56cb37c237d7f2bb&chksm=fa0e6e3bcd79e72dc430bf81aed9dde9bd01634239dcf7820d6befa881efd323d9d58d76d90d&scene=21#wechat_redirect) |![](https://bucket-1257126549.cos.ap-guangzhou.myqcloud.com/20181206161304.gif)| -| 167| 两数之和 II - 输入有序数组 | [每天一算：Two Sum II ](http://mp.weixin.qq.com/s?__biz=MzUyNjQxNjYyMg==&mid=2247483711&idx=1&sn=3afec74e9e9effa71dc0b22659e14b44&chksm=fa0e6ebecd79e7a84db7861c9b5dbccdc98aa9d9a6994dda49a37edeb729e8242ea6af8f20ad&scene=21#wechat_redirect)|![](https://bucket-1257126549.cos.ap-guangzhou.myqcloud.com/20181206161314.gif)| -|199 | 二叉树的右视图 | 每天一算：Binary Tree Right Side View |![](https://bucket-1257126549.cos.ap-guangzhou.myqcloud.com/20181206161328.gif)| -| 203| 移除链表元素 | [每天一算：Remove Linked List Elements](http://mp.weixin.qq.com/s?__biz=MzUyNjQxNjYyMg==&mid=2247483766&idx=1&sn=6721376a65680bf7cf9064cf7b1ae4ae&chksm=fa0e6ef7cd79e7e1665e60fe6ea3f2087bca518c1573bc4c4b9425573f98401bafc59542dca0&scene=21#wechat_redirect)|![](https://bucket-1257126549.cos.ap-guangzhou.myqcloud.com/20181206161338.gif)| -|206 | 反转链表 | 每天一算： Reverse Linked List Traversal|![](https://diycode.b0.upaiyun.com/photo/2018/0e0b3a4b1031c3bcf16bd1240ebc571a.gif)| -|209 | 长度最小的子数组 | 每天一算： Minimum Size Subarray Sum |![](https://bucket-1257126549.cos.ap-guangzhou.myqcloud.com/20181210093031.gif)| -| 219|存在重复元素 II |[每天一算：Contains Duplicate II ](http://mp.weixin.qq.com/s?__biz=MzUyNjQxNjYyMg==&mid=2247483755&idx=1&sn=2501b6ca09c43eaa9fba71a9bd1f5253&chksm=fa0e6eeacd79e7fc192c0a23cf90d98fe6f2c35f9e4f2d0f937ccba45a58cf23a0a9c49d35d5&scene=21#wechat_redirect)|![](https://bucket-1257126549.cos.ap-guangzhou.myqcloud.com/20181206161352.gif)| -|237| 删除链表中的节点 |每天一算：Delete Node in a Linked List|![](https://bucket-1257126549.cos.ap-guangzhou.myqcloud.com/20181206161400.gif) | -|283 |移动零 |[每天一算：Move Zeros](http://mp.weixin.qq.com/s?__biz=MzUyNjQxNjYyMg==&mid=2247483700&idx=1&sn=465f778d60e8560742feab5844d7cac5&chksm=fa0e6eb5cd79e7a357899d378edb532b498cd63e3ce9113f8ac74d397ce4b214ca5aa8198b7d&scene=21#wechat_redirect)|![](https://bucket-1257126549.cos.ap-guangzhou.myqcloud.com/20181206161421.gif)| -|328 |奇偶链表 | [每天一算：Odd Even Linked List](http://mp.weixin.qq.com/s?__biz=MzUyNjQxNjYyMg==&mid=2247483786&idx=1&sn=f7810950b34675e1c4420361faf5e361&chksm=fa0e6e0bcd79e71d2c6fc6a4a68b6ef7a17abc3dc9897548f8e44b51e9494f52c4cebbc4176e&scene=21#wechat_redirect) |![](https://diycode.b0.upaiyun.com/photo/2018/94e5c38540029690c93314b3d697caaf.gif)| -|344 | 反转字符串 |[每天一算：Reverse String](http://mp.weixin.qq.com/s?__biz=MzUyNjQxNjYyMg==&mid=2247483799&idx=1&sn=c2212c8963809e8d3392abeeb851dbfc&chksm=fa0e6e16cd79e7003c2d30b1a2bb4f23dc56df38e3efedd0ab2cfae291609280a832eabe67de&scene=21#wechat_redirect) |![](https://bucket-1257126549.cos.ap-guangzhou.myqcloud.com/20181211110918.gif)| -|349 | 两个数组的交集| [每天一算：Intersection of Two Arrays ](http://mp.weixin.qq.com/s?__biz=MzUyNjQxNjYyMg==&mid=2247483726&idx=1&sn=a887f6b983058d97c183dd300832ecbb&chksm=fa0e6ecfcd79e7d985587b543622c85aadc83a4d7a074135e1356fb4a0ebfd07e7af13467906&scene=21#wechat_redirect)|![](https://bucket-1257126549.cos.ap-guangzhou.myqcloud.com/20181206161441.gif)| -| 350| 两个数组的交集 II| [每天一算：Intersection of Two Arrays II ](http://mp.weixin.qq.com/s?__biz=MzUyNjQxNjYyMg==&mid=2247483733&idx=1&sn=946bd6de3251437dd77b43ecab056c82&chksm=fa0e6ed4cd79e7c2a439b5f1853bf5154a3438ed282c7ba5e94948780c426a1f1492c0b201c4&scene=21#wechat_redirect)|![](https://bucket-1257126549.cos.ap-guangzhou.myqcloud.com/20181206161729.gif)| -|447 | 回旋镖的数量 | [每日一算：Number of Boomerangs](http://mp.weixin.qq.com/s?__biz=MzUyNjQxNjYyMg==&mid=2247483747&idx=1&sn=7774eee0b252b311257134f6a52c4e2d&chksm=fa0e6ee2cd79e7f44858c46c3d04859ced9073dbb9de95ce7ee0bcc131e613862ddfd9a6f158&scene=21#wechat_redirect)|![](https://bucket-1257126549.cos.ap-guangzhou.myqcloud.com/20181206161738.gif)| -|454 |四数相加 II | 每日一算：4Sum II|![](https://bucket-1257126549.cos.ap-guangzhou.myqcloud.com/20181206161751.gif)| - - -如果文章链接无法点击，说明文章还未发布，敬请期待：） - -为了让文章加载动画更快，录制动画时进行了压缩，有可能会模糊，如果你想获取上述文章的所有超清动画，请在公众号 **五分钟学算法** 内回复 **MP4** 进行获取。 - -## 代码来源声明 -本仓库代码如无特殊说明，全部来源于此仓库 - -[Play-Leetcode](https://github.com/liuyubobobo/Play-Leetcode) - -## 补充 -该仓库保持随时更新。 - -2018-12-07 说明： - -为了更好的做好LeetCode动画，笔者正在努力的学习更多的数据结构与算法。 - -笔者目前正在写数据结构的文章与动画，将《动画图解数据结构》系列文章写完后将继续更新此仓库。 - -邮箱：278166530@qq.com - -喜欢就star❤️一下吧！ - - -## 关注我 -| 二维码 | 说明 | -| --- | --- | -|![](https://diycode.b0.upaiyun.com/photo/2018/6ac660d9a4a36db44c404246ba858862.jpg) | 关注公众号 **五分钟学算法** 获取更多数据结构与动画相关的内容| -| ![支付宝](https://upload-images.jianshu.io/upload_images/1940317-b8d0ceb7663b14dd.jpg?imageMogr2/auto-orient/strip%7CimageView2/2/w/1240) | 如果你不嫌麻烦，可以用支付宝扫描一下，那样我们都有一个小红包❤️| - - - - - - - - - - +两次md5 \ No newline at end of file diff --git a/pom.xml b/pom.xml index bb3ff15..c21041e 100644 --- a/pom.xml +++ b/pom.xml @@ -146,7 +146,7 @@ 1.2.38 - + salt commons-codec commons-codec diff --git a/src/main/java/com/geekq/miaosha/utils/MD5Utils.java b/src/main/java/com/geekq/miaosha/utils/MD5Utils.java index 13dd65b..e01c9bb 100644 --- a/src/main/java/com/geekq/miaosha/utils/MD5Utils.java +++ b/src/main/java/com/geekq/miaosha/utils/MD5Utils.java @@ -22,7 +22,7 @@ public class MD5Utils { } /** - * 第二次md5　salt　可随机　 + * 第二次md5　salt 可随机　 * @param formPass * @param salt * @return diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties index 62ff291..3abba25 100644 --- a/src/main/resources/application.properties +++ b/src/main/resources/application.properties @@ -19,7 +19,7 @@ log4j.logger.com.ibatis.sqlmap.engine.impl.SqlMapClientDelegate=DEBUG log4j.logger.Java.sql.Connection=DEBUG log4j.logger.java.sql.Statement=DEBUG log4j.logger.java.sql.PreparedStatement=DEBUG - +ajajs #mybatis mybatis.type-aliases-package=com.geekq.miaosha.domain #开启驼峰转换 configuration config-location 不能同時存在 如果要走流程 请 放开注释 diff --git a/src/main/resources/config/application-test.properties b/src/main/resources/config/application-test.properties index b47588c..8edee1c 100644 --- a/src/main/resources/config/application-test.properties +++ b/src/main/resources/config/application-test.properties @@ -18,7 +18,7 @@ mybatis.config-locations=classpath:mybatis/config.xml #datasource spring.datasource.url=jdbc:mysql://localhost:3306/miaosha?useUnicode=true&characterEncoding=utf-8&allowMultiQueries=true&useSSL=false spring.datasource.username=root -spring.datasource.password=aixiyue11 +spring.datasource.password=xxxx spring.datasource.driver-class-name=com.mysql.jdbc.Driver #druid spring.datasource.type=com.alibaba.druid.pool.DruidDataSource