Merge branch 'dev'

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";
     }
 
     /**

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;
     }

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();