diff --git a/logs/JIAL-ss.log b/logs/JIAL-ss.log index 0a84f9b..d06afec 100644 --- a/logs/JIAL-ss.log +++ b/logs/JIAL-ss.log @@ -540,6 +540,7 @@ Caused by: org.springframework.context.annotation.ConflictingBeanDefinitionExcep 2024-02-26 09:08:12.703 INFO 4784 --- [http-nio-3333-exec-9] com.JN.filter.LoginCheckFilter : 本次请求/plugins/axios/axios.min.map不需要处理 2024-02-26 09:08:12.739 INFO 4784 --- [http-nio-3333-exec-10] com.JN.filter.LoginCheckFilter : 拦截到请求：/zmquotation/inventoryList 2024-02-26 09:08:12.739 INFO 4784 --- [http-nio-3333-exec-10] com.JN.filter.LoginCheckFilter : 本次请求/zmquotation/inventoryList不需要处理 +<<<<<<< HEAD 2024-02-26 09:12:12.019 INFO 11140 --- [main] com.JN.JNApplication : Starting JNApplication using Java 1.8.0_171 on xudong with PID 11140 (E:\myproject\JNDemo\target\classes started by Administrator in E:\myproject\JNDemo) 2024-02-26 09:12:12.021 INFO 11140 --- [main] com.JN.JNApplication : The following profiles are active: ZM 2024-02-26 09:12:13.751 WARN 11140 --- [Druid-ConnectionPool-Create-999699153] c.m.s.jdbc.internals.TDS.Channel : TLSv1 was negotiated. Please update server and client to use TLSv1.2 at minimum. @@ -561,3 +562,29 @@ Caused by: org.springframework.context.annotation.ConflictingBeanDefinitionExcep 2024-02-26 09:12:30.447 INFO 11140 --- [http-nio-3333-exec-9] com.JN.filter.LoginCheckFilter : 拦截到请求：/zmquotation/regionList 2024-02-26 09:12:30.447 INFO 11140 --- [http-nio-3333-exec-9] com.JN.filter.LoginCheckFilter : 本次请求/zmquotation/regionList不需要处理 2024-02-26 09:12:30.650 INFO 11140 --- [http-nio-3333-exec-9] c.J.d.z.controller.ZMController : 查询到的地区列表结果是：[RegionDto(province=江苏省, city=无锡市, district=滨湖区, kilometers=86, price01=1.4600, price02=1.4600, price03=1.4600, price04=1.4600, price05=1.4600), RegionDto(province=江苏省, city=无锡市, district=惠山区, kilometers=76, price01=1.4600, price02=1.4600, price03=1.4600, price04=1.4600, price05=1.4600), RegionDto(province=江苏省, city=无锡市, district=梁溪区, kilometers=75, price01=1.4600, price02=1.4600, price03=1.4600, price04=1.4600, price05=1.4600), RegionDto(province=江苏省, city=无锡市, district=锡山区, kilometers=79, price01=1.4600, price02=1.4600, price03=1.4600, price04=1.4600, price05=1.4600), RegionDto(province=江苏省, city=无锡市, district=新吴区, kilometers=91, price01=1.4600, price02=1.4600, price03=1.4600, price04=1.4600, price05=1.4600)] +======= +2024-02-26 09:11:21.327 INFO 6236 --- [main] com.JN.JNApplication : Starting JNApplication using Java 1.8.0_171 on DESKTOP-OG1MRMC with PID 6236 (D:\JavaProject\JNDemo\target\classes started by Administrator in D:\JavaProject\JNDemo) +2024-02-26 09:11:21.343 INFO 6236 --- [main] com.JN.JNApplication : The following profiles are active: ZM +2024-02-26 09:11:23.326 WARN 6236 --- [Druid-ConnectionPool-Create-162320368] c.m.s.jdbc.internals.TDS.Channel : TLSv1 was negotiated. Please update server and client to use TLSv1.2 at minimum. +2024-02-26 09:11:24.550 INFO 6236 --- [main] com.JN.config.WebMvcConfig : 扩展消息转换器... +2024-02-26 09:11:24.566 INFO 6236 --- [main] com.JN.config.WebMvcConfig : 开始进行静态资源映射... +2024-02-26 09:11:24.691 WARN 6236 --- [main] 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 +2024-02-26 09:11:24.941 INFO 6236 --- [main] com.JN.JNApplication : Started JNApplication in 4.017 seconds (JVM running for 4.98) +2024-02-26 09:11:24.941 INFO 6236 --- [main] com.JN.JNApplication : 项目启动成功... +2024-02-26 09:11:46.097 INFO 6236 --- [http-nio-3333-exec-2] com.JN.filter.LoginCheckFilter : 拦截到请求：/JN +2024-02-26 09:11:46.099 INFO 6236 --- [http-nio-3333-exec-2] com.JN.filter.LoginCheckFilter : 本次请求/JN不需要处理 +2024-02-26 09:11:46.173 INFO 6236 --- [http-nio-3333-exec-1] com.JN.filter.LoginCheckFilter : 拦截到请求：/JN +2024-02-26 09:11:46.173 INFO 6236 --- [http-nio-3333-exec-1] com.JN.filter.LoginCheckFilter : 本次请求/JN不需要处理 +2024-02-26 09:11:46.325 INFO 6236 --- [http-nio-3333-exec-3] com.JN.filter.LoginCheckFilter : 拦截到请求：/JN +2024-02-26 09:11:46.325 INFO 6236 --- [http-nio-3333-exec-3] com.JN.filter.LoginCheckFilter : 本次请求/JN不需要处理 +2024-02-26 09:11:46.421 INFO 6236 --- [http-nio-3333-exec-8] com.JN.filter.LoginCheckFilter : 拦截到请求：/static/jnquotation/js/index.js +2024-02-26 09:11:46.421 INFO 6236 --- [http-nio-3333-exec-8] com.JN.filter.LoginCheckFilter : 本次请求/static/jnquotation/js/index.js不需要处理 +2024-02-26 09:11:46.422 INFO 6236 --- [http-nio-3333-exec-5] com.JN.filter.LoginCheckFilter : 拦截到请求：/static/jnquotation/css/index.css +2024-02-26 09:11:46.422 INFO 6236 --- [http-nio-3333-exec-5] com.JN.filter.LoginCheckFilter : 本次请求/static/jnquotation/css/index.css不需要处理 +2024-02-26 09:11:46.652 INFO 6236 --- [http-nio-3333-exec-6] com.JN.filter.LoginCheckFilter : 拦截到请求：/plugins/calendar/js-calendar-converter.js.map +2024-02-26 09:11:46.652 INFO 6236 --- [http-nio-3333-exec-6] com.JN.filter.LoginCheckFilter : 本次请求/plugins/calendar/js-calendar-converter.js.map不需要处理 +2024-02-26 09:11:46.659 INFO 6236 --- [http-nio-3333-exec-7] com.JN.filter.LoginCheckFilter : 拦截到请求：/plugins/axios/axios.min.map +2024-02-26 09:11:46.660 INFO 6236 --- [http-nio-3333-exec-7] com.JN.filter.LoginCheckFilter : 本次请求/plugins/axios/axios.min.map不需要处理 +2024-02-26 09:11:46.721 INFO 6236 --- [http-nio-3333-exec-4] com.JN.filter.LoginCheckFilter : 拦截到请求：/zmquotation/inventoryList +2024-02-26 09:11:46.721 INFO 6236 --- [http-nio-3333-exec-4] com.JN.filter.LoginCheckFilter : 本次请求/zmquotation/inventoryList不需要处理 +>>>>>>> 21fb65c83fe6bc738a699e566d5691cb441ad751 diff --git a/src/main/resources/application-JN.yml b/src/main/resources/application-JN.yml index e6e83f0..9bdbd98 100644 --- a/src/main/resources/application-JN.yml +++ b/src/main/resources/application-JN.yml @@ -35,8 +35,8 @@ logging: level: root: warn com.JN: info - file: - name: logs/JIAL-ss.log +# file: +# name: logs/JIAL-ss.log mybatis-plus: configuration: diff --git a/src/main/resources/application-ZM.yml b/src/main/resources/application-ZM.yml index 61f8c6b..a8a356f 100644 --- a/src/main/resources/application-ZM.yml +++ b/src/main/resources/application-ZM.yml @@ -30,8 +30,8 @@ logging: level: root: warn com.JN: info - file: - name: logs/JIAL-ss.log +# file: +# name: logs/JIAL-ss.log mybatis-plus: configuration: diff --git a/target/classes/application-JN.yml b/target/classes/application-JN.yml index e6e83f0..9bdbd98 100644 --- a/target/classes/application-JN.yml +++ b/target/classes/application-JN.yml @@ -35,8 +35,8 @@ logging: level: root: warn com.JN: info - file: - name: logs/JIAL-ss.log +# file: +# name: logs/JIAL-ss.log mybatis-plus: configuration: diff --git a/target/classes/application-ZM.yml b/target/classes/application-ZM.yml index 61f8c6b..a8a356f 100644 --- a/target/classes/application-ZM.yml +++ b/target/classes/application-ZM.yml @@ -30,8 +30,8 @@ logging: level: root: warn com.JN: info - file: - name: logs/JIAL-ss.log +# file: +# name: logs/JIAL-ss.log mybatis-plus: configuration: