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
1 # 页面标题 1 # 页面标题
2 VITE_APP_TITLE = 数据资产管理系统 2 VITE_APP_TITLE = 数据资产管理系统
3 # 接口域名 3 # 接口域名
4 VITE_API_BASEURL = https://daop-zcgl-test.zgsjzc.com/ 4 VITE_API_BASEURL = https://zq-zcgl.zgsjzc.com/
5 # VITE_API_BASEURL = http://49.4.26.201:31709/ 5 # VITE_API_BASEURL = http://49.4.26.201:31709/
6 6
7 VITE_IDASS_BASEURL = https://daop-test.zgsjzc.com/portalLogin 7 VITE_IDASS_BASEURL = https://zq.zgsjzc.com/portalLogin
8
9 # # 平台用户 接口请地址
10 # VITE_APP_USER_API_BASEURL = gateway-server
11
12 # # 系统管理 接口地址
13 # VITE_APP_API_BASEURL = ms-daop-zcgl-system-manager-service
14
15 # # 文件上传请求地址
16 # VITE_APP_ADD_FILE = ms-daop-import-data-service
17
18 # # 调试工具，可设置 eruda 或 vconsole，如果不需要开启则留空
19 # VITE_APP_DEBUG_TOOL =
20
21 # # 是否开启代理
22 # VITE_OPEN_PROXY = true
23
24 # # vite serve base
25 # VITE_SERVE_BASE = /
26
27 # # 流程设计访问地址
28 # VITE_BPMN_URL = https://workflow.zgsjzc.com
29
30 # # 数据标准、元数据、数据目录 接口地址
31 # VITE_APP_PLAN_BASEURL = ms-daop-jgjf-data-plan-service
32
33 # #数据质量接口地址
34 # VITE_APP_QUALITY_BASEURL = ms-daop-data-quality-service
35
36 # #门户接口
37 # VITE_API_PORTALURL = https://www.zgsjzc.com/portal
38
39 # #数据资产接口地址
40 # VITE_API_ASSET_BASEURL = ms-swzl-data-dam-service
41
42 # #数据同步接口地址
43 # VITE_API_DATA_SYNC = ms-swzl-data-sync-service
44
45 # #消息接口
46 # VITE_API_MESSAGE = ms-swzl-message-notification-service
47 8
48 # 平台用户 接口请地址 9 # 平台用户 接口请地址
49 VITE_APP_USER_API_BASEURL = gateway-server 10 VITE_APP_USER_API_BASEURL = gateway-server
...@@ -67,7 +28,7 @@ VITE_OPEN_PROXY = true ...@@ -67,7 +28,7 @@ VITE_OPEN_PROXY = true
67 VITE_SERVE_BASE = / 28 VITE_SERVE_BASE = /
68 29
69 # 流程设计访问地址 30 # 流程设计访问地址
70 VITE_BPMN_URL = https://workflow-swzl-test.csbr.cn 31 VITE_BPMN_URL = https://zq-workflow.csbr.cn
71 32
72 #流程服务 33 #流程服务
73 VITE_APP_WORK_FLOW_URL = 'ms-daop-workflow-service' 34 VITE_APP_WORK_FLOW_URL = 'ms-daop-workflow-service'
...@@ -117,9 +78,9 @@ VITE_API_MESSAGE = ms-daop-message-service ...@@ -117,9 +78,9 @@ VITE_API_MESSAGE = ms-daop-message-service
117 VITE_APP_PERSONAL_URL = ms-daop-personel-service 78 VITE_APP_PERSONAL_URL = ms-daop-personel-service
118 79
119 #流通平台接口地址 80 #流通平台接口地址
120 VITE_APP_CIRCULATION = https://daop-lt-test.zgsjzc.com/ 81 VITE_APP_CIRCULATION = https://zq-lt.zgsjzc.com/
121 #数据加工交付 82 #数据加工交付
122 VITE_APP_DATA_DELIVERY = https://daop-jgjf-test.zgsjzc.com/ 83 VITE_APP_DATA_DELIVERY = https://zq-jgjf.zgsjzc.com/
123 84
124 # 是否在打包时生成 sourcemap 85 # 是否在打包时生成 sourcemap
125 VITE_BUILD_SOURCEMAP = false 86 VITE_BUILD_SOURCEMAP = false
......
Jenkinsfile
...@@ -9,7 +9,7 @@ pipeline { ...@@ -9,7 +9,7 @@ pipeline {
9 //SSH_PATH = "csbr4.4" 9 //SSH_PATH = "csbr4.4"
10 //192.168.5.4 10 //192.168.5.4
11 SSH_PATH = "csbr5.4" 11 SSH_PATH = "csbr5.4"
12 SVN_TYPE = "test" 12 SVN_TYPE = "temp"
13 //139.9.190.186 13 //139.9.190.186
14 //SSH_PATH = "csbr190.186" 14 //SSH_PATH = "csbr190.186"
15 //SVN_TYPE = "master" 15 //SVN_TYPE = "master"
...@@ -64,9 +64,9 @@ pipeline { ...@@ -64,9 +64,9 @@ pipeline {
64 steps { 64 steps {
65 //分分支构建 65 //分分支构建
66 script{ 66 script{
67 if(env.BRANCH_NAME=='release-test'){ 67 if(env.BRANCH_NAME=='master'){
68 //master-asset分支环境 68 //master-asset分支环境
69 echo 'start to deploy ${SVN_FOLD} on release-test ...' 69 echo 'start to deploy ${SVN_FOLD} on master ...'
70 sh ''' 70 sh '''
71 #docker rmi -f $(docker images | grep "none" | awk '{print $3}') 71 #docker rmi -f $(docker images | grep "none" | awk '{print $3}')
72 CID=$(docker ps -a | grep "${SVN_FOLD}" | awk '{print $1}') 72 CID=$(docker ps -a | grep "${SVN_FOLD}" | awk '{print $1}')
...@@ -108,14 +108,14 @@ pipeline { ...@@ -108,14 +108,14 @@ pipeline {
108 echo 'Deploying' 108 echo 'Deploying'
109 //分分支部署 109 //分分支部署
110 script{ 110 script{
111 if(env.BRANCH_NAME=='release-test'){ 111 if(env.BRANCH_NAME=='master'){
112 //master-asset分支环境 112 //master-asset分支环境
113 echo 'start to deploy ${SVN_FOLD} on release-test ...' 113 echo 'start to deploy ${SVN_FOLD} on master ...'
114 //调用Publish Over SSH插件，上传docker-compose.yaml文件并且执行deploy脚本 114 //调用Publish Over SSH插件，上传docker-compose.yaml文件并且执行deploy脚本
115 sshPublisher(publishers: [sshPublisherDesc(configName: "csbr5.4", transfers: [sshTransfer(cleanRemote: false, excludes: '', execCommand: """ 115 sshPublisher(publishers: [sshPublisherDesc(configName: "csbr5.4", transfers: [sshTransfer(cleanRemote: false, excludes: '', execCommand: """
116 #使用k8s构建 116 #使用k8s构建
117 kubectl delete -f /mnt/k8s/daop/release-test/daop-zcgl/fe-data-asset-management.yaml 117 kubectl delete -f /mnt/k8s/daop/zq-production/daop-zcgl/fe-data-asset-management.yaml
118 kubectl apply -f /mnt/k8s/daop/release-test/daop-zcgl/fe-data-asset-management.yaml 118 kubectl apply -f /mnt/k8s/daop/zq-production/daop-zcgl/fe-data-asset-management.yaml
119 """, execTimeout: 120000, flatten: false, makeEmptyDirs: false, noDefaultExcludes: false, patternSeparator: '[, ]+', remoteDirectory: '/mnt/csbr/data', remoteDirectorySDF: false, removePrefix: '', sourceFiles: 'output/*.*')], usePromotionTimestamp: false, useWorkspaceInPromotion: false, verbose: false)]) 119 """, execTimeout: 120000, flatten: false, makeEmptyDirs: false, noDefaultExcludes: false, patternSeparator: '[, ]+', remoteDirectory: '/mnt/csbr/data', remoteDirectorySDF: false, removePrefix: '', sourceFiles: 'output/*.*')], usePromotionTimestamp: false, useWorkspaceInPromotion: false, verbose: false)])
120 120
121 echo 'Depoly ${SVN_FOLD} success ...' 121 echo 'Depoly ${SVN_FOLD} success ...'
......
default.conf
...@@ -43,7 +43,7 @@ server { ...@@ -43,7 +43,7 @@ server {
43 43
44 # 使用 rewrite 将 /api 替换为 /new-api 44 # 使用 rewrite 将 /api 替换为 /new-api
45 rewrite ^/api/(.*)$ /$1 break; 45 rewrite ^/api/(.*)$ /$1 break;
46 proxy_pass https://daop-zcgl-test.zgsjzc.com; 46 proxy_pass https://zq-zcgl.zgsjzc.com;
47 } 47 }
48 48
49 location /circulation { 49 location /circulation {
...@@ -61,7 +61,7 @@ server { ...@@ -61,7 +61,7 @@ server {
61 61
62 # 使用 rewrite 将 /circulation 替换为 /new-api 62 # 使用 rewrite 将 /circulation 替换为 /new-api
63 rewrite ^/circulation/(.*)$ /$1 break; 63 rewrite ^/circulation/(.*)$ /$1 break;
64 proxy_pass https://daop-lt-test.zgsjzc.com; 64 proxy_pass https://zq-lt.zgsjzc.com;
65 } 65 }
66 location /delivery { 66 location /delivery {
67 # 设置允许跨域的域名，可以使用通配符 '*' 允许所有域访问 67 # 设置允许跨域的域名，可以使用通配符 '*' 允许所有域访问
...@@ -78,7 +78,7 @@ server { ...@@ -78,7 +78,7 @@ server {
78 78
79 # 使用 rewrite 将 /circulation 替换为 /new-api 79 # 使用 rewrite 将 /circulation 替换为 /new-api
80 rewrite ^/delivery/(.*)$ /$1 break; 80 rewrite ^/delivery/(.*)$ /$1 break;
81 proxy_pass https://daop-jgjf-test.zgsjzc.com; 81 proxy_pass https://zq-jgjf.zgsjzc.com;
82 } 82 }
83 83
84 error_page 500 502 503 504 /50x.html; 84 error_page 500 502 503 504 /50x.html;
......
src/layouts/index.vue
...@@ -276,7 +276,9 @@ const messageAllRead = () => { ...@@ -276,7 +276,9 @@ const messageAllRead = () => {
276 const createServerConnect = () => { 276 const createServerConnect = () => {
277 let websocketUrl = 'ws://192.168.6.20:39203'; 277 let websocketUrl = 'ws://192.168.6.20:39203';
278 //测试环境 278 //测试环境
279 if (location.origin == 'https://daop-zcgl-test.zgsjzc.com') { 279 if (location.origin == 'https://zq-zcgl.zgsjzc.com') {
280 websocketUrl = 'wss://zq-zcgl.zgsjzc.com/websocket'
281 } else if (location.origin == 'https://daop-zcgl-test.zgsjzc.com') {
280 websocketUrl = 'wss://daop-zcgl-test.zgsjzc.com/websocket' 282 websocketUrl = 'wss://daop-zcgl-test.zgsjzc.com/websocket'
281 } 283 }
282 const ws = new WebSocket(`${websocketUrl}/websocket/${userData.staffGuid}`); 284 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!