diff --git a/coolstore-partner-webb/Dockerfile b/coolstore-partner-web/Dockerfile similarity index 100% rename from coolstore-partner-webb/Dockerfile rename to coolstore-partner-web/Dockerfile diff --git a/coolstore-partner-webb/pom.xml b/coolstore-partner-web/pom.xml similarity index 98% rename from coolstore-partner-webb/pom.xml rename to coolstore-partner-web/pom.xml index 8cc7b5208..16aa42b4e 100644 --- a/coolstore-partner-webb/pom.xml +++ b/coolstore-partner-web/pom.xml @@ -9,7 +9,7 @@ 4.0.0 - coolstore-partner-webb + coolstore-partner-web 8 diff --git a/coolstore-partner-webb/src/main/java/com/cool/store/PartnerBWebApplication.java b/coolstore-partner-web/src/main/java/com/cool/store/PartnerWebApplication.java similarity index 92% rename from coolstore-partner-webb/src/main/java/com/cool/store/PartnerBWebApplication.java rename to coolstore-partner-web/src/main/java/com/cool/store/PartnerWebApplication.java index 51105ba58..9f1f66664 100644 --- a/coolstore-partner-webb/src/main/java/com/cool/store/PartnerBWebApplication.java +++ b/coolstore-partner-web/src/main/java/com/cool/store/PartnerWebApplication.java @@ -21,10 +21,10 @@ import javax.sql.DataSource; @SpringBootApplication @EnableAsync @MapperScan("com.cool.store.mapper") -public class PartnerBWebApplication { +public class PartnerWebApplication { public static void main(String[] args) { - SpringApplication.run(PartnerBWebApplication.class, args); + SpringApplication.run(PartnerWebApplication.class, args); } @Bean diff --git a/coolstore-partner-webb/src/main/java/com/cool/store/config/BodyWrapperFilter.java b/coolstore-partner-web/src/main/java/com/cool/store/config/BodyWrapperFilter.java similarity index 100% rename from coolstore-partner-webb/src/main/java/com/cool/store/config/BodyWrapperFilter.java rename to coolstore-partner-web/src/main/java/com/cool/store/config/BodyWrapperFilter.java diff --git a/coolstore-partner-webb/src/main/java/com/cool/store/config/CorsFilter.java b/coolstore-partner-web/src/main/java/com/cool/store/config/CorsFilter.java similarity index 100% rename from coolstore-partner-webb/src/main/java/com/cool/store/config/CorsFilter.java rename to coolstore-partner-web/src/main/java/com/cool/store/config/CorsFilter.java diff --git a/coolstore-partner-webb/src/main/java/com/cool/store/config/CustomHttpServletRequestWrapper.java b/coolstore-partner-web/src/main/java/com/cool/store/config/CustomHttpServletRequestWrapper.java similarity index 100% rename from coolstore-partner-webb/src/main/java/com/cool/store/config/CustomHttpServletRequestWrapper.java rename to coolstore-partner-web/src/main/java/com/cool/store/config/CustomHttpServletRequestWrapper.java diff --git a/coolstore-partner-webb/src/main/java/com/cool/store/config/ServletContextConfig.java b/coolstore-partner-web/src/main/java/com/cool/store/config/ServletContextConfig.java similarity index 100% rename from coolstore-partner-webb/src/main/java/com/cool/store/config/ServletContextConfig.java rename to coolstore-partner-web/src/main/java/com/cool/store/config/ServletContextConfig.java diff --git a/coolstore-partner-webc/src/main/java/com/cool/store/config/SignValidateFilter.java b/coolstore-partner-web/src/main/java/com/cool/store/config/SignValidateFilter.java similarity index 100% rename from coolstore-partner-webc/src/main/java/com/cool/store/config/SignValidateFilter.java rename to coolstore-partner-web/src/main/java/com/cool/store/config/SignValidateFilter.java diff --git a/coolstore-partner-webb/src/main/java/com/cool/store/config/TRTCCallbackFilter.java b/coolstore-partner-web/src/main/java/com/cool/store/config/TRTCCallbackFilter.java similarity index 100% rename from coolstore-partner-webb/src/main/java/com/cool/store/config/TRTCCallbackFilter.java rename to coolstore-partner-web/src/main/java/com/cool/store/config/TRTCCallbackFilter.java diff --git a/coolstore-partner-webb/src/main/java/com/cool/store/config/TokenValidateFilter.java b/coolstore-partner-web/src/main/java/com/cool/store/config/TokenValidateFilter.java similarity index 100% rename from coolstore-partner-webb/src/main/java/com/cool/store/config/TokenValidateFilter.java rename to coolstore-partner-web/src/main/java/com/cool/store/config/TokenValidateFilter.java diff --git a/coolstore-partner-webb/src/main/java/com/cool/store/config/XxlJobConfig.java b/coolstore-partner-web/src/main/java/com/cool/store/config/XxlJobConfig.java similarity index 100% rename from coolstore-partner-webb/src/main/java/com/cool/store/config/XxlJobConfig.java rename to coolstore-partner-web/src/main/java/com/cool/store/config/XxlJobConfig.java diff --git a/coolstore-partner-webb/src/main/java/com/cool/store/config/swagger/Swagger2Config.java b/coolstore-partner-web/src/main/java/com/cool/store/config/swagger/Swagger2Config.java similarity index 100% rename from coolstore-partner-webb/src/main/java/com/cool/store/config/swagger/Swagger2Config.java rename to coolstore-partner-web/src/main/java/com/cool/store/config/swagger/Swagger2Config.java diff --git a/coolstore-partner-webb/src/main/java/com/cool/store/controller/ContentController.java b/coolstore-partner-web/src/main/java/com/cool/store/controller/webb/ContentController.java similarity index 98% rename from coolstore-partner-webb/src/main/java/com/cool/store/controller/ContentController.java rename to coolstore-partner-web/src/main/java/com/cool/store/controller/webb/ContentController.java index f46cb3119..7feb02fb5 100644 --- a/coolstore-partner-webb/src/main/java/com/cool/store/controller/ContentController.java +++ b/coolstore-partner-web/src/main/java/com/cool/store/controller/webb/ContentController.java @@ -1,4 +1,4 @@ -package com.cool.store.controller; +package com.cool.store.controller.webb; import com.cool.store.dto.content.*; import com.cool.store.entity.HyContentInfoDO; diff --git a/coolstore-partner-webb/src/main/java/com/cool/store/controller/LabelController.java b/coolstore-partner-web/src/main/java/com/cool/store/controller/webb/LabelController.java similarity index 98% rename from coolstore-partner-webb/src/main/java/com/cool/store/controller/LabelController.java rename to coolstore-partner-web/src/main/java/com/cool/store/controller/webb/LabelController.java index ae544dc9c..9de3ba340 100644 --- a/coolstore-partner-webb/src/main/java/com/cool/store/controller/LabelController.java +++ b/coolstore-partner-web/src/main/java/com/cool/store/controller/webb/LabelController.java @@ -1,4 +1,4 @@ -package com.cool.store.controller; +package com.cool.store.controller.webb; import com.cool.store.dto.label.LabelAddDTO; import com.cool.store.dto.label.LabelDeleteDTO; diff --git a/coolstore-partner-webb/src/main/java/com/cool/store/controller/LabelGroupController.java b/coolstore-partner-web/src/main/java/com/cool/store/controller/webb/LabelGroupController.java similarity index 98% rename from coolstore-partner-webb/src/main/java/com/cool/store/controller/LabelGroupController.java rename to coolstore-partner-web/src/main/java/com/cool/store/controller/webb/LabelGroupController.java index 53b941c75..9af9ffc56 100644 --- a/coolstore-partner-webb/src/main/java/com/cool/store/controller/LabelGroupController.java +++ b/coolstore-partner-web/src/main/java/com/cool/store/controller/webb/LabelGroupController.java @@ -1,4 +1,4 @@ -package com.cool.store.controller; +package com.cool.store.controller.webb; import com.cool.store.dto.label.LabelGroupAddDTO; import com.cool.store.dto.label.LabelGroupDeleteDTO; diff --git a/coolstore-partner-webb/src/main/java/com/cool/store/controller/OpenAreaController.java b/coolstore-partner-web/src/main/java/com/cool/store/controller/webb/OpenAreaController.java similarity index 98% rename from coolstore-partner-webb/src/main/java/com/cool/store/controller/OpenAreaController.java rename to coolstore-partner-web/src/main/java/com/cool/store/controller/webb/OpenAreaController.java index f4c4958eb..0451816c0 100644 --- a/coolstore-partner-webb/src/main/java/com/cool/store/controller/OpenAreaController.java +++ b/coolstore-partner-web/src/main/java/com/cool/store/controller/webb/OpenAreaController.java @@ -1,4 +1,4 @@ -package com.cool.store.controller; +package com.cool.store.controller.webb; import com.cool.store.context.CurrentUserHolder; import com.cool.store.request.OpenAreaRequest; diff --git a/coolstore-partner-webb/src/main/java/com/cool/store/controller/VideoController.java b/coolstore-partner-web/src/main/java/com/cool/store/controller/webb/VideoController.java similarity index 97% rename from coolstore-partner-webb/src/main/java/com/cool/store/controller/VideoController.java rename to coolstore-partner-web/src/main/java/com/cool/store/controller/webb/VideoController.java index 68d0c983b..0051a293c 100644 --- a/coolstore-partner-webb/src/main/java/com/cool/store/controller/VideoController.java +++ b/coolstore-partner-web/src/main/java/com/cool/store/controller/webb/VideoController.java @@ -1,4 +1,4 @@ -package com.cool.store.controller; +package com.cool.store.controller.webb; import com.alibaba.fastjson.JSONObject; import com.cool.store.dto.trtc.callback.VideoCallBackDTO; diff --git a/coolstore-partner-webc/src/main/java/com/cool/store/controller/ContentController.java b/coolstore-partner-web/src/main/java/com/cool/store/controller/webc/ContentController.java similarity index 83% rename from coolstore-partner-webc/src/main/java/com/cool/store/controller/ContentController.java rename to coolstore-partner-web/src/main/java/com/cool/store/controller/webc/ContentController.java index 77e9cd611..ed6bb959d 100644 --- a/coolstore-partner-webc/src/main/java/com/cool/store/controller/ContentController.java +++ b/coolstore-partner-web/src/main/java/com/cool/store/controller/webc/ContentController.java @@ -1,4 +1,4 @@ -package com.cool.store.controller; +package com.cool.store.controller.webc; import com.cool.store.dto.content.ContentQueryDetailDto; import com.cool.store.dto.content.ContentQueryListDto; @@ -12,7 +12,10 @@ import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.*; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; import java.util.List; diff --git a/coolstore-partner-webc/src/main/java/com/cool/store/controller/MiniProgramAppController.java b/coolstore-partner-web/src/main/java/com/cool/store/controller/webc/MiniProgramAppController.java similarity index 98% rename from coolstore-partner-webc/src/main/java/com/cool/store/controller/MiniProgramAppController.java rename to coolstore-partner-web/src/main/java/com/cool/store/controller/webc/MiniProgramAppController.java index 7a8caa82f..9fca35c88 100644 --- a/coolstore-partner-webc/src/main/java/com/cool/store/controller/MiniProgramAppController.java +++ b/coolstore-partner-web/src/main/java/com/cool/store/controller/webc/MiniProgramAppController.java @@ -1,4 +1,4 @@ -package com.cool.store.controller; +package com.cool.store.controller.webc; import com.cool.store.context.PartnerUserHolder; import com.cool.store.dto.wx.MiniProgramLoginDTO; diff --git a/coolstore-partner-webc/src/main/java/com/cool/store/controller/TestController.java b/coolstore-partner-web/src/main/java/com/cool/store/controller/webc/TestController.java similarity index 98% rename from coolstore-partner-webc/src/main/java/com/cool/store/controller/TestController.java rename to coolstore-partner-web/src/main/java/com/cool/store/controller/webc/TestController.java index 8a11a8ccc..4ee762c67 100644 --- a/coolstore-partner-webc/src/main/java/com/cool/store/controller/TestController.java +++ b/coolstore-partner-web/src/main/java/com/cool/store/controller/webc/TestController.java @@ -1,4 +1,4 @@ -package com.cool.store.controller; +package com.cool.store.controller.webc; import com.cool.store.dao.*; import com.cool.store.entity.*; diff --git a/coolstore-partner-webb/src/main/resources/application-ab.properties b/coolstore-partner-web/src/main/resources/application-ab.properties similarity index 100% rename from coolstore-partner-webb/src/main/resources/application-ab.properties rename to coolstore-partner-web/src/main/resources/application-ab.properties diff --git a/coolstore-partner-webb/src/main/resources/application-local.properties b/coolstore-partner-web/src/main/resources/application-local.properties similarity index 100% rename from coolstore-partner-webb/src/main/resources/application-local.properties rename to coolstore-partner-web/src/main/resources/application-local.properties diff --git a/coolstore-partner-webb/src/main/resources/application-online.properties b/coolstore-partner-web/src/main/resources/application-online.properties similarity index 100% rename from coolstore-partner-webb/src/main/resources/application-online.properties rename to coolstore-partner-web/src/main/resources/application-online.properties diff --git a/coolstore-partner-webb/src/main/resources/application-test.properties b/coolstore-partner-web/src/main/resources/application-test.properties similarity index 100% rename from coolstore-partner-webb/src/main/resources/application-test.properties rename to coolstore-partner-web/src/main/resources/application-test.properties diff --git a/coolstore-partner-webb/src/main/resources/application.properties b/coolstore-partner-web/src/main/resources/application.properties similarity index 96% rename from coolstore-partner-webb/src/main/resources/application.properties rename to coolstore-partner-web/src/main/resources/application.properties index f65673ea8..80c20bb1b 100644 --- a/coolstore-partner-webb/src/main/resources/application.properties +++ b/coolstore-partner-web/src/main/resources/application.properties @@ -1,8 +1,8 @@ -spring.application.name=hsay-partner-webb +spring.application.name=hsay-partner-web spring.profiles.active=test server.port=40000 -server.servlet.context-path=/xfsg/pc +server.servlet.context-path=/xfsg #logback logging.config=classpath:logback-spring.xml diff --git a/coolstore-partner-webb/src/main/resources/logback-spring.xml b/coolstore-partner-web/src/main/resources/logback-spring.xml similarity index 100% rename from coolstore-partner-webb/src/main/resources/logback-spring.xml rename to coolstore-partner-web/src/main/resources/logback-spring.xml diff --git a/coolstore-partner-webb/src/main/resources/static/Alibaba-PuHuiTi-Regular.ttf b/coolstore-partner-web/src/main/resources/static/Alibaba-PuHuiTi-Regular.ttf similarity index 100% rename from coolstore-partner-webb/src/main/resources/static/Alibaba-PuHuiTi-Regular.ttf rename to coolstore-partner-web/src/main/resources/static/Alibaba-PuHuiTi-Regular.ttf diff --git a/coolstore-partner-webb/src/main/resources/static/passLetterBg.jpg b/coolstore-partner-web/src/main/resources/static/passLetterBg.jpg similarity index 100% rename from coolstore-partner-webb/src/main/resources/static/passLetterBg.jpg rename to coolstore-partner-web/src/main/resources/static/passLetterBg.jpg diff --git a/coolstore-partner-webc/Dockerfile b/coolstore-partner-webc/Dockerfile deleted file mode 100644 index 6a4dc4c52..000000000 --- a/coolstore-partner-webc/Dockerfile +++ /dev/null @@ -1,20 +0,0 @@ -FROM openjdk:8u342 -# 作者 -MAINTAINER hsay -# VOLUME 指定了临时文件目录为/tmp。 -# 其效果是在主机 /var/lib/docker 目录下创建了一个临时文件，并链接到容器的/tmp -VOLUME /tmp -# 设置时区 -ENV TZ=Asia/Shanghai - -RUN /bin/cp /usr/share/zoneinfo/Asia/Shanghai /etc/localtime -RUN echo "Asia/Shanghai" > /etc/timezone - -# 将jar包添加到容器中并更名为app.jar -ARG JAR_FILE -ADD target/coolstore-partner-webc-1.0.0.jar /app.jar -#配置项目端口 - -# 运行jar包 -RUN bash -c 'touch /app.jar' -ENTRYPOINT ["sh","-c","java -jar $JAVA_OPTS /app.jar $PARAMS"] \ No newline at end of file diff --git a/coolstore-partner-webc/pom.xml b/coolstore-partner-webc/pom.xml deleted file mode 100644 index 16ecdeae7..000000000 --- a/coolstore-partner-webc/pom.xml +++ /dev/null @@ -1,71 +0,0 @@ - - - - coolstore-partner-manage - com.coolstore - 1.0.0 - - 4.0.0 - - coolstore-partner-webc - - - 8 - 8 - - - - - com.coolstore - coolstore-partner-service - - - org.springframework.boot - spring-boot-starter-web - - - org.springframework.boot - spring-boot-starter - - - com.aliyun.oss - aliyun-sdk-oss - - - - - - - - - - - - - - com.github.danielwegener - logback-kafka-appender - - - - - - - org.springframework.boot - spring-boot-maven-plugin - - - org.sonarsource.scanner.maven - sonar-maven-plugin - - - org.jacoco - jacoco-maven-plugin - - - compile - - - \ No newline at end of file diff --git a/coolstore-partner-webc/src/main/java/com/cool/store/PartnerCWebApplication.java b/coolstore-partner-webc/src/main/java/com/cool/store/PartnerCWebApplication.java deleted file mode 100644 index b52286b3c..000000000 --- a/coolstore-partner-webc/src/main/java/com/cool/store/PartnerCWebApplication.java +++ /dev/null @@ -1,47 +0,0 @@ -package com.cool.store; - -import com.zaxxer.hikari.HikariDataSource; -import org.springframework.boot.SpringApplication; -import org.springframework.boot.autoconfigure.SpringBootApplication; -import org.springframework.boot.autoconfigure.jdbc.DataSourceProperties; -import org.springframework.boot.context.properties.ConfigurationProperties; -import org.springframework.boot.web.servlet.ServletComponentScan; -import org.springframework.cache.annotation.EnableCaching; -import org.springframework.context.annotation.Bean; -import org.springframework.context.annotation.Primary; -import org.springframework.scheduling.annotation.EnableAsync; -import tk.mybatis.spring.annotation.MapperScan; - -import javax.sql.DataSource; - -/** - * @author zhangchenbiao - * @FileName: PartnerBWebApplication - * @Description: B端web层 - * @date 2023-05-17 11:28 - */ -@SpringBootApplication -@MapperScan("com.cool.store.mapper") -@EnableAsync -@EnableCaching -@ServletComponentScan -public class PartnerCWebApplication { - - public static void main(String[] args) { - SpringApplication.run(PartnerCWebApplication.class, args); - } - - @Bean - @Primary - @ConfigurationProperties("default.datasource") - public DataSourceProperties defaultDataSourceProperties() { - return new DataSourceProperties(); - } - - @Bean - @ConfigurationProperties("spring.datasource.hikari") - public DataSource defaultDataSource() { - return defaultDataSourceProperties().initializeDataSourceBuilder().type(HikariDataSource.class).build(); - } - -} diff --git a/coolstore-partner-webc/src/main/java/com/cool/store/config/BodyWrapperFilter.java b/coolstore-partner-webc/src/main/java/com/cool/store/config/BodyWrapperFilter.java deleted file mode 100644 index 561d9b3c3..000000000 --- a/coolstore-partner-webc/src/main/java/com/cool/store/config/BodyWrapperFilter.java +++ /dev/null @@ -1,31 +0,0 @@ -package com.cool.store.config; - -import org.springframework.core.annotation.Order; -import org.springframework.stereotype.Component; - -import javax.servlet.*; -import javax.servlet.http.HttpServletRequest; -import java.io.IOException; - - -/** - * @Author: JCccc - * @Date: 2022-6-12 10:35 - * @Description: - */ -@Component -@Order(2) -public class BodyWrapperFilter implements Filter { - @Override - public void doFilter(ServletRequest servletRequest, ServletResponse servletResponse, FilterChain filterChain) throws IOException, ServletException { - ServletRequest requestWrapper = null; - if(servletRequest instanceof HttpServletRequest) { - requestWrapper = new CustomHttpServletRequestWrapper((HttpServletRequest) servletRequest); - } - if(requestWrapper == null) { - filterChain.doFilter(servletRequest, servletResponse); - } else { - filterChain.doFilter(requestWrapper, servletResponse); - } - } -} \ No newline at end of file diff --git a/coolstore-partner-webc/src/main/java/com/cool/store/config/CorsFilter.java b/coolstore-partner-webc/src/main/java/com/cool/store/config/CorsFilter.java deleted file mode 100644 index 711926df2..000000000 --- a/coolstore-partner-webc/src/main/java/com/cool/store/config/CorsFilter.java +++ /dev/null @@ -1,50 +0,0 @@ -package com.cool.store.config; - - -import cn.hutool.http.HttpStatus; -import org.springframework.core.annotation.Order; -import org.springframework.stereotype.Component; - -import javax.servlet.*; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; -import java.io.IOException; - -/** - * @Description 跨域配置 - * @author Aaron - * @date 2020/1/9 - */ -@Component -@Order(1) -public class CorsFilter implements Filter { - - @Override - public void doFilter(ServletRequest req, ServletResponse res, FilterChain chain) throws IOException, ServletException { - HttpServletResponse response = (HttpServletResponse) res; - HttpServletRequest reqs = (HttpServletRequest) req; - response.setHeader("Access-Control-Allow-Origin",reqs.getHeader("Origin")); - response.setHeader("Access-Control-Allow-Credentials", "true"); - response.setHeader("Access-Control-Allow-Methods", "POST, OPTIONS, GET, DELETE, PUT"); - response.setHeader("Access-Control-Max-Age", "36000"); - response.setHeader("Access-Control-Allow-Headers", "*"); - if (reqs.getMethod().equals("OPTIONS") || reqs.getMethod().equals("HEAD")) { - response.setStatus(HttpStatus.HTTP_OK); - return; - } - chain.doFilter(req, res); - } - - - @Override - public void init(FilterConfig filterConfig) { - //do nothing - } - - - @Override - public void destroy() { - //do nothing - } - -} \ No newline at end of file diff --git a/coolstore-partner-webc/src/main/java/com/cool/store/config/CustomHttpServletRequestWrapper.java b/coolstore-partner-webc/src/main/java/com/cool/store/config/CustomHttpServletRequestWrapper.java deleted file mode 100644 index 0e1a4d64d..000000000 --- a/coolstore-partner-webc/src/main/java/com/cool/store/config/CustomHttpServletRequestWrapper.java +++ /dev/null @@ -1,66 +0,0 @@ -package com.cool.store.config; - -import javax.servlet.ReadListener; -import javax.servlet.ServletInputStream; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletRequestWrapper; -import java.io.*; -import java.nio.charset.StandardCharsets; - -/** - * @Author: JCccc - * @Date: 2022-6-12 10:36 - * @Description: 重写一个自己的 RequestWrapper 拿出body给自己用 - */ - -public class CustomHttpServletRequestWrapper extends HttpServletRequestWrapper { - private byte[] body; - public CustomHttpServletRequestWrapper(HttpServletRequest request) throws IOException { - super(request); - BufferedReader reader = request.getReader(); - try (StringWriter writer = new StringWriter()) { - int read; - char[] buf = new char[1024 * 8]; - while ((read = reader.read(buf)) != -1) { - writer.write(buf, 0, read); - } - this.body = writer.getBuffer().toString().getBytes(); - } - } - public String getBody(){ - return new String(body, StandardCharsets.UTF_8); - } - @Override - public ServletInputStream getInputStream() { - final ByteArrayInputStream byteArrayInputStream = new ByteArrayInputStream(body); - return new ServletInputStream() { - @Override - public boolean isFinished() { - return false; - } - @Override - public boolean isReady() { - return false; - } - - /** - * Sets the ReadListener for this ServletInputStream. - * @param readListener The non-blocking IO read listener - * - */ - @Override - public void setReadListener(ReadListener readListener) { - //do nothing - } - - @Override - public int read() { - return byteArrayInputStream.read(); - } - }; - } - @Override - public BufferedReader getReader() { - return new BufferedReader(new InputStreamReader(this.getInputStream())); - } -} \ No newline at end of file diff --git a/coolstore-partner-webc/src/main/java/com/cool/store/config/ServletContextConfig.java b/coolstore-partner-webc/src/main/java/com/cool/store/config/ServletContextConfig.java deleted file mode 100644 index 255565aa1..000000000 --- a/coolstore-partner-webc/src/main/java/com/cool/store/config/ServletContextConfig.java +++ /dev/null @@ -1,64 +0,0 @@ -package com.cool.store.config; - -import org.springframework.context.annotation.Configuration; -import org.springframework.http.converter.HttpMessageConverter; -import org.springframework.web.servlet.HandlerExceptionResolver; -import org.springframework.web.servlet.config.annotation.CorsRegistry; -import org.springframework.web.servlet.config.annotation.DefaultServletHandlerConfigurer; -import org.springframework.web.servlet.config.annotation.ResourceHandlerRegistry; -import org.springframework.web.servlet.config.annotation.WebMvcConfigurationSupport; - -import java.util.List; - -/** - * @author zhangchenbiao - * @FileName: ServletContextConfig - * @Description: - * @date 2023-06-08 16:28 - */ -@Configuration -public class ServletContextConfig extends WebMvcConfigurationSupport { - - /** - * 配置servlet处理 - */ - @Override - public void configureDefaultServletHandling(DefaultServletHandlerConfigurer configurer) { - configurer.enable(); - } - - @Override - public void addCorsMappings(CorsRegistry registry) { - registry.addMapping("/**") - .allowedOrigins("*") - .allowCredentials(true) - .allowedMethods("GET", "POST", "OPTIONS", "PUT", "DELETE") - .maxAge(3600); - } - - @Override - public void addResourceHandlers(ResourceHandlerRegistry registry) { - registry.addResourceHandler("/**").addResourceLocations("classpath:/static/"); - registry.addResourceHandler("swagger-ui.html").addResourceLocations("classpath:/META-INF/resources/"); - registry.addResourceHandler("doc.html").addResourceLocations("classpath:/META-INF/resources/"); - registry.addResourceHandler("/webjars/**") - .addResourceLocations("classpath:/META-INF/resources/webjars/"); - super.addResourceHandlers(registry); - } - - @Override - public void configureMessageConverters(List> converters) { - //do nothing - } - - /** - * 统一异常处理 - * - * @param exceptionResolvers - */ - @Override - public void configureHandlerExceptionResolvers(List exceptionResolvers) { - //do nothing - } - -} diff --git a/coolstore-partner-webc/src/main/java/com/cool/store/config/swagger/Swagger2Config.java b/coolstore-partner-webc/src/main/java/com/cool/store/config/swagger/Swagger2Config.java deleted file mode 100644 index 959a2ef1f..000000000 --- a/coolstore-partner-webc/src/main/java/com/cool/store/config/swagger/Swagger2Config.java +++ /dev/null @@ -1,87 +0,0 @@ -package com.cool.store.config.swagger; - -import com.github.xiaoymin.knife4j.spring.annotations.EnableKnife4j; -import com.google.common.base.Predicate; -import com.google.common.base.Predicates; -import org.apache.commons.lang3.StringUtils; -import org.springframework.context.annotation.Bean; -import org.springframework.context.annotation.Configuration; -import org.springframework.context.annotation.Profile; -import springfox.documentation.RequestHandler; -import springfox.documentation.builders.ApiInfoBuilder; -import springfox.documentation.builders.ParameterBuilder; -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; - -/** - * @author zhangchenbiao - * @description: - * @date 2023/05/15 02:52 - */ -@Profile({"local", "dev", "ab", "test", "pre"}) -@Configuration -@EnableSwagger2 -@EnableKnife4j -public class Swagger2Config { - - /** - * 扫描接口地址的包名 - */ - public static final String BASE_PACKAGE = "com.cool.store.controller"; - - private ApiInfo getApiInfo() { - return new ApiInfoBuilder() - .title("coolstore-partner-manage") - .description("接口文档") - .version("1.0") - .build(); - } - - private Docket createDocket (String groupName, String... packages){ - List pars = getParameters(); - return new Docket(DocumentationType.SWAGGER_2) - .enable(Boolean.TRUE) - .apiInfo(this.getApiInfo()) - .groupName(groupName) - .select() - .apis(this.scanBasePackage(packages)) - .build() - .globalOperationParameters(pars); - } - - private List getParameters() { - List pars = new ArrayList<>(); - pars.add(new ParameterBuilder().name("accessToken").description("令牌").required(true) - .modelRef(new ModelRef("string")) - .defaultValue("{{accessToken}}") - .parameterType("query").build()); - return pars; - } - - private Predicate scanBasePackage(final String... controllerPack) { - Predicate predicate = null; - for (String strBasePackage : controllerPack) { - if(StringUtils.isNotBlank(strBasePackage)){ - Predicate tempPredicate = RequestHandlerSelectors.basePackage(strBasePackage); - predicate = predicate == null ? tempPredicate : Predicates.or(tempPredicate,predicate); - } - } - return predicate; - } - - - @Bean - public Docket allApi() { - return this.createDocket("全部", BASE_PACKAGE); - } - -} - diff --git a/coolstore-partner-webc/src/main/resources/application-ab.properties b/coolstore-partner-webc/src/main/resources/application-ab.properties deleted file mode 100644 index d3eb28f51..000000000 --- a/coolstore-partner-webc/src/main/resources/application-ab.properties +++ /dev/null @@ -1,86 +0,0 @@ - -#mysql config -default.datasource.url=jdbc:mysql://dingpushcoolcollege.mysql.rds.aliyuncs.com:3306/coolcollege_intelligent_hy?useSSL=false&useUnicode=true&characterEncoding=utf8&allowMultiQueries=true&autoReconnect=true -default.datasource.username=hsay -default.datasource.password=Z3J7xBbgouMD - -#redis -spring.redis.host=tstore-coolcollege.redis.rds.aliyuncs.com -spring.redis.port=6379 -spring.redis.password=Cx111111 -spring.redis.database=0 -spring.redis.timeout=2000ms -spring.redis.lettuce.pool.max-wait=100ms -spring.redis.lettuce.pool.max-active=1024 -spring.redis.lettuce.pool.max-idle=200 -spring.redis.lettuce.pool.min-idle=0 -spring.redis.lettuce.shutdown-timeout=100ms -redis.host.uri=http://userInfo:Cx111111@tstore-coolcollege.redis.rds.aliyuncs.com:6379/0 -redis.isv.host.uri=http://userInfo:Cx111111@tstore-coolcollege.redis.rds.aliyuncs.com:6379/2 - -#pagehelper -pagehelper.helper-dialect=mysql -pagehelper.reasonable=false -pagehelper.returnPageInfo=check -pagehelper.support-methods-arguments=false -pagehelper.params=count=countSql -pagehelper.page-size-zero=true - -spring.mvc.async.request-timeout=60000 - -# mybatis config -mybatis.mapper-locations=classpath*:mapper/**/*Mapper.xml - -mybatis.configuration.call-setters-on-nulls=true -mybatis.configuration.map-underscore-to-camel-case=true - -isv.domain=https://abstore-isv.coolstore.cn/isv - -#rocketmq \u914D\u7F6E -rocketmq.accessKey=zK2oVEz4G1ts23d2 -rocketmq.secretKey=0UstLCS0mh2ASgBh -rocketmq.nameSrvAdder=http://rmq-cn-9lb38l1rx04.cn-hangzhou.rmq.aliyuncs.com:8080 -rocketmq.topic=simple_message - -#oss配置 -oss.accessKeyId=LTAI5tRSXy2MrqaaBJ6gReur -oss.accessKeySecret=FFsl8d9batprJ0vXr0k4Y8ada40Wm2 -oss.endpoint=oss-cn-hangzhou.aliyuncs.com -oss.bucket=cool-store-hsay -oss.file.dir=partner/171cddee76471740/ -oss.excelFile.dir=lineExcel/ - -#企业corpId -corp.id=171cddee76471740 -#cdn地址 -cdn.url=https://testhsaypic.coolstore.cn - -#TRTC -trtc.sdkAppId=1400811820 -trtc.secretKey=4854bab106c2ca2a2fda16a8c966933e28a078a34e458999d6227e8cd8ab8219 - -weixin.appId=wx085c84fe42691bf1 -weixin.appSecret=58e89c9ec4ade1d094bbe21836a19ec4 - - -signKey=77fea013c3a6459685b83c21a2fc3411 -fixMobileOpenid=HSAY5531DA7 - -#飞书通知 -feishu.notice.link.url=https://applink.feishu.cn/client/web_app/open?appId=cli_a4f3e24dc73a100c&lk_target_url=https%3A%2F%2Ftest-hsay-web.coolstore.cn%2F%23%2Fwork%2Fbench -feishu.notice.link.url.mobile=https://test-hsay-web.coolstore.cn/#/mobile - -#阿里云ak sk -aliyun.accessKeyId=LTAI5t9RaXvABZbHvoXjDFJ1 -aliyun.accessKeySecret=zhOK7WWo3yGoUWkOMaatty19k25CMd -aliyun.authCode=Y81FVZepk6 - -exhibition.channel.id=52399 -recommended.channel.id=52400 -manual.channel.id=52403 - -ec.sync.createUserId=ou_18d7526a527a30a06ee99205ad983f3f - -#沪上阿姨事件中心地址 -hsay.event.url=https://oapi-gateway.shpr.top/event -hsay.event.systemsource=hsay_test \ No newline at end of file diff --git a/coolstore-partner-webc/src/main/resources/application-local.properties b/coolstore-partner-webc/src/main/resources/application-local.properties deleted file mode 100644 index bc506baef..000000000 --- a/coolstore-partner-webc/src/main/resources/application-local.properties +++ /dev/null @@ -1,85 +0,0 @@ - -#mysql config -default.datasource.url=jdbc:mysql://dingpushcoolcollege.mysql.rds.aliyuncs.com:3306/coolcollege_intelligent_36?useSSL=false&useUnicode=true&characterEncoding=utf8&allowMultiQueries=true&autoReconnect=true -default.datasource.username=coolstore -default.datasource.password=CSCErYcXniNYm7bT - -#redis -spring.redis.host=tstore-coolcollege.redis.rds.aliyuncs.com -spring.redis.port=6379 -spring.redis.password=Cx111111 -spring.redis.database=0 -spring.redis.timeout=2000ms -spring.redis.lettuce.pool.max-wait=100ms -spring.redis.lettuce.pool.max-active=1024 -spring.redis.lettuce.pool.max-idle=200 -spring.redis.lettuce.pool.min-idle=0 -spring.redis.lettuce.shutdown-timeout=100ms -redis.host.uri=http://userInfo:Cx111111@tstore-coolcollege.redis.rds.aliyuncs.com:6379/0 -redis.isv.host.uri=http://userInfo:Cx111111@tstore-coolcollege.redis.rds.aliyuncs.com:6379/2 - -#pagehelper -pagehelper.helper-dialect=mysql -pagehelper.reasonable=false -pagehelper.returnPageInfo=check -pagehelper.support-methods-arguments=false -pagehelper.params=count=countSql -pagehelper.page-size-zero=true - -spring.mvc.async.request-timeout=60000 - -# mybatis config -mybatis.mapper-locations=classpath*:mapper/**/*Mapper.xml - -mybatis.configuration.call-setters-on-nulls=true -mybatis.configuration.map-underscore-to-camel-case=true - -isv.domain=https://abstore-isv.coolstore.cn/isv - -#rocketmq \u914D\u7F6E -rocketmq.accessKey=zK2oVEz4G1ts23d2 -rocketmq.secretKey=0UstLCS0mh2ASgBh -rocketmq.nameSrvAdder=http://rmq-cn-9lb38l1rx04.cn-hangzhou.rmq.aliyuncs.com:8080 -rocketmq.topic=simple_message - -#oss配置 -oss.accessKeyId=LTAI5tRSXy2MrqaaBJ6gReur -oss.accessKeySecret=FFsl8d9batprJ0vXr0k4Y8ada40Wm2 -oss.endpoint=oss-cn-hangzhou.aliyuncs.com -oss.bucket=cool-store-hsay -oss.file.dir=partner/171cddee76471740/ -oss.excelFile.dir=lineExcel/ - -#企业corpId -corp.id=171cddee76471740 -#cdn地址 -cdn.url=https://testhsaypic.coolstore.cn - -#TRTC -trtc.sdkAppId=1400811820 -trtc.secretKey=4854bab106c2ca2a2fda16a8c966933e28a078a34e458999d6227e8cd8ab8219 - -weixin.appId=wx085c84fe42691bf1 -weixin.appSecret=58e89c9ec4ade1d094bbe21836a19ec4 - -signKey=77fea013c3a6459685b83c21a2fc3411 -fixMobileOpenid=HSAY5531DA7 - -#飞书通知 -feishu.notice.link.url=https://applink.feishu.cn/client/web_app/open?appId=cli_a4f3e24dc73a100c&lk_target_url=https%3A%2F%2Ftest-hsay-web.coolstore.cn%2F%23%2Fwork%2Fbench -feishu.notice.link.url.mobile=https://test-hsay-web.coolstore.cn/#/mobile - -#阿里云ak sk -aliyun.accessKeyId=LTAI5t9RaXvABZbHvoXjDFJ1 -aliyun.accessKeySecret=zhOK7WWo3yGoUWkOMaatty19k25CMd -aliyun.authCode=Y81FVZepk6 - -exhibition.channel.id=52399 -recommended.channel.id=52400 -manual.channel.id=52403 - -ec.sync.createUserId=ou_18d7526a527a30a06ee99205ad983f3f - -#沪上阿姨事件中心地址 -hsay.event.url=https://oapi-gateway.shpr.top/event -hsay.event.systemsource=hsay_test \ No newline at end of file diff --git a/coolstore-partner-webc/src/main/resources/application-online.properties b/coolstore-partner-webc/src/main/resources/application-online.properties deleted file mode 100644 index 7b79d39b0..000000000 --- a/coolstore-partner-webc/src/main/resources/application-online.properties +++ /dev/null @@ -1,108 +0,0 @@ - -#mysql config -default.datasource.url=jdbc:mysql://dingpushcoolcollege.mysql.rds.aliyuncs.com:3306/coolcollege_intelligent_hy?useSSL=false&useUnicode=true&characterEncoding=utf8&allowMultiQueries=true&autoReconnect=true -default.datasource.username=hsay -default.datasource.password=Z3J7xBbgouMD - -#redis -spring.redis.host=tstore-coolcollege.redis.rds.aliyuncs.com -spring.redis.port=6379 -spring.redis.password=Cx111111 -spring.redis.database=0 -spring.redis.timeout=2000ms -spring.redis.lettuce.pool.max-wait=100ms -spring.redis.lettuce.pool.max-active=1024 -spring.redis.lettuce.pool.max-idle=200 -spring.redis.lettuce.pool.min-idle=0 -spring.redis.lettuce.shutdown-timeout=100ms -redis.host.uri=http://userInfo:Cx111111@tstore-coolcollege.redis.rds.aliyuncs.com:6379/0 -redis.isv.host.uri=http://userInfo:Cx111111@tstore-coolcollege.redis.rds.aliyuncs.com:6379/2 - -#pagehelper -pagehelper.helper-dialect=mysql -pagehelper.reasonable=false -pagehelper.returnPageInfo=check -pagehelper.support-methods-arguments=false -pagehelper.params=count=countSql -pagehelper.page-size-zero=true - -spring.mvc.async.request-timeout=60000 - -# mybatis config -mybatis.mapper-locations=classpath*:mapper/**/*Mapper.xml - -mybatis.configuration.call-setters-on-nulls=true -mybatis.configuration.map-underscore-to-camel-case=true - -isv.domain=https://abstore-isv.coolstore.cn/isv - -#rocketmq \u914D\u7F6E -rocketmq.accessKey=zK2oVEz4G1ts23d2 -rocketmq.secretKey=0UstLCS0mh2ASgBh -rocketmq.nameSrvAdder=http://rmq-cn-9lb38l1rx04.cn-hangzhou.rmq.aliyuncs.com:8080 -rocketmq.topic=simple_message - -#oss配置 -oss.accessKeyId=LTAI5tRSXy2MrqaaBJ6gReur -oss.accessKeySecret=FFsl8d9batprJ0vXr0k4Y8ada40Wm2 -oss.endpoint=oss-cn-hangzhou.aliyuncs.com -oss.bucket=cool-store-hsay -oss.file.dir=partner/171cddee76471740/ -oss.excelFile.dir=lineExcel/ - -#企业corpId -corp.id=171cddee76471740 -#cdn地址 -cdn.url=https://testhsaypic.coolstore.cn - -#TRTC -trtc.sdkAppId=1400811820 -trtc.secretKey=4854bab106c2ca2a2fda16a8c966933e28a078a34e458999d6227e8cd8ab8219 -trtc.video.callback.secretKey=1ECEAD34DBD84E838BF07FC7360EA4D8 - -weixin.appId=wx997f2206e276e513 -weixin.appSecret=90a51574dde00480316f81a552e6b5cb -weixin.index.url=pages/index/index - -signKey=77fea013c3a6459685b83c21a2fc3411 -fixMobileOpenid=HSAY5531DA7 -#xxljob配置 -#xxljob配置 -xxl.job.admin.addresses=http://10.7.53.224:10001/xxl-job-admin -xxl.job.executor.appname=${spring.application.name} -xxl.job.executor.ip= -xxl.job.executor.port=31001 -xxl.job.executor.logpath=logs/xxl-job/jobhandler -xxl.job.executor.logretentiondays=3 -xxl.job.accessToken=25365115eed84e9ba5e0040abb255a09 - - -hs.mdm.baseUrl=http://36.7.115.86:10112 -hs.mdm.appkey=HSAYPartner -hs.mdm.appsec=ab39fedb886fa3587c7f517551976de8b2606f5511fd8f8675266825d74c5cd3 - -#sms -hs.sms.accessKeyId=LTAI5tPWCTeCyngfYLqoSGWk -hs.sms.accessKeySecret=jkzIXlvNF17ne5TPPEFP1sQhcfg4Je - -ec.baseUrl=https://oapi-gateway.shpr.top/basic - -#飞书通知 -feishu.notice.link.url=https://applink.feishu.cn/client/web_app/open?appId=cli_a4f3e24dc73a100c&lk_target_url=https%3A%2F%2Ftest-hsay-web.coolstore.cn%2F%23%2Fwork%2Fbench -feishu.notice.link.url.mobile=https://test-hsay-web.coolstore.cn/#/mobile - -#阿里云ak sk -aliyun.accessKeyId=LTAI5t9RaXvABZbHvoXjDFJ1 -aliyun.accessKeySecret=zhOK7WWo3yGoUWkOMaatty19k25CMd -aliyun.authCode=Y81FVZepk6 - -exhibition.channel.id=52399 -recommended.channel.id=52400 -manual.channel.id=52403 -sms.invate.channel.id=46930 - -ec.sync.createUserId=ou_18d7526a527a30a06ee99205ad983f3f - -#沪上阿姨事件中心地址 -hsay.event.url=https://oapi-gateway.shpr.top/event -hsay.event.systemsource=hsay_test \ No newline at end of file diff --git a/coolstore-partner-webc/src/main/resources/application-test.properties b/coolstore-partner-webc/src/main/resources/application-test.properties deleted file mode 100644 index d3eb28f51..000000000 --- a/coolstore-partner-webc/src/main/resources/application-test.properties +++ /dev/null @@ -1,86 +0,0 @@ - -#mysql config -default.datasource.url=jdbc:mysql://dingpushcoolcollege.mysql.rds.aliyuncs.com:3306/coolcollege_intelligent_hy?useSSL=false&useUnicode=true&characterEncoding=utf8&allowMultiQueries=true&autoReconnect=true -default.datasource.username=hsay -default.datasource.password=Z3J7xBbgouMD - -#redis -spring.redis.host=tstore-coolcollege.redis.rds.aliyuncs.com -spring.redis.port=6379 -spring.redis.password=Cx111111 -spring.redis.database=0 -spring.redis.timeout=2000ms -spring.redis.lettuce.pool.max-wait=100ms -spring.redis.lettuce.pool.max-active=1024 -spring.redis.lettuce.pool.max-idle=200 -spring.redis.lettuce.pool.min-idle=0 -spring.redis.lettuce.shutdown-timeout=100ms -redis.host.uri=http://userInfo:Cx111111@tstore-coolcollege.redis.rds.aliyuncs.com:6379/0 -redis.isv.host.uri=http://userInfo:Cx111111@tstore-coolcollege.redis.rds.aliyuncs.com:6379/2 - -#pagehelper -pagehelper.helper-dialect=mysql -pagehelper.reasonable=false -pagehelper.returnPageInfo=check -pagehelper.support-methods-arguments=false -pagehelper.params=count=countSql -pagehelper.page-size-zero=true - -spring.mvc.async.request-timeout=60000 - -# mybatis config -mybatis.mapper-locations=classpath*:mapper/**/*Mapper.xml - -mybatis.configuration.call-setters-on-nulls=true -mybatis.configuration.map-underscore-to-camel-case=true - -isv.domain=https://abstore-isv.coolstore.cn/isv - -#rocketmq \u914D\u7F6E -rocketmq.accessKey=zK2oVEz4G1ts23d2 -rocketmq.secretKey=0UstLCS0mh2ASgBh -rocketmq.nameSrvAdder=http://rmq-cn-9lb38l1rx04.cn-hangzhou.rmq.aliyuncs.com:8080 -rocketmq.topic=simple_message - -#oss配置 -oss.accessKeyId=LTAI5tRSXy2MrqaaBJ6gReur -oss.accessKeySecret=FFsl8d9batprJ0vXr0k4Y8ada40Wm2 -oss.endpoint=oss-cn-hangzhou.aliyuncs.com -oss.bucket=cool-store-hsay -oss.file.dir=partner/171cddee76471740/ -oss.excelFile.dir=lineExcel/ - -#企业corpId -corp.id=171cddee76471740 -#cdn地址 -cdn.url=https://testhsaypic.coolstore.cn - -#TRTC -trtc.sdkAppId=1400811820 -trtc.secretKey=4854bab106c2ca2a2fda16a8c966933e28a078a34e458999d6227e8cd8ab8219 - -weixin.appId=wx085c84fe42691bf1 -weixin.appSecret=58e89c9ec4ade1d094bbe21836a19ec4 - - -signKey=77fea013c3a6459685b83c21a2fc3411 -fixMobileOpenid=HSAY5531DA7 - -#飞书通知 -feishu.notice.link.url=https://applink.feishu.cn/client/web_app/open?appId=cli_a4f3e24dc73a100c&lk_target_url=https%3A%2F%2Ftest-hsay-web.coolstore.cn%2F%23%2Fwork%2Fbench -feishu.notice.link.url.mobile=https://test-hsay-web.coolstore.cn/#/mobile - -#阿里云ak sk -aliyun.accessKeyId=LTAI5t9RaXvABZbHvoXjDFJ1 -aliyun.accessKeySecret=zhOK7WWo3yGoUWkOMaatty19k25CMd -aliyun.authCode=Y81FVZepk6 - -exhibition.channel.id=52399 -recommended.channel.id=52400 -manual.channel.id=52403 - -ec.sync.createUserId=ou_18d7526a527a30a06ee99205ad983f3f - -#沪上阿姨事件中心地址 -hsay.event.url=https://oapi-gateway.shpr.top/event -hsay.event.systemsource=hsay_test \ No newline at end of file diff --git a/coolstore-partner-webc/src/main/resources/application.properties b/coolstore-partner-webc/src/main/resources/application.properties deleted file mode 100644 index 40d4defb9..000000000 --- a/coolstore-partner-webc/src/main/resources/application.properties +++ /dev/null @@ -1,52 +0,0 @@ -spring.application.name=hsay-partner-webc -spring.profiles.active=test -server.port=40100 -server.servlet.context-path=/xfsg/mini/program - -#logback -logging.config=classpath:logback-spring.xml -logging.path=/data/log/partner - -#connection pool config -spring.datasource.hikari.driver-class-name=com.mysql.cj.jdbc.Driver -spring.datasource.hikari.cachePrepStmts=true -spring.datasource.hikari.prepStmtCacheSize=250 -spring.datasource.hikari.prepStmtCacheSqlLimit=2048 -spring.datasource.hikari.useServerPrepStmts=true -spring.datasource.hikari.useLocalSessionState=true -spring.datasource.hikari.rewriteBatchedStatements=true -spring.datasource.hikari.cacheResultSetMetadata=true -spring.datasource.hikari.cacheServerConfiguration=true -spring.datasource.hikari.elideSetAutoCommits=true -spring.datasource.hikari.maintainTimeStats=false -spring.datasource.hikari.minimumIdle=10 -spring.datasource.hikari.maximumPoolSize=150 -spring.datasource.hikari.maxLifetime=200000 -spring.datasource.hikari.connectionTimeout=3000 -spring.datasource.hikari.poolName=DefaultHikariCP -spring.datasource.hikari.idleTimeout=300000 -#\u914D\u7F6E\u8FD4\u56DE\u65F6\u95F4\u6233 -spring.jackson.serialization.write-dates-as-timestamps=true -# file size -spring.servlet.multipart.maxFileSize=1024MB -spring.servlet.multipart.maxRequestSize=1024MB -# Max file size. -spring.servlet.multipart.max-file-size=1024MB -# Max request size. -spring.servlet.multipart.max-request-size=1024MB -spring.main.allow-circular-references=true - -allow.upload.image.ext=jpg,jpeg,gif,png,bmp,jfif -allow.upload.file.ext=zip,mp4,pptx,ppt,doc,docx,pdf -allow.upload.video.ext=3gp,asf,avi,dat,dv,flv,f4v,gif,m2t,m3u8,m4v,mj2,mjpeg,mkv,mov,mp4,mpe,mpg,mpeg,mts,ogg,qt,rm,rmvb,swf,ts,vob,wmv,webm -allow.upload.audio.ext=mp3 -allow.upload.image.size=1024 * 1024L * 1024L -allow.upload.file.size=30 * 1024 * 1024L -allow.upload.video.size=1024 * 1024 * 10L -allow.upload.audio.size=1024 * 1024 * 10L - -server.connection-timeout=18000000 -server.tomcat.basedir=/tmp/tomcat/partner-b - -log4j2.formatMsgNoLookups=true -mybatis.configuration.variables.enterpriseId=e17cd2dc350541df8a8b0af9bd27f77d diff --git a/coolstore-partner-webc/src/main/resources/logback-spring.xml b/coolstore-partner-webc/src/main/resources/logback-spring.xml deleted file mode 100644 index 18c7dec14..000000000 --- a/coolstore-partner-webc/src/main/resources/logback-spring.xml +++ /dev/null @@ -1,58 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - DEBUG - - - ${log_pattern} - - - - - > - ${logBaseFolder}/${logFileNamePrefix}.%d{yyyy-MM-dd}.log - ${every_his_size} - - - ${log_pattern} - - - - - - - - - - - - - - - - - - \ No newline at end of file