diff --git a/.idea/libraries/Maven__com_sun_mail_javax_mail_1_6_2.xml b/.idea/libraries/Maven__com_sun_mail_javax_mail_1_6_2.xml new file mode 100644 index 0000000..108e2d4 --- /dev/null +++ b/.idea/libraries/Maven__com_sun_mail_javax_mail_1_6_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__javax_activation_activation_1_1.xml b/.idea/libraries/Maven__javax_activation_activation_1_1.xml new file mode 100644 index 0000000..6e46344 --- /dev/null +++ b/.idea/libraries/Maven__javax_activation_activation_1_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/workspace.xml b/.idea/workspace.xml index 1fbd240..2158ace 100644 --- a/.idea/workspace.xml +++ b/.idea/workspace.xml @@ -2,6 +2,8 @@ + + @@ -19,82 +21,10 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + - @@ -114,63 +44,24 @@ - - - - - - - - - - - - - - - - - - - - - + + + + + - - - - - - - + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - + + @@ -249,6 +140,7 @@ + @@ -1043,13 +935,13 @@ - - - 1665485232564 - 1665560782356 @@ -1387,7 +1279,14 @@ - @@ -1418,7 +1317,6 @@ - + - + + + + + - + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - + @@ -1533,6 +1436,11 @@ 103 diff --git a/logs/springboot-logback-info.log b/logs/springboot-logback-info.log index e5db827..dcb6bb7 100644 --- a/logs/springboot-logback-info.log +++ b/logs/springboot-logback-info.log @@ -1,22 +1,26 @@ -2024-11-07 09:35:15,611 [main] INFO org.springframework.data.repository.config.RepositoryConfigurationDelegate:244 - Multiple Spring Data modules found, entering strict repository configuration mode! -2024-11-07 09:35:15,623 [main] INFO org.springframework.data.repository.config.RepositoryConfigurationDelegate:126 - Bootstrapping Spring Data repositories in DEFAULT mode. -2024-11-07 09:35:15,707 [main] INFO org.springframework.data.repository.config.RepositoryConfigurationDelegate:182 - Finished Spring Data repository scanning in 60ms. Found 0 repository interfaces. -2024-11-07 09:35:16,323 [main] INFO org.springframework.context.support.PostProcessorRegistrationDelegate$BeanPostProcessorChecker:330 - Bean 'org.springframework.transaction.annotation.ProxyTransactionManagementConfiguration' of type [org.springframework.transaction.annotation.ProxyTransactionManagementConfiguration$$EnhancerBySpringCGLIB$$5bb98bdc] is not eligible for getting processed by all BeanPostProcessors (for example: not eligible for auto-proxying) -2024-11-07 09:35:16,459 [main] INFO org.springframework.context.support.PostProcessorRegistrationDelegate$BeanPostProcessorChecker:330 - Bean 'redisConfig' of type [com.subsidy.common.configure.RedisConfig$$EnhancerBySpringCGLIB$$5b8196e3] is not eligible for getting processed by all BeanPostProcessors (for example: not eligible for auto-proxying) -2024-11-07 09:35:16,923 [main] INFO org.springframework.boot.web.embedded.tomcat.TomcatWebServer:90 - Tomcat initialized with port(s): 23467 (http) -2024-11-07 09:35:16,943 [main] INFO org.apache.coyote.http11.Http11NioProtocol:173 - Initializing ProtocolHandler ["http-nio-23467"] -2024-11-07 09:35:16,955 [main] INFO org.apache.catalina.core.StandardService:173 - Starting service [Tomcat] -2024-11-07 09:35:16,955 [main] INFO org.apache.catalina.core.StandardEngine:173 - Starting Servlet engine: [Apache Tomcat/9.0.22] -2024-11-07 09:35:17,107 [main] INFO org.apache.catalina.core.ContainerBase.[Tomcat].[localhost].[/]:173 - Initializing Spring embedded WebApplicationContext -2024-11-07 09:35:17,107 [main] INFO org.springframework.web.context.ContextLoader:284 - Root WebApplicationContext: initialization completed in 3434 ms -2024-11-07 09:35:17,255 [main] INFO com.alibaba.druid.spring.boot.autoconfigure.DruidDataSourceAutoConfigure:56 - Init DruidDataSource -2024-11-07 09:35:18,595 [main] INFO com.alibaba.druid.pool.DruidDataSource:994 - {dataSource-1} inited -2024-11-07 09:35:21,456 [main] INFO org.quartz.impl.StdSchedulerFactory:1208 - Using default implementation for ThreadExecutor -2024-11-07 09:35:21,468 [main] INFO org.quartz.core.SchedulerSignalerImpl:61 - Initialized Scheduler Signaller of type: class org.quartz.core.SchedulerSignalerImpl -2024-11-07 09:35:21,468 [main] INFO org.quartz.core.QuartzScheduler:229 - Quartz Scheduler v.2.3.1 created. -2024-11-07 09:35:21,472 [main] INFO org.springframework.scheduling.quartz.LocalDataSourceJobStore:672 - Using db table-based data access locking (synchronization). -2024-11-07 09:35:21,476 [main] INFO org.springframework.scheduling.quartz.LocalDataSourceJobStore:145 - JobStoreCMT initialized. -2024-11-07 09:35:21,476 [main] INFO org.quartz.core.QuartzScheduler:294 - Scheduler meta-data: Quartz Scheduler (v2.3.1) 'schedulerFactoryBean' with instanceId 'NON_CLUSTERED' +2024-11-28 18:19:51,155 [main] INFO org.springframework.data.repository.config.RepositoryConfigurationDelegate:244 - Multiple Spring Data modules found, entering strict repository configuration mode! +2024-11-28 18:19:51,161 [main] INFO org.springframework.data.repository.config.RepositoryConfigurationDelegate:126 - Bootstrapping Spring Data repositories in DEFAULT mode. +2024-11-28 18:19:51,208 [main] INFO org.springframework.data.repository.config.RepositoryConfigurationDelegate:182 - Finished Spring Data repository scanning in 34ms. Found 0 repository interfaces. +2024-11-28 18:19:51,528 [main] INFO org.springframework.context.support.PostProcessorRegistrationDelegate$BeanPostProcessorChecker:330 - Bean 'org.springframework.transaction.annotation.ProxyTransactionManagementConfiguration' of type [org.springframework.transaction.annotation.ProxyTransactionManagementConfiguration$$EnhancerBySpringCGLIB$$e966761d] is not eligible for getting processed by all BeanPostProcessors (for example: not eligible for auto-proxying) +2024-11-28 18:19:51,602 [main] INFO org.springframework.context.support.PostProcessorRegistrationDelegate$BeanPostProcessorChecker:330 - Bean 'redisConfig' of type [com.subsidy.common.configure.RedisConfig$$EnhancerBySpringCGLIB$$e92e8124] is not eligible for getting processed by all BeanPostProcessors (for example: not eligible for auto-proxying) +2024-11-28 18:19:51,883 [main] INFO org.springframework.boot.web.embedded.tomcat.TomcatWebServer:90 - Tomcat initialized with port(s): 23467 (http) +2024-11-28 18:19:51,895 [main] INFO org.apache.coyote.http11.Http11NioProtocol:173 - Initializing ProtocolHandler ["http-nio-23467"] +2024-11-28 18:19:51,902 [main] INFO org.apache.catalina.core.StandardService:173 - Starting service [Tomcat] +2024-11-28 18:19:51,902 [main] INFO org.apache.catalina.core.StandardEngine:173 - Starting Servlet engine: [Apache Tomcat/9.0.22] +2024-11-28 18:19:51,907 [main] INFO org.apache.catalina.core.AprLifecycleListener:173 - Loaded APR based Apache Tomcat Native library [1.2.37] using APR version [1.7.4]. +2024-11-28 18:19:51,907 [main] INFO org.apache.catalina.core.AprLifecycleListener:173 - APR capabilities: IPv6 [true], sendfile [true], accept filters [false], random [true]. +2024-11-28 18:19:51,908 [main] INFO org.apache.catalina.core.AprLifecycleListener:173 - APR/OpenSSL configuration: useAprConnector [false], useOpenSSL [true] +2024-11-28 18:19:51,911 [main] INFO org.apache.catalina.core.AprLifecycleListener:173 - OpenSSL successfully initialized [OpenSSL 1.1.1u 30 May 2023] +2024-11-28 18:19:52,013 [main] INFO org.apache.catalina.core.ContainerBase.[Tomcat].[localhost].[/]:173 - Initializing Spring embedded WebApplicationContext +2024-11-28 18:19:52,013 [main] INFO org.springframework.web.context.ContextLoader:284 - Root WebApplicationContext: initialization completed in 1683 ms +2024-11-28 18:19:52,099 [main] INFO com.alibaba.druid.spring.boot.autoconfigure.DruidDataSourceAutoConfigure:56 - Init DruidDataSource +2024-11-28 18:19:53,124 [main] INFO com.alibaba.druid.pool.DruidDataSource:994 - {dataSource-1} inited +2024-11-28 18:19:54,921 [main] INFO org.quartz.impl.StdSchedulerFactory:1208 - Using default implementation for ThreadExecutor +2024-11-28 18:19:54,930 [main] INFO org.quartz.core.SchedulerSignalerImpl:61 - Initialized Scheduler Signaller of type: class org.quartz.core.SchedulerSignalerImpl +2024-11-28 18:19:54,930 [main] INFO org.quartz.core.QuartzScheduler:229 - Quartz Scheduler v.2.3.1 created. +2024-11-28 18:19:54,936 [main] INFO org.springframework.scheduling.quartz.LocalDataSourceJobStore:672 - Using db table-based data access locking (synchronization). +2024-11-28 18:19:54,938 [main] INFO org.springframework.scheduling.quartz.LocalDataSourceJobStore:145 - JobStoreCMT initialized. +2024-11-28 18:19:54,939 [main] INFO org.quartz.core.QuartzScheduler:294 - Scheduler meta-data: Quartz Scheduler (v2.3.1) 'schedulerFactoryBean' with instanceId 'NON_CLUSTERED' Scheduler class: 'org.quartz.core.QuartzScheduler' - running locally. NOT STARTED. Currently in standby mode. @@ -24,97 +28,37 @@ Using thread pool 'org.quartz.simpl.SimpleThreadPool' - with 10 threads. Using job-store 'org.springframework.scheduling.quartz.LocalDataSourceJobStore' - which supports persistence. and is not clustered. -2024-11-07 09:35:21,476 [main] INFO org.quartz.impl.StdSchedulerFactory:1362 - Quartz scheduler 'schedulerFactoryBean' initialized from an externally provided properties instance. -2024-11-07 09:35:21,476 [main] INFO org.quartz.impl.StdSchedulerFactory:1366 - Quartz scheduler version: 2.3.1 -2024-11-07 09:35:21,476 [main] INFO org.quartz.core.QuartzScheduler:2293 - JobFactory set to: com.subsidy.common.configure.JobFactory@70c205bf -2024-11-07 09:35:22,437 [main] INFO springfox.documentation.spring.web.PropertySourcedRequestMappingHandlerMapping:69 - Mapped URL path [/v2/api-docs] onto method [public org.springframework.http.ResponseEntity springfox.documentation.swagger2.web.Swagger2Controller.getDocumentation(java.lang.String,javax.servlet.http.HttpServletRequest)] -2024-11-07 09:35:22,776 [main] INFO org.springframework.scheduling.concurrent.ThreadPoolTaskExecutor:171 - Initializing ExecutorService 'applicationTaskExecutor' -2024-11-07 09:35:23,916 [main] INFO org.springframework.scheduling.concurrent.ThreadPoolTaskScheduler:171 - Initializing ExecutorService 'taskScheduler' -2024-11-07 09:35:24,029 [main] INFO springfox.documentation.spring.web.plugins.DocumentationPluginsBootstrapper:160 - Context refreshed -2024-11-07 09:35:24,057 [main] INFO springfox.documentation.spring.web.plugins.DocumentationPluginsBootstrapper:163 - Found 1 custom documentation plugin(s) -2024-11-07 09:35:24,101 [main] INFO springfox.documentation.spring.web.scanners.ApiListingReferenceScanner:41 - Scanning for api listing references -2024-11-07 09:35:24,365 [main] INFO springfox.documentation.spring.web.readers.operation.CachingOperationNameGenerator:40 - Generating unique operation named: deleteAdministerUsingPOST_1 -2024-11-07 09:35:24,373 [main] INFO springfox.documentation.spring.web.readers.operation.CachingOperationNameGenerator:40 - Generating unique operation named: operatorsUsingPOST_1 -2024-11-07 09:35:24,373 [main] INFO springfox.documentation.spring.web.readers.operation.CachingOperationNameGenerator:40 - Generating unique operation named: updateAdministerUsingPOST_1 -2024-11-07 09:35:24,472 [main] INFO org.springframework.scheduling.quartz.SchedulerFactoryBean:731 - Will start Quartz Scheduler [schedulerFactoryBean] in 1 seconds -2024-11-07 09:35:24,496 [main] INFO org.apache.coyote.http11.Http11NioProtocol:173 - Starting ProtocolHandler ["http-nio-23467"] -2024-11-07 09:35:24,528 [main] INFO org.springframework.boot.web.embedded.tomcat.TomcatWebServer:202 - Tomcat started on port(s): 23467 (http) with context path '' -2024-11-07 09:35:25,494 [Quartz Scheduler [schedulerFactoryBean]] INFO org.springframework.scheduling.quartz.SchedulerFactoryBean:747 - Starting Quartz Scheduler now, after delay of 1 seconds -2024-11-07 09:35:25,570 [Quartz Scheduler [schedulerFactoryBean]] INFO org.springframework.scheduling.quartz.LocalDataSourceJobStore:866 - Freed 0 triggers from 'acquired' / 'blocked' state. -2024-11-07 09:35:25,590 [Quartz Scheduler [schedulerFactoryBean]] INFO org.springframework.scheduling.quartz.LocalDataSourceJobStore:876 - Recovering 0 jobs that were in-progress at the time of the last shut-down. -2024-11-07 09:35:25,590 [Quartz Scheduler [schedulerFactoryBean]] INFO org.springframework.scheduling.quartz.LocalDataSourceJobStore:889 - Recovery complete. -2024-11-07 09:35:25,598 [Quartz Scheduler [schedulerFactoryBean]] INFO org.springframework.scheduling.quartz.LocalDataSourceJobStore:896 - Removed 0 'complete' triggers. -2024-11-07 09:35:25,610 [Quartz Scheduler [schedulerFactoryBean]] INFO org.springframework.scheduling.quartz.LocalDataSourceJobStore:901 - Removed 0 stale fired job entries. -2024-11-07 09:35:25,626 [Quartz Scheduler [schedulerFactoryBean]] INFO org.quartz.core.QuartzScheduler:547 - Scheduler schedulerFactoryBean_$_NON_CLUSTERED started. -2024-11-07 09:35:31,579 [http-nio-23467-exec-1] INFO org.apache.catalina.core.ContainerBase.[Tomcat].[localhost].[/]:173 - Initializing Spring DispatcherServlet 'dispatcherServlet' -2024-11-07 09:35:31,579 [http-nio-23467-exec-1] INFO org.springframework.web.servlet.DispatcherServlet:524 - Initializing Servlet 'dispatcherServlet' -2024-11-07 09:35:31,588 [http-nio-23467-exec-1] INFO org.springframework.web.servlet.DispatcherServlet:546 - Completed initialization in 9 ms -2024-11-07 09:37:49,042 [Thread-24] INFO org.quartz.core.QuartzScheduler:585 - Scheduler schedulerFactoryBean_$_NON_CLUSTERED paused. -2024-11-07 09:37:49,042 [Thread-24] INFO org.springframework.scheduling.concurrent.ThreadPoolTaskScheduler:208 - Shutting down ExecutorService 'taskScheduler' -2024-11-07 09:37:49,050 [Thread-24] INFO org.springframework.scheduling.concurrent.ThreadPoolTaskExecutor:208 - Shutting down ExecutorService 'applicationTaskExecutor' -2024-11-07 09:37:49,078 [Thread-24] INFO org.quartz.core.QuartzScheduler:666 - Scheduler schedulerFactoryBean_$_NON_CLUSTERED shutting down. -2024-11-07 09:37:49,078 [Thread-24] INFO org.quartz.core.QuartzScheduler:585 - Scheduler schedulerFactoryBean_$_NON_CLUSTERED paused. -2024-11-07 09:37:49,078 [Thread-24] INFO org.quartz.core.QuartzScheduler:740 - Scheduler schedulerFactoryBean_$_NON_CLUSTERED shutdown complete. -2024-11-07 09:37:49,078 [Thread-24] INFO org.springframework.scheduling.quartz.SchedulerFactoryBean:844 - Shutting down Quartz Scheduler -2024-11-07 09:37:49,082 [Thread-24] INFO com.alibaba.druid.pool.DruidDataSource:2029 - {dataSource-1} closing ... -2024-11-07 09:37:49,086 [Thread-24] INFO com.alibaba.druid.pool.DruidDataSource:2101 - {dataSource-1} closed -2024-11-07 09:38:04,213 [main] INFO org.springframework.data.repository.config.RepositoryConfigurationDelegate:244 - Multiple Spring Data modules found, entering strict repository configuration mode! -2024-11-07 09:38:04,217 [main] INFO org.springframework.data.repository.config.RepositoryConfigurationDelegate:126 - Bootstrapping Spring Data repositories in DEFAULT mode. -2024-11-07 09:38:04,265 [main] INFO org.springframework.data.repository.config.RepositoryConfigurationDelegate:182 - Finished Spring Data repository scanning in 36ms. Found 0 repository interfaces. -2024-11-07 09:38:04,664 [main] INFO org.springframework.context.support.PostProcessorRegistrationDelegate$BeanPostProcessorChecker:330 - Bean 'org.springframework.transaction.annotation.ProxyTransactionManagementConfiguration' of type [org.springframework.transaction.annotation.ProxyTransactionManagementConfiguration$$EnhancerBySpringCGLIB$$63452b5f] is not eligible for getting processed by all BeanPostProcessors (for example: not eligible for auto-proxying) -2024-11-07 09:38:04,760 [main] INFO org.springframework.context.support.PostProcessorRegistrationDelegate$BeanPostProcessorChecker:330 - Bean 'redisConfig' of type [com.subsidy.common.configure.RedisConfig$$EnhancerBySpringCGLIB$$630d3666] is not eligible for getting processed by all BeanPostProcessors (for example: not eligible for auto-proxying) -2024-11-07 09:38:05,116 [main] INFO org.springframework.boot.web.embedded.tomcat.TomcatWebServer:90 - Tomcat initialized with port(s): 23467 (http) -2024-11-07 09:38:05,128 [main] INFO org.apache.coyote.http11.Http11NioProtocol:173 - Initializing ProtocolHandler ["http-nio-23467"] -2024-11-07 09:38:05,136 [main] INFO org.apache.catalina.core.StandardService:173 - Starting service [Tomcat] -2024-11-07 09:38:05,136 [main] INFO org.apache.catalina.core.StandardEngine:173 - Starting Servlet engine: [Apache Tomcat/9.0.22] -2024-11-07 09:38:05,256 [main] INFO org.apache.catalina.core.ContainerBase.[Tomcat].[localhost].[/]:173 - Initializing Spring embedded WebApplicationContext -2024-11-07 09:38:05,256 [main] INFO org.springframework.web.context.ContextLoader:284 - Root WebApplicationContext: initialization completed in 2125 ms -2024-11-07 09:38:05,375 [main] INFO com.alibaba.druid.spring.boot.autoconfigure.DruidDataSourceAutoConfigure:56 - Init DruidDataSource -2024-11-07 09:38:07,379 [main] INFO com.alibaba.druid.pool.DruidDataSource:994 - {dataSource-1} inited -2024-11-07 09:38:11,364 [main] INFO org.quartz.impl.StdSchedulerFactory:1208 - Using default implementation for ThreadExecutor -2024-11-07 09:38:11,380 [main] INFO org.quartz.core.SchedulerSignalerImpl:61 - Initialized Scheduler Signaller of type: class org.quartz.core.SchedulerSignalerImpl -2024-11-07 09:38:11,380 [main] INFO org.quartz.core.QuartzScheduler:229 - Quartz Scheduler v.2.3.1 created. -2024-11-07 09:38:11,388 [main] INFO org.springframework.scheduling.quartz.LocalDataSourceJobStore:672 - Using db table-based data access locking (synchronization). -2024-11-07 09:38:11,388 [main] INFO org.springframework.scheduling.quartz.LocalDataSourceJobStore:145 - JobStoreCMT initialized. -2024-11-07 09:38:11,392 [main] INFO org.quartz.core.QuartzScheduler:294 - Scheduler meta-data: Quartz Scheduler (v2.3.1) 'schedulerFactoryBean' with instanceId 'NON_CLUSTERED' - Scheduler class: 'org.quartz.core.QuartzScheduler' - running locally. - NOT STARTED. - Currently in standby mode. - Number of jobs executed: 0 - Using thread pool 'org.quartz.simpl.SimpleThreadPool' - with 10 threads. - Using job-store 'org.springframework.scheduling.quartz.LocalDataSourceJobStore' - which supports persistence. and is not clustered. - -2024-11-07 09:38:11,392 [main] INFO org.quartz.impl.StdSchedulerFactory:1362 - Quartz scheduler 'schedulerFactoryBean' initialized from an externally provided properties instance. -2024-11-07 09:38:11,392 [main] INFO org.quartz.impl.StdSchedulerFactory:1366 - Quartz scheduler version: 2.3.1 -2024-11-07 09:38:11,392 [main] INFO org.quartz.core.QuartzScheduler:2293 - JobFactory set to: com.subsidy.common.configure.JobFactory@51a719e7 -2024-11-07 09:38:12,277 [main] INFO springfox.documentation.spring.web.PropertySourcedRequestMappingHandlerMapping:69 - Mapped URL path [/v2/api-docs] onto method [public org.springframework.http.ResponseEntity springfox.documentation.swagger2.web.Swagger2Controller.getDocumentation(java.lang.String,javax.servlet.http.HttpServletRequest)] -2024-11-07 09:38:12,482 [main] INFO org.springframework.scheduling.concurrent.ThreadPoolTaskExecutor:171 - Initializing ExecutorService 'applicationTaskExecutor' -2024-11-07 09:38:13,253 [main] INFO org.springframework.scheduling.concurrent.ThreadPoolTaskScheduler:171 - Initializing ExecutorService 'taskScheduler' -2024-11-07 09:38:13,341 [main] INFO springfox.documentation.spring.web.plugins.DocumentationPluginsBootstrapper:160 - Context refreshed -2024-11-07 09:38:13,357 [main] INFO springfox.documentation.spring.web.plugins.DocumentationPluginsBootstrapper:163 - Found 1 custom documentation plugin(s) -2024-11-07 09:38:13,397 [main] INFO springfox.documentation.spring.web.scanners.ApiListingReferenceScanner:41 - Scanning for api listing references -2024-11-07 09:38:13,607 [main] INFO springfox.documentation.spring.web.readers.operation.CachingOperationNameGenerator:40 - Generating unique operation named: deleteAdministerUsingPOST_1 -2024-11-07 09:38:13,611 [main] INFO springfox.documentation.spring.web.readers.operation.CachingOperationNameGenerator:40 - Generating unique operation named: operatorsUsingPOST_1 -2024-11-07 09:38:13,611 [main] INFO springfox.documentation.spring.web.readers.operation.CachingOperationNameGenerator:40 - Generating unique operation named: updateAdministerUsingPOST_1 -2024-11-07 09:38:13,687 [main] INFO org.springframework.scheduling.quartz.SchedulerFactoryBean:731 - Will start Quartz Scheduler [schedulerFactoryBean] in 1 seconds -2024-11-07 09:38:13,699 [main] INFO org.apache.coyote.http11.Http11NioProtocol:173 - Starting ProtocolHandler ["http-nio-23467"] -2024-11-07 09:38:13,723 [main] INFO org.springframework.boot.web.embedded.tomcat.TomcatWebServer:202 - Tomcat started on port(s): 23467 (http) with context path '' -2024-11-07 09:38:14,690 [Quartz Scheduler [schedulerFactoryBean]] INFO org.springframework.scheduling.quartz.SchedulerFactoryBean:747 - Starting Quartz Scheduler now, after delay of 1 seconds -2024-11-07 09:38:14,770 [Quartz Scheduler [schedulerFactoryBean]] INFO org.springframework.scheduling.quartz.LocalDataSourceJobStore:866 - Freed 0 triggers from 'acquired' / 'blocked' state. -2024-11-07 09:38:14,790 [Quartz Scheduler [schedulerFactoryBean]] INFO org.springframework.scheduling.quartz.LocalDataSourceJobStore:876 - Recovering 0 jobs that were in-progress at the time of the last shut-down. -2024-11-07 09:38:14,790 [Quartz Scheduler [schedulerFactoryBean]] INFO org.springframework.scheduling.quartz.LocalDataSourceJobStore:889 - Recovery complete. -2024-11-07 09:38:14,798 [Quartz Scheduler [schedulerFactoryBean]] INFO org.springframework.scheduling.quartz.LocalDataSourceJobStore:896 - Removed 0 'complete' triggers. -2024-11-07 09:38:14,810 [Quartz Scheduler [schedulerFactoryBean]] INFO org.springframework.scheduling.quartz.LocalDataSourceJobStore:901 - Removed 0 stale fired job entries. -2024-11-07 09:38:14,826 [Quartz Scheduler [schedulerFactoryBean]] INFO org.quartz.core.QuartzScheduler:547 - Scheduler schedulerFactoryBean_$_NON_CLUSTERED started. -2024-11-07 09:38:17,253 [http-nio-23467-exec-2] INFO org.apache.catalina.core.ContainerBase.[Tomcat].[localhost].[/]:173 - Initializing Spring DispatcherServlet 'dispatcherServlet' -2024-11-07 09:38:17,254 [http-nio-23467-exec-2] INFO org.springframework.web.servlet.DispatcherServlet:524 - Initializing Servlet 'dispatcherServlet' -2024-11-07 09:38:17,278 [http-nio-23467-exec-2] INFO org.springframework.web.servlet.DispatcherServlet:546 - Completed initialization in 24 ms -2024-11-07 09:41:07,553 [Thread-26] INFO org.quartz.core.QuartzScheduler:585 - Scheduler schedulerFactoryBean_$_NON_CLUSTERED paused. -2024-11-07 09:41:07,555 [Thread-26] INFO org.springframework.scheduling.concurrent.ThreadPoolTaskScheduler:208 - Shutting down ExecutorService 'taskScheduler' -2024-11-07 09:41:07,566 [Thread-26] INFO org.springframework.scheduling.concurrent.ThreadPoolTaskExecutor:208 - Shutting down ExecutorService 'applicationTaskExecutor' -2024-11-07 09:41:07,591 [Thread-26] INFO org.quartz.core.QuartzScheduler:666 - Scheduler schedulerFactoryBean_$_NON_CLUSTERED shutting down. -2024-11-07 09:41:07,592 [Thread-26] INFO org.quartz.core.QuartzScheduler:585 - Scheduler schedulerFactoryBean_$_NON_CLUSTERED paused. -2024-11-07 09:41:07,593 [Thread-26] INFO org.quartz.core.QuartzScheduler:740 - Scheduler schedulerFactoryBean_$_NON_CLUSTERED shutdown complete. -2024-11-07 09:41:07,593 [Thread-26] INFO org.springframework.scheduling.quartz.SchedulerFactoryBean:844 - Shutting down Quartz Scheduler -2024-11-07 09:41:07,597 [Thread-26] INFO com.alibaba.druid.pool.DruidDataSource:2029 - {dataSource-1} closing ... -2024-11-07 09:41:07,597 [Thread-26] INFO com.alibaba.druid.pool.DruidDataSource:2101 - {dataSource-1} closed +2024-11-28 18:19:54,939 [main] INFO org.quartz.impl.StdSchedulerFactory:1362 - Quartz scheduler 'schedulerFactoryBean' initialized from an externally provided properties instance. +2024-11-28 18:19:54,939 [main] INFO org.quartz.impl.StdSchedulerFactory:1366 - Quartz scheduler version: 2.3.1 +2024-11-28 18:19:54,939 [main] INFO org.quartz.core.QuartzScheduler:2293 - JobFactory set to: com.subsidy.common.configure.JobFactory@5fbae40 +2024-11-28 18:19:55,454 [main] INFO springfox.documentation.spring.web.PropertySourcedRequestMappingHandlerMapping:69 - Mapped URL path [/v2/api-docs] onto method [public org.springframework.http.ResponseEntity springfox.documentation.swagger2.web.Swagger2Controller.getDocumentation(java.lang.String,javax.servlet.http.HttpServletRequest)] +2024-11-28 18:19:55,616 [main] INFO org.springframework.scheduling.concurrent.ThreadPoolTaskExecutor:171 - Initializing ExecutorService 'applicationTaskExecutor' +2024-11-28 18:19:56,265 [main] INFO org.springframework.scheduling.concurrent.ThreadPoolTaskScheduler:171 - Initializing ExecutorService 'taskScheduler' +2024-11-28 18:19:56,327 [main] INFO springfox.documentation.spring.web.plugins.DocumentationPluginsBootstrapper:160 - Context refreshed +2024-11-28 18:19:56,343 [main] INFO springfox.documentation.spring.web.plugins.DocumentationPluginsBootstrapper:163 - Found 1 custom documentation plugin(s) +2024-11-28 18:19:56,372 [main] INFO springfox.documentation.spring.web.scanners.ApiListingReferenceScanner:41 - Scanning for api listing references +2024-11-28 18:19:56,514 [main] INFO springfox.documentation.spring.web.readers.operation.CachingOperationNameGenerator:40 - Generating unique operation named: deleteAdministerUsingPOST_1 +2024-11-28 18:19:56,517 [main] INFO springfox.documentation.spring.web.readers.operation.CachingOperationNameGenerator:40 - Generating unique operation named: operatorsUsingPOST_1 +2024-11-28 18:19:56,518 [main] INFO springfox.documentation.spring.web.readers.operation.CachingOperationNameGenerator:40 - Generating unique operation named: updateAdministerUsingPOST_1 +2024-11-28 18:19:56,569 [main] INFO org.springframework.scheduling.quartz.SchedulerFactoryBean:731 - Will start Quartz Scheduler [schedulerFactoryBean] in 1 seconds +2024-11-28 18:19:56,578 [main] INFO org.apache.coyote.http11.Http11NioProtocol:173 - Starting ProtocolHandler ["http-nio-23467"] +2024-11-28 18:19:56,599 [main] INFO org.springframework.boot.web.embedded.tomcat.TomcatWebServer:202 - Tomcat started on port(s): 23467 (http) with context path '' +2024-11-28 18:19:57,581 [Quartz Scheduler [schedulerFactoryBean]] INFO org.springframework.scheduling.quartz.SchedulerFactoryBean:747 - Starting Quartz Scheduler now, after delay of 1 seconds +2024-11-28 18:19:57,644 [Quartz Scheduler [schedulerFactoryBean]] INFO org.springframework.scheduling.quartz.LocalDataSourceJobStore:866 - Freed 0 triggers from 'acquired' / 'blocked' state. +2024-11-28 18:19:57,663 [Quartz Scheduler [schedulerFactoryBean]] INFO org.springframework.scheduling.quartz.LocalDataSourceJobStore:876 - Recovering 0 jobs that were in-progress at the time of the last shut-down. +2024-11-28 18:19:57,664 [Quartz Scheduler [schedulerFactoryBean]] INFO org.springframework.scheduling.quartz.LocalDataSourceJobStore:889 - Recovery complete. +2024-11-28 18:19:57,674 [Quartz Scheduler [schedulerFactoryBean]] INFO org.springframework.scheduling.quartz.LocalDataSourceJobStore:896 - Removed 0 'complete' triggers. +2024-11-28 18:19:57,686 [Quartz Scheduler [schedulerFactoryBean]] INFO org.springframework.scheduling.quartz.LocalDataSourceJobStore:901 - Removed 0 stale fired job entries. +2024-11-28 18:19:57,704 [Quartz Scheduler [schedulerFactoryBean]] INFO org.quartz.core.QuartzScheduler:547 - Scheduler schedulerFactoryBean_$_NON_CLUSTERED started. +2024-11-28 18:20:00,859 [http-nio-23467-exec-1] INFO org.apache.catalina.core.ContainerBase.[Tomcat].[localhost].[/]:173 - Initializing Spring DispatcherServlet 'dispatcherServlet' +2024-11-28 18:20:00,859 [http-nio-23467-exec-1] INFO org.springframework.web.servlet.DispatcherServlet:524 - Initializing Servlet 'dispatcherServlet' +2024-11-28 18:20:00,866 [http-nio-23467-exec-1] INFO org.springframework.web.servlet.DispatcherServlet:546 - Completed initialization in 7 ms +2024-11-28 18:24:39,418 [Thread-18] INFO org.quartz.core.QuartzScheduler:585 - Scheduler schedulerFactoryBean_$_NON_CLUSTERED paused. +2024-11-28 18:24:39,419 [Thread-18] INFO org.springframework.scheduling.concurrent.ThreadPoolTaskScheduler:208 - Shutting down ExecutorService 'taskScheduler' +2024-11-28 18:24:39,422 [Thread-18] INFO org.springframework.scheduling.concurrent.ThreadPoolTaskExecutor:208 - Shutting down ExecutorService 'applicationTaskExecutor' +2024-11-28 18:24:39,436 [Thread-18] INFO org.quartz.core.QuartzScheduler:666 - Scheduler schedulerFactoryBean_$_NON_CLUSTERED shutting down. +2024-11-28 18:24:39,437 [Thread-18] INFO org.quartz.core.QuartzScheduler:585 - Scheduler schedulerFactoryBean_$_NON_CLUSTERED paused. +2024-11-28 18:24:39,437 [Thread-18] INFO org.quartz.core.QuartzScheduler:740 - Scheduler schedulerFactoryBean_$_NON_CLUSTERED shutdown complete. +2024-11-28 18:24:39,437 [Thread-18] INFO org.springframework.scheduling.quartz.SchedulerFactoryBean:844 - Shutting down Quartz Scheduler +2024-11-28 18:24:39,439 [Thread-18] INFO com.alibaba.druid.pool.DruidDataSource:2029 - {dataSource-1} closing ... +2024-11-28 18:24:39,440 [Thread-18] INFO com.alibaba.druid.pool.DruidDataSource:2101 - {dataSource-1} closed diff --git a/logs/springboot-logback/error/2023-07-31-0.log.gz b/logs/springboot-logback/error/2023-07-31-0.log.gz deleted file mode 100644 index ea960ae..0000000 Binary files a/logs/springboot-logback/error/2023-07-31-0.log.gz and /dev/null differ diff --git a/logs/springboot-logback/error/2023-08-08-0.log.gz b/logs/springboot-logback/error/2023-08-08-0.log.gz deleted file mode 100644 index 360f67e..0000000 Binary files a/logs/springboot-logback/error/2023-08-08-0.log.gz and /dev/null differ diff --git a/logs/springboot-logback/error/2023-10-11-0.log.gz b/logs/springboot-logback/error/2023-10-11-0.log.gz deleted file mode 100644 index d897ba7..0000000 Binary files a/logs/springboot-logback/error/2023-10-11-0.log.gz and /dev/null differ diff --git a/logs/springboot-logback/error/2024-01-22-0.log.gz b/logs/springboot-logback/error/2024-01-22-0.log.gz deleted file mode 100644 index 5617331..0000000 Binary files a/logs/springboot-logback/error/2024-01-22-0.log.gz and /dev/null differ diff --git a/logs/springboot-logback/error/2024-02-23-0.log.gz b/logs/springboot-logback/error/2024-02-23-0.log.gz new file mode 100644 index 0000000..f245e08 Binary files /dev/null and b/logs/springboot-logback/error/2024-02-23-0.log.gz differ diff --git a/logs/springboot-logback/error/2024-02-26-0.log.gz b/logs/springboot-logback/error/2024-02-26-0.log.gz new file mode 100644 index 0000000..e193619 Binary files /dev/null and b/logs/springboot-logback/error/2024-02-26-0.log.gz differ diff --git a/logs/springboot-logback/info/2024-01-05-0.log.gz b/logs/springboot-logback/info/2024-01-05-0.log.gz deleted file mode 100644 index b867a23..0000000 Binary files a/logs/springboot-logback/info/2024-01-05-0.log.gz and /dev/null differ diff --git a/logs/springboot-logback/info/2024-01-08-0.log.gz b/logs/springboot-logback/info/2024-01-08-0.log.gz deleted file mode 100644 index 1f49b5a..0000000 Binary files a/logs/springboot-logback/info/2024-01-08-0.log.gz and /dev/null differ diff --git a/logs/springboot-logback/info/2024-01-09-0.log.gz b/logs/springboot-logback/info/2024-01-09-0.log.gz deleted file mode 100644 index a180f62..0000000 Binary files a/logs/springboot-logback/info/2024-01-09-0.log.gz and /dev/null differ diff --git a/logs/springboot-logback/info/2024-01-10-0.log.gz b/logs/springboot-logback/info/2024-01-10-0.log.gz deleted file mode 100644 index a7bbd6f..0000000 Binary files a/logs/springboot-logback/info/2024-01-10-0.log.gz and /dev/null differ diff --git a/logs/springboot-logback/info/2024-01-11-0.log.gz b/logs/springboot-logback/info/2024-01-11-0.log.gz deleted file mode 100644 index 02642ba..0000000 Binary files a/logs/springboot-logback/info/2024-01-11-0.log.gz and /dev/null differ diff --git a/logs/springboot-logback/info/2024-01-12-0.log.gz b/logs/springboot-logback/info/2024-01-12-0.log.gz deleted file mode 100644 index 879f39c..0000000 Binary files a/logs/springboot-logback/info/2024-01-12-0.log.gz and /dev/null differ diff --git a/logs/springboot-logback/info/2024-01-15-0.log.gz b/logs/springboot-logback/info/2024-01-15-0.log.gz deleted file mode 100644 index 81908da..0000000 Binary files a/logs/springboot-logback/info/2024-01-15-0.log.gz and /dev/null differ diff --git a/logs/springboot-logback/info/2024-01-16-0.log.gz b/logs/springboot-logback/info/2024-01-16-0.log.gz deleted file mode 100644 index 26d4976..0000000 Binary files a/logs/springboot-logback/info/2024-01-16-0.log.gz and /dev/null differ diff --git a/logs/springboot-logback/info/2024-01-17-0.log.gz b/logs/springboot-logback/info/2024-01-17-0.log.gz deleted file mode 100644 index 4d538e8..0000000 Binary files a/logs/springboot-logback/info/2024-01-17-0.log.gz and /dev/null differ diff --git a/logs/springboot-logback/info/2024-01-18-0.log.gz b/logs/springboot-logback/info/2024-01-18-0.log.gz deleted file mode 100644 index 2f6c4cb..0000000 Binary files a/logs/springboot-logback/info/2024-01-18-0.log.gz and /dev/null differ diff --git a/logs/springboot-logback/info/2024-01-19-0.log.gz b/logs/springboot-logback/info/2024-01-19-0.log.gz deleted file mode 100644 index fc863cd..0000000 Binary files a/logs/springboot-logback/info/2024-01-19-0.log.gz and /dev/null differ diff --git a/logs/springboot-logback/info/2024-01-22-0.log.gz b/logs/springboot-logback/info/2024-01-22-0.log.gz deleted file mode 100644 index 4bbecbf..0000000 Binary files a/logs/springboot-logback/info/2024-01-22-0.log.gz and /dev/null differ diff --git a/logs/springboot-logback/info/2024-01-24-0.log.gz b/logs/springboot-logback/info/2024-01-24-0.log.gz deleted file mode 100644 index ad9d910..0000000 Binary files a/logs/springboot-logback/info/2024-01-24-0.log.gz and /dev/null differ diff --git a/logs/springboot-logback/info/2024-01-26-0.log.gz b/logs/springboot-logback/info/2024-01-26-0.log.gz deleted file mode 100644 index 02f1264..0000000 Binary files a/logs/springboot-logback/info/2024-01-26-0.log.gz and /dev/null differ diff --git a/logs/springboot-logback/info/2024-04-15-0.log.gz b/logs/springboot-logback/info/2024-04-15-0.log.gz new file mode 100644 index 0000000..f68b044 Binary files /dev/null and b/logs/springboot-logback/info/2024-04-15-0.log.gz differ diff --git a/logs/springboot-logback/info/2024-04-16-0.log.gz b/logs/springboot-logback/info/2024-04-16-0.log.gz new file mode 100644 index 0000000..f513af2 Binary files /dev/null and b/logs/springboot-logback/info/2024-04-16-0.log.gz differ diff --git a/logs/springboot-logback/info/2024-04-17-0.log.gz b/logs/springboot-logback/info/2024-04-17-0.log.gz new file mode 100644 index 0000000..c692b2d Binary files /dev/null and b/logs/springboot-logback/info/2024-04-17-0.log.gz differ diff --git a/logs/springboot-logback/info/2024-04-18-0.log.gz b/logs/springboot-logback/info/2024-04-18-0.log.gz new file mode 100644 index 0000000..054ba48 Binary files /dev/null and b/logs/springboot-logback/info/2024-04-18-0.log.gz differ diff --git a/logs/springboot-logback/info/2024-04-19-0.log.gz b/logs/springboot-logback/info/2024-04-19-0.log.gz new file mode 100644 index 0000000..7fef431 Binary files /dev/null and b/logs/springboot-logback/info/2024-04-19-0.log.gz differ diff --git a/logs/springboot-logback/info/2024-04-22-0.log.gz b/logs/springboot-logback/info/2024-04-22-0.log.gz new file mode 100644 index 0000000..a2b1b3d Binary files /dev/null and b/logs/springboot-logback/info/2024-04-22-0.log.gz differ diff --git a/logs/springboot-logback/info/2024-04-24-0.log.gz b/logs/springboot-logback/info/2024-04-24-0.log.gz new file mode 100644 index 0000000..dbede20 Binary files /dev/null and b/logs/springboot-logback/info/2024-04-24-0.log.gz differ diff --git a/logs/springboot-logback/info/2024-04-25-0.log.gz b/logs/springboot-logback/info/2024-04-25-0.log.gz new file mode 100644 index 0000000..1f89fd3 Binary files /dev/null and b/logs/springboot-logback/info/2024-04-25-0.log.gz differ diff --git a/logs/springboot-logback/info/2024-04-26-0.log.gz b/logs/springboot-logback/info/2024-04-26-0.log.gz new file mode 100644 index 0000000..e8eb087 Binary files /dev/null and b/logs/springboot-logback/info/2024-04-26-0.log.gz differ diff --git a/logs/springboot-logback/info/2024-04-28-0.log.gz b/logs/springboot-logback/info/2024-04-28-0.log.gz new file mode 100644 index 0000000..324b5c2 Binary files /dev/null and b/logs/springboot-logback/info/2024-04-28-0.log.gz differ diff --git a/logs/springboot-logback/info/2024-05-07-0.log.gz b/logs/springboot-logback/info/2024-05-07-0.log.gz new file mode 100644 index 0000000..6cf5d3c Binary files /dev/null and b/logs/springboot-logback/info/2024-05-07-0.log.gz differ diff --git a/logs/springboot-logback/info/2024-05-08-0.log.gz b/logs/springboot-logback/info/2024-05-08-0.log.gz new file mode 100644 index 0000000..97ee33d Binary files /dev/null and b/logs/springboot-logback/info/2024-05-08-0.log.gz differ diff --git a/logs/springboot-logback/info/2024-05-13-0.log.gz b/logs/springboot-logback/info/2024-05-13-0.log.gz new file mode 100644 index 0000000..77c7891 Binary files /dev/null and b/logs/springboot-logback/info/2024-05-13-0.log.gz differ diff --git a/logs/springboot-logback/info/2024-08-19-0.log.gz b/logs/springboot-logback/info/2024-08-19-0.log.gz new file mode 100644 index 0000000..029051d Binary files /dev/null and b/logs/springboot-logback/info/2024-08-19-0.log.gz differ diff --git a/logs/springboot-logback/info/2024-08-20-0.log.gz b/logs/springboot-logback/info/2024-08-20-0.log.gz new file mode 100644 index 0000000..0353d7b Binary files /dev/null and b/logs/springboot-logback/info/2024-08-20-0.log.gz differ diff --git a/logs/springboot-logback/info/2024-11-11-0.log.gz b/logs/springboot-logback/info/2024-11-11-0.log.gz new file mode 100644 index 0000000..f09d0b8 Binary files /dev/null and b/logs/springboot-logback/info/2024-11-11-0.log.gz differ diff --git a/src/main/java/com/subsidy/common/configure/EmailConfig.java b/src/main/java/com/subsidy/common/configure/EmailConfig.java new file mode 100644 index 0000000..b394b3b --- /dev/null +++ b/src/main/java/com/subsidy/common/configure/EmailConfig.java @@ -0,0 +1,14 @@ +package com.subsidy.common.configure; + +import lombok.Data; +import org.springframework.boot.context.properties.ConfigurationProperties; +import org.springframework.context.annotation.Configuration; + +@Data +@Configuration +@ConfigurationProperties(prefix = "email") +public class EmailConfig { + + private String address; + +} diff --git a/src/main/java/com/subsidy/mapper/CollectInfoMapper.java b/src/main/java/com/subsidy/mapper/CollectInfoMapper.java index eaa368f..2c580fd 100644 --- a/src/main/java/com/subsidy/mapper/CollectInfoMapper.java +++ b/src/main/java/com/subsidy/mapper/CollectInfoMapper.java @@ -3,6 +3,7 @@ package com.subsidy.mapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.subsidy.model.CollectInfoDO; import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.subsidy.vo.InfoVO; import org.springframework.stereotype.Repository; /** @@ -16,6 +17,6 @@ import org.springframework.stereotype.Repository; @Repository public interface CollectInfoMapper extends BaseMapper { - IPage info(IPage iPage); + IPage info(IPage iPage); } diff --git a/src/main/java/com/subsidy/service/CollectInfoService.java b/src/main/java/com/subsidy/service/CollectInfoService.java index ac2379b..b1938f6 100644 --- a/src/main/java/com/subsidy/service/CollectInfoService.java +++ b/src/main/java/com/subsidy/service/CollectInfoService.java @@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage; import com.subsidy.dto.collect.InfoDTO; import com.subsidy.model.CollectInfoDO; import com.baomidou.mybatisplus.extension.service.IService; +import com.subsidy.vo.InfoVO; /** *

@@ -17,6 +18,6 @@ public interface CollectInfoService extends IService { String collect(CollectInfoDO collectInfoDO); - IPage info(InfoDTO infoDTO); + IPage info(InfoDTO infoDTO); } diff --git a/src/main/java/com/subsidy/service/impl/CollectInfoServiceImpl.java b/src/main/java/com/subsidy/service/impl/CollectInfoServiceImpl.java index 5eb1429..209168d 100644 --- a/src/main/java/com/subsidy/service/impl/CollectInfoServiceImpl.java +++ b/src/main/java/com/subsidy/service/impl/CollectInfoServiceImpl.java @@ -3,6 +3,7 @@ package com.subsidy.service.impl; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.subsidy.common.configure.EmailConfig; import com.subsidy.common.exception.HttpException; import com.subsidy.dto.collect.InfoDTO; import com.subsidy.model.CollectInfoDO; @@ -10,6 +11,8 @@ import com.subsidy.mapper.CollectInfoMapper; import com.subsidy.service.CollectInfoService; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.subsidy.util.ConstantUtils; +import com.subsidy.vo.InfoVO; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; @@ -29,6 +32,9 @@ import java.util.Properties; @Service public class CollectInfoServiceImpl extends ServiceImpl implements CollectInfoService { + @Autowired + private EmailConfig emailConfig; + @Transactional(rollbackFor = Exception.class) public String collect(CollectInfoDO collectInfoDO) { @@ -48,7 +54,7 @@ public class CollectInfoServiceImpl extends ServiceImpl info(InfoDTO infoDTO){ + public IPage info(InfoDTO infoDTO){ Page pager = new Page(infoDTO.getPageNum(), infoDTO.getPageSize()); return this.baseMapper.info(pager); } @@ -75,7 +81,7 @@ public class CollectInfoServiceImpl extends ServiceImpl - SELECT * FROM diff --git a/subsidy.iml b/subsidy.iml index 243c20a..01cf7a5 100644 --- a/subsidy.iml +++ b/subsidy.iml @@ -169,5 +169,7 @@ + + \ No newline at end of file diff --git a/target/classes/META-INF/spring-configuration-metadata.json b/target/classes/META-INF/spring-configuration-metadata.json index ca2b5e2..5929f1a 100644 --- a/target/classes/META-INF/spring-configuration-metadata.json +++ b/target/classes/META-INF/spring-configuration-metadata.json @@ -1,6 +1,11 @@ { "groups": [ { + "name": "email", + "type": "com.subsidy.common.configure.EmailConfig", + "sourceType": "com.subsidy.common.configure.EmailConfig" + }, + { "name": "meishu", "type": "com.subsidy.common.configure.RemoteProperties", "sourceType": "com.subsidy.common.configure.RemoteProperties" @@ -38,6 +43,11 @@ ], "properties": [ { + "name": "email.address", + "type": "java.lang.String", + "sourceType": "com.subsidy.common.configure.EmailConfig" + }, + { "name": "meishu.code-message", "type": "java.util.Map", "sourceType": "com.subsidy.common.configure.RemoteProperties" diff --git a/target/classes/application-dev.properties b/target/classes/application-dev.properties index 1dd5a62..6789ec5 100644 --- a/target/classes/application-dev.properties +++ b/target/classes/application-dev.properties @@ -1,15 +1,12 @@ # 本地环境配置 spring.server.port=23467 -# 数据源配置 -#spring.datasource.url=jdbc:mysql://116.62.57.92:3306/subsidy_test?autoReconnect=true&useUnicode=true&characterEncoding=utf8&serverTimezone=GMT%2B8 -##spring.datasource.url=jdbc:mysql://rm-uf6rab73w0qg843opxo.mysql.rds.aliyuncs.com:3306/subsidy_test?autoReconnect=true&useUnicode=true&characterEncoding=utf8&serverTimezone=GMT%2B8 +## 数据源配置 +#spring.datasource.url=jdbc:mysql://localhost:3306/subsidy?autoReconnect=true&useUnicode=true&characterEncoding=utf8&serverTimezone=GMT%2B8 #spring.datasource.type=com.alibaba.druid.pool.DruidDataSource #spring.datasource.driver-class-name=com.mysql.cj.jdbc.Driver -##spring.datasource.username=ykadmin_new -##spring.datasource.password=youkedb608@good -#spring.datasource.username=devloper -#spring.datasource.password=dev@1553$ +#spring.datasource.username=root +#spring.datasource.password=123456 # 数据源配置 spring.datasource.url=jdbc:mysql://139.224.253.21:3306/subsidy?autoReconnect=true&useUnicode=true&characterEncoding=utf8&serverTimezone=GMT%2B8 @@ -65,4 +62,6 @@ qxueyou.url=https://dev.qxueyou.com/auth/user/token renshe.url = https://test.shzypxy.com renshe.secretKey = ad927f0b-6a39-43a7-bac7-163baef1fff7 -renshe.putuo = http://180.167.195.117:18015/ddproject \ No newline at end of file +renshe.putuo = http://180.167.195.117:18015/ddproject + +email.address = tuyaping@ykhl.com \ No newline at end of file diff --git a/target/classes/application-online.properties b/target/classes/application-online.properties deleted file mode 100644 index 5bca86a..0000000 --- a/target/classes/application-online.properties +++ /dev/null @@ -1,60 +0,0 @@ -# 本地环境配置 -spring.server.port=23462 - -# 数据源配置 -spring.datasource.url=jdbc:mysql://116.62.57.92:3306/subsidy_online?autoReconnect=true&useUnicode=true&characterEncoding=utf8&serverTimezone=GMT%2B8 -#spring.datasource.url=jdbc:mysql://rm-uf6rab73w0qg843opxo.mysql.rds.aliyuncs.com:3306/subsidy_test?autoReconnect=true&useUnicode=true&characterEncoding=utf8&serverTimezone=GMT%2B8 -spring.datasource.type=com.alibaba.druid.pool.DruidDataSource -spring.datasource.driver-class-name=com.mysql.cj.jdbc.Driver -#spring.datasource.username=ykadmin_new -#spring.datasource.password=youkedb608@good -spring.datasource.username=devloper -spring.datasource.password=dev@1553$ - -spring.datasource.druid.initialSize=5 -spring.datasource.druid.minIdle=5 -spring.datasource.druid.maxActive=200 -spring.datasource.druid.maxWait=60000 -spring.datasource.druid.timeBetweenEvictionRunsMillis=60000 -spring.datasource.druid.minEvictableIdleTimeMillis=300000 -spring.datasource.druid.validationQuery=SELECT 1 FROM DUAL -spring.datasource.druid.testWhileIdle=true -spring.datasource.druid.testOnBorrow=false -spring.datasource.druid.testOnReturn=false -spring.datasource.druid.poolPreparedStatements=true -spring.datasource.druid.maxPoolPreparedStatementPerConnectionSize=20 -spring.datasource.druid.useGlobalDataSourceStat=true - -# 控制台日志打印 -mybatis-plus.configuration.log-impl=org.apache.ibatis.logging.stdout.StdOutImpl - -#spring.redis.host=r-uf6meywj6ysuehg148pd.redis.rds.aliyuncs.com -#spring.redis.password=r-uf6meywj6ysuehg148:Ykhl@208 -#spring.redis.port=6379 -#spring.redis.lettuce.pool.max-idle=16 -#spring.redis.lettuce.pool.max-active=32 -#spring.redis.lettuce.pool.min-idle=8 - -#spring.application.name=spring-boot-mongodb -## mongodb -##spring.data.mongodb.uri=mongodb://47.97.19.66:27017/subsidy -#spring.data.mongodb.username=root -#spring.data.mongodb.password=123456 -##spring.data.mongodb.authentication-database=subsidy -#spring.data.mongodb.database=subsidy -#spring.data.mongodb.host=47.97.19.66 -#spring.data.mongodb.port=27017 - -spring.redis.host=47.97.19.66 -spring.redis.password=Ykhl@208 -spring.redis.port=6389 -spring.redis.lettuce.pool.max-idle=16 -spring.redis.lettuce.pool.max-active=32 -spring.redis.lettuce.pool.min-idle=8 - -qxueyou.appId=qxywz5nnWMI77CM3Tx -qxueyou.securityKey=626737T1-65K0-5xC2-0Y0V-2Aq95qxy -qxueyou.url=https://dev.qxueyou.com/auth/user/token - -renshe.url = https://api.shzypxy.com -renshe.secretKey = 111 \ No newline at end of file diff --git a/target/classes/application-prod.properties b/target/classes/application-prod.properties index 8a569bd..0ffa29c 100644 --- a/target/classes/application-prod.properties +++ b/target/classes/application-prod.properties @@ -50,4 +50,6 @@ qxueyou.url=https://www.qxueyou.com/auth/user/token renshe.url = https://api.shzypxy.com #renshe.url = http://trial.shzypxy.com/api renshe.secretKey = ad927f0b-6a39-43a7-bac7-163baef1fff7 -renshe.putuo = http://180.167.195.117:18025/ddproject \ No newline at end of file +renshe.putuo = http://180.167.195.117:18025/ddproject + +email.address = tuyaping@ykhl.com \ No newline at end of file diff --git a/target/classes/application-quartz.properties b/target/classes/application-quartz.properties index 0d1f6b6..699a7fe 100644 --- a/target/classes/application-quartz.properties +++ b/target/classes/application-quartz.properties @@ -1,7 +1,7 @@ -spring.quartz.properties.org.quartz.jobStore.class=org.quartz.impl.jdbcjobstore.JobStoreTX -spring.quartz.properties.org.quartz.jobStore.driverDelegateClass=org.quartz.impl.jdbcjobstore.StdJDBCDelegate -spring.quartz.properties.org.quartz.jobStore.tablePrefix=QRTZ_ -spring.quartz.properties.org.quartz.threadPool.class=org.quartz.simpl.SimpleThreadPool -spring.quartz.properties.org.quartz.threadPool.threadCount=15 -spring.quartz.properties.org.quartz.threadPool.threadPriority=5 -spring.quartz.properties.org.quartz.threadPool.threadsInheritContextClassLoaderOfInitializingThread=true \ No newline at end of file +#spring.quartz.properties.org.quartz.jobStore.class=org.quartz.impl.jdbcjobstore.JobStoreTX +#spring.quartz.properties.org.quartz.jobStore.driverDelegateClass=org.quartz.impl.jdbcjobstore.StdJDBCDelegate +#spring.quartz.properties.org.quartz.jobStore.tablePrefix=QRTZ_ +#spring.quartz.properties.org.quartz.threadPool.class=org.quartz.simpl.SimpleThreadPool +#spring.quartz.properties.org.quartz.threadPool.threadCount=15 +#spring.quartz.properties.org.quartz.threadPool.threadPriority=5 +#spring.quartz.properties.org.quartz.threadPool.threadsInheritContextClassLoaderOfInitializingThread=true \ No newline at end of file diff --git a/target/classes/application.properties b/target/classes/application.properties index 75a5fad..1f171cb 100644 --- a/target/classes/application.properties +++ b/target/classes/application.properties @@ -1,5 +1,5 @@ # 环境配置 平台端 -spring.profiles.active=dev +spring.profiles.active=prod #和CPU数 spring.server.acceptorThreadCount=600 spring.server.minSpareThreads=100 @@ -57,21 +57,7 @@ vod.secretKey=vjHYRmrfDbw0rWxA7oFcj7F8lDPKCm8E vod.api=vod.tencentcloudapi.com vod.region=ap-shanghai vod.classId=848920 -# quartz -# 数据持久化方式 -spring.quartz.job-store-type=jdbc -# 初始化后是否自动启动计划程序 -spring.quartz.auto-startup=true -# 初始化完成后启动计划程序的延迟时间 -spring.quartz.startup-delay=10s -# 配置的作业是否应覆盖现有的作业定义 -spring.quartz.overwrite-existing-jobs=false -# 自动建表,如果已经存在表请勿使用,会覆盖数据表 -#spring.quartz.jdbc.initialize-schema=always -#spring.datasource.initialization-mode=embedded -#spring.redis.host=r-uf6m4cpkjrgpzywjm3pd.redis.rds.aliyuncs.com -#spring.redis.port=6379 -#spring.redis.password=r-uf6m4cpkjrgpzywjm3:Ykhl@208 + wechat= #pro appId=wx5e1ecb9c9bd33451 diff --git a/target/classes/code.properties b/target/classes/code.properties index 49ba659..6969374 100644 --- a/target/classes/code.properties +++ b/target/classes/code.properties @@ -79,4 +79,5 @@ meishu.code-message[19001]=验证失败 meishu.code-message[20003]=提交时间过短，请稍后尝试 -meishu.code-message[30002]=该产品已存在 \ No newline at end of file +meishu.code-message[30002]=该产品已存在 +meishu.code-message[30003]=您已提交过信息，请勿重复提交 \ No newline at end of file diff --git a/target/classes/com/subsidy/util/excel/ExcelUtil.class b/target/classes/com/subsidy/util/excel/ExcelUtil.class index 3f46d7c..8dd3de7 100644 Binary files a/target/classes/com/subsidy/util/excel/ExcelUtil.class and b/target/classes/com/subsidy/util/excel/ExcelUtil.class differ diff --git a/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst b/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst index d473318..a2a1c1e 100644 --- a/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst +++ b/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst @@ -110,6 +110,7 @@ com\subsidy\util\IpAddressUtil.class com\subsidy\dto\company\GetCompanyMembersDTO.class com\subsidy\util\CodeGenerator$1.class com\subsidy\common\ResponseVO$ResponseVOBuilder.class +com\subsidy\common\configure\EmailConfig.class com\subsidy\common\handler\MetaHandler.class com\subsidy\service\MemberService.class com\subsidy\mapper\RoleAdministerMappingMapper.class diff --git a/target/subsidy-center.jar b/target/subsidy-center.jar index 6913ced..19fc734 100644 Binary files a/target/subsidy-center.jar and b/target/subsidy-center.jar differ diff --git a/target/subsidy-center.jar.original b/target/subsidy-center.jar.original index 7a11541..1766dca 100644 Binary files a/target/subsidy-center.jar.original and b/target/subsidy-center.jar.original differ