Skip to content

Q
quantum-blocks
Commit 35554749 authored by 郭志伟's avatar 郭志伟
Browse files
Options

build: apollo实现

parent dbe0b8c8
Hide whitespace changes
Inline Side-by-side
Showing with 42 additions and 64 deletions
app/controller/editor.ts
View file @ 35554749
...@@ -11,7 +11,7 @@ export default class EditorController extends Controller { ...@@ -11,7 +11,7 @@ export default class EditorController extends Controller {
public async home(ctx: Context) { public async home(ctx: Context) {
const { api, qiniu } = await import(path.resolve('./config/apollo.json')); const { api, qiniu } = await import(path.resolve('./config/apollo.json'));
await ctx.renderClient('editor.js', { 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
View file @ 35554749
...@@ -23,9 +23,6 @@ const create = function(initState) { ...@@ -23,9 +23,6 @@ const create = function(initState) {
const client = function() { const client = function() {
const vm = create(window.__INITIAL_STATE__); const vm = create(window.__INITIAL_STATE__);
if (window.__INITIAL_STATE__.apollo) {
window.apollo = window.__INITIAL_STATE__.apollo;
}
const app = new Vue(vm); const app = new Vue(vm);
const root = document.getElementById('app'); const root = document.getElementById('app');
const hydrate = (<HTMLElement>root).childNodes.length > 0; const hydrate = (<HTMLElement>root).childNodes.length > 0;
......
app/web/view/layout.html
View file @ 35554749
...@@ -30,5 +30,7 @@ ...@@ -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/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/swiper/4.5.1/swiper.min.js"></script>
<script src="https://activitystatic.lkbang.net/axios/0.19.2/axios.min.js"></script> <script src="https://activitystatic.lkbang.net/axios/0.19.2/axios.min.js"></script>
<script v-html="apollo">
</script>
</body> </body>
</html> </html>
\ No newline at end of file
config/apollo.json
View file @ 35554749
{ {
"api": { "api":{
"apiHost": "https://quantum-blocks-undefined.liangkebang.net/", "apiHost":"https://quantum-blocks-vcc2.liangkebang.net/",
"h5Host": "https://quantum-h5-undefined.liangkebang.net/", "h5Host":"https://quantum-h5-vcc2.liangkebang.net/",
"opapiHost": "https://opapi-undefined.liangkebang.net/" "opapiHost":"https://opapi-vcc2.liangkebang.net/",
"passportHost": "https://passportapi-vcc2.liangkebang.net",
"kdspHost": "https://talos-vcc2.liangkebang.net"
}, },
"mysql": { "mysql":{
"low_code": { "low_code":{
"host": "undefined", "host":"${DB_SERVICE_HOST}",
"port": "undefined", "port": "${DB_SERVICE_PORT}",
"username": "qa", "username":"qa",
"password": "qatest", "password":"qatest",
"database": "low_code" "database":"low_code"
} }
}, },
"redis": { "redis":{
"port": "undefined", "port": "${REDIS_SERVICE_PORT}",
"host": "undefined", "host": "${REDIS_SERVICE_HOST}",
"password": "", "password": "",
"db": 0 "db": 0
}, },
"qiniu": { "qiniu":{
"qiniuUpHost": "https://up-z0.qiniup.com", "qiniuUpHost":"https://up-z0.qiniup.com",
"qiniuHost": "https://appsync.lkbang.net" "qiniuHost":"https://appsync.lkbang.net"
} }
} }
\ No newline at end of file
config/config.local.ts
View file @ 35554749
...@@ -22,16 +22,14 @@ export default (appInfo: EggAppConfig) => { ...@@ -22,16 +22,14 @@ export default (appInfo: EggAppConfig) => {
injectCss: false injectCss: false
}; };
const localMysqlConfig = { exports.sequelize = {
dialect: 'mysql', dialect: 'mysql',
username: 'qa', username: 'qa',
password: 'qatest', password: 'qatest',
host: '172.17.5.9', host: '172.17.5.9',
port: 31024, port: 31024,
database: 'low_code', database: 'low_code',
}; };;
exports.sequelize = localMysqlConfig;
exports.redis = { exports.redis = {
default: { default: {
......
config/config.prod.ts
View file @ 35554749
...@@ -13,7 +13,10 @@ export default (appInfo: EggAppConfig) => { ...@@ -13,7 +13,10 @@ export default (appInfo: EggAppConfig) => {
dir: '/home/quant_group/logs', 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', dialect: 'mysql',
username: 'low_code_w', username: 'low_code_w',
password: 'B2pRHuGMLBNybuKp', password: 'B2pRHuGMLBNybuKp',
...@@ -22,19 +25,6 @@ export default (appInfo: EggAppConfig) => { ...@@ -22,19 +25,6 @@ export default (appInfo: EggAppConfig) => {
database: 'low_code', 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 = { const prodRedisConfig = {
default: { default: {
keyPrefix: appInfo.name + ':', keyPrefix: appInfo.name + ':',
...@@ -47,19 +37,7 @@ export default (appInfo: EggAppConfig) => { ...@@ -47,19 +37,7 @@ export default (appInfo: EggAppConfig) => {
} }
}; };
const localRedisConfig = { exports.redis = prodRedisConfig;
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;
return exports; return exports;
}; };
config/config.test.ts → config/config.sit.ts
View file @ 35554749
...@@ -6,6 +6,7 @@ const { mysql, redis } = apollo; ...@@ -6,6 +6,7 @@ const { mysql, redis } = apollo;
export default (appInfo: EggAppConfig) => { export default (appInfo: EggAppConfig) => {
const exports: any = {}; const exports: any = {};
console.log('>>>env:', process.env.NAMESPACE, process.env.NODE_ENV, process.env.EGG_SERVER_ENV);
const localMysqlConfig = { const localMysqlConfig = {
dialect: 'mysql', dialect: 'mysql',
...mysql.low_code ...mysql.low_code
......
package-lock.json
View file @ 35554749
...@@ -1501,9 +1501,9 @@ ...@@ -1501,9 +1501,9 @@
} }
}, },
"@qg/citrus-ui": { "@qg/citrus-ui": {
"version": "0.1.3-beta1", "version": "0.1.4-beta1",
"resolved": "http://npmprivate.quantgroups.com/@qg%2fcitrus-ui/-/citrus-ui-0.1.3-beta1.tgz", "resolved": "http://npmprivate.quantgroups.com/@qg%2fcitrus-ui/-/citrus-ui-0.1.4-beta1.tgz",
"integrity": "sha512-lf87UC4XOKaloHfa9rj8xnFwTfEYDhEwOQ8K5KAslxsM7aPYPMrIZi4f5JCFvrJTi7YbQRrJq+D9QkCWl6T/Hg==", "integrity": "sha512-/dIA/+5Dhp5vKrAqF+nubZWi99xPd4hv1iHq2rl/3a+8t7Q8qfbSGj1Vx1QqgzYOBM6nDbWxD8bVL8S06BoT5g==",
"requires": { "requires": {
"@better-scroll/core": "^2.1.1", "@better-scroll/core": "^2.1.1",
"@qg/cherry-ui": "^2.20.19", "@qg/cherry-ui": "^2.20.19",
...@@ -20135,9 +20135,9 @@ ...@@ -20135,9 +20135,9 @@
"integrity": "sha1-8z/pz7Urv9UgqhgyO8ZdsRCht2w=" "integrity": "sha1-8z/pz7Urv9UgqhgyO8ZdsRCht2w="
}, },
"rollup": { "rollup": {
"version": "2.49.0", "version": "2.50.0",
"resolved": "http://npmprivate.quantgroups.com/rollup/-/rollup-2.49.0.tgz", "resolved": "http://npmprivate.quantgroups.com/rollup/-/rollup-2.50.0.tgz",
"integrity": "sha512-UnrCjMXICx9q0jF8L7OYs7LPk95dW0U5UYp/VANnWqfuhyr66FWi/YVlI34Oy8Tp4ZGLcaUDt4APJm80b9oPWQ==", "integrity": "sha512-wO+F2MqWPGUCZx0549oqY8dsQqHVjuSxoyBWWnxKoQE+1UGcDKjtL7wHq/8jnnLJEeoGDQLf3ztrpgRwlbGJ0A==",
"requires": { "requires": {
"fsevents": "~2.3.1" "fsevents": "~2.3.1"
} }
......
package.json
View file @ 35554749
...@@ -3,8 +3,8 @@ ...@@ -3,8 +3,8 @@
"version": "0.0.1", "version": "0.0.1",
"description": "低代码平台", "description": "低代码平台",
"scripts": { "scripts": {
"start": "cross-env APOLLO_CLUSTER=3C egg-scripts start --port 9050 --workers 1", "start": "cross-env NODE_ENV=production 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", "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", "stop": "egg-scripts stop",
"backend": "nohup egg-scripts start --port 7001 --workers 4", "backend": "nohup egg-scripts start --port 7001 --workers 4",
"dev": "egg-bin dev -r egg-ts-helper/register", "dev": "egg-bin dev -r egg-ts-helper/register",
...@@ -26,7 +26,7 @@ ...@@ -26,7 +26,7 @@
"@hubcarl/json-typescript-mapper": "^2.0.0", "@hubcarl/json-typescript-mapper": "^2.0.0",
"@qg/apollo-nodejs": "^2.1.2", "@qg/apollo-nodejs": "^2.1.2",
"@qg/cherry-ui": "2.20.19", "@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", "@riophae/vue-treeselect": "^0.4.0",
"@types/lodash": "^4.14.117", "@types/lodash": "^4.14.117",
"@types/node": "^10.12.0", "@types/node": "^10.12.0",
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment