Merge branch 'master' of ssh://47.105.117.50:2224/wanli/evm-store

backend/app/setting.py

@@ -25,6 +25,10 @@ config = dict(
     },
     TABLE_PREFIX='evm_store_',
     MD5_SALT="EhuqUkwV",
+<<<<<<< Updated upstream
+=======
+    UPLOAD_SERVER="{}://{}:{}/".format(conf.get('uploads', 'protocol'), conf.get('uploads', 'host'), conf.get('uploads', 'port')),
+>>>>>>> Stashed changes
     UPLOAD_PATH=os.getcwd(),
     UPLOAD_DIR=conf.get('uploads', 'upload_dir'),
     TEMPLATE_PATH=os.path.join(os.getcwd(), "static"),

backend/controller/apps_manager.py

@@ -34,7 +34,15 @@ class AppsManager(object):
 
     def add(self, user, data):
         with db_session:
+<<<<<<< Updated upstream
             editor = User.get(id=user)
+=======
+            result = Apps.get(app_name=data.get("app_name"), is_delete=False)
+            if result:
+                return False, "app_name has been exists."
+
+            editor = User.get(id=request.current_user.get("id"))
+>>>>>>> Stashed changes
             if not editor:
                 return False, "current user is not exists"
 

backend/model/download.py

@@ -15,6 +15,7 @@ class AppDownload(db.Entity):
     uuid = Required(uuid.UUID, unique=True, default=uuid.uuid1, index=True)
     app = Optional("Apps", reverse="app_download")
     imei = Required(str)
+    ip = Optional(str)
     address = Optional(str)
     download_at = Required(datetime, default=datetime.now)
     is_delete = Required(bool, default=False)

backend/model/login_logs.py

@@ -14,6 +14,7 @@ class LoginLogs(db.Entity):
     id = PrimaryKey(int, auto=True)
     uuid = Required(uuid.UUID, unique=True, default=uuid.uuid1, index=True)
     username = Optional(str)
+    ip = Optional(str)
     address = Optional(str)
     create_at = Required(datetime, default=datetime.now)
     create_by = Optional("User", reverse='login_logs_creater')