From 41660a11fb793295d44a4d47949284105e429395 Mon Sep 17 00:00:00 2001
From: cjl <276999030@qq.com>
Date: Fri, 18 Aug 2023 14:56:42 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into cjl-230812
---
screen-api/src/main/resources/application-dev.yml | 10 ----------
screen-api/src/main/java/com/moral/api/exception/consumer/SecondDataConsumer.java | 7 +++++--
screen-api/src/main/java/com/moral/api/exception/consumer/CruiserDataConsumer.java | 6 +++---
3 files changed, 8 insertions(+), 15 deletions(-)
diff --git a/screen-api/src/main/java/com/moral/api/exception/consumer/CruiserDataConsumer.java b/screen-api/src/main/java/com/moral/api/exception/consumer/CruiserDataConsumer.java
index c2be6d5..16e3944 100644
--- a/screen-api/src/main/java/com/moral/api/exception/consumer/CruiserDataConsumer.java
+++ b/screen-api/src/main/java/com/moral/api/exception/consumer/CruiserDataConsumer.java
@@ -29,9 +29,9 @@
*/
-/*
- * ������������������������
- * *//*
+/* * ������������������������
+ **//*
+
@Component
diff --git a/screen-api/src/main/java/com/moral/api/exception/consumer/SecondDataConsumer.java b/screen-api/src/main/java/com/moral/api/exception/consumer/SecondDataConsumer.java
index 536c6f0..ba639bd 100644
--- a/screen-api/src/main/java/com/moral/api/exception/consumer/SecondDataConsumer.java
+++ b/screen-api/src/main/java/com/moral/api/exception/consumer/SecondDataConsumer.java
@@ -26,13 +26,16 @@
*/
-/**
+/*
+*
* @ClassName SecondsDataConsumer1
* @Description TODO
* @Author ���������
* @Date 2021/6/15 14:49
* @Version TODO
- **//*
+ *
+*//*
+
@Component
diff --git a/screen-api/src/main/resources/application-dev.yml b/screen-api/src/main/resources/application-dev.yml
index e8df1b7..606db00 100644
--- a/screen-api/src/main/resources/application-dev.yml
+++ b/screen-api/src/main/resources/application-dev.yml
@@ -1,15 +1,5 @@
server:
port: 8081
- tomcat:
- uri-encoding: UTF-8
- #���������������
- min-spare-threads: 500
- #���������������
- max-threads: 2500
- #���������������
- max-connections: 6500
- #������������������������
- accept-count: 1000
spring:
profiles:
active: dev
--
Gitblit v1.8.0