vue2-client 1.6.37 → 1.6.38

package/CHANGELOG.md

@@ -1,6 +1,9 @@
 # Change Log
 > 所有关于本项目的变化都在该文档里。
 
+**1.6.38 -2023-05-30 @江超**
+- V3登录加密
+
 **1.6.37 -2023-05-25 @江超**
 - 地址搜索框允许自己设置坐标字段名
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "vue2-client",
-  "version": "1.6.37",
+  "version": "1.6.38",
   "private": false,
   "scripts": {
     "serve": "vue-cli-service serve",
@@ -12,38 +12,38 @@
   },
   "dependencies": {
     "@amap/amap-jsapi-loader": "^1.0.1",
+    "@antv/data-set": "^0.11.8",
     "@antv/g2plot": "^2.4.29",
-    "lodash.get": "^4.4.2",
-    "js-base64": "^3.7.5",
-    "jsencrypt": "^3.3.2",
-    "vue-json-viewer": "^2.2.22",
-    "xlsx": "0.18.5",
-    "file-saver": "^2.0.5",
     "@vue/babel-preset-jsx": "^1.4.0",
-    "@antv/data-set": "^0.11.8",
     "animate.css": "^4.1.1",
     "ant-design-vue": "^1.7.8",
     "axios": "^0.27.2",
     "clipboard": "^2.0.11",
     "core-js": "^3.30.1",
+    "crypto-js": "^4.1.1",
     "date-fns": "^2.29.3",
     "default-passive-events": "^2.0.0",
     "enquire.js": "^2.1.6",
+    "file-saver": "^2.0.5",
     "highlight.js": "^11.7.0",
+    "js-base64": "^3.7.5",
     "js-cookie": "^2.2.1",
+    "jsencrypt": "^3.3.2",
+    "lodash.get": "^4.4.2",
     "mockjs": "^1.1.0",
     "nprogress": "^0.2.0",
+    "videojs-contrib-hls": "^5.15.0",
     "viser-vue": "^2.4.8",
     "vue": "2.6.14",
     "vue-i18n": "^8.28.2",
+    "vue-json-viewer": "^2.2.22",
     "vue-router": "^3.6.5",
+    "vue-video-player": "^5.0.2",
     "vuedraggable": "^2.24.3",
     "vuex": "^3.6.2",
-    "vue-video-player": "^5.0.2",
-    "videojs-contrib-hls": "^5.15.0"
+    "xlsx": "0.18.5"
   },
   "devDependencies": {
-    "script-loader": "^0.7.2",
     "@ant-design/colors": "^7.0.0",
     "@babel/core": "^7.21.4",
     "@vue/cli-plugin-babel": "^4.5.19",
@@ -59,11 +59,12 @@
     "eslint": "^6.8.0",
     "eslint-plugin-import": "^2.26.0",
     "eslint-plugin-node": "^11.1.0",
-    "eslint-plugin-vue": "^6.2.2",
     "eslint-plugin-promise": "^4.3.1",
     "eslint-plugin-standard": "^4.1.0",
+    "eslint-plugin-vue": "^6.2.2",
     "fast-deep-equal": "^3.1.3",
     "less-loader": "^6.2.0",
+    "script-loader": "^0.7.2",
     "style-resources-loader": "^1.5.0",
     "vue-cli-plugin-style-resources-loader": "^0.1.5",
     "vue-template-compiler": "2.6.14",

package/src/base-client/components/common/AddressSearchCombobox/AddressSearchCombobox.vue

@@ -1,317 +1,316 @@
-<template>
-  <div id="addressSearchCombobox">
-    <div>
-      <a-input style="width: 88%" v-model="addressInput" @change="change"/>
-      <a-button style="width: 10%;padding: 0px" type="link" @click="visible=true"><img style="width: 100%" src="@vue2-client/assets/img/location.png"/></a-button>
-    </div>
-    <a-modal :visible="visible" title="地址选择" @ok="selected" @cancel="visible=false" :zIndex='m_index'>
-      <div id="addressSearchCombobox_map">
-        <div class="certain-category-search-wrapper">
-          <a-auto-complete
-            style="right: 0px;width: 90%;z-index:2;margin-top:2%;"
-            :disabled="!mapAutocomplete"
-            class="certain-category-search"
-            dropdown-class-name="certain-category-search-dropdown"
-            option-label-prop="value"
-            placeholder="输入地址关键字搜索"
-            @search="fetchFunction"
-            @select="onSelect"
-          >
-            <a-spin v-if="searching" slot="notFoundContent" size="small" />
-            <template slot="dataSource">
-              <a-select-opt-group v-for="group in option" :key="group.title">
-          <span
-            slot="label">
-            <a-icon type="bank" /> {{ group.title }}
-          </span>
-                <a-select-option v-for="address in group.children" :key="address.label + ' <' + address.value + '>'">
-                  <p class="addressName"><a-icon type="environment" /> <span v-html="highLight(address.label, address.word)">{{ address.label }}</span></p>
-                  <p v-if="address.address !== '[]'" class="addressRemark">
-                    {{ address.address }}
-                  </p>
-                </a-select-option>
-              </a-select-opt-group>
-            </template>
-            <a-input>
-              <a-icon slot="suffix" class="certain-category-icon" type="search"/>
-            </a-input>
-          </a-auto-complete>
-        </div>
-      </div>
-      <a-descriptions
-        bordered
-        class="asc_descriptions"
-        :column="{ xxl: 2, xl: 2, lg: 2, md: 2, sm: 1, xs: 1 }"
-      >
-        <a-descriptions-item label="坐标" span=2><span>{{addressObj.lng_lat}}</span></a-descriptions-item>
-        <a-descriptions-item label="地址" span=2><span>{{addressObj.address}}</span></a-descriptions-item>
-      </a-descriptions>
-    </a-modal>
-    <!--    -->
-  </div>
-</template>
-<script>
-
-import { post } from '@vue2-client/services/api'
-import { GetGDMap } from '@vue2-client/utils/map-utils'
-import { debounce } from 'ant-design-vue/lib/vc-table/src/utils'
-import { mapState } from 'vuex'
-
-export default {
-  name: 'AddressSearchCombobox',
-  data () {
-    // 检索去抖
-    this.fetchFunction = debounce(this.fetchFunction, 300)
-    return {
-      // 地址搜索联想
-      mapAutocomplete: undefined,
-      // 检索结果
-      option: [],
-      // 最后检索版本
-      lastFetchId: 0,
-      // 检索中
-      searching: false,
-      addressObj: {
-        lng_lat: '',
-        address: '',
-      },
-      visible: false,
-      map: null,
-      m_index: 1002,
-      positionPicker: null,
-      addressInput: this.searchResult
-    }
-  },
-  computed: {
-    ...mapState('setting', ['isMobile', 'gaode_key', 'gaode_secret_key'])
-  },
-  props: {
-    searchResult: {
-      type: String,
-      default: undefined
-    },
-    // 返回数据格式
-    searchResultType: {
-      type: String,
-      default: 'Default'
-      // default: 'Array'
-      // default: 'Object'
-    },
-    // Object 返回格式时 可以自定义key
-    resultKeys: {
-      type: Object,
-      default: () => { return { address: 'address', coords: 'coords' } }
-    }
-  },
-  created () {
-  },
-  mounted () {
-  },
-  methods: {
-    change (value) {
-      this.$emit('update:searchResult', this.addressInput)
-    },
-    initMap (aMap) {
-      this.map = new (aMap).Map('addressSearchCombobox_map', { // 设置地图容器id
-        resizeEnable: true, // 是否监控地图容器尺寸变化
-        zoom: 10, // 初始化地图层级
-      })
-      this.geocoder = new (aMap).Geocoder({
-        radius: 500 // 范围，默认：500
-      })
-      this.map.addControl(new (aMap).ToolBar()) // 初始化工具插件
-      // 初始化窗体
-      /*this.infoWindow = new (aMap).InfoWindow({
-        anchor: 'bottom-center',
-        isCustom: false, // 使用自定义窗体
-        autoMove: true,
-        content: '',
-        showShadow: true,
-        offset: new (aMap).Pixel(0, -25)
-      })*/
-    },
-    onSelect (value) {
-      let result
-      console.log(' value--- ', this.searchResult)
-      const _arr = value.replace('>', '').split('<')
-      this.addressObj.address=_arr[0]
-      this.addressObj.lng_lat=_arr[1]
-      this.map.setCenter(this.addressObj.lng_lat.split(','))
-    },
-    selected () {
-      let result
-      if (this.searchResultType !== 'Default') {
-        if (this.searchResultType === 'Array') {
-          result = [this.addressObj.address, this.addressObj.lng_lat]
-        } else {
-          result = {}
-          result[this.resultKeys.address] = this.addressObj.address
-          result[this.resultKeys.coords] = this.addressObj.lng_lat
-        }
-      }
-      this.addressInput=this.addressObj.address
-      console.log(' result--- ', result)
-      this.visible=false
-      this.$emit('onSelect', JSON.stringify(result))
-      // this.$emit('onClick', result || value)
-    },
-    // 懒加载检索方法
-    fetchFunction (value) {
-      if (value && this.mapAutocomplete) {
-        this.searching = true
-        this.lastFetchId += 1
-        const fetchId = this.lastFetchId
-        this.mapAutocomplete.search(value, (status, result) => {
-          if (fetchId !== this.lastFetchId) {
-            return
-          }
-          if (status === 'complete') {
-            this.option = []
-            const addressMap = {}
-            result.tips.forEach((res) => {
-              if (res.location) {
-                if (!addressMap.hasOwnProperty(res.district)) {
-                  addressMap[res.district] = []
-                }
-                addressMap[res.district].push({
-                  label: res.name,
-                  value: res.location.lng + ',' + res.location.lat,
-                  address: res.address + '',
-                  word: value
-                })
-              }
-            })
-            for (const key of Object.keys(addressMap)) {
-              this.option.push({
-                title: key,
-                children: addressMap[key]
-              })
-            }
-          }
-          this.searching = false
-        })
-      }
-    },
-    // 获取数据
-    getData (value, callback) {
-      if (value !== '') {
-        const logicName = this.attr.keyName
-        const logic = logicName.substring(6)
-        post('/api/af-system/logic/' + logic, value).then(res => {
-          callback(res)
-        })
-      }
-    },
-    // 关键字高亮
-    highLight (value, word) {
-      // 如果标题中包含，关键字就替换一下
-      if (value.includes(word)) {
-        value = value.replace(word,
-          // 这里是替换成html格式的数据，最好再加一个样式权重，保险一点
-          '<span style="color:red!important;">' + word + '</span>'
-        )
-        return value
-        // eslint-disable-next-line brace-style
-      }
-      // 不包含的话还用这个
-      else {
-        return value
-      }
-    }
-  },
-  watch: {
-    'visible' (val){
-      console.log('val', val)
-      if(val){
-        GetGDMap(this.gaode_secret_key, this.gaode_key).then(aMap => {
-          this.initMap(aMap)
-          this.mapAutocomplete = new (aMap).AutoComplete({
-            // city 限定城市，默认全国
-            city: '全国',
-            dragEnable: true,
-            animateEnable: false
-          })
-          console.log(aMap)
-          console.log(window)
-          this.positionPicker = new window.AMapUI.PositionPicker({
-            mode: 'dragMap',
-            map: this.map
-          })
-          this.positionPicker.on('success', (positionResult) => {
-            console.log(positionResult)
-            console.log(positionResult.position)
-            this.addressObj.address=positionResult.address
-            this.addressObj.lng_lat=`${positionResult.position.lng},${positionResult.position.lat}`
-          })
-          this.positionPicker.on('fail', function(positionResult) {
-          })
-          this.positionPicker.start()
-        })
-      }
-    }
-  }
-}
-</script>
-<style>
-.asc_descriptions .ant-descriptions-item-content{
-  width: 80%;
-}
-</style>
-<style lang="less">
-#addressSearchCombobox_map{
-  margin:1% 0;
-  width:100%;
-  height:400px;
-  text-align:center
-}
-#addressSearchCombobox{
-
-  .certain-category-search-dropdown .ant-select-dropdown-menu-item-group-title {
-    color: #666;
-    font-weight: bold;
-    font-size: 14px;
-  }
-
-  .certain-category-search-dropdown .ant-select-dropdown-menu-item-group {
-    border-bottom: 1px solid #f6f6f6;
-  }
-
-  .certain-category-search-dropdown .ant-select-dropdown-menu-item {
-    padding-left: 16px;
-  }
-
-  .certain-category-search-dropdown .ant-select-dropdown-menu-item.show-all {
-    text-align: center;
-    cursor: default;
-  }
-
-  .certain-category-search-dropdown .ant-select-dropdown-menu {
-    max-height: 300px;
-  }
-  .certain-category-search-wrapper .certain-search-item-count {
-    position: absolute;
-    color: #999;
-    right: 16px;
-  }
-  .certain-category-search-wrapper .certain-category-search.ant-select-focused,
-  .certain-category-icon {
-    color: #108ee9;
-  }
-  .certain-category-search-wrapper .certain-category-icon {
-    color: #6e6e6e;
-    transition: all 0.3s cubic-bezier(0.645, 0.045, 0.355, 1);
-    font-size: 16px;
-  }
-
-  .addressName {
-    margin-bottom: 0;
-    font-size: 14px;
-    font-weight: bold;
-  }
-
-  .addressRemark {
-    margin-bottom: 0;
-    font-size: 12px;
-  }
-}
-</style>
+<template>
+  <div id="addressSearchCombobox">
+    <div>
+      <a-input style="width: 88%" v-model="addressInput" @change="change"/>
+      <a-button style="width: 10%;padding: 0px" type="link" @click="visible=true"><img style="width: 100%" src="@vue2-client/assets/img/location.png"/></a-button>
+    </div>
+    <a-modal :visible="visible" title="地址选择" @ok="selected" @cancel="visible=false" :zIndex="m_index">
+      <div id="addressSearchCombobox_map">
+        <div class="certain-category-search-wrapper">
+          <a-auto-complete
+            style="right: 0px;width: 90%;z-index:2;margin-top:2%;"
+            :disabled="!mapAutocomplete"
+            class="certain-category-search"
+            dropdown-class-name="certain-category-search-dropdown"
+            option-label-prop="value"
+            placeholder="输入地址关键字搜索"
+            @search="fetchFunction"
+            @select="onSelect"
+          >
+            <a-spin v-if="searching" slot="notFoundContent" size="small" />
+            <template slot="dataSource">
+              <a-select-opt-group v-for="group in option" :key="group.title">
+                <span
+                  slot="label">
+                  <a-icon type="bank" /> {{ group.title }}
+                </span>
+                <a-select-option v-for="address in group.children" :key="address.label + ' <' + address.value + '>'">
+                  <p class="addressName"><a-icon type="environment" /> <span v-html="highLight(address.label, address.word)">{{ address.label }}</span></p>
+                  <p v-if="address.address !== '[]'" class="addressRemark">
+                    {{ address.address }}
+                  </p>
+                </a-select-option>
+              </a-select-opt-group>
+            </template>
+            <a-input>
+              <a-icon slot="suffix" class="certain-category-icon" type="search"/>
+            </a-input>
+          </a-auto-complete>
+        </div>
+      </div>
+      <a-descriptions
+        bordered
+        class="asc_descriptions"
+        :column="{ xxl: 2, xl: 2, lg: 2, md: 2, sm: 1, xs: 1 }"
+      >
+        <a-descriptions-item label="坐标" span="2"><span>{{ addressObj.lng_lat }}</span></a-descriptions-item>
+        <a-descriptions-item label="地址" span="2"><span>{{ addressObj.address }}</span></a-descriptions-item>
+      </a-descriptions>
+    </a-modal>
+    <!--    -->
+  </div>
+</template>
+<script>
+
+import { post } from '@vue2-client/services/api'
+import { GetGDMap } from '@vue2-client/utils/map-utils'
+import { debounce } from 'ant-design-vue/lib/vc-table/src/utils'
+import { mapState } from 'vuex'
+
+export default {
+  name: 'AddressSearchCombobox',
+  data () {
+    // 检索去抖
+    this.fetchFunction = debounce(this.fetchFunction, 300)
+    return {
+      // 地址搜索联想
+      mapAutocomplete: undefined,
+      // 检索结果
+      option: [],
+      // 最后检索版本
+      lastFetchId: 0,
+      // 检索中
+      searching: false,
+      addressObj: {
+        lng_lat: '',
+        address: '',
+      },
+      visible: false,
+      map: null,
+      m_index: 1002,
+      positionPicker: null,
+      addressInput: this.searchResult
+    }
+  },
+  computed: {
+    ...mapState('setting', ['isMobile', 'gaode_key', 'gaode_secret_key'])
+  },
+  props: {
+    searchResult: {
+      type: String,
+      default: undefined
+    },
+    // 返回数据格式
+    searchResultType: {
+      type: String,
+      default: 'Default'
+      // default: 'Array'
+      // default: 'Object'
+    },
+    // Object 返回格式时 可以自定义key
+    resultKeys: {
+      type: Object,
+      default: () => { return { address: 'address', coords: 'coords' } }
+    }
+  },
+  created () {
+  },
+  mounted () {
+  },
+  methods: {
+    change (value) {
+      this.$emit('update:searchResult', this.addressInput)
+    },
+    initMap (aMap) {
+      this.map = new (aMap).Map('addressSearchCombobox_map', { // 设置地图容器id
+        resizeEnable: true, // 是否监控地图容器尺寸变化
+        zoom: 10, // 初始化地图层级
+      })
+      this.geocoder = new (aMap).Geocoder({
+        radius: 500 // 范围，默认：500
+      })
+      this.map.addControl(new (aMap).ToolBar()) // 初始化工具插件
+      // 初始化窗体
+      /* this.infoWindow = new (aMap).InfoWindow({
+        anchor: 'bottom-center',
+        isCustom: false, // 使用自定义窗体
+        autoMove: true,
+        content: '',
+        showShadow: true,
+        offset: new (aMap).Pixel(0, -25)
+      }) */
+    },
+    onSelect (value) {
+      console.log(' value--- ', this.searchResult)
+      const _arr = value.replace('>', '').split('<')
+      this.addressObj.address = _arr[0]
+      this.addressObj.lng_lat = _arr[1]
+      this.map.setCenter(this.addressObj.lng_lat.split(','))
+    },
+    selected () {
+      let result
+      if (this.searchResultType !== 'Default') {
+        if (this.searchResultType === 'Array') {
+          result = [this.addressObj.address, this.addressObj.lng_lat]
+        } else {
+          result = {}
+          result[this.resultKeys.address] = this.addressObj.address
+          result[this.resultKeys.coords] = this.addressObj.lng_lat
+        }
+      }
+      this.addressInput = this.addressObj.address
+      console.log(' result--- ', result)
+      this.visible = false
+      this.$emit('onSelect', JSON.stringify(result))
+      // this.$emit('onClick', result || value)
+    },
+    // 懒加载检索方法
+    fetchFunction (value) {
+      if (value && this.mapAutocomplete) {
+        this.searching = true
+        this.lastFetchId += 1
+        const fetchId = this.lastFetchId
+        this.mapAutocomplete.search(value, (status, result) => {
+          if (fetchId !== this.lastFetchId) {
+            return
+          }
+          if (status === 'complete') {
+            this.option = []
+            const addressMap = {}
+            result.tips.forEach((res) => {
+              if (res.location) {
+                if (!addressMap.hasOwnProperty(res.district)) {
+                  addressMap[res.district] = []
+                }
+                addressMap[res.district].push({
+                  label: res.name,
+                  value: res.location.lng + ',' + res.location.lat,
+                  address: res.address + '',
+                  word: value
+                })
+              }
+            })
+            for (const key of Object.keys(addressMap)) {
+              this.option.push({
+                title: key,
+                children: addressMap[key]
+              })
+            }
+          }
+          this.searching = false
+        })
+      }
+    },
+    // 获取数据
+    getData (value, callback) {
+      if (value !== '') {
+        const logicName = this.attr.keyName
+        const logic = logicName.substring(6)
+        post('/api/af-system/logic/' + logic, value).then(res => {
+          callback(res)
+        })
+      }
+    },
+    // 关键字高亮
+    highLight (value, word) {
+      // 如果标题中包含，关键字就替换一下
+      if (value.includes(word)) {
+        value = value.replace(word,
+          // 这里是替换成html格式的数据，最好再加一个样式权重，保险一点
+          '<span style="color:red!important;">' + word + '</span>'
+        )
+        return value
+        // eslint-disable-next-line brace-style
+      }
+      // 不包含的话还用这个
+      else {
+        return value
+      }
+    }
+  },
+  watch: {
+    'visible' (val) {
+      console.log('val', val)
+      if (val) {
+        GetGDMap(this.gaode_secret_key, this.gaode_key).then(aMap => {
+          this.initMap(aMap)
+          this.mapAutocomplete = new (aMap).AutoComplete({
+            // city 限定城市，默认全国
+            city: '全国',
+            dragEnable: true,
+            animateEnable: false
+          })
+          console.log(aMap)
+          console.log(window)
+          this.positionPicker = new window.AMapUI.PositionPicker({
+            mode: 'dragMap',
+            map: this.map
+          })
+          this.positionPicker.on('success', (positionResult) => {
+            console.log(positionResult)
+            console.log(positionResult.position)
+            this.addressObj.address = positionResult.address
+            this.addressObj.lng_lat = `${positionResult.position.lng},${positionResult.position.lat}`
+          })
+          this.positionPicker.on('fail', function (positionResult) {
+          })
+          this.positionPicker.start()
+        })
+      }
+    }
+  }
+}
+</script>
+<style>
+.asc_descriptions .ant-descriptions-item-content{
+  width: 80%;
+}
+</style>
+<style lang="less">
+#addressSearchCombobox_map{
+  margin:1% 0;
+  width:100%;
+  height:400px;
+  text-align:center
+}
+#addressSearchCombobox{
+
+  .certain-category-search-dropdown .ant-select-dropdown-menu-item-group-title {
+    color: #666;
+    font-weight: bold;
+    font-size: 14px;
+  }
+
+  .certain-category-search-dropdown .ant-select-dropdown-menu-item-group {
+    border-bottom: 1px solid #f6f6f6;
+  }
+
+  .certain-category-search-dropdown .ant-select-dropdown-menu-item {
+    padding-left: 16px;
+  }
+
+  .certain-category-search-dropdown .ant-select-dropdown-menu-item.show-all {
+    text-align: center;
+    cursor: default;
+  }
+
+  .certain-category-search-dropdown .ant-select-dropdown-menu {
+    max-height: 300px;
+  }
+  .certain-category-search-wrapper .certain-search-item-count {
+    position: absolute;
+    color: #999;
+    right: 16px;
+  }
+  .certain-category-search-wrapper .certain-category-search.ant-select-focused,
+  .certain-category-icon {
+    color: #108ee9;
+  }
+  .certain-category-search-wrapper .certain-category-icon {
+    color: #6e6e6e;
+    transition: all 0.3s cubic-bezier(0.645, 0.045, 0.355, 1);
+    font-size: 16px;
+  }
+
+  .addressName {
+    margin-bottom: 0;
+    font-size: 14px;
+    font-weight: bold;
+  }
+
+  .addressRemark {
+    margin-bottom: 0;
+    font-size: 12px;
+  }
+}
+</style>

package/src/base-client/components/common/CreateQuery/CreateQueryItem.vue

@@ -48,7 +48,7 @@
             <a-form-model-item
               v-if="item.formType ==='addressSearch'"
               label="坐标字段名">
-              <a-input :value="`${item.key}_lng_lat`">
+              <a-input :disabled="true" :value="`${item.key}_lng_lat`">
                 <a-popover slot="suffix" placement="bottom" title="坐标字段名">
                   <template slot="content">
                     <p>表单类型为地点搜索框时：</p>

package/src/services/user.js

@@ -1,5 +1,6 @@
 import { LOGIN, MODIFY_PASSWORD, ROUTES, V4_GET_INFO, V4_LOGIN, V4_LOGOUT } from '@vue2-client/services/apiService'
 import { request, METHOD, removeAuthorization } from '@vue2-client/utils/request'
+import EncryptUtil from '@vue2-client/utils/EncryptUtil'
 
 /**
  * 登录服务
@@ -8,10 +9,12 @@ import { request, METHOD, removeAuthorization } from '@vue2-client/utils/request
  * @returns {Promise<AxiosResponse<T>>}
  */
 export async function login (name, password) {
-  return request(LOGIN, METHOD.POST, {
+  let data = {
     name: name,
     password: password
-  })
+  }
+  data = '$' + EncryptUtil.RSAEncrypt(JSON.stringify(data))
+  return request(LOGIN, METHOD.POST, data)
 }
 
 export async function modifyPassword (name, password, newPassword) {

package/src/utils/EncryptUtil.js

@@ -0,0 +1,53 @@
+import AesEncryptJS from 'crypto-js'
+import RsaEncryptJS from 'jsencrypt'
+
+export default {
+  /**
+   * AES加密
+   * @param word
+   * @returns {*}
+   */
+  AESEncrypt (word, encryKey) {
+    const key = AesEncryptJS.enc.Utf8.parse(encryKey)
+    const srcs = AesEncryptJS.enc.Utf8.parse(word)
+    const encrypted = AesEncryptJS.AES.encrypt(srcs, key, { mode: AesEncryptJS.mode.ECB, padding: AesEncryptJS.pad.Pkcs7 })
+    return encrypted.toString()
+  },
+  /**
+   * AES解密
+   * @param word
+   * @returns {*}
+   */
+  AESDecrypt (word, encryKey) {
+    const key = AesEncryptJS.enc.Utf8.parse(encryKey)
+    const decrypt = AesEncryptJS.AES.decrypt(word, key, { mode: AesEncryptJS.mode.ECB, padding: AesEncryptJS.pad.Pkcs7 })
+    const ret = AesEncryptJS.enc.Utf8.stringify(decrypt).toString()
+    try {
+      return JSON.parse(ret)
+    } catch (e) {
+      return ret
+    }
+  },
+  /**
+   * RSA加密
+   * @param word
+   * @returns {*}
+   */
+  RSAEncrypt (word) {
+    const encrypt = new RsaEncryptJS()
+    encrypt.setPublicKey('MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQCqPvovSfXcwBbW8cKMCgwqNpsYuzF8RPAPFb7LGsnVo44JhM/xxzDyzoYtdfNmtbIuKVi9PzIsyp6rg+09gbuI6UGwBZ5DWBDBMqv5MPdOF5dCQkB2Bbr5yPfURPENypUz+pBFBg41d+BC+rwRiXELwKy7Y9caD/MtJyHydj8OUwIDAQAB')
+    const resdata = encrypt.encrypt(word)
+    return resdata.toString()
+  },
+  /**
+   * RSA解密
+   * @param word
+   * @returns {*}
+   */
+  RSADecrypt (word) {
+    const encrypt = new RsaEncryptJS()
+    encrypt.setPrivateKey('MIICdwIBADANBgkqhkiG9w0BAQEFAASCAmEwggJdAgEAAoGBAKo++i9J9dzAFtbxwowKDCo2mxi7MXxE8A8VvssaydWjjgmEz/HHMPLOhi1182a1si4pWL0/MizKnquD7T2Bu4jpQbAFnkNYEMEyq/kw904Xl0JCQHYFuvnI99RE8Q3KlTP6kEUGDjV34EL6vBGJcQvArLtj1xoP8y0nIfJ2Pw5TAgMBAAECgYAGGB8IllMwxceLhjf6n1l0IWRH7FuHIUieoZ6k0p6rASHSgWiYNRMxfecbtX8zDAoG0QAWNi7rn40ygpR5gS1fWDAKhmnhKgQIT6wW0VmD4hraaeyP78iy8BLhlvblri2nCPIhDH5+l96v7D47ZZi3ZSOzcj89s1eS/k7/N4peEQJBAPEtGGJY+lBoCxQMhGyzuzDmgcS1Un1ZE2pt+XNCVl2b+T8fxWJH3tRRR8wOY5uvtPiK1HM/IjT0T5qwQeH8Yk0CQQC0tcv3d/bDb7bOe9QzUFDQkUSpTdPWAgMX2OVPxjdq3Sls9oA5+fGNYEy0OgyqTjde0b4iRzlD1O0OhLqPSUMfAkEAh5FIvqezdRU2/PsYSR4yoAdCdLdT+h/jGRVefhqQ/6eYUJJkWp15tTFHQX3pIe9/s6IeT/XyHYAjaxmevxAmlQJBAKSdhvQjf9KAjZKDEsa7vyJ/coCXuQUWSCMNHbcR5aGfXgE4e45UtUoIE1eKGcd6AM6LWhx3rR6xdFDpb9je8BkCQB0SpevGfOQkMk5i8xkEt9eeYP0fi8nv6eOUcK96EXbzs4jV2SAoQJ9oJegPtPROHbhIvVUmNQTbuP10Yjg59+8=')
+    const resdata = encrypt.decrypt(word)
+    return JSON.parse(resdata.toString())
+  },
+}

package/src/utils/map-utils.js

@@ -1,37 +1,37 @@
-import AMapLoader from '@amap/amap-jsapi-loader'
-let Amap
-async function GetGDMap (secret_key,key) {
-  if (!Amap) {
-    window._AMapSecurityConfig = {
-      securityJsCode: secret_key
-    }
-    Amap = await AMapLoader.load({
-      key: key, // 申请好的Web端开发者Key，首次调用 load 时必填
-      version: '2.0', // 指定要加载的 JSAPI 的版本，缺省时默认为 1.4.15
-      plugins: ['AMap.IndexCluster', 'AMP.MarkerCluster', 'AMap.InfoWindow', 'AMap.HeatMap', 'AMap.HawkEye', 'AMap.DistrictSearch',
-        'AMap.ToolBar', 'AMap.Geolocation',
-        'AMap.Geocoder', 'AMap.MarkerClusterer', 'AMap.AutoComplete'], // 需要使用的的插件列表，如比例尺'AMap.Scale'等
-      AMapUI: {
-        version: '1.1', // AMapUI 缺省 1.1
-        plugins: ['misc/PositionPicker'] // 需要加载的 AMapUI ui插件
-      }
-    })
-  }
-  return Amap
-}
-async function GetLocation (address) {
-  return new Promise(async (resolve, reject) => {
-    new (await GetGDMap()).Geocoder({
-      radius: 500 // 范围，默认：500
-    }).getLocation(address, function (status, result) {
-      console.log(result)
-      if (status === 'complete' && result.geocodes.length) {
-        resolve({ lng: result.geocodes[0].location.lng, lat: result.geocodes[0].location.lat })
-      } else {
-        // eslint-disable-next-line prefer-promise-reject-errors
-        reject('根据经纬度查询地址失败')
-      }
-    })
-  })
-}
-export { GetGDMap, GetLocation }
+import AMapLoader from '@amap/amap-jsapi-loader'
+let Amap
+async function GetGDMap (secretKey, key) {
+  if (!Amap) {
+    window._AMapSecurityConfig = {
+      securityJsCode: secretKey
+    }
+    Amap = await AMapLoader.load({
+      key: key, // 申请好的Web端开发者Key，首次调用 load 时必填
+      version: '2.0', // 指定要加载的 JSAPI 的版本，缺省时默认为 1.4.15
+      plugins: ['AMap.IndexCluster', 'AMP.MarkerCluster', 'AMap.InfoWindow', 'AMap.HeatMap', 'AMap.HawkEye', 'AMap.DistrictSearch',
+        'AMap.ToolBar', 'AMap.Geolocation',
+        'AMap.Geocoder', 'AMap.MarkerClusterer', 'AMap.AutoComplete'], // 需要使用的的插件列表，如比例尺'AMap.Scale'等
+      AMapUI: {
+        version: '1.1', // AMapUI 缺省 1.1
+        plugins: ['misc/PositionPicker'] // 需要加载的 AMapUI ui插件
+      }
+    })
+  }
+  return Amap
+}
+async function GetLocation (address) {
+  return new Promise(async (resolve, reject) => {
+    new (await GetGDMap()).Geocoder({
+      radius: 500 // 范围，默认：500
+    }).getLocation(address, function (status, result) {
+      console.log(result)
+      if (status === 'complete' && result.geocodes.length) {
+        resolve({ lng: result.geocodes[0].location.lng, lat: result.geocodes[0].location.lat })
+      } else {
+        // eslint-disable-next-line prefer-promise-reject-errors
+        reject('根据经纬度查询地址失败')
+      }
+    })
+  })
+}
+export { GetGDMap, GetLocation }