update

examcloud-core-print-common/pom.xml

@@ -47,6 +47,10 @@
                 </exclusion>
             </exclusions>
         </dependency>
+        <dependency>
+            <groupId>com.github.xiaoymin</groupId>
+            <artifactId>swagger-bootstrap-ui</artifactId>
+        </dependency>
         <dependency>
             <groupId>io.springfox</groupId>
             <artifactId>springfox-swagger2</artifactId>

examcloud-core-print-common/src/main/java/cn/com/qmth/examcloud/core/print/common/jpa/SpecUtils.java

@@ -78,12 +78,12 @@ public class SpecUtils {
                         case GT:
                             predicates.add(builder.greaterThan(expression, (Comparable) filter.getValue()));
                             break;
-                        case LT:
-                            predicates.add(builder.lessThan(expression, (Comparable) filter.getValue()));
-                            break;
                         case GTE:
                             predicates.add(builder.greaterThanOrEqualTo(expression, (Comparable) filter.getValue()));
                             break;
+                        case LT:
+                            predicates.add(builder.lessThan(expression, (Comparable) filter.getValue()));
+                            break;
                         case LTE:
                             predicates.add(builder.lessThanOrEqualTo(expression, (Comparable) filter.getValue()));
                             break;

examcloud-core-print-starter/pom.xml

@@ -12,10 +12,6 @@
     </parent>
 
     <dependencies>
-        <dependency>
-            <groupId>com.github.xiaoymin</groupId>
-            <artifactId>swagger-bootstrap-ui</artifactId>
-        </dependency>
         <dependency>
             <groupId>cn.com.qmth.examcloud</groupId>
             <artifactId>examcloud-core-print-provider</artifactId>
@@ -29,6 +25,7 @@
     </dependencies>
 
     <build>
+        <finalName>examcloud-core-print-starter</finalName>
         <plugins>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
@@ -36,7 +33,7 @@
                 <configuration>
                     <archive>
                         <manifest>
-                            <mainClass>cn.com.qmth.examcloud.core.print.stater.PrintApplication</mainClass>
+                            <mainClass>cn.com.qmth.examcloud.core.print.PrintApplication</mainClass>
                             <addClasspath>true</addClasspath>
                             <classpathPrefix>./</classpathPrefix>
                         </manifest>

examcloud-core-print-starter/shell/start.sh

@@ -1,6 +1,6 @@
 #!/bin/bash
 
-APP_MAIN_JAR="examcloud-core-print-starter-2.0-SNAPSHOT.jar"
+APP_MAIN_JAR="examcloud-core-print-starter.jar"
 
 FILE_PATH=$(cd `dirname $0`; pwd)
 

examcloud-core-print-starter/shell/stop.sh

@@ -1,6 +1,6 @@
 #!/bin/bash
 
-APP_MAIN_JAR="examcloud-core-print-starter-2.0-SNAPSHOT.jar"
+APP_MAIN_JAR="examcloud-core-print-starter.jar"
 
 FILE_PATH=$(cd `dirname $0`; pwd)
 

examcloud-core-print-starter/src/main/java/cn/com/qmth/examcloud/core/print/stater/PrintApplication.java → examcloud-core-print-starter/src/main/java/cn/com/qmth/examcloud/core/print/PrintApplication.java

@@ -5,24 +5,18 @@
  * *************************************************
  */
 
-package cn.com.qmth.examcloud.core.print.stater;
+package cn.com.qmth.examcloud.core.print;
 
 import cn.com.qmth.examcloud.commons.base.logging.ExamCloudLog;
 import cn.com.qmth.examcloud.commons.base.logging.ExamCloudLogFactory;
 import cn.com.qmth.examcloud.commons.base.logging.SLF4JImpl;
 import org.slf4j.MDC;
 import org.springframework.boot.SpringApplication;
-import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
-import org.springframework.boot.autoconfigure.domain.EntityScan;
-import org.springframework.boot.autoconfigure.web.MultipartAutoConfiguration;
 import org.springframework.boot.web.support.SpringBootServletInitializer;
 import org.springframework.cloud.client.discovery.EnableDiscoveryClient;
 import org.springframework.cloud.netflix.eureka.EnableEurekaClient;
-import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.ComponentScan;
 import org.springframework.data.jpa.repository.config.EnableJpaAuditing;
-import org.springframework.data.jpa.repository.config.EnableJpaRepositories;
 import org.springframework.web.multipart.MultipartResolver;
 import org.springframework.web.multipart.commons.CommonsMultipartResolver;
 
@@ -34,10 +28,7 @@ import org.springframework.web.multipart.commons.CommonsMultipartResolver;
 @EnableEurekaClient
 @EnableDiscoveryClient
 @SpringBootApplication
-@ComponentScan(basePackages = {"cn.com.qmth"})
-@EntityScan(basePackages = {"cn.com.qmth"})
-@EnableJpaRepositories(basePackages = {"cn.com.qmth"})
-@EnableAutoConfiguration(exclude = {MultipartAutoConfiguration.class})
+//@EnableAutoConfiguration(exclude = {MultipartAutoConfiguration.class})
 public class PrintApplication extends SpringBootServletInitializer {
     private static final ExamCloudLog LOG = ExamCloudLogFactory.getLog(PrintApplication.class);
 
@@ -48,7 +39,7 @@ public class PrintApplication extends SpringBootServletInitializer {
         SpringApplication.run(PrintApplication.class, args);
     }
 
-    @Bean(name = "multipartResolver")
+    //@Bean(name = "multipartResolver")
     public MultipartResolver multipartResolver() {
         CommonsMultipartResolver resolver = new CommonsMultipartResolver();
         resolver.setDefaultEncoding("UTF-8");

examcloud-core-print-starter/src/main/java/cn/com/qmth/examcloud/core/print/stater/config/InterceptorConfig.java → examcloud-core-print-starter/src/main/java/cn/com/qmth/examcloud/core/print/config/InterceptorConfig.java

@@ -5,7 +5,7 @@
  * *************************************************
  */
 
-package cn.com.qmth.examcloud.core.print.stater.config;
+package cn.com.qmth.examcloud.core.print.config;
 
 import cn.com.qmth.examcloud.commons.base.util.PathUtil;
 import cn.com.qmth.examcloud.commons.base.util.PropertiesUtil;
@@ -42,8 +42,8 @@ public class InterceptorConfig extends WebMvcConfigurerAdapter {
     public void addInterceptors(InterceptorRegistry registry) {
         registry.addInterceptor(new FirstInterceptor()).addPathPatterns("/**");
         SpringCloudInterceptor springCloudInterceptor = new SpringCloudInterceptor();
-        springCloudInterceptor.setRedisClient(redisClient);
         registry.addInterceptor(springCloudInterceptor).addPathPatterns("/**");
+        springCloudInterceptor.setRedisClient(redisClient);
 
         RequestPermissionInterceptor requestPermissionInterceptor = getRequestPermissionInterceptor();
         requestPermissionInterceptor.configureAndWatch("security-exclusions.conf");

examcloud-core-print-starter/src/main/java/cn/com/qmth/examcloud/core/print/stater/config/PropertiesConfig.java → examcloud-core-print-starter/src/main/java/cn/com/qmth/examcloud/core/print/config/PropertiesConfig.java

@@ -5,7 +5,7 @@
  * *************************************************
  */
 
-package cn.com.qmth.examcloud.core.print.stater.config;
+package cn.com.qmth.examcloud.core.print.config;
 
 import cn.com.qmth.examcloud.commons.base.util.PathUtil;
 import cn.com.qmth.examcloud.commons.base.util.PropertiesUtil;

examcloud-core-print-starter/src/main/java/cn/com/qmth/examcloud/core/print/stater/config/RedisConfig.java → examcloud-core-print-starter/src/main/java/cn/com/qmth/examcloud/core/print/config/RedisConfig.java

@@ -5,7 +5,7 @@
  * *************************************************
  */
 
-package cn.com.qmth.examcloud.core.print.stater.config;
+package cn.com.qmth.examcloud.core.print.config;
 
 import cn.com.qmth.examcloud.commons.web.redis.RedisClient;
 import cn.com.qmth.examcloud.commons.web.redis.RedisClientImpl;
@@ -50,8 +50,8 @@ public class RedisConfig {
         redisTemplate.setConnectionFactory(redisConnectionFactory);
         Jackson2JsonRedisSerializer<?> jackson2JsonRedisSerializer = new Jackson2JsonRedisSerializer<>(Object.class);
         ObjectMapper objectMapper = new ObjectMapper();
-        objectMapper.setVisibility(PropertyAccessor.ALL, JsonAutoDetect.Visibility.ANY);
         objectMapper.enableDefaultTyping(ObjectMapper.DefaultTyping.NON_FINAL);
+        objectMapper.setVisibility(PropertyAccessor.ALL, JsonAutoDetect.Visibility.ANY);
         jackson2JsonRedisSerializer.setObjectMapper(objectMapper);
         redisTemplate.setValueSerializer(jackson2JsonRedisSerializer);
         redisTemplate.setKeySerializer(new StringRedisSerializer());

examcloud-core-print-starter/src/main/java/cn/com/qmth/examcloud/core/print/stater/config/SwaggerConfig.java → examcloud-core-print-starter/src/main/java/cn/com/qmth/examcloud/core/print/config/SwaggerConfig.java

@@ -5,7 +5,7 @@
  * *************************************************
  */
 
-package cn.com.qmth.examcloud.core.print.stater.config;
+package cn.com.qmth.examcloud.core.print.config;
 
 import io.swagger.annotations.ApiOperation;
 import org.springframework.context.annotation.Bean;

examcloud-core-print-starter/src/main/java/cn/com/qmth/examcloud/core/print/stater/controller/IndexController.java → examcloud-core-print-starter/src/main/java/cn/com/qmth/examcloud/core/print/controller/IndexController.java

@@ -5,7 +5,7 @@
  * *************************************************
  */
 
-package cn.com.qmth.examcloud.core.print.stater.controller;
+package cn.com.qmth.examcloud.core.print.controller;
 
 import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.RequestMapping;

examcloud-core-print-starter/src/main/resources/application.properties

@@ -1,29 +1,21 @@
-# profile config
+#debug=true
 spring.profiles.active=dev
-# mvc config
+#mvc config
 server.port=8013
 spring.http.multipart.max-file-size=50Mb
 spring.http.multipart.max-request-size=50Mb
-# jackson config
 spring.jackson.date-format=yyyy-MM-dd HH:mm:ss
 spring.jackson.time-zone=GMT+8
-# feign config
-feign.httpclient.enabled=false
-feign.okhttp.enabled=true
-# eureka config
+logging.config=classpath:logback-spring.xml
+#eureka config
 eureka.instance.lease-renewal-interval-in-seconds=1
 eureka.instance.lease-expiration-duration-in-seconds=2
 eureka.instance.prefer-ip-address=true
 eureka.instance.instance-id=${spring.cloud.client.ipAddress}:${server.port}
 eureka.client.healthcheck.enabled=true
-# log config
-logging.file=logs/debug.log
-logging.level.org.springframework.jdbc.core.JdbcTemplate=DEBUG
-logging.level.org.springframework.data.mongodb=DEBUG
-logging.level.org.springframework=WARN
-logging.level.org.hibernate=WARN
-logging.level.org.apache=WARN
-logging.level.cn.com.qmth=DEBUG
-# api config
+#feign config
+feign.httpclient.enabled=false
+feign.okhttp.enabled=true
+#api config
 $rmp.cloud.print=/api/cloud/ecs_prt
 $rmp.ctrl.print=/api/ecs_prt

examcloud-core-print-starter/src/main/resources/logback-spring.xml

@@ -10,12 +10,12 @@
 
     <!-- debug 日志 -->
     <appender name="DEBUG_APPENDER" class="ch.qos.logback.core.rolling.RollingFileAppender">
-        <file>log/debug.log</file>
+        <file>logs/debug-print.log</file>
         <encoder>
             <pattern>%d{yyyy-MM-dd HH:mm:ss.SSS}| %level | %X{TRACE_ID} - %X{KEY} | %m | [%class:%line]%n</pattern>
         </encoder>
         <rollingPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedRollingPolicy">
-            <fileNamePattern>logs/debug.log.%d{yyyy-MM-dd}.%i.zip</fileNamePattern>
+            <fileNamePattern>logs/debug-print.log.%d{yyyy-MM-dd}.%i.zip</fileNamePattern>
             <maxHistory>100</maxHistory>
             <maxFileSize>100MB</maxFileSize>
         </rollingPolicy>
@@ -23,34 +23,35 @@
 
     <!-- 接口日志 -->
     <appender name="INTERFACE_APPENDER" class="ch.qos.logback.core.rolling.RollingFileAppender">
-        <file>log/interface.log</file>
+        <file>logs/interface-print.log</file>
         <encoder>
             <pattern>%d{yyyy-MM-dd HH:mm:ss.SSS}| %level | %X{TRACE_ID} - %X{KEY} | %m%n</pattern>
         </encoder>
         <rollingPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedRollingPolicy">
-            <fileNamePattern>logs/interface.log.%d{yyyy-MM-dd}.%i.zip</fileNamePattern>
+            <fileNamePattern>logs/interface-print.log.%d{yyyy-MM-dd}.%i.zip</fileNamePattern>
             <maxHistory>100</maxHistory>
             <maxFileSize>100MB</maxFileSize>
         </rollingPolicy>
     </appender>
 
-    <logger name="cn.com.qmth.examcloud" level="DEBUG" additivity="false">
-        <appender-ref ref="DEBUG_APPENDER"/>
+    <logger name="INTERFACE_LOGGER" level="DEBUG" additivity="false">
+        <appender-ref ref="INTERFACE_APPENDER"/>
         <appender-ref ref="STDOUT"/>
     </logger>
 
-    <logger name="INTERFACE_LOGGER" level="DEBUG" additivity="false">
-        <appender-ref ref="INTERFACE_APPENDER"/>
+    <logger name="cn.com.qmth.examcloud" level="DEBUG" additivity="false">
+        <appender-ref ref="DEBUG_APPENDER"/>
         <appender-ref ref="STDOUT"/>
     </logger>
 
+    <logger name="com.netflix.discovery" level="WARN"/>
     <logger name="org.springframework.jdbc.core.JdbcTemplate" level="DEBUG"/>
     <logger name="org.springframework.data.mongodb" level="DEBUG"/>
     <logger name="org.springframework" level="WARN"/>
     <logger name="org.hibernate" level="WARN"/>
     <logger name="org.apache" level="WARN"/>
 
-    <root level="INFO">
+    <root level="DEBUG">
         <appender-ref ref="DEBUG_APPENDER"/>
         <appender-ref ref="STDOUT"/>
     </root>

examcloud-core-print-starter/src/test/java/cn/com/qmth/examcloud/core/print/test/PrintingProjectServiceTest.java

@@ -7,6 +7,7 @@
 
 package cn.com.qmth.examcloud.core.print.test;
 
+import cn.com.qmth.examcloud.core.print.PrintApplication;
 import cn.com.qmth.examcloud.core.print.service.PrintingProjectService;
 import org.junit.Test;
 import org.junit.runner.RunWith;
@@ -18,15 +19,15 @@ import org.springframework.test.context.junit4.SpringRunner;
  * @author: fengdesheng
  * @since: 2018/10/17
  */
-@SpringBootTest
 @RunWith(SpringRunner.class)
+@SpringBootTest(classes = PrintApplication.class)
 public class PrintingProjectServiceTest {
     @Autowired
     private PrintingProjectService printingProjectService;
 
     @Test
     public void demoTest() throws Exception {
-
+        System.out.println("...");
     }
 
 }

pom.xml

@@ -36,7 +36,7 @@
             <dependency>
                 <groupId>com.google.guava</groupId>
                 <artifactId>guava</artifactId>
-                <version>26.0-jre</version>
+                <version>27.0-jre</version>
             </dependency>
             <dependency>
                 <groupId>org.apache.commons</groupId>