Skip to content

Feat wzy cs #174

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 63 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
63 commits
Select commit Hold shift + click to select a range
ac855c3
feat: 去除点击XRFrame弹窗
May 13, 2025
6edabcf
feat: 测测测
May 13, 2025
8e94f87
feat: 测测测测
May 13, 2025
77a1b14
feat: 测测测测
May 13, 2025
124a950
feat: 测测测测
May 13, 2025
31cfd08
feat: 测测测测
May 13, 2025
d7f93d3
feat: 测测测测
May 13, 2025
84ce4ba
feat: 测测测测
May 13, 2025
4f95eb4
feat: 测测测测
May 13, 2025
0c16016
feat: 测测测测
May 13, 2025
0e77386
feat: 测测测测
May 13, 2025
b553e83
feat: 测测测测
May 13, 2025
8887782
feat: 测测测测
May 13, 2025
3a1c471
feat: 测测测测
May 13, 2025
d6842d7
feat: 测测测测
May 13, 2025
f92c7f2
feat: 测测测测
May 13, 2025
3ecb5a6
feat: 测测测测
May 13, 2025
288c8b0
feat: 测测测测
May 13, 2025
081711e
feat: 测测测测
May 13, 2025
878e26c
feat: 测测测测
May 13, 2025
0d728b1
feat: 测测测测
May 13, 2025
e4e36a9
feat: 测测测测
May 13, 2025
cdbe97b
feat: 测测测测
May 13, 2025
5f1836b
feat: 测测测测
May 13, 2025
5f50405
feat: 测测测测
May 13, 2025
13d2e1e
feat: 测
May 14, 2025
9800050
feat: 测
May 14, 2025
9f22f20
feat: 测
May 14, 2025
b955d48
feat: 测
May 14, 2025
c6000f4
feat: 测
May 14, 2025
1fbd2ac
feat: 测
May 14, 2025
10563de
feat: 测试
May 14, 2025
923f1c7
feat: 修改workflows
May 14, 2025
cfcb902
feat: 修改workflows
May 14, 2025
507695e
feat: 修改workflows
May 14, 2025
eac70b7
feat: 测试
May 14, 2025
f389a8e
feat: 测试
May 14, 2025
bc1e839
feat: 测试
May 14, 2025
71aa4ca
feat: 测试
May 14, 2025
e6476ad
feat: 测试分支提交
May 19, 2025
64b6bd4
feat: 测试分支提交
May 19, 2025
7496e26
feat: 测试工作流
May 20, 2025
8953934
feat: 测试远程工作流--wzy
May 20, 2025
2e5052c
feat: 测试远程工作流--wzy
May 20, 2025
e939f41
feat: 测试远程工作流--wzy
May 20, 2025
dd940e7
feat: 测试远程工作流--wzy
May 20, 2025
942ac40
feat: 测试--wzy
May 20, 2025
13c83d1
feat: 测试-one--wzy
May 20, 2025
fbc6573
feat: 测试-two--wzy
May 20, 2025
026d2e2
feat: 测试-three-wzy
May 20, 2025
97d37d8
feat: 测试-three-wzy
May 20, 2025
63e63fa
feat: 测试-four-wzy
May 20, 2025
0a9061d
feat: 测
May 21, 2025
5193f54
feat: 代码提交
May 21, 2025
fee6601
feat: 代码提交
May 21, 2025
895cf31
feat: 你好世界
May 21, 2025
c20910f
Merge branch 'feat-ce' into feat-xxx
bailin0824 May 21, 2025
9c03136
feat: 代码提交
May 26, 2025
2bf4bd3
Merge branch 'feat-xxx' of https://github.com/15170844121/miniprogram…
May 26, 2025
2414f9d
Merge branch 'feat-wzy-cs' into feat-xxx
bailin0824 May 26, 2025
a1774ea
Merge pull request #6 from 15170844121/feat-xxx
bailin0824 May 27, 2025
2fd0bd8
feat: 5-27提交
May 27, 2025
33c6197
Merge pull request #7 from 15170844121/feat-xxx
bailin0824 May 27, 2025
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
File renamed without changes.
35 changes: 0 additions & 35 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
@@ -1,35 +0,0 @@
name: WeChat MiniProgram Demo CI/CD

on:
pull_request:
types: [closed]
branches:
- master
jobs:
upload:
if: github.event.pull_request.merged == true && github.repository == 'wechat-miniprogram/miniprogram-demo'
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4
with:
fetch-depth: 0
submodules: 'recursive'
token: ${{ secrets.GITHUB_TOKEN }}

- name: Clone submodule
run: git submodule status

- name: Install dependencies
run: npm install

- name: Run package script
run: npm run init

- name: Upload MiniProgram
env:
WX_PRIVATE_KEY: ${{ secrets.WX_PRIVATE_KEY }}
run: |
mkdir -p ./build
echo "$WX_PRIVATE_KEY" > ./build/key
chmod +x ./build/ci.js
node ./build/ci.js --skip-key-write
19 changes: 19 additions & 0 deletions .github/workflows/pr-lint-check.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
name: PR Lint Check

on:
pull_request:
branches: feat-wzy-cs

jobs:
lint:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
- name: Set up Node.js
uses: actions/setup-node@v2
with:
node-version: '16'
- name: Install dependencies
run: npm install
- name: Run lint
run: npm run lint
57 changes: 0 additions & 57 deletions build/ci.js
Original file line number Diff line number Diff line change
@@ -1,57 +0,0 @@
import path from 'path'
import { fileURLToPath } from 'url'
import fs from 'fs'
import ci from 'miniprogram-ci'
import packageJson from '../package.json' with { type: 'json' }
const __filename = fileURLToPath(import.meta.url)
const __dirname = path.dirname(__filename)
const privateKeyPath = path.resolve(__dirname, './key')

// 检查私钥文件是否已存在
if (!fs.existsSync(privateKeyPath)) {
const privateKeyContent = process.env.WX_PRIVATE_KEY
if (!privateKeyContent) {
throw new Error('未找到私钥内容,请确保已正确配置 GitHub Secrets')
}
console.log('>>>>写入私钥文件:', privateKeyPath);
fs.writeFileSync(privateKeyPath, privateKeyContent)
}

const project = new ci.Project({
appid: 'wxe5f52902cf4de896',
type: 'miniProgram',
projectPath: path.resolve(__dirname, '../'),
privateKeyPath: path.resolve(__dirname, './key'),
ignores: [path.resolve(__dirname, '../miniprogram/node_modules/**/*')]
})
const robotNumber = 2
const params = {
onProgressUpdate: console.log,
robot: robotNumber,
version: packageJson.version,
desc: packageJson.bundleDescription,
setting: {
es7: true,
minifyJS: true,
minifyWXML: true,
minifyWXSS: true,
codeProtect: false,
autoPrefixWXSS: true,
ignoreUploadUnusedFiles: true
},
}
await ci.packNpm(project, {})
ci.upload({
project,
...params
}).then(res => {
console.debug('>>>>upload res', res)
}).catch(err => {
console.error('>>>>upload error', err)
throw err
}).finally(() => {
// 删除临时私钥文件
fs.unlinkSync(privateKeyPath)
})


175 changes: 1 addition & 174 deletions miniprogram/app.json
Original file line number Diff line number Diff line change
Expand Up @@ -9,27 +9,7 @@
"usingComponents": {
"mp-navigation-bar": "/component/navigation-bar/navigation-bar"
},
"chatTools": [
{
"root": "packageChatTool",
"entryPagePath": "pages/activity_create/index",
"desc": "群签到工具",
"scopes": [
"scope.userLocation"
]
}
],
"subpackages": [
{
"root": "packageChatTool",
"pages": [
"pages/activity_detail/index",
"pages/activity_create/index"
],
"entry": "entry.js",
"independent": true,
"renderer": "skyline"
},
{
"root": "packageComponent",
"pages": [
Expand All @@ -52,18 +32,6 @@
"pages/content/progress/progress",
"pages/content/rich-text/rich-text",
"pages/content/selection/selection",
"pages/form/button/button",
"pages/form/checkbox/checkbox",
"pages/form/form/form",
"pages/form/input/input",
"pages/form/label/label",
"pages/form/picker/picker",
"pages/form/picker-view/picker-view",
"pages/form/radio/radio",
"pages/form/slider/slider",
"pages/form/switch/switch",
"pages/form/textarea/textarea",
"pages/form/editor/editor",
"pages/nav/navigator/navigator",
"pages/nav/navigator/navigate",
"pages/nav/navigator/redirect",
Expand All @@ -85,119 +53,6 @@
"pages/doc-web-view/doc-web-view"
]
},
{
"root": "packageAPI",
"pages": [
"pages/api/login/login",
"pages/api/get-user-info/get-user-info",
"pages/api/request-payment/request-payment",
"pages/api/jump/jump",
"pages/api/share/share",
"pages/api/share-button/share-button",
"pages/api/custom-message/custom-message",
"pages/api/subscribe-message/subscribe-message",
"pages/api/choose-address/choose-address",
"pages/api/choose-invoice-title/choose-invoice-title",
"pages/api/soter-authentication/soter-authentication",
"pages/api/setting/setting",
"pages/ar/visionkit-basic/visionkit-basic",
"pages/ar/visionkit-basic-v2/visionkit-basic-v2",
"pages/ar/plane-ar/plane-ar",
"pages/ar/plane-ar-v2/plane-ar-v2",
"pages/ar/plane-ar-v2-options/plane-ar-v2-options",
"pages/ar/plane-ar-v2-marker/plane-ar-v2-marker",
"pages/ar/plane-ar-v2-depth/plane-ar-v2-depth",
"pages/ar/plane-ar-3dof/plane-ar-3dof",
"pages/ar/2dmarker-ar/2dmarker-ar",
"pages/ar/3dmarker-ar/3dmarker-ar",
"pages/ar/osd-ar/osd-ar",
"pages/ar/face-detect/face-detect",
"pages/ar/face-detect-3d/face-detect-3d",
"pages/ar/face-detect-3d-glasses/face-detect-3d-glasses",
"pages/ar/body-detect/body-detect",
"pages/ar/body-detect-3d/body-detect-3d",
"pages/ar/hand-detect/hand-detect",
"pages/ar/hand-detect-3d/hand-detect-3d",
"pages/ar/depth-detect/depth-detect",
"pages/ar/cameraBuffer-detect/cameraBuffer-detect",
"pages/ar/cameraBuffer-jpg/cameraBuffer-jpg",
"pages/ar/ocr-detect/ocr-detect",
"pages/ar/shoe-detect/shoe-detect",
"pages/ar/photo-shoe-detect/photo-shoe-detect",
"pages/ar/photo-ocr-detect/photo-ocr-detect",
"pages/ar/photo-idcard-detect/photo-idcard-detect",
"pages/ar/photo-hand-detect/photo-hand-detect",
"pages/ar/photo-body-detect/photo-body-detect",
"pages/ar/photo-face-detect/photo-face-detect",
"pages/ar/photo-depth-detect/photo-depth-detect",
"pages/ar/gaussian-splatting/gaussian-splatting",
"pages/ar/gaussian-splatting/gaussian-splatting-ar",
"pages/page/set-navigation-bar-title/set-navigation-bar-title",
"pages/page/navigation-bar-loading/navigation-bar-loading",
"pages/page/navigator/navigator",
"pages/page/pull-down-refresh/pull-down-refresh",
"pages/page/animation/animation",
"pages/page/action-sheet/action-sheet",
"pages/page/modal/modal",
"pages/page/toast/toast",
"pages/page/canvas/canvas",
"pages/page/get-wxml-node-info/get-wxml-node-info",
"pages/page/page-scroll/page-scroll",
"pages/page/intersection-observer/intersection-observer",
"pages/device/clipboard-data/clipboard-data",
"pages/device/bluetooth/bluetooth",
"pages/device/bluetooth/slave/slave",
"pages/device/screen-brightness/screen-brightness",
"pages/device/vibrate/vibrate",
"pages/device/add-contact/add-contact",
"pages/device/wifi/wifi",
"pages/device/get-network-type/get-network-type",
"pages/device/on-network-status-change/on-network-status-change",
"pages/device/get-system-info/get-system-info",
"pages/device/on-compass-change/on-compass-change",
"pages/device/make-phone-call/make-phone-call",
"pages/device/scan-code/scan-code",
"pages/device/on-accelerometer-change/on-accelerometer-change",
"pages/device/capture-screen/capture-screen",
"pages/device/ibeacon/ibeacon",
"pages/device/get-battery-info/get-battery-info",
"pages/media/image/image",
"pages/media/voice/voice",
"pages/media/file/file",
"pages/media/load-font-face/load-font-face",
"pages/media/background-audio/background-audio",
"pages/media/video/video",
"pages/media/audio/audio",
"pages/media/media-container/media-container",
"pages/location/get-location/get-location",
"pages/location/open-location/open-location",
"pages/location/choose-location/choose-location",
"pages/network/request/request",
"pages/network/web-socket/web-socket",
"pages/network/upload-file/upload-file",
"pages/network/download-file/download-file",
"pages/network/mdns/mdns",
"pages/network/udp-socket/udp-socket",
"pages/storage/storage/storage",
"pages/storage/get-background-fetch-data/get-background-fetch-data",
"pages/storage/get-background-prefetch-data/get-background-prefetch-data",
"pages/performance/get-performance/get-performance",
"pages/worker/worker/worker",
"pages/framework/two-way-bindings/two-way-bindings",
"pages/framework/wxs/wxs",
"pages/framework/resizable/resizable",
"pages/framework/wxs/movable",
"pages/framework/wxs/sidebar",
"pages/framework/wxs/stick-top",
"pages/framework/wxs/nearby",
"pages/ai/mobilenet/index",
"pages/ai/style-trans/index",
"pages/ai/mobilenet_int8/index",
"pages/chattool/activity_assist/activity_assist",
"pages/chattool/material_open/material_open",
"pages/chattool/material_view/material_view"
]
},
{
"root": "packageCloud",
"pages": [
Expand Down Expand Up @@ -401,18 +256,6 @@
"packageComponent"
]
},
"page/API/index": {
"network": "all",
"packages": [
"packageAPI"
]
},
"packageAPI/pages/chattool/activity_assist/activity_assist": {
"network": "all",
"packages": [
"packageChatTool"
]
},
"page/cloud/index": {
"network": "all",
"packages": [
Expand Down Expand Up @@ -512,21 +355,5 @@
},
"renderer": "skyline",
"componentFramework": "glass-easel",
"appBar": {},
"supportedMaterials": [
{
"materialType": "image/*",
"name": "用${nickname}打开",
"desc": "聊天内容长按打开",
"path": "packageAPI/pages/chattool/material_open/material_open"
}
],
"multiSelectSupportedMaterials": [
{
"materialType": ["image/*"],
"desc": "聊天内容长按多选打开",
"path": "packageAPI/pages/chattool/material_open/material_open",
"scopes": []
}
]
"appBar": {}
}
3 changes: 1 addition & 2 deletions miniprogram/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@
"dependencies": {
"miniprogram-barrage": "^1.1.0",
"miniprogram-recycle-view": "^0.1.5",
"wxml-to-canvas": "^1.1.1",
"threejs-miniprogram": "0.0.3"
"wxml-to-canvas": "^1.1.1"
}
}

This file was deleted.

This file was deleted.

This file was deleted.

Loading