Skip to content

A
admin
提交 7a7fa701 作者: bax
操作

更改配置

上级 5f8681c7
正在显示 包含 118 行增加 和 22 行删除
.gitlab-ci.yml 0 → 100644
stages:
- dockerbuild
- kustomize_tag_push
variables:
REGION_id: cn-shenzhen
REGISTRY: mmc-registry.cn-shenzhen.cr.aliyuncs.com
IMAGE: admin
TAG: $CI_COMMIT_SHA
ACR_EE_USERNAME: QD--KeBiTeHangKong@1354706964800968
ACR_EE_PASSWORD: MMC@2023&ACR
ACR_EE_REGISTRY: mmc-registry.cn-shenzhen.cr.aliyuncs.com
ACR_EE_INSTANCE_ID: cri-yhk5zgfc2v1sia6l
ACR_EE_IMAGE: admin
ACR_EE_TAG: $CI_COMMIT_SHA
JAVA_VERSION: '8'
GITLAB_URL: https://oauth2:MjVJKxB7m4tCy7symBzn@git.mmcuav.cn/iuav/csf-admin.git
docker_build_dev:
stage: dockerbuild
variables:
NAMESPACE: sharefly-dev
ACR_EE_NAMESPACE: sharefly-dev
only:
- develop
script:
- echo "dev docker build"
- echo $ACR_EE_USERNAME
- echo $ACR_EE_REGISTRY
- docker login -u $ACR_EE_USERNAME -p 'MMC@2023&ACR' $ACR_EE_REGISTRY
- docker build -t ${ACR_EE_REGISTRY}/${ACR_EE_NAMESPACE}/${ACR_EE_IMAGE}:${TAG} .
- docker push "${ACR_EE_REGISTRY}/${ACR_EE_NAMESPACE}/${ACR_EE_IMAGE}:${TAG}"
- docker logout
docker_build_prod:
stage: dockerbuild
variables:
NAMESPACE: sharefly
ACR_EE_NAMESPACE: sharefly
only:
- master
script:
- echo "prod docker build"
- echo $ACR_EE_USERNAME
- echo $ACR_EE_REGISTRY
- docker login -u $ACR_EE_USERNAME -p 'MMC@2023&ACR' $ACR_EE_REGISTRY
- docker build -t ${ACR_EE_REGISTRY}/${ACR_EE_NAMESPACE}/${ACR_EE_IMAGE}:${TAG} .
- docker push "${ACR_EE_REGISTRY}/${ACR_EE_NAMESPACE}/${ACR_EE_IMAGE}:${TAG}"
- docker logout
kustomize_set_image_dev:
stage: kustomize_tag_push
variables:
NAMESPACE: sharefly-dev
ACR_EE_NAMESPACE: sharefly-dev
only:
- develop
before_script:
- echo "dev set image"
- git config --global user.name "bax" #配置本地仓库用户名信息
- git config --global user.email "baoaxin1999@163.com" #配置本地仓库邮箱信息
script:
- git remote -v
- git checkout -B develop
- cd kustomization/overlays/dev
- kustomize edit set image REGISTRY/NAMESPACE/IMAGE:TAG=$REGISTRY/$NAMESPACE/$IMAGE:$TAG
- cat kustomization.yaml
- git remote set-url origin "$GITLAB_URL"
- git commit -am '[skip ci] DEV image update' #git 本地提交，注意“skip ci”为gitlab流水线文件内置关键字，作用为跳过ci流水线操作，未设置可能导致流水线进入死循环
- git push --set-upstream origin develop #重新提交修改镜像版本后的代码
kustomize_set_image_prod:
stage: kustomize_tag_push
variables:
NAMESPACE: sharefly
ACR_EE_NAMESPACE: sharefly
only:
- master
before_script:
- echo "prod set image"
- echo "master"
- git config --global user.name "bax" #配置本地仓库用户名信息
- git config --global user.email "baoaxin1999@163.com" #配置本地仓库邮箱信息
script:
- git remote -v
- git checkout -B master
- cd kustomization/overlays/prod
- kustomize edit set image REGISTRY/NAMESPACE/IMAGE:TAG=$REGISTRY/$NAMESPACE/$IMAGE:$TAG
- cat kustomization.yaml
- git remote set-url origin "$GITLAB_URL"
- git commit -am '[skip ci] DEV image update' #git 本地提交，注意“skip ci”为gitlab流水线文件内置关键字，作用为跳过ci流水线操作，未设置可能导致流水线进入死循环
- git push --set-upstream origin master #重新提交修改镜像版本后的代码
env/.env.development
#请求接口地址
#正式服
#VITE_REQUEST_BASE_URL='https://www.iuav.shop'
#VITE_REQUEST_BASE_URL='https://www.iuav.com'
#测试服
VITE_REQUEST_BASE_URL='https://test.iuav.shop'
VITE_REQUEST_BASE_URL='https://test.iuav.com'
#VITE_REQUEST_BASE_URL='https://120.25.213.190'
#VITE_REQUEST_BASE_URL='https://iuav.mmcuav.cn'
#VITE_REQUEST_BASE_URL='/api'
......
env/.env.production
#请求接口地址
VITE_REQUEST_BASE_URL='https://www.iuav.shop'
VITE_REQUEST_BASE_URL='https://www.iuav.com'
#VITE_REQUEST_BASE_URL='http://119.23.248.181'
#VITE_REQUEST_BASE_URL='http://120.77.145.47'
#VITE_REQUEST_BASE_URL='https://test.iuav.shop'
#VITE_REQUEST_BASE_URL='https://test.iuav.com'
#VITE_REQUEST_BASE_URL='/api'
#旧版接口地址
#VITE_REQUEST_BASE_URL='https://iuav.mmcuav.cn'
......
src/components/messageBox/index.scss
......@@ -48,7 +48,7 @@
width: 32px;
height: 32px;
border-radius: 50%;
background-image: url('https://pad-video-x.oss-cn-shenzhen.aliyuncs.com/file/mine_user.png');
background-image: url('https://share-fly.oss-cn-hangzhou.aliyuncs.com/file/mine_user.png');
background-size: 100% 100%;
box-shadow: 0 0 10px rgba(0, 0, 0, 0.1);
}
......
src/components/video/index.tsx
......@@ -15,7 +15,7 @@ interface propsType {
const Video: React.FC<propsType> = (props) => {
// 组件的默认值
Video.defaultProps = {
src: 'http://pad-video-x.oss-cn-shenzhen.aliyuncs.com/file/3505c402-cbf9-41a5-9d6f-bdb350625bea.jpg',
src: 'http://share-fly.oss-cn-hangzhou.aliyuncs.com/file/3505c402-cbf9-41a5-9d6f-bdb350625bea.jpg',
width: 40,
height: 40,
};
......
src/pages/activityManage/activityListOld/index.tsx
......@@ -123,7 +123,7 @@ const ActivityList: FC = () => {
activityName: '裂变活动测试',
activityCode: 'AC77674',
activityImg:
'https://pad-video-x.oss-cn-shenzhen.aliyuncs.com/file/87681f78-67db-4603-aaf3-4bdbdb4546d2.jpg',
'https://share-fly.oss-cn-hangzhou.aliyuncs.com/file/87681f78-67db-4603-aaf3-4bdbdb4546d2.jpg',
bindingCouponId: 10000148,
bindingCouponName: '裂变优惠券测试',
activityStatus: 2,
......@@ -143,7 +143,7 @@ const ActivityList: FC = () => {
activityName: '裂变活动测试',
activityCode: 'AC55159',
activityImg:
'https://pad-video-x.oss-cn-shenzhen.aliyuncs.com/file/6e4f318f-3081-43b7-ad6a-79afabd9ddb9.jpg',
'https://share-fly.oss-cn-hangzhou.aliyuncs.com/file/6e4f318f-3081-43b7-ad6a-79afabd9ddb9.jpg',
bindingCouponId: 10000141,
bindingCouponName: '测试裂变',
activityStatus: 2,
......@@ -163,7 +163,7 @@ const ActivityList: FC = () => {
activityName: '认证裂变',
activityCode: 'AC17946',
activityImg:
'https://pad-video-x.oss-cn-shenzhen.aliyuncs.com/file/b22e0f43-fd04-4147-adc6-73d96b76c740.png',
'https://share-fly.oss-cn-hangzhou.aliyuncs.com/file/b22e0f43-fd04-4147-adc6-73d96b76c740.png',
bindingCouponId: null,
bindingCouponName: null,
activityStatus: 2,
......@@ -183,7 +183,7 @@ const ActivityList: FC = () => {
activityName: '测试裂变',
activityCode: 'AC01841',
activityImg:
'https://pad-video-x.oss-cn-shenzhen.aliyuncs.com/file/40f09893-01c5-4cc6-a64a-75dac1963791.jpg',
'https://share-fly.oss-cn-hangzhou.aliyuncs.com/file/40f09893-01c5-4cc6-a64a-75dac1963791.jpg',
bindingCouponId: 10000141,
bindingCouponName: '测试裂变',
activityStatus: 2,
......
src/pages/couponManage/couponList/detail/index.tsx
......@@ -396,9 +396,9 @@ export default function CouponDetail(props: { location: { search: string } }) {
<Button
type='link'
onClick={() => {
// 使用file-save保存文件，文件链接为：https://pad-video-x.oss-cn-shenzhen.aliyuncs.com/doc/coupon-template.xlsx
// 使用file-save保存文件，文件链接为：https://share-fly.oss-cn-hangzhou.aliyuncs.com/doc/coupon-template.xlsx
saveAs(
'https://pad-video-x.oss-cn-shenzhen.aliyuncs.com/doc/coupon-template.xlsx',
'https://share-fly.oss-cn-hangzhou.aliyuncs.com/doc/coupon-template.xlsx',
'导入模板.xlsx',
);
}}
......
src/pages/orderManage/serviceOrder/comp/detailDelivery/index.tsx
......@@ -20,8 +20,8 @@ function DetailDelivery() {
<div className={'detail-text'}>验收凭证：</div>
<div className={'detail-image'}>
{[
'https://pad-video-x.oss-cn-shenzhen.aliyuncs.com/file/infrastructure-05-05.png',
'https://pad-video-x.oss-cn-shenzhen.aliyuncs.com/file/infrastructure-05-05.png',
'https://share-fly.oss-cn-hangzhou.aliyuncs.com/file/infrastructure-05-05.png',
'https://share-fly.oss-cn-hangzhou.aliyuncs.com/file/infrastructure-05-05.png',
].map((i, j) => (
<Image key={j} className={'image'} src={i} alt='付款凭证' />
))}
......
src/pages/orderManage/serviceOrder/comp/detailPurchaser/index.tsx
......@@ -23,8 +23,8 @@ function DetailPurchaser() {
<div className={'detail-text'}>预付款：</div>
<div className={'detail-image'}>
{[
'https://pad-video-x.oss-cn-shenzhen.aliyuncs.com/file/infrastructure-05-05.png',
'https://pad-video-x.oss-cn-shenzhen.aliyuncs.com/file/infrastructure-05-05.png',
'https://share-fly.oss-cn-hangzhou.aliyuncs.com/file/infrastructure-05-05.png',
'https://share-fly.oss-cn-hangzhou.aliyuncs.com/file/infrastructure-05-05.png',
].map((i, j) => (
<Image key={j} className={'image'} src={i} alt='付款凭证' />
))}
......@@ -32,8 +32,8 @@ function DetailPurchaser() {
<div className={'detail-text'}>尾款：</div>
<div className={'detail-image'}>
{[
'https://pad-video-x.oss-cn-shenzhen.aliyuncs.com/file/infrastructure-05-05.png',
'https://pad-video-x.oss-cn-shenzhen.aliyuncs.com/file/infrastructure-05-05.png',
'https://share-fly.oss-cn-hangzhou.aliyuncs.com/file/infrastructure-05-05.png',
'https://share-fly.oss-cn-hangzhou.aliyuncs.com/file/infrastructure-05-05.png',
].map((i, j) => (
<Image key={j} className={'image'} src={i} alt='付款凭证' />
))}
......@@ -41,8 +41,8 @@ function DetailPurchaser() {
<div className={'detail-text'}>全款：</div>
<div className={'detail-image'}>
{[
'https://pad-video-x.oss-cn-shenzhen.aliyuncs.com/file/infrastructure-05-05.png',
'https://pad-video-x.oss-cn-shenzhen.aliyuncs.com/file/infrastructure-05-05.png',
'https://share-fly.oss-cn-hangzhou.aliyuncs.com/file/infrastructure-05-05.png',
'https://share-fly.oss-cn-hangzhou.aliyuncs.com/file/infrastructure-05-05.png',
].map((i, j) => (
<Image key={j} className={'image'} src={i} alt='付款凭证' />
))}
......
src/pages/resourceManage/tenderManage/index.tsx
......@@ -187,7 +187,7 @@ const TenderManageView = () => {
icon={<DownloadOutlined />}
onClick={() => {
saveAs(
'https://pad-video-x.oss-cn-shenzhen.aliyuncs.com/doc/tender-news-template.xlsx',
'https://share-fly.oss-cn-hangzhou.aliyuncs.com/doc/tender-news-template.xlsx',
`招标快讯模板_${new Date().getTime()}.xlsx`,
);
}}
......
vite.config.ts
......@@ -16,7 +16,7 @@ export default defineConfig({
// target: 'http://192.168.3.111:10001', // 后端女release
// target: 'http://192.168.3.111:35150', // 后端女user
// target: 'http://192.168.3.17:8099', // 狗旺
target: 'https://test.iuav.shop',
target: 'https://test.iuav.com',
changeOrigin: true,
rewrite: (path) => path.replace(/^\/api/, ''),
},
......
Markdown 格式
0% 或
您添加了 0 人 到此讨论。请谨慎行事。
请先完成此评论的编辑！
请 注册 或者 后发表评论