~whyclxw/CadDrawManager.git

			@@ -34,7 +34,7 @@
			//取第三行,并以第三行开始
			Row row2 = sheet.getRow(1);
			short lastCellNum = row2.getLastCellNum();
			for (int i = 2; i < lastRowNum; i++) {
			for (int i = 2; i < lastRowNum+1; i++) {
			ProductBomApproving bomApproving = new ProductBomApproving();
			for (int j = 1; j < lastCellNum; j++) {
			Row row = sheet.getRow(i);
			@@ -76,17 +76,15 @@
			provingFile.mkdirs();
			}
			String suffix = pictureData.suggestFileExtension();
			String picturePath = approvingPath + File.separator + bomApproving.getSubModel() + File.separator + suffix;
			String picturePath = approvingPath + File.separator + bomApproving.getSubModel() + "." + suffix;
			String picturePathFront = "doc_file" + File.separator + "product_approving" + File.separator + user.getName() + File.separator + dateFormat + File.separator + bomApproving.getSubModel() + "." + suffix;
			byte[] data = pictureData.getData();
			FileOutputStream fileOutputStream = null;
			try {
			File pictureFile = new File(picturePath);
			fileOutputStream = new FileOutputStream(pictureFile);
			fileOutputStream.write(data);
			}finally {
			fileOutputStream.close();
			}
			bomApproving.setPictureUrl(picturePath);
			File pictureFile = new File(picturePath);
			fileOutputStream = new FileOutputStream(pictureFile);
			fileOutputStream.write(data);

			bomApproving.setPictureUrl(picturePathFront);
			}
			}break;
			}

	src/main/java/com/whyc/config/ShiroConfig.java	2 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	src/main/java/com/whyc/service/ProductBomApprovingService.java	18 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史

			@@ -42,7 +42,7 @@
			cookie.setHttpOnly(false);
			cookie.setSameSite(Cookie.SameSiteOptions.NONE);
			cookie.setSecure(true);
			cookie.setName("fg_v2");
			cookie.setName("CadDrawManager");
			sessionManager.setSessionIdCookie(cookie);
			sessionManager.setSessionIdCookieEnabled(true);
			sessionManager.setSessionIdUrlRewritingEnabled(true);