Browse Source

删除通知服务

wangliang 2 năm trước cách đây
mục cha
commit
5b35bf3082

+ 0 - 1
pom.xml

@@ -14,7 +14,6 @@
         <module>themis-exam</module>
         <module>themis-mq</module>
         <module>themis-task</module>
-        <module>themis-notify</module>
     </modules>
 
     <parent>

+ 0 - 6
themis-admin/src/main/java/com/qmth/themis/admin/api/TSNotifyController.java

@@ -5,7 +5,6 @@ import com.qmth.themis.business.constant.SystemConstant;
 import com.qmth.themis.business.entity.TSBlackList;
 import com.qmth.themis.business.entity.TSNotify;
 import com.qmth.themis.business.service.TSNotifyService;
-import com.qmth.themis.business.service.ThemisCacheService;
 import com.qmth.themis.common.exception.BusinessException;
 import com.qmth.themis.common.util.Result;
 import com.qmth.themis.common.util.ResultUtil;
@@ -40,9 +39,6 @@ public class TSNotifyController {
     @Resource
     TSNotifyService tsNotifyService;
 
-    @Resource
-    ThemisCacheService themisCacheService;
-
     @ApiOperation(value = "系统通知信息查询接口")
     @RequestMapping(value = "/select", method = RequestMethod.POST)
     @ApiResponses({@ApiResponse(code = 200, message = "系统通知信息", response = TSBlackList.class)})
@@ -60,7 +56,6 @@ public class TSNotifyController {
             return ResultUtil.error(bindingResult.getAllErrors().get(0).getDefaultMessage());
         }
         tsNotifyService.saveOrUpdate(tsNotify);
-        themisCacheService.removeSysNotifyCache();
         return ResultUtil.ok(true);
     }
 
@@ -78,7 +73,6 @@ public class TSNotifyController {
 
         tsNotify.setEnable(enable);
         tsNotifyService.saveOrUpdate(tsNotify);
-        themisCacheService.removeSysNotifyCache();
         return ResultUtil.ok(true);
     }
 }

+ 0 - 3
themis-business/src/main/java/com/qmth/themis/business/constant/SystemConstant.java

@@ -76,7 +76,6 @@ public class SystemConstant {
     public static final String PREFIX_URL_NOTIFY = "/api/notify";
     public static final String PREFIX_URL_OE = "/api/oe";
     public static final String PREFIX_URL_MOBILE = "/api/mobile";
-    public static final String PREFIX_URL_SYS_NOTIFY = "/api/sys/notify";
 
     public static final String ATTACHMENT_TYPE = "attachment.type";
     public static final String ADMIN_LOGO_URL = "admin.logo.url";
@@ -94,7 +93,6 @@ public class SystemConstant {
     public static final String ADMIN_COMMON_SYSTEM_URLS = "admin.common.system.urls";
     public static final String EXAM_NO_AUTH_URLS = "exam.no.auth.urls";
     public static final String EXAM_COMMON_SYSTEM_URLS = "exam.common.system.urls";
-    public static final String NOTIFY_NO_AUTH_URLS = "notify.no.auth.urls";
 
     public static final String TENCENT_CLOUD_SDK_APPID = "tencentcloud.sdk.appId";
     public static final String TENCENT_CLOUD_SDK_KEY = "tencentcloud.sdk.key";
@@ -199,7 +197,6 @@ public class SystemConstant {
     public static final String EXAM_AUDIO_CACHE = "exam:audio:cache";
     public static final String ATTACHMENT_CACHE = "attachment:cache";
     public static final String BLACK_LIST_CACHE = "blacklist:cache";
-    public static final String SYS_NOTIFY_CACHE = "sys:notify:cache";
     public volatile static Searcher SEARCHER = null;
     public static final String ONLINE_WARN_INTERVAL = "online.warn.interval";
     public static final String ONLINE_WARN_SCALESIZE = "online.warn.scaleSize";

+ 0 - 19
themis-business/src/main/java/com/qmth/themis/business/service/ThemisCacheService.java

@@ -265,23 +265,4 @@ public interface ThemisCacheService {
      * 删除黑名单缓存
      */
     public void removeBlackListCache();
-
-    /**
-     * 系统通知缓存
-     *
-     * @return
-     */
-    public List<TSNotify> sysNotifyCache();
-
-    /**
-     * 修改系统通知缓存
-     *
-     * @return
-     */
-    public List<TSNotify> updateSysNotifyCache();
-
-    /**
-     * 删除系统通知缓存
-     */
-    public void removeSysNotifyCache();
 }

+ 0 - 31
themis-business/src/main/java/com/qmth/themis/business/service/impl/ThemisCacheServiceImpl.java

@@ -516,35 +516,4 @@ public class ThemisCacheServiceImpl implements ThemisCacheService {
     public void removeBlackListCache() {
 
     }
-
-    /**
-     * 系统通知缓存
-     *
-     * @return
-     */
-    @Override
-    @Cacheable(value = SystemConstant.SYS_NOTIFY_CACHE, unless = "#result == null")
-    public List<TSNotify> sysNotifyCache() {
-        return tsNotifyService.list(new QueryWrapper<TSNotify>().lambda().eq(TSNotify::getEnable, true));
-    }
-
-    /**
-     * 修改系统通知缓存
-     *
-     * @return
-     */
-    @Override
-    @CachePut(value = SystemConstant.SYS_NOTIFY_CACHE, condition = "#result != null")
-    public List<TSNotify> updateSysNotifyCache() {
-        return tsNotifyService.list(new QueryWrapper<TSNotify>().lambda().eq(TSNotify::getEnable, true));
-    }
-
-    /**
-     * 删除系统通知缓存
-     */
-    @Override
-    @CacheEvict(value = SystemConstant.SYS_NOTIFY_CACHE)
-    public void removeSysNotifyCache() {
-
-    }
 }

+ 0 - 7
themis-notify/Dockerfile

@@ -1,7 +0,0 @@
-FROM openjdk:8
-MAINTAINER luoshi luoshi@qmth.com.cn
-ENV TZ Asia/Shanghai
-
-ARG JAR_FILE
-COPY ${JAR_FILE} /opt/app.jar
-CMD java -XX:InitialRAMPercentage=50.0 -XX:MaxRAMPercentage=50.0 -XX:MetaspaceSize=128m -XX:MaxMetaspaceSize=128m $JAVA_OPTS -jar /opt/app.jar

+ 0 - 16
themis-notify/README.md

@@ -1,16 +0,0 @@
-在线考试平台-通知管理
-
-项目模块:
-notify
-
-项目框架:
-java8,spring boot2.3.0,rocketmq
-
-数据库:
-mysql8.0
-
-部署:
-docker
-
-附件:
-本地或oss存储

+ 0 - 67
themis-notify/pom.xml

@@ -1,67 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         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.qmth.themis.notify</groupId>
-    <artifactId>themis-notify</artifactId>
-    <version>1.2.5</version>
-    <packaging>jar</packaging>
-
-    <parent>
-        <groupId>com.qmth.themis</groupId>
-        <artifactId>themis-service</artifactId>
-        <version>1.2.5</version>
-    </parent>
-
-    <dependencies>
-        <dependency>
-            <groupId>com.qmth.themis.mq</groupId>
-            <artifactId>themis-mq</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-starter-web</artifactId>
-        </dependency>
-        <!--        <dependency>-->
-        <!--            <groupId>org.springframework.boot</groupId>-->
-        <!--            <artifactId>spring-boot-starter-data-mongodb</artifactId>-->
-        <!--        </dependency>-->
-        <!--        <dependency>-->
-        <!--            <groupId>org.springframework.boot</groupId>-->
-        <!--            <artifactId>spring-boot-starter-data-elasticsearch</artifactId>-->
-        <!--        </dependency>-->
-        <dependency>
-            <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-starter-websocket</artifactId>
-        </dependency>
-    </dependencies>
-
-    <build>
-        <plugins>
-            <plugin>
-                <groupId>org.springframework.boot</groupId>
-                <artifactId>spring-boot-maven-plugin</artifactId>
-                <version>2.6.2</version>
-                <configuration>
-                    <includeSystemScope>true</includeSystemScope>
-                </configuration>
-            </plugin>
-
-            <plugin>
-                <groupId>com.spotify</groupId>
-                <artifactId>dockerfile-maven-plugin</artifactId>
-                <version>1.4.12</version>
-                <configuration>
-                    <repository>registry.cn-shenzhen.aliyuncs.com/online_exam/notify</repository>
-                    <tag>${project.version}</tag>
-                    <contextDirectory>${project.baseDir}</contextDirectory>
-                    <useMavenSettingsForAuth>true</useMavenSettingsForAuth>
-                    <pullNewerImage>true</pullNewerImage>
-                    <buildArgs>
-                        <JAR_FILE>target/${project.build.finalName}.jar</JAR_FILE>
-                    </buildArgs>
-                </configuration>
-            </plugin>
-        </plugins>
-    </build>
-</project>

+ 0 - 28
themis-notify/src/main/java/com/qmth/themis/notify/ThemisNotifyApplication.java

@@ -1,28 +0,0 @@
-package com.qmth.themis.notify;
-
-import org.mybatis.spring.annotation.MapperScan;
-import org.springframework.boot.SpringApplication;
-import org.springframework.boot.autoconfigure.SpringBootApplication;
-import org.springframework.boot.autoconfigure.domain.EntityScan;
-import org.springframework.cache.annotation.EnableCaching;
-import org.springframework.context.annotation.ComponentScan;
-import org.springframework.scheduling.annotation.EnableAsync;
-import org.springframework.scheduling.annotation.EnableScheduling;
-import org.springframework.transaction.annotation.EnableTransactionManagement;
-
-@SpringBootApplication
-@ComponentScan(basePackages = {"com.qmth.themis"})
-@MapperScan("com.qmth.themis.business.dao")
-//主要就是定义扫描的路径从中找出标识了需要装配的类自动装配到spring的bean容器中,做过web开发的同学一定都有用过@Controller,@Service,@Repository注解,查看其源码你会发现,他们中有一个共同的注解@Component,没错@ComponentScan注解默认就会装配标识了@Controller,@Service,@Repository,@Component注解的类到spring容器中
-@EntityScan(basePackages = {"com.qmth.themis.business.entity"}) // 用来扫描和发现指定包及其子包中的Entity定义
-@EnableTransactionManagement // spring开启事务支持
-@EnableAsync // 开启异步任务
-@EnableCaching // 开启缓存注解
-@EnableScheduling//开启定时任务
-public class ThemisNotifyApplication {
-
-    public static void main(String[] args) {
-        SpringApplication.run(ThemisNotifyApplication.class, args);
-    }
-
-}

+ 0 - 45
themis-notify/src/main/java/com/qmth/themis/notify/api/TSNotifyController.java

@@ -1,45 +0,0 @@
-package com.qmth.themis.notify.api;
-
-import com.qmth.themis.business.constant.SystemConstant;
-import com.qmth.themis.business.entity.TSBlackList;
-import com.qmth.themis.business.service.ThemisCacheService;
-import com.qmth.themis.common.util.Result;
-import com.qmth.themis.common.util.ResultUtil;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import io.swagger.annotations.ApiResponse;
-import io.swagger.annotations.ApiResponses;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.RestController;
-
-import javax.annotation.Resource;
-
-/**
- * <p>
- * 系统通知表 前端控制器
- * </p>
- *
- * @author wangliang
- * @since 2023-02-01
- */
-@Api(tags = "系统通知信息Controller")
-@RestController
-@RequestMapping(SystemConstant.PREFIX_URL_SYS_NOTIFY)
-@Validated
-public class TSNotifyController {
-    private final static Logger log = LoggerFactory.getLogger(TSNotifyController.class);
-
-    @Resource
-    ThemisCacheService themisCacheService;
-
-    @ApiOperation(value = "系统通知信息查询接口")
-    @RequestMapping(value = "/select", method = RequestMethod.POST)
-    @ApiResponses({@ApiResponse(code = 200, message = "系统通知信息", response = TSBlackList.class)})
-    public Result select() {
-        return ResultUtil.ok(themisCacheService.sysNotifyCache());
-    }
-}

+ 0 - 88
themis-notify/src/main/java/com/qmth/themis/notify/aspect/ApiControllerAspect.java

@@ -1,88 +0,0 @@
-package com.qmth.themis.notify.aspect;
-
-import com.qmth.themis.business.constant.SystemConstant;
-import com.qmth.themis.business.util.JacksonUtil;
-import com.qmth.themis.business.util.ServletUtil;
-import com.qmth.themis.common.exception.BusinessException;
-import com.qmth.themis.common.util.ResultUtil;
-import org.aspectj.lang.ProceedingJoinPoint;
-import org.aspectj.lang.annotation.Around;
-import org.aspectj.lang.annotation.Aspect;
-import org.aspectj.lang.annotation.Pointcut;
-import org.aspectj.lang.reflect.MethodSignature;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.stereotype.Component;
-import org.springframework.validation.BeanPropertyBindingResult;
-import org.springframework.web.multipart.MultipartFile;
-import org.springframework.web.multipart.commons.CommonsMultipartFile;
-
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import java.util.Objects;
-import java.util.StringJoiner;
-
-/**
- * @Description: api aspect
- * @Param:
- * @return:
- * @Author: wangliang
- * @Date: 2020/5/12
- */
-@Aspect
-@Component
-public class ApiControllerAspect {
-    private final static Logger log = LoggerFactory.getLogger(ApiControllerAspect.class);
-
-    /**
-     * api切入点
-     */
-    @Pointcut("execution(public * com.qmth.themis.notify.api.*.*(..))")
-    public void apiAspect() {
-    }
-
-    /**
-     * 后台环绕切入
-     *
-     * @param joinPoint
-     * @return
-     * @throws Throwable
-     */
-    @Around(value = "apiAspect()")
-    public Object aroundApiPoint(ProceedingJoinPoint joinPoint) throws Throwable {
-        long start = System.currentTimeMillis();
-        StringJoiner stringJoiner = new StringJoiner("");
-        try {
-            MethodSignature msig = (MethodSignature) joinPoint.getSignature();
-            String className = msig.getDeclaringTypeName();
-            String methodName = msig.getName();
-            Object[] args = joinPoint.getArgs();
-            String[] paramsName = msig.getParameterNames();
-            HttpServletRequest request = ServletUtil.getRequest();
-            stringJoiner.add("============请求地址============:").add(request.getServletPath()).add("\r\n");
-            stringJoiner.add("============类============:").add(className).add("\r\n");
-            stringJoiner.add("============方法============:").add(methodName).add("\r\n");
-            if (Objects.nonNull(args) && args.length > 0) {
-                for (int i = 0; i < args.length; i++) {
-                    if (Objects.nonNull(args[i]) && (args[i] instanceof HttpServletRequest || args[i] instanceof HttpServletResponse || args[i] instanceof CommonsMultipartFile || args[i] instanceof MultipartFile || args[i] instanceof BeanPropertyBindingResult)) {
-                        continue;
-                    } else {
-                        stringJoiner.add("参数key:").add(JacksonUtil.parseJson(paramsName[i])).add(",参数value:").add(JacksonUtil.parseJson(args[i])).add("\r\n");
-                    }
-                }
-            }
-            return joinPoint.proceed();
-        } catch (Exception e) {
-            log.error(SystemConstant.LOG_ERROR, e);
-            if (e instanceof BusinessException) {
-                return ResultUtil.error((BusinessException) e, e.getMessage());
-            } else {
-                return ResultUtil.error(e.getMessage());
-            }
-        } finally {
-            long end = System.currentTimeMillis();
-            stringJoiner.add("============耗时============:").add((end - start) / 1000 + "").add("秒");
-            log.info("request:{}", stringJoiner.toString());
-        }
-    }
-}

+ 0 - 40
themis-notify/src/main/java/com/qmth/themis/notify/config/DictionaryConfig.java

@@ -1,40 +0,0 @@
-package com.qmth.themis.notify.config;
-
-import com.qmth.themis.business.domain.AliYunOssDomain;
-import com.qmth.themis.business.domain.SysDomain;
-import org.springframework.boot.context.properties.ConfigurationProperties;
-import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.Configuration;
-
-/**
- * @Description: 数据字典
- * @Param:
- * @return:
- * @Author: wangliang
- * @Date: 2020/4/10
- */
-@Configuration
-public class DictionaryConfig {
-
-    /**
-     * 系统配置
-     *
-     * @return
-     */
-    @Bean
-    @ConfigurationProperties(prefix = "sys.config", ignoreUnknownFields = false)
-    public SysDomain sysDomain() {
-        return new SysDomain();
-    }
-
-    /**
-     * 阿里云oss配置
-     *
-     * @return
-     */
-    @Bean
-    @ConfigurationProperties(prefix = "aliyun.oss", ignoreUnknownFields = false)
-    public AliYunOssDomain aliYunOssDomain() {
-        return new AliYunOssDomain();
-    }
-}

+ 0 - 56
themis-notify/src/main/java/com/qmth/themis/notify/config/DruidConfig.java

@@ -1,56 +0,0 @@
-//package com.qmth.themis.notify.config;
-//
-//import com.alibaba.druid.pool.DruidDataSource;
-//import com.alibaba.druid.support.http.StatViewServlet;
-//import com.alibaba.druid.support.http.WebStatFilter;
-//import org.springframework.boot.context.properties.ConfigurationProperties;
-//import org.springframework.boot.web.servlet.FilterRegistrationBean;
-//import org.springframework.boot.web.servlet.ServletRegistrationBean;
-//import org.springframework.context.annotation.Bean;
-//import org.springframework.context.annotation.Configuration;
-//
-//import javax.sql.DataSource;
-//
-///**
-// * @Description: druid数据源配置
-// * @Param:
-// * @return:
-// * @Author: wangliang
-// * @Date: 2019/10/11
-// */
-//@Configuration
-//public class DruidConfig {
-//
-//    @Bean
-//    public ServletRegistrationBean druidServlet() {
-//        ServletRegistrationBean servletRegistrationBean = new ServletRegistrationBean(new StatViewServlet(), "/druid/*");
-//        // IP白名单
-//        servletRegistrationBean.addInitParameter("allow", "*");
-//        // IP黑名单(共同存在时,deny优先于allow)
-////        servletRegistrationBean.addInitParameter("deny", "192.168.1.206");
-//        //控制台管理用户
-//        servletRegistrationBean.addInitParameter("loginUsername", "admin");
-//        servletRegistrationBean.addInitParameter("loginPassword", "admin");
-//        //是否能够重置数据 禁用HTML页面上的“Reset All”功能
-//        servletRegistrationBean.addInitParameter("resetEnable", "false");
-//        return servletRegistrationBean;
-//    }
-//
-//    @Bean
-//    public FilterRegistrationBean filterRegistrationBean() {
-//        FilterRegistrationBean filterRegistrationBean = new FilterRegistrationBean(new WebStatFilter());
-//        filterRegistrationBean.addUrlPatterns("/*");
-//        filterRegistrationBean.addInitParameter("exclusions", "*.js,*.gif,*.jpg,*.png,*.css,*.ico,/druid/*");
-//        return filterRegistrationBean;
-//    }
-//
-//    /**
-//     * 单数据源可以直接放开以下注释行
-//     */
-//    @Bean
-//    @ConfigurationProperties(prefix = "spring.datasource")
-//    public DataSource druid() {
-//        return new DruidDataSource();
-//    }
-//}
-//

+ 0 - 73
themis-notify/src/main/java/com/qmth/themis/notify/config/SwaggerConfig.java

@@ -1,73 +0,0 @@
-package com.qmth.themis.notify.config;
-
-import com.google.common.base.Predicates;
-import com.qmth.themis.common.contanst.Constants;
-import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.Configuration;
-import springfox.documentation.builders.ParameterBuilder;
-import springfox.documentation.builders.PathSelectors;
-import springfox.documentation.builders.RequestHandlerSelectors;
-import springfox.documentation.schema.ModelRef;
-import springfox.documentation.service.ApiInfo;
-import springfox.documentation.service.Parameter;
-import springfox.documentation.spi.DocumentationType;
-import springfox.documentation.spring.web.plugins.Docket;
-import springfox.documentation.swagger2.annotations.EnableSwagger2;
-
-import java.util.ArrayList;
-import java.util.List;
-
-/**
- * @Description: swagger配置类
- * @Param:
- * @return:
- * @Author: wangliang
- * @Date: 2019/9/21
- */
-@Configuration
-@EnableSwagger2
-public class SwaggerConfig {
-
-    @Bean
-    public Docket createRestApi() {
-        ParameterBuilder tokenPar = new ParameterBuilder();
-        ParameterBuilder tokenPar1 = new ParameterBuilder();
-        ParameterBuilder tokenPar2 = new ParameterBuilder();
-        ParameterBuilder tokenPar3 = new ParameterBuilder();
-        List<Parameter> pars = new ArrayList<>();
-        tokenPar.name(Constants.HEADER_PLATFORM).description("平台").modelRef(new ModelRef("string")).parameterType("header").required(false).build();
-        tokenPar1.name(Constants.HEADER_DEVICE_ID).description("设备id").modelRef(new ModelRef("string")).parameterType("header").required(false).build();
-        tokenPar2.name(Constants.HEADER_AUTHORIZATION).description("鉴权token").modelRef(new ModelRef("string")).parameterType("header").required(false).build();
-        tokenPar3.name(Constants.HEADER_TIME).description("时间戳").modelRef(new ModelRef("long")).parameterType("header").required(false).build();
-        pars.add(tokenPar.build());
-        pars.add(tokenPar1.build());
-        pars.add(tokenPar2.build());
-        pars.add(tokenPar3.build());
-
-        return new Docket(DocumentationType.SWAGGER_2)
-                .groupName("themis-notify")
-                .select()
-                .apis(RequestHandlerSelectors.basePackage("com.qmth.themis.notify"))
-//                .apis(RequestHandlerSelectors.any())
-                .paths(PathSelectors.any())
-                // 不显示错误的接口地址 
-                .paths(Predicates.not(PathSelectors.regex("/error.*")))// 错误路径不监控
-                .build()
-                .globalOperationParameters(pars)
-                .apiInfo(apiInfo());
-    }
-
-    private ApiInfo apiInfo() {
-        ApiInfo apiInfo = new ApiInfo(
-                "在线考试平台-通知管理 - api",
-                "Some custom description of API.",
-                "API TOS",
-                "Terms of service",
-                "myeaddress@company.com",
-                "License of API",
-                "API license URL");
-        return apiInfo;
-    }
-}
- 
-

+ 0 - 44
themis-notify/src/main/java/com/qmth/themis/notify/config/WebMvcConfig.java

@@ -1,44 +0,0 @@
-package com.qmth.themis.notify.config;
-
-import com.qmth.themis.business.constant.SystemConstant;
-import com.qmth.themis.business.entity.SysConfig;
-import com.qmth.themis.business.service.ThemisCacheService;
-import com.qmth.themis.common.exception.BusinessException;
-import com.qmth.themis.notify.interceptor.AuthInterceptor;
-import org.apache.commons.lang3.StringUtils;
-import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.Configuration;
-import org.springframework.web.servlet.config.annotation.InterceptorRegistry;
-import org.springframework.web.servlet.config.annotation.WebMvcConfigurer;
-
-import javax.annotation.Resource;
-import java.util.Arrays;
-import java.util.Optional;
-
-/**
- * @Description: 路径拦截器
- * @Param:
- * @return:
- * @Author: wangliang
- * @Date: 2020/6/27
- */
-@Configuration
-public class WebMvcConfig implements WebMvcConfigurer {
-
-    @Resource
-    ThemisCacheService themisCacheService;
-
-    @Bean
-    public AuthInterceptor AuthInterceptor() {
-        return new AuthInterceptor();
-    }
-
-    @Override
-    public void addInterceptors(InterceptorRegistry registry) {
-        SysConfig sysConfig = themisCacheService.addSysConfigCache(SystemConstant.NOTIFY_NO_AUTH_URLS);
-        Optional.ofNullable(sysConfig).orElseThrow(() -> new BusinessException("未配置notify无需鉴权的url"));
-
-        registry.addInterceptor(AuthInterceptor()).addPathPatterns(SystemConstant.ALL_PATH)
-                .excludePathPatterns(Arrays.asList(StringUtils.split(sysConfig.getConfigValue(), ",")));
-    }
-}

+ 0 - 36
themis-notify/src/main/java/com/qmth/themis/notify/interceptor/AuthInterceptor.java

@@ -1,36 +0,0 @@
-package com.qmth.themis.notify.interceptor;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.web.servlet.HandlerInterceptor;
-import org.springframework.web.servlet.ModelAndView;
-
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
-/**
- * @Description: 鉴权拦截器
- * @Param:
- * @return:
- * @Author: wangliang
- * @Date: 2020/6/27
- */
-public class AuthInterceptor implements HandlerInterceptor {
-    private final static Logger log = LoggerFactory.getLogger(AuthInterceptor.class);
-
-    @Override
-    public boolean preHandle(HttpServletRequest request, HttpServletResponse response, Object object) {
-        return true;
-    }
-
-    @Override
-    public void postHandle(HttpServletRequest request, HttpServletResponse response, Object o,
-                           ModelAndView modelAndView) throws Exception {
-
-    }
-
-    @Override
-    public void afterCompletion(HttpServletRequest request, HttpServletResponse response, Object o, Exception e)
-            throws Exception {
-    }
-}

+ 0 - 26
themis-notify/src/main/java/com/qmth/themis/notify/start/StartRunning.java

@@ -1,26 +0,0 @@
-package com.qmth.themis.notify.start;
-
-import com.qmth.themis.business.constant.SystemConstant;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.boot.CommandLineRunner;
-import org.springframework.stereotype.Component;
-
-/**
- * @Description: 服务启动时初始化运行,哪个微服务模块需要则拿此模版去用
- * @Param:
- * @return:
- * @Author: wangliang
- * @Date: 2020/7/3
- */
-@Component
-public class StartRunning implements CommandLineRunner {
-    private final static Logger log = LoggerFactory.getLogger(StartRunning.class);
-
-    @Override
-    public void run(String... args) throws Exception {
-        log.info("服务器启动时执行 start");
-        SystemConstant.initTempFiles();
-        log.info("服务器启动时执行 end");
-    }
-}

+ 0 - 83
themis-notify/src/main/resources/application.properties

@@ -1,83 +0,0 @@
-#\u7AEF\u53E3\u914D\u7F6E
-server.port=6005
-#tomcat\u6700\u5927\u7EBF\u7A0B\u6570\uFF0C\u9ED8\u8BA4\u4E3A200
-server.tomcat.threads.max=250
-#tomcat\u6700\u5927\u8FDE\u63A5\u6570
-server.tomcat.max-connections=2500
-#tomcat\u7684URI\u7F16\u7801
-server.tomcat.uri-encoding=UTF-8
-
-#\u9879\u76EE\u540D\u79F0
-spring.application.name=themis-notify
-
-#\u6570\u636E\u6E90\u914D\u7F6E
-db.host=localhost
-db.port=3306
-db.name=themis_v1.1
-db.username=root
-db.password=123456789
-
-#redis\u6570\u636E\u6E90\u914D\u7F6E
-com.qmth.redis.host=${db.host}
-com.qmth.redis.port=6379
-com.qmth.redis.db=13
-#com.qmth.redis.password=
-
-#mysql\u914D\u7F6E
-com.qmth.datasource.url=jdbc:mysql://${db.host}:${db.port}/${db.name}?serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=UTF-8&nullCatalogMeansCurrent=true
-com.qmth.datasource.username=${db.username}
-com.qmth.datasource.password=${db.password}
-com.qmth.mybatis.log-level=debug
-
-#\u65E5\u5FD7\u914D\u7F6E
-logging.level.root=info
-
-#\u65E5\u671F\u683C\u5F0F\u5316
-spring.jackson.date-format=yyyy-MM-dd HH:mm:ss
-spring.jackson.time-zone=GMT+8
-
-aliyun.oss.publicName=oss-cn-shenzhen.aliyuncs.com
-aliyun.oss.publicEndpoint=http://${aliyun.oss.publicName}
-aliyun.oss.publicAccessKeyId=LTAI4FnJ2pgV6aGceYcCkeEi
-aliyun.oss.publicAccessKeySecret=ktrMEVE7PfoxRPeJUPDFeygOIH4aU7
-aliyun.oss.publicBucket=qmth-test
-aliyun.oss.publicUrl=http://${aliyun.oss.publicBucket}.${aliyun.oss.publicName}
-
-aliyun.oss.privateName=oss-cn-shenzhen.aliyuncs.com
-aliyun.oss.privateEndpoint=http://${aliyun.oss.privateName}
-aliyun.oss.privateAccessKeyId=LTAI4FnJ2pgV6aGceYcCkeEi
-aliyun.oss.privateAccessKeySecret=ktrMEVE7PfoxRPeJUPDFeygOIH4aU7
-aliyun.oss.privateBucket=qmth-test
-aliyun.oss.privateUrl=http://static-test.qmth.com.cn
-
-#\u7CFB\u7EDF\u914D\u7F6E
-sys.config.datacenterId=4
-sys.config.oss=true
-sys.config.serverUpload=/Users/king/git/themis-files/
-spring.resources.static-locations=file:${sys.config.serverUpload},classpath:/META-INF/resources/,classpath:/resources/
-
-#============================================================================
-# \u914D\u7F6Erocketmq
-#============================================================================
-#namesrv\u5730\u5740
-rocketmq.name-server=192.168.10.36:9876
-#\u53D1\u9001\u6D88\u606F\u8D85\u65F6\u65F6\u95F4\uFF0C\u5355\u4F4D\u6BEB\u79D2\u3002\u9ED8\u8BA410000
-rocketmq.producer.send-message-timeout=300000
-#Producer\u7EC4\u540D\uFF0C\u591A\u4E2AProducer\u5982\u679C\u5C5E\u4E8E\u4E00\u4E2A\u5E94\u7528\uFF0C\u53D1\u9001\u540C\u6837\u7684\u6D88\u606F\uFF0C\u5219\u5E94\u8BE5\u5C06\u5B83\u4EEC\u5F52\u4E3A\u540C\u4E00\u7EC4\u3002\u9ED8\u8BA4DEFAULT_PRODUCER
-rocketmq.producer.group=my-group
-#\u5BA2\u6237\u7AEF\u9650\u5236\u7684\u6D88\u606F\u5927\u5C0F\uFF0C\u8D85\u8FC7\u62A5\u9519\uFF0C\u540C\u65F6\u670D\u52A1\u7AEF\u4E5F\u4F1A\u9650\u5236\uFF0C\u9700\u8981\u8DDF\u670D\u52A1\u7AEF\u914D\u5408\u4F7F\u7528\u3002\u9ED8\u8BA44MB
-rocketmq.producer.compress-message-body-threshold=4096
-rocketmq.producer.max-message-size=4194304
-#\u5982\u679C\u6D88\u606F\u53D1\u9001\u5931\u8D25\uFF0C\u6700\u5927\u91CD\u8BD5\u6B21\u6570\uFF0C\u8BE5\u53C2\u6570\u53EA\u5BF9\u5F02\u6B65\u53D1\u9001\u6A21\u5F0F\u8D77\u4F5C\u7528\u3002\u9ED8\u8BA42
-rocketmq.producer.retry-times-when-send-async-failed=3
-#\u5982\u679C\u6D88\u606F\u53D1\u9001\u5931\u8D25\uFF0C\u662F\u5426\u7EE7\u7EED\u53D1\u4E0B\u4E00\u6761
-rocketmq.producer.retry-next-server=true
-#\u5982\u679C\u6D88\u606F\u53D1\u9001\u5931\u8D25\uFF0C\u6700\u5927\u91CD\u8BD5\u6B21\u6570\uFF0C\u8BE5\u53C2\u6570\u53EA\u5BF9\u540C\u6B65\u53D1\u9001\u6A21\u5F0F\u8D77\u4F5C\u7528\u3002\u9ED8\u8BA42
-rocketmq.producer.retry-times-when-send-failed=3
-#ACK
-rocketmq.producer.access-key=AK
-rocketmq.producer.secret-key=SK
-#\u542F\u7528\u6D88\u606F\u8F68\u8FF9\uFF0C\u9ED8\u8BA4\u503Ctrue
-rocketmq.producer.enable-msg-trace=true
-#\u81EA\u5B9A\u4E49\u7684\u6D88\u606F\u8F68\u8FF9\u4E3B\u9898
-#rocketmq.producer.customized-trace-topic=my-trace-topic

+ 0 - 42
themis-notify/src/main/resources/logback-spring.xml

@@ -1,42 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<configuration debug="true" scan="true" scanPeriod="30 seconds">
-
-    <springProperty scope="context" name="logLevel" source="logging.level.root" />
-
-    <appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
-        <encoder>
-            <pattern>%d{yyyy-MM-dd HH:mm:ss.SSS}| %thread | %level | %X{TRACE_ID} - %X{KEY} | %m | [%class:%line]%n</pattern>
-            <charset>UTF-8</charset>
-        </encoder>
-    </appender>
-
-    <!-- debug 日志 -->
-    <appender name="DEBUG_APPENDER" class="ch.qos.logback.core.rolling.RollingFileAppender">
-        <file>logs/themis-notify.log</file>
-        <encoder>
-            <pattern>%d{yyyy-MM-dd HH:mm:ss.SSS}| %thread | %level | %X{TRACE_ID} - %X{KEY} | %m | [%class:%line]%n</pattern>
-            <charset>UTF-8</charset>
-        </encoder>
-        <rollingPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedRollingPolicy">
-            <fileNamePattern>logs/themis-notify.%d{yyyy-MM-dd}.%i.log</fileNamePattern>
-            <maxHistory>100</maxHistory>
-            <maxFileSize>100MB</maxFileSize>
-        </rollingPolicy>
-    </appender>
-
-    <logger name="org.springframework" level="${logLevel}" additivity="false">
-        <appender-ref ref="DEBUG_APPENDER"/>
-        <appender-ref ref="STDOUT" />
-    </logger>
-
-    <logger name="com.qmth.themis.notify" level="${logLevel}" additivity="false">
-        <appender-ref ref="DEBUG_APPENDER" />
-        <appender-ref ref="STDOUT" />
-    </logger>
-
-    <root level="INFO">
-        <appender-ref ref="DEBUG_APPENDER" />
-        <appender-ref ref="STDOUT" />
-    </root>
-
-</configuration>