From 83dc87009ef38af94261924c3518ec63d0b0550b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=8D=83=E7=9B=AE=E7=AE=A1=E7=90=86=E5=91=98?= Date: Wed, 5 Jul 2023 13:22:43 +0800 Subject: [PATCH 1/6] fix: ci --- .drone.yml | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/.drone.yml b/.drone.yml index 12b0000..e975b00 100644 --- a/.drone.yml +++ b/.drone.yml @@ -43,20 +43,20 @@ steps: from_secret: gitea_username git_password: from_secret: gitea_password - - name: test分支获取master信息 - image: alpine/git:v2.36.2 - commands: - - git fetch origin test - - git checkout test - - git merge origin/master - - git commit --amend -m "[skip ci]从master合并历史到test" - - git branch --set-upstream-to=origin/test test - - git pull - - git push --set-upstream origin test - - git checkout master - when: - branch: - - master + # - name: test分支获取master信息 + # image: alpine/git:v2.36.2 + # commands: + # - git fetch origin test + # - git checkout test + # - git merge origin/master + # - git commit --amend -m "[skip ci]从master合并历史到test" + # - git branch --set-upstream-to=origin/test test + # - git pull + # - git push --set-upstream origin test + # - git checkout master + # when: + # branch: + # - master - name: 获取tag数据 image: alpine/git:v2.36.2 environment: From 1c92edcba6e05bf5b54bf9b524db63451bbbc01b Mon Sep 17 00:00:00 2001 From: jiannibang <271381693@qq.com> Date: Mon, 16 Dec 2024 16:04:10 +0800 Subject: [PATCH 2/6] =?UTF-8?q?feat:=20=E5=85=BC=E5=AE=B9=E4=B8=83?= =?UTF-8?q?=E5=AE=9D=E9=A2=86=E5=B1=95=E5=B9=BF=E5=9C=BA=E9=93=BA=E4=BD=8D?= =?UTF-8?q?=E5=8F=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/pages/Index/Index.js | 2 ++ src/qmmap | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/src/pages/Index/Index.js b/src/pages/Index/Index.js index 8d95048..c6c2322 100644 --- a/src/pages/Index/Index.js +++ b/src/pages/Index/Index.js @@ -74,6 +74,8 @@ const Index = () => { return; } + if (endId.includes(" ") && mall.code === "project-oaja40x1eujdl8ohn6v-ja") + endId = endId.replaceAll(" ", "+"); if (mall.mcShopIDHouseNumMap && mall.mcShopIDHouseNumMap[endId]) endId = mall.mcShopIDHouseNumMap[endId]; const shop = map.getShopByHouseNum(endId); diff --git a/src/qmmap b/src/qmmap index 4b3ee2c..3629b8a 160000 --- a/src/qmmap +++ b/src/qmmap @@ -1 +1 @@ -Subproject commit 4b3ee2c866953ff8c7d586a3ab24768f88a945ae +Subproject commit 3629b8a0e2ac8e04665608db47b653e36eda3896 From 39957e39524ed547c5b081c88df0e5b811320c03 Mon Sep 17 00:00:00 2001 From: jiannibang <271381693@qq.com> Date: Mon, 16 Dec 2024 16:10:42 +0800 Subject: [PATCH 3/6] fix: ci --- .drone.yml | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/.drone.yml b/.drone.yml index e975b00..785cb02 100644 --- a/.drone.yml +++ b/.drone.yml @@ -84,18 +84,15 @@ steps: # - cat .tags - name: 代码构建 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 + image: registry.k8s.1000my.com/library/node:16.15.0-slim volumes: - name: node path: /drone/src/node_modules settings: mirror: https://docker.mirrors.ustc.edu.cn commands: - - 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/ + - npm config set registry https://registry.npmmirror.com/ + - npm config set sass_binary_site https://cdn.npmmirror.com/binaries/node-sass - cd ./src/qmmap - npm install - cd ../../ From 865faf23611f05ffd23d7b7b28331726780a6199 Mon Sep 17 00:00:00 2001 From: jiannibang <271381693@qq.com> Date: Mon, 16 Dec 2024 16:19:22 +0800 Subject: [PATCH 4/6] feat: submodule update --- .gitmodules | 3 --- src/qmmap | 1 - 2 files changed, 4 deletions(-) delete mode 160000 src/qmmap diff --git a/.gitmodules b/.gitmodules index c4fc27e..e69de29 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,3 +0,0 @@ -[submodule "src/qmmap"] - path = src/qmmap - url = https://git.1000my.com/common/base_mobile_map_sdk.git diff --git a/src/qmmap b/src/qmmap deleted file mode 160000 index 3629b8a..0000000 --- a/src/qmmap +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 3629b8a0e2ac8e04665608db47b653e36eda3896 From 60c1fd9233f6e30b4c8ca7e2b41b2d423746e392 Mon Sep 17 00:00:00 2001 From: jiannibang <271381693@qq.com> Date: Mon, 16 Dec 2024 16:30:57 +0800 Subject: [PATCH 5/6] feat: ci --- .gitmodules | 3 +++ src/qmmap | 1 + 2 files changed, 4 insertions(+) create mode 160000 src/qmmap diff --git a/.gitmodules b/.gitmodules index e69de29..c4fc27e 100644 --- a/.gitmodules +++ b/.gitmodules @@ -0,0 +1,3 @@ +[submodule "src/qmmap"] + path = src/qmmap + url = https://git.1000my.com/common/base_mobile_map_sdk.git diff --git a/src/qmmap b/src/qmmap new file mode 160000 index 0000000..3629b8a --- /dev/null +++ b/src/qmmap @@ -0,0 +1 @@ +Subproject commit 3629b8a0e2ac8e04665608db47b653e36eda3896 From 539738cdee222ab1b7f839f486da88254ca53f08 Mon Sep 17 00:00:00 2001 From: jiannibang <271381693@qq.com> Date: Mon, 16 Dec 2024 16:33:25 +0800 Subject: [PATCH 6/6] fix: ci --- package.json | 1 - 1 file changed, 1 deletion(-) diff --git a/package.json b/package.json index 46cd9d8..93cb18e 100644 --- a/package.json +++ b/package.json @@ -11,7 +11,6 @@ "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",