Forráskód Böngészése

项目内容改进原有MQ实现方式,目前改用Spring事件+异步实现。

xian 5 éve
szülő
commit
9ce9a66d18
17 módosított fájl, 18 hozzáadás és 12 törlés
  1. 1 0
      watero-wechat-web/src/main/java/com/iamberry/wechat/handles/admin/AdminAdministratorHandler.java
  2. 1 0
      watero-wechat-web/src/main/java/com/iamberry/wechat/handles/admin/AdminMemberHandler.java
  3. 1 1
      watero-wechat-web/src/main/java/com/iamberry/wechat/handles/admin/AdminProbationOrderHandler.java
  4. 1 0
      watero-wechat-web/src/main/java/com/iamberry/wechat/handles/admin/AdminWithdrawHandler.java
  5. 2 5
      watero-wechat-web/src/main/java/com/iamberry/wechat/handles/admin/LoginController.java
  6. 1 0
      watero-wechat-web/src/main/java/com/iamberry/wechat/handles/admin/SystemHandler.java
  7. 1 0
      watero-wechat-web/src/main/java/com/iamberry/wechat/handles/agent/AgentHandler.java
  8. 1 1
      watero-wechat-web/src/main/java/com/iamberry/wechat/handles/coupon/AdminCouponItemHandler.java
  9. 1 1
      watero-wechat-web/src/main/java/com/iamberry/wechat/handles/coupon/AdminCouponTypeHandler.java
  10. 1 0
      watero-wechat-web/src/main/java/com/iamberry/wechat/handles/member/CashLogHandler.java
  11. 1 0
      watero-wechat-web/src/main/java/com/iamberry/wechat/handles/news/AdminNewsHandler.java
  12. 1 1
      watero-wechat-web/src/main/java/com/iamberry/wechat/handles/official/AdminProspectusHandler.java
  13. 1 0
      watero-wechat-web/src/main/java/com/iamberry/wechat/handles/porduct/ProductColorHandler.java
  14. 1 0
      watero-wechat-web/src/main/java/com/iamberry/wechat/handles/porduct/ProductHandler.java
  15. 1 1
      watero-wechat-web/src/main/java/com/iamberry/wechat/handles/porduct/ProductTypeHandler.java
  16. 1 0
      watero-wechat-web/src/main/java/com/iamberry/wechat/handles/task/AdminTaskHandler.java
  17. 1 2
      watero-wechat-web/src/main/webapp/WEB-INF/views/login.ftl

+ 1 - 0
watero-wechat-web/src/main/java/com/iamberry/wechat/handles/admin/AdminAdministratorHandler.java

@@ -28,6 +28,7 @@ import com.iamberry.wechat.face.admin.AdminPermissionsService;
 
 
 @Controller
+@Deprecated
 public class AdminAdministratorHandler {
 	@Autowired
 	private AdminAdministratorService adminadministratorservice;

+ 1 - 0
watero-wechat-web/src/main/java/com/iamberry/wechat/handles/admin/AdminMemberHandler.java

@@ -38,6 +38,7 @@ import com.iamberry.wechat.tools.ResultInfo;
  * @author: 张应真
  * @createDate: 2016年4月29日
  */
+@Deprecated
 @Controller
 @RequestMapping("/admin/member")
 public class AdminMemberHandler {

+ 1 - 1
watero-wechat-web/src/main/java/com/iamberry/wechat/handles/admin/AdminProbationOrderHandler.java

@@ -28,7 +28,7 @@ import com.iamberry.wechat.face.order.AdminProbationOrderService;
 import com.iamberry.wechat.tools.DateTimeUtil;
 import com.iamberry.wechat.tools.ResultInfo;
 import com.iamberry.wechat.sendMsg.SendMessageUtil;
-
+@Deprecated
 @Controller
 @RequestMapping("/admin/probationOrder")
 public class AdminProbationOrderHandler {

+ 1 - 0
watero-wechat-web/src/main/java/com/iamberry/wechat/handles/admin/AdminWithdrawHandler.java

@@ -25,6 +25,7 @@ import com.iamberry.wechat.face.member.WithdrawService;
  * Create Date:2016年4月21日
  * Update Date:2016年4月21日
  */
+@Deprecated
 @RequestMapping("/admin/withdraw")
 @Controller
 public class AdminWithdrawHandler {

+ 2 - 5
watero-wechat-web/src/main/java/com/iamberry/wechat/handles/admin/LoginController.java

@@ -1,7 +1,6 @@
 package com.iamberry.wechat.handles.admin;
 
 import com.iamberry.sys.Admin;
-import com.iamberry.wechat.core.entity.mq.MQMessage;
 import com.iamberry.wechat.face.mq.MQSerivce;
 import com.iamberry.wechat.face.sys.SysService;
 import com.iamberry.wechat.realm.IamberryRealm;
@@ -47,9 +46,6 @@ public class LoginController {
     @Autowired
     private IamberryRealm iamberryRealm;
 
-    @Autowired
-    private MQSerivce mQSerivce;
-
     @RequestMapping("/_login")
     public ModelAndView loginUI(HttpServletRequest request) {
         // 判断用户是否登录,如果已经登录,则跳转
@@ -86,7 +82,8 @@ public class LoginController {
 
     @ResponseBody
     @RequestMapping("/loginShiro")
-    public ResponseJson loginShiro(HttpServletRequest request, HttpServletResponse response,
+    public ResponseJson loginShiro(HttpServletRequest request,
+                                   HttpServletResponse response,
                               @RequestParam("login_name") String loginName,
                               @RequestParam("login_pwd") String loginPwd,
                               @RequestParam("login_code") String loginCode,

+ 1 - 0
watero-wechat-web/src/main/java/com/iamberry/wechat/handles/admin/SystemHandler.java

@@ -32,6 +32,7 @@ import com.iamberry.zk.ZookeeperQueue;
  * Create Date:2016年4月25日
  * Update Date:2016年4月25日
  */
+@Deprecated
 @Controller
 @RequestMapping("/admin/system")
 public class SystemHandler {

+ 1 - 0
watero-wechat-web/src/main/java/com/iamberry/wechat/handles/agent/AgentHandler.java

@@ -43,6 +43,7 @@ import com.iamberry.wechat.tools.ResultInfo;
  * @author 穆再兴
  *	2016年4月19日
  */
+@Deprecated
 @Controller
 @RequestMapping("/wechat/agent")
 public class AgentHandler {

+ 1 - 1
watero-wechat-web/src/main/java/com/iamberry/wechat/handles/coupon/AdminCouponItemHandler.java

@@ -16,7 +16,7 @@ import org.springframework.web.servlet.ModelAndView;
 import com.iamberry.wechat.core.entity.banner.MessageDTO;
 import com.iamberry.wechat.core.entity.coupon.AdminCouponItemDto;
 import com.iamberry.wechat.face.coupon.AdminCouponItemService;
-
+@Deprecated
 @Controller
 @RequestMapping("/admin/couponItem")
 public class AdminCouponItemHandler {

+ 1 - 1
watero-wechat-web/src/main/java/com/iamberry/wechat/handles/coupon/AdminCouponTypeHandler.java

@@ -24,7 +24,7 @@ import com.iamberry.wechat.face.coupon.CouponItemService;
 import com.iamberry.wechat.face.coupon.CouponTypeService;
 import com.iamberry.wechat.tools.DateTimeUtil;
 import com.iamberry.wechat.tools.NameUtils;
-
+@Deprecated
 @Controller
 @RequestMapping("/admin/couponType")
 public class AdminCouponTypeHandler {

+ 1 - 0
watero-wechat-web/src/main/java/com/iamberry/wechat/handles/member/CashLogHandler.java

@@ -27,6 +27,7 @@ import com.iamberry.wechat.tools.ResultInfo;
  * @author 穆再兴
  *
  */
+@Deprecated
 @Controller
 @RequestMapping("/wechat/cashLog")
 public class CashLogHandler {

+ 1 - 0
watero-wechat-web/src/main/java/com/iamberry/wechat/handles/news/AdminNewsHandler.java

@@ -33,6 +33,7 @@ import com.iamberry.wechat.utils.StaticCacheMemory;
  * @description : 新闻内容的后台、前台
  * @createDate : 2016年6月13日
  */
+@Deprecated
 @Controller
 public class AdminNewsHandler {
 

+ 1 - 1
watero-wechat-web/src/main/java/com/iamberry/wechat/handles/official/AdminProspectusHandler.java

@@ -10,7 +10,7 @@ import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.servlet.ModelAndView;
 
 import java.util.List;
-
+@Deprecated
 @Controller
 @RequestMapping("/admin/official")
 public class AdminProspectusHandler {

+ 1 - 0
watero-wechat-web/src/main/java/com/iamberry/wechat/handles/porduct/ProductColorHandler.java

@@ -22,6 +22,7 @@ import com.iamberry.wechat.face.porduct.ProductService;
  * 2017年2月5日
  * @author muzx
  */
+@Deprecated
 @Controller
 @RequestMapping("/admin/product_color")
 public class ProductColorHandler {

+ 1 - 0
watero-wechat-web/src/main/java/com/iamberry/wechat/handles/porduct/ProductHandler.java

@@ -35,6 +35,7 @@ import com.iamberry.wechat.face.porduct.ProductTypeService;
  * 	@author: iamberry~
  *	@createDate: 2016年4月20日
  */
+@Deprecated
 @Controller
 @RequestMapping("/admin/product")
 public class ProductHandler {

+ 1 - 1
watero-wechat-web/src/main/java/com/iamberry/wechat/handles/porduct/ProductTypeHandler.java

@@ -17,7 +17,7 @@ import org.springframework.web.servlet.ModelAndView;
 import com.iamberry.wechat.core.entity.banner.MessageDTO;
 import com.iamberry.wechat.core.entity.product.ProductType;
 import com.iamberry.wechat.face.porduct.ProductTypeService;
-
+@Deprecated
 @Controller
 @RequestMapping("/admin/productType")
 public class ProductTypeHandler {

+ 1 - 0
watero-wechat-web/src/main/java/com/iamberry/wechat/handles/task/AdminTaskHandler.java

@@ -27,6 +27,7 @@ import com.iamberry.wechat.face.task.WechatTaskService;
  * @date	2016年9月20日
  * @explain	微信任务管理的handler
  */
+@Deprecated
 @RequestMapping("/admin/task")
 @Controller
 public class AdminTaskHandler {

+ 1 - 2
watero-wechat-web/src/main/webapp/WEB-INF/views/login.ftl

@@ -24,9 +24,8 @@
         /*用于判断是否有父级页面,如果有就强制跳转*/
         function myfun(){
             var ifmObj = window.parent.PARENT_IS_LOGIN;
-            console.log(window.parent);
             if(ifmObj != null && ifmObj !== "" && typeof(ifmObj) !=="undefined" && ifmObj !== undefined && ifmObj === 1){
-                parent.location.href = "${path}/";
+                parent.location.href = "${path}";
             }
         }
         window.onload = myfun();