Merge pull request 'feat: 依赖更新' (#2) from dev into test

Reviewed-on: #2

.drone.yml

@@ -69,8 +69,6 @@ steps:
       - echo "https://$USER:$PASSWD@git.1000my.com" >> ~/.git-credentials
       - cat ~/.git-credentials
       - git fetch --tags
-      - git submodule init
-      - git submodule update --recursive --remote
       # - git submodule add -b master https://git.1000my.com/project_runteng/server_iot-common.git
       # - git mv server_iot-common iot-common
       # - git submodule sync
@@ -86,19 +84,23 @@ steps:
     pull: if-not-exists
     # image: registry.k8s.1000my.com/library/node:16.15.0-slim
     image: registry.cn-hangzhou.aliyuncs.com/qmiot/init:node-14-slim-python2_3
+    environment:
+      USER:
+        from_secret: gitea_username
+      PASSWD:
+        from_secret: gitea_password
     volumes:
       - name: node
         path: /drone/src/node_modules
     settings:
       mirror: https://docker.mirrors.ustc.edu.cn
     commands:
+      - git config --global credential.helper store
+      - echo "https://$USER:$PASSWD@git.1000my.com" >> ~/.git-credentials
       - ln -s /usr/bin/python2 /usr/bin/python
       - python --version
       - npm config set registry https://registry.npm.taobao.org
       - npm config set sass_binary_site https://npm.taobao.org/mirrors/node-sass/
-      - cd ./src/base_mobile_map_sdk
-      - npm install
-      - cd ../../
       - npm install
       - unset CI
       - npm run build

.gitmodules

@@ -1,3 +0,0 @@
-[submodule "src/base_mobile_map_sdk"]
-	path = src/base_mobile_map_sdk
-	url = https://git.1000my.com/common/base_mobile_map_sdk.git

package.json

@@ -11,6 +11,7 @@
     "axios": "^0.21.1",
     "graphql": "^15.5.0",
     "node-sass": "^8.0.0",
+    "qmmap": "git+https://git.1000my.com/common/base_mobile_map_sdk.git",
     "qrcodejs2": "^0.0.2",
     "react": "^17.0.1",
     "react-dom": "^17.0.1",

src/base_mobile_map_sdk

@@ -1 +0,0 @@
-Subproject commit 18e320fd065f17a50e754795638b4148c5fd87a9

src/pages/Index/Index.js

@@ -1,5 +1,5 @@
 import React, { useState, useEffect, useReducer, useRef } from "react";
-import Qmmap from "../../base_mobile_map_sdk/index";
+import Qmmap from "qmmap";
 import { useHistory, useLocation } from "react-router-dom";
 import { getMallInfo } from "../../js/helpers/data-helper";
 import "./Index.scss";