소스 검색

证书调整

mxs 3 일 전
부모
커밋
41ce8a17ee
7개의 변경된 파일209개의 추가작업 그리고 113개의 파일을 삭제
  1. 48 2
      frontend/src/data/filters.js
  2. 26 1
      frontend/src/views/CodeList.vue
  3. 26 1
      frontend/src/views/ReviewList.vue
  4. 26 26
      httpclient/keys/ca.crt
  5. 26 26
      httpclient/keys/client.crt
  6. 50 50
      httpclient/keys/client.key
  7. 7 7
      main.go

+ 48 - 2
frontend/src/data/filters.js

@@ -33,10 +33,10 @@ export const spiderStateOptions = [
     label: '已上线',
     label: '已上线',
     value: 11,
     value: 11,
   },
   },
-  /*{
+  {
     label: '无法标注',
     label: '无法标注',
     value: 12,
     value: 12,
-  },*/
+  },
 ]
 ]
 
 
 // codeList审核列表爬虫状态备选项
 // codeList审核列表爬虫状态备选项
@@ -125,3 +125,49 @@ export const rollbackReasonList = [
     value: '平台无法处理',
     value: '平台无法处理',
   },
   },
 ]
 ]
+
+export const infoformatList = [
+  {
+    label: '招标',
+    value: 1,
+  },
+  {
+    label: '拟建/审批',
+    value: 2,
+  },
+  {
+    label: '产权',
+    value: 3,
+  },
+  {
+    label: '舆情',
+    value: 4,
+  },
+  {
+    label: '新闻',
+    value: 5,
+  },
+]
+
+export const autotypeList = [
+  {
+    label: '常规',
+    value: -1,
+  },
+  {
+    label: '常规',
+    value: 0,
+  },
+  {
+    label: 'AI',
+    value: 1,
+  },
+  {
+    label: '整站',
+    value: 2,
+  },
+  // {
+  //   label: '常规',
+  //   value: undefined,
+  // },
+]

+ 26 - 1
frontend/src/views/CodeList.vue

@@ -59,10 +59,12 @@
                 <el-table-column prop="site" label="网站" align="left" show-overflow-tooltip></el-table-column>
                 <el-table-column prop="site" label="网站" align="left" show-overflow-tooltip></el-table-column>
                 <el-table-column prop="channel" label="栏目" align="left" show-overflow-tooltip></el-table-column>
                 <el-table-column prop="channel" label="栏目" align="left" show-overflow-tooltip></el-table-column>
                 <el-table-column prop="code" label="代码" align="left" show-overflow-tooltip></el-table-column>
                 <el-table-column prop="code" label="代码" align="left" show-overflow-tooltip></el-table-column>
+                <el-table-column prop="infoformatText" label="类型" width="60" align="left" show-overflow-tooltip></el-table-column>
                 <el-table-column prop="stateText" label="爬虫状态" width="80" align="center" show-overflow-tooltip></el-table-column>
                 <el-table-column prop="stateText" label="爬虫状态" width="80" align="center" show-overflow-tooltip></el-table-column>
                 <el-table-column prop="claimText" label="认领状态" width="100" align="center" show-overflow-tooltip></el-table-column>
                 <el-table-column prop="claimText" label="认领状态" width="100" align="center" show-overflow-tooltip></el-table-column>
                 <el-table-column prop="href" label="栏目地址" show-overflow-tooltip></el-table-column>
                 <el-table-column prop="href" label="栏目地址" show-overflow-tooltip></el-table-column>
                 <el-table-column prop="modifyUserText" label="维护人" width="120" align="center" show-overflow-tooltip></el-table-column>
                 <el-table-column prop="modifyUserText" label="维护人" width="120" align="center" show-overflow-tooltip></el-table-column>
+                <el-table-column prop="autotypeText" label="AI/整站" align="center" show-overflow-tooltip></el-table-column>
                 <el-table-column label="操作" width="160" align="center">
                 <el-table-column label="操作" width="160" align="center">
                     <template #default="scope">
                     <template #default="scope">
                   <!-- <el-tooltip content="标注" placement="top">
                   <!-- <el-tooltip content="标注" placement="top">
@@ -164,7 +166,7 @@ import RunSpiderDialog from "../components/spider/RunSpiderDialog.vue"
 import VerifySpider from "../components/spider/VerifySpider.vue"
 import VerifySpider from "../components/spider/VerifySpider.vue"
 import { useCodeListFiltersWithRole } from '../composables/filter-options'
 import { useCodeListFiltersWithRole } from '../composables/filter-options'
 import { USER_ROLE_ADMIN, USER_ROLE_DEVELOPER, USER_ROLE_REVIEWER } from '../data/user'
 import { USER_ROLE_ADMIN, USER_ROLE_DEVELOPER, USER_ROLE_REVIEWER } from '../data/user'
-import { rollbackReasonList } from "../data/index.js";
+import {rollbackReasonList, infoformatList, autotypeList} from "../data/index.js";
 import { Refresh, Search, Box } from '@element-plus/icons-vue'
 import { Refresh, Search, Box } from '@element-plus/icons-vue'
 const isAdmin = computed(() => [USER_ROLE_ADMIN].includes(userRole.value))
 const isAdmin = computed(() => [USER_ROLE_ADMIN].includes(userRole.value))
 const router = useRouter();
 const router = useRouter();
@@ -341,6 +343,25 @@ const calcModifyUserText = (state) => {
         return state.modifyuser
         return state.modifyuser
     }
     }
 }
 }
+const calcInfoformatText = (row) => {
+    const infoformat = row.infoformat;
+    const target = infoformatList.find(r => r.value === infoformat)
+    if (target) {
+      return target.label
+    } else {
+      return ''
+    }
+}
+const calcAutoTypeText = (row) => {
+  const autotype = row.autotype;
+  const target = autotypeList.find(r => r.value === autotype)
+  if (target) {
+    return target.label
+  } else {
+    return ''
+  }
+}
+
 // 获取列表数据
 // 获取列表数据
 async function getTableList() {
 async function getTableList() {
     listState.loading = true
     listState.loading = true
@@ -364,6 +385,8 @@ async function getTableList() {
                         stateText: calcStateText(t.state),
                         stateText: calcStateText(t.state),
                         claimText: calcClaimText(t.claimtype),
                         claimText: calcClaimText(t.claimtype),
                         modifyUserText: calcModifyUserText(t),
                         modifyUserText: calcModifyUserText(t),
+                        infoformatText: calcInfoformatText(t),
+                        autotypeText: calcAutoTypeText(t),
                         // 操作按钮是否点击过
                         // 操作按钮是否点击过
                         _action_clicked_mark: false,
                         _action_clicked_mark: false,
                         _action_clicked_edit: false,
                         _action_clicked_edit: false,
@@ -611,6 +634,8 @@ const getLuaParams = row => {
         priority: row.priority,
         priority: row.priority,
         spiderimportant: row.spiderimportant,
         spiderimportant: row.spiderimportant,
         modifytime: row.modifytime,
         modifytime: row.modifytime,
+        infoformat: row.infoformat,
+        autotype: row.autotype,
     }
     }
     return baseInfo
     return baseInfo
 }
 }

+ 26 - 1
frontend/src/views/ReviewList.vue

@@ -62,10 +62,12 @@
                 <el-table-column prop="site" label="网站" align="left" show-overflow-tooltip></el-table-column>
                 <el-table-column prop="site" label="网站" align="left" show-overflow-tooltip></el-table-column>
                 <el-table-column prop="channel" label="栏目" align="left" show-overflow-tooltip></el-table-column>
                 <el-table-column prop="channel" label="栏目" align="left" show-overflow-tooltip></el-table-column>
                 <el-table-column prop="code" label="代码" align="left" show-overflow-tooltip></el-table-column>
                 <el-table-column prop="code" label="代码" align="left" show-overflow-tooltip></el-table-column>
+                <el-table-column prop="infoformatText" label="类型" width="60" align="left" show-overflow-tooltip></el-table-column>
                 <el-table-column prop="stateText" label="爬虫状态" width="80" align="center" show-overflow-tooltip></el-table-column>
                 <el-table-column prop="stateText" label="爬虫状态" width="80" align="center" show-overflow-tooltip></el-table-column>
                 <el-table-column prop="claimText" label="认领状态" width="100" align="center" show-overflow-tooltip></el-table-column>
                 <el-table-column prop="claimText" label="认领状态" width="100" align="center" show-overflow-tooltip></el-table-column>
                 <el-table-column prop="href" label="栏目地址" show-overflow-tooltip></el-table-column>
                 <el-table-column prop="href" label="栏目地址" show-overflow-tooltip></el-table-column>
                 <el-table-column prop="modifyuser" label="维护人" width="80" align="center" show-overflow-tooltip></el-table-column>
                 <el-table-column prop="modifyuser" label="维护人" width="80" align="center" show-overflow-tooltip></el-table-column>
+                <el-table-column prop="autotypeText" label="AI/整站" align="center" show-overflow-tooltip></el-table-column>
                 <el-table-column label="操作" width="160" align="center">
                 <el-table-column label="操作" width="160" align="center">
                     <template #default="scope">
                     <template #default="scope">
                   <!-- <el-tooltip content="标注" placement="top">
                   <!-- <el-tooltip content="标注" placement="top">
@@ -184,7 +186,7 @@ import VerifySpider from "../components/spider/VerifySpider.vue"
 import { useReviewListFiltersWithRole } from '../composables/filter-options'
 import { useReviewListFiltersWithRole } from '../composables/filter-options'
 import { USER_ROLE_ADMIN, USER_ROLE_DEVELOPER, USER_ROLE_REVIEWER } from '../data/user'
 import { USER_ROLE_ADMIN, USER_ROLE_DEVELOPER, USER_ROLE_REVIEWER } from '../data/user'
 import { Refresh, Search, Box } from '@element-plus/icons-vue'
 import { Refresh, Search, Box } from '@element-plus/icons-vue'
-import { rollbackReasonList } from "../data/index.js";
+import {autotypeList, infoformatList, rollbackReasonList} from "../data/index.js";
 
 
 const router = useRouter();
 const router = useRouter();
 const store = useStore();
 const store = useStore();
@@ -357,6 +359,25 @@ const calcClaimText = (state) => {
         return ''
         return ''
     }
     }
 }
 }
+const calcInfoformatText = (row) => {
+  const infoformat = row.infoformat;
+  const target = infoformatList.find(r => r.value === infoformat)
+  if (target) {
+    return target.label
+  } else {
+    return ''
+  }
+}
+const calcAutoTypeText = (row) => {
+  const autotype = row.autotype;
+  const target = autotypeList.find(r => r.value === autotype)
+  if (target) {
+    return target.label
+  } else {
+    return ''
+  }
+}
+
 // 获取列表数据
 // 获取列表数据
 async function getTableList() {
 async function getTableList() {
     listState.loading = true
     listState.loading = true
@@ -379,6 +400,8 @@ async function getTableList() {
                         ...t,
                         ...t,
                         stateText: calcStateText(t.state),
                         stateText: calcStateText(t.state),
                         claimText: calcClaimText(t.claimtype),
                         claimText: calcClaimText(t.claimtype),
+                        infoformatText: calcInfoformatText(t),
+                        autotypeText: calcAutoTypeText(t),
                         // 操作按钮是否点击过
                         // 操作按钮是否点击过
                         _action_clicked_mark: false,
                         _action_clicked_mark: false,
                         _action_clicked_edit: false,
                         _action_clicked_edit: false,
@@ -645,6 +668,8 @@ const getLuaParams = row => {
         spiderimportant: row.spiderimportant,
         spiderimportant: row.spiderimportant,
         modifytime: row.modifytime,
         modifytime: row.modifytime,
         state: row.state,
         state: row.state,
+        infoformat: row.infoformat,
+        autotype: row.autotype,
     }
     }
     return baseInfo
     return baseInfo
 }
 }

+ 26 - 26
httpclient/keys/ca.crt

@@ -1,32 +1,32 @@
 -----BEGIN CERTIFICATE-----
 -----BEGIN CERTIFICATE-----
-MIIFdTCCA10CFD88ikbzq6OJOHUXiw26JuE06gIXMA0GCSqGSIb3DQEBCwUAMHcx
+MIIFdTCCA10CFHnlEWRdBDVrhF4ldCFTpdg4gPchMA0GCSqGSIb3DQEBCwUAMHcx
 CzAJBgNVBAYTAkNOMQ4wDAYDVQQIDAVIZU5hbjESMBAGA1UEBwwJWmhlbmdaaG91
 CzAJBgNVBAYTAkNOMQ4wDAYDVQQIDAVIZU5hbjESMBAGA1UEBwwJWmhlbmdaaG91
 MQ8wDQYDVQQKDAZqaWFueXUxDDAKBgNVBAsMA2RldjElMCMGA1UEAwwcanNzcGlk
 MQ8wDQYDVQQKDAZqaWFueXUxDDAKBgNVBAsMA2RldjElMCMGA1UEAwwcanNzcGlk
-ZXIuanlkZXYuamlhbnl1MzYwLmNvbTAeFw0yNTA3MTEwOTEyMDdaFw0zNTA3MDkw
-OTEyMDdaMHcxCzAJBgNVBAYTAkNOMQ4wDAYDVQQIDAVIZU5hbjESMBAGA1UEBwwJ
+ZXIuanlkZXYuamlhbnl1MzYwLmNvbTAeFw0yNTA0MDcwODM4NDVaFw0zNTA0MDUw
+ODM4NDVaMHcxCzAJBgNVBAYTAkNOMQ4wDAYDVQQIDAVIZU5hbjESMBAGA1UEBwwJ
 WmhlbmdaaG91MQ8wDQYDVQQKDAZqaWFueXUxDDAKBgNVBAsMA2RldjElMCMGA1UE
 WmhlbmdaaG91MQ8wDQYDVQQKDAZqaWFueXUxDDAKBgNVBAsMA2RldjElMCMGA1UE
 AwwcanNzcGlkZXIuanlkZXYuamlhbnl1MzYwLmNvbTCCAiIwDQYJKoZIhvcNAQEB
 AwwcanNzcGlkZXIuanlkZXYuamlhbnl1MzYwLmNvbTCCAiIwDQYJKoZIhvcNAQEB
-BQADggIPADCCAgoCggIBAIa7zFjbp/SDhfp9nKboxsVUYXP69loJowghyjpi6Pvl
-hdUR4YgBQawgsXeeF07NXGpMjPr2uQwwaU4w2pFfqBNmbBdueNer52KrweRaCxxJ
-mKPnIEUCMF/M1McEGhpYJyBtBWYvh3IhO3XaNla1xWl8kQ8SLkJg7t0beWiO4+fz
-KRRVsjHCpeUwNAxbVwho4Z7d0bCfM2A/a6m1zqX2FXYbMPHxnpWhjYaq70/wnYOD
-3oUmIOpi7okNcLG12m752pzSDBlzbFsMTZS4YSISzAazwdipS4KXltCpRnpn9xpi
-7oxUfwjduHTRuErual/L/Ugn1qOApvn89c6VMKcbIBEUK0SjWWt/QILO6VxDT81v
-zS2MoiWhA5sEiolo+6EEyV7d4u6jSzUAPj3FekLgandPvzrpF5JbmtvsLTiXy4Tn
-4KGTVNwJRVqKljQ+LqDqRx/3MZzXeDiE2+c9d2JSjreUOpyhf/d6imQhvR3hAOAi
-ffSXdUE4sZ48kZ3Tfl/9DT920O059hK4zoHCPI+h6Bkvg5SFNM0Ufytl7c7qyXfN
-/pCju+qfcguDO+ssjDuSJUrfNIkiocXhKzUom+pk7JHjq0byUeCrz0YzbB7F6zPw
-m78am+Pa6bwO7g2p3IN3klN0HOLkuTJudg05xSRGJ6ikr8Y12o2cSMI7zwM6R1zj
-AgMBAAEwDQYJKoZIhvcNAQELBQADggIBACMw7GwmjOlPHtvEzzXRciPfPG+l5/Eq
-kcf5Wg9OludsAL+rcOWPRsO9YZXcXzqJ+j7M+cxPd7ZETiQodbfQcjq+TCfIPFFR
-HFH/UlKMnJg25tJZ4tcSz86Wg1yG4sI7JDqgTqPiiWI5TKqcFuBQYdYLcANQhg/8
-KKXu0FJCd4xg4csOW+IxcHG5QllXTHF27+a09FuBUDG1bc0h455hpV1OZwoSWa8h
-W4pdPf3HJ9ltg7P0kLTMCCS367PqW5BP5+HaU5plHhZn8nCFf+h8cmGUVsRh4Mhm
-G4lR8Rnd2N8PN0UWd0HXJM2arXH2kfS7X2x3/7vdejkWNV6fLn1/YQc/cmJLCHST
-JN+ZX70T5REWODoxQ/h+RZu/OLNYNnS1+2CGnz+ude36Vp6rB27jFDsd1Ej0/qaN
-0hQ0ZpGYE4RACKvU1EXfOpdqwEl0tFFV19RWZGbPCXdSEUC2R6xm9h+oGixCM7b/
-kGuXsjnGGAaGp8TkLSkJqz+9r6LtmclG03BdS9EYG/kqci9shDM8QQxa/bk13M6Z
-PrnaquVfJQPQqn90swr9hnXHLUgo+1M4tUYb38/KBBoG9gBvJ7bVjCqCg0KESqBu
-FjoYtoK44zem1mH75RCgwCAWWeU9bipg4A0HRz+ApeAltbtT9Y6sQ7P37WdCO2oW
-hlagSHR2Zuho
+BQADggIPADCCAgoCggIBAKvBuUsG3Fxqwk285ijOwGnFXYZkI8XPJdTqdVNcpZIC
+5S9FjMZCOqP3Bk87EXyB7HcIkRdFLExhx9cji6dm4AIFXSvb/TNMJHnTOQAPbN0O
+Wwt36gH9UMfpbhUKF36CZesq4zAOpCbyaH/7/7Kpe40UGqOaWCn5PcFX/50Q9qN3
+CJzJw0CNWN5OFE0GmC/OLDe6/uQhgfLCel5NcsL/8Zk7WeU2HIWpkGCVAH+oW/HW
+GXQmE5CRB1ZlLSMs7+muBSIC6uLOmg0g3hAurirzkRks2OTYMj4mfvm/IGg4HCaW
+OJXg4N7yDH7G7CwX0Sc8Wmcwiv/anjmamAiDdSIjxWQbppxSaGwj73jTRMy1Ouby
+VBby+fcTdU3XRRl/JSPphr86AyFvJV3KDAUIvAvgnm4mhClRBvLaOplb0jZSoRJO
+9bj0T1Y1YIu4fkLNY1rIaZ2bHytQvIy/KhpiMeXpWK2nUnu3Rf2vaRXpJQNCKIzP
+aXudRnWZwsu/XkuKqdB71JHV7AcTXEJqVwSMlUzVRZABgt2uKjE/wkTLptMR286U
+oqMKttKGxYehOu2rg5xq/0e3ZuMuhwuuUpWq27lBYqvZ46N8R5fLp59rqJesswjg
+IgPXOJKGuBofuUrZIX0TsYLrl6Ph6doBe9m9TOqK8IxyyfRBvkMv1vxTiO/OxvLn
+AgMBAAEwDQYJKoZIhvcNAQELBQADggIBAI2VEUnnAEJKoCC+BW1MLIEbC6DBdHY8
+ms6dB0RU93hne5SS1cirl0LX5JYsRcyWLFGOc/mwecgPwg28FG7m2SOZD3HZYTT9
+fGXamYaiTbmaLJWu7p1XPGgAsAfkHkEcxDi6KpqaAQE4mgUlEX4mtf9Hx83zA+2v
+1JK5PciUNbKc3/Kn+JRfyIXKk36DHrmnWQiqJdZ2eqtlnzJhM6ZuYGAJvFfqkA0r
+psRpxDfmua6QcIoLzOxvrfwbvCF6qKJjC/QcCB5PmTFCo3foUFcNmXe7Gy/Ix+YY
+ApM8XbXZgsjkgKx2OGbQXBJZbYz0ox8hf2Kw8pT13wV4cLNEZCw0ZvInWLKPFl/9
+Ag+041vIYbso6PJZu5vOOfb/8SlEmuev4YgBL16deRcO7OPVIhM/yEERcxIdrHMX
+V8fIwCsPYVfGYTdH433f17F4bkA+/pccg60IkAlJwdOJhOt6EXT1wVVvrWf6N18b
+SOmimIJfk1Ia+0gAgp7owxEAvk8skk9xgATK0XkUGl6fkicUlAnTYqWhUXXC91X2
+pXOhPb75IHQoqwV50Gv09+TxdmXYmGrwdMPCf7kT+SYUjb8HKVHk35NboA/hERdK
+YOh4U5fqaNRh5XfnY1cKzl+d9EGbMhv+YXElIPclw7JM+YC7wtPZ+Eev6HnOrnQh
+hf3yPe7XQe0U
 -----END CERTIFICATE-----
 -----END CERTIFICATE-----

+ 26 - 26
httpclient/keys/client.crt

@@ -1,32 +1,32 @@
 -----BEGIN CERTIFICATE-----
 -----BEGIN CERTIFICATE-----
-MIIFdTCCA10CFAeMJT+gbItYYjZjf5ErlC9zD04wMA0GCSqGSIb3DQEBCwUAMHcx
+MIIFdTCCA10CFBnU5S43k57625IAhGd+Lvdn1w5xMA0GCSqGSIb3DQEBCwUAMHcx
 CzAJBgNVBAYTAkNOMQ4wDAYDVQQIDAVIZU5hbjESMBAGA1UEBwwJWmhlbmdaaG91
 CzAJBgNVBAYTAkNOMQ4wDAYDVQQIDAVIZU5hbjESMBAGA1UEBwwJWmhlbmdaaG91
 MQ8wDQYDVQQKDAZqaWFueXUxDDAKBgNVBAsMA2RldjElMCMGA1UEAwwcanNzcGlk
 MQ8wDQYDVQQKDAZqaWFueXUxDDAKBgNVBAsMA2RldjElMCMGA1UEAwwcanNzcGlk
-ZXIuanlkZXYuamlhbnl1MzYwLmNvbTAeFw0yNTA3MTQwMzU1NTVaFw0yNTA3MTUw
-MzU1NTVaMHcxCzAJBgNVBAYTAkNOMQ4wDAYDVQQIDAVIZU5hbjESMBAGA1UEBwwJ
+ZXIuanlkZXYuamlhbnl1MzYwLmNvbTAeFw0yNTA0MDcwODM5MTZaFw0zNTA0MDUw
+ODM5MTZaMHcxCzAJBgNVBAYTAkNOMQ4wDAYDVQQIDAVIZU5hbjESMBAGA1UEBwwJ
 WmhlbmdaaG91MQ8wDQYDVQQKDAZqaWFueXUxDDAKBgNVBAsMA2RldjElMCMGA1UE
 WmhlbmdaaG91MQ8wDQYDVQQKDAZqaWFueXUxDDAKBgNVBAsMA2RldjElMCMGA1UE
 AwwcanNzcGlkZXIuanlkZXYuamlhbnl1MzYwLmNvbTCCAiIwDQYJKoZIhvcNAQEB
 AwwcanNzcGlkZXIuanlkZXYuamlhbnl1MzYwLmNvbTCCAiIwDQYJKoZIhvcNAQEB
-BQADggIPADCCAgoCggIBAJpyjrWpfCyL5J1N54sm+nZfT6f2dm+96W/gQh6lYh4B
-Bpb9/lu4sHjxxqt4JoLCQd/KBdVCBO1wKruUNkEj96i1sTG5MEfoqDi+nq8Vnuo0
-I421qbytSCOwRYWYFbmFNmGwR17t01qXFhzxkE6jhepQ2kQAFGk29tETrZ7Uirnr
-cuOtt1As3e9Bn3qBvPe8nc3sjHpCpKmyp6RUO2v0/Y739ZYOvJhCNPLowDspfF5P
-X80L83seUxBl5q2Hh6cwgHZmvo5Ynogjhs/B/8gfsvgeWAv6gbms/tqSWWdRGsGf
-jCRSZ4zz2MsyN13jqtXtjTw7HSr/ZbI2et/0LfKm7+g4bfaDUvpKibiDGn/ujxY3
-V1utmHZ86YRJdgfen8EonwVSTYHQR9ZXRizaHkZFI0WwpovI9gwDnxsewDVRZ0kn
-+DE7kU+YeCYH3ZleAdvSU+YJucsEvdIYfD5lzh6KpO68i2vd9OcjGuBZiDwLJfaH
-RiKzxnDrNdzep5jUcLJ2gaV+HgTs1wqQDFOp6JwRLQnMS9ddzXJU/ibxDxxFA8uQ
-bZ1fQc4WB5Dp6GMqMuW0H/Eo0oBNMgTXw2lQdG1VRusj/uuQe7K0vXL5FSaChod2
-pkQFvAC7kFukDoIViQAeg6H9Zqc9W/k/sGqyc/TfBoh/Vb/IG7JBJX6zOcTPZ2tb
-AgMBAAEwDQYJKoZIhvcNAQELBQADggIBAH49idEj1Qn2kBDGHv5kYToBuJ0tkvHU
-IPgzT04jATX+8wsZrgENMP0k0O2YhtZbkj3zlchadRCswnmiXxj65aFQAUxzfdmY
-2LcQOu215p+P4lIMPdBd5tF7/WxYHebrzBG+qO+LyGCK4bcrRVXO0ZPHYegYqCbw
-5JfdxrnJOYfPiPow/aCiCY+ktgJcTd/gl5HESZd1GxpQ8+IpYsZKri5heqppQYda
-9SJyoiAl7zpylj9DQkarRQFoDJzFtF4WaVAYOelbN8gbh29dO9j7rKUlcCX3Y73u
-+onnpup6OMbW6C3iJmocenGo3G63Kt+T29YAHvFI8T7pSA2et4mD+/LTySRCKtmS
-Ou2oX66Cs35nWlAKGgcE0w+b5NwX0wk4BvHqXqNFUSmZ8VfiZGu0EL9Y7KJ7/naH
-4q6HmdW9U4tcSeSVhJXJjswu4AACUHCzxN7w9Hg5uDd8wurNoOpa3zMFR/s/B9lp
-9tYQZTddhwxOePcTXDdh+M+44lpEPKFfR0qbcEqazq5F//cMehsHDIu7dYiDgomR
-Dt6L5fXrNanTkMDfL13HAMzCiDhS3w8uTKjAEUg5T/Pckwx5G/32OjErZq/UqAtX
-32PJOHO7NXhYXMM1o0sgcr+hSBDtGYAojPK9GT1n8eO76RIorkNMfUaPnLkEAVZ/
-MID2rCTU1yfD
+BQADggIPADCCAgoCggIBAK0AY9W2U9h0S382/G+psKTu7olN5rOhNKDS4VAlTGsk
+z+/pXuBHvQ7GAiuDcO3bw+1RMA2x4Lw/oTkThF1FT4KUMU9DPmymlJ/4rRf9XsQ2
+5/ErS4b148F91R/7/LD2pa3vh5kznbfxesZ9azTTuuGxcwe4KIze619eBbgP/bj6
+FdAdKRCz/ExsHJypgqC3Wi/5gWIyFDTlZDFKcyc9xBN0E3aa0pxSMSpwsf0Ea92E
+JCipDiIzd2G0wjfnTCDPO2norCnM6JNhWXaSfKfCrDqLKgJYYNFcrsrJYOLNufvz
+5wl2SoYCj+TlPtXigGPx4we2ZMBsd5SEOhkjYn7tqLsKtVNMQMbCzI43Xrdeu5Gn
+oi/4u8AYDGOn8vw1Ss0Lu++oFx3jzqkGodCj7ojf764erj5S11pKRgVVsRmv955r
+OFPtLOlIQ+209DpG9vNFhJLJ6WoxsmRUxViP/sb4sCSH6JzLt/ZungR/ZQ3Ffr0Z
+FPKkQgh9v7qBh6cFZ9weKse1mYixVFT3xro9p01buv79uE7nbS2Mvl2XYccnJPOi
+XlGE33RHZYuaMB65EWZ+/4OfSFupaZOBTFeTIhHsEKGQF7Lthx/IVAjWZYPj/LsW
+IX+MQMoMDc/6mB5kZWAQy1VSFtDOa5bosyHzGSDiFVhimNYsofaRKeHia8MasDNf
+AgMBAAEwDQYJKoZIhvcNAQELBQADggIBADzGfnjyhAZT0TobX4hJjAJBKmWsRVnP
+sxCUG4oKd/eOAJvjHBEXQj28KaPTcPs39AZ5J7+8ZUb76/6dIsw+AYhtuV0vO+8i
+NqCoE/zOgGfVWVTYbBPzc8UWl/mZzamI1aSmvXw/LoPOc9AkRynEG8Elby0j3AwW
+R8iqQKqE0t/+km1aTBvg+WRKCuAp2WUfIP6xivvY/95f82hLroDS7ULOrHsObMqm
+B+1DtSe8UMfqSDrVRlzCA/CQ2d+pCoMWsv6msoakBO1GE2zl3Wx57xhV/SsZL0IK
+XYV1EAWJviho6rjP+Rd02iX61TUDC/C2h7v//KJCtqT9uBKzAYlNAubI8+TazAFb
+wpK42hJG6WkgtkMgQTuQ422jwNxLgLFgrGqV34KNqrrqkPoO5wZ7dwYsZ2BXXMse
+LlbRvaEvyLoxJpa+GX6qCtHGbdXRpRD5McoYYg1778dBPonyD/9X8icdSE7OgqVE
+xrZ197XdcRreGBzBePqzCnKMer4M38dO/+hia6D6EJd3/ijfZyWU8eEwR5WuVUTf
+spMyILl1pd4gS0bXMJMfeQlcc6XORPrLNWIu04eObZhzdYyZqU3bQkDbh6JeWCE+
+hHytIBBcGIo2gJxwSrdaMjXxDWw781KNgS/IpsX9HxolN4CI+FKtP4BKCuNHrOog
+2RaQyiGc+rzN
 -----END CERTIFICATE-----
 -----END CERTIFICATE-----

+ 50 - 50
httpclient/keys/client.key

@@ -1,52 +1,52 @@
 -----BEGIN PRIVATE KEY-----
 -----BEGIN PRIVATE KEY-----
-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
-63ZUV8AHZ/gjNAIbDVt6YaitiuZRCXZbo2BFLaBHAoIBAHM8NdgL5W8/EdEyzEln
-QB0Me9EVUb2lMtNmVpDga58/dsivWXuk2ih4adXjfH0zmgJdo6uKSurlfUNeEd4S
-ndMQllFZNav+eiV58DVU61++5zdYGjKl6hifge97fhL6czWT1JyFcGofvAVhcn0T
-+hkpPwbcIx18ifIWeeNop3cqAQLWBhqmrbrbZWEfp05OY1STwwssLCSkOwNLE8/K
-jizGYbEj7C+2I1lAO/puvexveRVcN7UdyGPT6IGyMGxubrQMREcxD+qDx59Atce/
-PGqxUVs+7LIgojJQ3jhNgjvOyjyW1lM2blPN4Fs+a+En8/85j+lpCccmbdS2qZh/
-tpUCggEAf1Ogo+LbWhh8dfA7Q2RyBPDT5MSRvgKJUq5XeZP9cQ51wGaXabR4y2n+
-bQVemOynLuB0hQ6HxhF3bwKfC6BoOmCLHghChlaculwHHK0+JlXRjbXaOihv6uh3
-ToGHGf4jIrOXAY5tJaQMhYC8cEHUESuOfS8RuZTt90ZQ0ZW7FVhDKkBKe5kPP5Qx
-z0EQdMqZkSKSKxmG9k0QPBNYHZ/MB1es4oJ0T1prYSBFZ59ytpQ5wLi5PS8n8ey/
-UX8G7lU57Sxq6EBwXRqoPWTZHU636w17j9D2vI0iigNUfjAav+VyYSs4h0zSmKA1
-RKaGDZkEM3j+tf/YeQ/KQ+1vHahrTA==
+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
+4ApoM/HSTDkFfpTSGCZwpB7gjynASw==
 -----END PRIVATE KEY-----
 -----END PRIVATE KEY-----

+ 7 - 7
main.go

@@ -32,7 +32,7 @@ var (
 	browserLoadResourceTimeout int64 = 5
 	browserLoadResourceTimeout int64 = 5
 
 
 	//重点网站和正式环境
 	//重点网站和正式环境
-	isOnly4MainSite             = "false"
+	//isOnly4MainSite             = "false"
 	browserDisableLoadResources = "ws://;wss://;.tof;.woff;.ico;.mp4;.zip;.rar;.exe;"
 	browserDisableLoadResources = "ws://;wss://;.tof;.woff;.ico;.mp4;.zip;.rar;.exe;"
 	//serverAddress               = "http://visualizeld.spdata.jianyu360.com/%s" //正式环境
 	//serverAddress               = "http://visualizeld.spdata.jianyu360.com/%s" //正式环境
 	//serverAddress = "http://visualizepx.spdata.jianyu360.com/%s" //培训环境
 	//serverAddress = "http://visualizepx.spdata.jianyu360.com/%s" //培训环境
@@ -80,11 +80,11 @@ func init() {
 		be.Cfg.ServerCodePassword = serverCodePassword
 		be.Cfg.ServerCodePassword = serverCodePassword
 	}
 	}
 
 
-	//客户端版本
-	be.Cfg.IsOnly4MainSite = isOnly4MainSite == "true"
-	if be.Cfg.IsOnly4MainSite {
-		serverAddress = "http://visualize.spdata.jianyu360.com/%s" //重点网站
-	}
+	////客户端版本
+	//be.Cfg.IsOnly4MainSite = isOnly4MainSite == "true"
+	//if be.Cfg.IsOnly4MainSite {
+	//	serverAddress = "http://visualize.spdata.jianyu360.com/%s" //重点网站
+	//}
 	qu.Debug("重点网站:", be.Cfg.IsOnly4MainSite, serverAddress)
 	qu.Debug("重点网站:", be.Cfg.IsOnly4MainSite, serverAddress)
 }
 }
 
 
@@ -96,7 +96,7 @@ func main() {
 	// Create application with options
 	// Create application with options
 	err := wails.Run(&options.App{
 	err := wails.Run(&options.App{
 		Title:  "剑鱼-爬虫开发平台 v1.0",
 		Title:  "剑鱼-爬虫开发平台 v1.0",
-		Width:  1224,
+		Width:  1350,
 		Height: 668,
 		Height: 668,
 		AssetServer: &assetserver.Options{
 		AssetServer: &assetserver.Options{
 			Assets: assets,
 			Assets: assets,