From cb270b43d232ddbd16cfd07b2e3a494d06b9dccb Mon Sep 17 00:00:00 2001 From: leosanqing Date: Fri, 10 Apr 2020 11:04:17 +0800 Subject: [PATCH 01/62] Update README.md MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit add 以下文章链接 分布式锁的实现和对比; elk+kafka； fastdfs --- README.md | 20 ++++---------------- 1 file changed, 4 insertions(+), 16 deletions(-) diff --git a/README.md b/README.md index ef735ef..74c4242 100644 --- a/README.md +++ b/README.md @@ -4,22 +4,17 @@ # 写在前面 --------------- -最近要换工作了，过几天就回成都了。这几天在弄3.0版本，一大堆东西要寄。 最近没有更这个模块了，不是去偷懒了。我搞了个springboot 的电商项目。从单体一步步往上升级，到集群到分布式。现在我只完成了单体的部分，可以直接下载经过简单的配置就可以部署，主要是想通过这个学习下互联网在部署的时候都会用到哪些技术，[有需要的可以看看，如果入门也可以作为选择](https://github.com/leosanqing/food-shop)。 - - Java学习笔记，内容包括JVM，spring，hashMap实现源码分析，多线程，剑指offer题解，设计模式。然后根据面试的重点，又将很多从里面抽出，专门整了个面试的分类，如果是看面试的东西的话，可以重点看这个 - - 码字不易，点个star吧。 -这边是最近更的两篇文章。 +这边是最近更的几篇文章 +- [分布式锁的实现和对比](https://github.com/leosanqing/food-shop/tree/master/3.0/blog/%E5%88%86%E5%B8%83%E5%BC%8F%E5%B9%B6%E5%8F%91%E9%97%AE%E9%A2%98) - [lambda表达式](https://github.com/leosanqing/Java-Notes/tree/master/Utils/jdk8%E6%96%B0%E7%89%B9%E6%80%A7/lambda) - [stream流操作](https://github.com/leosanqing/Java-Notes/tree/master/Utils/jdk8%E6%96%B0%E7%89%B9%E6%80%A7/stream) @@ -71,9 +66,9 @@ Java学习笔记，内容包括JVM，spring，hashMap实现源码分析，多线 这个版本主要增加了 几个个中间件 - 使用ES 做为搜索，搜索的关键词可高亮 -- 使用FastDFS 作为图片上传的工具。 +- [使用FastDFS 作为图片上传的工具](https://github.com/leosanqing/food-shop/tree/master/3.0/blog/fastdfs/FastDFS%E5%AE%89%E8%A3%85%E5%92%8C%E9%85%8D%E7%BD%AE) - 使用 RabbitMQ 作为消息队列 -- 使用 ELK(ES，Kibana、LogStash) + kafka 作为日志搜集 +- [使用 ELK(ES，Kibana、LogStash) + kafka 作为日志搜集](https://github.com/leosanqing/food-shop/tree/master/3.0/blog/elk%2Bkafka%E5%AE%8C%E6%88%90%E6%97%A5%E5%BF%97%E6%90%9C%E9%9B%86) # 书籍 @@ -135,13 +130,6 @@ https://github.com/leosanqing/Java-Notes/tree/master/books - 并发准备放在并发编程那一模块，JVM这本书上和并发编程讲到的有一些小细节不一样，那个更加详细，因此到时候就放并发模块的目录。 - [链接](https://github.com/leosanqing/Java-Notes/tree/master/ConcurrencyProgramming) - - -# Redis - -- Redis实战代码(python版) -- - # 并发 链接：https://github.com/leosanqing/Java-Notes/tree/master/ConcurrencyProgramming From fb185a9d6cbe0fed30a939428573eaa0042df42a Mon Sep 17 00:00:00 2001 From: leosanqing Date: Wed, 15 Apr 2020 11:04:54 +0800 Subject: [PATCH 02/62] =?UTF-8?q?update=20=20=E6=9B=B4=E6=94=B9=E9=A1=B9?= =?UTF-8?q?=E7=9B=AE=E7=BB=93=E6=9E=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .gitignore | 2 + .../LeetCode/leetcode/.idea/workspace.xml | 527 +++++++----------- .../LeetCode/META-INF/LeetCode.kotlin_module | Bin 0 -> 16 bytes .../_121_BestTimeToBuyAndSellStock.class | Bin 1286 -> 0 bytes .../_121_BestTimeToBuyAndSellStock.java | 2 +- .../_122_BestTimeToBuyAndSellStock2.java | 2 +- .../src/easy/{array => }/_136_singleNum.java | 2 +- .../src/easy/{array => }/_1_twoSum.java | 2 +- .../leetcode/src/easy/_202_happyNumber.java | 69 +++ .../_237_deleteNodeInLinkedList.java | 2 +- .../{array => }/_26_removeDuplicates.java | 2 +- .../easy/{array => }/_27_removeElement.java | 2 +- .../{array => }/_35_searchInsertPosition.java | 2 +- ...81_ShortestUnsortedContinuousSubarray.java | 39 ++ .../src/easy/_617_mergeTwoBinaryTree.java | 46 ++ .../_70_ClimbingStairs.java | 2 +- .../src/medium/{array => }/_15_3nums.java | 2 +- .../{array => }/_73_setMatrixZeroes.java | 2 +- 18 files changed, 360 insertions(+), 345 deletions(-) create mode 100644 Algorithm/LeetCode/leetcode/out/production/LeetCode/META-INF/LeetCode.kotlin_module delete mode 100644 Algorithm/LeetCode/leetcode/out/production/LeetCode/easy/array/_121_BestTimeToBuyAndSellStock.class rename Algorithm/LeetCode/leetcode/src/easy/{array => }/_121_BestTimeToBuyAndSellStock.java (99%) rename Algorithm/LeetCode/leetcode/src/easy/{array => }/_122_BestTimeToBuyAndSellStock2.java (99%) rename Algorithm/LeetCode/leetcode/src/easy/{array => }/_136_singleNum.java (98%) rename Algorithm/LeetCode/leetcode/src/easy/{array => }/_1_twoSum.java (98%) create mode 100644 Algorithm/LeetCode/leetcode/src/easy/_202_happyNumber.java rename Algorithm/LeetCode/leetcode/src/easy/{linkedList => }/_237_deleteNodeInLinkedList.java (98%) rename Algorithm/LeetCode/leetcode/src/easy/{array => }/_26_removeDuplicates.java (98%) rename Algorithm/LeetCode/leetcode/src/easy/{array => }/_27_removeElement.java (98%) rename Algorithm/LeetCode/leetcode/src/easy/{array => }/_35_searchInsertPosition.java (98%) create mode 100644 Algorithm/LeetCode/leetcode/src/easy/_581_ShortestUnsortedContinuousSubarray.java create mode 100644 Algorithm/LeetCode/leetcode/src/easy/_617_mergeTwoBinaryTree.java rename Algorithm/LeetCode/leetcode/src/easy/{dynamicProgramming => }/_70_ClimbingStairs.java (98%) rename Algorithm/LeetCode/leetcode/src/medium/{array => }/_15_3nums.java (99%) rename Algorithm/LeetCode/leetcode/src/medium/{array => }/_73_setMatrixZeroes.java (98%) diff --git a/.gitignore b/.gitignore index eb8dae8..57af6a1 100644 --- a/.gitignore +++ b/.gitignore @@ -7,3 +7,5 @@ Utils/jdk8新特性/.DS_Store JVM/虚拟机执行子系统/.DS_Store Utils/.DS_Store Utils/jdk8新特性/lambda/lambda_demo/.idea/$CACHE_FILE$ +*.class +Algorithm/LeetCode/leetcode/.idea/workspace.xml diff --git a/Algorithm/LeetCode/leetcode/.idea/workspace.xml b/Algorithm/LeetCode/leetcode/.idea/workspace.xml index 0be58b8..199bc52 100644 --- a/Algorithm/LeetCode/leetcode/.idea/workspace.xml +++ b/Algorithm/LeetCode/leetcode/.idea/workspace.xml @@ -2,94 +2,13 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + - - + + + finalize + value + put + compareandSwapInt + - - true true true - - true - DEFINITION_ORDER - - - - - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + @@ -290,148 +165,119 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -