鉴权

src/main/java/com/izouma/awesomeadmin/dao/UserOrderMapper.xml

@@ -459,6 +459,9 @@
             <if test="record.statusFlag != null and !&quot;&quot;.equals(record.statusFlag)">
                 and status_flag = #{record.statusFlag}
             </if>
+            <if test="record.statusStr != null and !&quot;&quot;.equals(record.statusStr)">
+                and status_flag in (${record.statusStr})
+            </if>
             <if test="record.fee != null and !&quot;&quot;.equals(record.fee)">
                 and fee = #{record.fee}
             </if>
@@ -616,6 +619,9 @@
             <if test="statusFlag != null and !&quot;&quot;.equals(statusFlag)">
                 and status_flag = #{statusFlag}
             </if>
+            <if test="statusStr != null and !&quot;&quot;.equals(statusStr)">
+                and status_flag in (${statusStr})
+            </if>
             <if test="fee != null and !&quot;&quot;.equals(fee)">
                 and fee = #{fee}
             </if>

src/main/java/com/izouma/awesomeadmin/model/OrderImage.java

@@ -367,5 +367,6 @@ public class OrderImage {
     public void setOrderNum(Integer orderNum) {
         this.orderNum = orderNum;
     }
+
 }
 

src/main/java/com/izouma/awesomeadmin/model/UserOrder.java

@@ -39,6 +39,8 @@ public class UserOrder {
     private BigDecimal point;
     private BigDecimal cash;
 
+    private String statusStr;
+
     /**
      * 确认收货时间
      */
@@ -409,5 +411,13 @@ public class UserOrder {
     public void setCommentFlag(Integer commentFlag) {
         this.commentFlag = commentFlag;
     }
+
+    public String getStatusStr() {
+        return statusStr;
+    }
+
+    public void setStatusStr(String statusStr) {
+        this.statusStr = statusStr;
+    }
 }
 

src/main/java/com/izouma/awesomeadmin/util/ImagesUtil.java

@@ -82,7 +82,7 @@ public class ImagesUtil {
             String format = reader.getFormatName();
             BufferedImage image = null;
 
-            if ("JPEG".equalsIgnoreCase(format) || "JPG".equalsIgnoreCase(format)) {
+            if ("JPEG".equalsIgnoreCase(format) || "JPG".equalsIgnoreCase(format)|| "PNG".equalsIgnoreCase(format)) {
                 try {
                     // 尝试读取图片 (包括颜色的转换).
                     image = reader.read(0); //RGB

src/main/java/com/izouma/awesomeadmin/web/AboutUsController.java

@@ -22,6 +22,7 @@ import javax.servlet.http.HttpServletResponse;
 */
 @Controller
 @RequestMapping("/aboutUs")
+@RequiresAuthentication
 public class AboutUsController {
 
     @Autowired

src/main/java/com/izouma/awesomeadmin/web/BannerInfoController.java

@@ -22,6 +22,7 @@ import javax.servlet.http.HttpServletResponse;
 */
 @Controller
 @RequestMapping("/bannerInfo")
+@RequiresAuthentication
 public class BannerInfoController {
 
     @Autowired

src/main/java/com/izouma/awesomeadmin/web/CompanyAuthenticationController.java

@@ -25,6 +25,7 @@ import java.util.Map;
  */
 @Controller
 @RequestMapping("/companyAuthentication")
+@RequiresAuthentication
 public class CompanyAuthenticationController {
 
     @Autowired

src/main/java/com/izouma/awesomeadmin/web/CompanyTypeController.java

@@ -22,6 +22,7 @@ import javax.servlet.http.HttpServletResponse;
 */
 @Controller
 @RequestMapping("/companyType")
+@RequiresAuthentication
 public class CompanyTypeController {
 
     @Autowired

src/main/java/com/izouma/awesomeadmin/web/ContactUsController.java

@@ -22,6 +22,7 @@ import javax.servlet.http.HttpServletResponse;
 */
 @Controller
 @RequestMapping("/contactUs")
+@RequiresAuthentication
 public class ContactUsController {
 
     @Autowired

src/main/java/com/izouma/awesomeadmin/web/CouponInfoController.java

@@ -22,6 +22,7 @@ import javax.servlet.http.HttpServletResponse;
 */
 @Controller
 @RequestMapping("/couponInfo")
+@RequiresAuthentication
 public class CouponInfoController {
 
     @Autowired

src/main/java/com/izouma/awesomeadmin/web/CustomerServiceController.java

@@ -25,6 +25,7 @@ import javax.servlet.http.HttpServletResponse;
  */
 @Controller
 @RequestMapping("/customerService")
+@RequiresAuthentication
 public class CustomerServiceController {
 
     @Autowired

src/main/java/com/izouma/awesomeadmin/web/DistrictInfoController.java

@@ -22,6 +22,7 @@ import javax.servlet.http.HttpServletResponse;
 */
 @Controller
 @RequestMapping("/districtInfo")
+@RequiresAuthentication
 public class DistrictInfoController {
 
     @Autowired

src/main/java/com/izouma/awesomeadmin/web/HelpTextController.java

@@ -22,6 +22,7 @@ import javax.servlet.http.HttpServletResponse;
 */
 @Controller
 @RequestMapping("/helpText")
+@RequiresAuthentication
 public class HelpTextController {
 
     @Autowired

src/main/java/com/izouma/awesomeadmin/web/JoinUsController.java

@@ -22,6 +22,7 @@ import javax.servlet.http.HttpServletResponse;
 */
 @Controller
 @RequestMapping("/joinUs")
+@RequiresAuthentication
 public class JoinUsController {
 
     @Autowired

src/main/java/com/izouma/awesomeadmin/web/LogisticsInfoController.java

@@ -28,6 +28,7 @@ import javax.servlet.http.HttpServletResponse;
  */
 @Controller
 @RequestMapping("/logisticsInfo")
+@RequiresAuthentication
 public class LogisticsInfoController {
 
     @Autowired

src/main/java/com/izouma/awesomeadmin/web/MemberCoinController.java

@@ -22,6 +22,7 @@ import javax.servlet.http.HttpServletResponse;
  */
 @Controller
 @RequestMapping("/memberCoin")
+@RequiresAuthentication
 public class MemberCoinController {
 
     @Autowired

src/main/java/com/izouma/awesomeadmin/web/MemberCoinTixianController.java

@@ -31,6 +31,7 @@ import java.util.Map;
  */
 @Controller
 @RequestMapping("/memberCoinTixian")
+@RequiresAuthentication
 public class MemberCoinTixianController {
 
     @Autowired

src/main/java/com/izouma/awesomeadmin/web/MemberPointController.java

@@ -22,6 +22,7 @@ import javax.servlet.http.HttpServletResponse;
 */
 @Controller
 @RequestMapping("/memberPoint")
+@RequiresAuthentication
 public class MemberPointController {
 
     @Autowired

src/main/java/com/izouma/awesomeadmin/web/MsgSenderController.java

@@ -1,5 +1,6 @@
 package com.izouma.awesomeadmin.web;
 
+import org.apache.shiro.authz.annotation.RequiresAuthentication;
 import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
@@ -21,6 +22,7 @@ import com.izouma.awesomeadmin.util.MsgUtil;
  */
 @Controller
 @RequestMapping("/msg")
+@RequiresAuthentication
 public class MsgSenderController  {
 
     @RequestMapping(value = "/sendCodeMsg", method = RequestMethod.GET)

src/main/java/com/izouma/awesomeadmin/web/OrderAddressController.java

@@ -22,6 +22,7 @@ import javax.servlet.http.HttpServletResponse;
 */
 @Controller
 @RequestMapping("/orderAddress")
+@RequiresAuthentication
 public class OrderAddressController {
 
     @Autowired

src/main/java/com/izouma/awesomeadmin/web/OrderImageController.java

@@ -42,6 +42,7 @@ import java.util.zip.ZipOutputStream;
  */
 @Controller
 @RequestMapping("/orderImage")
+@RequiresAuthentication
 public class OrderImageController {
 
 
@@ -69,7 +70,6 @@ public class OrderImageController {
     /**
      * <p>获取全部记录。</p>
      */
-    @RequiresAuthentication
     @RequestMapping(value = "/all", method = RequestMethod.GET)
     @ResponseBody
     public Result all(OrderImage record) {

src/main/java/com/izouma/awesomeadmin/web/OrderInvoiceController.java

@@ -22,6 +22,7 @@ import javax.servlet.http.HttpServletResponse;
 */
 @Controller
 @RequestMapping("/orderInvoice")
+@RequiresAuthentication
 public class OrderInvoiceController {
 
     @Autowired

src/main/java/com/izouma/awesomeadmin/web/OrderLogisticsController.java

@@ -22,6 +22,7 @@ import javax.servlet.http.HttpServletResponse;
 */
 @Controller
 @RequestMapping("/orderLogistics")
+@RequiresAuthentication
 public class OrderLogisticsController {
 
     @Autowired

src/main/java/com/izouma/awesomeadmin/web/OrderMessageController.java

@@ -22,6 +22,7 @@ import javax.servlet.http.HttpServletResponse;
 */
 @Controller
 @RequestMapping("/orderMessage")
+@RequiresAuthentication
 public class OrderMessageController {
 
     @Autowired

src/main/java/com/izouma/awesomeadmin/web/OrderRepairController.java

@@ -22,6 +22,7 @@ import javax.servlet.http.HttpServletResponse;
 */
 @Controller
 @RequestMapping("/orderRepair")
+@RequiresAuthentication
 public class OrderRepairController {
 
     @Autowired

src/main/java/com/izouma/awesomeadmin/web/OrderRepairDetailController.java

@@ -22,6 +22,7 @@ import javax.servlet.http.HttpServletResponse;
  */
 @Controller
 @RequestMapping("/orderRepairDetail")
+@RequiresAuthentication
 public class OrderRepairDetailController {
 
     @Autowired

src/main/java/com/izouma/awesomeadmin/web/PersonalAuthenticationController.java

@@ -22,6 +22,7 @@ import javax.servlet.http.HttpServletResponse;
  */
 @Controller
 @RequestMapping("/personalAuthentication")
+@RequiresAuthentication
 public class PersonalAuthenticationController {
 
     @Autowired

src/main/java/com/izouma/awesomeadmin/web/ProductCollectionController.java

@@ -22,6 +22,7 @@ import javax.servlet.http.HttpServletResponse;
 */
 @Controller
 @RequestMapping("/productCollection")
+@RequiresAuthentication
 public class ProductCollectionController {
 
     @Autowired

src/main/java/com/izouma/awesomeadmin/web/ProductCommentController.java

@@ -25,6 +25,7 @@ import java.util.Map;
  */
 @Controller
 @RequestMapping("/productComment")
+@RequiresAuthentication
 public class ProductCommentController {
 
     @Autowired

src/main/java/com/izouma/awesomeadmin/web/ProductCommentImageController.java

@@ -22,6 +22,7 @@ import javax.servlet.http.HttpServletResponse;
 */
 @Controller
 @RequestMapping("/productCommentImage")
+@RequiresAuthentication
 public class ProductCommentImageController {
 
     @Autowired

src/main/java/com/izouma/awesomeadmin/web/ProductImageController.java

@@ -22,6 +22,7 @@ import javax.servlet.http.HttpServletResponse;
 */
 @Controller
 @RequestMapping("/productImage")
+@RequiresAuthentication
 public class ProductImageController {
 
     @Autowired

src/main/java/com/izouma/awesomeadmin/web/ProductPriceController.java

@@ -22,6 +22,7 @@ import javax.servlet.http.HttpServletResponse;
 */
 @Controller
 @RequestMapping("/productPrice")
+@RequiresAuthentication
 public class ProductPriceController {
 
     @Autowired

src/main/java/com/izouma/awesomeadmin/web/QuickLinksController.java

@@ -22,6 +22,7 @@ import javax.servlet.http.HttpServletResponse;
 */
 @Controller
 @RequestMapping("/quickLinks")
+@RequiresAuthentication
 public class QuickLinksController {
 
     @Autowired

src/main/java/com/izouma/awesomeadmin/web/ServiceTypeDetailController.java

@@ -22,6 +22,7 @@ import javax.servlet.http.HttpServletResponse;
 */
 @Controller
 @RequestMapping("/serviceTypeDetail")
+@RequiresAuthentication
 public class ServiceTypeDetailController {
 
     @Autowired

src/main/java/com/izouma/awesomeadmin/web/ShopAgreementController.java

@@ -22,6 +22,7 @@ import javax.servlet.http.HttpServletResponse;
 */
 @Controller
 @RequestMapping("/shopAgreement")
+@RequiresAuthentication
 public class ShopAgreementController {
 
     @Autowired

src/main/java/com/izouma/awesomeadmin/web/StoreCollectionController.java

@@ -22,6 +22,7 @@ import javax.servlet.http.HttpServletResponse;
 */
 @Controller
 @RequestMapping("/storeCollection")
+@RequiresAuthentication
 public class StoreCollectionController {
 
     @Autowired

src/main/java/com/izouma/awesomeadmin/web/StoreLabelController.java

@@ -22,6 +22,7 @@ import javax.servlet.http.HttpServletResponse;
 */
 @Controller
 @RequestMapping("/storeLabel")
+@RequiresAuthentication
 public class StoreLabelController {
 
     @Autowired

src/main/java/com/izouma/awesomeadmin/web/UserAddressController.java

@@ -22,6 +22,7 @@ import javax.servlet.http.HttpServletResponse;
  */
 @Controller
 @RequestMapping("/userAddress")
+@RequiresAuthentication
 public class UserAddressController {
 
     @Autowired

src/main/java/com/izouma/awesomeadmin/web/UserAgreementController.java

@@ -22,6 +22,7 @@ import javax.servlet.http.HttpServletResponse;
 */
 @Controller
 @RequestMapping("/userAgreement")
+@RequiresAuthentication
 public class UserAgreementController {
 
     @Autowired

src/main/java/com/izouma/awesomeadmin/web/UserCouponController.java

@@ -22,6 +22,7 @@ import javax.servlet.http.HttpServletResponse;
 */
 @Controller
 @RequestMapping("/userCoupon")
+@RequiresAuthentication
 public class UserCouponController {
 
     @Autowired

src/main/java/com/izouma/awesomeadmin/web/UserOrderController.java

@@ -26,6 +26,7 @@ import java.util.Map;
 /**
  * controller类
  */
+@RequiresAuthentication
 @Controller
 @RequestMapping("/userOrder")
 public class UserOrderController {
@@ -36,7 +37,6 @@ public class UserOrderController {
     /**
      * <p>获取全部记录。</p>
      */
-    @RequiresAuthentication
     @RequestMapping(value = "/all", method = RequestMethod.GET)
     @ResponseBody
     public Result all(UserOrder record) {

src/main/java/com/izouma/awesomeadmin/web/UsersSessionController.java

@@ -5,6 +5,7 @@ import com.izouma.awesomeadmin.dto.Page;
 import com.izouma.awesomeadmin.dto.Result;
 import com.izouma.awesomeadmin.model.UsersSession;
 import com.izouma.awesomeadmin.service.UsersSessionService;
+import org.apache.shiro.authz.annotation.RequiresAuthentication;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.RequestMapping;