Merge branch 'master' of xwh/kmall-pt-general into master

kmall-admin/src/main/java/com/kmall/admin/controller/MkActivitiesCombinationPriceController.java

@@ -31,7 +31,6 @@ public class MkActivitiesCombinationPriceController {
      * 查看列表
      */
     @RequestMapping("/list")
-    @RequiresPermissions("mkactivitiescombinationprice:list")
     @ResponseBody
     public R list(@RequestParam Map<String, Object> params) {
         //查询列表数据
@@ -49,7 +48,6 @@ public class MkActivitiesCombinationPriceController {
      * 查看信息
      */
     @RequestMapping("/info/{macpId}")
-    @RequiresPermissions("mkactivitiescombinationprice:info")
     @ResponseBody
     public R info(@PathVariable("macpId") Long macpId) {
         MkActivitiesCombinationPriceEntity mkActivitiesCombinationPrice = mkActivitiesCombinationPriceService.queryObject(macpId);
@@ -61,7 +59,6 @@ public class MkActivitiesCombinationPriceController {
      * 保存
      */
     @RequestMapping("/save")
-    @RequiresPermissions("mkactivitiescombinationprice:save")
     @ResponseBody
     public R save(@RequestBody MkActivitiesCombinationPriceEntity mkActivitiesCombinationPrice) {
         mkActivitiesCombinationPriceService.save(mkActivitiesCombinationPrice);
@@ -73,7 +70,6 @@ public class MkActivitiesCombinationPriceController {
      * 修改
      */
     @RequestMapping("/update")
-    @RequiresPermissions("mkactivitiescombinationprice:update")
     @ResponseBody
     public R update(@RequestBody MkActivitiesCombinationPriceEntity mkActivitiesCombinationPrice) {
         mkActivitiesCombinationPriceService.update(mkActivitiesCombinationPrice);
@@ -85,7 +81,6 @@ public class MkActivitiesCombinationPriceController {
      * 删除
      */
     @RequestMapping("/delete")
-    @RequiresPermissions("mkactivitiescombinationprice:delete")
     @ResponseBody
     public R delete(@RequestBody Long[]macpIds) {
         mkActivitiesCombinationPriceService.deleteBatch(macpIds);

kmall-admin/src/main/java/com/kmall/admin/controller/MkActivitiesDiscountController.java

@@ -31,7 +31,6 @@ public class MkActivitiesDiscountController {
      * 查看列表
      */
     @RequestMapping("/list")
-    @RequiresPermissions("mkactivitiesdiscount:list")
     @ResponseBody
     public R list(@RequestParam Map<String, Object> params) {
         //查询列表数据
@@ -49,7 +48,6 @@ public class MkActivitiesDiscountController {
      * 查看信息
      */
     @RequestMapping("/info/{madId}")
-    @RequiresPermissions("mkactivitiesdiscount:info")
     @ResponseBody
     public R info(@PathVariable("madId") Long madId) {
         MkActivitiesDiscountEntity mkActivitiesDiscount = mkActivitiesDiscountService.queryObject(madId);
@@ -61,7 +59,6 @@ public class MkActivitiesDiscountController {
      * 保存
      */
     @RequestMapping("/save")
-    @RequiresPermissions("mkactivitiesdiscount:save")
     @ResponseBody
     public R save(@RequestBody MkActivitiesDiscountEntity mkActivitiesDiscount) {
         mkActivitiesDiscountService.save(mkActivitiesDiscount);
@@ -73,7 +70,6 @@ public class MkActivitiesDiscountController {
      * 修改
      */
     @RequestMapping("/update")
-    @RequiresPermissions("mkactivitiesdiscount:update")
     @ResponseBody
     public R update(@RequestBody MkActivitiesDiscountEntity mkActivitiesDiscount) {
         mkActivitiesDiscountService.update(mkActivitiesDiscount);
@@ -85,7 +81,6 @@ public class MkActivitiesDiscountController {
      * 删除
      */
     @RequestMapping("/delete")
-    @RequiresPermissions("mkactivitiesdiscount:delete")
     @ResponseBody
     public R delete(@RequestBody Long[]madIds) {
         mkActivitiesDiscountService.deleteBatch(madIds);

kmall-admin/src/main/java/com/kmall/admin/controller/MkActivitiesFullGiftController.java

@@ -31,7 +31,6 @@ public class MkActivitiesFullGiftController {
      * 查看列表
      */
     @RequestMapping("/list")
-    @RequiresPermissions("mkactivitiesfullgift:list")
     @ResponseBody
     public R list(@RequestParam Map<String, Object> params) {
         //查询列表数据
@@ -49,7 +48,6 @@ public class MkActivitiesFullGiftController {
      * 查看信息
      */
     @RequestMapping("/info/{mafrId}")
-    @RequiresPermissions("mkactivitiesfullgift:info")
     @ResponseBody
     public R info(@PathVariable("mafrId") Long mafrId) {
         MkActivitiesFullGiftEntity mkActivitiesFullGift = mkActivitiesFullGiftService.queryObject(mafrId);
@@ -61,7 +59,6 @@ public class MkActivitiesFullGiftController {
      * 保存
      */
     @RequestMapping("/save")
-    @RequiresPermissions("mkactivitiesfullgift:save")
     @ResponseBody
     public R save(@RequestBody MkActivitiesFullGiftEntity mkActivitiesFullGift) {
         mkActivitiesFullGiftService.save(mkActivitiesFullGift);
@@ -73,7 +70,6 @@ public class MkActivitiesFullGiftController {
      * 修改
      */
     @RequestMapping("/update")
-    @RequiresPermissions("mkactivitiesfullgift:update")
     @ResponseBody
     public R update(@RequestBody MkActivitiesFullGiftEntity mkActivitiesFullGift) {
         mkActivitiesFullGiftService.update(mkActivitiesFullGift);
@@ -85,7 +81,6 @@ public class MkActivitiesFullGiftController {
      * 删除
      */
     @RequestMapping("/delete")
-    @RequiresPermissions("mkactivitiesfullgift:delete")
     @ResponseBody
     public R delete(@RequestBody Long[]mafrIds) {
         mkActivitiesFullGiftService.deleteBatch(mafrIds);

kmall-admin/src/main/java/com/kmall/admin/controller/exportPDF/ExportPDFController.java

@@ -30,8 +30,8 @@ public class ExportPDFController {
     @Value("${font.url}")
     private String fontUrl;
 
-    @Value("${upload.dir}")
-    private String uploadDir;
+//    @Value("${upload.dir}")
+//    private String uploadDir;
 
 
     //打印pdf
@@ -46,7 +46,7 @@ public class ExportPDFController {
             return null;
         }
 
-
+        String uploadDir="";
         if ("1".equals(head)) {
             Map<String, Object> model = new HashMap<>();
             model.put("dto", pdfGoodsDto);

kmall-admin/src/main/java/com/kmall/admin/utils/pdf/type/PDFWrite.java

@@ -24,7 +24,7 @@ public class PDFWrite {
         Font FontChinese11 = new Font(bfHei, 11);
 
         String path = uploadDir;
-        FileOutputStream out = new FileOutputStream(path);
+//        FileOutputStream out = new FileOutputStream(path);
 
         doc.setMargins(0,0,0,0);
 

kmall-admin/src/main/java/com/kmall/admin/utils/pdf/type/PDFWrite_12.java

@@ -22,7 +22,7 @@ public class PDFWrite_12 {
         Font FontChinese11 = new Font(bfHei, 11);
 
         String path = uploadDir;
-        FileOutputStream out = new FileOutputStream(path);
+//        FileOutputStream out = new FileOutputStream(path);
 
         doc.setMargins(0,0,0,0);
 

kmall-admin/src/main/java/com/kmall/admin/utils/pdf/type/PDFWrite_18.java

@@ -23,7 +23,7 @@ public class PDFWrite_18 {
         com.lowagie.text.Font FontChinese11 = new com.lowagie.text.Font(bfHei, 11);
 
         String path = uploadDir;
-        FileOutputStream out = new FileOutputStream(path);
+//        FileOutputStream out = new FileOutputStream(path);
 
         doc.setMargins(0,0,0,0);
 

kmall-admin/src/main/java/com/kmall/admin/utils/pdf/type/PDFWrite_2.java

@@ -21,7 +21,7 @@ public class PDFWrite_2 {
         Font FontChinese11 = new Font(bfHei, 11);
 
         String path = uploadDir;
-        FileOutputStream out = new FileOutputStream(path);
+//        FileOutputStream out = new FileOutputStream(path);
 
         doc.setMargins(0,0,0,0);
 

kmall-admin/src/main/java/com/kmall/admin/utils/pdf/type/PDFWrite_36.java

@@ -23,7 +23,7 @@ public class PDFWrite_36 {
         Font FontChinese11 = new Font(bfHei, 11);
 
         String path = uploadDir;
-        FileOutputStream out = new FileOutputStream(path);
+//        FileOutputStream out = new FileOutputStream(path);
 
         doc.setMargins(0,0,0,0);
 

kmall-admin/src/main/java/com/kmall/admin/utils/pdf/type/PDFWrite_4.java

@@ -21,7 +21,7 @@ public class PDFWrite_4 {
         Font FontChinese11 = new Font(bfHei, 11);
 
         String path = uploadDir;
-        FileOutputStream out = new FileOutputStream(path);
+//        FileOutputStream out = new FileOutputStream(path);
 
         doc.setMargins(0,0,0,0);
 

kmall-admin/src/main/java/com/kmall/admin/utils/pdf/type/PDFWrite_9.java

@@ -22,7 +22,7 @@ public class PDFWrite_9 {
         Font FontChinese11 = new Font(bfHei, 11);
 
         String path = uploadDir;
-        FileOutputStream out = new FileOutputStream(path);
+//        FileOutputStream out = new FileOutputStream(path);
 
         doc.setMargins(0,0,0,0);
 

kmall-admin/src/main/java/com/kmall/admin/utils/pdf/type/PDFWrite_nohead_36.java

@@ -29,7 +29,7 @@ public class PDFWrite_nohead_36 {
         Font FontChinese11 = new Font(bfHei, 11);
 
         String path = uploadDir;
-        FileOutputStream out = new FileOutputStream(path);
+//        FileOutputStream out = new FileOutputStream(path);
 
 
         writer.setPdfVersion(PdfWriter.PDF_VERSION_1_2);//版本(默认1.4)

kmall-manager/src/main/resources/conf/print.properties

@@ -1,2 +1,2 @@
 font.url=/static/font/ams1015.ttf
-upload.dir=E:/demo/code_1.pdf
+#upload.dir=E:/demo/code_1.pdf