fixed bug# 登录、注销对接三方登录

@@ -37,6 +37,16 @@ def split_by_crlf(s):
     return [v for v in s.splitlines() if v]
 
 
+def getRedirectUrl(request):  # 获取重定向地址
+    # 获取头部信息
+    X_Forwarded_Proto = request.headers.get("X-Forwarded-Proto")  # 协议
+    X_Forwarded_Host = request.headers.get("X-Forwarded-Host")  # host
+    if not X_Forwarded_Proto == None and not X_Forwarded_Host == None:
+        return X_Forwarded_Proto+"://"+X_Forwarded_Host
+    else:
+        return request.host_url.rstrip("/")
+
+
 class DataManager(BlueprintApi):
     bp = Blueprint("Auth", __name__, url_prefix="/auth")
 
@@ -136,25 +146,30 @@ class DataManager(BlueprintApi):
                 request=request2)
             redirect_uri = grant1.validate_authorization_request()
             access_token = request.args.get("accesstoken")
-            accesstoken = OAuth2Token.query.filter_by(
-                access_token=access_token).first()
-            accesstoken.revoked = True
-            db.session.commit()
-            user = current_user()
-            remove_user()
 
-            # 日志
-            log = OAuthLog(user_id=user.id, username=user.username,
-                           auth_type=AuthEnum.Other.name.lower(),
-                           message="注销成功", create_time=datetime.now(),
-                           operate_type=OperateEnum.Logout, token=access_token,
-                           displayname=user.displayname, ip=request.remote_addr
-                           )
-            db.session.add(log)
-            db.session.commit()
+            if not access_token == None:
+                accesstoken = OAuth2Token.query.filter_by(
+                    access_token=access_token).one_or_none()
+                if not accesstoken == None:
+                    accesstoken.revoked = True
+                    db.session.commit()
+                    if current_user() != None:
+                        remove_user()
+
+                    user = User.query.get(accesstoken.user_id)
+                    # 日志
+                    if user != None:
+                        log = OAuthLog(user_id=user.id, username=user.username,
+                                       auth_type=AuthEnum.Other.name.lower(),
+                                       message="注销成功", create_time=datetime.now(),
+                                       operate_type=OperateEnum.Logout, token=access_token,
+                                       displayname=user.displayname, ip=request.remote_addr
+                                       )
+                        db.session.add(log)
+                        db.session.commit()
 
         except OAuth2Error as error:
-            return jsonify(dict(error.get_body()))
+            StructurePrint().print(error.__str__()+":" + traceback.format_exc(), "error")
         return redirect(redirect_uri)
 
     """接口"""
@@ -255,8 +270,9 @@ class DataManager(BlueprintApi):
         client = oauth2.WebApplicationClient(
             configure.OA["client_id"])
         state = client.state_generator()
+        StructurePrint().print(request.headers, "info")
         auth_uri = client.prepare_request_uri(
-            configure.OA["authorization_endpoint"], configure.OA["redirect_uri"], configure.OA["scope"], state)
+            configure.OA["authorization_endpoint"], getRedirectUrl(request) + configure.OA["redirect_uri"], configure.OA["scope"], state)
         session["oauth_state"] = state
         return redirect(auth_uri)
 
@@ -267,7 +283,7 @@ class DataManager(BlueprintApi):
     @bp.route("/oa/callback", methods=["GET"])
     def oa_callback():
         try:
-            print(request.remote_addr)
+            auth_default_redirect_uri = configure.auth_default_redirect_uri
             client = oauth2.WebApplicationClient(
                 configure.OA["client_id"])
 
@@ -280,7 +296,7 @@ class DataManager(BlueprintApi):
 
             # 获取token
             body = client.prepare_request_body(
-                code, redirect_uri=configure.OA["redirect_uri"], client_secret=configure.OA["client_secret"])
+                code, redirect_uri=getRedirectUrl(request) + configure.OA["redirect_uri"], client_secret=configure.OA["client_secret"])
 
             r = requests.post(configure.OA["token_endpoint"], body, headers={
                 "Content-Type": "application/x-www-form-urlencoded"})
@@ -289,7 +305,6 @@ class DataManager(BlueprintApi):
             access_token = tokeninfo.get("access_token")
             id_token = tokeninfo.get("id_token")
 
-            auth_default_redirect_uri = configure.auth_default_redirect_uri
             origin_type = "dci_oa"  # 三方登录标识
             if access_token:
                 # 获取用户信息

@@ -27,18 +27,19 @@ class Api(ApiTemplate):
         res["result"] = False
         try:
             # 业务逻辑
-            username = AESHelper.decode( self.para.get("username", ''))
+            username = AESHelper.decode(self.para.get("username", ''))
             password = SM3.encode(AESHelper.decode(self.para.get("pwd", '')))
             role = AESHelper.decode(self.para.get("role", ''))
             company = AESHelper.decode(self.para.get("company", ''))
             position = AESHelper.decode(self.para.get("position", ''))
             email = AESHelper.decode(self.para.get("email", ''))
             phone = AESHelper.decode(self.para.get("phone", ''))
+            displayname = username
             # 是否重名
             if(User.query.filter_by(username=username).one_or_none()):
                 res["msg"] = "username 已存在"
             else:
-                user = User(username=username, password=password, role=role,
+                user = User(username=username, displayname=displayname, password=password, role=role,
                             phone=phone, company=company, position=position, email=email,
                             create_time=time.strftime(
                                 "%Y-%m-%d %H:%M:%S", time.localtime()),

@@ -55,7 +55,7 @@ class Api(ApiTemplate):
         {"name": "database_guid",
          "in": "formData",
          "type": "string",
-         "description": "数据库guid", "": "true"},
+         "description": "数据库guid", "required": "true"},
     
     ],
     "responses":{

@@ -33,7 +33,7 @@ OA = {
     "client_id": "dmap",
     "client_secret": "secret",
     "scope": "openid profile",
-    "redirect_uri": "http://localhost:8841/auth/oa/callback",
+    "redirect_uri": "/auth/oa/callback",
     "authorization_endpoint": "https://login.chinadci.com/netsso/connect/authorize",
     "token_endpoint": "https://login.chinadci.com/netsso/connect/token",
     "userinfo_endpoint": "https://login.chinadci.com/netsso/connect/userinfo",

@@ -77,4 +77,8 @@ result=AESHelper.decode(encryption)
 
 [验证码基础知识](https://baike.baidu.com/item/%E9%AA%8C%E8%AF%81%E7%A0%81/31701)
 [使用python图像处理标准库](https://www.liaoxuefeng.com/wiki/1016959663602400/1017785454949568)
-[pillow](https://pillow.readthedocs.io/en/stable/index.html)
\ No newline at end of file
+[pillow](https://pillow.readthedocs.io/en/stable/index.html)
+
+
+## 5 使用编译文件的方法
+cmd下运行./compile.py