2022.01.18 修复已知bug

@@ -23,7 +23,7 @@ class Api(ApiTemplate):
 
 
             database = db.session.query(Database).filter_by(guid=self.para.get("guid")).one_or_none()
             database = db.session.query(Database).filter_by(guid=self.para.get("guid")).one_or_none()
             #验证权限
             #验证权限
-            UserCheck.verify(database.creator,current_token.user.username)
+            UserCheck.verify(database.creator)
             if configure.VACUATE_DB_URI:
             if configure.VACUATE_DB_URI:
                 va_ds: DataSource = PGUtil.open_pg_data_source(1, configure.VACUATE_DB_URI)
                 va_ds: DataSource = PGUtil.open_pg_data_source(1, configure.VACUATE_DB_URI)
             else:
             else:

@@ -27,7 +27,7 @@ class Api(ApiTemplate):
             dbase:Database = database.one_or_none()
             dbase:Database = database.one_or_none()
 
 
             #验证权限
             #验证权限
-            UserCheck.verify(dbase.creator,current_token.user.username)
+            UserCheck.verify(dbase.creator)
 
 
             update_dict={}
             update_dict={}
     
     

@@ -28,7 +28,6 @@ class EntryDataVacuate:
         try:
         try:
             metas: list = parameter.get("meta")
             metas: list = parameter.get("meta")
 
 
-            vacuate = int(parameter.get("vacuate",1))
 
 
             # 总的入库是否成功
             # 总的入库是否成功
             is_success=True
             is_success=True
@@ -165,7 +164,7 @@ class EntryDataVacuate:
 
 
         new_layer_name = None
         new_layer_name = None
         vacuate_process= None
         vacuate_process= None
-        vacuate = int(this_task.parameter.get("vacuate", 1))
+        vacuate = int(this_task.parameter.get("vacuate", 0))
         success = True
         success = True
         table_guid = uuid.uuid1().__str__()
         table_guid = uuid.uuid1().__str__()
         try:
         try:
@@ -244,7 +243,10 @@ class EntryDataVacuate:
 
 
             # 注册图层信息
             # 注册图层信息
             # 是否抽吸过
             # 是否抽吸过
-            is_vacuate = 1 if vacuate_process.max_level>0 else 0
+            if vacuate:
+                is_vacuate = 1 if vacuate_process.max_level>0 else 0
+            else:
+                is_vacuate = 0
 
 
             this_task.register_table(pg_layer,new_layer_name,overwrite,parameter.get("creator"),is_vacuate,table_guid)
             this_task.register_table(pg_layer,new_layer_name,overwrite,parameter.get("creator"),is_vacuate,table_guid)
 
 

@@ -24,7 +24,7 @@ class Api(ApiTemplate):
             raise Exception("数据不存在！")
             raise Exception("数据不存在！")
 
 
         #验证权限
         #验证权限
-        UserCheck.verify(column.relate_table.relate_database.creator,current_token.user.username)
+        UserCheck.verify(column.relate_table.relate_database.creator)
 
 
         try:
         try:
             if self.para.get("column_alias"):
             if self.para.get("column_alias"):

@@ -36,17 +36,13 @@ class Api(ApiTemplate):
             database = Database.query.filter_by(guid=table.database_guid).one_or_none()
             database = Database.query.filter_by(guid=table.database_guid).one_or_none()
 
 
             #验证权限
             #验证权限
-            UserCheck.verify(database.creator,current_token.user.username)
+            UserCheck.verify(database.creator)
 
 
             if not database:
             if not database:
                 res["result"]=False
                 res["result"]=False
                 res["msg"]= "数据库不存在!"
                 res["msg"]= "数据库不存在!"
                 return res
                 return res
 
 
-            if database.creator != "":
-                raise Exception("缺乏权限！")
-
-
             pg_ds: DataSource = PGUtil.open_pg_data_source(1, DES.decode(database.sqlalchemy_uri))
             pg_ds: DataSource = PGUtil.open_pg_data_source(1, DES.decode(database.sqlalchemy_uri))
             
             
             if configure.VACUATE_DB_URI:
             if configure.VACUATE_DB_URI:

@@ -33,7 +33,7 @@ class Api(ApiTemplate):
                 return res
                 return res
 
 
             #验证权限
             #验证权限
-            UserCheck.verify(table.relate_database.creator,current_token.user.username)
+            UserCheck.verify(table.one_or_none().relate_database.creator)
     
     
             if self.para.__contains__("catalog_guid"):
             if self.para.__contains__("catalog_guid"):
                 if catalog_guid is None:
                 if catalog_guid is None:

@@ -29,10 +29,7 @@ class Api(ApiTemplate):
             database = Database.query.filter_by(guid=database_guid).one_or_none()
             database = Database.query.filter_by(guid=database_guid).one_or_none()
 
 
             #验证权限
             #验证权限
-            UserCheck.verify(database.creator,current_token.user.username)
-
-            if database.creator != "":
-                raise Exception("缺乏权限！")
+            UserCheck.verify(database.creator)
 
 
             if not database:
             if not database:
                 raise Exception("数据库不存在!")
                 raise Exception("数据库不存在!")

@@ -43,7 +43,7 @@ class Api(ApiTemplate):
                 raise Exception("数据不存在！")
                 raise Exception("数据不存在！")
 
 
             #验证权限
             #验证权限
-            UserCheck.verify(table.relate_database.creator,current_token.user.username)
+            UserCheck.verify(table.relate_database.creator)
 
 
             pg_ds :DataSource= PGUtil.open_pg_data_source(0,DES.decode(table.relate_database.sqlalchemy_uri))
             pg_ds :DataSource= PGUtil.open_pg_data_source(0,DES.decode(table.relate_database.sqlalchemy_uri))
             layer = pg_ds.GetLayerByName(table.name)
             layer = pg_ds.GetLayerByName(table.name)

@@ -42,7 +42,7 @@ class Api(ApiTemplate):
                 raise Exception("数据不存在！")
                 raise Exception("数据不存在！")
 
 
             #验证权限
             #验证权限
-            UserCheck.verify(table.relate_database.creator,current_token.user.username)
+            UserCheck.verify(table.relate_database.creator)
 
 
             # 判断图层是否存在
             # 判断图层是否存在
 
 

@@ -9,6 +9,7 @@ from sqlalchemy.engine import ResultProxy
 from app.util.component.ApiTemplate import ApiTemplate
 from app.util.component.ApiTemplate import ApiTemplate
 from app.util.component.PGUtil import PGUtil
 from app.util.component.PGUtil import PGUtil
 import json
 import json
+import decimal
 class Api(ApiTemplate):
 class Api(ApiTemplate):
     api_name = "数据浏览"
     api_name = "数据浏览"
     def process(self):
     def process(self):
@@ -53,6 +54,8 @@ class Api(ApiTemplate):
                     #格式化时间列
                     #格式化时间列
                     if isinstance(value, datetime.datetime):
                     if isinstance(value, datetime.datetime):
                         d[column] = value.strftime('%Y-%m-%d %H:%M:%S')
                         d[column] = value.strftime('%Y-%m-%d %H:%M:%S')
+                    elif isinstance(value, decimal.Decimal):
+                        d[column] = float(value)
                     else:
                     else:
                         d[column]=value
                         d[column]=value
                 pkey_dict.update(d)
                 pkey_dict.update(d)

@@ -23,7 +23,7 @@ class Api(ApiTemplate):
                 raise Exception("任务不存在！")
                 raise Exception("任务不存在！")
 
 
             #验证权限
             #验证权限
-            UserCheck.verify(task.creator,current_token.user.username)
+            UserCheck.verify(task.creator)
 
 
             db.session.delete(task)
             db.session.delete(task)
             db.session.commit()
             db.session.commit()

@@ -29,7 +29,7 @@ class Api(ApiTemplate):
                 raise Exception("任务不存在！")
                 raise Exception("任务不存在！")
 
 
             #验证权限
             #验证权限
-            UserCheck.verify(task.creator,current_token.user.username)
+            UserCheck.verify(task.creator)
 
 
             pid = task.task_pid
             pid = task.task_pid
             try:
             try:

@@ -23,7 +23,7 @@ class Api(ApiTemplate):
             if not user_req.json().get("result"):
             if not user_req.json().get("result"):
                 raise Exception("服务不存在！")
                 raise Exception("服务不存在！")
             # 验证权限
             # 验证权限
-            UserCheck.verify(user_req.json().get("data").get("service").get("creator"), current_token.user.username)
+            UserCheck.verify(user_req.json().get("data").get("service").get("creator"))
 
 
             url = "{}/API/Service/Delete".format(self.para.get("url"))
             url = "{}/API/Service/Delete".format(self.para.get("url"))
             response:requests.Response = requests.post(url,data=self.para)
             response:requests.Response = requests.post(url,data=self.para)

@@ -23,7 +23,7 @@ class Api(ApiTemplate):
             if not user_req.json().get("result"):
             if not user_req.json().get("result"):
                 raise Exception("服务不存在！")
                 raise Exception("服务不存在！")
             # 验证权限
             # 验证权限
-            UserCheck.verify(user_req.json().get("data").get("service").get("creator"), current_token.user.username)
+            UserCheck.verify(user_req.json().get("data").get("service").get("creator"))
 
 
             url = "{}/API/Service/Edit".format(self.para.get("url"))
             url = "{}/API/Service/Edit".format(self.para.get("url"))
             response:requests.Response = requests.post(url,data=self.para)
             response:requests.Response = requests.post(url,data=self.para)

@@ -26,14 +26,14 @@ class Api(ApiTemplate):
         try:
         try:
             guid = self.para.get("guid")
             guid = self.para.get("guid")
             functions = self.para.get("functions")
             functions = self.para.get("functions")
-            service :Service = Service.query.filter_by(guid=guid)
+            service :Service = Service.query.filter_by(guid=guid).one_or_none()
             this_time = datetime.datetime.now()
             this_time = datetime.datetime.now()
 
 
             if not service:
             if not service:
                 raise Exception("服务不存在！")
                 raise Exception("服务不存在！")
 
 
             #验证权限
             #验证权限
-            UserCheck.verify(service.creator,current_token.user.username)
+            UserCheck.verify(service.creator)
 
 
             service_update = {"update_time":this_time}
             service_update = {"update_time":this_time}
             map_service_update = {}
             map_service_update = {}
@@ -59,6 +59,8 @@ class Api(ApiTemplate):
             if not resp_json["status"]=="1":
             if not resp_json["status"]=="1":
                 raise Exception("调用矢量服务的修改服务接口失败！")
                 raise Exception("调用矢量服务的修改服务接口失败！")
 
 
+            service_update["overview"] = resp_json["url"]
+
             # 修改功能
             # 修改功能
             if functions:
             if functions:
                 new_types = functions.split(",")
                 new_types = functions.split(",")
@@ -75,7 +77,7 @@ class Api(ApiTemplate):
             map_service = MapService.query.filter_by(service_guid=guid)
             map_service = MapService.query.filter_by(service_guid=guid)
 
 
             if service_update:
             if service_update:
-                service.update(service_update)
+                Service.query.filter_by(guid=guid).update(service_update)
             if map_service_update:
             if map_service_update:
                 map_service.update(map_service_update)
                 map_service.update(map_service_update)
 
 

@@ -30,7 +30,7 @@ class Api(ApiTemplate):
                 if service:
                 if service:
 
 
                     # 验证权限
                     # 验证权限
-                    UserCheck.verify(service.creator, current_token.user.username)
+                    UserCheck.verify(service.creator)
 
 
                     try:
                     try:
                         if service.type.__eq__("切片服务"):
                         if service.type.__eq__("切片服务"):

@@ -29,7 +29,7 @@ class Api(ApiTemplate):
             if not service:
             if not service:
                 raise Exception("服务不存在！")
                 raise Exception("服务不存在！")
             #验证权限
             #验证权限
-            UserCheck.verify(service.creator,current_token.user.username)
+            UserCheck.verify(service.creator)
 
 
             this_time = datetime.datetime.now()
             this_time = datetime.datetime.now()
 
 

@@ -2,12 +2,13 @@
 #author:        4N
 #author:        4N
 #createtime:    2022/1/14
 #createtime:    2022/1/14
 #email:         nheweijun@sina.com
 #email:         nheweijun@sina.com
-
+from authlib.integrations.flask_oauth2 import current_token
 import configure
 import configure
 class UserCheck:
 class UserCheck:
 
 
     @classmethod
     @classmethod
-    def verify(cls,owner,operator):
+    def verify(cls,owner):
         if configure.PermissionActive:
         if configure.PermissionActive:
+            operator = current_token.user.username
             if configure.PermissionActive and operator != "admin" and owner !=operator:
             if configure.PermissionActive and operator != "admin" and owner !=operator:
                 raise Exception("缺乏权限！")
                 raise Exception("缺乏权限！")

-<VirtualHost *:80>
-    ServerName 172.26.60.101
+Listen 81
+<VirtualHost *:81>
+    ServerName 172.26.60.100
     WSGIDaemonProcess yourapplication processes=4 threads=16
     WSGIDaemonProcess yourapplication processes=4 threads=16
     WSGIScriptAlias / /usr/src/app/run.wsgi
     WSGIScriptAlias / /usr/src/app/run.wsgi
     WSGIPassAuthorization On
     WSGIPassAuthorization On
@@ -11,11 +12,9 @@
         Require all granted
         Require all granted
     </Directory>
     </Directory>
 </VirtualHost>
 </VirtualHost>
-
-Listen 81
-
-<VirtualHost *:81>
-    ServerName 172.26.60.101
+Listen 82
+<VirtualHost *:82>
+    ServerName 172.26.60.100
     WSGIDaemonProcess monitormanager processes=1 threads=8
     WSGIDaemonProcess monitormanager processes=1 threads=8
     WSGIScriptAlias / /usr/src/app/monitor.wsgi
     WSGIScriptAlias / /usr/src/app/monitor.wsgi
     WSGIPassAuthorization On
     WSGIPassAuthorization On