1.修改websock无法连接问题

2. 调整目录结构

pom.xml

@@ -3,8 +3,8 @@
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
 
-    <groupId>com.pinan</groupId>
-    <artifactId>pinan-service</artifactId>
+    <groupId>com.care</groupId>
+    <artifactId>care-server</artifactId>
 
     <version>1.0-RELEASE</version>
     <name>care</name>

src/main/java/com/care/CareSpringStart.java

@@ -4,6 +4,9 @@ import org.mybatis.spring.annotation.MapperScan;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration;
+import org.springframework.boot.web.embedded.tomcat.TomcatConnectorCustomizer;
+import org.springframework.boot.web.embedded.tomcat.TomcatServletWebServerFactory;
+import org.springframework.boot.web.servlet.server.ConfigurableServletWebServerFactory;
 import org.springframework.context.annotation.Bean;
 import org.springframework.scheduling.annotation.EnableScheduling;
 import org.springframework.web.client.RestTemplate;
@@ -26,5 +29,11 @@ public class CareSpringStart {
         return new RestTemplate();
     }
 
+    @Bean
+    public ConfigurableServletWebServerFactory webServerFactory() {
+        TomcatServletWebServerFactory factory = new TomcatServletWebServerFactory();
+        factory.addConnectorCustomizers((TomcatConnectorCustomizer) connector -> connector.setProperty("relaxedQueryChars", "|{}[]"));
+        return factory;
+    }
 }
 

src/main/java/com/care/bigscreen/controller/BigScreenController.java

@@ -5,9 +5,9 @@ import com.care.bigscreen.service.BigScreenService;
 import com.care.bigscreen.vo.*;
 
 import com.care.common.vo.PageResVO;
-import com.care.util.PageResult;
-import com.care.util.PageUtil;
-import com.care.util.Result;
+import com.care.common.util.PageResult;
+import com.care.common.util.PageUtil;
+import com.care.common.util.Result;
 import io.swagger.annotations.ApiImplicitParam;
 import io.swagger.annotations.ApiImplicitParams;
 import io.swagger.annotations.ApiOperation;

src/main/java/com/care/bigscreen/controller/CommonController.java

@@ -1,10 +1,11 @@
 package com.care.bigscreen.controller;
 
+import com.care.bigscreen.service.BigScreenService;
 import com.care.common.annotation.Permission;
 import com.care.common.vo.UserLogindConvertVO;
-import com.care.service.CommonService;
-import com.care.util.Result;
-import com.care.util.WebPageUtils;
+import com.care.common.service.CommonService;
+import com.care.common.util.Result;
+import com.care.common.util.WebPageUtils;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
@@ -25,6 +26,8 @@ public class CommonController {
 
     @Autowired
     CommonService commonService;
+    @Autowired
+    BigScreenService bigScreenService;
     /**
      * 字典：字段查重（字典选项代码）
      * 作用：添加或修改时对必须唯一的字段进行查重
@@ -42,6 +45,16 @@ public class CommonController {
             return Result.error("系统错误，查询失败");
         }
     }
+    @GetMapping("/pushEvent")
+    public Result<Object> pushEvent(@RequestParam("stationId") Long stationId) {
+        try {
+            bigScreenService.pushRtEventFlag(String.valueOf(stationId));
+            return Result.success("成功");
+        } catch (Exception e) {
+            log.error("convertedCodeName: ",e);
+            return Result.error("系统错误，推送失败");
+        }
+    }
 
 
 }

src/main/java/com/care/bigscreen/mapper/BigSreenMapper.java

@@ -3,8 +3,7 @@ package com.care.bigscreen.mapper;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.care.bigscreen.entity.StStation;
 import com.care.bigscreen.vo.*;
-import com.care.demo.entity.RimsDictionaries;
-import com.care.util.PageUtil;
+import com.care.common.util.PageUtil;
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;

src/main/java/com/care/bigscreen/service/BigScreenService.java

@@ -2,7 +2,7 @@ package com.care.bigscreen.service;
 
 import com.care.bigscreen.vo.*;
 import com.care.common.vo.PageResVO;
-import com.care.util.PageUtil;
+import com.care.common.util.PageUtil;
 
 import java.util.List;
 

src/main/java/com/care/bigscreen/service/impl/BigScreenServiceImpl.java

@@ -6,7 +6,7 @@ import com.care.bigscreen.service.BigScreenService;
 import com.care.bigscreen.vo.*;
 import com.care.bigscreen.websocket.BigScreenWebSocketEndpoint;
 import com.care.common.vo.PageResVO;
-import com.care.util.PageUtil;
+import com.care.common.util.PageUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 

src/main/java/com/care/bigscreen/websocket/BigScreenWebSocketEndpoint.java

@@ -3,10 +3,10 @@ package com.care.bigscreen.websocket;
 
 import cn.hutool.json.JSONUtil;
 import com.care.common.vo.UserLogindConvertVO;
-import com.care.util.ExUtil;
-import com.care.util.JsonUtil;
-import com.care.util.JwtUtils;
-import com.care.util.Result;
+import com.care.common.util.ExUtil;
+import com.care.common.util.JsonUtil;
+import com.care.common.util.JwtUtils;
+import com.care.common.util.Result;
 import io.jsonwebtoken.Claims;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -17,6 +17,8 @@ import org.springframework.util.StringUtils;
 import javax.websocket.*;
 import javax.websocket.server.ServerEndpoint;
 import java.io.IOException;
+import java.net.URLDecoder;
+import java.net.URLEncoder;
 import java.util.concurrent.CopyOnWriteArraySet;
 
 /**
@@ -30,8 +32,6 @@ import java.util.concurrent.CopyOnWriteArraySet;
 public class BigScreenWebSocketEndpoint {
     private static final Logger logger = LoggerFactory.getLogger(BigScreenWebSocketEndpoint.class);
 
-    @Autowired
-    JwtUtils jwtUtils;
 
     //用来存放每个客户端对应的BigScreenWebSocketEndpoint对象
     private static CopyOnWriteArraySet<BigScreenWebSocketEndpoint> currentWebSocketSession = new CopyOnWriteArraySet<>();
@@ -78,8 +78,7 @@ public class BigScreenWebSocketEndpoint {
                 closeSession(session, "-1", "连接失败,token或stationId为空");
                 return;
             }
-
-            Claims claims = jwtUtils.tokenParse(ts);
+            Claims claims = JwtUtils.tokenParse(ts);
             if (claims != null) {
                 UserLogindConvertVO vo = JSONUtil.toBean(claims.getSubject(), UserLogindConvertVO.class);
                 if (vo != null) {

src/main/java/com/care/app/bms/controller/LoginController.java

@@ -1,21 +1,18 @@
-package com.care.app.bms.controller;
+package com.care.bms.controller;
 
-import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.json.JSONUtil;
-import com.care.app.bms.params.UserLoginParams;
+import com.care.bms.params.UserLoginParams;
 import com.care.common.constant.Constants;
-import com.care.common.entity.CareSysUser;
 import com.care.common.exception.BDException;
 import com.care.common.vo.UserLogindConvertVO;
-import com.care.service.CareSysUserService;
-import com.care.util.JwtUtils;
-import com.care.util.Result;
-import com.care.util.ResultCode;
+import com.care.common.service.CareSysUserService;
+import com.care.common.util.JwtUtils;
+import com.care.common.util.Result;
+import com.care.common.util.ResultCode;
 import io.jsonwebtoken.Claims;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;
-import org.apache.commons.codec.digest.DigestUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.MediaType;
 import org.springframework.web.bind.annotation.*;
@@ -37,9 +34,6 @@ public class LoginController {
     @Autowired
     CareSysUserService careSysUserService;
 
-    @Autowired
-    JwtUtils jwtUtils;
-
     @PostMapping(value = "/login", produces = MediaType.APPLICATION_JSON_VALUE)
     @ApiOperation(value = "登陆", notes = "登陆")
     public Result<Object> login(HttpServletRequest request, @RequestBody UserLoginParams userLoginParams) {
@@ -51,7 +45,7 @@ public class LoginController {
             }
 
             Map<String,Object> dataMap = new HashMap<>(2);
-            dataMap.put("token",jwtUtils.generalToken(loginUser));
+            dataMap.put("token",JwtUtils.generalToken(loginUser));
             dataMap.put("user",loginUser);
             return Result.success("登陆成功",dataMap);
 
@@ -67,7 +61,7 @@ public class LoginController {
     public Result<Object> tokenParse(HttpServletRequest request) {
 
         String commonJwt = request.getHeader(Constants.LOGIN_TOKEN_KEY);
-        Claims claims = jwtUtils.tokenParse(commonJwt);
+        Claims claims = JwtUtils.tokenParse(commonJwt);
         if (claims != null) {
             UserLogindConvertVO vo = JSONUtil.toBean(claims.getSubject(), UserLogindConvertVO.class);
             if (vo != null) {

src/main/java/com/care/app/bms/params/UserLoginParams.java

@@ -1,4 +1,4 @@
-package com.care.app.bms.params;
+package com.care.bms.params;
 
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Getter;

src/main/java/com/care/config/CorsConfig.java

@@ -1,4 +1,4 @@
-package com.care.config;
+package com.care.common.config;
 
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;

src/main/java/com/care/config/DataSourceConfig.java

@@ -1,4 +1,4 @@
-package com.care.config;
+package com.care.common.config;
 
 import com.zaxxer.hikari.HikariDataSource;
 import org.springframework.beans.factory.annotation.Value;

src/main/java/com/care/config/MyBatisPlusConfig.java

@@ -1,4 +1,4 @@
-package com.care.config;
+package com.care.common.config;
 
 import com.baomidou.mybatisplus.annotation.DbType;
 import com.baomidou.mybatisplus.extension.plugins.MybatisPlusInterceptor;

src/main/java/com/care/config/SpringApplicationUtils.java

@@ -1,4 +1,4 @@
-package com.care.config;
+package com.care.common.config;
 
 import org.springframework.context.ApplicationContext;
 import org.springframework.context.ApplicationContextAware;

src/main/java/com/care/config/SwaggerConfig.java

@@ -1,10 +1,9 @@
-package com.care.config;
+package com.care.common.config;
 
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.core.env.Environment;
-import org.springframework.core.env.Profiles;
 import springfox.documentation.builders.RequestHandlerSelectors;
 import springfox.documentation.service.ApiInfo;
 import springfox.documentation.service.Contact;

src/main/java/com/care/common/config/WebSocketConfig.java

@@ -0,0 +1,30 @@
+package com.care.common.config;
+
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.web.socket.server.standard.ServerEndpointExporter;
+
+/**
+ * @Author: lilt
+ * @Date: 2021/5/25
+ * @Desc:
+ */
+@Configuration
+public class WebSocketConfig {
+    /**
+     * 给spring容器注入这个ServerEndpointExporter对象
+     * 相当于xml：
+     * <beans>
+     * <bean id="serverEndpointExporter" class="org.springframework.web.socket.server.standard.ServerEndpointExporter"/>
+     * </beans>
+     * <p>
+     * 检测所有带有@serverEndpoint注解的bean并注册他们。
+     *
+     * @return
+     */
+    @Bean
+    public ServerEndpointExporter serverEndpointExporter() {
+        System.out.println("我被注入了");
+        return new ServerEndpointExporter();
+    }
+}

src/main/java/com/care/interceptor/AuthorizationInterceptor.java

@@ -1,10 +1,10 @@
-package com.care.interceptor;
+package com.care.common.interceptor;
 
 import cn.hutool.core.util.StrUtil;
 import cn.hutool.json.JSONUtil;
 import com.care.common.constant.Constants;
 import com.care.common.vo.UserLogindConvertVO;
-import com.care.util.JwtUtils;
+import com.care.common.util.JwtUtils;
 import io.jsonwebtoken.Claims;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
@@ -22,8 +22,6 @@ import javax.servlet.http.HttpServletResponse;
 @Component
 public class AuthorizationInterceptor extends HandlerInterceptorAdapter {
 
-    @Autowired
-    JwtUtils jwtUtils;
 
     /**
      * 解析请求
@@ -65,7 +63,7 @@ public class AuthorizationInterceptor extends HandlerInterceptorAdapter {
                 return null;
             }
         }
-        Claims claims = jwtUtils.tokenParse(commonJwt);
+        Claims claims = JwtUtils.tokenParse(commonJwt);
         if(claims != null){
             return claims;
         }

src/main/java/com/care/interceptor/AuthorizationInterceptorConf.java

@@ -1,4 +1,4 @@
-package com.care.interceptor;
+package com.care.common.interceptor;
 
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.annotation.Configuration;
@@ -28,7 +28,7 @@ public class AuthorizationInterceptorConf extends WebMvcConfigurerAdapter implem
             "/swagger-resources",
             "/swagger-ui.html",
             "/static/**",
-
+            "/bms/bigscreen/ws",
             //不拦截登录接口
             "/bms/login",
 

src/main/java/com/care/interceptor/ControllerInterceptor.java

@@ -1,15 +1,14 @@
-package com.care.interceptor;
+package com.care.common.interceptor;
 
 import cn.hutool.core.util.StrUtil;
 import com.care.common.annotation.LogModule;
 import com.care.common.annotation.LoginedUser;
 import com.care.common.annotation.Permission;
 import com.care.common.constant.Constants;
+import com.care.common.util.Result;
+import com.care.common.util.ResultCode;
+import com.care.common.util.WebPageUtils;
 import com.care.common.vo.UserLogindConvertVO;
-import com.care.util.JwtUtils;
-import com.care.util.Result;
-import com.care.util.ResultCode;
-import com.care.util.WebPageUtils;
 import io.swagger.annotations.ApiOperation;
 import org.aspectj.lang.JoinPoint;
 import org.aspectj.lang.ProceedingJoinPoint;
@@ -19,7 +18,6 @@ import org.aspectj.lang.annotation.Pointcut;
 import org.aspectj.lang.reflect.MethodSignature;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.core.annotation.AnnotationUtils;
 import org.springframework.stereotype.Component;
 import org.springframework.web.context.request.RequestContextHolder;
@@ -43,8 +41,6 @@ public class ControllerInterceptor {
 
     private static final Logger logger = LoggerFactory.getLogger(ControllerInterceptor.class);
 
-    @Autowired
-    JwtUtils jwtUtils;
 
 //    @Autowired
 //    SysLogService sysLogService;

src/main/java/com/care/mapper/CareChamberlainOlderRelMapper.java

@@ -1,4 +1,4 @@
-package com.care.mapper;
+package com.care.common.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.care.common.entity.CareChamberlainOlderRel;

src/main/java/com/care/mapper/CareDeviceMapper.java

@@ -1,4 +1,4 @@
-package com.care.mapper;
+package com.care.common.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.care.common.entity.CareDevice;

src/main/java/com/care/mapper/CareEventOrderContactStatusMapper.java

@@ -1,4 +1,4 @@
-package com.care.mapper;
+package com.care.common.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.care.common.entity.CareEventOrderContactStatus;

src/main/java/com/care/mapper/CareEventOrderHandleHisMapper.java

@@ -1,4 +1,4 @@
-package com.care.mapper;
+package com.care.common.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.care.common.entity.CareEventOrderHandleHis;

src/main/java/com/care/mapper/CareEventOrderMapper.java

@@ -1,4 +1,4 @@
-package com.care.mapper;
+package com.care.common.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.care.common.entity.CareEventOrder;

src/main/java/com/care/mapper/CareOlderContactMapper.java

@@ -1,4 +1,4 @@
-package com.care.mapper;
+package com.care.common.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.care.common.entity.CareOlderContact;

src/main/java/com/care/mapper/CareOlderDeviceRelMapper.java

@@ -1,4 +1,4 @@
-package com.care.mapper;
+package com.care.common.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.care.common.entity.CareOlderDeviceRel;

src/main/java/com/care/mapper/CareOlderMapper.java

@@ -1,4 +1,4 @@
-package com.care.mapper;
+package com.care.common.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.care.common.entity.CareOlder;

src/main/java/com/care/mapper/CareOrganizationMapper.java

@@ -1,4 +1,4 @@
-package com.care.mapper;
+package com.care.common.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.care.common.entity.CareOrganization;

src/main/java/com/care/mapper/CareStationMapper.java

@@ -1,4 +1,4 @@
-package com.care.mapper;
+package com.care.common.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.care.common.entity.CareStation;

src/main/java/com/care/mapper/CareSysUserMapper.java

@@ -1,4 +1,4 @@
-package com.care.mapper;
+package com.care.common.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.care.common.entity.CareSysUser;

src/main/java/com/care/mapper/SysDimCodeMapper.java

@@ -1,4 +1,4 @@
-package com.care.mapper;
+package com.care.common.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.care.common.entity.SysDimCode;

src/main/java/com/care/mapper/SysDimTypeMapper.java

@@ -1,4 +1,4 @@
-package com.care.mapper;
+package com.care.common.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.care.common.entity.SysDimType;

src/main/java/com/care/service/CareChamberlainOlderRelService.java

@@ -1,4 +1,4 @@
-package com.care.service;
+package com.care.common.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.care.common.entity.CareChamberlainOlderRel;

src/main/java/com/care/service/CareDeviceService.java

@@ -1,4 +1,4 @@
-package com.care.service;
+package com.care.common.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.care.common.entity.CareDevice;

src/main/java/com/care/service/CareEventOrderContactStatusService.java

@@ -1,4 +1,4 @@
-package com.care.service;
+package com.care.common.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.care.common.entity.CareEventOrderContactStatus;

src/main/java/com/care/service/CareEventOrderHandleHisService.java

@@ -1,4 +1,4 @@
-package com.care.service;
+package com.care.common.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.care.common.entity.CareEventOrderHandleHis;

src/main/java/com/care/service/CareEventOrderService.java

@@ -1,4 +1,4 @@
-package com.care.service;
+package com.care.common.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.care.common.entity.CareEventOrder;

src/main/java/com/care/service/CareOlderContactService.java

@@ -1,4 +1,4 @@
-package com.care.service;
+package com.care.common.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.care.common.entity.CareOlderContact;

src/main/java/com/care/service/CareOlderDeviceRelService.java

@@ -1,4 +1,4 @@
-package com.care.service;
+package com.care.common.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.care.common.entity.CareOlderDeviceRel;

src/main/java/com/care/service/CareOlderService.java

@@ -1,4 +1,4 @@
-package com.care.service;
+package com.care.common.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.care.common.entity.CareOlder;

src/main/java/com/care/service/CareOrganizationService.java

@@ -1,4 +1,4 @@
-package com.care.service;
+package com.care.common.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.care.common.entity.CareOrganization;

src/main/java/com/care/service/CareStationService.java

@@ -1,4 +1,4 @@
-package com.care.service;
+package com.care.common.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.care.common.entity.CareStation;

src/main/java/com/care/service/CareSysUserService.java

@@ -1,4 +1,4 @@
-package com.care.service;
+package com.care.common.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.care.common.entity.CareSysUser;

src/main/java/com/care/service/CommonService.java

@@ -1,4 +1,4 @@
-package com.care.service;
+package com.care.common.service;
 
 import com.care.common.entity.SysDimCode;
 

src/main/java/com/care/service/SysDimCodeService.java

@@ -1,4 +1,4 @@
-package com.care.service;
+package com.care.common.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.care.common.entity.SysDimCode;

src/main/java/com/care/service/SysDimTypeService.java

@@ -1,4 +1,4 @@
-package com.care.service;
+package com.care.common.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.care.common.entity.SysDimType;

src/main/java/com/care/service/impl/CareChamberlainOlderRelServiceImpl.java

@@ -1,9 +1,9 @@
-package com.care.service.impl;
+package com.care.common.service.impl;
 
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.care.common.entity.CareChamberlainOlderRel;
-import com.care.mapper.CareChamberlainOlderRelMapper;
-import com.care.service.CareChamberlainOlderRelService;
+import com.care.common.mapper.CareChamberlainOlderRelMapper;
+import com.care.common.service.CareChamberlainOlderRelService;
 import org.springframework.stereotype.Service;
 
 /**

src/main/java/com/care/service/impl/CareDeviceServiceImpl.java

@@ -1,9 +1,9 @@
-package com.care.service.impl;
+package com.care.common.service.impl;
 
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.care.common.entity.CareDevice;
-import com.care.mapper.CareDeviceMapper;
-import com.care.service.CareDeviceService;
+import com.care.common.mapper.CareDeviceMapper;
+import com.care.common.service.CareDeviceService;
 import org.springframework.stereotype.Service;
 
 /**

src/main/java/com/care/service/impl/CareEventOrderContactStatusServiceImpl.java

@@ -1,9 +1,9 @@
-package com.care.service.impl;
+package com.care.common.service.impl;
 
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.care.common.entity.CareEventOrderContactStatus;
-import com.care.mapper.CareEventOrderContactStatusMapper;
-import com.care.service.CareEventOrderContactStatusService;
+import com.care.common.mapper.CareEventOrderContactStatusMapper;
+import com.care.common.service.CareEventOrderContactStatusService;
 import org.springframework.stereotype.Service;
 
 /**

src/main/java/com/care/service/impl/CareEventOrderHandleHisServiceImpl.java

@@ -1,9 +1,9 @@
-package com.care.service.impl;
+package com.care.common.service.impl;
 
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.care.common.entity.CareEventOrderHandleHis;
-import com.care.mapper.CareEventOrderHandleHisMapper;
-import com.care.service.CareEventOrderHandleHisService;
+import com.care.common.mapper.CareEventOrderHandleHisMapper;
+import com.care.common.service.CareEventOrderHandleHisService;
 import org.springframework.stereotype.Service;
 
 /**

src/main/java/com/care/service/impl/CareEventOrderServiceImpl.java

@@ -1,9 +1,9 @@
-package com.care.service.impl;
+package com.care.common.service.impl;
 
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.care.common.entity.CareEventOrder;
-import com.care.mapper.CareEventOrderMapper;
-import com.care.service.CareEventOrderService;
+import com.care.common.mapper.CareEventOrderMapper;
+import com.care.common.service.CareEventOrderService;
 import org.springframework.stereotype.Service;
 
 /**

src/main/java/com/care/service/impl/CareOlderContactServiceImpl.java

@@ -1,9 +1,9 @@
-package com.care.service.impl;
+package com.care.common.service.impl;
 
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.care.common.entity.CareOlderContact;
-import com.care.mapper.CareOlderContactMapper;
-import com.care.service.CareOlderContactService;
+import com.care.common.mapper.CareOlderContactMapper;
+import com.care.common.service.CareOlderContactService;
 import org.springframework.stereotype.Service;
 
 /**

src/main/java/com/care/service/impl/CareOlderDeviceRelServiceImpl.java

@@ -1,9 +1,9 @@
-package com.care.service.impl;
+package com.care.common.service.impl;
 
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.care.common.entity.CareOlderDeviceRel;
-import com.care.mapper.CareOlderDeviceRelMapper;
-import com.care.service.CareOlderDeviceRelService;
+import com.care.common.mapper.CareOlderDeviceRelMapper;
+import com.care.common.service.CareOlderDeviceRelService;
 import org.springframework.stereotype.Service;
 
 /**

src/main/java/com/care/service/impl/CareOlderServiceImpl.java

@@ -1,9 +1,9 @@
-package com.care.service.impl;
+package com.care.common.service.impl;
 
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.care.common.entity.CareOlder;
-import com.care.mapper.CareOlderMapper;
-import com.care.service.CareOlderService;
+import com.care.common.mapper.CareOlderMapper;
+import com.care.common.service.CareOlderService;
 import org.springframework.stereotype.Service;
 
 /**

src/main/java/com/care/service/impl/CareOrganizationServiceImpl.java

@@ -1,9 +1,9 @@
-package com.care.service.impl;
+package com.care.common.service.impl;
 
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.care.common.entity.CareOrganization;
-import com.care.mapper.CareOrganizationMapper;
-import com.care.service.CareOrganizationService;
+import com.care.common.mapper.CareOrganizationMapper;
+import com.care.common.service.CareOrganizationService;
 import org.springframework.stereotype.Service;
 
 /**

src/main/java/com/care/service/impl/CareStationServiceImpl.java

@@ -1,9 +1,9 @@
-package com.care.service.impl;
+package com.care.common.service.impl;
 
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.care.common.entity.CareStation;
-import com.care.mapper.CareStationMapper;
-import com.care.service.CareStationService;
+import com.care.common.mapper.CareStationMapper;
+import com.care.common.service.CareStationService;
 import org.springframework.stereotype.Service;
 
 /**

src/main/java/com/care/service/impl/CareSysUserServiceImpl.java

@@ -1,4 +1,4 @@
-package com.care.service.impl;
+package com.care.common.service.impl;
 
 import cn.hutool.core.bean.BeanUtil;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
@@ -7,12 +7,10 @@ import com.care.common.entity.CareOrganization;
 import com.care.common.entity.CareSysUser;
 import com.care.common.exception.BDException;
 import com.care.common.vo.UserLogindConvertVO;
-import com.care.mapper.CareSysUserMapper;
-import com.care.service.CareOrganizationService;
-import com.care.service.CareSysUserService;
-import com.care.util.Result;
+import com.care.common.mapper.CareSysUserMapper;
+import com.care.common.service.CareOrganizationService;
+import com.care.common.service.CareSysUserService;
 import org.apache.commons.codec.digest.DigestUtils;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;

src/main/java/com/care/service/impl/CommonServiceImpl.java

@@ -1,11 +1,11 @@
-package com.care.service.impl;
+package com.care.common.service.impl;
 
 import cn.hutool.cache.CacheUtil;
 import cn.hutool.cache.impl.TimedCache;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.care.common.entity.SysDimCode;
-import com.care.service.CommonService;
-import com.care.service.SysDimCodeService;
+import com.care.common.service.CommonService;
+import com.care.common.service.SysDimCodeService;
 import com.google.common.collect.Maps;
 import org.springframework.stereotype.Service;
 import org.springframework.util.CollectionUtils;

src/main/java/com/care/service/impl/SysDimCodeServiceImpl.java

@@ -1,9 +1,9 @@
-package com.care.service.impl;
+package com.care.common.service.impl;
 
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.care.common.entity.SysDimCode;
-import com.care.mapper.SysDimCodeMapper;
-import com.care.service.SysDimCodeService;
+import com.care.common.mapper.SysDimCodeMapper;
+import com.care.common.service.SysDimCodeService;
 import org.springframework.stereotype.Service;
 
 /**

src/main/java/com/care/service/impl/SysDimTypeServiceImpl.java

@@ -1,9 +1,9 @@
-package com.care.service.impl;
+package com.care.common.service.impl;
 
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.care.common.entity.SysDimType;
-import com.care.mapper.SysDimTypeMapper;
-import com.care.service.SysDimTypeService;
+import com.care.common.mapper.SysDimTypeMapper;
+import com.care.common.service.SysDimTypeService;
 import org.springframework.stereotype.Service;
 
 /**

src/main/java/com/care/util/CommonConfUtil.java

@@ -1,4 +1,4 @@
-package com.care.util;
+package com.care.common.util;
 
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
@@ -20,7 +20,7 @@ public final class CommonConfUtil {
     static {
         try {
             Properties properties = new Properties();
-            properties.load(new InputStreamReader(CommonConfUtil.class.getResourceAsStream("/CommonConfig.properties"), Charset.forName("utf-8")));
+            properties.load(new InputStreamReader(CommonConfUtil.class.getResourceAsStream("/common.properties"), Charset.forName("utf-8")));
             properties.keySet().iterator().forEachRemaining(k -> map.put(String.valueOf(k), String.valueOf(properties.get(k))));
         } catch (IOException e) {
             logger.error("读取配置文件错误，错误信息：" + e.getMessage());

src/main/java/com/care/util/DateUtils.java

@@ -1,4 +1,4 @@
-package com.care.util;
+package com.care.common.util;
 
 import java.text.ParseException;
 import java.text.SimpleDateFormat;

src/main/java/com/care/util/ExUtil.java

@@ -1,4 +1,4 @@
-package com.care.util;
+package com.care.common.util;
 
 import java.io.PrintWriter;
 import java.io.StringWriter;

src/main/java/com/care/util/JsonUtil.java

@@ -1,4 +1,4 @@
-package com.care.util;
+package com.care.common.util;
 
 import com.fasterxml.jackson.databind.ObjectMapper;
 

src/main/java/com/care/util/JwtUtils.java

@@ -1,4 +1,4 @@
-package com.care.util;
+package com.care.common.util;
 
 import cn.hutool.json.JSONUtil;
 import com.care.common.vo.UserLogindConvertVO;
@@ -9,6 +9,7 @@ import org.apache.commons.codec.binary.Base64;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.context.annotation.PropertySource;
+import org.springframework.core.annotation.Order;
 import org.springframework.core.env.Environment;
 import org.springframework.stereotype.Component;
 
@@ -22,8 +23,6 @@ import java.util.Date;
  * Created by y on 2017/11/16.
  * @author y
  */
-@Component
-@PropertySource(value = "classpath:common.properties", ignoreResourceNotFound = true)
 public class JwtUtils {
 
     private static final Logger logger = LoggerFactory.getLogger(JwtUtils.class);
@@ -35,14 +34,14 @@ public class JwtUtils {
      * 由字符串生成加密key
      * @return
      */
-    public SecretKey generalKey() {
-        String stringKey = env.getProperty("auth.jwt.id") + env.getProperty("auth.jwt.secret");
+    public static SecretKey generalKey() {
+        String stringKey = CommonConfUtil.getConf("auth.jwt.id") + CommonConfUtil.getConf("auth.jwt.secret");
         byte[] encodedKey = Base64.decodeBase64(stringKey);
         SecretKey key = new SecretKeySpec(encodedKey, 0, encodedKey.length, "AES");
         return key;
     }
 
-    public String generalToken(UserLogindConvertVO userLogindConvertDTO) {
+    public static String generalToken(UserLogindConvertVO userLogindConvertDTO) {
         String compactJws = null;
         try {
             long nowMillis = System.currentTimeMillis();
@@ -52,7 +51,7 @@ public class JwtUtils {
                     .setSubject(JSONUtil.toJsonStr(userLogindConvertDTO))
                     .setIssuedAt(now)
                     .signWith(SignatureAlgorithm.HS512, key)
-                    .setExpiration(new Date(nowMillis + env.getProperty("auth.jwt.ttl.ms", Long.class)))
+                    .setExpiration(new Date(nowMillis + CommonConfUtil.getLong("auth.jwt.ttl.ms",100)))
                     .compact();
         } catch (Exception e) {
             logger.error("生成TOKEN出现异常.", e);
@@ -66,7 +65,7 @@ public class JwtUtils {
      * @return
      * @throws Exception
      */
-    public Claims tokenParse(String jwt) {
+    public static Claims tokenParse(String jwt) {
         SecretKey key = generalKey();
         Claims claims = null;
         try {

src/main/java/com/care/util/LogUtil.java

@@ -1,4 +1,4 @@
-package com.care.util;
+package com.care.common.util;
 
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.web.bind.annotation.*;

src/main/java/com/care/util/PageResult.java

@@ -1,4 +1,4 @@
-package com.care.util;
+package com.care.common.util;
 
 import com.care.common.vo.PageResVO;
 import org.apache.commons.lang3.StringUtils;

src/main/java/com/care/util/PageUtil.java

@@ -1,4 +1,4 @@
-package com.care.util;
+package com.care.common.util;
 
 
 import java.util.List;

src/main/java/com/care/util/Result.java

@@ -1,4 +1,4 @@
-package com.care.util;
+package com.care.common.util;
 
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;

src/main/java/com/care/util/ResultCode.java

@@ -1,4 +1,4 @@
-package com.care.util;
+package com.care.common.util;
 
 /**
  * 返回值响应编码

src/main/java/com/care/util/WebPageUtils.java

@@ -1,4 +1,4 @@
-package com.care.util;
+package com.care.common.util;
 
 import com.care.common.constant.Constants;
 import com.care.common.vo.UserLogindConvertVO;

src/main/java/com/care/demo/controller/SystemDictionariesController.java

@@ -4,10 +4,10 @@ import cn.hutool.json.JSONUtil;
 import com.care.common.vo.PageResVO;
 import com.care.demo.entity.RimsDictionaries;
 import com.care.demo.service.SystemDictionariesService;
-import com.care.util.PageResult;
-import com.care.util.PageUtil;
-import com.care.util.Result;
-import com.care.util.ResultCode;
+import com.care.common.util.PageResult;
+import com.care.common.util.PageUtil;
+import com.care.common.util.Result;
+import com.care.common.util.ResultCode;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;

src/main/java/com/care/demo/mapper/RimsDictionariesMapper.java

@@ -2,7 +2,7 @@ package com.care.demo.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.care.demo.entity.RimsDictionaries;
-import com.care.util.PageUtil;
+import com.care.common.util.PageUtil;
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;

src/main/java/com/care/demo/service/SystemDictionariesService.java

@@ -2,7 +2,7 @@ package com.care.demo.service;
 
 import com.care.demo.entity.RimsDictionaries;
 import com.care.common.vo.PageResVO;
-import com.care.util.PageUtil;
+import com.care.common.util.PageUtil;
 
 import java.util.List;
 import java.util.Map;

src/main/java/com/care/demo/service/impl/SystemDictionariesServiceImpl.java

@@ -9,7 +9,7 @@ import com.care.common.vo.PageResVO;
 import com.care.demo.entity.RimsDictionaries;
 import com.care.demo.mapper.RimsDictionariesMapper;
 import com.care.demo.service.SystemDictionariesService;
-import com.care.util.PageUtil;
+import com.care.common.util.PageUtil;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.stereotype.Service;
 

src/main/java/com/care/outcall/controller/KoalaOutCallController.java

@@ -3,8 +3,8 @@ package com.care.outcall.controller;
 
 import com.care.outcall.entity.KoalaLoggerEntity;
 import com.care.outcall.service.KoalaOutCallService;
-import com.care.util.JsonUtil;
-import com.care.util.Result;
+import com.care.common.util.JsonUtil;
+import com.care.common.util.Result;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiImplicitParam;
 import io.swagger.annotations.ApiImplicitParams;

src/main/java/com/care/outcall/schedule/KoalaOutCallBillSchuding.java

@@ -5,8 +5,8 @@ import com.care.outcall.entity.KoalaOlderDto;
 import com.care.outcall.entity.KoalaOutCallBill;
 import com.care.outcall.entity.KoalaLogDomain;
 import com.care.outcall.mapper.KoalaOutCallDao;
-import com.care.util.CommonConfUtil;
-import com.care.util.DateUtils;
+import com.care.common.util.CommonConfUtil;
+import com.care.common.util.DateUtils;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 import org.springframework.beans.factory.annotation.Autowired;

src/main/java/com/care/outcall/service/impl/KoalaOutCallServiceImpl.java

@@ -5,8 +5,8 @@ import com.care.outcall.entity.KoalaLogDomain;
 import com.care.outcall.entity.KoalaLoggerEntity;
 import com.care.outcall.mapper.KoalaOutCallDao;
 import com.care.outcall.service.KoalaOutCallService;
-import com.care.util.DateUtils;
-import com.care.util.JsonUtil;
+import com.care.common.util.DateUtils;
+import com.care.common.util.JsonUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 

src/main/resources/mybatis/CareChamberlainOlderRelMapper.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.care.mapper.CareChamberlainOlderRelMapper">
+<mapper namespace="com.care.common.mapper.CareChamberlainOlderRelMapper">
    
 
 </mapper>

src/main/resources/mybatis/CareDeviceMapper.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.care.mapper.CareDeviceMapper">
+<mapper namespace="com.care.common.mapper.CareDeviceMapper">
    
 
 </mapper>

src/main/resources/mybatis/CareEventOrderContactStatusMapper.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.care.mapper.CareEventOrderContactStatusMapper">
+<mapper namespace="com.care.common.mapper.CareEventOrderContactStatusMapper">
    
 
 </mapper>

src/main/resources/mybatis/CareEventOrderHandleHisMapper.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.care.mapper.CareEventOrderHandleHisMapper">
+<mapper namespace="com.care.common.mapper.CareEventOrderHandleHisMapper">
    
 
 </mapper>

src/main/resources/mybatis/CareEventOrderMapper.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.care.mapper.CareEventOrderMapper">
+<mapper namespace="com.care.common.mapper.CareEventOrderMapper">
    
 
 </mapper>

src/main/resources/mybatis/CareOlderContactMapper.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.care.mapper.CareOlderContactMapper">
+<mapper namespace="com.care.common.mapper.CareOlderContactMapper">
    
 
 </mapper>

src/main/resources/mybatis/CareOlderDeviceRelMapper.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.care.mapper.CareOlderDeviceRelMapper">
+<mapper namespace="com.care.common.mapper.CareOlderDeviceRelMapper">
    
 
 </mapper>

src/main/resources/mybatis/CareOlderMapper.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.care.mapper.CareOlderMapper">
+<mapper namespace="com.care.common.mapper.CareOlderMapper">
    
 
 </mapper>

src/main/resources/mybatis/CareOrganizationMapper.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.care.mapper.CareOrganizationMapper">
+<mapper namespace="com.care.common.mapper.CareOrganizationMapper">
    
 
 </mapper>

src/main/resources/mybatis/CareStationMapper.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.care.mapper.CareStationMapper">
+<mapper namespace="com.care.common.mapper.CareStationMapper">
    
 
 </mapper>

src/main/resources/mybatis/CareSysUserMapper.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.care.mapper.CareSysUserMapper">
+<mapper namespace="com.care.common.mapper.CareSysUserMapper">
    
 
 </mapper>

src/main/resources/mybatis/SysDimCodeMapper.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.care.mapper.SysDimCodeMapper">
+<mapper namespace="com.care.common.mapper.SysDimCodeMapper">
    
 
 </mapper>

src/main/resources/mybatis/SysDimTypeMapper.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.care.mapper.SysDimTypeMapper">
+<mapper namespace="com.care.common.mapper.SysDimTypeMapper">
    
 
 </mapper>