平台正式环境发版

lihua
Showing 7 changed files with 24 additions and 27 deletions
.env.product
Jenkinsfile
README.md
default.conf
src/api/modules/dataAsset.ts
src/api/modules/queryService.ts
src/layouts/index.vue
--- a/.env.product
View file @0d01ab2
+++ b/.env.product
View file @0d01ab2
 # 页面标题
 VITE_APP_TITLE = 数据资产管理系统
 # 接口域名
- VITE_API_BASEURL = https://daop-zcgl-test.zgsjzc.com/
+ VITE_API_BASEURL = https://zcgl.zgsjzc.com/
 # VITE_API_BASEURL = http://49.4.26.201:31709/
-VITE_IDASS_BASEURL = https://daop-test.zgsjzc.com/portalLogin
+VITE_IDASS_BASEURL = https://daop.zgsjzc.com/portalLogin
 # # 平台用户 接口请地址
 # VITE_APP_USER_API_BASEURL = gateway-server
@@ -117,9 +117,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://lt.zgsjzc.com/
 #数据加工交付
-VITE_APP_DATA_DELIVERY = https://daop-jgjf-test.zgsjzc.com/
+VITE_APP_DATA_DELIVERY = https://jgjf.zgsjzc.com/
 # 是否在打包时生成 sourcemap
 VITE_BUILD_SOURCEMAP = false
--- a/Jenkinsfile
View file @0d01ab2
+++ b/Jenkinsfile
View file @0d01ab2
@@ -9,10 +9,10 @@ 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"
+        //SVN_TYPE = "master-platform"
        //镜像版本号
        image_tag = "1.0.0"
        //docker私服ip
@@ -21,7 +21,6 @@ pipeline {
        port = "80"
        //映射端口号
        vport = "80"
    }
    //定时任务
    //triggers { pollSCM('H 4/* 0 0 1-5') }
@@ -64,9 +63,9 @@ pipeline {
                    steps {
                       //分分支构建
                       script{
-                            if(env.BRANCH_NAME=='release-test'){
+                            if(env.BRANCH_NAME=='master-platform'){
-                                //master-asset分支环境
+                                //master-platform-asset分支环境
-                                echo 'start to deploy ${SVN_FOLD} on release-test ...'
+                                echo 'start to deploy ${SVN_FOLD} on master-platform ...'
                                 sh '''
                                    #docker rmi -f $(docker images | grep "none" | awk '{print $3}')
                                    CID=$(docker ps -a | grep "${SVN_FOLD}" | awk '{print $1}')
@@ -108,23 +107,21 @@ pipeline {
                echo 'Deploying'
                //分分支部署
                script{
-                    if(env.BRANCH_NAME=='release-test'){
+                    if(env.BRANCH_NAME=='master-platform'){
-                        //master-asset分支环境
+                        //master分支环境
-                        echo 'start to deploy ${SVN_FOLD} on release-test ...'
+                        echo 'start to deploy ${SVN_FOLD} on master-platform ...'
                        //调用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 delete -f /mnt/k8s/daop/production/daop-zcgl/fe-data-asset-management.yaml
-                             kubectl apply -f /mnt/k8s/daop/release-test/daop-zcgl/fe-data-asset-management.yaml
+                             kubectl apply -f /mnt/k8s/daop/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 ...'
                    }
                }
            }
        }
    }
    //归档
    post {
        always {
@@ -132,6 +129,4 @@ pipeline {
            archiveArtifacts artifacts: "dist/**", excludes: "dist"
        }
    }
+}
-}
\ No newline at end of file
--- a/README.md
View file @0d01ab2
+++ b/README.md
View file @0d01ab2
-数据资产服务平台-正式环境-发版分支
+资产运营平台正式环境-平台正式环境-资产管理子系统
 # 安装依赖
 # 注意，必须使用 pnpm 安装依赖，请勿使用 npm 或 yarn 安装依赖
--- a/default.conf
View file @0d01ab2
+++ b/default.conf
View file @0d01ab2
@@ -43,7 +43,7 @@ server {
         # 使用 rewrite 将 /api 替换为 /new-api
        rewrite ^/api/(.*)$ /$1 break;
-        proxy_pass https://daop-zcgl-test.zgsjzc.com;
+        proxy_pass https://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://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://jgjf.zgsjzc.com;
    }
    error_page   500 502 503 504  /50x.html;
--- a/src/api/modules/dataAsset.ts
View file @0d01ab2
+++ b/src/api/modules/dataAsset.ts
View file @0d01ab2
@@ -426,14 +426,14 @@ export const getApiDetail = (params) => request({
  // url:`${import.meta.env.VITE_APP_SERVICE_BASEURL}/api-base-info/detail`,
  // url: `http://localhost:9000/circulation/ms-data-circulation-portal-service/enterprise/detail-by-name`,
  // url: `http://localhost:9000/delivery/ms-daop-jgjf-data-open-service/api-base-info/detail/${params}`,
-  url: `https://daop-zcgl-test.zgsjzc.com/delivery/api/ms-daop-jgjf-data-open-service/api-base-info/detail/${params}`,
+  url: `https://zcgl.zgsjzc.com/delivery/api/ms-daop-jgjf-data-open-service/api-base-info/detail/${params}`,
  method: 'get',
 })
 // 跨服务调加工交付接口 获取API调用次数
 export const getApiInvokeCount = (data) => request({
  // url: `http://localhost:9000/delivery/ms-daop-jgjf-data-open-service/home-page/dam/call-api-stat`,
-  url: `https://daop-zcgl-test.zgsjzc.com/delivery/api/ms-daop-jgjf-data-open-service/home-page/dam/call-api-stat`,
+  url: `https://zcgl.zgsjzc.com/delivery/api/ms-daop-jgjf-data-open-service/home-page/dam/call-api-stat`,
  method: 'post',
  data
 })
--- a/src/api/modules/queryService.ts
View file @0d01ab2
+++ b/src/api/modules/queryService.ts
View file @0d01ab2
@@ -93,7 +93,7 @@ export const getProduct = (params) => request({
 export const getTenantInfo = (params) => request({
  // url: `${import.meta.env.VITE_APP_PERSONAL_URL}/tenant/getByGuid/${params}`,
  // url: `http://localhost:9000/circulation/ms-data-circulation-portal-service/enterprise/detail-by-name`,
-  url: `https://daop-zcgl-test.zgsjzc.com/circulation/api/ms-data-circulation-portal-service/enterprise/detail-by-name`,
+  url: `https://zcgl.zgsjzc.com/circulation/api/ms-data-circulation-portal-service/enterprise/detail-by-name`,
  method: 'get',
  params
 })
--- a/src/layouts/index.vue
View file @0d01ab2
+++ b/src/layouts/index.vue
View file @0d01ab2
@@ -278,6 +278,8 @@ const createServerConnect = () => {
  //测试环境
  if (location.origin == 'https://daop-zcgl-test.zgsjzc.com') {
    websocketUrl = 'wss://daop-zcgl-test.zgsjzc.com/websocket'
+  } else if (location.origin == 'https://zcgl.zgsjzc.com') {
+    websocketUrl = 'wss://zcgl.zgsjzc.com/websocket'
  }
  const ws = new WebSocket(`${websocketUrl}/websocket/${userData.staffGuid}`);
  ws.onopen = function () {