Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
jinli gu
Litemall
Commits
8e81093a
Commit
8e81093a
authored
May 06, 2018
by
Junling Bu
Browse files
update: 初步分离部署阶段和上线阶段。
1. 部署阶段配置文件中云主机的IP地址和端口 2. 上线阶段配置文件中云主机的域名地址(默认80端口)
parent
bbf71ee3
Changes
13
Hide whitespace changes
Inline
Side-by-side
litemall-admin-api/src/main/resources/application-dep.properties
0 → 100644
View file @
8e81093a
pagehelper.helperDialect
=
mysql
pagehelper.reasonable
=
true
pagehelper.supportMethodsArguments
=
true
pagehelper.params
=
count=countSql
spring.datasource.druid.url
=
jdbc:mysql://localhost:3306/litemall?useUnicode=true&characterEncoding=UTF-8&serverTimezone=UTC&verifyServerCertificate=false&useSSL=false
spring.datasource.druid.driver-class-name
=
com.mysql.jdbc.Driver
spring.datasource.druid.username
=
litemall
spring.datasource.druid.password
=
litemall123456
spring.datasource.druid.initial-size
=
50
spring.datasource.druid.max-active
=
100
spring.datasource.druid.min-idle
=
20
spring.datasource.druid.max-wait
=
60000
spring.datasource.druid.pool-prepared-statements
=
true
spring.datasource.druid.max-pool-prepared-statement-per-connection-size
=
20
spring.datasource.druid.validation-query
=
SELECT 1 FROM DUAL
spring.datasource.druid.test-on-borrow
=
false
spring.datasource.druid.test-on-return
=
false
spring.datasource.druid.test-while-idle
=
true
spring.datasource.druid.time-between-eviction-runs-millis
=
60000
spring.datasource.druid.filters
=
stat,wall,log4j
logging.level.root
=
ERROR
logging.level.org.springframework
=
ERROR
logging.level.org.mybatis
=
ERROR
logging.level.org.linlinjava.litemall.db
=
ERROR
logging.level.org.linlinjava.litemall
=
DEBUG
\ No newline at end of file
litemall-admin/config/dep.env.js
0 → 100644
View file @
8e81093a
module
.
exports
=
{
NODE_ENV
:
'
"deploy"
'
,
ENV_CONFIG
:
'
"dep"
'
,
BASE_API
:
'
"http://122.152.206.172:8083/admin"
'
,
OS_API
:
'
"http://122.152.206.172:8081/os"
'
}
litemall-admin/config/dev.env.js
View file @
8e81093a
module
.
exports
=
{
module
.
exports
=
{
NODE_ENV
:
'
"development"
'
,
NODE_ENV
:
'
"development"
'
,
ENV_CONFIG
:
'
"dev"
'
,
ENV_CONFIG
:
'
"dev"
'
,
BASE_API
:
'
"http://localhost:8083/admin"
'
,
BASE_API
:
'
"http://localhost:8083/admin"
'
,
OS_API
:
'
"http://localhost:8081/os"
'
OS_API
:
'
"http://localhost:8081/os"
'
}
}
litemall-admin/config/prod.env.js
View file @
8e81093a
module
.
exports
=
{
module
.
exports
=
{
NODE_ENV
:
'
"production"
'
,
NODE_ENV
:
'
"production"
'
,
ENV_CONFIG
:
'
"prod"
'
,
ENV_CONFIG
:
'
"prod"
'
,
BASE_API
:
'
"http://
122.152.206.172:8083
/admin"
'
,
BASE_API
:
'
"http
s
://
www.example.com
/admin"
'
,
OS_API
:
'
"http://
122.152.206.172:8081
/os"
'
OS_API
:
'
"http
s
://
www.example.com
/os"
'
}
}
litemall-admin/package.json
View file @
8e81093a
...
@@ -7,6 +7,7 @@
...
@@ -7,6 +7,7 @@
"private"
:
true
,
"private"
:
true
,
"scripts"
:
{
"scripts"
:
{
"dev"
:
"webpack-dev-server --inline --progress --config build/webpack.dev.conf.js"
,
"dev"
:
"webpack-dev-server --inline --progress --config build/webpack.dev.conf.js"
,
"build:dep"
:
"cross-env NODE_ENV=production env_config=dep node build/build.js"
,
"build:prod"
:
"cross-env NODE_ENV=production env_config=prod node build/build.js"
,
"build:prod"
:
"cross-env NODE_ENV=production env_config=prod node build/build.js"
,
"lint"
:
"eslint --ext .js,.vue src"
,
"lint"
:
"eslint --ext .js,.vue src"
,
"test"
:
"npm run lint"
"test"
:
"npm run lint"
...
...
litemall-all/src/main/resources/application-dep.properties
0 → 100644
View file @
8e81093a
pagehelper.helperDialect
=
mysql
pagehelper.reasonable
=
true
pagehelper.supportMethodsArguments
=
true
pagehelper.params
=
count=countSql
spring.datasource.druid.url
=
jdbc:mysql://localhost:3306/litemall?useUnicode=true&characterEncoding=UTF-8&serverTimezone=UTC&verifyServerCertificate=false&useSSL=false
spring.datasource.druid.driver-class-name
=
com.mysql.jdbc.Driver
spring.datasource.druid.username
=
litemall
spring.datasource.druid.password
=
litemall123456
spring.datasource.druid.initial-size
=
50
spring.datasource.druid.max-active
=
100
spring.datasource.druid.min-idle
=
20
spring.datasource.druid.max-wait
=
60000
spring.datasource.druid.pool-prepared-statements
=
true
spring.datasource.druid.max-pool-prepared-statement-per-connection-size
=
20
spring.datasource.druid.validation-query
=
SELECT 1 FROM DUAL
spring.datasource.druid.test-on-borrow
=
false
spring.datasource.druid.test-on-return
=
false
spring.datasource.druid.test-while-idle
=
true
spring.datasource.druid.time-between-eviction-runs-millis
=
60000
spring.datasource.druid.filters
=
stat,wall,log4j
logging.level.root
=
ERROR
logging.level.org.springframework
=
ERROR
logging.level.org.mybatis
=
ERROR
logging.level.org.linlinjava.litemall
=
DEBUG
litemall-db/src/main/resources/application-dep.properties
0 → 100644
View file @
8e81093a
pagehelper.helperDialect
=
mysql
pagehelper.reasonable
=
true
pagehelper.supportMethodsArguments
=
true
pagehelper.params
=
count=countSql
spring.datasource.druid.url
=
jdbc:mysql://localhost:3306/litemall?useUnicode=true&characterEncoding=UTF-8&serverTimezone=UTC&verifyServerCertificate=false&useSSL=false
spring.datasource.druid.driver-class-name
=
com.mysql.jdbc.Driver
spring.datasource.druid.username
=
litemall
spring.datasource.druid.password
=
litemall123456
spring.datasource.druid.initial-size
=
50
spring.datasource.druid.max-active
=
100
spring.datasource.druid.min-idle
=
20
spring.datasource.druid.max-wait
=
60000
spring.datasource.druid.pool-prepared-statements
=
true
spring.datasource.druid.max-pool-prepared-statement-per-connection-size
=
20
spring.datasource.druid.validation-query
=
SELECT 1 FROM DUAL
spring.datasource.druid.test-on-borrow
=
false
spring.datasource.druid.test-on-return
=
false
spring.datasource.druid.test-while-idle
=
true
spring.datasource.druid.time-between-eviction-runs-millis
=
60000
spring.datasource.druid.filters
=
stat,wall,log4j
logging.level.root
=
ERROR
logging.level.org.springframework
=
ERROR
logging.level.org.mybatis
=
ERROR
logging.level.org.linlinjava.litemall.db
=
DEBUG
logging.level.org.linlinjava.litemall
=
ERROR
litemall-os-api/src/main/resources/application-dep.properties
0 → 100644
View file @
8e81093a
pagehelper.helperDialect
=
mysql
pagehelper.reasonable
=
true
pagehelper.supportMethodsArguments
=
true
pagehelper.params
=
count=countSql
spring.datasource.druid.url
=
jdbc:mysql://localhost:3306/litemall?useUnicode=true&characterEncoding=UTF-8&serverTimezone=UTC&verifyServerCertificate=false&useSSL=false
spring.datasource.druid.driver-class-name
=
com.mysql.jdbc.Driver
spring.datasource.druid.username
=
litemall
spring.datasource.druid.password
=
litemall123456
spring.datasource.druid.initial-size
=
50
spring.datasource.druid.max-active
=
100
spring.datasource.druid.min-idle
=
20
spring.datasource.druid.max-wait
=
60000
spring.datasource.druid.pool-prepared-statements
=
true
spring.datasource.druid.max-pool-prepared-statement-per-connection-size
=
20
spring.datasource.druid.validation-query
=
SELECT 1 FROM DUAL
spring.datasource.druid.test-on-borrow
=
false
spring.datasource.druid.test-on-return
=
false
spring.datasource.druid.test-while-idle
=
true
spring.datasource.druid.time-between-eviction-runs-millis
=
60000
spring.datasource.druid.filters
=
stat,wall,log4j
logging.level.root
=
ERROR
logging.level.org.springframework
=
ERROR
logging.level.org.mybatis
=
ERROR
logging.level.org.linlinjava.litemall.db
=
ERROR
logging.level.org.linlinjava.litemall
=
ERROR
org.linlinjava.litemall.os.address
=
122.152.206.172
org.linlinjava.litemall.os.port
=
8081
\ No newline at end of file
litemall-os-api/src/main/resources/application-prod.properties
View file @
8e81093a
...
@@ -26,5 +26,6 @@ logging.level.org.mybatis=ERROR
...
@@ -26,5 +26,6 @@ logging.level.org.mybatis=ERROR
logging.level.org.linlinjava.litemall.db
=
ERROR
logging.level.org.linlinjava.litemall.db
=
ERROR
logging.level.org.linlinjava.litemall
=
DEBUG
logging.level.org.linlinjava.litemall
=
DEBUG
org.linlinjava.litemall.os.address
=
122.152.206.172
# 开发者应该设置成自己的域名
org.linlinjava.litemall.os.port
=
8081
org.linlinjava.litemall.os.address
=
www.example.com
\ No newline at end of file
org.linlinjava.litemall.os.port
=
80
\ No newline at end of file
litemall-wx-api/src/main/resources/application-dep.properties
0 → 100644
View file @
8e81093a
pagehelper.helperDialect
=
mysql
pagehelper.reasonable
=
true
pagehelper.supportMethodsArguments
=
true
pagehelper.params
=
count=countSql
spring.datasource.druid.url
=
jdbc:mysql://localhost:3306/litemall?useUnicode=true&characterEncoding=UTF-8&serverTimezone=UTC&verifyServerCertificate=false&useSSL=false
spring.datasource.druid.driver-class-name
=
com.mysql.jdbc.Driver
spring.datasource.druid.username
=
litemall
spring.datasource.druid.password
=
litemall123456
spring.datasource.druid.initial-size
=
50
spring.datasource.druid.max-active
=
100
spring.datasource.druid.min-idle
=
20
spring.datasource.druid.max-wait
=
60000
spring.datasource.druid.pool-prepared-statements
=
true
spring.datasource.druid.max-pool-prepared-statement-per-connection-size
=
20
spring.datasource.druid.validation-query
=
SELECT 1 FROM DUAL
spring.datasource.druid.test-on-borrow
=
false
spring.datasource.druid.test-on-return
=
false
spring.datasource.druid.test-while-idle
=
true
spring.datasource.druid.time-between-eviction-runs-millis
=
60000
spring.datasource.druid.filters
=
stat,wall,log4j
logging.level.root
=
ERROR
logging.level.org.springframework
=
ERROR
logging.level.org.mybatis
=
ERROR
logging.level.org.linlinjava.litemall.db
=
ERROR
logging.level.org.linlinjava.litemall
=
DEBUG
wx.app-id
=
wxa5b486c6b918ecfb
wx.app-secret
=
e04004829d4c383b4db7769d88dfbca1
wx.mch-id
=
wx.mch-key
=
wx.notify-url
=
\ No newline at end of file
litemall-wx-api/src/main/resources/application-dev.properties
View file @
8e81093a
...
@@ -25,4 +25,10 @@ logging.level.root=ERROR
...
@@ -25,4 +25,10 @@ logging.level.root=ERROR
logging.level.org.springframework
=
ERROR
logging.level.org.springframework
=
ERROR
logging.level.org.mybatis
=
ERROR
logging.level.org.mybatis
=
ERROR
logging.level.org.linlinjava.litemall.db
=
ERROR
logging.level.org.linlinjava.litemall.db
=
ERROR
logging.level.org.linlinjava.litemall
=
DEBUG
logging.level.org.linlinjava.litemall
=
DEBUG
\ No newline at end of file
wx.app-id
=
wxa5b486c6b918ecfb
wx.app-secret
=
e04004829d4c383b4db7769d88dfbca1
wx.mch-id
=
wx.mch-key
=
wx.notify-url
=
\ No newline at end of file
litemall-wx-api/src/main/resources/application-prod.properties
View file @
8e81093a
...
@@ -24,4 +24,11 @@ logging.level.root=ERROR
...
@@ -24,4 +24,11 @@ logging.level.root=ERROR
logging.level.org.springframework
=
ERROR
logging.level.org.springframework
=
ERROR
logging.level.org.mybatis
=
ERROR
logging.level.org.mybatis
=
ERROR
logging.level.org.linlinjava.litemall.db
=
ERROR
logging.level.org.linlinjava.litemall.db
=
ERROR
logging.level.org.linlinjava.litemall
=
ERROR
logging.level.org.linlinjava.litemall
=
ERROR
\ No newline at end of file
# 开发者应该设置成自己的wx相关信息
wx.app-id
=
wxa5b486c6b918ecfb
wx.app-secret
=
e04004829d4c383b4db7769d88dfbca1
wx.mch-id
=
wx.mch-key
=
wx.notify-url
=
\ No newline at end of file
litemall-wx/config/api.js
View file @
8e81093a
...
@@ -5,6 +5,8 @@
...
@@ -5,6 +5,8 @@
// var WxApiRoot = 'http://192.168.0.101:8082/wx/';
// var WxApiRoot = 'http://192.168.0.101:8082/wx/';
// 云平台部署时使用
// 云平台部署时使用
var
WxApiRoot
=
'
http://122.152.206.172:8082/wx/
'
;
var
WxApiRoot
=
'
http://122.152.206.172:8082/wx/
'
;
// 云平台上线时使用
// var WxApiRoot = 'https://www.example.com/wx/';
// 以下是图片存储服务器API地址
// 以下是图片存储服务器API地址
// 本机开发时使用
// 本机开发时使用
...
@@ -13,7 +15,8 @@
...
@@ -13,7 +15,8 @@
// var StorageApi = 'http://192.168.0.101:8081/os/storage/create';
// var StorageApi = 'http://192.168.0.101:8081/os/storage/create';
// 云平台部署时使用
// 云平台部署时使用
var
StorageApi
=
'
http://122.152.206.172:8081/os/storage/create
'
;
var
StorageApi
=
'
http://122.152.206.172:8081/os/storage/create
'
;
// 云平台上线时使用
// var StorageApi = 'https://www.example.com/os/storage/create';
module
.
exports
=
{
module
.
exports
=
{
IndexUrl
:
WxApiRoot
+
'
home/index
'
,
//首页数据接口
IndexUrl
:
WxApiRoot
+
'
home/index
'
,
//首页数据接口
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment