Merge branch 'develop' of https://gitlab.redhtc.com/Berlincen/DA-Platform into develop

DAPlatform-front/src/components/Login.vue

@@ -67,9 +67,13 @@ export default {
       }
       this.$store.commit('setUserInfo', userInfo)
       // 登录接口
-      this.axios.post('/signin', {
-        userName: this.userName,
-        password: this.password
+      this.axios({
+        method: 'post',
+        url: 'http://localhost:9100/user/signin',
+        data: {
+          userName: this.username,
+          password: this.password
+        }
       }).then(res => {
         if (res.code === 1) {
           // 存储用户ID和身份
@@ -88,7 +92,7 @@ export default {
       this.$store.commit('setUserInfo', userInfo)
 
       this.axios.post('/signup', {
-        userName: this.userName,
+        userName: this.username,
         password: this.password,
         email: this.email
       }).then(res => {

DAPlatform/Dao/User.py

 from peewee import *
-import json
 
 mysql = MySQLDatabase(
     'sys',
@@ -45,91 +44,120 @@ def register(username, pwd, email):
         return Result(0, "userName is repeat", {})
     else:
         User.create(userName=username, password=pwd, mail=email)
-        tmp = User.get(User.userName == username)
-        data = {
-            'userId': tmp.usrId,
-            'username': tmp.userName,
-            'email': tmp.mail,
-            'identity': tmp.type
-        }
-        return Result(1, "", data)
+        try:
+            tmp = User.get(User.userName == username)
+            data = {
+                'userId': tmp.usrId,
+                'username': tmp.userName,
+                'email': tmp.mail,
+                'identity': tmp.type
+            }
+            return Result(1, "", data)
+        except:
+            return Result(-1, "DoesNotExit", {})
 
 
 def login(username, pwd):
-    u = User.get(User.userName == username)
-    if (u.password == pwd):
+    try:
         tmp = User.get(User.userName == username)
+        if (tmp.password == pwd):
+            data = {
+                'userId': tmp.usrId,
+                'username': tmp.userName,
+                'email': tmp.mail,
+                'identity': tmp.type
+            }
+            return Result(1, "", data)
+        else:
+            return Result(0, "wrong userName/password", {})
+    except:
+        return Result(-1, "DoesNotExit", {})
+
+
+def personnal_information(id):
+    try:
+        tmp = User.get(User.usrId == id)
         data = {
+            'userName': tmp.userName,
             'userId': tmp.usrId,
-            'username': tmp.userName,
             'email': tmp.mail,
-            'identity': tmp.type
+            'identity': tmp.type,
+            'imageIntegration': tmp.imageScore,
+            'imageAccuracy': tmp.imageAccuracy,
+            'textIntegration': tmp.textScore,
+            'textAccuracy': tmp.textAccuracy,
+            'releaseTaskIntegration': tmp.postScore,
+            'taskNumber': tmp.postNum
         }
         return Result(1, "", data)
-    else:
-        return Result(0, "wrong userName/password", {})
-
-
-def personnal_information(id):
-    tmp = User.get(User.usrId == id)
-    data = {
-        'userName': tmp.userName,
-        'userId': tmp.usrId,
-        'email': tmp.mail,
-        'identity': tmp.type,
-        'imageIntegration': tmp.imageScore,
-        'imageAccuracy': tmp.imageAccuracy,
-        'textIntegration': tmp.textScore,
-        'textAccuracy': tmp.textAccuracy,
-        'releaseTaskIntegration': tmp.postScore,
-        'taskNumber': tmp.postNum
-    }
-    return Result(1, "", data)
+    except:
+        return Result(-1, "DoesNotExit", {})
 
 
 def set_type(id, type):
-    tmp = User.get(User.usrId == id)
-    tmp.type = type
-    tmp.save()
+    try:
+        tmp = User.get(User.usrId == id)
+        tmp.type = type
+        tmp.save()
+    except:
+        return Result(-1, "DoesNotExit", {})
 
 
 def add_image_score(id, score):
-    tmp = User.get(User.usrId == id)
-    tmp.imageScore = tmp.imageScore + score
-    tmp.save()
+    try:
+        tmp = User.get(User.usrId == id)
+        tmp.imageScore = tmp.imageScore + score
+        tmp.save()
+    except:
+        return Result(-1, "DoesNotExit", {})
 
 
 def setImageAccuracy(id, acuuracy):
-    tmp = User.get(User.usrId == id)
-    tmp.imageAccuracy = tmp.imageAccuracy + acuuracy
-    tmp.save()
+    try:
+        tmp = User.get(User.usrId == id)
+        tmp.imageAccuracy = tmp.imageAccuracy + acuuracy
+        tmp.save()
+    except:
+        return Result(-1, "DoesNotExit", {})
 
 
 def add_text_score(id, score):
-    tmp = User.get(User.usrId == id)
-    tmp.textScore = tmp.textScore + score
-    tmp.save()
+    try:
+        tmp = User.get(User.usrId == id)
+        tmp.textScore = tmp.textScore + score
+        tmp.save()
+    except:
+        return Result(-1, "DoesNotExit", {})
 
 
 def setTextAccuracy(id, acuuracy):
-    tmp = User.get(User.usrId == id)
-    tmp.textAccuracy = tmp.textAccuracy + acuuracy
-    tmp.save()
+    try:
+        tmp = User.get(User.usrId == id)
+        tmp.textAccuracy = tmp.textAccuracy + acuuracy
+        tmp.save()
+    except:
+        return Result(-1, "DoesNotExit", {})
 
 
 def add_post_score(id, score):
-    tmp = User.get(User.usrId == id)
-    tmp.postScore = tmp.postScore + score
-    tmp.save()
+    try:
+        tmp = User.get(User.usrId == id)
+        tmp.postScore = tmp.postScore + score
+        tmp.save()
+    except:
+        return Result(-1, "DoesNotExit", {})
 
 
 def add_post_num(id, num):
-    tmp = User.get(User.usrId == id)
-    tmp.postNum = tmp.postNum + num
-    tmp.save()
+    try:
+        tmp = User.get(User.usrId == id)
+        tmp.postNum = tmp.postNum + num
+        tmp.save()
+    except:
+        return Result(-1, "DoesNotExit", {})
 
 
 if __name__ == '__main__':
-    User.register('tom', '123', '32@qq.com')
-    User.register('tom', '123', '32@qq.com')
-    print(User.personnal_information(2))
+    register('tom', '123', '32@qq.com')
+    register('tom', '123', '32@qq.com')
+    print(personnal_information(2).code)

DAPlatform/app.py

 from flask import Flask
+from flask_cors import CORS
 
 # from views.uploadDownload import uploadDownload
 # from views.textAnnotation import textAnnotation
 from views.user import user
 
 app = Flask(__name__)
+CORS(app)
 # app.register_blueprint(textAnnotation)
 # app.register_blueprint(uploadDownload)
 app.register_blueprint(user)
 
 
+
 @app.route("/")
 def hello_world():
     return "hello"

DAPlatform/views/user.py

@@ -11,14 +11,20 @@ def register():
     username = request.args['userName']
     password = request.args['password']
     email = request.args['email']
-    return User.register(username, password, email)
+    ret = User.register(username, password, email)
+    res = {
+        'code': ret.code,
+        'message': ret.message,
+        'data': ret.data
+    }
+    return json.dumps(res)
 
 
 @user.route("/signin", methods=["Post"])
-def signup():
-    username = request.args['userName']
-    password = request.args['password']
-    ret = User.login(username, password)
+def signin():
+    data = request.get_json(silent=True)
+    print(data['userName'])
+    ret = User.login(data['userName'], data['password'])
     res = {
         'code': ret.code,
         'message': ret.message,
@@ -30,4 +36,10 @@ def signup():
 @user.route("/personalInformation", methods=["GET"])
 def personnal_information():
     userId = request.args['userId']
-    return User.personnal_information(userId)
+    ret = User.personnal_information(userId)
+    res = {
+        'code': ret.code,
+        'message': ret.message,
+        'data': ret.data
+    }
+    return json.dumps(res)