From 6be257060277ea501bb467ff997bc2536497ec78 Mon Sep 17 00:00:00 2001 From: "547884940@qq.com" <547884940@qq.com> Date: Fri, 30 Jan 2015 20:47:18 +0800 Subject: [PATCH] [user]edit --- PiBox/PiHome/PiApp/api.py | 4 +- PiBox/PiHome/PiApp/models.py | 2 +- PiBox/PiHome/WebShell/www/Thumbs.db | Bin 0 -> 6656 bytes PiBox/PiHome/templates/login.html | 2 + "PiBox/sh/datapoint_tools\200pic.py" | 106 ++++++++++++++++++++++++ "PiBox/sh/datapoint_tools\360switch.py" | 33 ++++++++ 6 files changed, 144 insertions(+), 3 deletions(-) create mode 100644 PiBox/PiHome/WebShell/www/Thumbs.db create mode 100644 "PiBox/sh/datapoint_tools\200pic.py" create mode 100644 "PiBox/sh/datapoint_tools\360switch.py" diff --git a/PiBox/PiHome/PiApp/api.py b/PiBox/PiHome/PiApp/api.py index dc35a09..366a43c 100644 --- a/PiBox/PiHome/PiApp/api.py +++ b/PiBox/PiHome/PiApp/api.py @@ -49,9 +49,9 @@ def check_username(request): return HttpResponse(simplejson.dumps({'msg':'Please enter a valid email format'})) user = PiUser.objects.get(username = request.GET['username']) if user is not None: - return HttpResponse(simplejson.dumps({'msg':'Username already exists'})) + return HttpResponse(simplejson.dumps({'msg':'Email already exists'})) except: - return HttpResponse(simplejson.dumps({'msg':'Username can be used'})) + return HttpResponse(simplejson.dumps({'msg':'Email can be used'})) def check_login(request): if request.user.is_authenticated(): diff --git a/PiBox/PiHome/PiApp/models.py b/PiBox/PiHome/PiApp/models.py index 979e21e..c8ec195 100644 --- a/PiBox/PiHome/PiApp/models.py +++ b/PiBox/PiHome/PiApp/models.py @@ -21,7 +21,7 @@ class PiUser(AbstractUser): class PiSettings(models.Model): - ip = models.IPAddressField(default="127.0.0.1") + ip = models.GenericIPAddressField(default="127.0.0.1") port = models.IntegerField(default=3333) enable_register = models.BooleanField(default=True) diff --git a/PiBox/PiHome/WebShell/www/Thumbs.db b/PiBox/PiHome/WebShell/www/Thumbs.db new file mode 100644 index 0000000000000000000000000000000000000000..8ae9ea7c0c802a337fd72e1b032165ce36b2fbe6 GIT binary patch literal 6656 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 literal 0 HcmV?d00001 diff --git a/PiBox/PiHome/templates/login.html b/PiBox/PiHome/templates/login.html index 060be16..820a213 100644 --- a/PiBox/PiHome/templates/login.html +++ b/PiBox/PiHome/templates/login.html @@ -27,9 +27,11 @@ {% csrf_token %}
+
+
diff --git "a/PiBox/sh/datapoint_tools\200pic.py" "b/PiBox/sh/datapoint_tools\200pic.py" new file mode 100644 index 0000000..6c6cbc6 --- /dev/null +++ "b/PiBox/sh/datapoint_tools\200pic.py" @@ -0,0 +1,106 @@ +#/bin/env python +# -*-coding:utf8-*- +''' +# Any issues or improvements please contact jacob-chen@iotwrt.com +''' +import urllib +import urllib2 +import sys +import json + +try: + from poster.encode import multipart_encode + from poster.streaminghttp import register_openers +except: + print "In order to post file,you should install poster modules!!" + print "sudo pip install poster" + +if __name__ == '__main__': + + choose = int(raw_input('1.write 2.read 3.edit 4.remove 5.history')) + domain = raw_input('domain(as 192.168.10.106:8000) : ') + sensor_id = raw_input('sensor_id(int) : ') + + #write + if choose == 1: + filepath = raw_input('filepath(as ./xxx.jpg) : ') + key = raw_input('key(as 2012-12-12T11:11:11) : ') + + # 在 urllib2 上注册 http 流处理句柄 + register_openers() + + # 开始对文件的 multiart/form-data 编码 + # "value" 是参数的名字，一般通过 HTML 中的 标签的 name 参数设置 + # headers 包含必须的 Content-Type 和 Content-Length + # datagen 是一个生成器对象，返回编码过后的参数，这里如果有多个参数的话依次添加即可 + datagen, headers = multipart_encode({"value": open(filepath, "rb"), "key" : key}) + + request = urllib2.Request("http://" + domain + "/API/sensor/" + sensor_id + "/datapoint/", datagen, headers) + + get = urllib2.urlopen(request).read() + print 'ret body:', get + s = json.loads(get) + print 'msg:', s['msg'] + + #read + elif choose == 2: + key = raw_input('key(as 2012-12-12T11:11:11) : ') + params = urllib.urlencode({'key': key}) + f = urllib.urlopen("http://" + domain + "/API/sensor/" + sensor_id + "/datapoint/get/?%s" % params) + get = f.read() + print 'ret body:', get + s = json.loads(get) + print 'key:',s['key'],'value:',s['value'] + + #edit + elif choose == 3: + filepath = raw_input('filepath(as ./xxx.jpg) : ') + key = raw_input('key(as 2012-12-12T11:11:11) : ') + + # 在 urllib2 上注册 http 流处理句柄 + register_openers() + + # 开始对文件的 multiart/form-data 编码 + # "value" 是参数的名字，一般通过 HTML 中的 标签的 name 参数设置 + # headers 包含必须的 Content-Type 和 Content-Length + # datagen 是一个生成器对象，返回编码过后的参数，这里如果有多个参数的话依次添加即可 + datagen, headers = multipart_encode({"value": open(filepath, "rb"), "key" : key}) + + request = urllib2.Request("http://" + domain + "/API/sensor/" + sensor_id + "/datapoint/edit/", datagen, headers) + + get = urllib2.urlopen(request).read() + print 'ret body:', get + s = json.loads(get) + print 'msg:', s['msg'] + + #remove + elif choose == 4: + key = raw_input('key(as 2012-12-12T11:11:11) : ') + params = urllib.urlencode({'key': key}) + f = urllib.urlopen("http://" + domain + "/API/sensor/" + sensor_id + "/datapoint/remove/?%s" % params) + get = f.read() + print 'ret body:', get + s = json.loads(get) + print 'msg:', s['msg'] + + #history + elif choose == 5: + ex = raw_input('latest 20?y or n') + if ex == 'y': + f = urllib.urlopen("http://" + domain + "/API/sensor/" + sensor_id + "/datapoint/history/") + get = f.read() + print 'ret body:', get + s = json.loads(get) + for item in s['datapoint']: + print 'key:',item['key'],'value:',item['value'] + else: + start = raw_input('start(as 2012-12-12T11:11:11) : ') + end = raw_input('end(as 2012-12-12T11:11:11) : ') + interval = raw_input('interval(int) : ') + params = urllib.urlencode({'start': start, 'end' : end, 'interval' : interval}) + f = urllib.urlopen("http://" + domain + "/API/sensor/" + sensor_id + "/datapoint/history/?%s" % params) + get = f.read() + print 'ret body:', get + s = json.loads(get) + for item in s['datapoint']: + print 'key:',item['key'],'value:',item['value'] \ No newline at end of file diff --git "a/PiBox/sh/datapoint_tools\360switch.py" "b/PiBox/sh/datapoint_tools\360switch.py" new file mode 100644 index 0000000..8f35c58 --- /dev/null +++ "b/PiBox/sh/datapoint_tools\360switch.py" @@ -0,0 +1,33 @@ +#/bin/env python +# -*-coding:utf8-*- +''' +# Any issues or improvements please contact jacob-chen@iotwrt.com +''' +import urllib +import json + +if __name__ == '__main__': + + choose = int(raw_input('1.write 2.read ')) + domain = raw_input('domain(as 192.168.10.106:8000) : ') + sensor_id = raw_input('sensor_id(int) : ') + + if choose == 1: + value = int(raw_input('value(int) : ')) + # params = urllib.urlencode() + params = urllib.urlencode({'value': value}) + f = urllib.urlopen("http://" + domain + "/API/sensor/" + sensor_id + "/datapoint/?%s" % params) + get = f.read() + print 'ret body:', get + + s = json.loads(get) + print 'msg:', s['msg'] + + elif choose == 2: + # params = urllib.urlencode() + f = urllib.urlopen("http://" + domain + "/API/sensor/" + sensor_id + "/datapoint/get/") + get = f.read() + print 'ret body:', get + + s = json.loads(get) + print 'value:', s['value']