diff --git a/app.py b/app.py index 6f88bc7..5f554f4 100644 --- a/app.py +++ b/app.py @@ -1,6 +1,5 @@ from flask import Flask, jsonify, g -from qr import image -import student +import qr app = Flask(__name__) @@ -11,10 +10,7 @@ def CNUqrhome(): @app.route('/cnuqr/', methods=['GET']) def CNUqr(ID): - student.setStudentID(ID) - g.studentID = ID - return image.load("result.png") - + return qr.qrmaker(ID).load("result.png") @app.route('/cnuqr/getid', methods=['GET']) def getID(): diff --git a/qr.py b/qr.py index e394fdd..c9d79b8 100644 --- a/qr.py +++ b/qr.py @@ -11,33 +11,28 @@ import base64 import time, datetime import qrcode -from studentinfo import studentID # 교번 또는 학번을 입력받습니다. # 코드 형식 조합 -now = datetime.datetime.now() - -year = str(now.year) -month = str(now.month) -day = str(now.day) -hour = str(now.hour) -minute = str(now.minute) -second = str(now.second) - -newMonth = month.rjust(2,'0') -newDay = day.rjust(2,'0') -newHour = hour.rjust(2,'0') -newMinute = minute.rjust(2,'0') -newSecond = second.rjust(2,'0') - -timeStamp = str(year + newMonth + newDay + newHour + newMinute + newSecond) - -#Base64 형식으로 암호화 -rawCode = str(studentID+"^"+timeStamp) -encodedCode = rawCode.encode('UTF-8') -resultCode = base64.b64encode(encodedCode) -resultCodeString = resultCode.decode('ascii') - -# QR코드를 표출합니다. -image = qrcode.make(resultCodeString) \ No newline at end of file +def qrmaker(studentID): + now = datetime.datetime.now() + year = str(now.year) + month = str(now.month) + day = str(now.day) + hour = str(now.hour) + minute = str(now.minute) + second = str(now.second) + newMonth = month.rjust(2,'0') + newDay = day.rjust(2,'0') + newHour = hour.rjust(2,'0') + newMinute = minute.rjust(2,'0') + newSecond = second.rjust(2,'0') + timeStamp = str(year + newMonth + newDay + newHour + newMinute + newSecond) + rawCode = str(studentID+"^"+timeStamp) + rawCode = str(studentID+"^"+timeStamp) + encodedCode = rawCode.encode('UTF-8') + resultCode = base64.b64encode(encodedCode) + resultCodeString = resultCode.decode('ascii') + image = qrcode.make(resultCodeString) + return image \ No newline at end of file