Merge branch 'master' of http://git.iamberry.com/hexiugang/iamberry-common-parent

# Conflicts:
#	watero-rst-web/src/main/java/com/iamberry/rst/controllers/pts/AdminMachineController.java
#	watero-rst-web/src/main/webapp/WEB-INF/views/pts/machine/addRenovationMachine.ftl

watero-rst-service/src/main/java/com/iamberry/rst/util/SmsConfig.java

@@ -55,6 +55,8 @@ public class SmsConfig {
     public static String ADD_CUSTOMER_SUCCESS_SHANGDUO="";
     /* 添加客诉成功提醒  -- 优尼雅 */
     public static String ADD_CUSTOMER_SUCCESS_YULIA="";
+    /* 扫描牙刷二维码访问地址 */
+    public static String scanningQrCode="";
 
 
 
@@ -91,6 +93,7 @@ public class SmsConfig {
             ADD_CUSTOMER_SUCCESS_WATERO=pro.getProperty("ADD_CUSTOMER_SUCCESS_WATERO");
             ADD_CUSTOMER_SUCCESS_SHANGDUO=pro.getProperty("ADD_CUSTOMER_SUCCESS_SHANGDUO");
             ADD_CUSTOMER_SUCCESS_YULIA=pro.getProperty("ADD_CUSTOMER_SUCCESS_YULIA");
+            scanningQrCode=pro.getProperty("scanningQrCode");
         } catch (Exception e) {
             e.printStackTrace();
         }

watero-rst-web/src/main/java/com/iamberry/rst/controllers/pts/AdminMachineController.java

@@ -30,6 +30,8 @@ import java.text.DecimalFormat;
 import java.text.NumberFormat;
 import java.util.*;
 
+import static com.iamberry.rst.util.SmsConfig.scanningQrCode;
+
 /**
  * Created by LJK on 2017/8/29.
  */
@@ -747,7 +749,7 @@ public class AdminMachineController {
                 String realPath = servletContext.getRealPath(ResultInfo.QRCODE_TOOTH_IMAGE);
                 boolean bl = false;
                 try {
-                    bl = QrCodeUtil.createQrCode("w.iamberry.com"+berQrcode+num,realPath+"/"+berQrcode+num+".",430,430);
+                    bl = QrCodeUtil.createQrCode(scanningQrCode+berQrcode+num,realPath+"/"+berQrcode+num+".",430,430);
                 }catch (Exception e){
                     e.printStackTrace();
                 }

watero-rst-web/src/main/resources/platform.properties

@@ -51,9 +51,9 @@ RELATION_SEND_WATERO=\u3010\u7F8E\u56FDWaterO\u3011\u5C0A\u656C\u7684\u5BA2\u623
 RELATION_SEND_SHANGDUO=\u3010\u4E0A\u6735\u5FAE\u5546\u57CE\u3011\u5C0A\u656C\u7684\u5BA2\u6237\uFF0C\u60A8\u7533\u8BF7\u7684{0}\u5DF2\u5904\u7406\u53D1\u8D27\uFF0C\u7269\u6D41\u4FE1\u606F\uFF1A{1}\u3002
 RELATION_SEND_YULIA=\u3010YULIA\u51C0\u6C34\u673A\u3011\u5C0A\u656C\u7684\u5BA2\u6237\uFF0C\u60A8\u7533\u8BF7\u7684{0}\u5DF2\u5904\u7406\u53D1\u8D27\uFF0C\u7269\u6D41\u4FE1\u606F\uFF1A{1}\u3002
 
-ADD_CUSTOMER_SUCCESS_WATERO=\u3010\u7f8e\u56fd\u0057\u0061\u0074\u0065\u0072\u004f\u3011\u5c0a\u656c\u7684\u5ba2\u6237\u60a8\u597d\uff0c\u5df2\u6536\u5230\u60a8\u7684\u552e\u540e\u7533\u8bf7\uff0c\u6211\u4eec\u6b63\u79ef\u6781\u5904\u7406\uff0c\u5904\u7406\u65b9\u5f0f\u4e3a\uff1a{0}\uff0c\u795d\u60a8\u751f\u6d3b\u6109\u5feb\uff08{1}\uff09
-ADD_CUSTOMER_SUCCESS_SHANGDUO=\u3010\u4e0a\u6735\u5fae\u5546\u57ce\u3011\u5c0a\u656c\u7684\u5ba2\u6237\u60a8\u597d\uff0c\u5df2\u6536\u5230\u60a8\u7684\u552e\u540e\u7533\u8bf7\uff0c\u6211\u4eec\u6b63\u79ef\u6781\u5904\u7406\uff0c\u5904\u7406\u65b9\u5f0f\u4e3a\uff1a{0}\uff0c\u795d\u60a8\u751f\u6d3b\u6109\u5feb\uff08{1}\uff09
-ADD_CUSTOMER_SUCCESS_YULIA=\u3010\u0059\u0055\u004c\u0049\u0041\u51c0\u6c34\u673a\u3011\u5c0a\u656c\u7684\u5ba2\u6237\u60a8\u597d\uff0c\u5df2\u6536\u5230\u60a8\u7684\u552e\u540e\u7533\u8bf7\uff0c\u6211\u4eec\u6b63\u79ef\u6781\u5904\u7406\uff0c\u5904\u7406\u65b9\u5f0f\u4e3a\uff1a{0}\uff0c\u795d\u60a8\u751f\u6d3b\u6109\u5feb\uff08{1}\uff09
+ADD_CUSTOMER_SUCCESS_WATERO=\u3010\u7F8E\u56FDWaterO\u3011\u5C0A\u656C\u7684\u5BA2\u6237\u60A8\u597D\uFF0C\u5DF2\u6536\u5230\u60A8\u7684\u552E\u540E\u7533\u8BF7\uFF0C\u6211\u4EEC\u6B63\u79EF\u6781\u5904\u7406\uFF0C\u5904\u7406\u65B9\u5F0F\u4E3A\uFF1A{0}\uFF0C\u795D\u60A8\u751F\u6D3B\u6109\u5FEB\uFF08{1}\uFF09
+ADD_CUSTOMER_SUCCESS_SHANGDUO=\u3010\u4E0A\u6735\u5FAE\u5546\u57CE\u3011\u5C0A\u656C\u7684\u5BA2\u6237\u60A8\u597D\uFF0C\u5DF2\u6536\u5230\u60A8\u7684\u552E\u540E\u7533\u8BF7\uFF0C\u6211\u4EEC\u6B63\u79EF\u6781\u5904\u7406\uFF0C\u5904\u7406\u65B9\u5F0F\u4E3A\uFF1A{0}\uFF0C\u795D\u60A8\u751F\u6D3B\u6109\u5FEB\uFF08{1}\uFF09
+ADD_CUSTOMER_SUCCESS_YULIA=\u3010YULIA\u51C0\u6C34\u673A\u3011\u5C0A\u656C\u7684\u5BA2\u6237\u60A8\u597D\uFF0C\u5DF2\u6536\u5230\u60A8\u7684\u552E\u540E\u7533\u8BF7\uFF0C\u6211\u4EEC\u6B63\u79EF\u6781\u5904\u7406\uFF0C\u5904\u7406\u65B9\u5F0F\u4E3A\uFF1A{0}\uFF0C\u795D\u60A8\u751F\u6D3B\u6109\u5FEB\uFF08{1}\uFF09
 
 #---SMS end---#
 #weixin
@@ -84,3 +84,4 @@ SUCCESSINFO=SUCCESS
 
 #cm-website-send-msg
 website=https://rst.iamberry.com/QA
+scanningQrCode=https://w.iamberry.com/iamberry/wechat/qrCode/scanningQrCode?barCode=