update

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"