diff --git a/pom.xml b/pom.xml old mode 100644 new mode 100755 diff --git a/src/main/java/Recipe/controller/recipeController.java b/src/main/java/Recipe/controller/recipeController.java old mode 100644 new mode 100755 diff --git a/src/main/java/Recipe/createRecipe.java b/src/main/java/Recipe/createRecipe.java new file mode 100755 index 0000000..4daddf5 --- /dev/null +++ b/src/main/java/Recipe/createRecipe.java @@ -0,0 +1,174 @@ +package Recipe; + +import java.io.BufferedReader; +import java.io.File; +import java.io.FileInputStream; +import java.io.IOException; +import java.io.InputStreamReader; +import java.sql.SQLException; +import java.text.ParseException; +import java.text.SimpleDateFormat; +import java.util.ArrayList; +import java.util.Date; +import java.util.List; + +import org.hibernate.Session; +import org.hibernate.SessionFactory; +import org.hibernate.Transaction; +import org.springframework.context.ApplicationContext; +import org.springframework.context.support.ClassPathXmlApplicationContext; + +import Recipe.model.MateralBean; +import Recipe.model.MethodBean; +import Recipe.model.RecipeBean; +import Recipe.service.MateralService; +import Recipe.service.MethodService; +import Recipe.service.RecipeService; +import createAccount.model.MemberBean; + +public class createRecipe { + public static final String UTF8_BOM = "\uFEFF"; // 定義 UTF-8的BOM字元 + private static ApplicationContext ctx; + + public static void main(String[] args) throws IOException, SQLException, ParseException { + + ctx = new ClassPathXmlApplicationContext("beans.xml"); + SessionFactory factory = ctx.getBean(SessionFactory.class); + Session session = factory.getCurrentSession(); + + RecipeService recipeService = ctx.getBean(RecipeService.class); + MateralService materalService = ctx.getBean(MateralService.class); +// MethodService methodService = ctx.getBean(MethodService.class); + + File file = new File("C:/ezfitData/createTable/recipe.data"); + File file2 = new File("C:/ezfitData/createTable/method.data"); + File file3 = new File("C:/ezfitData/createTable/materal.data"); +// File file = new File("C:/Users/tmps8/Desktop/ezfitData/createTable/recipe.data"); +// File file2 = new File("C:/Users/tmps8/Desktop/ezfitData/createTable/method.data"); +// File file3 = new File("C:/Users/tmps8/Desktop/ezfitData/createTable/materal.data"); + + int n = 0; + String line = ""; + + Transaction tx = session.beginTransaction(); +// recipe + try (FileInputStream fis = new FileInputStream(file); + InputStreamReader isr = new InputStreamReader(fis, "UTF8"); + BufferedReader br = new BufferedReader(isr);) { + + MemberBean mb = new MemberBean(); + session.save(mb); + + while ((line = br.readLine()) != null) { + System.out.println("line=" + line); + // 去除 UTF8_BOM: \uFEFF +// if (line.startsWith(UTF8_BOM)) { +// line = line.substring(1); + try { + + String[] token = line.split("\\|"); + RecipeBean recipe = new RecipeBean(); + recipe.setChat(Integer.parseInt(token[0])); + recipe.setFileName(token[1]); + recipe.setGood(Integer.parseInt(token[2])); + recipe.setIntroduction(token[3]); + recipe.setPublished(Boolean.valueOf(token[4])); + recipe.setRecipeName(token[5]); + recipe.setSave(Integer.parseInt(token[6])); + recipe.setServings(Integer.parseInt(token[7])); + recipe.setSpendTime((token[8])); +// recipe.setMember(recipeDao.getMemberBeanByMemberId(token[9])); + recipe.setMember(recipeService.getMemberByMemberId(token[9])); + + SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + Date date = sdf.parse("2019-11-11 10:54:17.943000"); + recipe.setRecipeCreateTime(date); +// session.save(recipe); + recipeService.insertRecipe(recipe); + } catch (Exception e) { + e.printStackTrace(); + } + ++n; +// } + } + tx.commit(); + System.out.println("新增Recipe紀錄,共成功=" + n); + } + +// method + List list = new ArrayList<>(); + line = ""; + factory = ctx.getBean(SessionFactory.class); + session = factory.getCurrentSession(); + tx = session.beginTransaction(); + try (FileInputStream fis = new FileInputStream(file2); + InputStreamReader isr = new InputStreamReader(fis, "UTF8"); + BufferedReader br = new BufferedReader(isr);) { + + while ((line = br.readLine()) != null) { + System.out.println("line=" + line); + // 去除 UTF8_BOM: \uFEFF +// if (line.startsWith(UTF8_BOM)) { +// line = line.substring(1); + + String[] token = line.split("\\|"); + MethodBean method = new MethodBean(); + method.setDetail(token[0]); + method.setFileName(token[1]); + RecipeBean recipe = new RecipeBean(); + recipe.setRecipeId(Integer.parseInt(token[2])); + method.setRecipe(recipe); + +// session.save(method); +// list.add(method); + ++n; + session.save(method); +// } +// methodService.insertMethod(list); + } + } catch (Exception e) { + e.printStackTrace(); + } +// tx.commit(); + System.out.println("新增Method紀錄,共成功=" + n); + +// materal +// factory = ctx.getBean(SessionFactory.class); +// session = factory.getCurrentSession(); +// tx = session.beginTransaction(); + line = ""; +// tx = session.beginTransaction(); + try (FileInputStream fis = new FileInputStream(file3); + InputStreamReader isr = new InputStreamReader(fis, "UTF8"); + BufferedReader br = new BufferedReader(isr);) { + + while ((line = br.readLine()) != null) { + System.out.println("line=" + line); + // 去除 UTF8_BOM: \uFEFF +// if (line.startsWith(UTF8_BOM)) { +// line = line.substring(1); + + String[] token = line.split("\\|"); + MateralBean materal = new MateralBean(); + materal.setMateralName(token[0]); + materal.setUnit(token[1]); + + RecipeBean recipe = new RecipeBean(); + recipe.setRecipeId(Integer.valueOf(token[2])); + materal.setRecipe(recipe); + + SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + Date date = sdf.parse("2019-11-11 10:54:17.943000"); + recipe.setRecipeCreateTime(date); + + materalService.insertMateral(materal); + ++n; + +// } + } + System.out.println("新增Materal紀錄,共成功=" + n); + } + tx.commit(); + } + +} diff --git a/src/main/java/Recipe/model/BoardBean.java b/src/main/java/Recipe/model/BoardBean.java old mode 100644 new mode 100755 diff --git a/src/main/java/Recipe/model/FollowedRecipeBean.java b/src/main/java/Recipe/model/FollowedRecipeBean.java old mode 100644 new mode 100755 diff --git a/src/main/java/Recipe/model/GoodBean.java b/src/main/java/Recipe/model/GoodBean.java old mode 100644 new mode 100755 diff --git a/src/main/java/Recipe/model/KeyWordBean.java b/src/main/java/Recipe/model/KeyWordBean.java old mode 100644 new mode 100755 diff --git a/src/main/java/Recipe/model/MateralBean.java b/src/main/java/Recipe/model/MateralBean.java old mode 100644 new mode 100755 diff --git a/src/main/java/Recipe/model/MethodBean.java b/src/main/java/Recipe/model/MethodBean.java old mode 100644 new mode 100755 diff --git a/src/main/java/Recipe/model/RecipeBean.java b/src/main/java/Recipe/model/RecipeBean.java old mode 100644 new mode 100755 diff --git a/src/main/java/Recipe/repository/BoardDao.java b/src/main/java/Recipe/repository/BoardDao.java old mode 100644 new mode 100755 diff --git a/src/main/java/Recipe/repository/FollowedRecipeDao.java b/src/main/java/Recipe/repository/FollowedRecipeDao.java old mode 100644 new mode 100755 diff --git a/src/main/java/Recipe/repository/GoodDao.java b/src/main/java/Recipe/repository/GoodDao.java old mode 100644 new mode 100755 diff --git a/src/main/java/Recipe/repository/Impl/BoardDao_Impl.java b/src/main/java/Recipe/repository/Impl/BoardDao_Impl.java old mode 100644 new mode 100755 diff --git a/src/main/java/Recipe/repository/Impl/FollowedRecipeDao_Impl.java b/src/main/java/Recipe/repository/Impl/FollowedRecipeDao_Impl.java old mode 100644 new mode 100755 diff --git a/src/main/java/Recipe/repository/Impl/GoodDao_Impl.java b/src/main/java/Recipe/repository/Impl/GoodDao_Impl.java old mode 100644 new mode 100755 diff --git a/src/main/java/Recipe/repository/Impl/KeyWordDao_Impl.java b/src/main/java/Recipe/repository/Impl/KeyWordDao_Impl.java old mode 100644 new mode 100755 diff --git a/src/main/java/Recipe/repository/Impl/MateralDao_Impl.java b/src/main/java/Recipe/repository/Impl/MateralDao_Impl.java old mode 100644 new mode 100755 diff --git a/src/main/java/Recipe/repository/Impl/MethodDao_Impl.java b/src/main/java/Recipe/repository/Impl/MethodDao_Impl.java old mode 100644 new mode 100755 diff --git a/src/main/java/Recipe/repository/Impl/RecipeDao_Impl.java b/src/main/java/Recipe/repository/Impl/RecipeDao_Impl.java old mode 100644 new mode 100755 diff --git a/src/main/java/Recipe/repository/KeyWordDao.java b/src/main/java/Recipe/repository/KeyWordDao.java old mode 100644 new mode 100755 diff --git a/src/main/java/Recipe/repository/MateralDao.java b/src/main/java/Recipe/repository/MateralDao.java old mode 100644 new mode 100755 diff --git a/src/main/java/Recipe/repository/MethodDao.java b/src/main/java/Recipe/repository/MethodDao.java old mode 100644 new mode 100755 diff --git a/src/main/java/Recipe/repository/RecipeDao.java b/src/main/java/Recipe/repository/RecipeDao.java old mode 100644 new mode 100755 diff --git a/src/main/java/Recipe/service/BoardService.java b/src/main/java/Recipe/service/BoardService.java old mode 100644 new mode 100755 diff --git a/src/main/java/Recipe/service/FollowedRecipeService.java b/src/main/java/Recipe/service/FollowedRecipeService.java old mode 100644 new mode 100755 diff --git a/src/main/java/Recipe/service/GoodService.java b/src/main/java/Recipe/service/GoodService.java old mode 100644 new mode 100755 diff --git a/src/main/java/Recipe/service/Impl/BoardService_Impl.java b/src/main/java/Recipe/service/Impl/BoardService_Impl.java old mode 100644 new mode 100755 diff --git a/src/main/java/Recipe/service/Impl/FollowedRecipeService_Impl.java b/src/main/java/Recipe/service/Impl/FollowedRecipeService_Impl.java old mode 100644 new mode 100755 diff --git a/src/main/java/Recipe/service/Impl/GoodService_Impl.java b/src/main/java/Recipe/service/Impl/GoodService_Impl.java old mode 100644 new mode 100755 diff --git a/src/main/java/Recipe/service/Impl/KeyWordService_Impl.java b/src/main/java/Recipe/service/Impl/KeyWordService_Impl.java old mode 100644 new mode 100755 diff --git a/src/main/java/Recipe/service/Impl/MateralService_Impl.java b/src/main/java/Recipe/service/Impl/MateralService_Impl.java old mode 100644 new mode 100755 diff --git a/src/main/java/Recipe/service/Impl/MethodService_Impl.java b/src/main/java/Recipe/service/Impl/MethodService_Impl.java old mode 100644 new mode 100755 diff --git a/src/main/java/Recipe/service/Impl/RecipeService_Impl.java b/src/main/java/Recipe/service/Impl/RecipeService_Impl.java old mode 100644 new mode 100755 diff --git a/src/main/java/Recipe/service/KeyWordService.java b/src/main/java/Recipe/service/KeyWordService.java old mode 100644 new mode 100755 diff --git a/src/main/java/Recipe/service/MateralService.java b/src/main/java/Recipe/service/MateralService.java old mode 100644 new mode 100755 diff --git a/src/main/java/Recipe/service/MethodService.java b/src/main/java/Recipe/service/MethodService.java old mode 100644 new mode 100755 diff --git a/src/main/java/Recipe/service/RecipeService.java b/src/main/java/Recipe/service/RecipeService.java old mode 100644 new mode 100755 diff --git a/src/main/java/_00/filter/ServiceController.java b/src/main/java/_00/filter/ServiceController.java old mode 100644 new mode 100755 diff --git a/src/main/java/_00/init/web/CreateSessionFactoryListener.java b/src/main/java/_00/init/web/CreateSessionFactoryListener.java old mode 100644 new mode 100755 diff --git a/src/main/java/_00/utils/DateYearTime.java b/src/main/java/_00/utils/DateYearTime.java old mode 100644 new mode 100755 diff --git a/src/main/java/_00/utils/GlobalString.java b/src/main/java/_00/utils/GlobalString.java old mode 100644 new mode 100755 diff --git a/src/main/java/_00/utils/HibernateProxyTypeAdapter.java b/src/main/java/_00/utils/HibernateProxyTypeAdapter.java old mode 100644 new mode 100755 diff --git a/src/main/java/_00/utils/HibernateUtils.java b/src/main/java/_00/utils/HibernateUtils.java old mode 100644 new mode 100755 diff --git a/src/main/java/_00/utils/SystemUtils2018.java b/src/main/java/_00/utils/SystemUtils2018.java old mode 100644 new mode 100755 diff --git a/src/main/java/_00/utils/ToJson.java b/src/main/java/_00/utils/ToJson.java old mode 100644 new mode 100755 diff --git a/src/main/java/config/RootAppConfig.java b/src/main/java/config/RootAppConfig.java old mode 100644 new mode 100755 diff --git a/src/main/java/config/WebAppConfig.java b/src/main/java/config/WebAppConfig.java old mode 100644 new mode 100755 diff --git a/src/main/java/config/WebAppInitializer.java b/src/main/java/config/WebAppInitializer.java old mode 100644 new mode 100755 diff --git a/src/main/java/config/WebSocketConfig.java b/src/main/java/config/WebSocketConfig.java old mode 100644 new mode 100755 diff --git a/src/main/java/createAccount/.DS_Store b/src/main/java/createAccount/.DS_Store old mode 100644 new mode 100755 diff --git a/src/main/java/createAccount/SendEmail.java b/src/main/java/createAccount/SendEmail.java old mode 100644 new mode 100755 diff --git a/src/main/java/createAccount/VeriCode.java b/src/main/java/createAccount/VeriCode.java old mode 100644 new mode 100755 diff --git a/src/main/java/createAccount/model/CodeBean.java b/src/main/java/createAccount/model/CodeBean.java old mode 100644 new mode 100755 diff --git a/src/main/java/createAccount/model/EncrypAES.java b/src/main/java/createAccount/model/EncrypAES.java old mode 100644 new mode 100755 diff --git a/src/main/java/createAccount/model/MemberBean.java b/src/main/java/createAccount/model/MemberBean.java old mode 100644 new mode 100755 diff --git a/src/main/java/createAccount/repository/CodeDao.java b/src/main/java/createAccount/repository/CodeDao.java old mode 100644 new mode 100755 diff --git a/src/main/java/createAccount/repository/CodeDaoImpl.java b/src/main/java/createAccount/repository/CodeDaoImpl.java old mode 100644 new mode 100755 diff --git a/src/main/java/createAccount/repository/MemberDao.java b/src/main/java/createAccount/repository/MemberDao.java old mode 100644 new mode 100755 diff --git a/src/main/java/createAccount/repository/MemberDaoImpl.java b/src/main/java/createAccount/repository/MemberDaoImpl.java old mode 100644 new mode 100755 diff --git a/src/main/java/createAccount/service/CodeService.java b/src/main/java/createAccount/service/CodeService.java old mode 100644 new mode 100755 diff --git a/src/main/java/createAccount/service/Impl/CodeServiceImpl.java b/src/main/java/createAccount/service/Impl/CodeServiceImpl.java old mode 100644 new mode 100755 diff --git a/src/main/java/createAccount/service/Impl/MemberServiceImpl.java b/src/main/java/createAccount/service/Impl/MemberServiceImpl.java old mode 100644 new mode 100755 diff --git a/src/main/java/createAccount/service/MemberService.java b/src/main/java/createAccount/service/MemberService.java old mode 100644 new mode 100755 diff --git a/src/main/java/home/controller/Home.java b/src/main/java/home/controller/Home.java old mode 100644 new mode 100755 diff --git a/src/main/java/login/.DS_Store b/src/main/java/login/.DS_Store old mode 100644 new mode 100755 diff --git a/src/main/java/login/controller/Member.java b/src/main/java/login/controller/Member.java old mode 100644 new mode 100755 index 6b7195b..b05dc22 --- a/src/main/java/login/controller/Member.java +++ b/src/main/java/login/controller/Member.java @@ -678,7 +678,7 @@ public String updatePwdAPI(Model model, HttpServletRequest request, HttpServletR } -// 拿取會員資料 +// 拿取會員資料(App) @RequestMapping(value = "/api/mobile/memberInfo", method = RequestMethod.POST, produces = "application/json;charset=utf-8") public @ResponseBody String memberInfo(@RequestParam("memberEmail") String memberEmail, @RequestParam("memberPassword") String memberPassword, HttpServletRequest request, diff --git a/src/main/java/login/controller/VerifyRecaptcha.java b/src/main/java/login/controller/VerifyRecaptcha.java old mode 100644 new mode 100755 diff --git a/src/main/java/login/filter/FindUserPassword.java b/src/main/java/login/filter/FindUserPassword.java old mode 100644 new mode 100755 diff --git a/src/main/java/login/filter/LoginCheckingFilter.java b/src/main/java/login/filter/LoginCheckingFilter.java old mode 100644 new mode 100755 diff --git a/src/main/java/login/model/LogoutBean.java b/src/main/java/login/model/LogoutBean.java old mode 100644 new mode 100755 diff --git a/src/main/java/login/service/Impl/LoginServiceImpl.java b/src/main/java/login/service/Impl/LoginServiceImpl.java old mode 100644 new mode 100755 diff --git a/src/main/java/login/service/LoginService.java b/src/main/java/login/service/LoginService.java old mode 100644 new mode 100755 diff --git a/src/main/java/shopping/CreateTable.java b/src/main/java/shopping/CreateTable.java old mode 100644 new mode 100755 diff --git a/src/main/java/shopping/HelloWorld.java b/src/main/java/shopping/HelloWorld.java old mode 100644 new mode 100755 diff --git a/src/main/java/shopping/controller/Mall.java b/src/main/java/shopping/controller/Mall.java old mode 100644 new mode 100755 index 49eac2c..a034b81 --- a/src/main/java/shopping/controller/Mall.java +++ b/src/main/java/shopping/controller/Mall.java @@ -1210,6 +1210,145 @@ public String groupBuyJoin(@PathVariable("group") String group, HttpServletReque String json = new ToJson>().getJson(status); return json; } + + + // 購物車結帳商品(個人App) + @RequestMapping(value = "api/shopCartApp/bill", produces = "application/json;charset=utf-8", method = RequestMethod.POST) + public @ResponseBody String billCartItemApp( + @RequestParam("memberEmail") String email, + @RequestParam("memberPassword") String password, + @RequestParam("subscriberName") String subscriberName, + @RequestParam("subscriberPhone") String subscriberPhone, + @RequestParam("subscriberEmail") String subscriberEmail, + @RequestParam("subscribercity") String subscriberCity, + @RequestParam("subscriberdistrict") String subscriberDistrict, + @RequestParam("subscriberzipCode") String subscriberZipCode, + @RequestParam("subscriberAddress") String subscriberAddress, + @RequestParam("name") String shippingName, + @RequestParam("phone") String shippingPhone, + @RequestParam("county") String shippingCity, + @RequestParam("district") String shippingDistrict, + @RequestParam("zipcode") String shippingZipCode, + @RequestParam("address") String shippingAddress, + HttpServletRequest req) { + + System.out.println("購物車結帳商品(個人App) api/shopCartApp/bill 測試....."); + System.out.println("email = " + email); + System.out.println("password = " + password); + System.out.println("subscriberName = " + subscriberName); + System.out.println("subscriberPhone = " + subscriberPhone); + System.out.println("subscriberEmail = " + subscriberEmail); + System.out.println("subscriberCity = " + subscriberCity); + System.out.println("subscriberDistrict = " + subscriberDistrict); + System.out.println("subscriberZipCode = " + subscriberZipCode); + System.out.println("subscriberAddress = " + subscriberAddress); + System.out.println("shippingName = " + shippingName); + System.out.println("shippingPhone = " + shippingPhone); + System.out.println("shippingCity = " + shippingCity); + System.out.println("shippingDistrict = " + shippingDistrict); + System.out.println("shippingZipCode = " + shippingZipCode); + System.out.println("shippingAddress = " + shippingAddress); + + password = EncrypAES.getMD5Endocing(EncrypAES.encryptString(password)); + MemberBean memberBean = null; + memberBean = loginService.checkIDPassword(email, password); + + totalAmount = 0; + Map errorMsg = new HashMap(); + + + if (subscriberName.trim() == "") { + errorMsg.put("errorSubName", "請輸入購買人姓名"); + } + + if (subscriberPhone.trim() == "") { + errorMsg.put("errorSubPhone", "請輸入購買人手機號碼"); + } else if (!(subscriberPhone.length() == 10) || !StringUtils.isNumeric(subscriberPhone)) { + errorMsg.put("errorSubPhone", "手機號碼為10位數字"); + } + + if (subscriberEmail.trim() == "") { + errorMsg.put("errorSubEmail", "請輸入購買人信箱"); + } + + if (subscriberAddress.trim() == "") { + errorMsg.put("errorSubAddress", "請輸入購買人地址"); + } + + if (shippingName.trim() == "") { + errorMsg.put("errorShipName", "請輸入收件人姓名"); + } + + if (shippingPhone.trim() == "") { + errorMsg.put("errorShipPhone", "請輸入收件人電話"); + } else if (!(shippingPhone.length() == 10) || !StringUtils.isNumeric(shippingPhone)) { + errorMsg.put("errorShipPhone", "手機號碼為10位數字"); + } + + if (shippingAddress.trim() == "") { + errorMsg.put("errorShipAddress", "請輸入收件人地址"); + } + + if (errorMsg.size() > 0) { + Gson gson = new Gson(); + String eMsg = gson.toJson(errorMsg); + return eMsg; + } else { + + orderBean = new OrderBean(); + orderItemBeans = new ArrayList(); + orderBean.setShippingAddress(shippingAddress); + orderBean.setShippingCity(shippingCity); + orderBean.setShippingDistrict(shippingDistrict); + orderBean.setShippingName(shippingName); + orderBean.setShippingPhone(shippingPhone); + orderBean.setSubscriberAddress(subscriberAddress); + orderBean.setSubscriberCity(subscriberCity); + orderBean.setSubscriberDistrict(subscriberDistrict); + orderBean.setSubscriberEmail(subscriberEmail); + orderBean.setSubscriberName(subscriberName); + orderBean.setSubscriberPhone(subscriberPhone); + orderBean.setSubscriberZipCode(subscriberZipCode); + orderBean.setShippingZipCode(shippingZipCode); + orderBean.setGroupBuyBean(null); + if (memberBean != null) { + cartItems = cartItemService.checkAllItems(memberBean); + for (Iterator iterator = cartItems.iterator(); iterator.hasNext();) { + OrderItemBean orderItemBean = new OrderItemBean(); + cartItem = (CartItem) iterator.next(); + if (cartItem.getPlaneItems() != null && cartItem.getPlaneItems().size() != 0) { + List orderPlaneItems = new ArrayList(); + List planeItems = cartItem.getPlaneItems(); + for (Iterator iterator2 = planeItems.iterator(); iterator2.hasNext();) { + PlaneItem planeItem = (PlaneItem) iterator2.next(); + OrderPlaneItem orderPlaneItem = new OrderPlaneItem(); + orderPlaneItem.setCuisineProduct(planeItem.getCuisineProduct()); + orderPlaneItems.add(orderPlaneItem); + } + orderItemBean.setShipDate(cartItem.getShipDate()); + orderItemBean.setPlaneItems(orderPlaneItems); + totalAmount += 90; + } + + orderItemBean.setQty(cartItem.getQty()); + orderItemBean.setSubTotal(cartItem.getSubTotal()); + orderItemBean.setProduct(cartItem.getProduct()); + orderItemBeans.add(orderItemBean); + totalAmount += cartItem.getSubTotal(); + cartItemService.remove(cartItem.getProduct().getId(), memberBean); + } + orderBean.setTotalAmount(totalAmount); + Timestamp ts = new java.sql.Timestamp(System.currentTimeMillis()); + orderBean.setOrderItemBeans(orderItemBeans); + orderBean.setCreateTime(ts); + orderBean.setMemberBean(memberBean); + orderService.save(orderBean); + + return null; + } + } + return null; + } // 食材加入購物車 (非團購App) @RequestMapping(value = "api/shopCartApp/add", method = RequestMethod.POST, produces = "application/json;charset=utf-8") diff --git a/src/main/java/shopping/model/CartItem.java b/src/main/java/shopping/model/CartItem.java old mode 100644 new mode 100755 diff --git a/src/main/java/shopping/model/CuisineProduct.java b/src/main/java/shopping/model/CuisineProduct.java old mode 100644 new mode 100755 diff --git a/src/main/java/shopping/model/GroupBuyBean.java b/src/main/java/shopping/model/GroupBuyBean.java old mode 100644 new mode 100755 diff --git a/src/main/java/shopping/model/IngredientProduct.java b/src/main/java/shopping/model/IngredientProduct.java old mode 100644 new mode 100755 diff --git a/src/main/java/shopping/model/OrderBean.java b/src/main/java/shopping/model/OrderBean.java old mode 100644 new mode 100755 diff --git a/src/main/java/shopping/model/OrderItemBean.java b/src/main/java/shopping/model/OrderItemBean.java old mode 100644 new mode 100755 diff --git a/src/main/java/shopping/model/OrderPlaneItem.java b/src/main/java/shopping/model/OrderPlaneItem.java old mode 100644 new mode 100755 diff --git a/src/main/java/shopping/model/PlaneItem.java b/src/main/java/shopping/model/PlaneItem.java old mode 100644 new mode 100755 diff --git a/src/main/java/shopping/model/PlaneProduct.java b/src/main/java/shopping/model/PlaneProduct.java old mode 100644 new mode 100755 diff --git a/src/main/java/shopping/model/Product.java b/src/main/java/shopping/model/Product.java old mode 100644 new mode 100755 diff --git a/src/main/java/shopping/model/ProductCategory.java b/src/main/java/shopping/model/ProductCategory.java old mode 100644 new mode 100755 diff --git a/src/main/java/shopping/repository/CartItemDao.java b/src/main/java/shopping/repository/CartItemDao.java old mode 100644 new mode 100755 diff --git a/src/main/java/shopping/repository/CuisineProductDao.java b/src/main/java/shopping/repository/CuisineProductDao.java old mode 100644 new mode 100755 diff --git a/src/main/java/shopping/repository/GroupBuyDao.java b/src/main/java/shopping/repository/GroupBuyDao.java old mode 100644 new mode 100755 diff --git a/src/main/java/shopping/repository/IngredientProductDao.java b/src/main/java/shopping/repository/IngredientProductDao.java old mode 100644 new mode 100755 diff --git a/src/main/java/shopping/repository/OrderDao.java b/src/main/java/shopping/repository/OrderDao.java old mode 100644 new mode 100755 diff --git a/src/main/java/shopping/repository/OrderItemDao.java b/src/main/java/shopping/repository/OrderItemDao.java old mode 100644 new mode 100755 diff --git a/src/main/java/shopping/repository/OrderItemService.java b/src/main/java/shopping/repository/OrderItemService.java old mode 100644 new mode 100755 diff --git a/src/main/java/shopping/repository/PlaneProductDao.java b/src/main/java/shopping/repository/PlaneProductDao.java old mode 100644 new mode 100755 diff --git a/src/main/java/shopping/repository/ProductCategoryDao.java b/src/main/java/shopping/repository/ProductCategoryDao.java old mode 100644 new mode 100755 diff --git a/src/main/java/shopping/repository/ProductDao.java b/src/main/java/shopping/repository/ProductDao.java old mode 100644 new mode 100755 diff --git a/src/main/java/shopping/repository/impl/CartItemDaoImpl.java b/src/main/java/shopping/repository/impl/CartItemDaoImpl.java old mode 100644 new mode 100755 diff --git a/src/main/java/shopping/repository/impl/CuisineProductDaoImpl.java b/src/main/java/shopping/repository/impl/CuisineProductDaoImpl.java old mode 100644 new mode 100755 diff --git a/src/main/java/shopping/repository/impl/GroupBuyDaoImpl.java b/src/main/java/shopping/repository/impl/GroupBuyDaoImpl.java old mode 100644 new mode 100755 diff --git a/src/main/java/shopping/repository/impl/IngredientProductDaoImpl.java b/src/main/java/shopping/repository/impl/IngredientProductDaoImpl.java old mode 100644 new mode 100755 diff --git a/src/main/java/shopping/repository/impl/OrderDaoImpl.java b/src/main/java/shopping/repository/impl/OrderDaoImpl.java old mode 100644 new mode 100755 diff --git a/src/main/java/shopping/repository/impl/OrderItemDaoImpl.java b/src/main/java/shopping/repository/impl/OrderItemDaoImpl.java old mode 100644 new mode 100755 diff --git a/src/main/java/shopping/repository/impl/PlaneItemDaoImpl.java b/src/main/java/shopping/repository/impl/PlaneItemDaoImpl.java old mode 100644 new mode 100755 diff --git a/src/main/java/shopping/repository/impl/PlaneProductDaoImpl.java b/src/main/java/shopping/repository/impl/PlaneProductDaoImpl.java old mode 100644 new mode 100755 diff --git a/src/main/java/shopping/repository/impl/ProductCategoryDaoImpl.java b/src/main/java/shopping/repository/impl/ProductCategoryDaoImpl.java old mode 100644 new mode 100755 diff --git a/src/main/java/shopping/repository/impl/ProductDaoImpl.java b/src/main/java/shopping/repository/impl/ProductDaoImpl.java old mode 100644 new mode 100755 diff --git a/src/main/java/shopping/repository/planeItemDao.java b/src/main/java/shopping/repository/planeItemDao.java old mode 100644 new mode 100755 diff --git a/src/main/java/shopping/service/CartItemService.java b/src/main/java/shopping/service/CartItemService.java old mode 100644 new mode 100755 diff --git a/src/main/java/shopping/service/CuisineProductService.java b/src/main/java/shopping/service/CuisineProductService.java old mode 100644 new mode 100755 diff --git a/src/main/java/shopping/service/GroupBuyService.java b/src/main/java/shopping/service/GroupBuyService.java old mode 100644 new mode 100755 diff --git a/src/main/java/shopping/service/IngredientProductService.java b/src/main/java/shopping/service/IngredientProductService.java old mode 100644 new mode 100755 diff --git a/src/main/java/shopping/service/OrderService.java b/src/main/java/shopping/service/OrderService.java old mode 100644 new mode 100755 diff --git a/src/main/java/shopping/service/PlaneItemService.java b/src/main/java/shopping/service/PlaneItemService.java old mode 100644 new mode 100755 diff --git a/src/main/java/shopping/service/PlaneProductService.java b/src/main/java/shopping/service/PlaneProductService.java old mode 100644 new mode 100755 diff --git a/src/main/java/shopping/service/ProductCategoryService.java b/src/main/java/shopping/service/ProductCategoryService.java old mode 100644 new mode 100755 diff --git a/src/main/java/shopping/service/ProductService.java b/src/main/java/shopping/service/ProductService.java old mode 100644 new mode 100755 diff --git a/src/main/java/shopping/service/impl/CartItemServiceImpl.java b/src/main/java/shopping/service/impl/CartItemServiceImpl.java old mode 100644 new mode 100755 diff --git a/src/main/java/shopping/service/impl/CuisineProductServiceImpl.java b/src/main/java/shopping/service/impl/CuisineProductServiceImpl.java old mode 100644 new mode 100755 diff --git a/src/main/java/shopping/service/impl/GroupBuyServiceImpl.java b/src/main/java/shopping/service/impl/GroupBuyServiceImpl.java old mode 100644 new mode 100755 diff --git a/src/main/java/shopping/service/impl/IngredientProductServiceImpl.java b/src/main/java/shopping/service/impl/IngredientProductServiceImpl.java old mode 100644 new mode 100755 diff --git a/src/main/java/shopping/service/impl/OrderItemServiceImpl.java b/src/main/java/shopping/service/impl/OrderItemServiceImpl.java old mode 100644 new mode 100755 diff --git a/src/main/java/shopping/service/impl/OrderServiceImpl.java b/src/main/java/shopping/service/impl/OrderServiceImpl.java old mode 100644 new mode 100755 diff --git a/src/main/java/shopping/service/impl/PlaneItemServiceImpl.java b/src/main/java/shopping/service/impl/PlaneItemServiceImpl.java old mode 100644 new mode 100755 diff --git a/src/main/java/shopping/service/impl/PlaneProductServiceImpl.java b/src/main/java/shopping/service/impl/PlaneProductServiceImpl.java old mode 100644 new mode 100755 diff --git a/src/main/java/shopping/service/impl/ProductCategoryServiceImpl.java b/src/main/java/shopping/service/impl/ProductCategoryServiceImpl.java old mode 100644 new mode 100755 diff --git a/src/main/java/shopping/service/impl/ProductServiceImpl.java b/src/main/java/shopping/service/impl/ProductServiceImpl.java old mode 100644 new mode 100755 diff --git a/src/main/java/websocket/component/CrAlert.java b/src/main/java/websocket/component/CrAlert.java old mode 100644 new mode 100755 diff --git a/src/main/java/websocket/component/CrAlertException.java b/src/main/java/websocket/component/CrAlertException.java old mode 100644 new mode 100755 diff --git a/src/main/java/websocket/component/CrContact.java b/src/main/java/websocket/component/CrContact.java old mode 100644 new mode 100755 diff --git a/src/main/java/websocket/component/CrMessage.java b/src/main/java/websocket/component/CrMessage.java old mode 100644 new mode 100755 diff --git a/src/main/java/websocket/component/CrMessageService.java b/src/main/java/websocket/component/CrMessageService.java old mode 100644 new mode 100755 diff --git a/src/main/java/websocket/controller/ChatRoomWebSocketController.java b/src/main/java/websocket/controller/ChatRoomWebSocketController.java old mode 100644 new mode 100755 diff --git a/src/main/java/websocket/handler/WebSocketHandshakeInterceptor.java b/src/main/java/websocket/handler/WebSocketHandshakeInterceptor.java old mode 100644 new mode 100755 diff --git a/src/main/java/websocket/repository/MessageDao.java b/src/main/java/websocket/repository/MessageDao.java old mode 100644 new mode 100755 diff --git a/src/main/java/websocket/repository/impl/MessageDaoImpl.java b/src/main/java/websocket/repository/impl/MessageDaoImpl.java old mode 100644 new mode 100755 diff --git a/src/main/java/websocket/service/Impl/MessageServiceImpl.java b/src/main/java/websocket/service/Impl/MessageServiceImpl.java old mode 100644 new mode 100755 diff --git a/src/main/java/websocket/service/MessageService.java b/src/main/java/websocket/service/MessageService.java old mode 100644 new mode 100755 diff --git a/src/main/resources/beans.xml b/src/main/resources/beans.xml old mode 100644 new mode 100755 index cde772a..cdf309d --- a/src/main/resources/beans.xml +++ b/src/main/resources/beans.xml @@ -5,7 +5,7 @@ xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context-4.3.xsd"> - +
- +
- +
diff --git a/src/main/webapp/WEB-INF/views/orderDetail.jsp b/src/main/webapp/WEB-INF/views/orderDetail.jsp old mode 100644 new mode 100755 diff --git a/src/main/webapp/WEB-INF/views/orders.jsp b/src/main/webapp/WEB-INF/views/orders.jsp old mode 100644 new mode 100755 diff --git a/src/main/webapp/WEB-INF/views/planeItemDetail.jsp b/src/main/webapp/WEB-INF/views/planeItemDetail.jsp old mode 100644 new mode 100755 diff --git a/src/main/webapp/WEB-INF/views/productImage/001-1.jpg b/src/main/webapp/WEB-INF/views/productImage/001-1.jpg old mode 100644 new mode 100755 diff --git a/src/main/webapp/WEB-INF/views/productImage/001-2.jpg b/src/main/webapp/WEB-INF/views/productImage/001-2.jpg old mode 100644 new mode 100755 diff --git a/src/main/webapp/WEB-INF/views/productImage/002-1.jpg b/src/main/webapp/WEB-INF/views/productImage/002-1.jpg old mode 100644 new mode 100755 diff --git a/src/main/webapp/WEB-INF/views/productImage/002-2.jpg b/src/main/webapp/WEB-INF/views/productImage/002-2.jpg old mode 100644 new mode 100755 diff --git a/src/main/webapp/WEB-INF/views/productImage/003-1.jpg b/src/main/webapp/WEB-INF/views/productImage/003-1.jpg old mode 100644 new mode 100755 diff --git a/src/main/webapp/WEB-INF/views/productImage/003-2.jpg b/src/main/webapp/WEB-INF/views/productImage/003-2.jpg old mode 100644 new mode 100755 diff --git a/src/main/webapp/WEB-INF/views/productImage/004-1.jpg b/src/main/webapp/WEB-INF/views/productImage/004-1.jpg old mode 100644 new mode 100755 diff --git a/src/main/webapp/WEB-INF/views/productImage/004-2.jpg b/src/main/webapp/WEB-INF/views/productImage/004-2.jpg old mode 100644 new mode 100755 diff --git a/src/main/webapp/WEB-INF/views/productImage/005-1.jpg b/src/main/webapp/WEB-INF/views/productImage/005-1.jpg old mode 100644 new mode 100755 diff --git a/src/main/webapp/WEB-INF/views/productImage/006-1.jpg b/src/main/webapp/WEB-INF/views/productImage/006-1.jpg old mode 100644 new mode 100755 diff --git a/src/main/webapp/WEB-INF/views/productImage/006-2.jpg b/src/main/webapp/WEB-INF/views/productImage/006-2.jpg old mode 100644 new mode 100755 diff --git a/src/main/webapp/WEB-INF/views/productImage/007-1.jpg b/src/main/webapp/WEB-INF/views/productImage/007-1.jpg old mode 100644 new mode 100755 diff --git a/src/main/webapp/WEB-INF/views/productImage/007-2.jpg b/src/main/webapp/WEB-INF/views/productImage/007-2.jpg old mode 100644 new mode 100755 diff --git a/src/main/webapp/WEB-INF/views/productImage/008-1.jpg b/src/main/webapp/WEB-INF/views/productImage/008-1.jpg old mode 100644 new mode 100755 diff --git a/src/main/webapp/WEB-INF/views/productImage/008-2.jpg b/src/main/webapp/WEB-INF/views/productImage/008-2.jpg old mode 100644 new mode 100755 diff --git a/src/main/webapp/WEB-INF/views/productImage/009-1.jpg b/src/main/webapp/WEB-INF/views/productImage/009-1.jpg old mode 100644 new mode 100755 diff --git a/src/main/webapp/WEB-INF/views/productImage/009-2.jpg b/src/main/webapp/WEB-INF/views/productImage/009-2.jpg old mode 100644 new mode 100755 diff --git a/src/main/webapp/WEB-INF/views/productImage/010-1.jpg b/src/main/webapp/WEB-INF/views/productImage/010-1.jpg old mode 100644 new mode 100755 diff --git a/src/main/webapp/WEB-INF/views/productImage/010-2.jpg b/src/main/webapp/WEB-INF/views/productImage/010-2.jpg old mode 100644 new mode 100755 diff --git a/src/main/webapp/WEB-INF/views/productImage/011-1.jpg b/src/main/webapp/WEB-INF/views/productImage/011-1.jpg old mode 100644 new mode 100755 diff --git a/src/main/webapp/WEB-INF/views/productImage/011-2.jpg b/src/main/webapp/WEB-INF/views/productImage/011-2.jpg old mode 100644 new mode 100755 diff --git a/src/main/webapp/WEB-INF/views/productImage/012-1.jpg b/src/main/webapp/WEB-INF/views/productImage/012-1.jpg old mode 100644 new mode 100755 diff --git a/src/main/webapp/WEB-INF/views/productImage/012-2.jpg b/src/main/webapp/WEB-INF/views/productImage/012-2.jpg old mode 100644 new mode 100755 diff --git a/src/main/webapp/WEB-INF/views/productImage/013-1.jpg b/src/main/webapp/WEB-INF/views/productImage/013-1.jpg old mode 100644 new mode 100755 diff --git a/src/main/webapp/WEB-INF/views/productImage/013-2.jpg b/src/main/webapp/WEB-INF/views/productImage/013-2.jpg old mode 100644 new mode 100755 diff --git a/src/main/webapp/WEB-INF/views/productImage/014-1.jpg b/src/main/webapp/WEB-INF/views/productImage/014-1.jpg old mode 100644 new mode 100755 diff --git a/src/main/webapp/WEB-INF/views/productImage/014-2.jpg b/src/main/webapp/WEB-INF/views/productImage/014-2.jpg old mode 100644 new mode 100755 diff --git a/src/main/webapp/WEB-INF/views/productImage/015-1.jpg b/src/main/webapp/WEB-INF/views/productImage/015-1.jpg old mode 100644 new mode 100755 diff --git a/src/main/webapp/WEB-INF/views/productImage/015-2.jpg b/src/main/webapp/WEB-INF/views/productImage/015-2.jpg old mode 100644 new mode 100755 diff --git a/src/main/webapp/WEB-INF/views/productImage/016-1.jpg b/src/main/webapp/WEB-INF/views/productImage/016-1.jpg old mode 100644 new mode 100755 diff --git a/src/main/webapp/WEB-INF/views/productImage/016-2.jpg b/src/main/webapp/WEB-INF/views/productImage/016-2.jpg old mode 100644 new mode 100755 diff --git a/src/main/webapp/WEB-INF/views/productImage/017-1.jpg b/src/main/webapp/WEB-INF/views/productImage/017-1.jpg old mode 100644 new mode 100755 diff --git a/src/main/webapp/WEB-INF/views/productImage/017-2.jpg b/src/main/webapp/WEB-INF/views/productImage/017-2.jpg old mode 100644 new mode 100755 diff --git a/src/main/webapp/WEB-INF/views/productImage/018-1.jpg b/src/main/webapp/WEB-INF/views/productImage/018-1.jpg old mode 100644 new mode 100755 diff --git a/src/main/webapp/WEB-INF/views/productImage/018-2.jpg b/src/main/webapp/WEB-INF/views/productImage/018-2.jpg old mode 100644 new mode 100755 diff --git a/src/main/webapp/WEB-INF/views/productImage/019-1.jpg b/src/main/webapp/WEB-INF/views/productImage/019-1.jpg old mode 100644 new mode 100755 diff --git a/src/main/webapp/WEB-INF/views/productImage/019-2.jpg b/src/main/webapp/WEB-INF/views/productImage/019-2.jpg old mode 100644 new mode 100755 diff --git a/src/main/webapp/WEB-INF/views/productImage/020-1.jpg b/src/main/webapp/WEB-INF/views/productImage/020-1.jpg old mode 100644 new mode 100755 diff --git a/src/main/webapp/WEB-INF/views/productImage/020-2.jpg b/src/main/webapp/WEB-INF/views/productImage/020-2.jpg old mode 100644 new mode 100755 diff --git a/src/main/webapp/WEB-INF/views/productImage/021-1.jpg b/src/main/webapp/WEB-INF/views/productImage/021-1.jpg old mode 100644 new mode 100755 diff --git a/src/main/webapp/WEB-INF/views/productImage/021-2.jpg b/src/main/webapp/WEB-INF/views/productImage/021-2.jpg old mode 100644 new mode 100755 diff --git a/src/main/webapp/WEB-INF/views/productImage/022-1.jpg b/src/main/webapp/WEB-INF/views/productImage/022-1.jpg old mode 100644 new mode 100755 diff --git a/src/main/webapp/WEB-INF/views/productImage/022-2.jpg b/src/main/webapp/WEB-INF/views/productImage/022-2.jpg old mode 100644 new mode 100755 diff --git a/src/main/webapp/WEB-INF/views/productImage/023-1.jpg b/src/main/webapp/WEB-INF/views/productImage/023-1.jpg old mode 100644 new mode 100755 diff --git a/src/main/webapp/WEB-INF/views/productImage/023-2.jpg b/src/main/webapp/WEB-INF/views/productImage/023-2.jpg old mode 100644 new mode 100755 diff --git a/src/main/webapp/WEB-INF/views/productImage/024-1.jpg b/src/main/webapp/WEB-INF/views/productImage/024-1.jpg old mode 100644 new mode 100755 diff --git a/src/main/webapp/WEB-INF/views/productImage/024-2.jpg b/src/main/webapp/WEB-INF/views/productImage/024-2.jpg old mode 100644 new mode 100755 diff --git a/src/main/webapp/WEB-INF/views/productImage/025-1.jpg b/src/main/webapp/WEB-INF/views/productImage/025-1.jpg old mode 100644 new mode 100755 diff --git a/src/main/webapp/WEB-INF/views/productImage/025-2.jpg b/src/main/webapp/WEB-INF/views/productImage/025-2.jpg old mode 100644 new mode 100755 diff --git a/src/main/webapp/WEB-INF/views/productImage/026-1.jpg b/src/main/webapp/WEB-INF/views/productImage/026-1.jpg old mode 100644 new mode 100755 diff --git a/src/main/webapp/WEB-INF/views/productImage/026-2.jpg b/src/main/webapp/WEB-INF/views/productImage/026-2.jpg old mode 100644 new mode 100755 diff --git a/src/main/webapp/WEB-INF/views/productImage/027-1.jpg b/src/main/webapp/WEB-INF/views/productImage/027-1.jpg old mode 100644 new mode 100755 diff --git a/src/main/webapp/WEB-INF/views/productImage/027-2.jpg b/src/main/webapp/WEB-INF/views/productImage/027-2.jpg old mode 100644 new mode 100755 diff --git a/src/main/webapp/WEB-INF/views/productImage/028-1.jpg b/src/main/webapp/WEB-INF/views/productImage/028-1.jpg old mode 100644 new mode 100755 diff --git a/src/main/webapp/WEB-INF/views/productImage/028-2.jpg b/src/main/webapp/WEB-INF/views/productImage/028-2.jpg old mode 100644 new mode 100755 diff --git a/src/main/webapp/WEB-INF/views/productImage/029-1.jpg b/src/main/webapp/WEB-INF/views/productImage/029-1.jpg old mode 100644 new mode 100755 diff --git a/src/main/webapp/WEB-INF/views/productImage/029-2.jpg b/src/main/webapp/WEB-INF/views/productImage/029-2.jpg old mode 100644 new mode 100755 diff --git a/src/main/webapp/WEB-INF/views/productImage/030-1.jpg b/src/main/webapp/WEB-INF/views/productImage/030-1.jpg old mode 100644 new mode 100755 diff --git a/src/main/webapp/WEB-INF/views/productImage/031-1.jpg b/src/main/webapp/WEB-INF/views/productImage/031-1.jpg old mode 100644 new mode 100755 diff --git a/src/main/webapp/WEB-INF/views/productImage/032-1.jpg b/src/main/webapp/WEB-INF/views/productImage/032-1.jpg old mode 100644 new mode 100755 diff --git a/src/main/webapp/WEB-INF/views/productImage/033-1.jpg b/src/main/webapp/WEB-INF/views/productImage/033-1.jpg old mode 100644 new mode 100755 diff --git a/src/main/webapp/WEB-INF/views/productImage/034-1.jpg b/src/main/webapp/WEB-INF/views/productImage/034-1.jpg old mode 100644 new mode 100755 diff --git a/src/main/webapp/WEB-INF/views/productImage/035-1.jpg b/src/main/webapp/WEB-INF/views/productImage/035-1.jpg old mode 100644 new mode 100755 diff --git a/src/main/webapp/WEB-INF/views/productImage/036-1.jpg b/src/main/webapp/WEB-INF/views/productImage/036-1.jpg old mode 100644 new mode 100755 diff --git a/src/main/webapp/WEB-INF/views/productImage/037-1.jpg b/src/main/webapp/WEB-INF/views/productImage/037-1.jpg old mode 100644 new mode 100755 diff --git a/src/main/webapp/WEB-INF/views/productImage/037-2.jpg b/src/main/webapp/WEB-INF/views/productImage/037-2.jpg old mode 100644 new mode 100755 diff --git a/src/main/webapp/WEB-INF/views/productImage/038-1.jpg b/src/main/webapp/WEB-INF/views/productImage/038-1.jpg old mode 100644 new mode 100755 diff --git a/src/main/webapp/WEB-INF/views/productImage/038-2.jpg b/src/main/webapp/WEB-INF/views/productImage/038-2.jpg old mode 100644 new mode 100755 diff --git a/src/main/webapp/WEB-INF/views/productImage/039-1.jpg b/src/main/webapp/WEB-INF/views/productImage/039-1.jpg old mode 100644 new mode 100755 diff --git a/src/main/webapp/WEB-INF/views/productImage/040-1.jpg b/src/main/webapp/WEB-INF/views/productImage/040-1.jpg old mode 100644 new mode 100755 diff --git a/src/main/webapp/WEB-INF/views/productImage/041-1.jpg b/src/main/webapp/WEB-INF/views/productImage/041-1.jpg old mode 100644 new mode 100755 diff --git a/src/main/webapp/WEB-INF/views/productImage/041-2.jpg b/src/main/webapp/WEB-INF/views/productImage/041-2.jpg old mode 100644 new mode 100755 diff --git a/src/main/webapp/WEB-INF/views/productImage/042-1.jpg b/src/main/webapp/WEB-INF/views/productImage/042-1.jpg old mode 100644 new mode 100755 diff --git a/src/main/webapp/WEB-INF/views/productImage/042-2.jpg b/src/main/webapp/WEB-INF/views/productImage/042-2.jpg old mode 100644 new mode 100755 diff --git a/src/main/webapp/WEB-INF/views/productImage/043-1.jpg b/src/main/webapp/WEB-INF/views/productImage/043-1.jpg old mode 100644 new mode 100755 diff --git a/src/main/webapp/WEB-INF/views/productImage/1000-1.jpg b/src/main/webapp/WEB-INF/views/productImage/1000-1.jpg old mode 100644 new mode 100755 diff --git a/src/main/webapp/WEB-INF/views/productImage/1000-2.jpg b/src/main/webapp/WEB-INF/views/productImage/1000-2.jpg old mode 100644 new mode 100755 diff --git a/src/main/webapp/WEB-INF/views/productImage/1001-1.jpg b/src/main/webapp/WEB-INF/views/productImage/1001-1.jpg old mode 100644 new mode 100755 diff --git a/src/main/webapp/WEB-INF/views/productImage/1001-2.jpg b/src/main/webapp/WEB-INF/views/productImage/1001-2.jpg old mode 100644 new mode 100755 diff --git a/src/main/webapp/WEB-INF/views/productImage/1002-1.jpg b/src/main/webapp/WEB-INF/views/productImage/1002-1.jpg old mode 100644 new mode 100755 diff --git a/src/main/webapp/WEB-INF/views/productImage/1002-2.jpg b/src/main/webapp/WEB-INF/views/productImage/1002-2.jpg old mode 100644 new mode 100755 diff --git a/src/main/webapp/WEB-INF/views/productImage/1003-1.jpg b/src/main/webapp/WEB-INF/views/productImage/1003-1.jpg old mode 100644 new mode 100755 diff --git a/src/main/webapp/WEB-INF/views/productImage/1003-2.jpg b/src/main/webapp/WEB-INF/views/productImage/1003-2.jpg old mode 100644 new mode 100755 diff --git a/src/main/webapp/WEB-INF/views/productImage/1004-1.jpg b/src/main/webapp/WEB-INF/views/productImage/1004-1.jpg old mode 100644 new mode 100755 diff --git a/src/main/webapp/WEB-INF/views/productImage/1004-2.jpg b/src/main/webapp/WEB-INF/views/productImage/1004-2.jpg old mode 100644 new mode 100755 diff --git a/src/main/webapp/WEB-INF/views/productImage/1005-1.jpg b/src/main/webapp/WEB-INF/views/productImage/1005-1.jpg old mode 100644 new mode 100755 diff --git a/src/main/webapp/WEB-INF/views/productImage/1005-2.jpg b/src/main/webapp/WEB-INF/views/productImage/1005-2.jpg old mode 100644 new mode 100755 diff --git a/src/main/webapp/WEB-INF/views/productImage/1006-1.jpg b/src/main/webapp/WEB-INF/views/productImage/1006-1.jpg old mode 100644 new mode 100755 diff --git a/src/main/webapp/WEB-INF/views/productImage/1006-2.jpg b/src/main/webapp/WEB-INF/views/productImage/1006-2.jpg old mode 100644 new mode 100755 diff --git a/src/main/webapp/WEB-INF/views/productImage/1007-1.jpg b/src/main/webapp/WEB-INF/views/productImage/1007-1.jpg old mode 100644 new mode 100755 diff --git a/src/main/webapp/WEB-INF/views/productImage/1007-2.jpg b/src/main/webapp/WEB-INF/views/productImage/1007-2.jpg old mode 100644 new mode 100755 diff --git a/src/main/webapp/WEB-INF/views/productImage/1008-1.jpg b/src/main/webapp/WEB-INF/views/productImage/1008-1.jpg old mode 100644 new mode 100755 diff --git a/src/main/webapp/WEB-INF/views/productImage/1008-2.jpg b/src/main/webapp/WEB-INF/views/productImage/1008-2.jpg old mode 100644 new mode 100755 diff --git a/src/main/webapp/WEB-INF/views/productImage/1009-1.jpg b/src/main/webapp/WEB-INF/views/productImage/1009-1.jpg old mode 100644 new mode 100755 diff --git a/src/main/webapp/WEB-INF/views/productImage/1009-2.jpg b/src/main/webapp/WEB-INF/views/productImage/1009-2.jpg old mode 100644 new mode 100755 diff --git a/src/main/webapp/WEB-INF/views/productImage/1010-1.jpg b/src/main/webapp/WEB-INF/views/productImage/1010-1.jpg old mode 100644 new mode 100755 diff --git a/src/main/webapp/WEB-INF/views/productImage/1010-2.jpg b/src/main/webapp/WEB-INF/views/productImage/1010-2.jpg old mode 100644 new mode 100755 diff --git a/src/main/webapp/WEB-INF/views/productImage/1011-1.jpg b/src/main/webapp/WEB-INF/views/productImage/1011-1.jpg old mode 100644 new mode 100755 diff --git a/src/main/webapp/WEB-INF/views/productImage/1011-2.jpg b/src/main/webapp/WEB-INF/views/productImage/1011-2.jpg old mode 100644 new mode 100755 diff --git a/src/main/webapp/WEB-INF/views/productImage/1012-1.jpg b/src/main/webapp/WEB-INF/views/productImage/1012-1.jpg old mode 100644 new mode 100755 diff --git a/src/main/webapp/WEB-INF/views/productImage/1013-1.jpg b/src/main/webapp/WEB-INF/views/productImage/1013-1.jpg old mode 100644 new mode 100755 diff --git a/src/main/webapp/WEB-INF/views/productImage/1014-1.jpg b/src/main/webapp/WEB-INF/views/productImage/1014-1.jpg old mode 100644 new mode 100755 diff --git a/src/main/webapp/WEB-INF/views/productImage/1015-1.jpg b/src/main/webapp/WEB-INF/views/productImage/1015-1.jpg old mode 100644 new mode 100755 diff --git a/src/main/webapp/WEB-INF/views/productImage/1016-1.jpg b/src/main/webapp/WEB-INF/views/productImage/1016-1.jpg old mode 100644 new mode 100755 diff --git a/src/main/webapp/WEB-INF/views/productImage/1017-1.jpg b/src/main/webapp/WEB-INF/views/productImage/1017-1.jpg old mode 100644 new mode 100755 diff --git a/src/main/webapp/WEB-INF/views/productImage/1018-1.jpg b/src/main/webapp/WEB-INF/views/productImage/1018-1.jpg old mode 100644 new mode 100755 diff --git a/src/main/webapp/WEB-INF/views/productImage/1019-1.jpg b/src/main/webapp/WEB-INF/views/productImage/1019-1.jpg old mode 100644 new mode 100755 diff --git a/src/main/webapp/WEB-INF/views/productImage/1019-2.jpg b/src/main/webapp/WEB-INF/views/productImage/1019-2.jpg old mode 100644 new mode 100755 diff --git a/src/main/webapp/WEB-INF/views/productImage/1020-1.jpg b/src/main/webapp/WEB-INF/views/productImage/1020-1.jpg old mode 100644 new mode 100755 diff --git a/src/main/webapp/WEB-INF/views/productImage/1020-2.jpg b/src/main/webapp/WEB-INF/views/productImage/1020-2.jpg old mode 100644 new mode 100755 diff --git a/src/main/webapp/WEB-INF/views/productImage/1021-1.jpg b/src/main/webapp/WEB-INF/views/productImage/1021-1.jpg old mode 100644 new mode 100755 diff --git a/src/main/webapp/WEB-INF/views/productImage/1021-2.jpg b/src/main/webapp/WEB-INF/views/productImage/1021-2.jpg old mode 100644 new mode 100755 diff --git a/src/main/webapp/WEB-INF/views/productImage/1022-1.jpg b/src/main/webapp/WEB-INF/views/productImage/1022-1.jpg old mode 100644 new mode 100755 diff --git a/src/main/webapp/WEB-INF/views/productImage/1022-2.jpg b/src/main/webapp/WEB-INF/views/productImage/1022-2.jpg old mode 100644 new mode 100755 diff --git a/src/main/webapp/WEB-INF/views/productImage/1023-1.jpg b/src/main/webapp/WEB-INF/views/productImage/1023-1.jpg old mode 100644 new mode 100755 diff --git a/src/main/webapp/WEB-INF/views/productImage/1023-2.jpg b/src/main/webapp/WEB-INF/views/productImage/1023-2.jpg old mode 100644 new mode 100755 diff --git a/src/main/webapp/WEB-INF/views/productImage/1024-1.jpg b/src/main/webapp/WEB-INF/views/productImage/1024-1.jpg old mode 100644 new mode 100755 diff --git a/src/main/webapp/WEB-INF/views/productImage/1024-2.jpg b/src/main/webapp/WEB-INF/views/productImage/1024-2.jpg old mode 100644 new mode 100755 diff --git a/src/main/webapp/WEB-INF/views/productImage/1025-1.jpg b/src/main/webapp/WEB-INF/views/productImage/1025-1.jpg old mode 100644 new mode 100755 diff --git a/src/main/webapp/WEB-INF/views/productImage/1026-1.jpg b/src/main/webapp/WEB-INF/views/productImage/1026-1.jpg old mode 100644 new mode 100755 diff --git a/src/main/webapp/WEB-INF/views/productImage/1027-1.jpg b/src/main/webapp/WEB-INF/views/productImage/1027-1.jpg old mode 100644 new mode 100755 diff --git a/src/main/webapp/WEB-INF/views/productImage/1028-1.jpg b/src/main/webapp/WEB-INF/views/productImage/1028-1.jpg old mode 100644 new mode 100755 diff --git a/src/main/webapp/WEB-INF/views/productImage/1029-1.jpg b/src/main/webapp/WEB-INF/views/productImage/1029-1.jpg old mode 100644 new mode 100755 diff --git a/src/main/webapp/WEB-INF/views/productImage/1030-1.jpg b/src/main/webapp/WEB-INF/views/productImage/1030-1.jpg old mode 100644 new mode 100755 diff --git a/src/main/webapp/WEB-INF/views/productImage/1031-1.jpg b/src/main/webapp/WEB-INF/views/productImage/1031-1.jpg old mode 100644 new mode 100755 diff --git a/src/main/webapp/WEB-INF/views/productImage/1032-1.jpg b/src/main/webapp/WEB-INF/views/productImage/1032-1.jpg old mode 100644 new mode 100755 diff --git a/src/main/webapp/WEB-INF/views/productImage/1033-1.jpg b/src/main/webapp/WEB-INF/views/productImage/1033-1.jpg old mode 100644 new mode 100755 diff --git a/src/main/webapp/WEB-INF/views/productImage/1034-1.jpg b/src/main/webapp/WEB-INF/views/productImage/1034-1.jpg old mode 100644 new mode 100755 diff --git a/src/main/webapp/WEB-INF/views/productImage/1035-1.jpg b/src/main/webapp/WEB-INF/views/productImage/1035-1.jpg old mode 100644 new mode 100755 diff --git a/src/main/webapp/WEB-INF/views/productImage/1036-1.jpg b/src/main/webapp/WEB-INF/views/productImage/1036-1.jpg old mode 100644 new mode 100755 diff --git a/src/main/webapp/WEB-INF/views/publish_recipe.jsp b/src/main/webapp/WEB-INF/views/publish_recipe.jsp old mode 100644 new mode 100755 diff --git a/src/main/webapp/WEB-INF/views/recipe_main.jsp b/src/main/webapp/WEB-INF/views/recipe_main.jsp old mode 100644 new mode 100755 index ba39ebb..124657a --- a/src/main/webapp/WEB-INF/views/recipe_main.jsp +++ b/src/main/webapp/WEB-INF/views/recipe_main.jsp @@ -66,15 +66,15 @@