xiatian 2 veckor sedan
förälder
incheckning
a500fb3994

+ 131 - 131
pom.xml

@@ -1,132 +1,132 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0"
-	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-	<modelVersion>4.0.0</modelVersion>
-	<groupId>yunkai-import</groupId>
-	<artifactId>yunkai-import</artifactId>
-	<version>0.0.1-SNAPSHOT</version>
-	<properties>
-		<spring-boot.version>2.3.12.RELEASE</spring-boot.version>
-		<mybatis-plus.version>3.4.3.3</mybatis-plus.version>
-		<maven-compiler-version>3.8.1</maven-compiler-version>
-		<maven-surefire-version>2.22.2</maven-surefire-version>
-		<maven.compiler.source>1.8</maven.compiler.source>
-		<maven.compiler.target>1.8</maven.compiler.target>
-		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-		<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
-		<qmth-boot-version>1.0.4</qmth-boot-version>
-	</properties>
-	<dependencies>
-		<!-- https://mvnrepository.com/artifact/com.ibm.icu/icu4j -->
-		<dependency>
-			<groupId>com.ibm.icu</groupId>
-			<artifactId>icu4j</artifactId>
-			<version>65.1</version>
-		</dependency>
-		<dependency>
-			<groupId>com.fasterxml.jackson.core</groupId>
-			<artifactId>jackson-annotations</artifactId>
-			<version>2.9.10</version>
-		</dependency>
-		<dependency>
-			<groupId>com.fasterxml.jackson.core</groupId>
-			<artifactId>jackson-core</artifactId>
-			<version>2.9.10</version>
-		</dependency>
-		<dependency>
-			<groupId>com.fasterxml.jackson.core</groupId>
-			<artifactId>jackson-databind</artifactId>
-			<version>2.9.10.3</version>
-		</dependency>
-		<dependency>
-			<groupId>com.fasterxml.jackson.dataformat</groupId>
-			<artifactId>jackson-dataformat-avro</artifactId>
-			<version>2.9.10</version>
-		</dependency>
-		<dependency>
-			<groupId>com.oracle</groupId>
-			<artifactId>ojdbc6</artifactId>
-			<version>11.2.0.3</version>
-		</dependency>
-		<dependency>
-			<groupId>mysql</groupId>
-			<artifactId>mysql-connector-java</artifactId>
-			<version>8.0.17</version>
-		</dependency>
-		<dependency>
-			<groupId>org.apache.logging.log4j</groupId>
-			<artifactId>log4j-1.2-api</artifactId>
-			<version>2.3</version>
-		</dependency>
-		<dependency>
-			<groupId>org.apache.poi</groupId>
-			<artifactId>poi</artifactId>
-			<version>3.17</version>
-		</dependency>
-		<dependency>
-			<groupId>org.apache.poi</groupId>
-			<artifactId>poi-ooxml</artifactId>
-			<version>3.17</version>
-		</dependency>
-		<dependency>
-			<groupId>com.squareup.okhttp3</groupId>
-			<artifactId>okhttp</artifactId>
-			<version>3.11.0</version>
-		</dependency>
-		<dependency>
-			<groupId>com.google.guava</groupId>
-			<artifactId>guava</artifactId>
-			<version>23.0</version>
-		</dependency>
-		<dependency>
-			<groupId>commons-io</groupId>
-			<artifactId>commons-io</artifactId>
-			<version>2.5</version>
-		</dependency>
-		<dependency>
-			<groupId>com.google.code.gson</groupId>
-			<artifactId>gson</artifactId>
-			<version>2.8.5</version>
-		</dependency>
-		<dependency>
-			<groupId>net.freeutils</groupId>
-			<artifactId>jcharset</artifactId>
-			<version>2.0</version>
-		</dependency>
-		<!-- https://mvnrepository.com/artifact/org.apache.httpcomponents/httpclient -->
-		<dependency>
-			<groupId>org.apache.httpcomponents</groupId>
-			<artifactId>httpclient</artifactId>
-			<version>4.5.10</version>
-		</dependency>
-		<dependency>
-			<groupId>org.springframework.boot</groupId>
-			<artifactId>spring-boot-starter-data-redis</artifactId>
-			<version>2.1.13.RELEASE</version>
-		</dependency>
-		<dependency>
-			<groupId>com.alibaba</groupId>
-			<artifactId>fastjson</artifactId>
-			<version>1.2.76</version>
-		</dependency>
-		<dependency>
-			<groupId>org.apache.commons</groupId>
-			<artifactId>commons-text</artifactId>
-			<version>1.9</version>
-		</dependency>
-	</dependencies>
-	<build>
-		<finalName>${project.artifactId}</finalName>
-
-		<plugins>
-			<plugin>
-				<groupId>org.springframework.boot</groupId>
-				<artifactId>spring-boot-maven-plugin</artifactId>
-				<configuration>
-					<includeSystemScope>true</includeSystemScope>
-				</configuration>
-			</plugin>
-		</plugins>
-	</build>
-
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+	<modelVersion>4.0.0</modelVersion>
+	<groupId>yunkai-import</groupId>
+	<artifactId>yunkai-import</artifactId>
+	<version>0.0.1-SNAPSHOT</version>
+	<properties>
+		<spring-boot.version>2.3.12.RELEASE</spring-boot.version>
+		<mybatis-plus.version>3.4.3.3</mybatis-plus.version>
+		<maven-compiler-version>3.8.1</maven-compiler-version>
+		<maven-surefire-version>2.22.2</maven-surefire-version>
+		<maven.compiler.source>1.8</maven.compiler.source>
+		<maven.compiler.target>1.8</maven.compiler.target>
+		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+		<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
+		<qmth-boot-version>1.0.4</qmth-boot-version>
+	</properties>
+	<dependencies>
+		<!-- https://mvnrepository.com/artifact/com.ibm.icu/icu4j -->
+		<dependency>
+			<groupId>com.ibm.icu</groupId>
+			<artifactId>icu4j</artifactId>
+			<version>65.1</version>
+		</dependency>
+		<dependency>
+			<groupId>com.fasterxml.jackson.core</groupId>
+			<artifactId>jackson-annotations</artifactId>
+			<version>2.9.10</version>
+		</dependency>
+		<dependency>
+			<groupId>com.fasterxml.jackson.core</groupId>
+			<artifactId>jackson-core</artifactId>
+			<version>2.9.10</version>
+		</dependency>
+		<dependency>
+			<groupId>com.fasterxml.jackson.core</groupId>
+			<artifactId>jackson-databind</artifactId>
+			<version>2.9.10.3</version>
+		</dependency>
+		<dependency>
+			<groupId>com.fasterxml.jackson.dataformat</groupId>
+			<artifactId>jackson-dataformat-avro</artifactId>
+			<version>2.9.10</version>
+		</dependency>
+		<dependency>
+			<groupId>com.oracle</groupId>
+			<artifactId>ojdbc6</artifactId>
+			<version>11.2.0.3</version>
+		</dependency>
+		<dependency>
+			<groupId>mysql</groupId>
+			<artifactId>mysql-connector-java</artifactId>
+			<version>8.0.17</version>
+		</dependency>
+		<dependency>
+			<groupId>org.apache.logging.log4j</groupId>
+			<artifactId>log4j-1.2-api</artifactId>
+			<version>2.3</version>
+		</dependency>
+		<dependency>
+			<groupId>org.apache.poi</groupId>
+			<artifactId>poi</artifactId>
+			<version>3.17</version>
+		</dependency>
+		<dependency>
+			<groupId>org.apache.poi</groupId>
+			<artifactId>poi-ooxml</artifactId>
+			<version>3.17</version>
+		</dependency>
+		<dependency>
+			<groupId>com.squareup.okhttp3</groupId>
+			<artifactId>okhttp</artifactId>
+			<version>3.11.0</version>
+		</dependency>
+		<dependency>
+			<groupId>com.google.guava</groupId>
+			<artifactId>guava</artifactId>
+			<version>23.0</version>
+		</dependency>
+		<dependency>
+			<groupId>commons-io</groupId>
+			<artifactId>commons-io</artifactId>
+			<version>2.5</version>
+		</dependency>
+		<dependency>
+			<groupId>com.google.code.gson</groupId>
+			<artifactId>gson</artifactId>
+			<version>2.8.5</version>
+		</dependency>
+		<dependency>
+			<groupId>net.freeutils</groupId>
+			<artifactId>jcharset</artifactId>
+			<version>2.0</version>
+		</dependency>
+		<!-- https://mvnrepository.com/artifact/org.apache.httpcomponents/httpclient -->
+		<dependency>
+			<groupId>org.apache.httpcomponents</groupId>
+			<artifactId>httpclient</artifactId>
+			<version>4.5.10</version>
+		</dependency>
+		<dependency>
+			<groupId>org.springframework.boot</groupId>
+			<artifactId>spring-boot-starter-data-redis</artifactId>
+			<version>2.1.13.RELEASE</version>
+		</dependency>
+		<dependency>
+			<groupId>com.alibaba</groupId>
+			<artifactId>fastjson</artifactId>
+			<version>1.2.76</version>
+		</dependency>
+		<dependency>
+			<groupId>org.apache.commons</groupId>
+			<artifactId>commons-text</artifactId>
+			<version>1.9</version>
+		</dependency>
+	</dependencies>
+	<build>
+		<finalName>${project.artifactId}</finalName>
+
+		<plugins>
+			<plugin>
+				<groupId>org.springframework.boot</groupId>
+				<artifactId>spring-boot-maven-plugin</artifactId>
+				<configuration>
+					<includeSystemScope>true</includeSystemScope>
+				</configuration>
+			</plugin>
+		</plugins>
+	</build>
+
 </project>

+ 7 - 7
src/main/java/cn/com/qmth/im/config/Param.java

@@ -2,21 +2,21 @@ package cn.com.qmth.im.config;
 
 public class Param {
 
-    // public static String host = "http://localhost:8008";
+    // public static String host = "http://192.168.10.39";
     //
     // public static String rootOrgId = "0";
     //
     // public static String key = "$SS:C_0_8";
     //
-    // public static String token = "fba01d80195d452192b15df9c5a281e8";
+    // public static String token = "1e7891e2de1748ad87d3eacf37eb6b5a";
 
-    public static String host = "http://192.168.1.249:8008";
+    public static String host = "http://192.168.1.70:8008";
 
-    public static String rootOrgId = "17351";
+    public static String rootOrgId = "17068";
 
-    public static String key = "$SS:C_17351_646523";
+    public static String key = "$SS:C_17068_669284";
 
-    public static String token = "5c7d0d1035a54df09abf830593bd9853";
+    public static String token = "e42da9b3831741c995332c8bb1950647";
 
-    public static String dataDir = "e:/files/yunkai/241204/";
+    public static String dataDir = "e:/files/guangkai/20250530/";
 }

+ 6 - 6
src/main/java/cn/com/qmth/im/multithread/Consumer.java

@@ -3,14 +3,14 @@ package cn.com.qmth.im.multithread;
 import java.util.ArrayList;
 import java.util.List;
 
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+import org.apache.log4j.LogManager;
+import org.apache.log4j.Logger;
 
 import cn.com.qmth.im.bean.StatusException;
 
 public abstract class Consumer<T> extends Thread {
 
-    private static final Logger LOG = LoggerFactory.getLogger(Consumer.class);
+    private static Logger logger = LogManager.getLogger(Consumer.class);
 
     private Basket basket;
 
@@ -43,11 +43,11 @@ public abstract class Consumer<T> extends Thread {
                 // }
             }
         } catch (StatusException e) {
-            LOG.error(e.getMessage(), e);
+            logger.error(e.getMessage(), e);
             addMsg(e.getMessage());
             basket.setExcuteError(true);
         } catch (Exception e) {
-            LOG.error(e.getMessage(), e);
+            logger.error(e.getMessage(), e);
             basket.setExcuteError(true);
         } finally {
             basket.countDown();
@@ -76,7 +76,7 @@ public abstract class Consumer<T> extends Thread {
     }
 
     protected void processInfo() {
-        LOG.info(basket.getTaskName() + " 处理进度" + basket.getProgress());
+        logger.info(basket.getTaskName() + " 处理进度" + basket.getProgress());
     }
 
     public List<Object> getRet() {

+ 5 - 5
src/main/java/cn/com/qmth/im/multithread/Producer.java

@@ -6,14 +6,14 @@ import java.util.List;
 import java.util.Map;
 import java.util.concurrent.atomic.AtomicInteger;
 
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+import org.apache.log4j.LogManager;
+import org.apache.log4j.Logger;
 
 import cn.com.qmth.im.bean.StatusException;
 
 public abstract class Producer<T, C extends Consumer<T>> {
 
-    private static final Logger LOG = LoggerFactory.getLogger(Producer.class);
+    private static Logger logger = LogManager.getLogger(Producer.class);
 
     private Basket basket;
 
@@ -93,12 +93,12 @@ public abstract class Producer<T, C extends Consumer<T>> {
                 throw new StatusException("处理失败,线程异常");
             }
         } catch (StatusException e) {
-            LOG.error(e.getMessage(), e);
+            logger.error(e.getMessage(), e);
             // 获取异常时发送异常结束信息
             endConsumerAsError();
             throw e;
         } catch (Exception e) {
-            LOG.error(e.getMessage(), e);
+            logger.error(e.getMessage(), e);
             // 获取异常时发送异常结束信息
             endConsumerAsError();
             throw new StatusException("处理失败", e);

+ 1 - 1
src/main/resources/log4j2.xml

@@ -23,7 +23,7 @@
 		</Logger>
 
 
-		<Root level="INFO">
+		<Root level="debug">
 			<AppenderRef ref="Console" />
 			<AppenderRef ref="DEBUG_APPERDER" />
 		</Root>