fix: apollo问题修复

app/controller/activity.ts

@@ -9,15 +9,14 @@ export default class ActivityController extends Controller {
       ctx.logger.info('请求redis成功 key: %j', redisKey);
     }
     if (!body) {
-      body = await ctx.renderView('activity.js', { url: ctx.url });
+      let apollo = {};
+      // if (process.env.NODE_ENV === 'production') {
+        const { api, qiniu } = ctx.app.config.apollo || {};
+        apollo = { ...api, ...qiniu };
+      // }
+      body = await ctx.renderView('activity.js', { url: ctx.url, apollo });
       await ctx.service.redis.set(redisKey, body);
     }
-    if (process.env.NODE_ENV === 'production') {
-    const { api, qiniu } = await import(path.resolve('./config/apollo.json'));
-    const firstScriptTagIndex = body.indexOf('<script');
-      body = `${body.slice(0, firstScriptTagIndex)}<script>var apollo = ${JSON.stringify({...api, ...qiniu} )};</script>${body.slice(firstScriptTagIndex, body.length - 1)}`;
-    }
-    ctx.logger.info('body: %j', body);
     ctx.body = body;
   }
 }
\ No newline at end of file

app/web/framework/app.ts

@@ -70,14 +70,13 @@ export default class App {
 
   server() {
     return context => {
-      // console.log('server', context.state);
       const vm = this.create(context.state);
       const { store, router } = vm;
       router.push(context.state.url);
       return new Promise((resolve, reject) => {
         router.onReady(() => {
           this.fetch(vm).then(() => {
-            context.state = store.state;
+            context.state = {...store.state, apollo: context.state.apollo};
             return resolve(new Vue(vm));
           });
         });

app/web/page/store/modules/activity/index.ts

@@ -23,7 +23,7 @@ export default class EditorModule implements Module<EditorState, RootState> {
       const [res] = await api.getPageById(condition);
       let { page, ...rest } = res as PageInfo;
       if (!page) {
-        page = "[]";
+        page = '[]';
       }
       commit(SET_PAGE_INFO, { ...rest, page: JSON.parse(page as string) });
     }

config/config.sit.ts

 
 import { Application, EggAppConfig } from 'egg';
 const path = require('path');
-
+ 
 export default (appInfo: EggAppConfig) => {
   const exports: any = {};
   const { redis } = require(path.resolve('./config/apollo.json'));

config/typings.d.ts

+declare module "*.json" {
+  const value: any;
+  export default value;
+ }
\ No newline at end of file