From 66d3d4812b26e4f8bbbe5a41cbcfaa5c951ab807 Mon Sep 17 00:00:00 2001 From: winter Date: Sun, 31 Dec 2023 20:35:43 +0800 Subject: [PATCH] fix --- yqzjSchedule/pom.xml | 157 --------- .../com/iformall/ScheduleApplication.java | 89 ----- .../java/com/iformall/config/AwsProperty.java | 52 --- .../iformall/config/MyBatisConfiguration.java | 28 -- .../java/com/iformall/config/RedisConfig.java | 332 ------------------ .../java/com/iformall/config/RestFilter.java | 58 --- .../iformall/config/RestTemplateConfig.java | 24 -- .../com/iformall/config/SchedulingConfig.java | 19 - .../java/com/iformall/config/WebConfig.java | 79 ----- .../iformall/controller/HomeController.java | 40 --- .../schedule/ProductOrderSchedule.java | 32 -- .../src/main/resources/application-dev.yml | 205 ----------- .../src/main/resources/application-prod.yml | 161 --------- .../src/main/resources/application-yqzj.yml | 169 --------- .../src/main/resources/application.yml | 71 ---- .../src/main/resources/logback-spring.xml | 100 ------ .../mapper/YqzjGuangGaoWeiMapper.xml | 2 +- .../resources/mapper/YqzjHotNewsMapper.xml | 2 +- .../resources/mapper/YqzjPageNewsMapper.xml | 2 +- 19 files changed, 3 insertions(+), 1619 deletions(-) delete mode 100644 yqzjSchedule/pom.xml delete mode 100644 yqzjSchedule/src/main/java/com/iformall/ScheduleApplication.java delete mode 100644 yqzjSchedule/src/main/java/com/iformall/config/AwsProperty.java delete mode 100644 yqzjSchedule/src/main/java/com/iformall/config/MyBatisConfiguration.java delete mode 100644 yqzjSchedule/src/main/java/com/iformall/config/RedisConfig.java delete mode 100644 yqzjSchedule/src/main/java/com/iformall/config/RestFilter.java delete mode 100644 yqzjSchedule/src/main/java/com/iformall/config/RestTemplateConfig.java delete mode 100644 yqzjSchedule/src/main/java/com/iformall/config/SchedulingConfig.java delete mode 100644 yqzjSchedule/src/main/java/com/iformall/config/WebConfig.java delete mode 100644 yqzjSchedule/src/main/java/com/iformall/controller/HomeController.java delete mode 100644 yqzjSchedule/src/main/java/com/iformall/schedule/ProductOrderSchedule.java delete mode 100644 yqzjSchedule/src/main/resources/application-dev.yml delete mode 100644 yqzjSchedule/src/main/resources/application-prod.yml delete mode 100644 yqzjSchedule/src/main/resources/application-yqzj.yml delete mode 100644 yqzjSchedule/src/main/resources/application.yml delete mode 100644 yqzjSchedule/src/main/resources/logback-spring.xml diff --git a/yqzjSchedule/pom.xml b/yqzjSchedule/pom.xml deleted file mode 100644 index 125c3e9..0000000 --- a/yqzjSchedule/pom.xml +++ /dev/null @@ -1,157 +0,0 @@ - - - 4.0.0 - - - yqzj - com.iformall - 1.0 - - - yqzjSchedule - - - - com.iformall - yqzjService - 1.0 - - - - - - - org.springframework.boot - spring-boot-maven-plugin - - true - ZIP - - antlr, - cn.afterturn, - ch.qos.logback, - com.alibaba, - com.amazonaws, - com.baomidou, - com.mchange, - com.fasterxml.jackson.core, - com.fasterxml.jackson.dataformat, - com.fasterxml.jackson.datatype, - com.fasterxml.jackson.module, - com.fasterxml.uuid, - com.fasterxml, - com.github.axet, - com.github.jsqlparser, - com.github.pagehelper, - com.github.ulisesbocchio, - com.github.virtuald, - com.google.code.findbugs, - com.google.code.gson, - com.google.errorprone, - com.google.guava, - com.google.protobuf, - com.google.zxing, - com.jayway.jsonpath, - com.jhlabs, - com.puppycrawl.tools, - com.rabbitmq, - com.squareup.okhttp3, - com.squareup.okio, - com.sun, - com.sun.mail, - com.thoughtworks.xstream, - com.zaxxer, - commons-beanutils, - commons-cli, - commons-codec, - commons-collections, - commons-fileupload, - commons-io, - commons-logging, - io.lettuce, - io.netty, - io.projectreactor, - io.springfox, - io.swagger, - io.undertow, - javax.activation, - javax.annotation, - javax.mail, - javax.persistence, - javax.servlet, - javax.validation, - javax.xml.bind, - javax.xml.soap, - javax.xml.ws, - joda-time, - junit, - mysql, - net.bytebuddy, - net.minidev, - net.sf.dozer, - net.sf.saxon, - ognl, - org.antlr, - org.apache.commons, - org.apache.httpcomponents, - org.apache.logging.log4j, - org.apache.poi, - org.apache.poi.wso2, - org.apache.rocketmq, - org.apache.shiro, - org.apache.tomcat.embed, - org.apache.xmlbeans, - org.aspectj, - org.assertj, - org.bouncycastle, - org.checkerframework, - org.codehaus.mojo, - org.crazycake, - org.dom4j, - org.flowable, - org.flywaydb, - org.glassfish, - org.hibernate.validator, - org.jasypt, - org.javassist, - org.jboss.logging, - org.jboss.spec.javax.annotation, - org.jboss.spec.javax.websocket, - org.jboss.xnio, - org.jdom, - org.jodd, - org.jvnet.mimepull, - org.jvnet.staxex, - org.mapstruct, - org.mockito, - org.mybatis, - org.mybatis.generator, - org.mybatis.spring.boot, - org.ow2.asm, - org.projectlombok, - org.quartz-scheduler, - org.reactivestreams, - org.reflections, - org.rocketmq.spring.boot, - org.slf4j, - org.springframework, - org.springframework.amqp, - org.springframework.boot, - org.springframework.data, - org.springframework.retry, - org.springframework.ws, - org.yaml, - redis.clients, - software.amazon.ion, - tk.mybatis, - xmlpull, - xpp3 - - - - - - - \ No newline at end of file diff --git a/yqzjSchedule/src/main/java/com/iformall/ScheduleApplication.java b/yqzjSchedule/src/main/java/com/iformall/ScheduleApplication.java deleted file mode 100644 index e1a800d..0000000 --- a/yqzjSchedule/src/main/java/com/iformall/ScheduleApplication.java +++ /dev/null @@ -1,89 +0,0 @@ -package com.iformall; - -import com.ulisesbocchio.jasyptspringboot.annotation.EnableEncryptableProperties; -import org.mybatis.spring.annotation.MapperScan; -import org.rocketmq.starter.annotation.EnableRocketMQ; -import org.springframework.beans.factory.annotation.Value; -import org.springframework.boot.SpringApplication; -import org.springframework.boot.autoconfigure.SpringBootApplication; -import org.springframework.context.annotation.Bean; -import org.springframework.context.annotation.EnableAspectJAutoProxy; -import org.springframework.scheduling.annotation.EnableAsync; -import org.springframework.scheduling.annotation.EnableScheduling; - -import springfox.documentation.swagger2.annotations.EnableSwagger2; - -/** - * @author chenkx - * @date 2017-12-26 - */ -@SpringBootApplication -@MapperScan(basePackages = {"com.iformall.mapper"}) -@EnableSwagger2 -@EnableRocketMQ -@EnableEncryptableProperties -@EnableAspectJAutoProxy(exposeProxy = true) -@EnableScheduling -@EnableAsync -public class ScheduleApplication { - - @Value("${fm.exception}") - private boolean fmException; - - @Value("${fm.exception_emails}") - private String fmExceptionEmails; - - @Value("${fm.open}") - private boolean fmOpen; - - @Value("${fm.upload_dir}") - private String uploadDir; - - @Value("${fm.monitor_emails}") - private String fmMonitorEmails; - - @Value("${fm.monitor_enable}") - private boolean fmMonitor; - - @Value("${fm.videoType}") - private String videoType; - - @Bean - public boolean isFmException() { - return fmException; - } - - @Bean - public String fmExceptionEmails() { - return fmExceptionEmails; - } - - @Bean - public boolean isFmOpen() { - return fmOpen; - } - - @Bean - public String fmUploadDir() { - return uploadDir; - } - - @Bean - public String fmMonitorEmails() { - return fmMonitorEmails; - } - - @Bean - public boolean isFmMonitor() { - return fmMonitor; - } - - @Bean - public String videoType() { - return videoType; - } - - public static void main(String[] args) { - SpringApplication.run(ScheduleApplication.class, args); - } -} diff --git a/yqzjSchedule/src/main/java/com/iformall/config/AwsProperty.java b/yqzjSchedule/src/main/java/com/iformall/config/AwsProperty.java deleted file mode 100644 index 0329f1d..0000000 --- a/yqzjSchedule/src/main/java/com/iformall/config/AwsProperty.java +++ /dev/null @@ -1,52 +0,0 @@ -package com.iformall.config; - -import org.springframework.boot.context.properties.ConfigurationProperties; -import org.springframework.stereotype.Component; - -/** - * @author Stormeye - */ -@Component -@ConfigurationProperties(prefix = "aws") -public class AwsProperty { - // AWS ACCESS KEY - private String access; - - private String secret; - - private String clientRegion; - - private String bucketName; - - public String getAccess() { - return access; - } - - public void setAccess(String access) { - this.access = access; - } - - public String getSecret() { - return secret; - } - - public void setSecret(String secret) { - this.secret = secret; - } - - public String getClientRegion() { - return clientRegion; - } - - public void setClientRegion(String clientRegion) { - this.clientRegion = clientRegion; - } - - public String getBucketName() { - return bucketName; - } - - public void setBucketName(String bucketName) { - this.bucketName = bucketName; - } -} diff --git a/yqzjSchedule/src/main/java/com/iformall/config/MyBatisConfiguration.java b/yqzjSchedule/src/main/java/com/iformall/config/MyBatisConfiguration.java deleted file mode 100644 index 8c0ad18..0000000 --- a/yqzjSchedule/src/main/java/com/iformall/config/MyBatisConfiguration.java +++ /dev/null @@ -1,28 +0,0 @@ -package com.iformall.config; - -import com.iformall.plugin.MyBatisItercepters; -import com.iformall.plugin.MyBatisPlus; -import com.iformall.plugin.shard.plugin.ShardingSpherePlugin; - -import java.util.ArrayList; -import java.util.List; - -import org.springframework.context.annotation.Bean; -import org.springframework.context.annotation.Configuration; -import org.springframework.transaction.annotation.EnableTransactionManagement; - -@EnableTransactionManagement -@Configuration -public class MyBatisConfiguration extends BaseMyBatisConfiguration { - - @Bean - public MyBatisItercepters intercepters() { -// MyBatisItercepters intercepters = new MyBatisItercepters(); -// List plugins = new ArrayList(); -// plugins.add(baseShardingSpherePlugin()); -// -// intercepters.setPlugins(plugins); -// return intercepters; - return allIntercepters(); - } -} diff --git a/yqzjSchedule/src/main/java/com/iformall/config/RedisConfig.java b/yqzjSchedule/src/main/java/com/iformall/config/RedisConfig.java deleted file mode 100644 index fd58408..0000000 --- a/yqzjSchedule/src/main/java/com/iformall/config/RedisConfig.java +++ /dev/null @@ -1,332 +0,0 @@ -package com.iformall.config; - -import com.fasterxml.jackson.annotation.JsonAutoDetect; -import com.fasterxml.jackson.annotation.PropertyAccessor; -import com.fasterxml.jackson.databind.DeserializationFeature; -import com.fasterxml.jackson.databind.ObjectMapper; -import com.github.pagehelper.PageInfo; -import com.iformall.domain.po.*; -import com.iformall.domain.po.base.BaseCUserEntity; -import com.iformall.domain.vo.WxCouponCVo; -import com.iformall.domain.vo.WxCouponChannelVo; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; -import org.springframework.cache.CacheManager; -import org.springframework.cache.annotation.CachingConfigurerSupport; -import org.springframework.cache.annotation.EnableCaching; -import org.springframework.context.annotation.Bean; -import org.springframework.context.annotation.Configuration; -import org.springframework.data.redis.cache.RedisCacheConfiguration; -import org.springframework.data.redis.cache.RedisCacheManager; -import org.springframework.data.redis.connection.RedisConnectionFactory; -import org.springframework.data.redis.core.RedisTemplate; -import org.springframework.data.redis.serializer.Jackson2JsonRedisSerializer; -import org.springframework.data.redis.serializer.StringRedisSerializer; - -import java.time.Duration; -import java.util.*; - -/** - * Created by Stormeye on 2018/10/1. - */ -@Configuration -@EnableCaching -public class RedisConfig extends CachingConfigurerSupport { - - private final Logger logger = LoggerFactory.getLogger(this.getClass()); - - //缓存管理器 - @Bean - public CacheManager cacheManager(RedisConnectionFactory connectionFactory) { - /* - //user信息缓存配置 - RedisCacheConfiguration userCacheConfiguration = RedisCacheConfiguration.defaultCacheConfig().entryTtl(Duration.ofSeconds(10)).disableCachingNullValues().prefixKeysWith("user"); - Map redisCacheConfigurationMap = new HashMap<>(); - redisCacheConfigurationMap.put("user", userCacheConfiguration); - //初始化一个RedisCacheWriter - RedisCacheWriter redisCacheWriter = RedisCacheWriter.nonLockingRedisCacheWriter(connectionFactory); - // 设置CacheManager的值序列化方式为JdkSerializationRedisSerializer,但其实RedisCacheConfiguration默认就是使用StringRedisSerializer序列化key,JdkSerializationRedisSerializer序列化value,所以以下注释代码为默认实现 - // ClassLoader loader = this.getClass().getClassLoader(); - // JdkSerializationRedisSerializer jdkSerializer = new JdkSerializationRedisSerializer(loader); - // RedisSerializationContext.SerializationPair pair = RedisSerializationContext.SerializationPair.fromSerializer(jdkSerializer); - // RedisCacheConfiguration defaultCacheConfig = RedisCacheConfiguration.defaultCacheConfig().serializeValuesWith(pair); - RedisCacheConfiguration defaultCacheConfig = RedisCacheConfiguration.defaultCacheConfig(); - //设置默认超过期时间是30秒 - defaultCacheConfig.entryTtl(Duration.ofSeconds(30)); - //初始化RedisCacheManager - RedisCacheManager cacheManager = new RedisCacheManager(redisCacheWriter, defaultCacheConfig, redisCacheConfigurationMap); - return cacheManager; - */ - RedisCacheConfiguration config = RedisCacheConfiguration.defaultCacheConfig(); // 生成一个默认配置,通过config对象即可对缓存进行自定义配置 - config = config.entryTtl(Duration.ofMinutes(1)) // 设置缓存的默认过期时间,也是使用Duration设置 - .disableCachingNullValues(); // 不缓存空值 - - // 设置一个初始化的缓存空间set集合 - Set cacheNames = new HashSet<>(); - cacheNames.add("my-redis-cache1"); - cacheNames.add("my-redis-cache2"); - - // 对每个缓存空间应用不同的配置 - Map configMap = new HashMap<>(); - configMap.put("my-redis-cache1", config); - configMap.put("my-redis-cache2", config.entryTtl(Duration.ofSeconds(120))); - - RedisCacheManager cacheManager = RedisCacheManager.builder(connectionFactory) // 使用自定义的缓存配置初始化一个cacheManager - .initialCacheNames(cacheNames) // 注意这两句的调用顺序,一定要先调用该方法设置初始化的缓存名,再初始化相关的配置 - .withInitialCacheConfigurations(configMap) - .build(); - return cacheManager; - } - - @Bean("pushLimitRedisTemplate") - public RedisTemplate getPushLimitRedisTemplate(RedisConnectionFactory connectionFactory) { - RedisTemplate template = new RedisTemplate(); - - Jackson2JsonRedisSerializer j = new Jackson2JsonRedisSerializer(PushLimit.class); - - ObjectMapper om = new ObjectMapper(); - om.setVisibility(PropertyAccessor.ALL, JsonAutoDetect.Visibility.ANY); - om.configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false); - j.setObjectMapper(om); - - // value值的序列化 - template.setValueSerializer(j); - template.setHashKeySerializer(j); - - // key的序列化 - template.setKeySerializer(new StringRedisSerializer()); - template.setHashKeySerializer(new StringRedisSerializer()); - - template.setConnectionFactory(connectionFactory); - return template; - } - - @Bean("scoreRuleRedisTemplate") - public RedisTemplate getScoreRuleRedisTemplate(RedisConnectionFactory connectionFactory) { - RedisTemplate template = new RedisTemplate(); - - Jackson2JsonRedisSerializer j = new Jackson2JsonRedisSerializer(WxScoreRules.class); - - ObjectMapper om = new ObjectMapper(); - om.setVisibility(PropertyAccessor.ALL, JsonAutoDetect.Visibility.ANY); - om.configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false); - j.setObjectMapper(om); - - // value值的序列化 - template.setValueSerializer(j); - template.setHashKeySerializer(j); - - // key的序列化 - template.setKeySerializer(new StringRedisSerializer()); - template.setHashKeySerializer(new StringRedisSerializer()); - - template.setConnectionFactory(connectionFactory); - return template; - } - - @Bean("cuserTokenRedisTemplate") - public RedisTemplate getCUserTokenRedisTemplate(RedisConnectionFactory connectionFactory) { - RedisTemplate template = new RedisTemplate(); - - Jackson2JsonRedisSerializer j = new Jackson2JsonRedisSerializer(WxCUser.class); - - ObjectMapper om = new ObjectMapper(); - om.setVisibility(PropertyAccessor.ALL, JsonAutoDetect.Visibility.ANY); - om.configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false); - j.setObjectMapper(om); - - // value值的序列化 - template.setValueSerializer(j); - template.setHashKeySerializer(j); - - // key的序列化 - template.setKeySerializer(new StringRedisSerializer()); - template.setHashKeySerializer(new StringRedisSerializer()); - - template.setConnectionFactory(connectionFactory); - return template; - } - - @Bean("baseCUserTokenRedisTemplate") - public RedisTemplate getBaseCUserTokenRedisTemplate(RedisConnectionFactory connectionFactory) { - RedisTemplate template = new RedisTemplate(); - - Jackson2JsonRedisSerializer j = new Jackson2JsonRedisSerializer(BaseCUserEntity.class); - - ObjectMapper om = new ObjectMapper(); - om.setVisibility(PropertyAccessor.ALL, JsonAutoDetect.Visibility.ANY); - om.configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false); - j.setObjectMapper(om); - - // value值的序列化 - template.setValueSerializer(j); - template.setHashKeySerializer(j); - - // key的序列化 - template.setKeySerializer(new StringRedisSerializer()); - template.setHashKeySerializer(new StringRedisSerializer()); - - template.setConnectionFactory(connectionFactory); - return template; - } - - @Bean("cUserBasicInfoRedisTemplate") - public RedisTemplate getCUserBasicInfoRedisTemplate(RedisConnectionFactory connectionFactory) { - RedisTemplate template = new RedisTemplate(); - - Jackson2JsonRedisSerializer j = new Jackson2JsonRedisSerializer(WxCUserBasicInfo.class); - - ObjectMapper om = new ObjectMapper(); - om.setVisibility(PropertyAccessor.ALL, JsonAutoDetect.Visibility.ANY); - om.configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false); - j.setObjectMapper(om); - - // value值的序列化 - template.setValueSerializer(j); - template.setHashKeySerializer(j); - - // key的序列化 - template.setKeySerializer(new StringRedisSerializer()); - template.setHashKeySerializer(new StringRedisSerializer()); - - template.setConnectionFactory(connectionFactory); - return template; - } - - @Bean("mallRedisTemplate") - public RedisTemplate getMallRedisTemplate(RedisConnectionFactory connectionFactory) { - RedisTemplate template = new RedisTemplate(); - - Jackson2JsonRedisSerializer j = new Jackson2JsonRedisSerializer(WxMall.class); - - ObjectMapper om = new ObjectMapper(); - om.setVisibility(PropertyAccessor.ALL, JsonAutoDetect.Visibility.ANY); - om.configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false); - j.setObjectMapper(om); - - // value值的序列化 - template.setValueSerializer(j); - template.setHashKeySerializer(j); - - // key的序列化 - template.setKeySerializer(new StringRedisSerializer()); - template.setHashKeySerializer(new StringRedisSerializer()); - - template.setConnectionFactory(connectionFactory); - return template; - } - - @Bean("subMallListRedisTemplate") - public RedisTemplate> getSubMallListRedisTemplate(RedisConnectionFactory connectionFactory) { - RedisTemplate> template = new RedisTemplate>(); - - Jackson2JsonRedisSerializer j = new Jackson2JsonRedisSerializer(List.class); - - ObjectMapper om = new ObjectMapper(); - om.setVisibility(PropertyAccessor.ALL, JsonAutoDetect.Visibility.ANY); - om.configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false); - j.setObjectMapper(om); - - // value值的序列化 - template.setValueSerializer(j); - template.setHashKeySerializer(j); - - // key的序列化 - template.setKeySerializer(new StringRedisSerializer()); - template.setHashKeySerializer(new StringRedisSerializer()); - - template.setConnectionFactory(connectionFactory); - return template; - } - - @Bean("couponChannelRedisTemplate") - public RedisTemplate> getCouponChannelRedisTemplate(RedisConnectionFactory connectionFactory) { - RedisTemplate> template = new RedisTemplate<>(); - - Jackson2JsonRedisSerializer j = new Jackson2JsonRedisSerializer(PageInfo.class); - - ObjectMapper om = new ObjectMapper(); - om.setVisibility(PropertyAccessor.ALL, JsonAutoDetect.Visibility.ANY); - om.configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false); - j.setObjectMapper(om); - - // value值的序列化 - template.setValueSerializer(j); - template.setHashKeySerializer(j); - - // key的序列化 - template.setKeySerializer(new StringRedisSerializer()); - template.setHashKeySerializer(new StringRedisSerializer()); - - template.setConnectionFactory(connectionFactory); - return template; - } - - @Bean("buserTokenRedisTemplate") - public RedisTemplate getBuserTokenRedisTemplate(RedisConnectionFactory connectionFactory) { - RedisTemplate template = new RedisTemplate(); - - Jackson2JsonRedisSerializer j = new Jackson2JsonRedisSerializer(WxBuser.class); - - ObjectMapper om = new ObjectMapper(); - om.setVisibility(PropertyAccessor.ALL, JsonAutoDetect.Visibility.ANY); - om.configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false); - j.setObjectMapper(om); - - // value值的序列化 - template.setValueSerializer(j); - template.setHashKeySerializer(j); - - // key的序列化 - template.setKeySerializer(new StringRedisSerializer()); - template.setHashKeySerializer(new StringRedisSerializer()); - - template.setConnectionFactory(connectionFactory); - return template; - } - - @Bean("couponDetailRedisTemplate") - public RedisTemplate getCouponDetailRedisTemplate(RedisConnectionFactory connectionFactory) { - RedisTemplate template = new RedisTemplate(); - - Jackson2JsonRedisSerializer j = new Jackson2JsonRedisSerializer(WxCouponCVo.class); - - ObjectMapper om = new ObjectMapper(); - om.setVisibility(PropertyAccessor.ALL, JsonAutoDetect.Visibility.ANY); - om.configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false); - j.setObjectMapper(om); - - // value值的序列化 - template.setValueSerializer(j); - template.setHashKeySerializer(j); - - // key的序列化 - template.setKeySerializer(new StringRedisSerializer()); - template.setHashKeySerializer(new StringRedisSerializer()); - - template.setConnectionFactory(connectionFactory); - return template; - } - - @Bean("objectCommonRedisTemplate") - public RedisTemplate getObjectValueOperations(RedisConnectionFactory connectionFactory) { - RedisTemplate template = new RedisTemplate<>(); - template.setConnectionFactory(connectionFactory); - Jackson2JsonRedisSerializer j = new Jackson2JsonRedisSerializer(Object.class); - ObjectMapper om = new ObjectMapper(); - om.setVisibility(PropertyAccessor.ALL, JsonAutoDetect.Visibility.ANY); - om.configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false); - j.setObjectMapper(om); - - // value值的序列化 - template.setValueSerializer(j); - template.setHashValueSerializer(j); - - // key的序列化 - template.setKeySerializer(new StringRedisSerializer()); - template.setHashKeySerializer(new StringRedisSerializer()); - template.afterPropertiesSet(); - return template; - } - -} diff --git a/yqzjSchedule/src/main/java/com/iformall/config/RestFilter.java b/yqzjSchedule/src/main/java/com/iformall/config/RestFilter.java deleted file mode 100644 index 4f92984..0000000 --- a/yqzjSchedule/src/main/java/com/iformall/config/RestFilter.java +++ /dev/null @@ -1,58 +0,0 @@ -package com.iformall.config; - -import java.io.IOException; -import java.util.Optional; - -import javax.servlet.Filter; -import javax.servlet.FilterChain; -import javax.servlet.FilterConfig; -import javax.servlet.ServletException; -import javax.servlet.ServletRequest; -import javax.servlet.ServletResponse; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; - -/** - * 前后端分离RESTful接口过滤器 - * - * @author xuguoqin - * - */ -public class RestFilter implements Filter { - - @Override - public void init(FilterConfig filterConfig) throws ServletException { - - } - - @Override - public void doFilter(ServletRequest request, ServletResponse response, FilterChain chain) - throws IOException, ServletException { - HttpServletRequest req = null; - if (request instanceof HttpServletRequest) { - req = (HttpServletRequest) request; - } - HttpServletResponse res = null; - if (response instanceof HttpServletResponse) { - res = (HttpServletResponse) response; - } - if (req != null && res != null) { - //设置允许传递的参数 - res.setHeader("Access-Control-Allow-Headers", "Origin, X-Requested-With, Content-Type, Accept, Authorization"); - //设置允许带上cookie - res.setHeader("Access-Control-Allow-Credentials", "true"); - String origin = Optional.ofNullable(req.getHeader("Origin")).orElse(req.getHeader("Referer")); - //设置允许的请求来源 - res.setHeader("Access-Control-Allow-Origin", origin); - //设置允许的请求方法 - res.setHeader("Access-Control-Allow-Methods", "GET, POST, PATCH, PUT, DELETE, OPTIONS"); - } - chain.doFilter(request, response); - } - - @Override - public void destroy() { - - } - -} \ No newline at end of file diff --git a/yqzjSchedule/src/main/java/com/iformall/config/RestTemplateConfig.java b/yqzjSchedule/src/main/java/com/iformall/config/RestTemplateConfig.java deleted file mode 100644 index 560a77c..0000000 --- a/yqzjSchedule/src/main/java/com/iformall/config/RestTemplateConfig.java +++ /dev/null @@ -1,24 +0,0 @@ -package com.iformall.config; - -import org.springframework.context.annotation.Bean; -import org.springframework.context.annotation.Configuration; -import org.springframework.http.client.ClientHttpRequestFactory; -import org.springframework.http.client.SimpleClientHttpRequestFactory; -import org.springframework.web.client.RestTemplate; - -@Configuration -public class RestTemplateConfig { - - @Bean - public RestTemplate restTemplate(ClientHttpRequestFactory factory) { - return new RestTemplate(factory); - } - - @Bean - public ClientHttpRequestFactory simpleClientHttpRequestFactory() { - SimpleClientHttpRequestFactory factory = new SimpleClientHttpRequestFactory(); - factory.setReadTimeout(5000);//ms - factory.setConnectTimeout(10000);//ms - return factory; - } -} \ No newline at end of file diff --git a/yqzjSchedule/src/main/java/com/iformall/config/SchedulingConfig.java b/yqzjSchedule/src/main/java/com/iformall/config/SchedulingConfig.java deleted file mode 100644 index 3ff83b3..0000000 --- a/yqzjSchedule/src/main/java/com/iformall/config/SchedulingConfig.java +++ /dev/null @@ -1,19 +0,0 @@ -package com.iformall.config; - -import org.springframework.context.annotation.Configuration; -import org.springframework.scheduling.annotation.EnableScheduling; -import org.springframework.scheduling.annotation.SchedulingConfigurer; -import org.springframework.scheduling.concurrent.ThreadPoolTaskScheduler; -import org.springframework.scheduling.config.ScheduledTaskRegistrar; - -//@Configuration -//@EnableScheduling -//public class SchedulingConfig implements SchedulingConfigurer { -// -// @Override -// public void configureTasks(ScheduledTaskRegistrar taskRegistrar) { -// -// -// } -// -//} \ No newline at end of file diff --git a/yqzjSchedule/src/main/java/com/iformall/config/WebConfig.java b/yqzjSchedule/src/main/java/com/iformall/config/WebConfig.java deleted file mode 100644 index 48708f3..0000000 --- a/yqzjSchedule/src/main/java/com/iformall/config/WebConfig.java +++ /dev/null @@ -1,79 +0,0 @@ -package com.iformall.config; - -import com.fasterxml.jackson.annotation.JsonInclude; -import com.fasterxml.jackson.databind.DeserializationConfig; -import com.fasterxml.jackson.databind.DeserializationFeature; -import com.fasterxml.jackson.databind.ObjectMapper; -import com.fasterxml.jackson.databind.module.SimpleModule; -import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; -import org.springframework.context.annotation.Configuration; -import org.springframework.http.converter.HttpMessageConverter; -import org.springframework.http.converter.json.MappingJackson2HttpMessageConverter; -import org.springframework.web.servlet.config.annotation.CorsRegistry; -import org.springframework.web.servlet.config.annotation.EnableWebMvc; -import org.springframework.web.servlet.config.annotation.ResourceHandlerRegistry; -import org.springframework.web.servlet.config.annotation.WebMvcConfigurer; - -import java.math.BigDecimal; -import java.math.BigInteger; -import java.text.SimpleDateFormat; -import java.util.List; - -@Configuration -@EnableWebMvc -public class WebConfig implements WebMvcConfigurer { - - @Override - public void addResourceHandlers(ResourceHandlerRegistry registry) { - registry.addResourceHandler("swagger-ui.html") - .addResourceLocations("classpath:/META-INF/resources/"); - registry.addResourceHandler("/webjars/**") - .addResourceLocations("classpath:/META-INF/resources/webjars/"); - //registry.addResourceHandler("/app/**").addResourceLocations("classpath:/app/"); - - } - - @Override - public void addCorsMappings(CorsRegistry registry) { - registry.addMapping("/**") - .allowedOrigins("*") - .allowCredentials(true) - .allowedMethods("GET", "POST", "DELETE", "PUT") - .maxAge(3600); - } - - @Override - public void configureMessageConverters(List> converters) { - MappingJackson2HttpMessageConverter jackson2HttpMessageConverter = new MappingJackson2HttpMessageConverter(); - //ObjectMapper 是Jackson库的主要类。它提供一些功能将转换成Java对象匹配JSON结构,反之亦然 - ObjectMapper objectMapper = new ObjectMapper(); - SimpleModule simpleModule = new SimpleModule(); - - //不显示为null的字段 - objectMapper.setSerializationInclusion(JsonInclude.Include.NON_NULL); - - DeserializationConfig dc = objectMapper.getDeserializationConfig(); - // 设置反序列化日期格式、忽略不存在get、set的属性 - objectMapper.setConfig( - dc.with(new SimpleDateFormat("yyyy-MM-dd HH:mm:ss")) - .without(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES) - ); - - //序列化将Long转String类型 - simpleModule.addSerializer(Long.class, ToStringSerializer.instance); - simpleModule.addSerializer(Long.TYPE, ToStringSerializer.instance); - SimpleModule bigIntegerModule = new SimpleModule(); - //序列化将BigInteger转String类型 - bigIntegerModule.addSerializer(BigInteger.class, ToStringSerializer.instance); - SimpleModule bigDecimalModule = new SimpleModule(); - //序列化将BigDecimal转String类型 - bigDecimalModule.addSerializer(BigDecimal.class, ToStringSerializer.instance); - objectMapper.registerModule(simpleModule); - objectMapper.registerModule(bigDecimalModule); - objectMapper.registerModule(bigIntegerModule); - jackson2HttpMessageConverter.setObjectMapper(objectMapper); - converters.add(jackson2HttpMessageConverter); - } - - -} diff --git a/yqzjSchedule/src/main/java/com/iformall/controller/HomeController.java b/yqzjSchedule/src/main/java/com/iformall/controller/HomeController.java deleted file mode 100644 index ecfc89b..0000000 --- a/yqzjSchedule/src/main/java/com/iformall/controller/HomeController.java +++ /dev/null @@ -1,40 +0,0 @@ -package com.iformall.controller; - -import com.iformall.common.ResultData; -import com.iformall.domain.po.msg.WxMsgRecord; -import com.iformall.mq.MqBaseProducer; -import com.iformall.mq.impl.RabbitMqMessageProducer; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiOperation; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.beans.factory.annotation.Value; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.RestController; - - -@RestController -@Api(description = "登录相关接口") -public class HomeController { - private final Logger logger = LoggerFactory.getLogger(this.getClass()); - - @Value("${version}") - private String version; - - @Autowired - private MqBaseProducer mqBaseProducer; - - - @ApiOperation("获取后端版本号") - @GetMapping("/version") - public ResultData version() { - return new ResultData(version); - } - - @GetMapping("/mqtest") - public ResultData mqtest() { - mqBaseProducer.sendMessage(new WxMsgRecord(), "topic-1", "tag-1", "key-1"); - return new ResultData(); - } -} \ No newline at end of file diff --git a/yqzjSchedule/src/main/java/com/iformall/schedule/ProductOrderSchedule.java b/yqzjSchedule/src/main/java/com/iformall/schedule/ProductOrderSchedule.java deleted file mode 100644 index 3076210..0000000 --- a/yqzjSchedule/src/main/java/com/iformall/schedule/ProductOrderSchedule.java +++ /dev/null @@ -1,32 +0,0 @@ -package com.iformall.schedule; - -import com.iformall.domain.po.ProductOrder; -import com.iformall.domain.po.ProductOrderSharing; -import com.iformall.enums.EnumProductOrderSettleStatus; -import com.iformall.enums.EnumProductOrderStatus; -import com.iformall.enums.EnumProfitSharing; -import com.iformall.service.ProductOrderSharingService; -import com.iformall.utils.DateUtils; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.scheduling.annotation.Scheduled; -import org.springframework.stereotype.Component; - -import java.util.Date; -import java.util.List; - -@Component -public class ProductOrderSchedule { - - private final Logger logger = LoggerFactory.getLogger(this.getClass()); - - - @Autowired - private ProductOrderSharingService productOrderSharingService; - - //@Scheduled(cron = "0 */5 * * * *?") - public void productOrderSharingSchedule() { - } - -} \ No newline at end of file diff --git a/yqzjSchedule/src/main/resources/application-dev.yml b/yqzjSchedule/src/main/resources/application-dev.yml deleted file mode 100644 index 08f0658..0000000 --- a/yqzjSchedule/src/main/resources/application-dev.yml +++ /dev/null @@ -1,205 +0,0 @@ -spring: - profiles: - #include: aliyunRocketMQ - include: rabbitMQ - # JDBC - datasource: - url: jdbc:mysql://182.92.151.30:3306/mallink_suimang_test?characterEncoding=UTF-8&serverTimezone=Asia/Shanghai&useUnicode=true&useSSL=false&useAffectedRows=true - username: root - password: sm2023@ms - type: com.alibaba.druid.pool.DruidDataSource - driver-class-name: com.mysql.cj.jdbc.Driver - filters: stat - maxActive: 20 - initialSize: 1 - maxWait: 60000 - minIdle: 1 - timeBetweenEvictionRunsMillis: 28000 - minEvictableIdleTimeMillis: 28000 - validationQuery: select 'x' - testWhileIdle: true - testOnBorrow: false - testOnReturn: false - poolPreparedStatements: true - maxOpenPreparedStatements: 20 - connectionProperties: "druid.stat.mergeSql=true;druid.stat.slowSqlMillis=6000" - #jackson: - #date-format: yyyy-MM-dd HH:mm:ss - - # REDIS - redis: - host: 101.200.130.134 - port: 6379 - password: iF0rm@2l2ol9 - timeout: 3600 - expire: 1800 #30分钟 - database: 5 - defaultExpiration: 2592000 # 默认生命周期30天 - jedis: - pool: - max-active: 50 - max-idle: 50 - max-wait: -1 - min-idle: 10 - - # SMS - aliyun: - sms: - accessKeyId: LTAI5tQs4MBjzLFbiQLjsMYy - accessKeySecret: nYmnexFJxrsBu0AGVIOSbUaSaweJu7 - product: Dysmsapi - domain: dysmsapi.aliyuncs.com - regionId: cn-hangzhou - dateFormat: yyyyMMdd - endpointName: cn-hangzhou - - oss: - endpoint: oss-cn-beijing.aliyuncs.com - keyid: LTAI5tQs4MBjzLFbiQLjsMYy - keysecret: nYmnexFJxrsBu0AGVIOSbUaSaweJu7 - bucketname: suimang - filehost: schedule - filedomain: https://suimang.oss-accelerate.aliyuncs.com - - # EMAIL - mail: - host: smtp.exmail.qq.com - username: zhengfangyuan@iformall.com - password: 2hSeppFRaw7KZZyf # 授权密码 - properties: - mail: - smtp: - auth: true - starttls: - enable: true - socketFactory: - port: 465 - class: javax.net.ssl.SSLSocketFactory - rocketmq: - nameServer: 127.0.0.1:9876 - producer: - retry-times-when-send-async-failed: 0 - send-msg-timeout: 300000 - compress-msg-body-over-howmuch: 4096 - max-message-size: 4194304 - retry-another-broker-when-not-store-ok: false - retry-times-when-send-failed: 2 - rabbitmq: - host: 127.0.0.1 - port: 5672 - username: fumao - password: f9l98 - publisher-confirms: true - publisher-returns: false - virtual-host: / - aliyunRocketmq: - accessKeyId: "LTAI4G7ixY4AhvM35F8o3W3V" - accessKeySecret: "VfWqGb83qIQrS9us45utskl8itd7ry" - groupId: "GID_P_1" - namesrvAddr: "http://MQ_INST_1796289517488555_Bcqaq2is.cn-beijing.mq-internal.aliyuncs.com:8080" - -aws: - clientRegion: cn-northwest-1 - bucketName: iformall-net - access: ENC(3gx5ghDFBqGrEhO3Wf8aYmXsnwHO7Cj3HNKJGOeUj0o=) - secret: ENC(HVKIJwCJKVXLlUpGlQPwNqJOlnpxn4xYuy91SH0seTSm2uAttIQHvA49fXWWax90v5wloIk0QuU=) - -#wechat: -# open: -# componentAppId: "wxdfc8fb4e62d6b52b" -# componentSecret: "98daa62b316dd6feabaad708327ce233" -# componentToken: "formall2018" -# componentAesKey: "htKq8EjBMPNndfZQK9JiFojFaqFwFpw42VfeWFtx7HN" -# redis: -# host: 101.201.103.81 -# port: 6379 -# password: ENC(xPFDlgd6v8zUhJMbcKc0KmmQiqs9qHtk) -# timeout: 3600 -# expire: 1800 #30分钟 -# database: 2 -# defaultExpiration: 2592000 # 默认生命周期30天 -# jedis: -# pool: -# max-active: 100 -# max-idle: 500 -# max-wait: -1 -# min-idle: 10 - -wechat: - web: - appId: "wx091907dd0bfd3f6b" - secret: "2a2ca10738998b9ef92c1fe8a4d366a6" - url: "https://admintest.malls.iformall.com" - open: - componentAppId: wxdfc8fb4e62d6b52b - componentSecret: 98daa62b316dd6feabaad708327ce233 - componentToken: formall2018 - componentAesKey: htKq8EjBMPNndfZQK9JiFojFaqFwFpw42VfeWFtx7HN - redis: - host: 101.200.130.134 - port: 6379 - password: iF0rm@2l2ol9 - timeout: 3600 - expire: 1800 #30分钟 - database: 2 - defaultExpiration: 2592000 # 默认生命周期30天 - jedis: - pool: - max-active: 100 - max-idle: 100 - max-wait: -1 - min-idle: 10 - -alipay: - open: - appId: 2021002137663024 - appPrivateKey: MIIEvQIBADANBgkqhkiG9w0BAQEFAASCBKcwggSjAgEAAoIBAQCUfymV5J73QQMG52PVIGUbowkloYCO4B7TQoKbrTZf2YeYsg/To/o4PiXPMNwEUfEUU8NYQ6WwNhCd2fa1ei8WFXJUf3bfgswtBk1aOmHLeY9yoXFxIKMTQ9RcobnmBzKQZlaAPMTSr7t1QtKZKPuc2gEHGRFYKO/ZuL8gIpnsVidVtmi52yd7hzao/pI3ThLA0lreg4L3rYP5ESQZRytxIPgUQ4KI11pZxFgbe+uy28AGDYIQscSIb+SWOHPYKLvOEqqepIZ8M18w/U0lZzpzepzi/V/llekvXJ6UEf1lzl7x/4UIA3WPN1B40+NzbD/OxEGTuM0UctOG6ZTd4Te9AgMBAAECggEAPYksnHbvARspu/SrRCh2fatkIPn6Ijrxyy3mnch7neCw9i/jqxpqmF/4nxFqO0gRlRDZBHyT7p+Y5zDpsW5+kLI2fJmNkzXKkmXoLBnBaOZo8WHBdtXFfjg/iltig9Y7t+cQtXd5QK2eCwuz5dA75FXa0ywqKdRdAGY0nYZ5LpwrHVU8RXheUDCJyhKNj2+W6lIaSKDxLZU3laO1oBrv1agcy7Crd5E2ndb8O3Enga+z7wSz2h7A1BasC/Yl/Ro0Y21wLCH3s/R6qA0Paq12+WEF+xdodM7SrP43CCTVFGbC1TfEOdanJfixop8QuYsIp7pHrL925+vP4eY9RfckgQKBgQDQqLdpDzzU7Ot/L9Vc/r8d4iwXXbX8+HwVFV4oBuausgFyv8eJJpfrI+IlEoB1ubJcPpJBFqfmeYTW6/v6ioFljJAlWfFvesUVt/HszBMIOsU0Bzt7ex6WlwKOagb0q0ZPA4T0OY0K0lg0loaaaR8ZTr4ivDymaGBtTBYhslpc7QKBgQC2MBznGEc5r2dhyENvdPOR20PnXQcevGnPdqSus8m0VmDcHE72RVcckcZtwczsb3NaLSqmjAcWTn51/VFmlvhB3F34FcFTPZGq6sj7fWK8HuFq7l7mu5OzYuVr73zy9ggsUuaw10IqvvwIVxszNAF0hiRnSGH3z27CoRmz3s+8EQKBgQCK3o7atBJ3X4rIJiypbL4DhIB1uJ+jUjk6yvLUTut+fufp1+tTw0S+cS5UIAEw2Lr1G4u5F/v8rwmTBJG6SC4gSLGyui6uVBYRA1BWmedcxchzfRDAeMt9y9kesUAZ3Fe5xIzbAeZ1ulKMBVZmM+pHrJlsgr0Wv0bV1xqvqITtbQKBgBIsIGXopQoa9dvqBtfyOW1eCprkS5aEQqWf9vM6Ga90QjsSU8n6xqKh48IE57TZtQ7UnIF6TCasc66/MsRh4KdpHLJnMR5lcMc0nhF/wz5ychehaTPol+X3wlyOyc7OPah2KG6ROhdbb3ZBggQMduyxiKYIsUTvmuOtAAxR+DSRAoGADtuDzGQDOJYWiO2uuP6FpA5IJaiwlSfu3xncJVfhO8SVr6VBJFg88igbIB3w6nk/sv7j9VTXqXre9HMvp1flxaaLsdxM4HcTSALS9q6t/ajaveqte6S5kAtWx0WW8C6PtgWXHbxcD7LXARSsKLoEl2JXXyUVS/m2l/RzHBQ8GJI= - appPublicKeyCertPath: /opt/iformall/service/alipay/appCertPublicKey_2021002137663024.crt - alipayCertPath: /opt/iformall/service/alipay/alipayCertPublicKey_RSA2.crt - alipayRootCertPath: /opt/iformall/service/alipay/alipayRootCert.crt - callback: https://callbacktest.malls.iformall.com/api/alipay/notify/callback - -video: - aliyun: - accessKeyId: LTAI5tQs4MBjzLFbiQLjsMYy - accessKeySecret: nYmnexFJxrsBu0AGVIOSbUaSaweJu7 - regionId: cn-beijing - endPoint: https://oss-cn-beijing.aliyuncs.com - corePoolSize: 6 - maxPoolSize: 20 - queueCapacity: 1000 - namePrefix: aliyun-video-upload - -jasypt: - encryptor: - password: oRqdnDbK5pj3eMmB - -fm: - exception: true - exception_emails: xuxiaohu@iformall.com - deploy: 1 - open: true - upload_dir: /home/test/server/uploads/ - monitor_emails: houtaikaifa@iformall.com,xiaochengxufabu@iformall.com - monitor_enable: true - clear_data_before_msg_record: 1 - videoType: aliyun - -logging: - level: - #tk.mybatis: debug - com.iformall.mapper: debug - path: ./logs/s - -suimang: - oral_broadcasting: http://nas.pucao.cn:50014 - video_path: http://nas.pucao.cn:50014 - callbackUrl: https://mtest.metavatar.cc/C - video_tts: http://111.198.0.15:22299 - huibo_tts_wav: http://111.198.0.15:22222 - photo_speak: http://nas.pucao.cn:50015 - photo_speak_hy: http://nas.pucao.cn:50013 - digital_avatar: http://nas.pucao.cn:2005 - digital_avatar_hy: http://nas.pucao.cn:2003 - local_deploy: true - token: fm2023 \ No newline at end of file diff --git a/yqzjSchedule/src/main/resources/application-prod.yml b/yqzjSchedule/src/main/resources/application-prod.yml deleted file mode 100644 index 5a67ec1..0000000 --- a/yqzjSchedule/src/main/resources/application-prod.yml +++ /dev/null @@ -1,161 +0,0 @@ -spring: - profiles: - include: aliyunRocketMQ - # JDBC - datasource: - url: jdbc:mysql://182.92.151.30:3306/mallink_suimang?serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=UTF-8&useSSL=false&useAffectedRows=true - username: root - password: sm2023@ms - type: com.alibaba.druid.pool.DruidDataSource - driver-class-name: com.mysql.cj.jdbc.Driver - filters: stat - maxActive: 200 - initialSize: 1 - maxWait: 60000 - minIdle: 1 - timeBetweenEvictionRunsMillis: 28000 - minEvictableIdleTimeMillis: 28000 - validationQuery: select 'x' - testWhileIdle: true - testOnBorrow: false - testOnReturn: false - poolPreparedStatements: true - maxOpenPreparedStatements: 20 - connectionProperties: "druid.stat.mergeSql=true;druid.stat.slowSqlMillis=6000" - # REDIS - redis: - host: 182.92.151.30 - port: 6379 - password: sm2023@rd - timeout: 3600 - expire: 1800 #30分钟 - database: 1 - defaultExpiration: 2592000 # 默认生命周期30天 - jedis: - pool: - max-active: 8 - max-idle: 8 - max-wait: -1 - min-idle: 0 - # SMS - aliyun: - sms: - accessKeyId: LTAI5tQs4MBjzLFbiQLjsMYy - accessKeySecret: nYmnexFJxrsBu0AGVIOSbUaSaweJu7 - product: Dysmsapi - domain: dysmsapi.aliyuncs.com - regionId: cn-hangzhou - dateFormat: yyyyMMdd - endpointName: cn-hangzhou - oss: - endpoint: oss-cn-beijing.aliyuncs.com - keyid: LTAI5tQs4MBjzLFbiQLjsMYy - keysecret: nYmnexFJxrsBu0AGVIOSbUaSaweJu7 - bucketname: suimang - filehost: schedule - filedomain: https://suimang.oss-accelerate.aliyuncs.com - # EMAIL - mail: - host: smtp.exmail.qq.com - username: system@metavatar.com.cn - password: 2bKGhFaKKjhQFeka # 授权密码 - properties: - mail: - smtp: - auth: true - starttls: - enable: true - socketFactory: - port: 465 - class: javax.net.ssl.SSLSocketFactory - # RABBITMQ - rabbitmq: - host: 127.0.0.1 - port: 5672 - username: ENC(lRmLd6EzgeY1RT5ktcHv9g==) - password: ENC(gBI8mCjr3OC0v57jcnSb660Ux7mW03K2oePgvohhg7w=) - publisher-confirms: true - publisher-returns: false - virtual-host: / - aliyunRocketmq: - accessKeyId: "LTAI4G7ixY4AhvM35F8o3W3V" - accessKeySecret: "VfWqGb83qIQrS9us45utskl8itd7ry" - groupId: "GID_P_1" - namesrvAddr: "http://MQ_INST_1796289517488555_Bcqaq2is.cn-beijing.mq-internal.aliyuncs.com:8080" -aws: - clientRegion: cn-northwest-1 - bucketName: iformall-net - access: ENC(a6SN1sZ1enNL49ypiOXkg/pPPAnZD8H4buQFTTKN08s=) - secret: ENC(5P5ff4bTMJUbXVR4ZsM03UHzOKZ4+Zg5Iutcdkyp/Quny/oXg+A4KpfwEyGarlLu3vQMJahGP5M=) - -wechat: - open: - componentAppId: ENC(b3JG0MUZgQfz5Zj+DC2ZM1zDeLOiGTmmeokfe2O8kaM=) - componentSecret: ENC(QVyc4BPGdnSjXGs2ivgpDBE1v8wPWHLLRMYI7Vv8uYwC0SiZHQz0QpyyQV/b48Pb) - componentToken: ENC(rkxj0733WxFFDLgA9x01m2s5Fi2L+0PC) - componentAesKey: ENC(EIbJUBpbYOrLb4YQ/HXLQmxlxgAqIp2ZmpnGICC8pu5xiTz3Cqfkbwd2S8raCcK/IvYcX2GmedI=) - redis: - host: 182.92.151.30 - port: 6379 - password: sm2023@rd - timeout: 3600 - expire: 1800 #30分钟 - database: 2 - defaultExpiration: 2592000 # 默认生命周期30天 - jedis: - pool: - max-active: 100 - max-idle: 100 - max-wait: -1 - min-idle: 10 - -alipay: - open: - appId: 2021002140616334 - appPrivateKey: MIIEvgIBADANBgkqhkiG9w0BAQEFAASCBKgwggSkAgEAAoIBAQDo4bm5ERQi4XvspahY5kgyAlT2Tq97JimXQLX9qhZwYRz21Q+aDOhAwIBLpHIet5tkffMjwysqui+FxtDkqDkIuFWUqTPOiJcE6EwViyQkSz96li5boNqUu541rVSDtIviWBbFcACeSkclI+eLJXb/QGztyOu8apSYqdG7EFwah6tDldfloTwm7fwhvZSg5TY1DRh0olkqnZVZtinMgeZ/dDssNpdu17jRnLwQ+z955VrXI7K5IvITgG6bWcHxcz14Y3OxvyvBsaZkYaepRpa3rNpw5hOtBs+uusSf40hpisW2vT3zVJUkhEM9PAN6h5p5WK91v0vTFbBW4+DMI9/PAgMBAAECggEAT16fLbPkaP7wfXb4KVRSxriEvG2U4SPgiOxFGm8dtq9ib72t05MSlP8GusERI+bvzxAeDdI2pBlQmQdpqoSq643nnQMN5RYoYkPJqo4Bg10iBWWp5xCrboWDJkgsxbaC9mGPYTsK+ufV15KlF4dtRxFuDpyru0uX2XAHSvoIagGspdl+BmY8mjqS1/iwKD4neGDU1qUkXgO5lAXnWhBcZI106WloyyDRCPkhX0N2zUse9Tp55C80iQxQ0srL3zkXr7ruxNsrEwN5mMn3/THrT8sS8uXWVBncd9/ts3gitqAEtHaVvb5L2TijRFFAG/wtCvzWtJko6VtUtY9n9euIAQKBgQD49Y1kCaKmy+mbbfb2dC7MM3y52QqdsBWSQp2zfKranB6dF/guzVFCgLFRzF6vLWrib0FmL2ZzLkdE/DA3Ddg1snXfoHzR4GNNlBd6eRt8arc16p6lSw9zSoYTFIOUK8tBjQLwQk0hQlYlps0BzJfEnDq+q6f/FC67DYShBQDvfwKBgQDvd8YGMt5GISt4si031lwCsAwvBsGZs0lkYHQ0qWzLdwbWqkTNQVLK7Qs0cO8y8vdlVIVVuPHCd+scy5c4QLTO0usHO7CQXXi/Lt+fiS2SlDi6jbJrhJ+DzGhX1QaxgTN3dVWxlai31OzfReCm7/8izTuhAI6GqlCbmmEcgfY3sQKBgQCTp2cNPt212Vias5R2RSAAQkUmIIC4V1fj4BiR/E2EzHUnrLCoaWNZcuQ35GL/uIsc8ukxxskXZQol8wBRlqd16XsZf6CoBVJAD6YBIFTZ7JzuoFEpLaRjN37fUBpdxb+OCCkG//uozyQyvoP2HjahCBubPEmt8nVowTK5ITOV1wKBgQDSRO+CvePi3HlZb8q4vuboDUGFgX85wO3uz6r6GtLHDerZT4U+Xd+fA+nU0F2Y9TM6rK6viMfwJHA0Rqiv4lFhUl7BaS4udYTzCuudIEz96lytooJKWpfemPv+M7W+414XxNXMK0eMs9CSdL9AlngHTQLQ6rY7lQ1WtIYVDCDw4QKBgFkVCjmMo4BWgCDz4+XoFY6GBipM6UlVK3Iwzq0lUnN8KJntU92GqlpOB6aw/dAd9FrX3dsBoMIMy3dMN7oVEP+wbUhGykR0rbDBjEMWJHMC+vVJ+L6YhUYBYDer4Nr46IOcExWcpWudIw1b+3zXpjCbIO8nbUG4pZW+tLxmp6IO - appPublicKeyCertPath: /opt/iformall/service/alipay/appCertPublicKey_2021002140616334.crt - alipayCertPath: /opt/iformall/service/alipay/alipayCertPublicKey_RSA2.crt - alipayRootCertPath: /opt/iformall/service/alipay/alipayRootCert.crt - callback: https://callback.malls.iformall.com/api/alipay/notify/callback - -video: - aliyun: - accessKeyId: LTAI5tQs4MBjzLFbiQLjsMYy - accessKeySecret: nYmnexFJxrsBu0AGVIOSbUaSaweJu7 - regionId: cn-beijing - endPoint: https://oss-cn-beijing.aliyuncs.com - corePoolSize: 6 - maxPoolSize: 20 - queueCapacity: 1000 - namePrefix: aliyun-video-upload - -fm: - exception: true - exception_emails: houtaikaifa@iformall.com - deploy: 3 - open: true - upload_dir: /root/uploads/ - monitor_emails: houtaikaifa@iformall.com,xiaochengxufabu@iformall.com - monitor_enable: false - clear_data_before_msg_record: 1 - videoType: aliyun - -logging: - level: - #tk.mybatis: debug - com.iformall: debug - path: ./logs/s - - -suimang: - oral_broadcasting: http://111.198.0.15:22266 - video_path: http://111.198.0.15:22266 - callbackUrl: https://neuver.metavatar.cc/C - video_tts: http://111.198.0.15:22299 - huibo_tts_wav: http://111.198.0.15:22222 - photo_speak: http://111.198.0.15:22299 - photo_speak_hy: http://111.198.0.15:22288 - digital_avatar: http://111.198.0.15:22200 - digital_avatar_hy: http://*****:2003 - local_deploy: false - token: fm2023 \ No newline at end of file diff --git a/yqzjSchedule/src/main/resources/application-yqzj.yml b/yqzjSchedule/src/main/resources/application-yqzj.yml deleted file mode 100644 index 00c1767..0000000 --- a/yqzjSchedule/src/main/resources/application-yqzj.yml +++ /dev/null @@ -1,169 +0,0 @@ -spring: - profiles: - include: aliyunRocketMQ - # JDBC - datasource: - url: jdbc:mysql://rm-2zelxn28n1kr4093q.mysql.rds.aliyuncs.com/matavatar?serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=UTF-8&useSSL=false&useAffectedRows=true - username: yqzjroot - password: yqzj@2023ABC - type: com.alibaba.druid.pool.DruidDataSource - driver-class-name: com.mysql.cj.jdbc.Driver - filters: stat - maxActive: 200 - initialSize: 1 - maxWait: 60000 - minIdle: 1 - timeBetweenEvictionRunsMillis: 28000 - minEvictableIdleTimeMillis: 28000 - validationQuery: select 'x' - testWhileIdle: true - testOnBorrow: false - testOnReturn: false - poolPreparedStatements: true - maxOpenPreparedStatements: 20 - connectionProperties: "druid.stat.mergeSql=true;druid.stat.slowSqlMillis=6000" - # REDIS - redis: - host: r-2zeb1syt5wyw757yf4.redis.rds.aliyuncs.com - port: 6379 - password: sm2023@rd - timeout: 3600 - expire: 1800 #30分钟 - database: 1 - defaultExpiration: 2592000 # 默认生命周期30天 - jedis: - pool: - max-active: 8 - max-idle: 8 - max-wait: -1 - min-idle: 0 - # SMS - aliyun: - sms: - accessKeyId: LTAI5tNkUMtFoWH4L7vh7Tzp - accessKeySecret: 1oXCcfK8paG454VxO6VdsqyRQpgboW - product: Dysmsapi - domain: dysmsapi.aliyuncs.com - regionId: cn-hangzhou - dateFormat: yyyyMMdd - endpointName: cn-hangzhou - oss: - endpoint: oss-cn-beijing.aliyuncs.com - keyid: LTAI5tNkUMtFoWH4L7vh7Tzp - keysecret: 1oXCcfK8paG454VxO6VdsqyRQpgboW - bucketname: yuanqizhijia - filehost: schedule - filedomain: https://suimang.oss-accelerate.aliyuncs.com - # EMAIL - mail: - host: smtp.exmail.qq.com - username: system@metavatar.com.cn - password: 2bKGhFaKKjhQFeka # 授权密码 - properties: - mail: - smtp: - auth: true - starttls: - enable: true - socketFactory: - port: 465 - class: javax.net.ssl.SSLSocketFactory - # RABBITMQ - rabbitmq: - host: 127.0.0.1 - port: 5672 - username: ENC(lRmLd6EzgeY1RT5ktcHv9g==) - password: ENC(gBI8mCjr3OC0v57jcnSb660Ux7mW03K2oePgvohhg7w=) - publisher-confirms: true - publisher-returns: false - virtual-host: / - # - aliyunRocketmq: - accessKeyId: "xxx" - accessKeySecret: "xxxx" - groupId: "GID_P_1" - namesrvAddr: "http://xxxx2is.cn-beijing.mq-internal.aliyuncs.com:8080" - flyway: - enabled: false - -aws: - clientRegion: cn-northwest-1 - bucketName: iformall-net - access: ENC(a6SN1sZ1enNL49ypiOXkg/pPPAnZD8H4buQFTTKN08s=) - secret: ENC(5P5ff4bTMJUbXVR4ZsM03UHzOKZ4+Zg5Iutcdkyp/Quny/oXg+A4KpfwEyGarlLu3vQMJahGP5M=) - -wechat: - web: - appId: "xxxx" - secret: "xxxx" - url: "https://xxxx" - open: - componentAppId: ENC(b3JG0MUZgQfz5Zj+DC2ZM1zDeLOiGTmmeokfe2O8kaM=) - componentSecret: ENC(QVyc4BPGdnSjXGs2ivgpDBE1v8wPWHLLRMYI7Vv8uYwC0SiZHQz0QpyyQV/b48Pb) - componentToken: ENC(rkxj0733WxFFDLgA9x01m2s5Fi2L+0PC) - componentAesKey: ENC(EIbJUBpbYOrLb4YQ/HXLQmxlxgAqIp2ZmpnGICC8pu5xiTz3Cqfkbwd2S8raCcK/IvYcX2GmedI=) - redis: - host: r-2zeb1syt5wyw757yf4.redis.rds.aliyuncs.com - port: 6379 - password: sm2023@rd - timeout: 3600 - expire: 1800 #30分钟 - database: 2 - defaultExpiration: 2592000 # 默认生命周期30天 - jedis: - pool: - max-active: 100 - max-idle: 100 - max-wait: -1 - min-idle: 10 - -alipay: - open: - appId: 2021011111616334 - appPrivateKey: MIIEvAIBADANBgkqhkiG9w0BAQEFAASCBKYwggSiAgEAAoIBxxxxRRVlypCcgiSkqpSlnmgyCEM7nu8IerV8Yf7dMBitBklTpJB+4URV1bW+q6Ijzo8RsCyjm1Kx+EFiKf1PiJXlT0h1+bF3fYdDr6r5GK0/TtB8O80p774NcRD3HgbzUS8AEe/GcBvhiXbDRgJh7yAngW9vxl9u1o5UcaxOXVLWDrjlQGF6qyXUlycCNIdPXj3LduP3PBK5daVZwJm33Pr7kmSI0agZvV267HaTpSKaiXI7Zwo+nFMqx9g9kpzmYRfOgHx3DWpQUFI646IB8nEpLpQp3/0eDocuqiHXYgEpLpPoFKoVE228v74YSFh3Y4fFGX+qtjAgMBAAECggEAIJK9Y42xtSyHjaNdo7bf3CK3HAyn3pafFjyYFT4SxJyxNEDMay5Z5nVq7IAD/+BehMycOFqtvveVf+1+NO/XzZo1iH9URYVfRazkz+lWXYopVkdACm6gN1ILeymAy9g2q+s918ywyxteP668+ABK+5j5wsk/F7wNwKVvKGn0yMT7DP0FAL1e0KWndZCZlF79VnFpBLscDJq28GqRzqYop4CWqHHTA6DBvIqkfQV4U3IzqnzOsxNLEMBwhnbK08XfYZ3DxCPH0jQdA2Jj/aABrntq2EpWjzW5H9iZqrVo33rmsNHUSQvla/333RkbpwGyNhI6kcPBRq4cVSAa3y7dMQKBgQDVfyDUPWKXVwIJUgO1my8WIUu2p6nhuT7Mfnpk4X7ewdFaRVjb/r0KvhLgoz2/KOwkqtWTlEvNaCDDycpLXk+V5ZH833kYsDEmxY7ikOUjCcrfYJgT7P77//cZ4Kx8a5X45SiKAZT2GQv7BTtIfNhrfTUj6AQx/3MP3sa2QAWeNQKBgQCedWoF7t+qyck2hctqtTFC7fRkEk7RNJVph1ZOeTqOIAKhmhkwaOE3joxQ/VqHDy212YdW4hI0BWUzbEdMy0Idz2G3y9ERVD84hZehf5GGRdiSrY9EEQgHlcI6Qb8/AnDdpy1DlKUMwTYjVNzkDL3AzeWn61JS1XQaOzZBsJy2NwKBgFa+pJQXrOtYytcGn8M2Hlebh6vbS8cPAVkNOqWqiWXw0iMfcg9Q3XZz7C+hpAD7m5b6YnToGDSJTma+opck5qk88agRFJ7XV+Es+/VKcg9edzNzh9bwwFmbksbM5shW3kSWt3X7Vo73dkqzwXaeY0CpSuIf7zRxWkrkdVCvipjRAoGAMcJlPN+6VQNwsDJromKryXy31gT5wzBkCvN44sOm46KhsOWXK2CD+NJGtdgZaXgWvphEq7/qP3PCR9ekvDTH2lyZLwJN8Mcn4zPwXcKVjDi6vbTK3HEMuHUKvQiQadT2ZGRvDl3LRqoVuhqYEvT9UWJWz9hRzblB8ErPyukPDRkCgYB7bMv2iflpaGE1J3gkTlVJB+2QSfnAXaUDMLWsZN4gYjwEBVCEJ+mhWL1/GeEIBjSs5/qZIeRsYzlxGEcnsJzRfog6ITBF14AeZ+xNkHq83ja87OGVKMypiccGwRehijDhJi6tgMJ0u0w6PiqcJvh0SX4jBhDDPjuWzK2XD+lx8A== - appPublicKeyCertPath: /opt/service/alipay/appCertPublicKey_2021002140616334.crt - alipayCertPath: /opt/service/alipay/alipayCertPublicKey_RSA2.crt - alipayRootCertPath: /opt/service/alipay/alipayRootCert.crt - callback: https://xx.com/api/alipay/notify/callback - -video: - aliyun: - accessKeyId: LTAI5tNkUMtFoWH4L7vh7Tzp - accessKeySecret: 1oXCcfK8paG454VxO6VdsqyRQpgboW - regionId: cn-beijing - endPoint: https://oss-cn-beijing.aliyuncs.com - corePoolSize: 6 - maxPoolSize: 20 - queueCapacity: 1000 - namePrefix: aliyun-video-upload - -fm: - exception: true - exception_emails: houtaikaifa@iformall.com - deploy: 3 - open: true - upload_dir: /root/uploads/ - monitor_emails: houtaikaifa@iformall.com,xiaochengxufabu@iformall.com - monitor_enable: false - clear_data_before_msg_record: 1 - videoType: aliyun - -logging: - level: - #tk.mybatis: debug - com.iformall: debug - path: ./logs/s - - -suimang: - oral_broadcasting: x.x.x.x - video_path: http://111.198.0.15:22266 - callbackUrl: https://neuver.meta-autotv.com/C/callback/oral/broadcasting - video_tts: x.x.x.x - huibo_tts_wav: x.x.x.x - photo_speak: x.x.x.x - photo_speak_hy: x.x.x.x - digital_avatar: x.x.x.x - digital_avatar_hy: x.x.x.x - local_deploy: true - token: x \ No newline at end of file diff --git a/yqzjSchedule/src/main/resources/application.yml b/yqzjSchedule/src/main/resources/application.yml deleted file mode 100644 index 597ef90..0000000 --- a/yqzjSchedule/src/main/resources/application.yml +++ /dev/null @@ -1,71 +0,0 @@ -server: - port: 5200 - servlet: - context-path: /S - -spring: - application: - name: suimang - profiles: - active: dev - jackson: - date-format: yyyy-MM-dd HH:mm:ss - time-zone: GMT+8 - default-property-inclusion: non_null - servlet: - multipart: - max-file-size: 2MB - max-request-size: 2MB - cache: - type: REDIS - cache-names: redis_cache #缓存的名字(可以不指定) - redis: - time-to-live: 60000ms #很重要,缓存的有效时间,以便缓存的过期(单位为毫秒) -# rocketmq: -# nameServer: 127.0.0.1:9876 -# producer: -# retry-times-when-send-async-failed: 0 -# send-msg-timeout: 300000 -# compress-msg-body-over-howmuch: 4096 -# max-message-size: 4194304 -# retry-another-broker-when-not-store-ok: false -# retry-times-when-send-failed: 2 -# rabbitmq: -# host: 127.0.0.1 -# port: 5672 -# username: guest -# password: guest -# publisher-confirms: true -# virtual-host: / - - -# MybatisPlus -mybatis-plus: - mapper-locations: classpath:mapper/*Mapper.xml - global-config: - db-config: - id-type: id_worker - field-strategy: not_null - db-type: mysql - configuration: - jdbc-type-for-null: 'null' - cache-enabled: false - call-setters-on-nulls: true - type-aliases-package: com.iformall.domain.po - type-enums-package: com.iformall.enums - -# PageHelper -pagehelper: - helperDialect: mysql - reasonable: false - supportMethodsArguments: true - params: count=countSql - offset-as-page-num: true - page-size-zero: true - row-bounds-with-count: true - -mapper: - mappers: - - com.iformall.common.CommonMapper - -version: @project.version@ \ No newline at end of file diff --git a/yqzjSchedule/src/main/resources/logback-spring.xml b/yqzjSchedule/src/main/resources/logback-spring.xml deleted file mode 100644 index 3a54d11..0000000 --- a/yqzjSchedule/src/main/resources/logback-spring.xml +++ /dev/null @@ -1,100 +0,0 @@ - - - - - - - - [%date{yyyy-MM-dd HH:mm:ss.SSS}] [%-5level] --%mdc{client}%msg%n - - - - - ${logPath}/trace.log - - ${logPath}/daily/trace.%d{yyyy-MM-dd}.log - 30 - - - [%date{yyyy-MM-dd HH:mm:ss.SSS}] [%-5level] [%logger:%line]--%mdc{client} %msg%n - - - - - ${logPath}/info.log - - ${logPath}/daily/info.%d{yyyy-MM-dd}.log - 30 - - - [%date{yyyy-MM-dd HH:mm:ss.SSS}] [%-5level] [%logger:%line]--%mdc{client} %msg%n - - - INFO - ACCEPT - DENY - - - - - ${logPath}/debug.log - - ${logPath}/daily/debug.%d{yyyy-MM-dd}.log - 30 - - - [%date{yyyy-MM-dd HH:mm:ss.SSS}] [%-5level] [%logger:%line]--%mdc{client} %msg%n - - - DEBUG - ACCEPT - DENY - - - - - - ${logPath}/warn.log - - ${logPath}/daily/warn.%d{yyyy-MM-dd}.log - 30 - - - [%date{yyyy-MM-dd HH:mm:ss.SSS}] [%-5level] [%logger:%line]--%mdc{client} %msg%n - - - WARN - ACCEPT - DENY - - - - - - - ${logPath}/error.log - - ${logPath}/daily/error.%d{yyyy-MM-dd}.log - 30 - - - [%date{yyyy-MM-dd HH:mm:ss.SSS}] [%-5level] [%logger:%line]--%mdc{client} %msg%n - - - ERROR - ACCEPT - DENY - - - - - - - - - - - - - - \ No newline at end of file diff --git a/yqzjService/src/main/resources/mapper/YqzjGuangGaoWeiMapper.xml b/yqzjService/src/main/resources/mapper/YqzjGuangGaoWeiMapper.xml index 5fad599..1914521 100644 --- a/yqzjService/src/main/resources/mapper/YqzjGuangGaoWeiMapper.xml +++ b/yqzjService/src/main/resources/mapper/YqzjGuangGaoWeiMapper.xml @@ -49,7 +49,7 @@ order by ${sortColumns} - select from yqzj_guanggao where `type` = #{type} diff --git a/yqzjService/src/main/resources/mapper/YqzjHotNewsMapper.xml b/yqzjService/src/main/resources/mapper/YqzjHotNewsMapper.xml index dda2b14..504511f 100644 --- a/yqzjService/src/main/resources/mapper/YqzjHotNewsMapper.xml +++ b/yqzjService/src/main/resources/mapper/YqzjHotNewsMapper.xml @@ -44,7 +44,7 @@ order by ${sortColumns} - select from yqzj_hot_news where type = #{type} diff --git a/yqzjService/src/main/resources/mapper/YqzjPageNewsMapper.xml b/yqzjService/src/main/resources/mapper/YqzjPageNewsMapper.xml index 10371b9..54ea6a1 100644 --- a/yqzjService/src/main/resources/mapper/YqzjPageNewsMapper.xml +++ b/yqzjService/src/main/resources/mapper/YqzjPageNewsMapper.xml @@ -60,7 +60,7 @@ - + delete from yqzj_page_news where `type` = #{type}