From 8e81093afb648fff264f146e85f3901df080900d Mon Sep 17 00:00:00 2001 From: Junling Bu Date: Sun, 6 May 2018 10:41:58 +0800 Subject: [PATCH] =?UTF-8?q?update:=20=E5=88=9D=E6=AD=A5=E5=88=86=E7=A6=BB?= =?UTF-8?q?=E9=83=A8=E7=BD=B2=E9=98=B6=E6=AE=B5=E5=92=8C=E4=B8=8A=E7=BA=BF?= =?UTF-8?q?=E9=98=B6=E6=AE=B5=E3=80=82=201.=20=E9=83=A8=E7=BD=B2=E9=98=B6?= =?UTF-8?q?=E6=AE=B5=E9=85=8D=E7=BD=AE=E6=96=87=E4=BB=B6=E4=B8=AD=E4=BA=91?= =?UTF-8?q?=E4=B8=BB=E6=9C=BA=E7=9A=84IP=E5=9C=B0=E5=9D=80=E5=92=8C?= =?UTF-8?q?=E7=AB=AF=E5=8F=A3=202.=20=E4=B8=8A=E7=BA=BF=E9=98=B6=E6=AE=B5?= =?UTF-8?q?=E9=85=8D=E7=BD=AE=E6=96=87=E4=BB=B6=E4=B8=AD=E4=BA=91=E4=B8=BB?= =?UTF-8?q?=E6=9C=BA=E7=9A=84=E5=9F=9F=E5=90=8D=E5=9C=B0=E5=9D=80=EF=BC=88?= =?UTF-8?q?=E9=BB=98=E8=AE=A480=E7=AB=AF=E5=8F=A3=EF=BC=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/resources/application-dep.properties | 28 +++++++++++++++ litemall-admin/config/dep.env.js | 6 ++++ litemall-admin/config/dev.env.js | 4 +-- litemall-admin/config/prod.env.js | 4 +-- litemall-admin/package.json | 1 + .../main/resources/application-dep.properties | 27 +++++++++++++++ .../main/resources/application-dep.properties | 29 ++++++++++++++++ .../main/resources/application-dep.properties | 30 ++++++++++++++++ .../resources/application-prod.properties | 5 +-- .../main/resources/application-dep.properties | 34 +++++++++++++++++++ .../main/resources/application-dev.properties | 8 ++++- .../resources/application-prod.properties | 9 ++++- litemall-wx/config/api.js | 5 ++- 13 files changed, 181 insertions(+), 9 deletions(-) create mode 100644 litemall-admin-api/src/main/resources/application-dep.properties create mode 100644 litemall-admin/config/dep.env.js create mode 100644 litemall-all/src/main/resources/application-dep.properties create mode 100644 litemall-db/src/main/resources/application-dep.properties create mode 100644 litemall-os-api/src/main/resources/application-dep.properties create mode 100644 litemall-wx-api/src/main/resources/application-dep.properties diff --git a/litemall-admin-api/src/main/resources/application-dep.properties b/litemall-admin-api/src/main/resources/application-dep.properties new file mode 100644 index 00000000..f9a6f906 --- /dev/null +++ b/litemall-admin-api/src/main/resources/application-dep.properties @@ -0,0 +1,28 @@ +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 diff --git a/litemall-admin/config/dep.env.js b/litemall-admin/config/dep.env.js new file mode 100644 index 00000000..e5903ec5 --- /dev/null +++ b/litemall-admin/config/dep.env.js @@ -0,0 +1,6 @@ +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"' +} diff --git a/litemall-admin/config/dev.env.js b/litemall-admin/config/dev.env.js index 2c4b540d..b82f20da 100644 --- a/litemall-admin/config/dev.env.js +++ b/litemall-admin/config/dev.env.js @@ -1,6 +1,6 @@ module.exports = { NODE_ENV: '"development"', ENV_CONFIG: '"dev"', - BASE_API: '"http://localhost:8083/admin"', - OS_API: '"http://localhost:8081/os"' + BASE_API: '"http://localhost:8083/admin"', + OS_API: '"http://localhost:8081/os"' } diff --git a/litemall-admin/config/prod.env.js b/litemall-admin/config/prod.env.js index 1ab8b2c3..c41e0a37 100644 --- a/litemall-admin/config/prod.env.js +++ b/litemall-admin/config/prod.env.js @@ -1,6 +1,6 @@ module.exports = { NODE_ENV: '"production"', ENV_CONFIG: '"prod"', - BASE_API: '"http://122.152.206.172:8083/admin"', - OS_API: '"http://122.152.206.172:8081/os"' + BASE_API: '"https://www.example.com/admin"', + OS_API: '"https://www.example.com/os"' } diff --git a/litemall-admin/package.json b/litemall-admin/package.json index ca4a9139..02618064 100644 --- a/litemall-admin/package.json +++ b/litemall-admin/package.json @@ -7,6 +7,7 @@ "private": true, "scripts": { "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", "lint": "eslint --ext .js,.vue src", "test": "npm run lint" diff --git a/litemall-all/src/main/resources/application-dep.properties b/litemall-all/src/main/resources/application-dep.properties new file mode 100644 index 00000000..a6830076 --- /dev/null +++ b/litemall-all/src/main/resources/application-dep.properties @@ -0,0 +1,27 @@ +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 diff --git a/litemall-db/src/main/resources/application-dep.properties b/litemall-db/src/main/resources/application-dep.properties new file mode 100644 index 00000000..c4763096 --- /dev/null +++ b/litemall-db/src/main/resources/application-dep.properties @@ -0,0 +1,29 @@ +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 + diff --git a/litemall-os-api/src/main/resources/application-dep.properties b/litemall-os-api/src/main/resources/application-dep.properties new file mode 100644 index 00000000..4a750203 --- /dev/null +++ b/litemall-os-api/src/main/resources/application-dep.properties @@ -0,0 +1,30 @@ +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 diff --git a/litemall-os-api/src/main/resources/application-prod.properties b/litemall-os-api/src/main/resources/application-prod.properties index 34c2cfcc..59cdb32f 100644 --- a/litemall-os-api/src/main/resources/application-prod.properties +++ b/litemall-os-api/src/main/resources/application-prod.properties @@ -26,5 +26,6 @@ logging.level.org.mybatis=ERROR logging.level.org.linlinjava.litemall.db=ERROR logging.level.org.linlinjava.litemall=DEBUG -org.linlinjava.litemall.os.address=122.152.206.172 -org.linlinjava.litemall.os.port=8081 \ No newline at end of file +# 开发者应该设置成自己的域名 +org.linlinjava.litemall.os.address=www.example.com +org.linlinjava.litemall.os.port=80 \ No newline at end of file diff --git a/litemall-wx-api/src/main/resources/application-dep.properties b/litemall-wx-api/src/main/resources/application-dep.properties new file mode 100644 index 00000000..5c45d09f --- /dev/null +++ b/litemall-wx-api/src/main/resources/application-dep.properties @@ -0,0 +1,34 @@ +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 diff --git a/litemall-wx-api/src/main/resources/application-dev.properties b/litemall-wx-api/src/main/resources/application-dev.properties index f9a6f906..5c45d09f 100644 --- a/litemall-wx-api/src/main/resources/application-dev.properties +++ b/litemall-wx-api/src/main/resources/application-dev.properties @@ -25,4 +25,10 @@ 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 +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 diff --git a/litemall-wx-api/src/main/resources/application-prod.properties b/litemall-wx-api/src/main/resources/application-prod.properties index ab971fa5..62c253ce 100644 --- a/litemall-wx-api/src/main/resources/application-prod.properties +++ b/litemall-wx-api/src/main/resources/application-prod.properties @@ -24,4 +24,11 @@ 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 \ No newline at end of file +logging.level.org.linlinjava.litemall=ERROR + +# 开发者应该设置成自己的wx相关信息 +wx.app-id=wxa5b486c6b918ecfb +wx.app-secret=e04004829d4c383b4db7769d88dfbca1 +wx.mch-id= +wx.mch-key= +wx.notify-url= \ No newline at end of file diff --git a/litemall-wx/config/api.js b/litemall-wx/config/api.js index 213c27f1..05a2fc17 100644 --- a/litemall-wx/config/api.js +++ b/litemall-wx/config/api.js @@ -5,6 +5,8 @@ // var WxApiRoot = 'http://192.168.0.101:8082/wx/'; // 云平台部署时使用 var WxApiRoot = 'http://122.152.206.172:8082/wx/'; +// 云平台上线时使用 +// var WxApiRoot = 'https://www.example.com/wx/'; // 以下是图片存储服务器API地址 // 本机开发时使用 @@ -13,7 +15,8 @@ // var StorageApi = 'http://192.168.0.101: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 = { IndexUrl: WxApiRoot + 'home/index', //首页数据接口