From e63c1daf5b6fb1c3d2d67ae8e73ee2664e7fd352 Mon Sep 17 00:00:00 2001
From: Alexchent <1023615292@qq.com>
Date: Sat, 3 Jul 2021 12:18:55 +0800
Subject: [PATCH] =?UTF-8?q?=E7=9B=AE=E5=BD=95=E7=BB=93=E6=9E=84=E6=95=B4?=
 =?UTF-8?q?=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 codehero/{ => NO1}/code_hero.sql              |  0
 codehero/{ => NO1}/codehero-3.html            |  0
 {codehero2 => codehero/NO2}/codehero-2.html   |  0
 {codehero2 => codehero/NO2}/codehero.sql      |  0
 .../NO2}/kill_memcached.php                   |  0
 {codehero2 => codehero/NO2}/kill_redis.php    |  1 +
 {codehero3 => codehero/NO3}/codehero.sql      |  0
 {codehero3 => codehero/NO3}/kill_redis.php    |  0
 {codehero3 => codehero/NO3}/makeData.php      |  0
 python/my_first_py/echo.py                    |  7 ---
 python/my_first_py/test.py                    | 47 -------------------
 11 files changed, 1 insertion(+), 54 deletions(-)
 rename codehero/{ => NO1}/code_hero.sql (100%)
 rename codehero/{ => NO1}/codehero-3.html (100%)
 rename {codehero2 => codehero/NO2}/codehero-2.html (100%)
 rename {codehero2 => codehero/NO2}/codehero.sql (100%)
 rename {codehero2 => codehero/NO2}/kill_memcached.php (100%)
 rename {codehero2 => codehero/NO2}/kill_redis.php (98%)
 rename {codehero3 => codehero/NO3}/codehero.sql (100%)
 rename {codehero3 => codehero/NO3}/kill_redis.php (100%)
 rename {codehero3 => codehero/NO3}/makeData.php (100%)
 delete mode 100755 python/my_first_py/echo.py
 delete mode 100755 python/my_first_py/test.py

diff --git a/codehero/code_hero.sql b/codehero/NO1/code_hero.sql
similarity index 100%
rename from codehero/code_hero.sql
rename to codehero/NO1/code_hero.sql
diff --git a/codehero/codehero-3.html b/codehero/NO1/codehero-3.html
similarity index 100%
rename from codehero/codehero-3.html
rename to codehero/NO1/codehero-3.html
diff --git a/codehero2/codehero-2.html b/codehero/NO2/codehero-2.html
similarity index 100%
rename from codehero2/codehero-2.html
rename to codehero/NO2/codehero-2.html
diff --git a/codehero2/codehero.sql b/codehero/NO2/codehero.sql
similarity index 100%
rename from codehero2/codehero.sql
rename to codehero/NO2/codehero.sql
diff --git a/codehero2/kill_memcached.php b/codehero/NO2/kill_memcached.php
similarity index 100%
rename from codehero2/kill_memcached.php
rename to codehero/NO2/kill_memcached.php
diff --git a/codehero2/kill_redis.php b/codehero/NO2/kill_redis.php
similarity index 98%
rename from codehero2/kill_redis.php
rename to codehero/NO2/kill_redis.php
index 2394081..a0934ea 100644
--- a/codehero2/kill_redis.php
+++ b/codehero/NO2/kill_redis.php
@@ -25,6 +25,7 @@ function kill($userId, $eventId)
     $redis = new Redis();
     $redis->connect('127.0.0.1', 6379);
     if (!$redis->setnx($userLock, 1) && $redis->expire($userLock, 20)) {
+        //todo set key value NX EX 20
         return "您已经参与过了！";
     }
 
diff --git a/codehero3/codehero.sql b/codehero/NO3/codehero.sql
similarity index 100%
rename from codehero3/codehero.sql
rename to codehero/NO3/codehero.sql
diff --git a/codehero3/kill_redis.php b/codehero/NO3/kill_redis.php
similarity index 100%
rename from codehero3/kill_redis.php
rename to codehero/NO3/kill_redis.php
diff --git a/codehero3/makeData.php b/codehero/NO3/makeData.php
similarity index 100%
rename from codehero3/makeData.php
rename to codehero/NO3/makeData.php
diff --git a/python/my_first_py/echo.py b/python/my_first_py/echo.py
deleted file mode 100755
index 82b8b47..0000000
--- a/python/my_first_py/echo.py
+++ /dev/null
@@ -1,7 +0,0 @@
-#!/usr/bin/python3
-
-import datetime
-print (datetime.datetime.now().year)
-name = input("请输入名称")
-age = input('请输入年龄')
-print(name,age)
diff --git a/python/my_first_py/test.py b/python/my_first_py/test.py
deleted file mode 100755
index 54530e4..0000000
--- a/python/my_first_py/test.py
+++ /dev/null
@@ -1,47 +0,0 @@
-import time
-import random
-print (time.time())
-
-
-# 序列
-
-score = list(range(1,10,1))
-for index,value in enumerate(score) :
-    print(index,value)
-
-
-tangshi = ['蜀道难','拿鱼上青天','哈哈']
-print(tangshi)
-
-# 列表中添加元素
-tangshi.append('我是谁')
-print(tangshi)
-
-# 列表中批量添加元素
-tangshi.extend(['来吧','小当家'])
-print(tangshi)
-
-# 列表中删除元素1
-del tangshi[1]
-print(tangshi)
-
-# 列表中删除元素1
-if tangshi.count('哈哈') >0 :
-    tangshi.remove('哈哈')
-print(tangshi)
-
-# 列表推导式   生成10个在10至100之间的随机数
-price = [random.randint(10,100) for i in range(10)]
-print(price)
-
-# 降序排序
-price.sort(reverse=True)
-print(price)
-
-# 根据列表生成指定需求的列表   打五折的新价格目录
-half_price= [x/2 for x in price]
-print(half_price)
-
-# 从列表中选择符合条件的元素组成新列表 五折后价格超过30的目录
-can_on=[x/2 for x in price if x/2 > 30]
-print(can_on)
\ No newline at end of file