pom更新

.gitignore

@@ -1,7 +1,6 @@
 # ---> Java
 *.class
 target
-
 /*/target/
 
 # Mobile Tools for Java (J2ME)
@@ -25,6 +24,8 @@ hs_err_pid*
 .vscode
 
 ### logs目录 ###
-logs
+logs/
+target/
+
 
-/.idea/
+/.idea/

pom.xml

@@ -13,9 +13,9 @@
     <description>slope-manage-service微服务系统</description>
 
     <modules>
-        <module>slope-modules</module>
         <module>slope-common</module>
-        <module>slope-modules-api</module>
+        <module>slope-modules</module>
+        <!--        <module>slope-modules-api</module>-->
     </modules>
     <packaging>pom</packaging>
 
@@ -39,13 +39,13 @@
         <cglib.version>3.3.0</cglib.version>
         <commons-io.version>2.11.0</commons-io.version>
         <alicloud-sms.version>2.2.0.RELEASE</alicloud-sms.version>
+        <oss.version>2.2.0.RELEASE</oss.version>
         <sentinel-csp.version>1.8.6</sentinel-csp.version>
         <nacos-client.version>2.2.1</nacos-client.version>
         <hutool.version>5.8.18</hutool.version>
         <mybatis-plus.version>3.5.3.1</mybatis-plus.version>
         <dynamic-datasource.version>3.6.1</dynamic-datasource.version>
         <latest.release.version>5.2.0</latest.release.version>
-        <tdengine.version>3.2.5</tdengine.version>
         <pagehelper.version>5.3.2</pagehelper.version>
         <pagehelper-spring-boot-starter.version>1.4.7</pagehelper-spring-boot-starter.version>
         <junit.version>4.13.2</junit.version>
@@ -138,10 +138,10 @@
             </dependency>
 
             <!--处理序列化问题-->
-<!--            <dependency>-->
-<!--                <groupId>com.caucho</groupId>-->
-<!--                <artifactId>hessian</artifactId>-->
-<!--            </dependency>-->
+            <dependency>
+                <groupId>com.caucho</groupId>
+                <artifactId>hessian</artifactId>
+            </dependency>
 
             <!--reids操作-->
             <dependency>
@@ -190,6 +190,20 @@
                 <version>${alicloud-sms.version}</version>
             </dependency>
 
+            <!--alibaba oss-->
+            <dependency>
+                <groupId>com.alibaba.cloud</groupId>
+                <artifactId>spring-cloud-starter-alicloud-oss</artifactId>
+                <version>${oss.version}</version>
+            </dependency>
+
+            <!-- Sentinel Datasource Nacos 持久化存储-->
+            <dependency>
+                <groupId>com.alibaba.csp</groupId>
+                <artifactId>sentinel-datasource-nacos</artifactId>
+                <version>${sentinel-csp.version}</version>
+            </dependency>
+
             <!--nacos-->
             <dependency>
                 <groupId>com.alibaba.nacos</groupId>
@@ -197,6 +211,14 @@
                 <version>${nacos-client.version}</version>
             </dependency>
 
+
+            <!-- 上面排除掉了springcloud默认seata版本，此处引入和seata-server版本对应的seata包-->
+            <dependency>
+                <groupId>io.seata</groupId>
+                <artifactId>seata-spring-boot-starter</artifactId>
+                <version>1.6.1</version>
+            </dependency>
+
             <!--jdk9+ 以上需要手动添加 JAXB能够使用Jackson对JAXB注解-->
             <dependency>
                 <groupId>javax.xml.bind</groupId>
@@ -222,19 +244,16 @@
                 <artifactId>mybatis-plus-boot-starter</artifactId>
                 <version>${mybatis-plus.version}</version>
             </dependency>
-
             <dependency>
                 <groupId>com.baomidou</groupId>
                 <artifactId>mybatis-plus-annotation</artifactId>
                 <version>${mybatis-plus.version}</version>
             </dependency>
-
             <dependency>
                 <groupId>com.baomidou</groupId>
                 <artifactId>mybatis-plus-extension</artifactId>
                 <version>${mybatis-plus.version}</version>
             </dependency>
-
             <!--多数据源-->
             <dependency>
                 <groupId>com.baomidou</groupId>
@@ -248,12 +267,6 @@
                 <artifactId>shardingsphere-jdbc-core-spring-boot-starter</artifactId>
                 <version>${latest.release.version}</version>
             </dependency>
-            <!--tdengine-->
-            <dependency>
-                <groupId>com.taosdata.jdbc</groupId>
-                <artifactId>taos-jdbcdriver</artifactId>
-                <version>${tdengine.version}</version>
-            </dependency>
 
             <!--分页-->
             <dependency>
@@ -261,13 +274,11 @@
                 <artifactId>pagehelper</artifactId>
                 <version>${pagehelper.version}</version>
             </dependency>
-
             <dependency>
                 <groupId>com.github.pagehelper</groupId>
                 <artifactId>pagehelper-spring-boot-autoconfigure</artifactId>
                 <version>${pagehelper-spring-boot-starter.version}</version>
             </dependency>
-
             <dependency>
                 <groupId>com.github.pagehelper</groupId>
                 <artifactId>pagehelper-spring-boot-starter</artifactId>
@@ -309,6 +320,12 @@
                 <version>${xxljob.version}</version>
             </dependency>
 
+            <!--<dependency>
+                <groupId>org.aspectj</groupId>
+                <artifactId>aspectjweaver</artifactId>
+                <version>1.9.19</version>
+            </dependency>-->
+
             <dependency>
                 <groupId>org.bouncycastle</groupId>
                 <artifactId>bcprov-jdk18on</artifactId>
@@ -323,7 +340,7 @@
             <properties>
                 <profiles.active>dev</profiles.active>
                 <nacos.server>10.10.10.230:8848</nacos.server>
-                <nacos.namespace>slope-manage-service</nacos.namespace>
+                <nacos.namespace>sckw-service-platform-dev</nacos.namespace>
             </properties>
         </profile>
         <!--测试环境-->
@@ -332,7 +349,7 @@
             <properties>
                 <profiles.active>test</profiles.active>
                 <nacos.server>10.10.10.224:8848</nacos.server>
-                <nacos.namespace>slope-manage-service</nacos.namespace>
+                <nacos.namespace>sckw-service-platform</nacos.namespace>
             </properties>
         </profile>
         <!--生产环境-->
@@ -341,7 +358,7 @@
             <properties>
                 <profiles.active>prod</profiles.active>
                 <nacos.server>172.16.156.151:8848</nacos.server>
-                <nacos.namespace>slope-manage-service</nacos.namespace>
+                <nacos.namespace>sckw-service-platform</nacos.namespace>
             </properties>
         </profile>
     </profiles>

slope-modules/pom.xml

@@ -2,29 +2,19 @@
 <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>
     <parent>
-        <artifactId>slope-manage-service</artifactId>
         <groupId>com.sckw</groupId>
+        <artifactId>slope-manage-service</artifactId>
         <version>1.0.0</version>
     </parent>
-    <dependencies>
-        <dependency>
-            <groupId>org.springframework</groupId>
-            <artifactId>spring-web</artifactId>
-        </dependency>
-    </dependencies>
-    <modelVersion>4.0.0</modelVersion>
 
     <artifactId>slope-modules</artifactId>
     <packaging>pom</packaging>
-
-    <modules>
-        <module>slope-detection</module>
-    </modules>
-
     <properties>
         <maven.compiler.source>17</maven.compiler.source>
         <maven.compiler.target>17</maven.compiler.target>
+        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     </properties>
 
 </project>

slope-modules/slope-detection/pom.xml

@@ -44,56 +44,14 @@
             <version>1.0.0</version>
         </dependency>
 
-        <dependency>
-            <groupId>com.sckw</groupId>
-            <artifactId>slope-common-redis</artifactId>
-            <version>1.0.0</version>
-        </dependency>
-
-        <dependency>
-            <groupId>com.sckw</groupId>
-            <artifactId>slope-common-excel</artifactId>
-            <version>1.0.0</version>
-        </dependency>
-
         <dependency>
             <groupId>com.sckw</groupId>
             <artifactId>slope-common-tdengine</artifactId>
             <version>1.0.0</version>
         </dependency>
-
-        <!-- validation -->
-        <dependency>
-            <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-starter-validation</artifactId>
-        </dependency>
-
         <dependency>
-            <groupId>com.sckw</groupId>
-            <artifactId>slope-common-log</artifactId>
-            <version>1.0.0</version>
+            <groupId>org.springframework</groupId>
+            <artifactId>spring-web</artifactId>
         </dependency>
     </dependencies>
-
-    <!--在build中配置resources,来防止我们资源导出失败的问题-->
-    <build>
-        <resources>
-            <resource>
-                <directory>src/main/resources</directory>
-                <includes>
-                    <include>**/*.properties</include>
-                    <include>**/*.xml</include>
-                </includes>
-                <filtering>true</filtering>
-            </resource>
-            <resource>
-                <directory>src/main/java</directory>
-                <includes>
-                    <include>**/*.properties</include>
-                    <include>**/*.xml</include>
-                </includes>
-                <filtering>true</filtering>
-            </resource>
-        </resources>
-    </build>
 </project>

slope-modules/slope-detection/src/main/resources/bootstrap-dev.yml

@@ -1,4 +1,6 @@
 spring:
+  application:
+    name: slope-detection
   cloud:
     nacos:
       discovery:

slope-modules/slope-detection/src/main/resources/bootstrap.yml

@@ -3,7 +3,7 @@ server:
 
 spring:
   application:
-    name: sckw-slope
+    name: slope-detection
 #    name: slope-detection
   profiles:
     active: dev