From 9a5cd4556fee20e2625400c4e7f2836b4461792b Mon Sep 17 00:00:00 2001 From: Menethil Date: Mon, 30 Jul 2018 15:44:49 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=88=86=E4=BA=AB=E5=9B=BE?= =?UTF-8?q?=E5=90=8E=E7=BC=80=E5=90=8D=EF=BC=8C=E6=B7=BB=E5=8A=A0system?= =?UTF-8?q?=E8=A1=A8=E6=89=93=E5=8D=B0=E4=BF=A1=E6=81=AF=EF=BC=8C=E9=AA=8C?= =?UTF-8?q?=E8=AF=81=E7=A0=81=E7=9F=AD=E4=BF=A1=E6=94=B9=E4=B8=BA=E5=BC=82?= =?UTF-8?q?=E6=AD=A5=E5=8F=91=E9=80=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- litemall-admin/config/dep.env.js | 2 +- .../litemall/core/qcode/QCodeService.java | 2 +- .../litemall/core/system/SystemInistService.java | 14 ++++++-------- .../litemall/wx/web/WxAuthController.java | 2 +- 4 files changed, 9 insertions(+), 11 deletions(-) diff --git a/litemall-admin/config/dep.env.js b/litemall-admin/config/dep.env.js index ad5dc964..7b80557e 100644 --- a/litemall-admin/config/dep.env.js +++ b/litemall-admin/config/dep.env.js @@ -1,5 +1,5 @@ module.exports = { NODE_ENV: '"production"', ENV_CONFIG: '"dep"', - BASE_API: '"https://www.menethil.com.cn/admin"' + BASE_API: '"http://localhost:8083/admin"' } diff --git a/litemall-core/src/main/java/org/linlinjava/litemall/core/qcode/QCodeService.java b/litemall-core/src/main/java/org/linlinjava/litemall/core/qcode/QCodeService.java index efaf3c8c..277e5d42 100644 --- a/litemall-core/src/main/java/org/linlinjava/litemall/core/qcode/QCodeService.java +++ b/litemall-core/src/main/java/org/linlinjava/litemall/core/qcode/QCodeService.java @@ -60,7 +60,7 @@ public class QCodeService { } private String getKeyName(String goodId) { - return "GOOD_QCODE_" + goodId; + return "GOOD_QCODE_" + goodId + ".jpg"; } /** diff --git a/litemall-core/src/main/java/org/linlinjava/litemall/core/system/SystemInistService.java b/litemall-core/src/main/java/org/linlinjava/litemall/core/system/SystemInistService.java index 2a34b21c..f8e9a791 100644 --- a/litemall-core/src/main/java/org/linlinjava/litemall/core/system/SystemInistService.java +++ b/litemall-core/src/main/java/org/linlinjava/litemall/core/system/SystemInistService.java @@ -33,34 +33,32 @@ class SystemInistService { // 测试获取application-db.yml配置信息 infos.put("数据库USER", environment.getProperty("spring.datasource.druid.username")); infos.put("数据库地址", environment.getProperty("spring.datasource.druid.url")); - // 测试获取application.yml配置信息 infos.put("调试级别", environment.getProperty("logging.level.org.linlinjava.litemall.wx")); + // 测试获取application-core.yml配置信息 infos.put(SystemInfoPrinter.CREATE_PART_COPPER + 1, "模块状态"); infos.put("邮件", environment.getProperty("litemall.notify.mail.enable")); infos.put("短信", environment.getProperty("litemall.notify.sms.enable")); infos.put("模版消息", environment.getProperty("litemall.notify.wx.enable")); infos.put("快递信息", environment.getProperty("litemall.express.enable")); - // 测试获取application-core.yml配置信息 infos.put("快递鸟ID", environment.getProperty("litemall.express.appId")); infos.put("对象存储", environment.getProperty("litemall.storage.active")); infos.put("本地对象存储路径", environment.getProperty("litemall.storage.local.storagePath")); infos.put("本地对象访问地址", environment.getProperty("litemall.storage.local.address")); infos.put("本地对象访问端口", environment.getProperty("litemall.storage.local.port")); - infos.put(SystemInfoPrinter.CREATE_PART_COPPER + 2, "微信相关"); - // 测试获取application-wx.yml配置信息 infos.put("微信APP KEY", environment.getProperty("litemall.wx.app-id")); - // 测试获取application-wx.yml配置信息 infos.put("微信APP-SECRET", environment.getProperty("litemall.wx.app-secret")); - // 测试获取application-wx.yml配置信息 infos.put("微信支付MCH-ID", environment.getProperty("litemall.wx.mch-id")); - // 测试获取application-wx.yml配置信息 infos.put("微信支付MCH-KEY", environment.getProperty("litemall.wx.mch-key")); - // 测试获取application-wx.yml配置信息 infos.put("微信支付通知地址", environment.getProperty("litemall.wx.notify-url")); + //测试获取System表配置信息 + infos.put(SystemInfoPrinter.CREATE_PART_COPPER + 3, "系统设置"); + infos.put("自动创建朋友圈分享图", Boolean.toString(SystemConfig.isAutoCreateShareImage())); + infos.put("商场名称", SystemConfig.getMallName()); + infos.put("首页显示记录数：NEW,HOT,BRAND,TOPIC,CatlogList,CatlogMore", SystemConfig.getNewLimit() + "," + SystemConfig.getHotLimit() + "," + SystemConfig.getBrandLimit() + "," + SystemConfig.getTopicLimit() + "," + SystemConfig.getCatlogListLimit() + "," + SystemConfig.getCatlogMoreLimit()); return infos; } diff --git a/litemall-wx-api/src/main/java/org/linlinjava/litemall/wx/web/WxAuthController.java b/litemall-wx-api/src/main/java/org/linlinjava/litemall/wx/web/WxAuthController.java index ec70e2c6..4d008d99 100644 --- a/litemall-wx-api/src/main/java/org/linlinjava/litemall/wx/web/WxAuthController.java +++ b/litemall-wx-api/src/main/java/org/linlinjava/litemall/wx/web/WxAuthController.java @@ -187,7 +187,7 @@ public class WxAuthController { String phoneNumber = JacksonUtil.parseString(body, "mobile"); String code = CharUtil.getRandomNum(6); - notifyService.notifySmsTemplateSync(phoneNumber, NotifyType.CAPTCHA, new String[]{code}); + notifyService.notifySmsTemplate(phoneNumber, NotifyType.CAPTCHA, new String[]{code}); boolean successful = CaptchaCodeManager.addToCache(phoneNumber, code); return successful ? ResponseUtil.ok() : ResponseUtil.badArgument();