From 10856ef6ec5ef2e7255bd64a8cd26fc594c60539 Mon Sep 17 00:00:00 2001 From: liuwenhui Date: Sat, 19 May 2018 08:54:27 +0800 Subject: [PATCH] 1 --- .gitignore | 3 ++- litemall-admin-api/.gitignore | 2 ++ .../src/main/resources/application-dep.properties | 4 ++-- .../src/main/resources/application-dev.properties | 4 ++-- .../src/main/resources/application-prod.properties | 4 ++-- litemall-admin/.gitignore | 1 + litemall-all/.gitignore | 2 ++ litemall-core/.gitignore | 2 ++ litemall-db/.gitignore | 2 ++ litemall-os-api/.gitignore | 2 ++ .../src/main/resources/application-dep.properties | 4 ++-- .../src/main/resources/application-dev.properties | 4 ++-- .../src/main/resources/application-prod.properties | 6 +++--- litemall-wx-api/.gitignore | 2 ++ .../src/main/resources/application-dep.properties | 4 ++-- .../src/main/resources/application-dev.properties | 8 ++++---- .../src/main/resources/application-prod.properties | 10 +++++----- litemall-wx/config/api.js | 4 ++-- litemall-wx/project.config.json | 2 +- 19 files changed, 42 insertions(+), 28 deletions(-) diff --git a/.gitignore b/.gitignore index b1f0472b..d6889681 100644 --- a/.gitignore +++ b/.gitignore @@ -2,4 +2,5 @@ /private/ /storage/ /litemall.iml -.idea \ No newline at end of file +.idea +/.project diff --git a/litemall-admin-api/.gitignore b/litemall-admin-api/.gitignore index f7e9170c..adf6a21a 100644 --- a/litemall-admin-api/.gitignore +++ b/litemall-admin-api/.gitignore @@ -1,3 +1,5 @@ /target/ /litemall-admin-api.iml +/.classpath +/.project diff --git a/litemall-admin-api/src/main/resources/application-dep.properties b/litemall-admin-api/src/main/resources/application-dep.properties index f9a6f906..41ce80cd 100644 --- a/litemall-admin-api/src/main/resources/application-dep.properties +++ b/litemall-admin-api/src/main/resources/application-dep.properties @@ -5,8 +5,8 @@ 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.username=root +spring.datasource.druid.password=root spring.datasource.druid.initial-size=50 spring.datasource.druid.max-active=100 spring.datasource.druid.min-idle=20 diff --git a/litemall-admin-api/src/main/resources/application-dev.properties b/litemall-admin-api/src/main/resources/application-dev.properties index f9a6f906..41ce80cd 100644 --- a/litemall-admin-api/src/main/resources/application-dev.properties +++ b/litemall-admin-api/src/main/resources/application-dev.properties @@ -5,8 +5,8 @@ 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.username=root +spring.datasource.druid.password=root spring.datasource.druid.initial-size=50 spring.datasource.druid.max-active=100 spring.datasource.druid.min-idle=20 diff --git a/litemall-admin-api/src/main/resources/application-prod.properties b/litemall-admin-api/src/main/resources/application-prod.properties index 0a09fe15..7a594152 100644 --- a/litemall-admin-api/src/main/resources/application-prod.properties +++ b/litemall-admin-api/src/main/resources/application-prod.properties @@ -5,8 +5,8 @@ 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.username=root +spring.datasource.druid.password=root spring.datasource.druid.initial-size=50 spring.datasource.druid.max-active=100 spring.datasource.druid.min-idle=20 diff --git a/litemall-admin/.gitignore b/litemall-admin/.gitignore index 01ea4565..d8215902 100644 --- a/litemall-admin/.gitignore +++ b/litemall-admin/.gitignore @@ -17,3 +17,4 @@ selenium-debug.log *.njsproj *.sln +/package-lock.json diff --git a/litemall-all/.gitignore b/litemall-all/.gitignore index 44bb7c9f..e42afdf5 100644 --- a/litemall-all/.gitignore +++ b/litemall-all/.gitignore @@ -1,3 +1,5 @@ /target/ /litemall-all.iml +/.project +/.classpath diff --git a/litemall-core/.gitignore b/litemall-core/.gitignore index 94ceef7d..9891568c 100644 --- a/litemall-core/.gitignore +++ b/litemall-core/.gitignore @@ -1,3 +1,5 @@ /target/ /litemall-core.iml +/.project +/.classpath diff --git a/litemall-db/.gitignore b/litemall-db/.gitignore index 1de76936..9bbb3cb5 100644 --- a/litemall-db/.gitignore +++ b/litemall-db/.gitignore @@ -1,3 +1,5 @@ /target/ /litemall-db.iml +/.project +/.classpath diff --git a/litemall-os-api/.gitignore b/litemall-os-api/.gitignore index ee0b013a..164b388c 100644 --- a/litemall-os-api/.gitignore +++ b/litemall-os-api/.gitignore @@ -1,3 +1,5 @@ /target/ /litemall-os-api.iml +/.project +/.classpath diff --git a/litemall-os-api/src/main/resources/application-dep.properties b/litemall-os-api/src/main/resources/application-dep.properties index 4a750203..94cea182 100644 --- a/litemall-os-api/src/main/resources/application-dep.properties +++ b/litemall-os-api/src/main/resources/application-dep.properties @@ -5,8 +5,8 @@ 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.username=root +spring.datasource.druid.password=root spring.datasource.druid.initial-size=50 spring.datasource.druid.max-active=100 spring.datasource.druid.min-idle=20 diff --git a/litemall-os-api/src/main/resources/application-dev.properties b/litemall-os-api/src/main/resources/application-dev.properties index f772711d..073ee88f 100644 --- a/litemall-os-api/src/main/resources/application-dev.properties +++ b/litemall-os-api/src/main/resources/application-dev.properties @@ -5,8 +5,8 @@ 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.username=root +spring.datasource.druid.password=root spring.datasource.druid.initial-size=50 spring.datasource.druid.max-active=100 spring.datasource.druid.min-idle=20 diff --git a/litemall-os-api/src/main/resources/application-prod.properties b/litemall-os-api/src/main/resources/application-prod.properties index 59cdb32f..c6f6434a 100644 --- a/litemall-os-api/src/main/resources/application-prod.properties +++ b/litemall-os-api/src/main/resources/application-prod.properties @@ -5,8 +5,8 @@ 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.username=root +spring.datasource.druid.password=root spring.datasource.druid.initial-size=50 spring.datasource.druid.max-active=100 spring.datasource.druid.min-idle=20 @@ -26,6 +26,6 @@ logging.level.org.mybatis=ERROR logging.level.org.linlinjava.litemall.db=ERROR logging.level.org.linlinjava.litemall=DEBUG -# 开发者应该设置成自己的域名 +# \u5f00\u53d1\u8005\u5e94\u8be5\u8bbe\u7f6e\u6210\u81ea\u5df1\u7684\u57df\u540d 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/.gitignore b/litemall-wx-api/.gitignore index 41db0155..7e19c796 100644 --- a/litemall-wx-api/.gitignore +++ b/litemall-wx-api/.gitignore @@ -1,3 +1,5 @@ /target/ /litemall-wx-api.iml +/.project +/.classpath diff --git a/litemall-wx-api/src/main/resources/application-dep.properties b/litemall-wx-api/src/main/resources/application-dep.properties index 5c45d09f..471cf7bf 100644 --- a/litemall-wx-api/src/main/resources/application-dep.properties +++ b/litemall-wx-api/src/main/resources/application-dep.properties @@ -5,8 +5,8 @@ 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.username=root +spring.datasource.druid.password=root spring.datasource.druid.initial-size=50 spring.datasource.druid.max-active=100 spring.datasource.druid.min-idle=20 diff --git a/litemall-wx-api/src/main/resources/application-dev.properties b/litemall-wx-api/src/main/resources/application-dev.properties index 5c45d09f..1f37f7e1 100644 --- a/litemall-wx-api/src/main/resources/application-dev.properties +++ b/litemall-wx-api/src/main/resources/application-dev.properties @@ -5,8 +5,8 @@ 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.username=root +spring.datasource.druid.password=root spring.datasource.druid.initial-size=50 spring.datasource.druid.max-active=100 spring.datasource.druid.min-idle=20 @@ -27,8 +27,8 @@ 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.app-id=wxc3832e570671022a +wx.app-secret=bdb7c5d94a76f6fc5a00417fbd229901 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 62c253ce..b96bd32c 100644 --- a/litemall-wx-api/src/main/resources/application-prod.properties +++ b/litemall-wx-api/src/main/resources/application-prod.properties @@ -5,8 +5,8 @@ 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.username=root +spring.datasource.druid.password=root spring.datasource.druid.initial-size=50 spring.datasource.druid.max-active=100 spring.datasource.druid.min-idle=20 @@ -26,9 +26,9 @@ logging.level.org.mybatis=ERROR logging.level.org.linlinjava.litemall.db=ERROR logging.level.org.linlinjava.litemall=ERROR -# 开发者应该设置成自己的wx相关信息 -wx.app-id=wxa5b486c6b918ecfb -wx.app-secret=e04004829d4c383b4db7769d88dfbca1 +# \u5f00\u53d1\u8005\u5e94\u8be5\u8bbe\u7f6e\u6210\u81ea\u5df1\u7684wx\u76f8\u5173\u4fe1\u606f +wx.app-id=wxc3832e570671022a +wx.app-secret=bdb7c5d94a76f6fc5a00417fbd229901 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 8c3fdea8..56ee7ef3 100644 --- a/litemall-wx/config/api.js +++ b/litemall-wx/config/api.js @@ -1,10 +1,10 @@ // 以下是业务服务器API地址 // 本机开发时使用 -// var WxApiRoot = 'http://localhost:8082/wx/'; +var WxApiRoot = 'http://192.168.6.174: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/'; diff --git a/litemall-wx/project.config.json b/litemall-wx/project.config.json index 3455070e..fdc1a274 100644 --- a/litemall-wx/project.config.json +++ b/litemall-wx/project.config.json @@ -9,7 +9,7 @@ }, "compileType": "miniprogram", "libVersion": "1.9.93", - "appid": "wxa5b486c6b918ecfb", + "appid": "wxc3832e570671022a", "projectname": "litemall-wx", "condition": { "search": { -- Gitee