diff --git a/.gitignore b/.gitignore index b1f0472b69d1fd12bee195c50a245ff94133a8e0..d68896812a640da8a424b2b17ec0ef7f8e864c50 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 f7e9170c8d47aa97f030da5446d595cf242cad2d..adf6a21a6e2e5a58a7217560b72ede3073d087d6 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 f9a6f906d1a9372296f1b211a3c437342dacf408..41ce80cde2bb478328c69c64bbfb77319da64e2e 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 f9a6f906d1a9372296f1b211a3c437342dacf408..41ce80cde2bb478328c69c64bbfb77319da64e2e 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 0a09fe1537d9a45baec1c55bcb7266bbb1a6b43f..7a594152cf0b143ea57bedd1efc29d4a3d234166 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 01ea4565671bd200c57e059d221f205ecce082b8..d82159024a2e9e11766696c01797836f850ada9f 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 44bb7c9fc75b188da5fd4fe4397329ed09d009a8..e42afdf5f966a2acce4b64fda76089f23a62f35a 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 94ceef7d1f68764350b9047e14dfc6d3e8e3e9c3..9891568c10a52d2e84a03f77ef84ffb4cdd2f396 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 1de76936ebd1c8560fbb1ed7da91dc09752ae1c1..9bbb3cb535064fe53198497f3023d346a44809a4 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 ee0b013ab20378834add703689141e4ecbce86d5..164b388c99535b3517787ddf3e9ade39299b1bea 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 4a7502034c8b47d6d41e9213a839b52ab7da1d38..94cea1827acd37172468c5e95431dca2c4db29ac 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 f772711d01239add8c68067a18ba429d4e7eaf72..073ee88fc9d2e7b136cb65d7c191c258d688cc98 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 59cdb32fef1c75a8dc3dc0ff28d54c9c34084db1..c6f6434a7b18a6ac2a3923fcc27ee27363658dfc 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 41db015523d819b827ce0a0f89b750e8257a4766..7e19c7962fa633ba5c54c135b6947317de151925 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 5c45d09fd88f4ca170a1fc9fa2e0a3890cb76118..471cf7bf1e8919b06141193935b6c397a4156a78 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 5c45d09fd88f4ca170a1fc9fa2e0a3890cb76118..1f37f7e17fbbc12aa0b3058c1b40e6c825b524cb 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 62c253ce1d4112531f7f7653c948c81f5e188266..b96bd32cb369fc87aa082f56c870ce4e73201151 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 8c3fdea81ce5deafcff74394b20e61d68d822284..56ee7ef304bdacabf79005efeca55de711eaebe2 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 3455070ec4a9498f6a5f852784c531c3a0c4e804..fdc1a27463c6fbc55b05624a0590c868435acf1c 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": {