From 658582817139182dd45551b3323e1278b457f3f2 Mon Sep 17 00:00:00 2001
From: chenhaojie <hjchencq@isoftstone.com>
Date: Wed, 19 Jun 2024 15:43:10 +0800
Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E6=B6=A6=E9=98=B3=E9=A1=B9?=
 =?UTF-8?q?=E7=9B=AE=E5=90=8E=E7=AB=AF=E6=A1=86=E6=9E=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 das/pom.xml                            | 147 +------------------------
 das/src/main/resources/application.yml |   6 +-
 2 files changed, 4 insertions(+), 149 deletions(-)

diff --git a/das/pom.xml b/das/pom.xml
index 5dd384e7..d5d5f259 100644
--- a/das/pom.xml
+++ b/das/pom.xml
@@ -7,14 +7,13 @@
     <groupId>com.das</groupId>
     <artifactId>das</artifactId>
     <version>1.0.0-release</version>
-    <name>admin</name>
-    <description>base admin project for Spring Boot</description>
+    <name>das</name>
+    <description>base das project for Spring Boot</description>
 
     <properties>
-        <admin.project.id>admin-boot</admin.project.id>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
-        <java.version>1.8</java.version>
+        <java.version>17</java.version>
         <maven.compiler.source>1.8</maven.compiler.source>
         <maven.compiler.target>1.8</maven.compiler.target>
         <maven.plugin.version>3.8.1</maven.plugin.version>
@@ -23,13 +22,6 @@
         <bitwalker.version>1.21</bitwalker.version>
         <kaptcha.version>2.3.2</kaptcha.version>
         <fastjson.version>1.2.83</fastjson.version>
-        <oshi.version>6.1.2</oshi.version>
-        <jna.version>5.10.0</jna.version>
-        <commons.io.version>2.11.0</commons.io.version>
-        <commons.fileupload.version>1.4</commons.fileupload.version>
-        <commons.collections.version>3.2.2</commons.collections.version>
-        <poi.version>4.1.2</poi.version>
-        <jwt.version>0.9.1</jwt.version>
         <spring.boot.version>2.7.6</spring.boot.version>
         <mybatis.plus.spring.boot>3.5.2</mybatis.plus.spring.boot>
         <hutool.version>5.8.18</hutool.version>
@@ -37,18 +29,8 @@
         <!--注意这里 lombok 1.18.20 和 mapstruct 1.5.2.Final 匹配-->
         <org.mapstruct.version>1.5.2.Final</org.mapstruct.version>
         <org.projectlombok.version>1.18.20</org.projectlombok.version>
-        <swagger.knife4j.version>2.0.9</swagger.knife4j.version>
         <google.guava.version>29.0-jre</google.guava.version>
-        <velocity.engine.core.version>2.3</velocity.engine.core.version>
         <apache.commons.text>1.9</apache.commons.text>
-        <redisson.version>3.17.6</redisson.version>
-        <minio.verion>8.1.0</minio.verion>
-        <xxl-job.version>2.3.1</xxl-job.version>
-        <easyexcel.version>3.1.1</easyexcel.version>
-        <apm-toolkit-trace.version>8.11.0</apm-toolkit-trace.version>
-        <just-auth.version>1.16.3</just-auth.version>
-        <org.apache.httpclient>4.5.12</org.apache.httpclient>
-        <aliyun.dysmsapi.version>2.0.16</aliyun.dysmsapi.version>
     </properties>
 
     <!--锁定版本-->
@@ -83,11 +65,6 @@
             <artifactId>spring-boot-starter-undertow</artifactId>
         </dependency>
 
-<!--        <dependency>-->
-<!--            <groupId>org.springframework.boot</groupId>-->
-<!--            <artifactId>spring-boot-starter-security</artifactId>-->
-<!--        </dependency>-->
-
         <!--spring 配置支持-->
         <dependency>
             <groupId>org.springframework.boot</groupId>
@@ -120,26 +97,6 @@
             <version>1.34.0</version>
         </dependency>
 
-        <!--第三方认证包-->
-        <dependency>
-            <groupId>me.zhyd.oauth</groupId>
-            <artifactId>JustAuth</artifactId>
-            <version>${just-auth.version}</version>
-            <exclusions>
-                <exclusion>
-                    <artifactId>fastjson</artifactId>
-                    <groupId>com.alibaba</groupId>
-                </exclusion>
-            </exclusions>
-        </dependency>
-
-        <!--just-auth中的http工具-->
-        <dependency>
-            <groupId>org.apache.httpcomponents</groupId>
-            <artifactId>httpclient</artifactId>
-            <version>${org.apache.httpclient}</version>
-        </dependency>
-
         <!-- 验证码 -->
         <dependency>
             <groupId>com.github.penggle</groupId>
@@ -154,22 +111,6 @@
             <optional>true</optional>
         </dependency>
 
-        <dependency>
-            <groupId>org.mapstruct</groupId>
-            <artifactId>mapstruct</artifactId>
-            <version>${org.mapstruct.version}</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.mapstruct</groupId>
-            <artifactId>mapstruct-processor</artifactId>
-            <version>${org.mapstruct.version}</version>
-            <!-- IntelliJ does not pick up the processor if it is not in the dependencies.
-             There is already an open issue for IntelliJ see https://youtrack.jetbrains.com/issue/IDEA-150621
-            -->
-            <scope>provided</scope>
-        </dependency>
-
         <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-test</artifactId>
@@ -197,13 +138,6 @@
             <version>${druid.version}</version>
         </dependency>
 
-        <!--AliSms-->
-        <dependency>
-            <groupId>com.aliyun</groupId>
-            <artifactId>dysmsapi20170525</artifactId>
-            <version>${aliyun.dysmsapi.version}</version>
-        </dependency>
-
         <dependency>
             <groupId>com.alibaba</groupId>
             <artifactId>fastjson</artifactId>
@@ -230,20 +164,6 @@
             <artifactId>spring-boot-starter-validation</artifactId>
         </dependency>
 
-        <!--Swagger-->
-        <!--        <dependency>-->
-        <!--            <groupId>com.github.xiaoymin</groupId>-->
-        <!--            <artifactId>knife4j-micro-spring-boot-starter</artifactId>-->
-        <!--            <version>${swagger.knife4j.version}</version>-->
-        <!--        </dependency>-->
-
-        <!--swagger-->
-        <dependency>
-            <groupId>com.github.xiaoymin</groupId>
-            <artifactId>knife4j-spring-boot-starter</artifactId>
-            <version>${swagger.knife4j.version}</version>
-        </dependency>
-
         <!--google工具类-->
         <dependency>
             <groupId>com.google.guava</groupId>
@@ -251,20 +171,6 @@
             <version>${google.guava.version}</version>
         </dependency>
 
-        <!--代码生成器-->
-        <dependency>
-            <groupId>com.baomidou</groupId>
-            <artifactId>mybatis-plus-generator</artifactId>
-            <version>${mybatis.plus.spring.boot}</version>
-        </dependency>
-
-        <!--模板生成器 velocity-->
-        <dependency>
-            <groupId>org.apache.velocity</groupId>
-            <artifactId>velocity-engine-core</artifactId>
-            <version>${velocity.engine.core.version}</version>
-        </dependency>
-
         <!--redis 操作-->
         <dependency>
             <groupId>org.springframework.boot</groupId>
@@ -276,62 +182,15 @@
             <artifactId>commons-pool2</artifactId>
         </dependency>
 
-        <!-- redisson 实现分布式锁 -->
-        <dependency>
-            <groupId>org.redisson</groupId>
-            <artifactId>redisson</artifactId>
-            <version>${redisson.version}</version>
-        </dependency>
-
         <!--aop切面-->
         <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-aop</artifactId>
         </dependency>
 
-        <!--minio 客户端-->
-        <dependency>
-            <groupId>io.minio</groupId>
-            <artifactId>minio</artifactId>
-            <version>${minio.verion}</version>
-        </dependency>
-
-        <!--分布式定时任务-->
-        <dependency>
-            <groupId>com.xuxueli</groupId>
-            <artifactId>xxl-job-core</artifactId>
-            <version>${xxl-job.version}</version>
-        </dependency>
-
-        <!--easy-excel 表格导入导出-->
-        <dependency>
-            <groupId>com.alibaba</groupId>
-            <artifactId>easyexcel</artifactId>
-            <version>${easyexcel.version}</version>
-        </dependency>
-
-        <!--添加水印-->
-        <dependency>
-            <groupId>org.apache.poi</groupId>
-            <artifactId>ooxml-schemas</artifactId>
-            <version>1.4</version>
-        </dependency>
-
-        <!--Skywalking工具类, 版本号与服务端一致-->
-        <dependency>
-            <groupId>org.apache.skywalking</groupId>
-            <artifactId>apm-toolkit-trace</artifactId>
-            <version>${apm-toolkit-trace.version}</version>
-        </dependency>
-
-
-
-
-
     </dependencies>
 
     <build>
-        <finalName>${admin.project.id}</finalName>
         <resources>
             <resource>
                 <directory>src/main/resources</directory>
diff --git a/das/src/main/resources/application.yml b/das/src/main/resources/application.yml
index 65e70752..34129916 100644
--- a/das/src/main/resources/application.yml
+++ b/das/src/main/resources/application.yml
@@ -27,15 +27,11 @@ sa-token:
   # 是否允许同一账号多终端登录，默认为true
   is-concurrent: true
 
-# 系统信息
-admin-boot:
-  version: 1.0.0
-
 spring:
   profiles:
     active: dev
   application:
-    name: admin
+    name: das
   #json格式化全局配置,相当于@JsonFormat
   jackson:
     time-zone: GMT+8