Mr.qian 4 өдөр өмнө
parent
commit
4ca237ab23

+ 2 - 1
operating-service/src/main/java/com/txz/operating/core/RedisUtil.java

@@ -1,5 +1,6 @@
 package com.txz.operating.core;
 
+import java.util.Arrays;
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
@@ -78,7 +79,7 @@ public class RedisUtil {
 			if(key.length==1){
 				redisTemplate.delete(key[0]);
 			}else{
-				redisTemplate.delete(CollectionUtils.arrayToList(key));
+				redisTemplate.delete(Arrays.asList(key));
 			}
 		}
 	}

+ 1 - 1
operating-service/src/main/resources/bootstrap.properties

@@ -1,7 +1,7 @@
 spring.application.name=operating
 server.port=8301
 spring.mvc.throw-exception-if-no-handler-found=true
-spring.resources.add-mappings=true
+spring.web.resources.add-mappings=true
 
 multipart.maxFileSize=50Mb
 #spring.servlet.multipart.enabled=true

+ 1 - 1
operating-service/src/main/resources/logback.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <configuration debug="false">
     <!--定义日志文件的存储地址 勿在 LogBack 的配置中使用相对路径-->
-    <property name="LOG_HOME" value="logs/operating" />
+    <property name="LOG_HOME" value="./logs/operating" />
     <!-- 控制台输出 -->
     <appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
         <encoder class="ch.qos.logback.classic.encoder.PatternLayoutEncoder">

+ 50 - 37
pom.xml

@@ -2,57 +2,70 @@
 <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>
+    <modelVersion>4.0.0</modelVersion>
     <groupId>com.txz</groupId>
     <version>1.0.0-SNAPSHOT</version>
     <parent>
         <groupId>org.springframework.boot</groupId>
         <artifactId>spring-boot-starter-parent</artifactId>
-		<version>2.0.5.RELEASE</version>
+        <version>2.7.18</version>
     </parent>
+    <properties>
+        <spring-cloud-alibaba.version>2023.0.3.3</spring-cloud-alibaba.version>
+    </properties>
 
 
     <artifactId>operating</artifactId>
     <packaging>pom</packaging>
-	<modules>
-<!--        <module>operating-interface</module>-->
+    <modules>
+        <!--        <module>operating-interface</module>-->
         <module>operating-service</module>
-		<module>operating-api</module>
+        <module>operating-api</module>
     </modules>
 
-   <dependencyManagement>
-		<dependencies>
-			<dependency>
-				<groupId>org.springframework.cloud</groupId>
-				<artifactId>spring-cloud-dependencies</artifactId>
-				<version>Finchley.SR1</version>
-				<type>pom</type>
-				<scope>import</scope>
-			</dependency>
-			<dependency>
-				<groupId>org.springframework.cloud</groupId>
-				<artifactId>spring-cloud-alibaba-dependencies</artifactId>
-				<version>0.2.2.RELEASE</version>
-				<type>pom</type>
-				<scope>import</scope>
-			</dependency>
-		</dependencies>
-	</dependencyManagement>
-	<distributionManagement>
-		<snapshotRepository>
-			<uniqueVersion>false</uniqueVersion>
-			<id>nexus-snapshots</id>
-			<name>nexus-snapshots</name>
-			<url>http://124.220.229.80:9091/repository/maven-snapshots/</url>
-			<layout>default</layout>
-		</snapshotRepository>
+    <dependencyManagement>
+        <dependencies>
+            <dependency>
+                <groupId>org.springframework.cloud</groupId>
+                <artifactId>spring-cloud-dependencies</artifactId>
+                <version>Finchley.SR1</version>
+                <type>pom</type>
+                <scope>import</scope>
+            </dependency>
+            <dependency>
+                <groupId>org.springframework.cloud</groupId>
+                <artifactId>spring-cloud-alibaba-dependencies</artifactId>
+                <version>0.2.2.RELEASE</version>
+                <type>pom</type>
+                <scope>import</scope>
+            </dependency>
+            <dependency>
+                <groupId>com.alibaba.cloud</groupId>
+                <artifactId>spring-cloud-starter-alibaba-nacos-discovery</artifactId>
+                <version>${spring-cloud-alibaba.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>com.alibaba.cloud</groupId>
+                <artifactId>spring-cloud-starter-alibaba-nacos-config</artifactId>
+                <version>${spring-cloud-alibaba.version}</version>
+            </dependency>
+        </dependencies>
+    </dependencyManagement>
+    <distributionManagement>
+        <snapshotRepository>
+            <uniqueVersion>false</uniqueVersion>
+            <id>nexus-snapshots</id>
+            <name>nexus-snapshots</name>
+            <url>http://124.220.229.80:9091/repository/maven-snapshots/</url>
+            <layout>default</layout>
+        </snapshotRepository>
 
-		<repository>
-			<id>nexus-releases</id>
-			<name>nexus-releases</name>
-			<url>http://124.220.229.80:9091/repository/maven-releases/</url>
-		</repository>
-	</distributionManagement>
+        <repository>
+            <id>nexus-releases</id>
+            <name>nexus-releases</name>
+            <url>http://124.220.229.80:9091/repository/maven-releases/</url>
+        </repository>
+    </distributionManagement>
 
 
     <build>