Merge branch 'pzb' of ssh://192.168.136.45:10022/SERVER/AnsjerServer into pzb

Controller/AppColophon.py

@@ -172,13 +172,13 @@ class AppColView(View):
         version_time =  request_dict.get('version_time', None)
         id = request_dict.get('id', None)
         if not id:
-            return response.json(444, 'content,id')
+            return response.json(444, 'id')
         try:
             print (id)
             AppColophon = App_Colophon.objects.filter(id=id)
 
             if AppColophon.exists():
-                AppColophon.update(  lang=lang,
+                AppColophon.update(lang=lang,
                 newApp_version=newApp_version,
                 version_time=version_time,
                 content=content)

Controller/AppInfo.py

@@ -226,7 +226,7 @@ class AppVersionView(View):
         #     return render_to_response('appVersionLists_cn.html')
         # else:
         #     return render_to_response('appVersionLists_en.html')
-        queryset = App_Colophon.objects.filter(lang=lang,app_id__appBundleId=appBundleId,app_id__app_type=app_type).order_by('-id')
+        queryset = App_Colophon.objects.filter(lang=lang,app_id__appBundleId=appBundleId,app_id__app_type=app_type).order_by('-newApp_version')
         queryset_dict = CommonService.qs_to_dict(queryset).get('datas')
         # 修改数据逻辑改装数据返回值
         for k, v in enumerate(queryset_dict):

Controller/UserController.py

@@ -201,6 +201,7 @@ class registerView(TemplateView):
                 try:
                     create_data = {
                         "username": username,
+                        "NickName": username,
                         "userEmail": userEmail,
                         "password": make_password(password),
                         "userID": CommonService.getUserID(μs=False, setOTAID=True),
@@ -237,6 +238,7 @@ class registerView(TemplateView):
                 try:
                     create_data = {
                         "username": username,
+                        "NickName": username,
                         "userEmail": userEmail,
                         "password": make_password(password),
                         "userID": CommonService.getUserID(μs=False, setOTAID=True),