Compare commits
3 Commits
8b5d68592b
...
81bec5ba3b
| Author | SHA1 | Date | |
|---|---|---|---|
| 81bec5ba3b | |||
| 729bc3c70e | |||
| 2e84a00f6e |
@@ -92,11 +92,15 @@ jobs:
|
|||||||
# 3. 安装依赖 & 构建 Uni-app (H5)
|
# 3. 安装依赖 & 构建 Uni-app (H5)
|
||||||
###############################################
|
###############################################
|
||||||
- name: Install dependencies and Build H5
|
- name: Install dependencies and Build H5
|
||||||
|
env:
|
||||||
|
DEPLOY_ENV: ${{ steps.detect.outputs.env }}
|
||||||
run: |
|
run: |
|
||||||
set -e
|
set -e
|
||||||
# pnpm真实路径
|
# pnpm真实路径
|
||||||
PNPM_PATH="/root/.nvm/versions/node/v20.20.2/bin/pnpm"
|
PNPM_PATH="/root/.nvm/versions/node/v20.20.2/bin/pnpm"
|
||||||
|
|
||||||
|
echo "构建环境: DEPLOY_ENV=$DEPLOY_ENV"
|
||||||
|
|
||||||
# 1. 配置镜像并安装依赖
|
# 1. 配置镜像并安装依赖
|
||||||
$PNPM_PATH config set registry https://registry.npmmirror.com
|
$PNPM_PATH config set registry https://registry.npmmirror.com
|
||||||
$PNPM_PATH install --frozen-lockfile
|
$PNPM_PATH install --frozen-lockfile
|
||||||
@@ -110,9 +114,16 @@ jobs:
|
|||||||
- name: Upload dist to server
|
- name: Upload dist to server
|
||||||
run: |
|
run: |
|
||||||
TARGET="${{ steps.detect.outputs.target }}"
|
TARGET="${{ steps.detect.outputs.target }}"
|
||||||
|
ENV_NAME="${{ steps.detect.outputs.env }}"
|
||||||
# 请根据你的实际构建输出路径调整
|
# 请根据你的实际构建输出路径调整
|
||||||
H5_SOURCE_DIR="dist/build/h5"
|
H5_SOURCE_DIR="dist/build/h5"
|
||||||
|
|
||||||
|
# 根据发布类型选择项目路径
|
||||||
|
if [ "$ENV_NAME" = "staging" ]; then
|
||||||
|
WEB_ROOT="${{ vars.STG_PROJECT_DIR }}"
|
||||||
|
else
|
||||||
WEB_ROOT="${{ vars.PROJECT_DIR }}"
|
WEB_ROOT="${{ vars.PROJECT_DIR }}"
|
||||||
|
fi
|
||||||
|
|
||||||
echo "部署到: $TARGET"
|
echo "部署到: $TARGET"
|
||||||
echo "源目录: $H5_SOURCE_DIR"
|
echo "源目录: $H5_SOURCE_DIR"
|
||||||
|
|||||||
@@ -131,6 +131,7 @@
|
|||||||
|
|
||||||
<script>
|
<script>
|
||||||
import { get, post } from '@/utils/request.js';
|
import { get, post } from '@/utils/request.js';
|
||||||
|
import { detectPlatform } from '@/utils/env.js';
|
||||||
|
|
||||||
export default {
|
export default {
|
||||||
props: {
|
props: {
|
||||||
@@ -163,7 +164,8 @@ export default {
|
|||||||
const res = await post('/device-scan/open', {
|
const res = await post('/device-scan/open', {
|
||||||
device_id: this.deviceId,
|
device_id: this.deviceId,
|
||||||
door_index: 0,
|
door_index: 0,
|
||||||
user_id: uid
|
user_id: uid,
|
||||||
|
platform: detectPlatform()
|
||||||
});
|
});
|
||||||
|
|
||||||
const ret = res.data || {};
|
const ret = res.data || {};
|
||||||
|
|||||||
+16
-2
@@ -1,16 +1,30 @@
|
|||||||
/**
|
/**
|
||||||
* 环境配置入口
|
* 环境配置入口
|
||||||
* 根据编译模式自动选择 dev / prod 配置
|
* 根据编译模式自动选择 dev / staging / prod 配置
|
||||||
|
*
|
||||||
|
* DEPLOY_ENV 环境变量:
|
||||||
|
* - 'staging' → 预发布环境
|
||||||
|
* - 'production' → 生产环境(默认)
|
||||||
|
* - 未设置且 NODE_ENV !== 'production' → 开发环境
|
||||||
*/
|
*/
|
||||||
import common from './index.js';
|
import common from './index.js';
|
||||||
import dev from './dev.js';
|
import dev from './dev.js';
|
||||||
|
import staging from './staging.js';
|
||||||
import prod from './prod.js';
|
import prod from './prod.js';
|
||||||
|
|
||||||
// uni-app 编译时通过 define 注译 __UNI_PLATFORM__
|
// uni-app 编译时通过 define 注译 __UNI_PLATFORM__
|
||||||
// H5 开发模式下 process.env.NODE_ENV === 'development'
|
// H5 开发模式下 process.env.NODE_ENV === 'development'
|
||||||
const isProd = process.env.NODE_ENV === 'production';
|
const isProd = process.env.NODE_ENV === 'production';
|
||||||
|
const deployEnv = process.env.DEPLOY_ENV;
|
||||||
|
|
||||||
const envConfig = isProd ? prod : dev;
|
let envConfig;
|
||||||
|
if (!isProd) {
|
||||||
|
envConfig = dev;
|
||||||
|
} else if (deployEnv === 'staging') {
|
||||||
|
envConfig = staging;
|
||||||
|
} else {
|
||||||
|
envConfig = prod;
|
||||||
|
}
|
||||||
|
|
||||||
const config = {
|
const config = {
|
||||||
...common,
|
...common,
|
||||||
|
|||||||
@@ -0,0 +1,20 @@
|
|||||||
|
/**
|
||||||
|
* 预发布环境配置
|
||||||
|
*/
|
||||||
|
const staging = {
|
||||||
|
// 业务 API 地址(vms-api)
|
||||||
|
apiBaseUrl: 'https://vmsapi.arklinksmart.cn',
|
||||||
|
|
||||||
|
// 网关地址(vms-gateway)— 用户授权、短信等接口走网关
|
||||||
|
apiGatewayUrl: 'https://gateway.arklinksmart.cn',
|
||||||
|
|
||||||
|
// 授权回调地址(微信 OAuth redirect_uri,必须 HTTPS,指向前端页面)
|
||||||
|
authRedirectUri: 'https://pre-m.arklinksmart.cn/pages/auth/loading',
|
||||||
|
|
||||||
|
// 生产环境 Token 从登录流程获取,此处为空
|
||||||
|
bearerToken: '',
|
||||||
|
|
||||||
|
enableRequestLog: false,
|
||||||
|
};
|
||||||
|
|
||||||
|
export default staging;
|
||||||
@@ -26,6 +26,10 @@ function servePublicFiles() {
|
|||||||
|
|
||||||
export default defineConfig({
|
export default defineConfig({
|
||||||
plugins: [servePublicFiles(), uni()],
|
plugins: [servePublicFiles(), uni()],
|
||||||
|
// 将构建时的 DEPLOY_ENV 环境变量注入到客户端代码中
|
||||||
|
define: {
|
||||||
|
'process.env.DEPLOY_ENV': JSON.stringify(process.env.DEPLOY_ENV || ''),
|
||||||
|
},
|
||||||
css: {
|
css: {
|
||||||
preprocessorOptions: {
|
preprocessorOptions: {
|
||||||
scss: {
|
scss: {
|
||||||
|
|||||||
Reference in New Issue
Block a user