build: apollo实现

app/controller/editor.ts

@@ -11,7 +11,7 @@ export default class EditorController extends Controller {
   public async home(ctx: Context) {
     const { api, qiniu } = await import(path.resolve('./config/apollo.json'));
     await ctx.renderClient('editor.js', {
-      apollo: {...api, ...qiniu}
+      apollo: process.env.NODE_ENV === 'production' ? `var apollo = ${JSON.stringify({...api, ...qiniu})};` : 'var apollo = {};'
     });
   }
 

app/web/page/editor/index.ts

@@ -23,9 +23,6 @@ const create = function(initState) {
 
 const client = function() {
   const vm = create(window.__INITIAL_STATE__);
-  if (window.__INITIAL_STATE__.apollo) {
-    window.apollo = window.__INITIAL_STATE__.apollo;
-  }
   const app = new Vue(vm);
   const root = document.getElementById('app');
   const hydrate = (<HTMLElement>root).childNodes.length > 0;

app/web/view/layout.html

@@ -30,5 +30,7 @@
     <script src="https://activitystatic.lkbang.net/sa-sdk-javascript/1.15.16/sensorsdata.min.js"></script>
     <script src="https://activitystatic.lkbang.net/swiper/4.5.1/swiper.min.js"></script>
     <script src="https://activitystatic.lkbang.net/axios/0.19.2/axios.min.js"></script>
+    <script v-html="apollo">
+    </script>
   </body>
 </html>
\ No newline at end of file

config/apollo.json

 {
-  "api": {
-    "apiHost": "https://quantum-blocks-undefined.liangkebang.net/",
-    "h5Host": "https://quantum-h5-undefined.liangkebang.net/",
-    "opapiHost": "https://opapi-undefined.liangkebang.net/"
+  "api":{
+      "apiHost":"https://quantum-blocks-vcc2.liangkebang.net/",
+      "h5Host":"https://quantum-h5-vcc2.liangkebang.net/",
+      "opapiHost":"https://opapi-vcc2.liangkebang.net/",
+      "passportHost": "https://passportapi-vcc2.liangkebang.net",
+      "kdspHost": "https://talos-vcc2.liangkebang.net"
   },
-  "mysql": {
-    "low_code": {
-      "host": "undefined",
-      "port": "undefined",
-      "username": "qa",
-      "password": "qatest",
-      "database": "low_code"
+  "mysql":{
+      "low_code":{
+          "host":"${DB_SERVICE_HOST}",
+          "port": "${DB_SERVICE_PORT}",
+          "username":"qa",
+          "password":"qatest",
+          "database":"low_code"
       }
   },
-  "redis": {
-    "port": "undefined",
-    "host": "undefined",
+  "redis":{
+      "port": "${REDIS_SERVICE_PORT}",
+      "host": "${REDIS_SERVICE_HOST}",
       "password": "",
       "db": 0
   },
-  "qiniu": {
-    "qiniuUpHost": "https://up-z0.qiniup.com",
-    "qiniuHost": "https://appsync.lkbang.net"
+  "qiniu":{
+      "qiniuUpHost":"https://up-z0.qiniup.com",
+      "qiniuHost":"https://appsync.lkbang.net"
   }
 }
\ No newline at end of file

config/config.local.ts

@@ -22,16 +22,14 @@ export default (appInfo: EggAppConfig) => {
     injectCss: false
   };
 
-  const localMysqlConfig = {
+  exports.sequelize = {
     dialect: 'mysql',
     username: 'qa',
     password: 'qatest',
     host: '172.17.5.9',
     port: 31024,
     database: 'low_code',
-  };
-
-  exports.sequelize = localMysqlConfig;
+  };;
 
   exports.redis = {
     default: {

config/config.prod.ts

@@ -13,7 +13,10 @@ export default (appInfo: EggAppConfig) => {
     dir: '/home/quant_group/logs',
   };
 
-  const prodMysqlConfig = {
+
+  console.log('env>>', process.env.NAMESPACE, process.env.NODE_ENV, process.env.EGG_SERVER_ENV);
+
+  exports.sequelize = {
     dialect: 'mysql',
     username: 'low_code_w',
     password: 'B2pRHuGMLBNybuKp',
@@ -22,19 +25,6 @@ export default (appInfo: EggAppConfig) => {
     database: 'low_code',
   };
 
-  const localMysqlConfig = {
-    dialect: 'mysql',
-    username: 'qa',
-    password: 'qatest',
-    host: '172.17.5.9',
-    port: 31024,
-    database: 'low_code',
-  };
-
-  console.log('process.env.NAMESPACE', process.env.NAMESPACE);
-
-  exports.sequelize = process.env.NAMESPACE ? localMysqlConfig : prodMysqlConfig;
-
   const prodRedisConfig = {
     default: {
       keyPrefix: appInfo.name + ':',
@@ -47,19 +37,7 @@ export default (appInfo: EggAppConfig) => {
     }
   };
 
-  const localRedisConfig = {
-    default: {
-      keyPrefix: appInfo.name + ':',
-    },
-    client: {
-      port: 31565,          // Redis port
-      host: '172.17.5.13',   // Redis host
-      password: '',
-      db: 0
-    }
-  };
-
-  exports.redis = process.env.NAMESPACE ? localRedisConfig: prodRedisConfig;
+  exports.redis = prodRedisConfig;
 
   return exports;
 };

config/config.test.ts → config/config.sit.ts

@@ -6,6 +6,7 @@ const { mysql, redis } = apollo;
 
 export default (appInfo: EggAppConfig) => {
   const exports: any = {};
+  console.log('>>>env:', process.env.NAMESPACE, process.env.NODE_ENV, process.env.EGG_SERVER_ENV);
   const localMysqlConfig = {
     dialect: 'mysql',
     ...mysql.low_code

package-lock.json

@@ -1501,9 +1501,9 @@
       }
     },
     "@qg/citrus-ui": {
-      "version": "0.1.3-beta1",
-      "resolved": "http://npmprivate.quantgroups.com/@qg%2fcitrus-ui/-/citrus-ui-0.1.3-beta1.tgz",
-      "integrity": "sha512-lf87UC4XOKaloHfa9rj8xnFwTfEYDhEwOQ8K5KAslxsM7aPYPMrIZi4f5JCFvrJTi7YbQRrJq+D9QkCWl6T/Hg==",
+      "version": "0.1.4-beta1",
+      "resolved": "http://npmprivate.quantgroups.com/@qg%2fcitrus-ui/-/citrus-ui-0.1.4-beta1.tgz",
+      "integrity": "sha512-/dIA/+5Dhp5vKrAqF+nubZWi99xPd4hv1iHq2rl/3a+8t7Q8qfbSGj1Vx1QqgzYOBM6nDbWxD8bVL8S06BoT5g==",
       "requires": {
         "@better-scroll/core": "^2.1.1",
         "@qg/cherry-ui": "^2.20.19",
@@ -20135,9 +20135,9 @@
       "integrity": "sha1-8z/pz7Urv9UgqhgyO8ZdsRCht2w="
     },
     "rollup": {
-      "version": "2.49.0",
-      "resolved": "http://npmprivate.quantgroups.com/rollup/-/rollup-2.49.0.tgz",
-      "integrity": "sha512-UnrCjMXICx9q0jF8L7OYs7LPk95dW0U5UYp/VANnWqfuhyr66FWi/YVlI34Oy8Tp4ZGLcaUDt4APJm80b9oPWQ==",
+      "version": "2.50.0",
+      "resolved": "http://npmprivate.quantgroups.com/rollup/-/rollup-2.50.0.tgz",
+      "integrity": "sha512-wO+F2MqWPGUCZx0549oqY8dsQqHVjuSxoyBWWnxKoQE+1UGcDKjtL7wHq/8jnnLJEeoGDQLf3ztrpgRwlbGJ0A==",
       "requires": {
         "fsevents": "~2.3.1"
       }

package.json

@@ -3,8 +3,8 @@
   "version": "0.0.1",
   "description": "低代码平台",
   "scripts": {
-    "start": "cross-env APOLLO_CLUSTER=3C egg-scripts start --port 9050 --workers 1",
-    "test": "cross-env DEBUG=apollo NODE_ENV=qa APOLLO_CLUSTER=k8s NAMESPACE=qa2 egg-scripts start --port 80 --workers 1",
+    "start": "cross-env NODE_ENV=production  APOLLO_CLUSTER=3C egg-scripts start --port 9050 --workers 1",
+    "test": "cross-env NODE_ENV=production EGG_SERVER_ENV=sit DEBUG=apollo NODE_ENV=qa 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",
@@ -26,7 +26,7 @@
     "@hubcarl/json-typescript-mapper": "^2.0.0",
     "@qg/apollo-nodejs": "^2.1.2",
     "@qg/cherry-ui": "2.20.19",
-    "@qg/citrus-ui": "0.1.3-beta1",
+    "@qg/citrus-ui": "0.1.4-beta1",
     "@riophae/vue-treeselect": "^0.4.0",
     "@types/lodash": "^4.14.117",
     "@types/node": "^10.12.0",