From d6d507b3b64755ddba8168ee87b65e2028790da3 Mon Sep 17 00:00:00 2001 From: zhanghongqing Date: Mon, 20 Feb 2023 15:30:13 +0800 Subject: [PATCH] =?UTF-8?q?=E7=95=8C=E9=9D=A2=E8=B0=83=E6=95=B4=EF=BC=8C?= =?UTF-8?q?=E9=9A=90=E8=97=8F=E5=86=97=E4=BD=99=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/mesasoft/cn/sketch/api/ChinaZ.java | 3 +- .../resources/application-sketch.properties | 4 +- src/main/resources/application.properties | 12 +- src/main/resources/static/index.html | 11 +- src/main/resources/static/signin.html | 4 +- webskt-query-agent.iml | 178 ++++++++++++++++++ 6 files changed, 194 insertions(+), 18 deletions(-) create mode 100644 webskt-query-agent.iml diff --git a/src/main/java/com/mesasoft/cn/sketch/api/ChinaZ.java b/src/main/java/com/mesasoft/cn/sketch/api/ChinaZ.java index 218b8f9..d98b717 100644 --- a/src/main/java/com/mesasoft/cn/sketch/api/ChinaZ.java +++ b/src/main/java/com/mesasoft/cn/sketch/api/ChinaZ.java @@ -106,7 +106,7 @@ public class ChinaZ { String fqdn = record.getString("domain_name"); String domainName = record.getString("domain_host"); - Integer matchPattern = fqdn.equals(domainName) ? EXACTLY_MATCHING : SUFFIX_MATCHING; + Integer matchPattern = fqdn.equals(domainName) ? 1 : 2; String source = "chinaz"; // json处理 @@ -179,7 +179,6 @@ public class ChinaZ { icp.setSource(CHINAZ); icp.setMatch_pattern(queryDomain.equals(res.getString("MainPage")) ? EXACTLY_MATCHING : SUFFIX_MATCHING); icp.setQuery_success(jsonRes.getBoolean("StateCode")); - // icp.setIs_accessible(); icp.setIcp_owner(res.getString("Owner")); icp.setIcp_company_name(res.getString("CompanyName")); icp.setIcp_company_type(res.getString("CompanyType")); diff --git a/src/main/resources/application-sketch.properties b/src/main/resources/application-sketch.properties index df837bf..0dacc23 100644 --- a/src/main/resources/application-sketch.properties +++ b/src/main/resources/application-sketch.properties @@ -1,5 +1,5 @@ #datasource -spring.datasource.url=jdbc:mysql://192.168.45.102:3306/web_sketch_v2?useUnicode=true&characterEncoding=utf-8&useSSL=true +spring.datasource.url=jdbc:mysql://192.168.44.12:3306/web_sketch_v2?useUnicode=true&characterEncoding=utf-8&useSSL=true spring.datasource.username=root spring.datasource.password=galaxy2019 @@ -46,5 +46,5 @@ chinaz.usereport-filepath = chinaz_query_count.csv #顶级域名 sketch.tld.file = public_suffix_list_only.dat -sketch.home.path=/home/test/sketch +sketch.home.path=C:\\test diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties index b494907..b942e1d 100644 --- a/src/main/resources/application.properties +++ b/src/main/resources/application.properties @@ -46,15 +46,15 @@ spring.devtools.restart.exclude=WEB-INF/** #spring.mvc.favicon.enabled=false swagger.enabled=true -swagger.title=线上文件管理系统 -swagger.description=上传、下载、分享、远程文件管理 +swagger.title=File Manager +swagger.description=upload,download,export,search swagger.version=1.2 swagger.license=MIT -swagger.licenseUrl=https://opensource.org/licenses/MIT -swagger.termsOfServiceUrl=https://github.com/code4everything/efo +swagger.licenseUrl=test +swagger.termsOfServiceUrl=test swagger.contact.name=e -swagger.contact.url=https://github.e.com -swagger.contact.email=.com +swagger.contact.url=test +swagger.contact.email=test.com swagger.base-package=com.mesasoft.cn swagger.base-path=/** swagger.exclude-path=/error, /ops/** diff --git a/src/main/resources/static/index.html b/src/main/resources/static/index.html index a643d02..956b71a 100644 --- a/src/main/resources/static/index.html +++ b/src/main/resources/static/index.html @@ -40,19 +40,19 @@
  • 文件列表
    • -
  • +
    • -
  • +
    • -
  • +
    • -
  • +
    • -
  • +
    • @@ -62,7 +62,6 @@ placeholder="搜索" id="search"/> -->
    - 退出
    diff --git a/src/main/resources/static/signin.html b/src/main/resources/static/signin.html index 46c4538..8cc4fe3 100644 --- a/src/main/resources/static/signin.html +++ b/src/main/resources/static/signin.html @@ -3,7 +3,7 @@ - + @@ -37,7 +37,7 @@
    -
    +
    diff --git a/webskt-query-agent.iml b/webskt-query-agent.iml new file mode 100644 index 0000000..8f3fa2c --- /dev/null +++ b/webskt-query-agent.iml @@ -0,0 +1,178 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file