diff --git a/log/web_debug.log b/log/web_debug.log deleted file mode 100644 index e69de29b..00000000 diff --git a/log/web_error.log b/log/web_error.log deleted file mode 100644 index 51c12c87..00000000 --- a/log/web_error.log +++ /dev/null @@ -1,34 +0,0 @@ -2023-11-21 10:44:30.152 [redisson-netty-4-26] ERROR i.n.u.concurrent.DefaultPromise.rejectedExecution - Failed to submit a listener notification task. Event loop shut down? -java.util.concurrent.RejectedExecutionException: event executor terminated - at io.netty.util.concurrent.SingleThreadEventExecutor.reject(SingleThreadEventExecutor.java:923) - at io.netty.util.concurrent.SingleThreadEventExecutor.offerTask(SingleThreadEventExecutor.java:350) - at io.netty.util.concurrent.SingleThreadEventExecutor.addTask(SingleThreadEventExecutor.java:343) - at io.netty.util.concurrent.SingleThreadEventExecutor.execute(SingleThreadEventExecutor.java:825) - at io.netty.util.concurrent.SingleThreadEventExecutor.execute(SingleThreadEventExecutor.java:815) - at io.netty.util.concurrent.DefaultPromise.safeExecute(DefaultPromise.java:841) - at io.netty.util.concurrent.DefaultPromise.notifyListeners(DefaultPromise.java:499) - at io.netty.util.concurrent.DefaultPromise.setValue0(DefaultPromise.java:616) - at io.netty.util.concurrent.DefaultPromise.setSuccess0(DefaultPromise.java:605) - at io.netty.util.concurrent.DefaultPromise.setSuccess(DefaultPromise.java:96) - at io.netty.channel.group.DefaultChannelGroupFuture.setSuccess0(DefaultChannelGroupFuture.java:200) - at io.netty.channel.group.DefaultChannelGroupFuture.access$400(DefaultChannelGroupFuture.java:41) - at io.netty.channel.group.DefaultChannelGroupFuture$1.operationComplete(DefaultChannelGroupFuture.java:75) - at io.netty.channel.group.DefaultChannelGroupFuture$1.operationComplete(DefaultChannelGroupFuture.java:48) - at io.netty.util.concurrent.DefaultPromise.notifyListener0(DefaultPromise.java:578) - at io.netty.util.concurrent.DefaultPromise.notifyListeners0(DefaultPromise.java:571) - at io.netty.util.concurrent.DefaultPromise.notifyListenersNow(DefaultPromise.java:550) - at io.netty.util.concurrent.DefaultPromise.notifyListeners(DefaultPromise.java:491) - at io.netty.util.concurrent.DefaultPromise.setValue0(DefaultPromise.java:616) - at io.netty.util.concurrent.DefaultPromise.setSuccess0(DefaultPromise.java:605) - at io.netty.util.concurrent.DefaultPromise.trySuccess(DefaultPromise.java:104) - at io.netty.channel.DefaultChannelPromise.trySuccess(DefaultChannelPromise.java:84) - at io.netty.channel.AbstractChannel$CloseFuture.setClosed(AbstractChannel.java:1164) - at io.netty.channel.AbstractChannel$AbstractUnsafe.doClose0(AbstractChannel.java:755) - at io.netty.channel.AbstractChannel$AbstractUnsafe.close(AbstractChannel.java:731) - at io.netty.channel.AbstractChannel$AbstractUnsafe.close(AbstractChannel.java:620) - at io.netty.channel.nio.NioEventLoop.closeAll(NioEventLoop.java:772) - at io.netty.channel.nio.NioEventLoop.run(NioEventLoop.java:529) - at io.netty.util.concurrent.SingleThreadEventExecutor$4.run(SingleThreadEventExecutor.java:986) - at io.netty.util.internal.ThreadExecutorMap$2.run(ThreadExecutorMap.java:74) - at io.netty.util.concurrent.FastThreadLocalRunnable.run(FastThreadLocalRunnable.java:30) - at java.lang.Thread.run(Thread.java:748) diff --git a/log/web_info.log b/log/web_info.log deleted file mode 100644 index e69de29b..00000000 diff --git a/log/web_warn.log b/log/web_warn.log deleted file mode 100644 index d2cb1c69..00000000 --- a/log/web_warn.log +++ /dev/null @@ -1,6 +0,0 @@ -2023-11-21 10:36:58.046 [main] WARN o.s.b.a.o.j.JpaBaseConfiguration$JpaWebConfiguration - spring.jpa.open-in-view is enabled by default. Therefore, database queries may be performed during view rendering. Explicitly configure spring.jpa.open-in-view to disable this warning -2023-11-21 10:40:18.813 [main] WARN o.s.b.a.o.j.JpaBaseConfiguration$JpaWebConfiguration - spring.jpa.open-in-view is enabled by default. Therefore, database queries may be performed during view rendering. Explicitly configure spring.jpa.open-in-view to disable this warning -2023-11-21 10:41:42.406 [AMQP Connection 39.106.36.183:5672] WARN com.rabbitmq.client.impl.ForgivingExceptionHandler - An unexpected connection driver error occurred (Exception message: Connection reset) -2023-11-21 10:46:49.457 [main] WARN o.s.b.a.o.j.JpaBaseConfiguration$JpaWebConfiguration - spring.jpa.open-in-view is enabled by default. Therefore, database queries may be performed during view rendering. Explicitly configure spring.jpa.open-in-view to disable this warning -2023-11-21 10:50:31.693 [main] WARN o.s.b.a.o.j.JpaBaseConfiguration$JpaWebConfiguration - spring.jpa.open-in-view is enabled by default. Therefore, database queries may be performed during view rendering. Explicitly configure spring.jpa.open-in-view to disable this warning -2023-11-21 10:51:56.022 [main] WARN o.s.b.a.o.j.JpaBaseConfiguration$JpaWebConfiguration - spring.jpa.open-in-view is enabled by default. Therefore, database queries may be performed during view rendering. Explicitly configure spring.jpa.open-in-view to disable this warning diff --git a/logs/cms.2022-08-04.0.log b/logs/cms.2022-08-04.0.log deleted file mode 100644 index 0f08d57d..00000000 --- a/logs/cms.2022-08-04.0.log +++ /dev/null @@ -1,63 +0,0 @@ -2022-08-04 15:23:56.461 [INFO ] o.h.validator.internal.util.Version : HV000001: Hibernate Validator 6.2.3.Final -2022-08-04 15:23:56.468 [INFO ] com.peanut.PeanutBookApplication : Starting PeanutBookApplication using Java 1.8.0_151 on DESKTOP-MUPIBUO with PID 42540 (C:\Users\Administrator\Desktop\peanut_book\peanut_book\target\classes started by Administrator in C:\Users\Administrator\Desktop\peanut_book\peanut_book) -2022-08-04 15:23:56.469 [INFO ] com.peanut.PeanutBookApplication : The following 1 profile is active: "dev" -2022-08-04 15:23:57.231 [INFO ] .s.d.r.c.RepositoryConfigurationDelegate : Multiple Spring Data modules found, entering strict repository configuration mode! -2022-08-04 15:23:57.234 [INFO ] .s.d.r.c.RepositoryConfigurationDelegate : Bootstrapping Spring Data Redis repositories in DEFAULT mode. -2022-08-04 15:23:57.265 [INFO ] .s.d.r.c.RepositoryConfigurationDelegate : Finished Spring Data repository scanning in 20 ms. Found 0 Redis repository interfaces. -2022-08-04 15:23:57.470 [INFO ] trationDelegate$BeanPostProcessorChecker : Bean 'shiroConfig' of type [com.peanut.config.ShiroConfig$$EnhancerBySpringCGLIB$$b3f39e27] is not eligible for getting processed by all BeanPostProcessors (for example: not eligible for auto-proxying) -2022-08-04 15:23:57.761 [INFO ] trationDelegate$BeanPostProcessorChecker : Bean 'mybatis-plus-com.baomidou.mybatisplus.autoconfigure.MybatisPlusProperties' of type [com.baomidou.mybatisplus.autoconfigure.MybatisPlusProperties] is not eligible for getting processed by all BeanPostProcessors (for example: not eligible for auto-proxying) -2022-08-04 15:23:57.768 [INFO ] trationDelegate$BeanPostProcessorChecker : Bean 'mybatisPlusConfig' of type [com.peanut.config.MybatisPlusConfig$$EnhancerBySpringCGLIB$$20ac39c3] is not eligible for getting processed by all BeanPostProcessors (for example: not eligible for auto-proxying) -2022-08-04 15:23:57.774 [INFO ] trationDelegate$BeanPostProcessorChecker : Bean 'paginationInterceptor' of type [com.baomidou.mybatisplus.extension.plugins.PaginationInterceptor] is not eligible for getting processed by all BeanPostProcessors (for example: not eligible for auto-proxying) -2022-08-04 15:23:57.782 [INFO ] trationDelegate$BeanPostProcessorChecker : Bean 'com.baomidou.mybatisplus.autoconfigure.MybatisPlusAutoConfiguration' of type [com.baomidou.mybatisplus.autoconfigure.MybatisPlusAutoConfiguration$$EnhancerBySpringCGLIB$$d01723d5] is not eligible for getting processed by all BeanPostProcessors (for example: not eligible for auto-proxying) -2022-08-04 15:23:57.788 [INFO ] trationDelegate$BeanPostProcessorChecker : Bean 'dynamic-com.peanut.datasource.properties.DynamicDataSourceProperties' of type [com.peanut.datasource.properties.DynamicDataSourceProperties] is not eligible for getting processed by all BeanPostProcessors (for example: not eligible for auto-proxying) -2022-08-04 15:23:57.790 [INFO ] trationDelegate$BeanPostProcessorChecker : Bean 'dynamicDataSourceConfig' of type [com.peanut.datasource.config.DynamicDataSourceConfig$$EnhancerBySpringCGLIB$$6a8e6083] is not eligible for getting processed by all BeanPostProcessors (for example: not eligible for auto-proxying) -2022-08-04 15:23:57.796 [INFO ] trationDelegate$BeanPostProcessorChecker : Bean 'dataSourceProperties' of type [com.peanut.datasource.properties.DataSourceProperties] is not eligible for getting processed by all BeanPostProcessors (for example: not eligible for auto-proxying) -2022-08-04 15:23:59.174 [INFO ] com.alibaba.druid.pool.DruidDataSource : {dataSource-1} inited -2022-08-04 15:23:59.176 [INFO ] trationDelegate$BeanPostProcessorChecker : Bean 'dynamicDataSource' of type [com.peanut.datasource.config.DynamicDataSource] is not eligible for getting processed by all BeanPostProcessors (for example: not eligible for auto-proxying) -2022-08-04 15:23:59.821 [INFO ] trationDelegate$BeanPostProcessorChecker : Bean 'sqlSessionFactory' of type [org.apache.ibatis.session.defaults.DefaultSqlSessionFactory] is not eligible for getting processed by all BeanPostProcessors (for example: not eligible for auto-proxying) -2022-08-04 15:23:59.826 [INFO ] trationDelegate$BeanPostProcessorChecker : Bean 'sqlSessionTemplate' of type [org.mybatis.spring.SqlSessionTemplate] is not eligible for getting processed by all BeanPostProcessors (for example: not eligible for auto-proxying) -2022-08-04 15:23:59.830 [INFO ] trationDelegate$BeanPostProcessorChecker : Bean 'sysMenuDao' of type [org.mybatis.spring.mapper.MapperFactoryBean] is not eligible for getting processed by all BeanPostProcessors (for example: not eligible for auto-proxying) -2022-08-04 15:23:59.835 [INFO ] trationDelegate$BeanPostProcessorChecker : Bean 'sysMenuDao' of type [com.sun.proxy.$Proxy89] is not eligible for getting processed by all BeanPostProcessors (for example: not eligible for auto-proxying) -2022-08-04 15:23:59.840 [INFO ] trationDelegate$BeanPostProcessorChecker : Bean 'sysUserDao' of type [org.mybatis.spring.mapper.MapperFactoryBean] is not eligible for getting processed by all BeanPostProcessors (for example: not eligible for auto-proxying) -2022-08-04 15:23:59.841 [INFO ] trationDelegate$BeanPostProcessorChecker : Bean 'sysUserDao' of type [com.sun.proxy.$Proxy90] is not eligible for getting processed by all BeanPostProcessors (for example: not eligible for auto-proxying) -2022-08-04 15:23:59.843 [INFO ] trationDelegate$BeanPostProcessorChecker : Bean 'sysUserTokenDao' of type [org.mybatis.spring.mapper.MapperFactoryBean] is not eligible for getting processed by all BeanPostProcessors (for example: not eligible for auto-proxying) -2022-08-04 15:23:59.844 [INFO ] trationDelegate$BeanPostProcessorChecker : Bean 'sysUserTokenDao' of type [com.sun.proxy.$Proxy91] is not eligible for getting processed by all BeanPostProcessors (for example: not eligible for auto-proxying) -2022-08-04 15:23:59.846 [INFO ] trationDelegate$BeanPostProcessorChecker : Bean 'shiroServiceImpl' of type [com.peanut.modules.sys.service.impl.ShiroServiceImpl] is not eligible for getting processed by all BeanPostProcessors (for example: not eligible for auto-proxying) -2022-08-04 15:23:59.848 [INFO ] trationDelegate$BeanPostProcessorChecker : Bean 'OAuth2Realm' of type [com.peanut.modules.sys.oauth2.OAuth2Realm] is not eligible for getting processed by all BeanPostProcessors (for example: not eligible for auto-proxying) -2022-08-04 15:23:59.872 [INFO ] trationDelegate$BeanPostProcessorChecker : Bean 'securityManager' of type [org.apache.shiro.web.mgt.DefaultWebSecurityManager] is not eligible for getting processed by all BeanPostProcessors (for example: not eligible for auto-proxying) -2022-08-04 15:23:59.883 [INFO ] trationDelegate$BeanPostProcessorChecker : Bean 'authorizationAttributeSourceAdvisor' of type [org.apache.shiro.spring.security.interceptor.AuthorizationAttributeSourceAdvisor] is not eligible for getting processed by all BeanPostProcessors (for example: not eligible for auto-proxying) -2022-08-04 15:24:00.102 [INFO ] o.s.b.w.embedded.tomcat.TomcatWebServer : Tomcat initialized with port(s): 9200 (http) -2022-08-04 15:24:00.111 [INFO ] o.a.coyote.http11.Http11NioProtocol : Initializing ProtocolHandler ["http-nio-9200"] -2022-08-04 15:24:00.111 [INFO ] o.apache.catalina.core.StandardService : Starting service [Tomcat] -2022-08-04 15:24:00.111 [INFO ] org.apache.catalina.core.StandardEngine : Starting Servlet engine: [Apache Tomcat/9.0.60] -2022-08-04 15:24:00.201 [INFO ] o.a.c.c.C.[Tomcat].[localhost].[/pb] : Initializing Spring embedded WebApplicationContext -2022-08-04 15:24:00.201 [INFO ] w.s.c.ServletWebServerApplicationContext : Root WebApplicationContext: initialization completed in 3690 ms -2022-08-04 15:24:00.648 [INFO ] org.quartz.impl.StdSchedulerFactory : Using default implementation for ThreadExecutor -2022-08-04 15:24:00.656 [INFO ] org.quartz.core.SchedulerSignalerImpl : Initialized Scheduler Signaller of type: class org.quartz.core.SchedulerSignalerImpl -2022-08-04 15:24:00.656 [INFO ] org.quartz.core.QuartzScheduler : Quartz Scheduler v.2.3.0 created. -2022-08-04 15:24:00.661 [INFO ] o.s.s.quartz.LocalDataSourceJobStore : Using db table-based data access locking (synchronization). -2022-08-04 15:24:00.662 [INFO ] o.s.s.quartz.LocalDataSourceJobStore : JobStoreCMT initialized. -2022-08-04 15:24:00.663 [INFO ] org.quartz.core.QuartzScheduler : Scheduler meta-data: Quartz Scheduler (v2.3.0) 'RenrenScheduler' with instanceId 'DESKTOP-MUPIBUO1659597840649' - 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 20 threads. - Using job-store 'org.springframework.scheduling.quartz.LocalDataSourceJobStore' - which supports persistence. and is clustered. - -2022-08-04 15:24:00.663 [INFO ] org.quartz.impl.StdSchedulerFactory : Quartz scheduler 'RenrenScheduler' initialized from an externally provided properties instance. -2022-08-04 15:24:00.664 [INFO ] org.quartz.impl.StdSchedulerFactory : Quartz scheduler version: 2.3.0 -2022-08-04 15:24:00.665 [INFO ] org.quartz.core.QuartzScheduler : JobFactory set to: org.springframework.scheduling.quartz.AdaptableJobFactory@baa9ce4 -2022-08-04 15:24:01.683 [INFO ] pertySourcedRequestMappingHandlerMapping : Mapped URL path [/v2/api-docs] onto method [springfox.documentation.swagger2.web.Swagger2Controller#getDocumentation(String, HttpServletRequest)] -2022-08-04 15:24:02.134 [INFO ] o.a.coyote.http11.Http11NioProtocol : Starting ProtocolHandler ["http-nio-9200"] -2022-08-04 15:24:02.148 [INFO ] o.s.b.w.embedded.tomcat.TomcatWebServer : Tomcat started on port(s): 9200 (http) with context path '/pb' -2022-08-04 15:24:02.149 [INFO ] d.s.w.p.DocumentationPluginsBootstrapper : Context refreshed -2022-08-04 15:24:02.160 [INFO ] d.s.w.p.DocumentationPluginsBootstrapper : Found 1 custom documentation plugin(s) -2022-08-04 15:24:02.186 [INFO ] s.d.s.w.s.ApiListingReferenceScanner : Scanning for api listing references -2022-08-04 15:24:02.289 [INFO ] .d.s.w.r.o.CachingOperationNameGenerator : Generating unique operation named: userInfoUsingGET_1 -2022-08-04 15:24:02.298 [INFO ] o.s.s.quartz.SchedulerFactoryBean : Will start Quartz Scheduler [RenrenScheduler] in 30 seconds -2022-08-04 15:24:02.306 [INFO ] com.peanut.PeanutBookApplication : Started PeanutBookApplication in 6.353 seconds (JVM running for 7.279) -2022-08-04 15:24:32.298 [INFO ] o.s.s.quartz.SchedulerFactoryBean : Starting Quartz Scheduler now, after delay of 30 seconds -2022-08-04 15:24:32.360 [INFO ] o.s.s.quartz.LocalDataSourceJobStore : ClusterManager: detected 1 failed or restarted instances. -2022-08-04 15:24:32.360 [INFO ] o.s.s.quartz.LocalDataSourceJobStore : ClusterManager: Scanning for instance "DESKTOP-MUPIBUO1659597599061"'s failed in-progress jobs. -2022-08-04 15:24:32.411 [INFO ] org.quartz.core.QuartzScheduler : Scheduler RenrenScheduler_$_DESKTOP-MUPIBUO1659597840649 started. diff --git a/src/main/java/com/peanut/modules/book/service/impl/UserAddressServiceImpl.java b/src/main/java/com/peanut/modules/book/service/impl/UserAddressServiceImpl.java index 3d9eedf0..38ae73bc 100644 --- a/src/main/java/com/peanut/modules/book/service/impl/UserAddressServiceImpl.java +++ b/src/main/java/com/peanut/modules/book/service/impl/UserAddressServiceImpl.java @@ -48,6 +48,9 @@ public class UserAddressServiceImpl extends ServiceImpl countyQueryWrapper = new QueryWrapper<>(); countyQueryWrapper.eq("region_code", regionCode); County county = countyService.getOne(countyQueryWrapper); + if(county==null){ + return null; + } vo.setCounty(county.getCountyName()); String cityRegionCode; if (regionCode.startsWith("11") || regionCode.startsWith("12") || regionCode.startsWith("31") || regionCode.startsWith("50")) { diff --git a/src/main/resources/application-dev.yml b/src/main/resources/application-dev.yml index 817ddc12..043f5123 100644 --- a/src/main/resources/application-dev.yml +++ b/src/main/resources/application-dev.yml @@ -1,7 +1,4 @@ spring: - logging: - file: - path: d:log/ redis: open: false # 是否开启redis缓存 true开启 false关闭 database: 0 @@ -90,6 +87,5 @@ wxpay: privateKeyUrl: D:/hs/nuttyreading-java/src/main/resources/cent/apiclient_key.pem - redisAddress: redis://59.110.212.44:6379 redisPassword: Jgll2015 \ No newline at end of file diff --git a/src/main/resources/application-prod.yml b/src/main/resources/application-prod.yml index 424b54b4..0e363d2c 100644 --- a/src/main/resources/application-prod.yml +++ b/src/main/resources/application-prod.yml @@ -85,9 +85,7 @@ wxpay: wechatPayCertificateUrl: /usr/local/hs/peanut_book/target/classes/cent/wechatpay_7B5676E3CDF56680D0414A009CE501C844DBE2D6.pem privateKeyUrl: /usr/local/hs/peanut_book/target/classes/cent/apiclient_key.pem -logging: - file: - path: /usr/local/hs/peanut_book/logs/ + redisAddress: redis://59.110.212.44:6379 redisPassword: Jgll2015 \ No newline at end of file diff --git a/src/main/resources/application-test.yml b/src/main/resources/application-test.yml index c69a4c06..763abd26 100644 --- a/src/main/resources/application-test.yml +++ b/src/main/resources/application-test.yml @@ -86,9 +86,7 @@ wxpay: wechatPayCertificateUrl: /usr/local/hs/peanut_book/target/classes/cent/wechatpay_7B5676E3CDF56680D0414A009CE501C844DBE2D6.pem privateKeyUrl: /usr/local/hs/peanut_book/target/classes/cent/apiclient_key.pem -logging: - file: - path: /usr/local/hs/peanut_book/logs/ + redisAddress: redis://59.110.212.44:6379 redisPassword: Jgll2015 \ No newline at end of file