Merge branch 'feat/addBy' into 'master'

build(ui): 升级业务库

See merge request !54

app/controller/editor.ts

@@ -32,7 +32,7 @@ export default class EditorController extends Controller {
     await ctx.service.redis.del(`page:${pageInfo.uuid}`);
     ctx.body = ctx.helper.ok(result);
   }
-
+  // todo 编辑器获取跳过redis，但需要注意
   public async get(ctx: Context) {
     let pageInfo = await ctx.service.redis.get(`pageInfo:${ctx.params.uuid}`);
     if (!pageInfo) {

app/web/config/dev.config.ts

 const protocol = EASY_ENV_IS_BROWSER ? window.location.protocol : 'http';
 
-export default {
+const hostMap = {
   apiHost: `http://localhost:7002/`,
   // apiHost: `http://192.168.28.199:7001/`,
-  // apiHost: 'https://quantum-blocks-test1.liangkebang.net/',
-  h5Host: 'https://quantum-h5-test1.liangkebang.net',
+  // apiHost: 'https://quantum-blocks-vcc2.liangkebang.net/',
+  h5Host: 'https://quantum-h5-vcc2.liangkebang.net',
   qiniuHost: `https://appsync.lkbang.net`,
   shenceUrl: `${protocol}//bn.xyqb.com/sa?project=default`,
-  opapiHost: `https://opapi-test1.liangkebang.net`,
+  opapiHost: `https://opapi-vcc2.liangkebang.net`,
   qiniuUpHost: `${protocol}//up-z0.qiniup.com`,
-  // kdspHost: 'https://kdsp-api-test1.liangkebang.net',
-  kdspHost: 'https://talos-test1.liangkebang.net',
+  // kdspHost: 'https://kdsp-api-vcc2.liangkebang.net',
+  kdspHost: 'https://talos-vcc2.liangkebang.net',
   yxmTenantId: 560761,
   appIdMap: {
     560761: 'wxe16bf9293671506c',
     560867: 'wxccb8435d68e8c7d6',
   },
-};
\ No newline at end of file
+};
+
+if (EASY_ENV_IS_BROWSER) {
+  const apolloCfg = window.apollo || window.__INITIAL_STATE__.apollo;
+  if (apolloCfg) {
+    for (const key in apolloCfg) {
+      if (apolloCfg[key]) {
+        hostMap[key] = apolloCfg[key];
+      }
+    }
+  }
+}
+
+export default hostMap;

package-lock.json

@@ -2176,9 +2176,9 @@
       }
     },
     "@qg/citrus-ui": {
-      "version": "0.3.24",
-      "resolved": "http://npmprivate.quantgroups.com/@qg%2fcitrus-ui/-/citrus-ui-0.3.24.tgz",
-      "integrity": "sha512-zbZ6bzfw9gBKmu1Qxcdz89rzNTMvxpAH1zqHpNJUhR3H9WGRkvzwbKeezdQZpGZ6lQR2X/u3JmA1G2lOksRi4w==",
+      "version": "0.3.26",
+      "resolved": "http://npmprivate.quantgroups.com/@qg%2fcitrus-ui/-/citrus-ui-0.3.26.tgz",
+      "integrity": "sha512-piybfgOOJScnHZSUqGkrfwYG9SsJUtknw4eDKwdWKHnvDrPHFKL23CDlFnhExzmSYgZSY0QFWUPanGM5pamiNw==",
       "requires": {
         "@better-scroll/core": "^2.1.1",
         "@qg/cherry-ui": "^2.23.9",

package.json

@@ -29,7 +29,7 @@
     "@hubcarl/json-typescript-mapper": "^2.0.0",
     "@qg/apollo-nodejs": "^2.1.2",
     "@qg/cherry-ui": "2.23.10",
-    "@qg/citrus-ui": "0.3.24",
+    "@qg/citrus-ui": "0.3.26",
     "@riophae/vue-treeselect": "^0.4.0",
     "@types/lodash": "^4.14.117",
     "@types/node": "^10.12.0",