Merge branch 'dev' of ssh://10.10.100.21/source/smartschool-platform into dev

applications/device/device-client/src/main/java/com/usoftchina/smartschool/device/client/service/AccessControlService.java

@@ -100,6 +100,8 @@ public class AccessControlService {
      * @param info
      */
     public void saveRecord(AccessControlInfo info) {
+        //去除cardNo末尾中的\u0000...\u0000
+        info.setCardNo(info.getCardNo().trim());
         ResponseEntity<Result> response = restTemplate.postForEntity(
                 deviceServerProperties.getAccessControlEvent(), info, Result.class);
         if (response.getStatusCode() == HttpStatus.OK) {

applications/device/device-client/src/main/resources/application.yml

@@ -4,10 +4,10 @@ device:
     connect-time: 10000
   server:
   # 门禁事件的服务端接口
-    accessControlEvent: https://school-api.ydyhz.com/api/device/accesscontrol/event
+    accessControlEvent: https://school-api.ubtob.com/api/device/accesscontrol/event
   # IC卡传输的服务端接口
   icCard:
-    icCardUrl: https://school-api.ydyhz.com/api/device/iccard/consume/record
+    icCardUrl: https://school-api.ubtob.com/api/device/iccard/consume/record
 server:
   tomcat:
     uri-encoding: UTF-8

applications/wechat/wechat-server/src/main/java/com/usoftchina/smartschool/wechat/controller/WxPushController.java

@@ -29,7 +29,7 @@ public class WxPushController {
         msg.setTouser(openid);
         msg.setTemplateId(templateId);
         msg.setTitle(title);
-        msg.setKeyword2(keyword1);
+        msg.setKeyword1(keyword1);
         msg.setKeyword2(keyword2);
         msg.setKeyword3(keyword3);
         msg.setKeyword4(keyword4);