From afaac2c538154e906286924cd947842d4b86e53b Mon Sep 17 00:00:00 2001 From: yiming Date: Mon, 14 Nov 2022 13:34:00 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=85=8D=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../filter/aspect/SessionAspect.java | 78 +++++++++---------- .../web/controller/AppCenterController.java | 15 ---- web/src/main/resources/application-dev.yml | 6 -- web/src/main/resources/application-prod.yml | 19 ++--- 4 files changed, 46 insertions(+), 72 deletions(-) diff --git a/modules/filter/src/main/java/com/zhehekeji/filter/aspect/SessionAspect.java b/modules/filter/src/main/java/com/zhehekeji/filter/aspect/SessionAspect.java index 0ee91b7..1e3cd82 100644 --- a/modules/filter/src/main/java/com/zhehekeji/filter/aspect/SessionAspect.java +++ b/modules/filter/src/main/java/com/zhehekeji/filter/aspect/SessionAspect.java @@ -28,46 +28,46 @@ import java.io.IOException; * @Author wangyiming1031@aliyun.com * @Date 2019/10/28 19:26 **/ -@Aspect -@Component +//@Aspect +//@Component @Slf4j public class SessionAspect { - @Value("${zhehe.filter.enable}") - private Boolean enable; - @Value("${userUrl}") - private String userUrl; - - /** - * zhehekeji..*.controller - * 匹配zhehekeji 到controller多级目录 - * - * @param sessionHandler - */ - @Before("execution(public * com.zhehekeji..*.controller.*.*(..))&&@annotation(sessionHandler)") - public void handler(SessionHandler sessionHandler){ - if(!enable){ - return; - } - HttpServletRequest request = ((ServletRequestAttributes) RequestContextHolder.getRequestAttributes()).getRequest(); - String token = request.getHeader(FilterConstance.HEADER); - CurrentUser currentUser = null; - try { - String res = HttpUtil.token(userUrl+"/api/account/checkToken",token); - Result currentUserResult = JSONObject.parseObject(res,Result.class); - if(currentUserResult != null && currentUserResult.getCode() == 200){ - currentUser = JSONObject.parseObject(JSONObject.toJSONString(currentUserResult.getData()),CurrentUser.class); - } - } catch (IOException e) { - e.printStackTrace(); - } - - if (sessionHandler.login()) { - Assert.isTrue(currentUser != null, HttpStatus.UNAUTHORIZED.getCode(), HttpStatus.UNAUTHORIZED.getReasonPhrase()); - } - if (sessionHandler.auth()) { - //todo 权限检验 - } - CurrentUserUtil.setCurrentUser(currentUser); - } +// @Value("${zhehe.filter.enable}") +// private Boolean enable; +// @Value("${userUrl}") +// private String userUrl; +// +// /** +// * zhehekeji..*.controller +// * 匹配zhehekeji 到controller多级目录 +// * +// * @param sessionHandler +// */ +// @Before("execution(public * com.zhehekeji..*.controller.*.*(..))&&@annotation(sessionHandler)") +// public void handler(SessionHandler sessionHandler){ +// if(!enable){ +// return; +// } +// HttpServletRequest request = ((ServletRequestAttributes) RequestContextHolder.getRequestAttributes()).getRequest(); +// String token = request.getHeader(FilterConstance.HEADER); +// CurrentUser currentUser = null; +// try { +// String res = HttpUtil.token(userUrl+"/api/account/checkToken",token); +// Result currentUserResult = JSONObject.parseObject(res,Result.class); +// if(currentUserResult != null && currentUserResult.getCode() == 200){ +// currentUser = JSONObject.parseObject(JSONObject.toJSONString(currentUserResult.getData()),CurrentUser.class); +// } +// } catch (IOException e) { +// e.printStackTrace(); +// } +// +// if (sessionHandler.login()) { +// Assert.isTrue(currentUser != null, HttpStatus.UNAUTHORIZED.getCode(), HttpStatus.UNAUTHORIZED.getReasonPhrase()); +// } +// if (sessionHandler.auth()) { +// //todo 权限检验 +// } +// CurrentUserUtil.setCurrentUser(currentUser); +// } } diff --git a/web/src/main/java/com/zhehekeji/web/controller/AppCenterController.java b/web/src/main/java/com/zhehekeji/web/controller/AppCenterController.java index c470d1f..ea7a38a 100644 --- a/web/src/main/java/com/zhehekeji/web/controller/AppCenterController.java +++ b/web/src/main/java/com/zhehekeji/web/controller/AppCenterController.java @@ -21,20 +21,5 @@ import java.io.IOException; @Slf4j public class AppCenterController { - @Value("${userUrl}") - private String userUrl; - @GetMapping("/userCenter") - @ApiOperation(value = "用户中心") - public Result userCenter() { - Result result = null; - try { - String res = HttpUtil.doGet(userUrl+"/api/app/userCenter"); - result = JSONObject.parseObject(res,Result.class); - } catch (IOException e) { - log.error("请求用户中心地址失败:{}",e); - Assert.isTrue(false,"请求用户中心地址失败"); - } - return result; - } } diff --git a/web/src/main/resources/application-dev.yml b/web/src/main/resources/application-dev.yml index 93f5ab6..d0ba145 100644 --- a/web/src/main/resources/application-dev.yml +++ b/web/src/main/resources/application-dev.yml @@ -20,14 +20,8 @@ spring: # --------本服务端口号 server: port: 8099 -#-------------- -# ------用户中心地址 -userUrl: http://115.236.65.98:11001 -# ----------- # ----默认摄像头的连接信息 cameraConfig: - # ------------球機選擇--- 0:利珀 1：海康 - cameraType: 0 cameraPassword: a1234567 cameraUser: admin cameraPort0: 37777 diff --git a/web/src/main/resources/application-prod.yml b/web/src/main/resources/application-prod.yml index 2387d7d..db3eefd 100644 --- a/web/src/main/resources/application-prod.yml +++ b/web/src/main/resources/application-prod.yml @@ -14,23 +14,18 @@ spring: testWhileIdle: false timeBetweenEvictionRunsMillis: 60000 type: com.alibaba.druid.pool.DruidDataSource - url: jdbc:mysql://192.168.77.91:3306/lia_duoji?useUnicode=true&characterEncoding=utf8&useSSL=false&serverTimezone=GMT%2B8 + url: jdbc:mysql://127.0.0.1:3306/lia_duoji_nanjing?useUnicode=true&characterEncoding=utf8&useSSL=false&serverTimezone=GMT%2B8 username: root validationQuery: SELECT 1 FROM DUAL # --------本服务端口号 server: port: 8099 -#-------------- -# ------用户中心地址 -userUrl: http://115.236.65.98:11001 -# ----------- # ----默认摄像头的连接信息 cameraConfig: - # ------------球機選擇--- 0:利珀 1：海康 - cameraType: 0 cameraPassword: a1234567 cameraUser: admin - cameraPort: 37777 + cameraPort0: 37777 + cameraPort1: 8000 videoServer: 127.0.0.1:8083 #相机抓图延迟 毫秒,这个延迟是等待球机球机转动到位，然后拍照的 delayCaptureTime: 3500 @@ -61,7 +56,7 @@ savePath: # ------------服务端类型 0：TCP(罗伯泰克) 1:KSEC(JSON)（昆船） serverMode: 1 ksec: - ip: 127.0.0.1 + ip: 172.18.96.1 port: 3000 # ------------ 实时视频流 全部页面的格式 行列数量 videoStyleConfig: @@ -72,18 +67,18 @@ videoStyleConfig: # ----------- num:总共多少个光源端口 index:需要控制的是哪个 # ------------ 利珀视觉控制器id从1开始，光源控制器从0开始 lightSource: - type: 2 + type: 1 num: 4 index: 1 # -----tray 托盘 # -----goods 货物 # 扫码模式 0:此处不盘点 1：球机扫码 2：sick扫码枪 3:南北达RFID scanCodeMode: - tray: 1 + tray: 3 goods: 0 goodsCodeTypes: - 14 trayCodeTypes: - 14 # 照片 視頻保存多久 -deleteFileDays: 365 \ No newline at end of file +deleteFileDays: 30 \ No newline at end of file