--no commit message

app/resource/src/main/java/com/zrqx/resource/bg/controller/ebook/EbookController.java

@@ -175,6 +175,9 @@ public class EbookController {
 	private QrCodeService qrCodeService;
 	@Value("${qrcode-upload-path}")
 	private String qrCodeUploadPath;
+	@Value("${qrcode-path}")
+	private String qrcodePath;
+	
 
 	@ApiOperation("保存电子书")
 	@PostMapping("/save")
@@ -797,7 +800,7 @@ public class EbookController {
 		qrCode.setUploadTime(new Date());
 		String path = qrCodeUploadPath;
 		try {
-			QrCodeCreateUtil.createQrCode(path + "/" + ev.getEbook().getId() + ".jpg","/wap/index.html#/bookDet?id="+ev.getEbook().getId());
+			QrCodeCreateUtil.createQrCode(path + "/" + ev.getEbook().getId() + ".jpg",qrcodePath+"/wap/index.html#/bookDet?id="+ev.getEbook().getId());
 			qrCode.setQrCode("/qr/" + ev.getEbook().getId() + ".jpg");
 		} catch (Exception e) {
 			e.printStackTrace();

app/resource/src/main/java/com/zrqx/resource/bg/controller/qrcode/QrCodeController.java

@@ -52,7 +52,7 @@ public class QrCodeController {
 	@Autowired
 	private QrCodeService service;
 	@Value("${qrcode-path}")
-	private String qrCodePath;
+	private String qrcodePath;
 	@Value("${qrcode-upload-path}")
 	private String qrCodeUploadPath;
 
@@ -67,7 +67,7 @@ public class QrCodeController {
 	@GetMapping(value = "/pakage")
 	public void filesdown(HttpServletResponse response,QueryQrCodeForm form) {
 		List<QrCodeListVO>list = service.export(form);
-		String url = qrCodePath;
+		String url = qrcodePath;
 		try {
 			String filename = new String("二维码.zip".getBytes("UTF-8"), "ISO8859-1");// 控制文件名编码
 			ByteArrayOutputStream bos = new ByteArrayOutputStream();
@@ -116,4 +116,35 @@ public class QrCodeController {
 		service.insert(qrCode);
 		return CallBack.success();
 	}
+	
+	@ApiOperation(value = "修改全部资源二维码", notes = "修改全部资源二维码")
+	@GetMapping(value = "/batch/update/qr")
+	public CallBack<Boolean> changeResourceQr() {
+		List<QrCode>list = service.selectAll();
+		for (QrCode qrCode : list) {
+			if(AllResourceTypeEnum.BOOK.getCode().equals(qrCode.getResourceType())){	
+				try {
+					QrCodeCreateUtil.createQrCode(qrCodeUploadPath + "/" + qrCode.getResourceId() + ".jpg",qrcodePath+"/wap/index.html#/bookDet?id="+qrCode.getResourceId());
+				} catch (Exception e) {
+					e.printStackTrace();
+					throw new BaseException("生成二维码异常 :" + qrCodeUploadPath + "/" + qrCode.getResourceId() +  ".jpg ");
+				}
+			}else if(AllResourceTypeEnum.VIDEO.getCode().equals(qrCode.getResourceType())) {
+				try {
+					QrCodeCreateUtil.createQrCode(qrCodeUploadPath + "/" + qrCode.getResourceId() + ".jpg",qrcodePath+"/wap/index.html#/videoDet?id="+qrCode.getResourceId());
+				} catch (Exception e) {
+					e.printStackTrace();
+					throw new BaseException("生成二维码异常 :" + qrCodeUploadPath + "/" + qrCode.getResourceId() +  ".jpg ");
+				}
+			}else if(AllResourceTypeEnum.AUDIO.getCode().equals(qrCode.getResourceType())) {
+				try {
+					QrCodeCreateUtil.createQrCode(qrCodeUploadPath + "/" + qrCode.getResourceId() + ".jpg",qrcodePath+"/wap/index.html#/audioDet?id="+qrCode.getResourceId());
+				} catch (Exception e) {
+					e.printStackTrace();
+					throw new BaseException("生成二维码异常 :" + qrCodeUploadPath + "/" + qrCode.getResourceId() +  ".jpg ");
+				}
+			}
+		}
+		return CallBack.success();
+	}
 }

app/resource/src/main/java/com/zrqx/resource/bg/service/audiolibrary/AudioLibrarySerivceImpl.java

@@ -88,6 +88,8 @@ public class AudioLibrarySerivceImpl extends BaseServiceImpl<AudioLibrary,String
 	private SysuserClient sysuserClient;
 	@Value("${qrcode-upload-path}")
 	private String qrCodeUploadPath;
+	@Value("${qrcode-path}")
+	private String qrcodePath;
 	
 	@Override
 	public BaseMapper<AudioLibrary> getMapper() {
@@ -125,7 +127,7 @@ public class AudioLibrarySerivceImpl extends BaseServiceImpl<AudioLibrary,String
 			qrCode.setUploadTime(new Date());
 			String path = qrCodeUploadPath;
 			try {
-				QrCodeCreateUtil.createQrCode(path + "/" + entity.getId() + ".jpg","/wap/index.html#/audioDet?id="+entity.getId());
+				QrCodeCreateUtil.createQrCode(path + "/" + entity.getId() + ".jpg",qrcodePath+"/wap/index.html#/audioDet?id="+entity.getId());
 				qrCode.setQrCode("/qr/" + entity.getId() + ".jpg");
 			} catch (Exception e) {
 				e.printStackTrace();
@@ -201,7 +203,7 @@ public class AudioLibrarySerivceImpl extends BaseServiceImpl<AudioLibrary,String
 			qrCode.setUploadTime(new Date());
 			String path = qrCodeUploadPath;
 			try {
-				QrCodeCreateUtil.createQrCode(path + "/" + entity.getId() + ".jpg","/wap/index.html#/audioDet?id="+entity.getId());
+				QrCodeCreateUtil.createQrCode(path + "/" + entity.getId() + ".jpg",qrcodePath+"/wap/index.html#/audioDet?id="+entity.getId());
 				qrCode.setQrCode("/qr/" + entity.getId() + ".jpg");
 			} catch (Exception e) {
 				e.printStackTrace();

app/resource/src/main/java/com/zrqx/resource/bg/service/ebook/EbookServiceImpl.java

@@ -117,6 +117,8 @@ public class EbookServiceImpl extends BaseServiceImpl<Ebook, String> implements
 	private QrCodeMapper qrCodeMapper;
 	@Value("${qrcode-upload-path}")
 	private String qrCodeUploadPath;
+	@Value("${qrcode-path}")
+	private String qrcodePath;
 	
 	@Override
 	public BaseMapper<Ebook> getMapper() {
@@ -198,7 +200,7 @@ public class EbookServiceImpl extends BaseServiceImpl<Ebook, String> implements
 			qrCode.setUploadTime(new Date());
 			String path = qrCodeUploadPath;
 			try {
-				QrCodeCreateUtil.createQrCode(path + "/" + book.getId() + ".jpg","/wap/index.html#/bookDet?id="+book.getId());
+				QrCodeCreateUtil.createQrCode(path + "/" + book.getId() + ".jpg",qrcodePath+"/wap/index.html#/bookDet?id="+book.getId());
 				qrCode.setQrCode("/qr/" + book.getId() + ".jpg");
 			} catch (Exception e) {
 				e.printStackTrace();

app/resource/src/main/java/com/zrqx/resource/bg/service/videolibrary/VideoLibrarySerivceImpl.java

@@ -96,6 +96,8 @@ public class VideoLibrarySerivceImpl extends BaseServiceImpl<VideoLibrary,String
 	private QrCodeMapper qrCodeMapper;
 	@Value("${qrcode-upload-path}")
 	private String qrCodeUploadPath;
+	@Value("${qrcode-path}")
+	private String qrcodePath;
 	
 	@Override
 	public BaseMapper<VideoLibrary> getMapper() {
@@ -142,7 +144,7 @@ public class VideoLibrarySerivceImpl extends BaseServiceImpl<VideoLibrary,String
 			qrCode.setUploadTime(new Date());
 			String path = qrCodeUploadPath;
 			try {
-				QrCodeCreateUtil.createQrCode(path + "/" + entity.getId() + ".jpg","/wap/index.html#/videoDet?id="+entity.getId());
+				QrCodeCreateUtil.createQrCode(path + "/" + entity.getId() + ".jpg",qrcodePath+"/wap/index.html#/videoDet?id="+entity.getId());
 				qrCode.setQrCode("/qr/" + entity.getId() + ".jpg");
 			} catch (Exception e) {
 				e.printStackTrace();
@@ -228,7 +230,7 @@ public class VideoLibrarySerivceImpl extends BaseServiceImpl<VideoLibrary,String
 			qrCode.setUploadTime(new Date());
 			String path = qrCodeUploadPath;
 			try {
-				QrCodeCreateUtil.createQrCode(path + "/" + entity.getId() + ".jpg","/wap/index.html#/videoDet?id="+entity.getId());
+				QrCodeCreateUtil.createQrCode(path + "/" + entity.getId() + ".jpg",qrcodePath+"/wap/index.html#/videoDet?id="+entity.getId());
 				qrCode.setQrCode("/qr/" + entity.getId() + ".jpg");
 			} catch (Exception e) {
 				e.printStackTrace();