fix(tenantid): 问题修复

app/web/page/activity/component/EmptyState/index.vue

@@ -2,12 +2,18 @@
   <cr-empty
     class="empty-state"
     image="error"
-    description="你访问的页面不存在"
+    :description="description"
   />
 </template>
 <script>
 export default {
   name: 'EmptyState',
+  props: {
+    description: {
+      type: String,
+      default: "你访问的页面不存在"
+    }
+  },
   mounted() {
     const loadingEle = document.querySelector('.mainload');
     if (!loadingEle) { return; }

app/web/page/activity/view/activity/index.ts

@@ -13,6 +13,8 @@ import DisableTouchMixin from '@/page/mixins/disableTouch.mixin';
 import { setAppTitleColor } from '@/service/color.service';
 import { EventBus } from '@qg/citrus-ui/src/helper/service/eventBus';
 import localStorage from '@/service/localStorage.service';
+import basicConfig from '@/config';
+
 @Component({ components: { FreedomContainer, GridLayout, GridItem, PageBottomTip, BackTop, EmptyState }, name: 'Activity'})
 export default class Activity extends Mixins(TransformStyleMixin, SaMixin, DisableTouchMixin) {
 
@@ -46,7 +48,16 @@ export default class Activity extends Mixins(TransformStyleMixin, SaMixin, Disab
     return this.pageData && this.pageData.elements.map(v => v.point) || [];
   }
   get tenantIdCorrect() {
-    return +this.tenantId === +localStorage.get('tenantId');
+    return +this.tenantId === +(localStorage.get('tenantId') || basicConfig.yxmTenantId);
+  }
+  get errorDesc() {
+    if (this.noPageData) {
+      return '你访问的页面不存在';
+    } else if (!this.tenantIdCorrect) {
+      return '当前页面禁止访问';
+    } else {
+      return '你访问的页面不存在';
+    }
   }
 
   @Watch('pageData', { deep: true })

app/web/page/activity/view/activity/index.vue

@@ -20,7 +20,7 @@
       </div>
       <back-top v-if="showBackTop" :show-back-top="showBackTop" ref="backTop" />
     </template>
-  	<empty-state v-else />
+  	<empty-state :description="errorDesc" v-else />
   </div>
 </template>
 <script lang="ts" src="./index.ts"></script>

config/apollo.json

 {
   "api": {
-    "apiHost": "https://quantum-blocks-tob.liangkebang.net",
-    "h5Host": "https://quantum-h5-tob.liangkebang.net",
-    "opapiHost": "https://opapi-tob.liangkebang.net",
-    "passportHost": "https://passportapi-tob.liangkebang.net",
-    "kdspHost": "https://talos-tob.liangkebang.net",
+    "apiHost": "https://quantum-blocks-vcc3.liangkebang.net",
+    "h5Host": "https://quantum-h5-vcc3.liangkebang.net",
+    "opapiHost": "https://opapi-vcc3.liangkebang.net",
+    "passportHost": "https://passportapi-vcc3.liangkebang.net",
+    "kdspHost": "https://talos-vcc3.liangkebang.net",
     "loginUrl": "",
-    "mallHost": "https://mall-tob.liangkebang.net",
-    "h5ShopHost": "https://tenet-tob.liangkebang.net/#",
+    "mallHost": "https://mall-vcc3.liangkebang.net",
+    "h5ShopHost": "https://tenet-vcc3.liangkebang.net/#",
     "yxmTenantId": 560761,
     "appIdMap": {
       "560761": "wxe16bf9293671506c",
@@ -16,8 +16,8 @@
   },
   "mysql": {
     "low_code": {
-      "host": "172.17.5.36",
-      "port": "30983",
+      "host": "172.17.5.48",
+      "port": "31393",
       "username": "qa",
       "password": "qatest",
       "database": "low_code"

config/apollo.ssr.json

 {
-  "apiHost": "https://quantum-blocks-tob.liangkebang.net",
-  "h5Host": "https://quantum-h5-tob.liangkebang.net",
-  "opapiHost": "https://opapi-tob.liangkebang.net",
-  "passportHost": "https://passportapi-tob.liangkebang.net",
-  "kdspHost": "https://talos-tob.liangkebang.net",
+  "apiHost": "https://quantum-blocks-vcc3.liangkebang.net",
+  "h5Host": "https://quantum-h5-vcc3.liangkebang.net",
+  "opapiHost": "https://opapi-vcc3.liangkebang.net",
+  "passportHost": "https://passportapi-vcc3.liangkebang.net",
+  "kdspHost": "https://talos-vcc3.liangkebang.net",
   "loginUrl": "",
-  "mallHost": "https://mall-tob.liangkebang.net",
-  "h5ShopHost": "https://tenet-tob.liangkebang.net/#",
-  "qiniuUpHost": "https://up-z0.qiniup.com",
-  "qiniuHost": "https://appsync.lkbang.net",
+  "mallHost": "https://mall-vcc3.liangkebang.net",
+  "h5ShopHost": "https://tenet-vcc3.liangkebang.net/#",
   "yxmTenantId": 560761,
   "appIdMap": {
     "560761": "wxe16bf9293671506c",
     "560867": "wxccb8435d68e8c7d6"
   }
-}
+}
\ No newline at end of file

package.json

@@ -4,13 +4,15 @@
   "description": "低代码平台",
   "scripts": {
     "start": "cross-env NODE_ENV=production APOLLO_CLUSTER=3C egg-scripts start --port 9050",
+    "start:pre": "cross-env NODE_ENV=production APOLLO_CLUSTER=3PRE egg-scripts start --port 9050",
     "test": "cross-env NODE_ENV=production EGG_SERVER_ENV=sit DEBUG=apollo APOLLO_CLUSTER=k8s NAMESPACE=qa2 egg-scripts start --port 80 --workers 1",
     "stop": "egg-scripts stop",
     "backend": "nohup egg-scripts start --port 7001 --workers 4",
     "dev": "egg-bin dev -r egg-ts-helper/register",
     "debug": "egg-bin debug -r egg-ts-helper/register",
     "apollo": "node bin/apollo.js",
-    "build": "npm run apollo && cross-env COS_ENV=production easy build --devtool",
+    "build": "cross-env NODE_ENV=production APOLLO_CLUSTER=3C npm run apollo && cross-env COS_ENV=production easy build --devtool",
+    "build:pre": "cross-env NODE_ENV=production APOLLO_CLUSTER=3PRE npm run apollo && cross-env COS_ENV=production easy build --devtool",
     "build:test": "cross-env COS_ENV=test easy build --devtool",
     "tsc": "ets && tsc -p tsconfig.json",
     "clean": "ets clean",