Browse Source

修改配置

gushoubang 1 month ago
parent
commit
f65ab7ce4f

+ 4 - 4
encrypt/siwei_config.json

@@ -1,15 +1,15 @@
 {
 {
   "db": {
   "db": {
-    "host": "192.168.60.52",
+    "host": "192.168.60.2",
     "port": "5432",
     "port": "5432",
     "schema": "vector",
     "schema": "vector",
     "schema_base": "base",
     "schema_base": "base",
     "user": "postgres",
     "user": "postgres",
-    "password": "postgres",
+    "password": "postgis",
     "name": "real3d"
     "name": "real3d"
   },
   },
   "redis": {
   "redis": {
-    "host": "192.168.60.220",
+    "host": "192.168.60.2",
     "port": 6379,
     "port": 6379,
     "db": 0
     "db": 0
   },
   },
@@ -22,7 +22,7 @@
     "cacheend": "15"
     "cacheend": "15"
   },
   },
   "ftp": {
   "ftp": {
-    "host": "192.168.60.52",
+    "host": "192.168.60.2",
     "port": 2021,
     "port": 2021,
     "username": "user1",
     "username": "user1",
     "password": "password"
     "password": "password"

+ 1 - 1
encrypt/siwei_config.json.enc

@@ -1 +1 @@
-gAAAAABoB1it0uNeIQdbvJzOVcUeeu1xBsaDbCojMB6IOByxt5m-ZiQNl_eaXrvrCjPgZO4DHHURYVx0E4pLOYD-kI7uZqW3JjV1FidTi7Di5D-86k7zIxUkcbeA981Ju_j0XiRmghhcNfBYl7ZnOst-Oi_31VP1dh_bhaBjqCtt4K1tpU7RcmTXCmSlBcqBY56_u5KYSRglnhbE1_Bhud_bBXVkxpBH5cWNfPaw8e1Gih9xOrJ6cw0481oDV1m9mmH4wJJYGMhsWDi4KuMwDGkbizDkwU2GKgqtOwhvKM8vOUJj3aZ5AmhkN2TZI8_VFi410pXX3aYqQ8zMRRpgTd4jlLybuvNabWNrlVho4Q20UzrkdSZuJmr6OyZINmWWJU5zDPvEeMuXzjsA57m284nCx5Q2DC2keK4QtSy70__jMmHIkqP427jguUKQd-gw63SsVyDJs-q0JBPFIEp9jTW98HDnP0nw_-lX09eP1U9CIfJnCBHo2LrqEL8Fc_QiWCI252LKHmyHPmZu91mnxXlim4fJy-T4PP1ruWBaxQYes8UspZ3owNoazj_WYOYNPw4vy_Jy2gx83gFoANlk-G0bLNeTQoRrJETguRnIu6p_HttvvpctZIUfYX11tx0-FPIMZoRBMnNCB2ZR958XrwkgMTXX3NIewrykGCYDAmsOFC0ZwNXF5v3x6RkbvSRAhx041GKx18gr0TJdRkqBhSwrS_loxSIossXSesadtIIpTHEAozuDJHDjIrBHeKRECX5e5AOpQoLsH6nh_AD-0aarOKokXn_HLIygtw4XHxL0nntZ4BUf0067nntXjNZKWSQDLxwoxNXmHSzjuqsoX5p4yv_-15Z8ag==
+gAAAAABoCYxz6ecLF6ug4VhXIa9ooe17qM9noz4giCrirrG2sxoOlQ4_ZR9es_qh1uLCdqtJWbfKKt_BqcyqO_F3ai7mNilC4F3FTL3QmqY1hX9dgoXvt19BDlUXZdzjCMME35S_ucEO5LNLqFLeSzx9FNOLKJWnzB-OPIgA57jgY0YOKkSXe50DdrEeMH286MzIklrvOy0tSt8GWDSQBToCfBVN_FqyZWm78NKGXrEEibZ8ZS8ISn2xX8Zz6TJCNus74PenZiRZJjvv7Sy66x4hvtpcKwj5AxMEPk-Mpsr99vsZGdGmEc-H0flKQBtGyuyIQGDK9e_WAsukGBV0aFZV8IxC93nAVscsg2TvRUB1rJQ7KwEo2rRkwRxh7NIInCPn4RlRwZF5saMrU21lGLxAlE5D6uiGBe35yppvpKTec7IKeWBRXXGvfoiGJbflxoIJlqm9X6Z1--glK1NhT1twZSLcD754DWAfEiINJP0nOQenpQNa6YwBgFcHWUjJM-TquYPHK2a3iPEgnMb45MPOTcfVNres4BHdCWfm-Yae42LxzW8N6fFAth14TXwJ_aFW8Di2vBXD08_dHSkmMISaadeu7cSdx-bcVgpO4H_ECIlDxkuI9MnOog5vEuDQoLp_oow0Xvby3Yc8h-y-TphtQA6cSpL9E1JTlobazrK-TALTd52KqabYK5B1EoZJXAeHJWDtzJpNfpCs13YgenttU68xEatDPUNAnVUV2yp9fJWQsGwIYvB11k61GnMShRPDV61OmxXTFf88bER5hMu8M1FoTN2raDlq7tCE-M8KEOvdl1meTV85wFGmpgQEk6ucUUfS9oWKb_0qi0_5gKBeUDg_dY65og==

+ 72 - 76
processing/algs/gdal/GdalAlgorithmProvider.py

@@ -23,91 +23,53 @@ import os
 
 
 from PyQt5.QtGui import QIcon
 from PyQt5.QtGui import QIcon
 from osgeo import gdal
 from osgeo import gdal
-
+from processing.core.ProcessingConfig import ProcessingConfig, Setting
 from qgis.PyQt.QtCore import QCoreApplication
 from qgis.PyQt.QtCore import QCoreApplication
 from qgis.core import (QgsApplication,
 from qgis.core import (QgsApplication,
                        QgsProcessingProvider,
                        QgsProcessingProvider,
                        QgsRuntimeProfiler)
                        QgsRuntimeProfiler)
-from processing.core.ProcessingConfig import ProcessingConfig, Setting
-from .GdalUtils import GdalUtils
 
 
 from .AssignProjection import AssignProjection
 from .AssignProjection import AssignProjection
-from .aspect import aspect
+from .Buffer import Buffer
-from .buildvrt import buildvrt
 from .ClipRasterByExtent import ClipRasterByExtent
 from .ClipRasterByExtent import ClipRasterByExtent
 from .ClipRasterByMask import ClipRasterByMask
 from .ClipRasterByMask import ClipRasterByMask
+from .ClipVectorByExtent import ClipVectorByExtent
+from .ClipVectorByMask import ClipVectorByMask
 from .ColorRelief import ColorRelief
 from .ColorRelief import ColorRelief
-from .contour import contour, contour_polygon
 from .Datasources2Vrt import Datasources2Vrt
 from .Datasources2Vrt import Datasources2Vrt
-from .fillnodata import fillnodata
+from .Dissolve import Dissolve
-from .gdalinfo import gdalinfo
+from .ExecuteSql import ExecuteSql
-from .gdal2tiles import gdal2tiles
+from .ExportRasterByMask import ExportRasterByMask
-from .gdal2xyz import gdal2xyz
+from .ExportVectorByMask import ExportVectorByMask
-from .gdaladdo import gdaladdo
+from .GdalUtils import GdalUtils
-from .gdalcalc import gdalcalc
-from .gdaltindex import gdaltindex
 from .GridAverage import GridAverage
 from .GridAverage import GridAverage
 from .GridDataMetrics import GridDataMetrics
 from .GridDataMetrics import GridDataMetrics
 from .GridInverseDistance import GridInverseDistance
 from .GridInverseDistance import GridInverseDistance
 from .GridInverseDistanceNearestNeighbor import GridInverseDistanceNearestNeighbor
 from .GridInverseDistanceNearestNeighbor import GridInverseDistanceNearestNeighbor
 from .GridLinear import GridLinear
 from .GridLinear import GridLinear
 from .GridNearestNeighbor import GridNearestNeighbor
 from .GridNearestNeighbor import GridNearestNeighbor
-from .hillshade import hillshade
+from .LicenseMake import LicenseMake
-from .merge import merge
-from .nearblack import nearblack
-from .pct2rgb import pct2rgb
-from .polygonize import polygonize
-from .proximity import proximity
-from .rasterize import rasterize
-from .rearrange_bands import rearrange_bands
-from .retile import retile
-from .rgb2pct import rgb2pct
-from .roughness import roughness
-from .sieve import sieve
-from .slope import slope
-from .translate import translate
-from .tpi import tpi
-from .tri import tri
-from .warp import warp
-from .pansharp import pansharp
-from .rasterize_over_fixed_value import rasterize_over_fixed_value
-from .viewshed import viewshed
-
-from .extractprojection import ExtractProjection
-from .rasterize_over import rasterize_over
-
-from .Buffer import Buffer
-from .ClipVectorByExtent import ClipVectorByExtent
-from .ClipVectorByMask import ClipVectorByMask
-from .Dissolve import Dissolve
-from .ExecuteSql import ExecuteSql
 from .OffsetCurve import OffsetCurve
 from .OffsetCurve import OffsetCurve
-from .ogr2ogr import ogr2ogr
-from .ogrinfo import ogrinfo
 from .OgrToPostGis import OgrToPostGis
 from .OgrToPostGis import OgrToPostGis
-from .ogr2ogrtopostgislist import Ogr2OgrToPostGisList
-from .rastertopostgislist import Ogr2PostGisList
-from .postgistogeoserver import Postgistogeoserver
-from .postgisupdate import Postgisupdate
-from .postgisrestore import Postgisrestore
 from .OneSideBuffer import OneSideBuffer
 from .OneSideBuffer import OneSideBuffer
 # from .spotfileupload import SpotfileUpload
 # from .spotfileupload import SpotfileUpload
 # from .spotfiledownload import SpotfileDownload
 # from .spotfiledownload import SpotfileDownload
 # from .spotfiledelete import SpotfileDelete
 # from .spotfiledelete import SpotfileDelete
 from .PointsAlongLines import PointsAlongLines
 from .PointsAlongLines import PointsAlongLines
-from .ExportVectorByMask import ExportVectorByMask
-from .ExportRasterByMask import ExportRasterByMask
-from .gdbtopostgislist import GdbToPostGisList
-from .VectorProject import VectorProject
-from .LicenseMake import LicenseMake
 from .Topology.A00 import A00
 from .Topology.A00 import A00
 from .Topology.A01 import A01
 from .Topology.A01 import A01
 from .Topology.A02 import A02
 from .Topology.A02 import A02
 from .Topology.A03 import A03
 from .Topology.A03 import A03
 from .Topology.A04 import A04
 from .Topology.A04 import A04
 from .Topology.A05 import A05
 from .Topology.A05 import A05
-from .Topology.P00 import P00
+from .Topology.AA01 import AA01
-from .Topology.P01 import P01
+from .Topology.AA02 import AA02
+from .Topology.AA03 import AA03
+from .Topology.AA04 import AA04
+from .Topology.AA05 import AA05
+from .Topology.AL01 import AL01
+from .Topology.AP01 import AP01
+from .Topology.AP02 import AP02
 from .Topology.L00 import L00
 from .Topology.L00 import L00
 from .Topology.L01 import L01
 from .Topology.L01 import L01
 from .Topology.L02 import L02
 from .Topology.L02 import L02
@@ -119,30 +81,64 @@ from .Topology.L07 import L07
 from .Topology.L08 import L08
 from .Topology.L08 import L08
 from .Topology.L09 import L09
 from .Topology.L09 import L09
 from .Topology.L10 import L10
 from .Topology.L10 import L10
-from .Topology.PP01 import PP01
+from .Topology.LA01 import LA01
-from .Topology.PP02 import PP02
+from .Topology.LA02 import LA02
-from .Topology.PL01 import PL01
+from .Topology.LA03 import LA03
-from .Topology.PL02 import PL02
-from .Topology.PA01 import PA01
-from .Topology.PA02 import PA02
-from .Topology.PA03 import PA03
-from .Topology.LP01 import LP01
 from .Topology.LL01 import LL01
 from .Topology.LL01 import LL01
 from .Topology.LL02 import LL02
 from .Topology.LL02 import LL02
 from .Topology.LL03 import LL03
 from .Topology.LL03 import LL03
 from .Topology.LL04 import LL04
 from .Topology.LL04 import LL04
-from .Topology.LA01 import LA01
+from .Topology.LP01 import LP01
-from .Topology.LA02 import LA02
+from .Topology.P00 import P00
-from .Topology.LA03 import LA03
+from .Topology.P01 import P01
-from .Topology.AP01 import AP01
+from .Topology.PA01 import PA01
-from .Topology.AP02 import AP02
+from .Topology.PA02 import PA02
-from .Topology.AL01 import AL01
+from .Topology.PA03 import PA03
-from .Topology.AA01 import AA01
+from .Topology.PL01 import PL01
-from .Topology.AA02 import AA02
+from .Topology.PL02 import PL02
-from .Topology.AA03 import AA03
+from .Topology.PP01 import PP01
-from .Topology.AA04 import AA04
+from .Topology.PP02 import PP02
-from .Topology.AA05 import AA05
+from .VectorProject import VectorProject
-from .topologycheck import TopologyCheck
+from .aspect import aspect
+from .buildvrt import buildvrt
+from .contour import contour, contour_polygon
+from .extractprojection import ExtractProjection
+from .fillnodata import fillnodata
+from .gdal2tiles import gdal2tiles
+from .gdal2xyz import gdal2xyz
+from .gdaladdo import gdaladdo
+from .gdalcalc import gdalcalc
+from .gdalinfo import gdalinfo
+from .gdaltindex import gdaltindex
+from .gdbtopostgislist import GdbToPostGisList
+from .hillshade import hillshade
+from .merge import merge
+from .nearblack import nearblack
+from .ogr2ogr import ogr2ogr
+from .ogr2ogrtopostgislist import Ogr2OgrToPostGisList
+from .ogrinfo import ogrinfo
+from .pansharp import pansharp
+from .pct2rgb import pct2rgb
+from .polygonize import polygonize
+from .postgisrestore import Postgisrestore
+from .postgistogeoserver import Postgistogeoserver
+from .postgisupdate import Postgisupdate
+from .proximity import proximity
+from .rasterize import rasterize
+from .rasterize_over import rasterize_over
+from .rasterize_over_fixed_value import rasterize_over_fixed_value
+from .rastertopostgislist import Ogr2PostGisList
+from .rearrange_bands import rearrange_bands
+from .retile import retile
+from .rgb2pct import rgb2pct
+from .roughness import roughness
+from .sieve import sieve
+from .slope import slope
+from .tpi import tpi
+from .translate import translate
+from .tri import tri
+from .viewshed import viewshed
+from .warp import warp
 
 
 # from .ogr2ogrtabletopostgislist import Ogr2OgrTableToPostGisList
 # from .ogr2ogrtabletopostgislist import Ogr2OgrTableToPostGisList