bug fixed# 用户表约束完整性修复；编辑用户失败

@@ -235,10 +235,10 @@ class DataManager(BlueprintApi):
     @bp.route("/init", methods=["GET"])
     @bp.route("/init", methods=["GET"])
     def init():
     def init():
         try:
         try:
-            username = 'admin'
+            displayname= username = 'admin'
             password = SM3.encode('DMap@123')
             password = SM3.encode('DMap@123')
             if not User.query.filter_by(username=username).one_or_none():
             if not User.query.filter_by(username=username).one_or_none():
-                user = User(username=username, password=password, role='admin',
+                user = User(username=username, displayname=displayname,password=password, role='admin',
                             phone='', company='', position='', email='',
                             phone='', company='', position='', email='',
                             create_time=time.strftime(
                             create_time=time.strftime(
                                 "%Y-%m-%d %H:%M:%S", time.localtime()),
                                 "%Y-%m-%d %H:%M:%S", time.localtime()),

-from sqlalchemy import  Column, Integer, Text, Time, ForeignKey, DateTime
+from sqlalchemy import Column, Integer, Text, Time, ForeignKey, DateTime
 from app.models import db
 from app.models import db
 from authlib.integrations.sqla_oauth2 import (
 from authlib.integrations.sqla_oauth2 import (
     OAuth2ClientMixin,
     OAuth2ClientMixin,
@@ -6,7 +6,7 @@ from authlib.integrations.sqla_oauth2 import (
     OAuth2AuthorizationCodeMixin
     OAuth2AuthorizationCodeMixin
 )
 )
 from sqlalchemy.orm import relationship
 from sqlalchemy.orm import relationship
-from app.util.enum.AuthEnum import OriginEnum,UserStatusEnum
+from app.util.enum.AuthEnum import OriginEnum, UserStatusEnum
 
 
 
 
 class User (db.Model):
 class User (db.Model):
@@ -26,8 +26,9 @@ class User (db.Model):
     role = Column(Text)
     role = Column(Text)
     displayname = Column(Text, nullable=False)  # 昵称
     displayname = Column(Text, nullable=False)  # 昵称
     # 用户来源，默认dmap平台用户
     # 用户来源，默认dmap平台用户
-    origin = Column(Text, default=OriginEnum.Dmap.name.lower())
-    status = Column(Integer, default=UserStatusEnum.Active)  # 1:激活，2:冻结，0:注销
+    origin = Column(Text, nullable=False, default=OriginEnum.Dmap.name.lower())
+    status = Column(Integer, nullable=False,
+                    default=UserStatusEnum.Active)  # 1:激活，2:冻结，0:注销
 
 
     def __str__(self):
     def __str__(self):
         return self.username
         return self.username
@@ -84,7 +85,7 @@ class OAuthLog(db.Model):
     id = Column(Integer, primary_key=True)
     id = Column(Integer, primary_key=True)
     user_id = Column(Text, nullable=False)
     user_id = Column(Text, nullable=False)
     username = Column(Text)  # 用户输入账号
     username = Column(Text)  # 用户输入账号
-    displayname=Column(Text) # 昵称
+    displayname = Column(Text)  # 别名
     ip = Column(Text)
     ip = Column(Text)
     # 登录方式：password，三方登录
     # 登录方式：password，三方登录
     auth_type = Column(Text)
     auth_type = Column(Text)

@@ -18,7 +18,7 @@ class Api(ApiTemplate):
         try:
         try:
             user_guid = int(self.para.get("guid"))
             user_guid = int(self.para.get("guid"))
             obj_value = {"company": "company", "email": "email",
             obj_value = {"company": "company", "email": "email",
-                         "position": "position", "phone": "phone"}
+                         "position": "position", "phone": "phone", "displayname": "displayname"}
 
 
             userinfo = User.query.filter_by(id=user_guid)
             userinfo = User.query.filter_by(id=user_guid)
             if not userinfo.one_or_none():
             if not userinfo.one_or_none():
@@ -53,7 +53,7 @@ class Api(ApiTemplate):
                 # 更新用户基本信息
                 # 更新用户基本信息
                 for key in obj_value:
                 for key in obj_value:
                     if self.para.__contains__(obj_value[key]):
                     if self.para.__contains__(obj_value[key]):
-                        value = self.para.get(AESHelper.decode(obj_value[key]))
+                        value = AESHelper.decode(self.para.get(obj_value[key]))
                         value = "" if value == "None" or value == "none" else value
                         value = "" if value == "None" or value == "none" else value
                         userinfo.update({key: value})
                         userinfo.update({key: value})
 
 
@@ -108,6 +108,11 @@ class Api(ApiTemplate):
              "type": "string",
              "type": "string",
              "description": "职位",
              "description": "职位",
              "required": ""},
              "required": ""},
+            {"name": "displayname",
+             "in": "formData",
+             "type": "string",
+             "description": "别名",
+             "required": ""},
         ],
         ],
         "responses": {
         "responses": {
             200: {
             200: {

@@ -34,6 +34,6 @@ def compile(des):
                 shutil.copy(pyc_file,des_pyc_file)
                 shutil.copy(pyc_file,des_pyc_file)
 
 
 if __name__ == '__main__':
 if __name__ == '__main__':
-    des="F:\Python\DMapManagerPublish"
+    des="D:\DMapManagerPublish" #D:\DMapManagerPublish
     compile(des)
     compile(des)