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

applications/school/school-server/src/main/java/com/usoftchina/smartschool/school/wxschool/basic/service/impl/WxClazzPictureServiceImpl.java

@@ -34,6 +34,13 @@ public class WxClazzPictureServiceImpl implements WxClazzPictureService {
 	 */
 	public String savePicture(Long albumId, String pictureUrls, String albumTitle, String albumRemarks){
 		List<ClazzPictureDO> clazzPictureDOS = clazzPictureMapper.listByAlbumId(albumId);
+		//更新相册名称、备注
+        ClazzAlbumDO clazzAlbumDO = new ClazzAlbumDO();
+        clazzAlbumDO.setAlbumId(albumId);
+        clazzAlbumDO.setAlbumTitle(albumTitle);
+        clazzAlbumDO.setAlbumRemarks(albumRemarks);
+        clazzAlbumMapper.update(clazzAlbumDO);
+        //更新相册图片
 		if (ObjectUtils.isNotEmpty(clazzPictureDOS)) {
 			for (int i = 0; i < clazzPictureDOS.size(); i++) {
 				ClazzPictureDO clazzPictureDO = clazzPictureDOS.get(i);
@@ -52,11 +59,6 @@ public class WxClazzPictureServiceImpl implements WxClazzPictureService {
 					clazzPictureMapper.save(clazzPictureDO);
 				}
 			}
-            ClazzAlbumDO clazzAlbumDO = new ClazzAlbumDO();
-			clazzAlbumDO.setAlbumId(albumId);
-			clazzAlbumDO.setAlbumTitle(albumTitle);
-			clazzAlbumDO.setAlbumRemarks(albumRemarks);
-            clazzAlbumMapper.update(clazzAlbumDO);
 			return "更新成功";
 		} else {
 			List<String> strings = JSON.parseArray(pictureUrls, String.class);

applications/school/school-server/src/main/java/com/usoftchina/smartschool/school/wxschool/basic/service/impl/WxUserServiceImpl.java

@@ -628,15 +628,10 @@ public class WxUserServiceImpl implements WxUserService {
                             updateTeacherDO.setTeacherId(teacherDO.getTeacherId());
                             updateTeacherDO.setTeacherPhone(userPhone);
                             teacherMapper.update(updateTeacherDO);
-                            //更新账户的手机号
-                            userDO.setUserPhone(userPhone);
-                            return userMapper.update(userDO);
                         }else {
                             throw new Exception("验证码错误，请核实");
                         }
                     }
-                }else {
-                    throw new Exception("用户不存在，请联系管理员");
                 }
 
                 ParentsDO parentsDO = parentsDOS.get(0);

base-servers/gateway-server/src/main/resources/application.yml

@@ -137,6 +137,8 @@ auth:
     - /api/account/account/register
     - /api/school/wxSchool/user/bindOpenid*
     - /api/school/wxSchool/user/isBinding*
+    - /api/school/wxSchool/user/sendCodeUpdate*
+    - /api/school/wxSchool/user/sendCode*
     - /api/school/wxSchool/user/userLogin*
     - /api/school/wxSchool/user/sendCodeUpdate*
     - /api/school/wxSchool/meeting/getMeetingDetails*
@@ -145,3 +147,4 @@ auth:
     - /api/school/wxSchool/taskNotify/taskDetail*
     - /api/school/wxSchool/outInRecord/inout/detail*
     - /api/device/**
+    - /api/school/excel/**