From c39e67927b3205c3ea2bcdd8bf6f741e19789eac Mon Sep 17 00:00:00 2001 From: wujing <297115770@qq.com> Date: Wed, 16 Dec 2020 14:40:25 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=85=8D=E7=BD=AE=E6=96=87?= =?UTF-8?q?=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- nacos_config.zip | Bin 3740 -> 4363 bytes .../education/ServerGatewayApplication.java | 41 +++-- .../gateway/common/FilterPre.java | 148 +++++++++--------- .../gateway/controller/HandlerController.java | 39 +++++ .../gateway/controller/IndexController.java | 10 +- .../gateway/controller/HandlerController.java | 37 ----- .../src/main/resources/bootstrap.properties | 6 +- .../src/main/resources/templates/index.ftl | 14 +- .../education/app/job/MsgSendCrontab.java | 48 ++++++ .../education/app/job/OrderCrontab.java | 46 ++++++ .../education/app/job/VideoCrontab.java | 68 ++++++++ .../education/server/job/MsgSendCrontab.java | 50 ------ .../education/server/job/OrderCrontab.java | 47 ------ .../education/server/job/VideoCrontab.java | 69 -------- .../sba/ServerSbaApplication.java | 11 +- .../app/sba/config/SecuritySecureConfig.java | 28 ++++ .../sba/config/SecuritySecureConfig.java | 29 ---- .../src/main/resources/logback-roncoo.xml | 29 ++-- 18 files changed, 359 insertions(+), 361 deletions(-) rename roncoo-education-app-gateway/src/main/java/com/roncoo/education/{server => app}/gateway/common/FilterPre.java (93%) create mode 100644 roncoo-education-app-gateway/src/main/java/com/roncoo/education/app/gateway/controller/HandlerController.java rename roncoo-education-app-gateway/src/main/java/com/roncoo/education/{server => app}/gateway/controller/IndexController.java (63%) delete mode 100644 roncoo-education-app-gateway/src/main/java/com/roncoo/education/server/gateway/controller/HandlerController.java create mode 100644 roncoo-education-app-job/src/main/java/com/roncoo/education/app/job/MsgSendCrontab.java create mode 100644 roncoo-education-app-job/src/main/java/com/roncoo/education/app/job/OrderCrontab.java create mode 100644 roncoo-education-app-job/src/main/java/com/roncoo/education/app/job/VideoCrontab.java delete mode 100644 roncoo-education-app-job/src/main/java/com/roncoo/education/server/job/MsgSendCrontab.java delete mode 100644 roncoo-education-app-job/src/main/java/com/roncoo/education/server/job/OrderCrontab.java delete mode 100644 roncoo-education-app-job/src/main/java/com/roncoo/education/server/job/VideoCrontab.java rename roncoo-education-app-sba/src/main/java/com/roncoo/education/{server => app}/sba/ServerSbaApplication.java (74%) create mode 100644 roncoo-education-app-sba/src/main/java/com/roncoo/education/app/sba/config/SecuritySecureConfig.java delete mode 100644 roncoo-education-app-sba/src/main/java/com/roncoo/education/server/sba/config/SecuritySecureConfig.java diff --git a/nacos_config.zip b/nacos_config.zip index ab8ab2b3d00d94cbea530ff6307ad70ea3ae7ae7..ae9a6be0b0775d5036f2744e73d8e7c00c23c8bb 100644 GIT binary patch literal 4363 zcmbuC2|QG97stn%>_lW4qsUSd$w;WwAlcVa_T5-!EMq6Tk!fs&B4pqG$P!VOu`kIs zw4lfmk-hA^Bd_;0{r&sA_1^i+oVoXN?{mJ-bAIV{-MEJ zxUnh1$_6WsBP(}BTS?3Cnue;j+J7FT06fS0NG6si79a)yfMfu` z*BY!p>!sNhJ(4HZhl@w>!rk`XoF?Rp$>ry>K@1M`3P@GwtL;Vlw=u0 zqkQ6>swz1&8v7=rD?R!ur@beyUpkMV$(%Wb^_Z=N#9ZeSs8HUlZBW%0|9PdHru15E z7JgZ+#TMIPT*DZn`L)Tc$<>wf7C*70ti2laYL3##=$8VJo4 zxDweYECsI3jIW>i9B$>@HlVMZ>HRTxI1cEJVj_}UyZsSupyW<%TS*a2X_k5|Ba>-Z zcc5+rJ<3-jC$#0xo$c*vRS%a0HG3LOj7UmTX}WZxZ+$yfdL*g6hVR%jaKB^1m(6s& zs%Y26uU}2)CCc)8q%3tp^#XD(mTURyD(bEzmMJbmf`fgnnB=igZh9Gac~NGLXN+b% zFTURHrZ#6Zk)ScD)dH`BAJ;VdjykJ_ca<%Rh-QQt4M`cjj1!>A=C(o;LDyfhq((1+ zpzB1Zxs7dQYE7X%(Ikoa^V?$&eJ?-M%k-+?kL~D3$vTt^=CkyUSKZdvo@#Guf6vnu zNOf2}wt%?6AtUfUsm2f+Nw~L%8;P)AP6T+HXkA`0b zhSAHocDT%9n|PS8^iC1>urHC28G*WCF{Wgx?J_0RT>crg#wmvPaxq$7O}$AKVReTH zDa+EL4*TQj%Knhj$;5acr7}jBGC-PIcAIP&^ww~MQcnqoq<+Oyr3)Xexr2+ z_?i=?+%RFMDJQv>ui>ul=OiQY9Mz_GbNWSG-4T+X0F`sNe!#{d#w z=b)8flw4P^V0%G`Zb4fL@z{Kkl)4HuAm|(pekS1P%gd~Mq3f%g&WRmk$Pz)H8(;gs zqTm8e=T%qJ1|Gbjn|;hNOnS4eKXT(?ka}jLp;No%m!7=mb#-QvHWr3}q2a;-+w-@< ziVkJBxk5h`A$gheK2yPwyi;u)gEpgGxi|^aF0#AcEM3j|mUU>$7SOSJBNwy3RLM8} zAV%2&7@~S^T#glt%D8$Wa+<~yjw?TbJgTY2D7A(o-X?-X8P$csi!|M)S%D|YlFYn> zSx>U(dMKAdJE@%`lF{Kd(miRxlv+%E@)G=-_Zgb!F4Q+`u~mn@sW$PqMX+snZ`~B} z_jbYETihV}5+@v2uqBs}II%>Lc-Ajb5;mewN2fYBXXtjVZM$QpWr&VY6A9%d_x@i^ zIJr9^&Fu&@p=!f^mcC(@+~*KfkrtBcY-g%hrx6lw(hR(s(B~jze!4xs_lqHq-DA5+ z*IE7#@708tGB`Ia62~jOA)R(^TAK#;261tRL+EWsE{F`X3+Rk!&+AXGdtmQSsI1|0PC@a~IZ_mi~;8_Zu6A0isWWPqIc->apsGCNE;-_m*_WdH~ALPT}M zp=0ABR@n6bhm_|@9}PdR>Zx4Y5k%GCorxGnuf+$dt;+73bFW(%RP3L<mdt;q3@?azFDxd1M-VUNfC&nD=Z@+} zyuHbQ8E_WkxTr|p0?IePR=Q@^$)!UQ6WVR%!<4Kc3)Q7qmkl>Vymd-_&755P&_8OZ zEA!|IT~;KU*mObsbV)^O$Gt?pV+B;fEsZ%QZ z5)m(22V+5uVZ)T+wZTf*-16$>7K-n;Udcdwd@D|d;CibenS5fHx5pSK%I}L=cp%-b zqP9~d+1AD$-N$mNDH0K12K-aQz=M~>&OyIx2-^or0O-eMA^hjKf_v}Fkf3H#Z5Pb3O2k=$vFXsC{R;>G(0QI*S5O^kN|H_Z$*|YnXWrvBd zKHJZPB>jCR!fNdx9z4 literal 3740 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 getParamMap(HttpServletRequest request) { + TreeMap paramMap = new TreeMap<>(); + Map map = request.getParameterMap(); + for (String key : map.keySet()) { + paramMap.put(key, map.get(key)[0]); + } + if (paramMap.isEmpty()) { + DataInputStream in = null; + try { + in = new DataInputStream(request.getInputStream()); + byte[] buf = new byte[request.getContentLength()]; + in.readFully(buf); + String t = new String(buf, "UTF-8"); + if (StringUtils.hasText(t)) { + return new TreeMap<>(JSONUtil.parseObject(t, TreeMap.class)); + } + } catch (Exception e) { + logger.error("获取不到任何参数"); + } finally { + if (null != in) + try { + in.close();// 关闭数据流 + } catch (IOException e) { + logger.error("关闭数据流异常"); + } + } + } + return paramMap; + } + + // 校验用户是否有权限 + private static Boolean checkUri(String uri, String tk) { + List menuVOList1 = JSONUtil.parseArray(tk, String.class); + if (StringUtils.hasText(uri) && uri.endsWith("/")) { + uri = uri.substring(0, uri.length() - 1); + } + for (String s : menuVOList1) { + if (s.contains(uri)) { + return true; + } + } + return false; + } + @Override public String filterType() { return FilterConstants.PRE_TYPE; @@ -138,11 +180,16 @@ public class FilterPre extends ZuulFilter { } // 单点登录处理，注意，登录的时候必须要放入缓存 - /* - * if (!stringRedisTemplate.hasKey(userNo.toString())) { // 不存在，则登录异常，有效期为1小时 throw new BaseException(ResultEnum.TOKEN_PAST); } - * - * // 存在，判断是否token相同 String tk = stringRedisTemplate.opsForValue().get(userNo.toString()); if (!token.equals(tk)) { // 不同则为不同的用户登录，这时候提示异地登录 throw new BaseException(ResultEnum.REMOTE_ERROR); } - */ +// if (!stringRedisTemplate.hasKey(userNo.toString())) { +// // 不存在，则登录异常，有效期为1小时 +// throw new BaseException(ResultEnum.TOKEN_PAST); +// } +// // 存在，判断是否token相同 +// String tk = stringRedisTemplate.opsForValue().get(userNo.toString()); +// if (!token.equals(tk)) { +// // 不同则为不同的用户登录，这时候提示异地登录 +// throw new BaseException(ResultEnum.REMOTE_ERROR); +// } // 更新时间，使token不过期 stringRedisTemplate.opsForValue().set(userNo.toString(), token, 1, TimeUnit.HOURS); @@ -178,49 +225,4 @@ public class FilterPre extends ZuulFilter { } }; } - - @SuppressWarnings("unchecked") - private static TreeMap getParamMap(HttpServletRequest request) { - TreeMap paramMap = new TreeMap<>(); - Map map = request.getParameterMap(); - for (String key : map.keySet()) { - paramMap.put(key, map.get(key)[0]); - } - if (paramMap.isEmpty()) { - DataInputStream in = null; - try { - in = new DataInputStream(request.getInputStream()); - byte[] buf = new byte[request.getContentLength()]; - in.readFully(buf); - String t = new String(buf, "UTF-8"); - if (StringUtils.hasText(t)) { - return new TreeMap<>(JSONUtil.parseObject(t, TreeMap.class)); - } - } catch (Exception e) { - logger.error("获取不到任何参数"); - } finally { - if (null != in) - try { - in.close();// 关闭数据流 - } catch (IOException e) { - logger.error("关闭数据流异常"); - } - } - } - return paramMap; - } - - // 校验用户是否有权限 - private static Boolean checkUri(String uri, String tk) { - List menuVOList1 = JSONUtil.parseArray(tk, String.class); - if (StringUtils.hasText(uri) && uri.endsWith("/")) { - uri = uri.substring(0, uri.length() - 1); - } - for (String s : menuVOList1) { - if (s.contains(uri)) { - return true; - } - } - return false; - } } diff --git a/roncoo-education-app-gateway/src/main/java/com/roncoo/education/app/gateway/controller/HandlerController.java b/roncoo-education-app-gateway/src/main/java/com/roncoo/education/app/gateway/controller/HandlerController.java new file mode 100644 index 00000000..cb93927f --- /dev/null +++ b/roncoo-education-app-gateway/src/main/java/com/roncoo/education/app/gateway/controller/HandlerController.java @@ -0,0 +1,39 @@ +package com.roncoo.education.app.gateway.controller; + +import com.netflix.zuul.context.RequestContext; +import com.netflix.zuul.exception.ZuulException; +import com.roncoo.education.util.base.Result; +import com.roncoo.education.util.enums.ResultEnum; +import lombok.extern.slf4j.Slf4j; +import org.springframework.boot.web.servlet.error.ErrorController; +import org.springframework.http.HttpStatus; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.ResponseStatus; +import org.springframework.web.bind.annotation.RestController; + +@Slf4j +@RestController +public class HandlerController implements ErrorController { + + /** + * 出异常后进入该方法，交由下面的方法处理 + */ + @Override + public String getErrorPath() { + return "/error"; + } + + @RequestMapping("/error") + @ResponseStatus(HttpStatus.OK) + public Result error() { + RequestContext ctx = RequestContext.getCurrentContext(); + Throwable throwable = ctx.getThrowable(); + log.error("系统异常", throwable); + if (null != throwable && throwable instanceof ZuulException) { + ZuulException e = (ZuulException) ctx.getThrowable(); + return Result.error(e.nStatusCode, e.errorCause); + } + return Result.error(ResultEnum.ERROR); + } + +} diff --git a/roncoo-education-app-gateway/src/main/java/com/roncoo/education/server/gateway/controller/IndexController.java b/roncoo-education-app-gateway/src/main/java/com/roncoo/education/app/gateway/controller/IndexController.java similarity index 63% rename from roncoo-education-app-gateway/src/main/java/com/roncoo/education/server/gateway/controller/IndexController.java rename to roncoo-education-app-gateway/src/main/java/com/roncoo/education/app/gateway/controller/IndexController.java index 2cdce935..54b817d5 100644 --- a/roncoo-education-app-gateway/src/main/java/com/roncoo/education/server/gateway/controller/IndexController.java +++ b/roncoo-education-app-gateway/src/main/java/com/roncoo/education/app/gateway/controller/IndexController.java @@ -1,7 +1,7 @@ /** * Copyright 2015-现在 广州市领课网络科技有限公司 */ -package com.roncoo.education.server.gateway.controller; +package com.roncoo.education.app.gateway.controller; import org.springframework.stereotype.Controller; import org.springframework.web.bind.annotation.RequestMapping; @@ -10,9 +10,9 @@ import org.springframework.web.bind.annotation.RequestMethod; @Controller public class IndexController { - @RequestMapping(value = "/", method = RequestMethod.GET) - public String index() { - return "index"; - } + @RequestMapping(value = "/", method = RequestMethod.GET) + public String index() { + return "index"; + } } diff --git a/roncoo-education-app-gateway/src/main/java/com/roncoo/education/server/gateway/controller/HandlerController.java b/roncoo-education-app-gateway/src/main/java/com/roncoo/education/server/gateway/controller/HandlerController.java deleted file mode 100644 index 4fc8dd9d..00000000 --- a/roncoo-education-app-gateway/src/main/java/com/roncoo/education/server/gateway/controller/HandlerController.java +++ /dev/null @@ -1,37 +0,0 @@ -package com.roncoo.education.server.gateway.controller; - -import com.roncoo.education.util.base.Result; -import com.roncoo.education.util.enums.ResultEnum; -import org.springframework.boot.web.servlet.error.ErrorController; -import org.springframework.http.HttpStatus; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.ResponseStatus; -import org.springframework.web.bind.annotation.RestController; - -import com.netflix.zuul.context.RequestContext; -import com.netflix.zuul.exception.ZuulException; - -@RestController -public class HandlerController implements ErrorController { - - /** - * 出异常后进入该方法，交由下面的方法处理 - */ - @Override - public String getErrorPath() { - return "/error"; - } - - @RequestMapping("/error") - @ResponseStatus(HttpStatus.OK) - public Result error() { - RequestContext ctx = RequestContext.getCurrentContext(); - Throwable throwable = ctx.getThrowable(); - if(null != throwable && throwable instanceof ZuulException ){ - ZuulException e = (ZuulException) ctx.getThrowable(); - return Result.error(e.nStatusCode, e.errorCause); - } - return Result.error(ResultEnum.ERROR); - } - -} diff --git a/roncoo-education-app-gateway/src/main/resources/bootstrap.properties b/roncoo-education-app-gateway/src/main/resources/bootstrap.properties index 31840108..40d0c8af 100644 --- a/roncoo-education-app-gateway/src/main/resources/bootstrap.properties +++ b/roncoo-education-app-gateway/src/main/resources/bootstrap.properties @@ -1,13 +1,13 @@ # application spring.application.name=roncoo-education-app-gateway # profile -spring.profiles.active=dev +spring.profiles.active=demo # server server.port=5840 # nacos spring.cloud.nacos.username=nacos -spring.cloud.nacos.password=nacos -spring.cloud.nacos.server-addr=localhost:8848 +spring.cloud.nacos.password=RonCoo.123 +spring.cloud.nacos.server-addr=10.65.3.98:8848 spring.cloud.nacos.namespace=${spring.profiles.active} spring.cloud.nacos.discovery.namespace=${spring.cloud.nacos.namespace} spring.cloud.nacos.config.namespace=${spring.cloud.nacos.namespace} diff --git a/roncoo-education-app-gateway/src/main/resources/templates/index.ftl b/roncoo-education-app-gateway/src/main/resources/templates/index.ftl index e5fedaf1..3679548e 100644 --- a/roncoo-education-app-gateway/src/main/resources/templates/index.ftl +++ b/roncoo-education-app-gateway/src/main/resources/templates/index.ftl @@ -1,19 +1,19 @@ - - 接口文档 + + 接口文档 - diff --git a/roncoo-education-app-job/src/main/java/com/roncoo/education/app/job/MsgSendCrontab.java b/roncoo-education-app-job/src/main/java/com/roncoo/education/app/job/MsgSendCrontab.java new file mode 100644 index 00000000..7b8d641b --- /dev/null +++ b/roncoo-education-app-job/src/main/java/com/roncoo/education/app/job/MsgSendCrontab.java @@ -0,0 +1,48 @@ +package com.roncoo.education.app.job; + +import com.roncoo.education.system.feign.interfaces.IFeignMsg; +import com.roncoo.education.util.base.BaseController; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.scheduling.annotation.Scheduled; +import org.springframework.stereotype.Component; + +/** + * 站内信-定时发送 + * + * @author wuyun + */ +@Component +public class MsgSendCrontab extends BaseController { + + private static final Object KEY = new Object(); + private static boolean taskFlag = false; + + @Autowired + private IFeignMsg bossMsg; + + /** + * 定时任务，一小时启动一次 + * + * @author wuyun + */ + @Scheduled(fixedRate = 60000) + public void pushCancel() { + synchronized (KEY) { + if (MsgSendCrontab.taskFlag) { + logger.warn("站内信-定时发送已经启动"); + return; + } + MsgSendCrontab.taskFlag = true; + } + + try { + bossMsg.push(); + } catch (Exception e) { + logger.error("站内信-定时发送-执行出错", e); + } + + MsgSendCrontab.taskFlag = false; + + logger.warn("站内信-定时发送-任务完成"); + } +} diff --git a/roncoo-education-app-job/src/main/java/com/roncoo/education/app/job/OrderCrontab.java b/roncoo-education-app-job/src/main/java/com/roncoo/education/app/job/OrderCrontab.java new file mode 100644 index 00000000..eeabd0ac --- /dev/null +++ b/roncoo-education-app-job/src/main/java/com/roncoo/education/app/job/OrderCrontab.java @@ -0,0 +1,46 @@ +package com.roncoo.education.app.job; + +import com.roncoo.education.course.feign.interfaces.IFeignOrderInfo; +import com.roncoo.education.util.base.BaseController; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.scheduling.annotation.Scheduled; +import org.springframework.stereotype.Component; + +/** + * 定时任务-订单处理 + * + * @author wuyun + */ +@Component +public class OrderCrontab extends BaseController { + + private static final Object KEY = new Object(); + + private static boolean taskFlag = false; + + @Autowired + private IFeignOrderInfo feignOrderInfo; + + /** + * 定时任务每分钟执行一次 + */ + @Scheduled(fixedRate = 60000) + public void orderCancel() { + synchronized (KEY) { + if (OrderCrontab.taskFlag) { + logger.warn("订单处理-任务已经启动"); + return; + } + OrderCrontab.taskFlag = true; + } + logger.warn("订单处理-定时任务开始"); + + try { + feignOrderInfo.handleScheduledTasks(); + } catch (Exception e) { + logger.error("定时任务-订单处理-执行出错", e); + } + OrderCrontab.taskFlag = false; + } + +} diff --git a/roncoo-education-app-job/src/main/java/com/roncoo/education/app/job/VideoCrontab.java b/roncoo-education-app-job/src/main/java/com/roncoo/education/app/job/VideoCrontab.java new file mode 100644 index 00000000..5f8c2de9 --- /dev/null +++ b/roncoo-education-app-job/src/main/java/com/roncoo/education/app/job/VideoCrontab.java @@ -0,0 +1,68 @@ +package com.roncoo.education.app.job; + +import com.roncoo.education.course.feign.interfaces.IFeignCourseVideo; +import com.roncoo.education.util.base.BaseController; +import com.roncoo.education.util.config.SystemUtil; +import com.xiaoleilu.hutool.io.FileUtil; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.scheduling.annotation.Scheduled; +import org.springframework.stereotype.Component; + +import java.io.File; + +/** + * 定时任务-视频处理 + * + * @author wuyun + */ +@Component +public class VideoCrontab extends BaseController { + + private static final Object KEY = new Object(); + private static boolean taskFlag = false; + + @Autowired + private IFeignCourseVideo feignCourseVideo; + + /** + * 定时任务每分钟执行一次
+ * 注意：每个course服务都必须要对应有一个定时任务，针对服务器 + */ + @Scheduled(fixedRate = 60000) + public void orderCancel() { + synchronized (KEY) { + if (VideoCrontab.taskFlag) { + logger.warn("视频处理-任务已经启动"); + return; + } + VideoCrontab.taskFlag = true; + } + + int videoSum = 0; + + File file = new File(SystemUtil.PERIOD_VIDEO_PATH); + if (file.isDirectory()) {// isDirectory是否文件夹 + File[] files = file.listFiles();// listFiles是获取该目录下所有文件和目录的绝对路径 + for (File targetFile : files) { + + if (targetFile.isFile() && targetFile.exists()) { + if (FileUtil.newerThan(targetFile, (System.currentTimeMillis() - 7200000))) {// 上传两个小时内 + + try { + feignCourseVideo.handleScheduledTasks(targetFile); + videoSum = videoSum + 1; + } catch (Exception e) { + logger.error("视频定时任务处理失败", e); + } + + } + } + } + } + + VideoCrontab.taskFlag = false; + + logger.warn("视频处理-定时任务完成，处理视频数={}", videoSum); + } + +} diff --git a/roncoo-education-app-job/src/main/java/com/roncoo/education/server/job/MsgSendCrontab.java b/roncoo-education-app-job/src/main/java/com/roncoo/education/server/job/MsgSendCrontab.java deleted file mode 100644 index 63a4db99..00000000 --- a/roncoo-education-app-job/src/main/java/com/roncoo/education/server/job/MsgSendCrontab.java +++ /dev/null @@ -1,50 +0,0 @@ -package com.roncoo.education.server.job; - -import com.roncoo.education.system.feign.interfaces.IFeignMsg; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.scheduling.annotation.Scheduled; -import org.springframework.stereotype.Component; - -import com.roncoo.education.util.base.BaseController; - -/** - * 站内信-定时发送 - * - * @author wuyun - * - */ -@Component -public class MsgSendCrontab extends BaseController { - - private static final Object KEY = new Object(); - private static boolean taskFlag = false; - - @Autowired - private IFeignMsg bossMsg; - - /** - * 定时任务，一小时启动一次 - * - * @author wuyun - */ - @Scheduled(fixedRate = 60000) - public void pushCancel() { - synchronized (KEY) { - if (MsgSendCrontab.taskFlag) { - logger.warn("站内信-定时发送已经启动"); - return; - } - MsgSendCrontab.taskFlag = true; - } - - try { - bossMsg.push(); - } catch (Exception e) { - logger.error("站内信-定时发送-执行出错", e); - } - - MsgSendCrontab.taskFlag = false; - - logger.warn("站内信-定时发送-任务完成"); - } -} diff --git a/roncoo-education-app-job/src/main/java/com/roncoo/education/server/job/OrderCrontab.java b/roncoo-education-app-job/src/main/java/com/roncoo/education/server/job/OrderCrontab.java deleted file mode 100644 index 256eaf39..00000000 --- a/roncoo-education-app-job/src/main/java/com/roncoo/education/server/job/OrderCrontab.java +++ /dev/null @@ -1,47 +0,0 @@ -package com.roncoo.education.server.job; - -import com.roncoo.education.course.feign.interfaces.IFeignOrderInfo; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.scheduling.annotation.Scheduled; -import org.springframework.stereotype.Component; - -import com.roncoo.education.util.base.BaseController; - -/** - * 定时任务-订单处理 - * - * @author wuyun - */ -@Component -public class OrderCrontab extends BaseController { - - private static final Object KEY = new Object(); - - private static boolean taskFlag = false; - - @Autowired - private IFeignOrderInfo feignOrderInfo; - - /** - * 定时任务每分钟执行一次 - */ - @Scheduled(fixedRate = 60000) - public void orderCancel() { - synchronized (KEY) { - if (OrderCrontab.taskFlag) { - logger.warn("订单处理-任务已经启动"); - return; - } - OrderCrontab.taskFlag = true; - } - logger.warn("订单处理-定时任务开始"); - - try { - feignOrderInfo.handleScheduledTasks(); - } catch (Exception e) { - logger.error("定时任务-订单处理-执行出错", e); - } - OrderCrontab.taskFlag = false; - } - -} diff --git a/roncoo-education-app-job/src/main/java/com/roncoo/education/server/job/VideoCrontab.java b/roncoo-education-app-job/src/main/java/com/roncoo/education/server/job/VideoCrontab.java deleted file mode 100644 index 01154148..00000000 --- a/roncoo-education-app-job/src/main/java/com/roncoo/education/server/job/VideoCrontab.java +++ /dev/null @@ -1,69 +0,0 @@ -package com.roncoo.education.server.job; - -import java.io.File; - -import com.roncoo.education.course.feign.interfaces.IFeignCourseVideo; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.scheduling.annotation.Scheduled; -import org.springframework.stereotype.Component; - -import com.roncoo.education.util.base.BaseController; -import com.roncoo.education.util.config.SystemUtil; -import com.xiaoleilu.hutool.io.FileUtil; - -/** - * 定时任务-视频处理 - * - * @author wuyun - */ -@Component -public class VideoCrontab extends BaseController { - - private static final Object KEY = new Object(); - private static boolean taskFlag = false; - - @Autowired - private IFeignCourseVideo feignCourseVideo; - - /** - * 定时任务每分钟执行一次
- * 注意：每个course服务都必须要对应有一个定时任务，针对服务器 - */ - @Scheduled(fixedRate = 60000) - public void orderCancel() { - synchronized (KEY) { - if (VideoCrontab.taskFlag) { - logger.warn("视频处理-任务已经启动"); - return; - } - VideoCrontab.taskFlag = true; - } - - int videoSum = 0; - - File file = new File(SystemUtil.PERIOD_VIDEO_PATH); - if (file.isDirectory()) {// isDirectory是否文件夹 - File[] files = file.listFiles();// listFiles是获取该目录下所有文件和目录的绝对路径 - for (File targetFile : files) { - - if (targetFile.isFile() && targetFile.exists()) { - if (FileUtil.newerThan(targetFile, (System.currentTimeMillis() - 7200000))) {// 上传两个小时内 - - try { - feignCourseVideo.handleScheduledTasks(targetFile); - videoSum = videoSum + 1; - } catch (Exception e) { - logger.error("视频定时任务处理失败", e); - } - - } - } - } - } - - VideoCrontab.taskFlag = false; - - logger.warn("视频处理-定时任务完成，处理视频数={}", videoSum); - } - -} diff --git a/roncoo-education-app-sba/src/main/java/com/roncoo/education/server/sba/ServerSbaApplication.java b/roncoo-education-app-sba/src/main/java/com/roncoo/education/app/sba/ServerSbaApplication.java similarity index 74% rename from roncoo-education-app-sba/src/main/java/com/roncoo/education/server/sba/ServerSbaApplication.java rename to roncoo-education-app-sba/src/main/java/com/roncoo/education/app/sba/ServerSbaApplication.java index adb51c01..e70e681a 100644 --- a/roncoo-education-app-sba/src/main/java/com/roncoo/education/server/sba/ServerSbaApplication.java +++ b/roncoo-education-app-sba/src/main/java/com/roncoo/education/app/sba/ServerSbaApplication.java @@ -1,21 +1,20 @@ /** * Copyright 2015-现在 广州市领课网络科技有限公司 */ -package com.roncoo.education.server.sba; +package com.roncoo.education.app.sba; +import de.codecentric.boot.admin.server.config.EnableAdminServer; import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.SpringBootApplication; import org.springframework.cloud.client.discovery.EnableDiscoveryClient; -import de.codecentric.boot.admin.server.config.EnableAdminServer; - @EnableAdminServer @EnableDiscoveryClient @SpringBootApplication public class ServerSbaApplication { - public static void main(String[] args) { - SpringApplication.run(ServerSbaApplication.class, args); - } + public static void main(String[] args) { + SpringApplication.run(ServerSbaApplication.class, args); + } } diff --git a/roncoo-education-app-sba/src/main/java/com/roncoo/education/app/sba/config/SecuritySecureConfig.java b/roncoo-education-app-sba/src/main/java/com/roncoo/education/app/sba/config/SecuritySecureConfig.java new file mode 100644 index 00000000..b34cd9fe --- /dev/null +++ b/roncoo-education-app-sba/src/main/java/com/roncoo/education/app/sba/config/SecuritySecureConfig.java @@ -0,0 +1,28 @@ +package com.roncoo.education.app.sba.config; + +import de.codecentric.boot.admin.server.config.AdminServerProperties; +import org.springframework.context.annotation.Configuration; +import org.springframework.security.config.annotation.web.builders.HttpSecurity; +import org.springframework.security.config.annotation.web.configuration.WebSecurityConfigurerAdapter; +import org.springframework.security.web.authentication.SavedRequestAwareAuthenticationSuccessHandler; +import org.springframework.security.web.csrf.CookieCsrfTokenRepository; + +@Configuration +public class SecuritySecureConfig extends WebSecurityConfigurerAdapter { + private final String adminContextPath; + + public SecuritySecureConfig(AdminServerProperties adminServerProperties) { + this.adminContextPath = adminServerProperties.getContextPath(); + } + + @Override + protected void configure(HttpSecurity http) throws Exception { + // @formatter:off + SavedRequestAwareAuthenticationSuccessHandler successHandler = new SavedRequestAwareAuthenticationSuccessHandler(); + successHandler.setTargetUrlParameter("redirectTo"); + successHandler.setDefaultTargetUrl(adminContextPath + "/"); + + http.authorizeRequests().antMatchers(adminContextPath + "/assets/**").permitAll().antMatchers(adminContextPath + "/login").permitAll().anyRequest().authenticated().and().formLogin().loginPage(adminContextPath + "/login").successHandler(successHandler).and().logout().logoutUrl(adminContextPath + "/logout").and().httpBasic().and().csrf().csrfTokenRepository(CookieCsrfTokenRepository.withHttpOnlyFalse()).ignoringAntMatchers(adminContextPath + "/instances", adminContextPath + "/actuator/**"); + // @formatter:on + } +} diff --git a/roncoo-education-app-sba/src/main/java/com/roncoo/education/server/sba/config/SecuritySecureConfig.java b/roncoo-education-app-sba/src/main/java/com/roncoo/education/server/sba/config/SecuritySecureConfig.java deleted file mode 100644 index 4f4a0573..00000000 --- a/roncoo-education-app-sba/src/main/java/com/roncoo/education/server/sba/config/SecuritySecureConfig.java +++ /dev/null @@ -1,29 +0,0 @@ -package com.roncoo.education.server.sba.config; - -import org.springframework.context.annotation.Configuration; -import org.springframework.security.config.annotation.web.builders.HttpSecurity; -import org.springframework.security.config.annotation.web.configuration.WebSecurityConfigurerAdapter; -import org.springframework.security.web.authentication.SavedRequestAwareAuthenticationSuccessHandler; -import org.springframework.security.web.csrf.CookieCsrfTokenRepository; - -import de.codecentric.boot.admin.server.config.AdminServerProperties; - -@Configuration -public class SecuritySecureConfig extends WebSecurityConfigurerAdapter { - private final String adminContextPath; - - public SecuritySecureConfig(AdminServerProperties adminServerProperties) { - this.adminContextPath = adminServerProperties.getContextPath(); - } - - @Override - protected void configure(HttpSecurity http) throws Exception { - // @formatter:off - SavedRequestAwareAuthenticationSuccessHandler successHandler = new SavedRequestAwareAuthenticationSuccessHandler(); - successHandler.setTargetUrlParameter("redirectTo"); - successHandler.setDefaultTargetUrl(adminContextPath + "/"); - - http.authorizeRequests().antMatchers(adminContextPath + "/assets/**").permitAll().antMatchers(adminContextPath + "/login").permitAll().anyRequest().authenticated().and().formLogin().loginPage(adminContextPath + "/login").successHandler(successHandler).and().logout().logoutUrl(adminContextPath + "/logout").and().httpBasic().and().csrf().csrfTokenRepository(CookieCsrfTokenRepository.withHttpOnlyFalse()).ignoringAntMatchers(adminContextPath + "/instances", adminContextPath + "/actuator/**"); - // @formatter:on - } -} \ No newline at end of file diff --git a/roncoo-education-util/src/main/resources/logback-roncoo.xml b/roncoo-education-util/src/main/resources/logback-roncoo.xml index a5d290da..8c965431 100644 --- a/roncoo-education-util/src/main/resources/logback-roncoo.xml +++ b/roncoo-education-util/src/main/resources/logback-roncoo.xml @@ -1,9 +1,10 @@ - + - + @@ -14,16 +15,16 @@ ${PATTERN} - - - + + + - + - + ${PATTERN} @@ -44,13 +45,13 @@ - - - + + + - - + + @@ -98,10 +99,10 @@ - + - + -- GitLab