add feature# 三方登录对接配置

@@ -224,10 +224,10 @@ class DataManager(BlueprintApi):
     @bp.route("/oa", methods=["GET"])
     def oa_authorization():
         client = oauth2.WebApplicationClient(
-            configure.OA_OAUTH["client_id"])
+            configure.OA["client_id"])
         state = client.state_generator()
         auth_uri = client.prepare_request_uri(
-            configure.OA_OAUTH["authorization_endpoint"], configure.OA_OAUTH["redirect_uri"], configure.OA_OAUTH["scope"], state)
+            configure.OA["authorization_endpoint"], configure.OA["redirect_uri"], configure.OA["scope"], state)
         session["oauth_state"] = state
         return redirect(auth_uri)
 
@@ -239,7 +239,7 @@ class DataManager(BlueprintApi):
     def oa_callback():
 
         client = oauth2.WebApplicationClient(
-            configure.OA_OAUTH["client_id"])
+            configure.OA["client_id"])
 
         # 获取code
         code = client.parse_request_uri_response(
@@ -250,9 +250,9 @@ class DataManager(BlueprintApi):
 
         # 获取token
         body = client.prepare_request_body(
-            code, redirect_uri=configure.OA_OAUTH["redirect_uri"], client_secret=configure.OA_OAUTH["client_secret"])
+            code, redirect_uri=configure.OA["redirect_uri"], client_secret=configure.OA["client_secret"])
 
-        r = requests.post(configure.OA_OAUTH["token_endpoint"], body, headers={
+        r = requests.post(configure.OA["token_endpoint"], body, headers={
                           "Content-Type": "application/x-www-form-urlencoded"})
 
         tokeninfo = r.json()
@@ -260,7 +260,7 @@ class DataManager(BlueprintApi):
 
         if access_token:
             # 获取用户信息
-            userinfo_url = configure.OA_OAUTH["userinfo_endpoint"]
+            userinfo_url = configure.OA["userinfo_endpoint"]
             user_request = requests.get(userinfo_url, headers={
                                         "Authorization": "Bearer %s" % access_token})
             userinfo = user_request.json()
@@ -277,7 +277,7 @@ class DataManager(BlueprintApi):
             # 用户不存在，创建用户
             if not user:
                 user = User(username=user_name, password=SM3.encode('DMap@123'), role='dataman',
-                            phone='', company='', position='', email='',
+                            phone='', company='', position='', email='', 
                             create_time=time.strftime(
                                 "%Y-%m-%d %H:%M:%S", time.localtime()),
                             update_time=time.strftime("%Y-%m-%d %H:%M:%S", time.localtime()))
@@ -286,10 +286,10 @@ class DataManager(BlueprintApi):
 
             # dmap token授权
             session["id"] = user.id
-            
+
             # 存入数据库
             token = OAuth2Token(
-                client_id=configure.OA_OAUTH["client_id"],
+                client_id=configure.OA["client_id"],
                 token_type=tokeninfo.get("token_type"),
                 access_token=access_token,
                 scope=tokeninfo.get("scope"),
@@ -298,14 +298,17 @@ class DataManager(BlueprintApi):
             )
             db.session.add(token)
             db.session.commit()
+            redirect_uri = ""
+            try:
+                redirect_uri = session["redirect_uri"]
+                if not redirect_uri:
+                    redirect_uri = '/'
+            except:
+                redirect_uri = "/"
 
-            redirect_uri = session["redirect_uri"]
-            if not redirect_uri:
-                redirect_uri = '/'
-                
             response = make_response(redirect(redirect_uri))
-            response.set_cookie('accessToken', access_token,max_age=604_800)
-            
+            response.set_cookie('accessToken', access_token, max_age=604_800)
+
             return response
         else:
             return redirect('/')

@@ -16,6 +16,7 @@ class User (db.Model):
     __tablename__ = "dmap_user"
     id = Column(Integer, primary_key=True)
     username = Column(Text)
+   
     password = Column(Text)
     company = Column(Text)
     position = Column(Text)
@@ -24,7 +25,8 @@ class User (db.Model):
     create_time = Column(Time)
     update_time = Column(Time)
     role = Column(Text)
-    #origin = Column(Text, default="dmap")
+    #display_name = Column(Text, nullable=True)  # 昵称
+    #origin = Column(Text, default="dmap")  # 用户来源，默认dmap平台用户
 
     def __str__(self):
         return self.username

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

@@ -5,12 +5,11 @@ deploy_ip_host = "172.26.40.105:8840"
 # 系统数据库
 SQLALCHEMY_DATABASE_URI = "postgresql://postgres:chinadci@172.26.60.101:5432/dmap_manager"
 
-
 # 指定精华表所在位置(必须为空间库)，设置为None则存放在各自的实体库中
 VACUATE_DB_URI = None
 #VACUATE_DB_URI = SQLALCHEMY_DATABASE_URI
 
-#DMap引擎
+# DMap引擎
 dmap_engine = "http://172.26.60.101:8820"
 
 # 固定配置不需要修改
@@ -27,3 +26,14 @@ PublishPermission = ['admin', 'dataman', 'publisher']
 ServicePermission = ['admin', 'dataman', 'publisher']
 
 log_level = logging.INFO
+
+
+OA = {
+    "client_id": "dmap",
+    "client_secret": "secret",
+    "scope": "openid profile",
+    "redirect_uri": "http://localhost:8841/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"
+}

@@ -6,4 +6,4 @@ import os
 os.environ['AUTHLIB_INSECURE_TRANSPORT'] = '1'
 app: Flask = create_app()
 if __name__ == '__main__':
-    app.run(host="0.0.0.0", port="8841", threaded=True, debug=True)
+    app.run(host="0.0.0.0", port="8841", threaded=True, debug=True)
\ No newline at end of file