diff --git a/pom.xml b/pom.xml index 95c1fa8e..625de7ed 100644 --- a/pom.xml +++ b/pom.xml @@ -115,10 +115,10 @@ aspectjweaver 1.9.5 + com.alibaba fastjson - 1.2.6 org.springframework.boot @@ -201,11 +201,13 @@ - - org.springframework.mobile - spring-mobile-starter - 2.0.0.M2 - + + + org.springframework.mobile + spring-mobile-device + 1.1.5.RELEASE + + org.dom4j diff --git a/src/main/java/com/dreamchaser/depository_manage/DepositoryManageApplication.java b/src/main/java/com/dreamchaser/depository_manage/DepositoryManageApplication.java index 6f8d3823..bfa1cebb 100644 --- a/src/main/java/com/dreamchaser/depository_manage/DepositoryManageApplication.java +++ b/src/main/java/com/dreamchaser/depository_manage/DepositoryManageApplication.java @@ -6,7 +6,7 @@ import org.springframework.boot.builder.SpringApplicationBuilder; import org.springframework.boot.web.servlet.support.SpringBootServletInitializer; @SpringBootApplication -public class DepositoryManageApplication extends SpringBootServletInitializer { +public class DepositoryManageApplication extends SpringBootServletInitializer { public static void main(String[] args) { SpringApplication.run(DepositoryManageApplication.class, args); diff --git a/src/main/java/com/dreamchaser/depository_manage/intercepter/UserInterceptor.java b/src/main/java/com/dreamchaser/depository_manage/intercepter/UserInterceptor.java index 82d8f40b..14c45f74 100644 --- a/src/main/java/com/dreamchaser/depository_manage/intercepter/UserInterceptor.java +++ b/src/main/java/com/dreamchaser/depository_manage/intercepter/UserInterceptor.java @@ -44,6 +44,7 @@ public class UserInterceptor extends HandlerInterceptorAdapter { @Autowired public void setRedisTemplate(RedisTemplate redisTemplate){UserInterceptor.redisTemplate = redisTemplate;} + //请求之前 @Override public boolean preHandle(HttpServletRequest request, HttpServletResponse response, Object handler) throws MyException { diff --git a/src/main/java/com/dreamchaser/depository_manage/service/impl/DepositoryRecordServiceImpl.java b/src/main/java/com/dreamchaser/depository_manage/service/impl/DepositoryRecordServiceImpl.java index 71bba1d0..95aa5719 100644 --- a/src/main/java/com/dreamchaser/depository_manage/service/impl/DepositoryRecordServiceImpl.java +++ b/src/main/java/com/dreamchaser/depository_manage/service/impl/DepositoryRecordServiceImpl.java @@ -2313,7 +2313,7 @@ public class DepositoryRecordServiceImpl implements DepositoryRecordService { minRecordManage.append(integer).append(","); String workwechat = manager.getWorkwechat(); if (workwechat == null || "".equals(workwechat)) { - workwechat = userByPort.getWechat(); + workwechat = manager.getWechat(); } // QyWxUid.append(workwechat+","); } @@ -2369,7 +2369,7 @@ public class DepositoryRecordServiceImpl implements DepositoryRecordService { minRecordManage.append(integer).append(","); String workwechat = manager.getWorkwechat(); if (workwechat == null || "".equals(workwechat)) { - workwechat = userByPort.getWechat(); + workwechat = manager.getWechat(); } // QyWxUid.append(workwechat+","); }