Enford 5 роки тому
батько
коміт
12653c1e66

+ 1 - 1
src/main/java/com/jeeplus/modules/sys/security/UsernamePasswordToken.java

@@ -15,7 +15,7 @@ public class UsernamePasswordToken extends org.apache.shiro.authc.UsernamePasswo
 	private String captcha;
 	private boolean mobileLogin;
 	
-	public UsernamePasswordToken() {
+	public UsernamePasswordToken(String admin, String s) {
 		super();
 	}
 

+ 12 - 0
src/main/java/com/jeeplus/modules/wexinpackage/access/util/access/AccessTokenUtil.java

@@ -24,6 +24,18 @@ public class AccessTokenUtil {
         }
         return access_token;
     }
+    //获取全过程action
+    public static String getAccessTokenTotal(String corpId,String corpSecret){
+        String access_token = "";
+//        boolean flag = JedisUtils.exists("access_token");
+        access_token = JedisUtils.get("access_token_total");
+        if (null==access_token){
+            AccessToken accessTokenUtil = getAccessTokenUtil(corpId, corpSecret);
+            JedisUtils.set("access_token_total",accessTokenUtil.getToken(),accessTokenUtil.getExpiresIn()- 1000);
+            access_token = accessTokenUtil.getToken();
+        }
+        return access_token;
+    }
 
     /**
          //     * 3.获取access_token

+ 16 - 0
src/main/java/com/jeeplus/modules/wexinpackage/access/web/MessageController.java

@@ -19,6 +19,7 @@ import org.springframework.ui.Model;
 import org.springframework.web.bind.annotation.RequestMapping;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
+import java.io.BufferedReader;
 import java.util.List;
 
 @Controller
@@ -39,6 +40,21 @@ public class MessageController extends BaseController {
     //主页展示
     @RequestMapping(value = "messageList")
     public String messageList(HttpServletRequest request, HttpServletResponse response) {
+        try {
+            BufferedReader reader = request.getReader();
+            char[] buf = new char[512];
+            int len = 0;
+            StringBuffer stringBuffer = new StringBuffer();
+            while ((len = (int) reader.read(buf))!= -1){
+                stringBuffer =  stringBuffer.append(buf, 0, len);
+            }
+            String content = stringBuffer.toString();
+            if (content == null){
+                content = "";
+            }
+        }catch (Exception e){
+            e.printStackTrace();
+        }
         return "modules/weixin/home";
     }
     //详细信息

+ 0 - 35
src/main/java/com/jeeplus/modules/wexintheorder/web/SimpleOAuth2Controller.java

@@ -40,39 +40,4 @@ public class SimpleOAuth2Controller {
                 + "&response_type=code&scope=snsapi_base&state=STATE#wechat_redirect";
         return "redirect:" + oauth2Url;
     }
-//    /**
-//
-//     * 授权回调请求处理
-//
-//     * @return
-//
-//     */
-//
-//    @RequestMapping(value = { "/oauth2me.do" })
-//    public String oAuth2Url(HttpServletRequest request, @RequestParam String code){
-//
-//        // 调用获取access_token的接口
-//
-//        AccessToken accessToken = WeiXinQiYeUtil.access_token();
-//        HttpSession session = request.getSession();
-//        if (accessToken != null && accessToken.getAccess_token() != null) {
-//
-//            // 调用获取用户信息的接口
-//
-//            String UserId = getMemberGuidByCode(accessToken.getAccess_token(), code, WeiXinQiYeConstants.AGENTID);
-//
-//            logger.info("UserId: " + UserId);
-//
-//            if (UserId != null) {
-//
-//                session.setAttribute("UserId", UserId);
-//
-//                logger.info("UserId放入session成功!");
-//
-//            }
-//
-//        }
-//        // 这里简单处理,存储到session中
-//        return "user/result";
-//    }
 }

+ 4 - 5
src/main/java/com/jeeplus/modules/wexintheorder/web/TheOrderController.java

@@ -53,10 +53,9 @@ public class TheOrderController extends BaseController {
         theLeadership.setCorrelationId(userId);
         List<TheLeadership> listUserId = theLeadershipService.findListUserId(theLeadership);
         if (listUserId.size()>0){
-            theLeadership.setTeam(listUserId.get(0).getTeam());
-            theOrder.setDepartment("2");//全显示
-            theLeadership.setSpecific(listUserId.get(0).getSpecific());
-            theLeadership.setDepartment(listUserId.get(0).getDepartment());
+            theOrder.setTeam(listUserId.get(0).getTeam());
+            theOrder.setSpecific(listUserId.get(0).getSpecific());
+            theOrder.setDepartment(listUserId.get(0).getDepartment());
             theOrder.setStatus("0"); //是回显
         }else {
             theLeadership.setTeam("");
@@ -70,7 +69,7 @@ public class TheOrderController extends BaseController {
     //获取--预定餐
     @ResponseBody
     @RequestMapping(value = "noSureTem")
-    public AjaxJson getReservation(TheOrder theOrder){
+    public AjaxJson getReservation(TheOrder theOrder) throws Exception{
         DateFormat dateFormat1 = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
         DateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd");
         Date date = new Date();//当前时间

+ 1 - 1
src/main/java/com/jeeplus/modules/wexintheorder/web/TheOrderWebController.java

@@ -86,7 +86,7 @@ public class TheOrderWebController extends BaseController {
                 leadership.setEndDate(theOrder.getEndDate());
                 leadership.setOrderStatus(theOrder.getOrderStatus());
                 List<TheOrder> theOrderListByLeadership = theOrderWebService.getTheOrderListByLeadership(leadership);
-                theOrderLeadership.setLeadership(leadership.getLeadership());
+//                theOrderLeadership.setLeadership(leadership.getLeadership());
                 theOrderLeadership.setTheOrderList(theOrderListByLeadership);
                 theOrderList.add(theOrderLeadership);
             }