Skip to content

csbr-daop / fe-data-trusted-space

Go to a project
Toggle navigation
Toggle navigation pinning
4593601c by lihua
Options

修改正式环境发版相关文件

1 parent 640c67a3
Inline Side-by-side
Showing 4 changed files with 18 additions and 55 deletions
.env.product
# 页面标题
VITE_APP_TITLE = 数据资产管理系统
# 接口域名
VITE_API_BASEURL = https://daop-zcgl-test.zgsjzc.com/
VITE_API_BASEURL = https://zq-zcgl.zgsjzc.com/
# VITE_API_BASEURL = http://49.4.26.201:31709/
VITE_IDASS_BASEURL = https://daop-test.zgsjzc.com/portalLogin
# # 平台用户 接口请地址
# VITE_APP_USER_API_BASEURL = gateway-server
# # 系统管理 接口地址
# VITE_APP_API_BASEURL = ms-daop-zcgl-system-manager-service
# # 文件上传请求地址
# VITE_APP_ADD_FILE = ms-daop-import-data-service
# # 调试工具，可设置 eruda 或 vconsole，如果不需要开启则留空
# VITE_APP_DEBUG_TOOL =
# # 是否开启代理
# VITE_OPEN_PROXY = true
# # vite serve base
# VITE_SERVE_BASE = /
# # 流程设计访问地址
# VITE_BPMN_URL = https://workflow.zgsjzc.com
# # 数据标准、元数据、数据目录 接口地址
# VITE_APP_PLAN_BASEURL = ms-daop-jgjf-data-plan-service
# #数据质量接口地址
# VITE_APP_QUALITY_BASEURL = ms-daop-data-quality-service
# #门户接口
# VITE_API_PORTALURL = https://www.zgsjzc.com/portal
# #数据资产接口地址
# VITE_API_ASSET_BASEURL = ms-swzl-data-dam-service
# #数据同步接口地址
# VITE_API_DATA_SYNC = ms-swzl-data-sync-service
# #消息接口
# VITE_API_MESSAGE = ms-swzl-message-notification-service
VITE_IDASS_BASEURL = https://zq.zgsjzc.com/portalLogin
# 平台用户 接口请地址
VITE_APP_USER_API_BASEURL = gateway-server
......@@ -67,7 +28,7 @@ VITE_OPEN_PROXY = true
VITE_SERVE_BASE = /
# 流程设计访问地址
VITE_BPMN_URL = https://workflow-swzl-test.csbr.cn
VITE_BPMN_URL = https://zq-workflow.csbr.cn
#流程服务
VITE_APP_WORK_FLOW_URL = 'ms-daop-workflow-service'
......@@ -117,9 +78,9 @@ VITE_API_MESSAGE = ms-daop-message-service
VITE_APP_PERSONAL_URL = ms-daop-personel-service
#流通平台接口地址
VITE_APP_CIRCULATION = https://daop-lt-test.zgsjzc.com/
VITE_APP_CIRCULATION = https://zq-lt.zgsjzc.com/
#数据加工交付
VITE_APP_DATA_DELIVERY = https://daop-jgjf-test.zgsjzc.com/
VITE_APP_DATA_DELIVERY = https://zq-jgjf.zgsjzc.com/
# 是否在打包时生成 sourcemap
VITE_BUILD_SOURCEMAP = false
......
Jenkinsfile
......@@ -9,7 +9,7 @@ pipeline {
//SSH_PATH = "csbr4.4"
//192.168.5.4
SSH_PATH = "csbr5.4"
SVN_TYPE = "test"
SVN_TYPE = "temp"
//139.9.190.186
//SSH_PATH = "csbr190.186"
//SVN_TYPE = "master"
......@@ -64,9 +64,9 @@ pipeline {
steps {
//分分支构建
script{
if(env.BRANCH_NAME=='release-test'){
if(env.BRANCH_NAME=='master'){
//master-asset分支环境
echo 'start to deploy ${SVN_FOLD} on release-test ...'
echo 'start to deploy ${SVN_FOLD} on master ...'
sh '''
#docker rmi -f $(docker images | grep "none" | awk '{print $3}')
CID=$(docker ps -a | grep "${SVN_FOLD}" | awk '{print $1}')
......@@ -108,14 +108,14 @@ pipeline {
echo 'Deploying'
//分分支部署
script{
if(env.BRANCH_NAME=='release-test'){
if(env.BRANCH_NAME=='master'){
//master-asset分支环境
echo 'start to deploy ${SVN_FOLD} on release-test ...'
echo 'start to deploy ${SVN_FOLD} on master ...'
//调用Publish Over SSH插件，上传docker-compose.yaml文件并且执行deploy脚本
sshPublisher(publishers: [sshPublisherDesc(configName: "csbr5.4", transfers: [sshTransfer(cleanRemote: false, excludes: '', execCommand: """
#使用k8s构建
kubectl delete -f /mnt/k8s/daop/release-test/daop-zcgl/fe-data-asset-management.yaml
kubectl apply -f /mnt/k8s/daop/release-test/daop-zcgl/fe-data-asset-management.yaml
kubectl delete -f /mnt/k8s/daop/zq-production/daop-zcgl/fe-data-asset-management.yaml
kubectl apply -f /mnt/k8s/daop/zq-production/daop-zcgl/fe-data-asset-management.yaml
""", execTimeout: 120000, flatten: false, makeEmptyDirs: false, noDefaultExcludes: false, patternSeparator: '[, ]+', remoteDirectory: '/mnt/csbr/data', remoteDirectorySDF: false, removePrefix: '', sourceFiles: 'output/*.*')], usePromotionTimestamp: false, useWorkspaceInPromotion: false, verbose: false)])
echo 'Depoly ${SVN_FOLD} success ...'
......
default.conf
......@@ -43,7 +43,7 @@ server {
# 使用 rewrite 将 /api 替换为 /new-api
rewrite ^/api/(.*)$ /$1 break;
proxy_pass https://daop-zcgl-test.zgsjzc.com;
proxy_pass https://zq-zcgl.zgsjzc.com;
}
location /circulation {
......@@ -61,7 +61,7 @@ server {
# 使用 rewrite 将 /circulation 替换为 /new-api
rewrite ^/circulation/(.*)$ /$1 break;
proxy_pass https://daop-lt-test.zgsjzc.com;
proxy_pass https://zq-lt.zgsjzc.com;
}
location /delivery {
# 设置允许跨域的域名，可以使用通配符 '*' 允许所有域访问
......@@ -78,7 +78,7 @@ server {
# 使用 rewrite 将 /circulation 替换为 /new-api
rewrite ^/delivery/(.*)$ /$1 break;
proxy_pass https://daop-jgjf-test.zgsjzc.com;
proxy_pass https://zq-jgjf.zgsjzc.com;
}
error_page 500 502 503 504 /50x.html;
......
src/layouts/index.vue
......@@ -276,7 +276,9 @@ const messageAllRead = () => {
const createServerConnect = () => {
let websocketUrl = 'ws://192.168.6.20:39203';
//测试环境
if (location.origin == 'https://daop-zcgl-test.zgsjzc.com') {
if (location.origin == 'https://zq-zcgl.zgsjzc.com') {
websocketUrl = 'wss://zq-zcgl.zgsjzc.com/websocket'
} else if (location.origin == 'https://daop-zcgl-test.zgsjzc.com') {
websocketUrl = 'wss://daop-zcgl-test.zgsjzc.com/websocket'
}
const ws = new WebSocket(`${websocketUrl}/websocket/${userData.staffGuid}`);
......
Styling with Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!