Skip to content

Commit

Permalink
4.2.2 打版准备
Browse files Browse the repository at this point in the history
  • Loading branch information
chopper711 committed Sep 15, 2021
1 parent 3d4319c commit 17ff3aa
Show file tree
Hide file tree
Showing 5 changed files with 3,095 additions and 5,406 deletions.
34 changes: 34 additions & 0 deletions config/application/api.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,34 @@
/**
* base : 基础业务API
* buyer : 买家API
*/
// 开发环境
const dev = {
common: "https://common-api.pickmall.cn",
buyer: "https://buyer-api.pickmall.cn",

};
// 生产环境
const prod = {
common: "https://common-api.pickmall.cn",
buyer: "https://buyer-api.pickmall.cn",
};

//默认生产环境
let api = dev;
//如果是开发环境
if (process.env.NODE_ENV == "development") {
api = dev;
} else {
api = prod;
}
//微信小程序,app的打包方式建议为生产环境,所以这块直接条件编译赋值
// #ifdef MP-WEIXIN || APP-PLUS
api = prod;
// #endif

api.buyer += "/buyer";
api.common += "/common";
export default {
...api,
};
52 changes: 52 additions & 0 deletions config/application/index.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,52 @@
export default {
/**
* @description 配置显示在浏览器标签的title
*/
title: "lilishop",

/**
* @description token在Cookie中存储的天数,默认1天
*/
cookieExpires: 1,
/**
* @description 是否使用国际化,默认为false
* 如果不使用,则需要在路由中给需要在菜单中展示的路由设置meta: {title: 'xxx'}
* 用来在菜单中显示文字
*/
useI18n: true,



/**
* @description api请求基础路径
*/
api_dev: {
common: "https://common-api.pickmall.cn",
buyer: "https://buyer-api.pickmall.cn",
seller: "https://store-api.pickmall.cn",
manager: "https://admin-api.pickmall.cn"
// common: 'http://192.168.0.100:8890',
// buyer: 'http://192.168.0.100:8888',
// seller: 'http://192.168.0.100:8889',
// manager: 'http://192.168.0.100:8887'
},
api_prod: {
common: "https://common-api.pickmall.cn",
buyer: "https://buyer-api.pickmall.cn",
seller: "https://store-api.pickmall.cn",
manager: "https://admin-api.pickmall.cn"
},
/**
* @description api请求基础路径前缀
*/
baseUrlPrefix: "/store",
/**
* @description 需要加载的插件
*/
plugin: {
"error-store": {
showInHeader: true, // 设为false后不会在顶部显示错误日志徽标
developmentOff: true // 设为true后在开发环境不会收集错误信息,方便开发中排查错误
}
}
};
26 changes: 13 additions & 13 deletions docker-compose-application.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ version: '3'
services:
buyer:
restart: always
image: registry.cn-beijing.aliyuncs.com/lili-images/buyer-api-4.2.0:0.0.1
image: registry.cn-beijing.aliyuncs.com/lili-images/buyer-api:4.2.2.1
container_name: buyer
network_mode: host
environment:
Expand All @@ -11,7 +11,7 @@ services:

common:
restart: always
image: registry.cn-beijing.aliyuncs.com/lili-images/common-api-4.2.0:0.0.1
image: registry.cn-beijing.aliyuncs.com/lili-images/common-api:4.2.2.1
container_name: common
environment:
- TZ=Asia/Shanghai
Expand All @@ -20,7 +20,7 @@ services:

seller:
restart: always
image: registry.cn-beijing.aliyuncs.com/lili-images/seller-api-4.2.0:0.0.1
image: registry.cn-beijing.aliyuncs.com/lili-images/seller-api:4.2.2.1
container_name: seller
environment:
- TZ=Asia/Shanghai
Expand All @@ -29,34 +29,34 @@ services:

manager:
restart: always
image: registry.cn-beijing.aliyuncs.com/lili-images/manager-api-4.2.0:0.0.1
image: registry.cn-beijing.aliyuncs.com/lili-images/manager-api:4.2.2.1
container_name: manager
environment:
- TZ=Asia/Shanghai
- JAVA_OPTS=-XX:MetaspaceSize=64m -XX:MaxMetaspaceSize=128m -Xms128m -Xmx256m -Xmn128m -Xss256k -XX:SurvivorRatio=8 -XX:+UseConcMarkSweepGC
network_mode: host

buyer-ui:
restart: always
image: registry.cn-beijing.aliyuncs.com/lili-images/buyer-ui-4.2.0:0.0.2
container_name: buyer-ui
network_mode: host

wap-ui:
restart: always
image: registry.cn-beijing.aliyuncs.com/lili-images/wap-ui-4.2.0:0.0.2
image: registry.cn-beijing.aliyuncs.com/lili-images/wap-ui:4.2.2.1
container_name: wap-ui
network_mode: host

buyer-ui:
restart: always
image: registry.cn-beijing.aliyuncs.com/lili-images/buyer-ui:4.2.2.1
container_name: buyer-ui
network_mode: host

seller-ui:
restart: always
image: registry.cn-beijing.aliyuncs.com/lili-images/seller-ui-4.2.0:0.0.2
image: registry.cn-beijing.aliyuncs.com/lili-images/seller-ui:4.2.2.1
container_name: seller-ui
network_mode: host

manager-ui:
restart: always
image: registry.cn-beijing.aliyuncs.com/lili-images/manager-ui-4.2.0:0.0.2
image: registry.cn-beijing.aliyuncs.com/lili-images/manager-ui:4.2.2.1
container_name: manager-ui
network_mode: host

14 changes: 7 additions & 7 deletions docker-compose.yml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
version: '3'
services:
mysql:
image: mysql
image: mysql:8.0.25
restart: always
container_name: mysql
volumes:
Expand All @@ -14,9 +14,9 @@ services:
- "MYSQL_DATABASE=lilishop"
- "TZ=Asia/Shanghai"
network_mode: host

mongo:
image: mongo
image: mongo:5.0.2
restart: always
container_name: 'mongo'
environment:
Expand All @@ -28,7 +28,7 @@ services:
- ../volumes/data/mongodata:/data/db

redis:
image: redis
image: redis:6.2.5
restart: always
container_name: 'redis'
ports:
Expand Down Expand Up @@ -91,7 +91,7 @@ services:

# rocket mq name server
rmqnamesrv:
image: foxiswho/rocketmq:server
image: foxiswho/rocketmq:server-4.7.0
restart: always
container_name: rocket-server
environment:
Expand All @@ -105,7 +105,7 @@ services:
- 9876:9876
# rocket mq broker
rmqbroker:
image: foxiswho/rocketmq:broker
image: foxiswho/rocketmq:broker-4.7.0
restart: always
container_name: rocket-broker
volumes:
Expand All @@ -126,7 +126,7 @@ services:
- 10911:10911
# rocket console 这个可以不需要
rmqconsole:
image: styletang/rocketmq-console-ng
image: styletang/rocketmq-console-ng:latest
restart: always
container_name: rocket-console
environment:
Expand Down
Loading

0 comments on commit 17ff3aa

Please sign in to comment.