From 2f08db5be957210179b3aa620d56add350d52bdc Mon Sep 17 00:00:00 2001
From: Yen <yen1130@qq.com>
Date: Thu, 28 Jul 2022 17:08:55 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4=E7=B3=BB=E7=BB=9F=E6=A8=A1?=
 =?UTF-8?q?=E5=9D=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pom.xml                                       | 36 +++++--------------
 .../com/qs/serve/controller/CommonApi.java    | 12 -------
 .../sys/controller/SysTenantController.java   |  2 +-
 src/main/resources/application-dev.yml        |  2 +-
 src/main/resources/application.yml            |  2 +-
 5 files changed, 12 insertions(+), 42 deletions(-)

diff --git a/pom.xml b/pom.xml
index 1011bcc..68a0dc4 100644
--- a/pom.xml
+++ b/pom.xml
@@ -19,7 +19,6 @@
         <maven.compiler.source>8</maven.compiler.source>
         <maven.compiler.target>8</maven.compiler.target>
         <xxlJob.version>2.3.0</xxlJob.version>
-        <!-- HuTool 工 具 类 -->
         <hutool.version>5.7.19</hutool.version>
         <jwt.version>3.10.3</jwt.version>
         <httpclient.version>4.5.7</httpclient.version>
@@ -32,14 +31,12 @@
 
     <dependencies>
 
-        <!-- 常 用 工 具 类 -->
         <dependency>
             <groupId>cn.hutool</groupId>
             <artifactId>hutool-all</artifactId>
             <version>${hutool.version}</version>
         </dependency>
 
-        <!-- Starter -->
         <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter</artifactId>
@@ -51,7 +48,6 @@
             </exclusions>
         </dependency>
 
-        <!-- Web -->
         <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-web</artifactId>
@@ -63,20 +59,16 @@
             </exclusions>
         </dependency>
 
-        <!-- undertow -->
         <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-undertow</artifactId>
         </dependency>
 
-        <!-- Redis -->
         <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-data-redis</artifactId>
         </dependency>
 
-
-        <!-- Security -->
         <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-security</artifactId>
@@ -88,40 +80,27 @@
             </exclusions>
         </dependency>
 
-        <!-- AOP -->
         <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-aop</artifactId>
-            <exclusions>
-                <exclusion>
-                    <groupId>org.springframework.boot</groupId>
-                    <artifactId>spring-boot-starter-logging</artifactId>
-                </exclusion>
-            </exclusions>
         </dependency>
 
-
-
-        <!--hibernate-validator-->
         <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-validation</artifactId>
         </dependency>
 
-        <!-- JWT -->
         <dependency>
             <groupId>com.auth0</groupId>
             <artifactId>java-jwt</artifactId>
             <version>${jwt.version}</version>
         </dependency>
 
-        <!-- Log4J2 -->
         <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-log4j2</artifactId>
         </dependency>
 
-        <!-- FastJson -->
         <dependency>
             <groupId>com.alibaba</groupId>
             <artifactId>fastjson</artifactId>
@@ -152,13 +131,13 @@
             <artifactId>mybatis-plus-boot-starter</artifactId>
             <version>${mybatis-plus.version}</version>
         </dependency>
-        <!--Mysql数据库驱动-->
+
         <dependency>
             <groupId>mysql</groupId>
             <artifactId>mysql-connector-java</artifactId>
             <version>8.0.15</version>
         </dependency>
-        <!-- lombok -->
+
         <dependency>
             <groupId>org.projectlombok</groupId>
             <artifactId>lombok</artifactId>
@@ -172,16 +151,12 @@
             <version>3.12.0</version>
         </dependency>
 
-        <!-- 公众号（包括订阅号和服务号） -->
         <dependency>
             <groupId>com.github.binarywang</groupId>
             <artifactId>weixin-java-mp</artifactId>
             <version>${wx.java.version}</version>
         </dependency>
 
-
-
-        <!-- Spring-test -->
         <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-test</artifactId>
@@ -195,6 +170,13 @@
             <scope>test</scope>
         </dependency>
 
+        <dependency>
+            <groupId>com.github.shalousun</groupId>
+            <artifactId>smart-doc</artifactId>
+            <version>2.4.0</version>
+            <scope>test</scope>
+        </dependency>
+
     </dependencies>
 
     <build>
diff --git a/src/main/java/com/qs/serve/controller/CommonApi.java b/src/main/java/com/qs/serve/controller/CommonApi.java
index 240c085..f3582fb 100644
--- a/src/main/java/com/qs/serve/controller/CommonApi.java
+++ b/src/main/java/com/qs/serve/controller/CommonApi.java
@@ -21,18 +21,6 @@ import javax.servlet.http.HttpServletResponse;
 @RequestMapping("/api/common")
 public class CommonApi {
 
-    /**
-     * 下载excel模板
-     * @param fileName [新数据招生模板,更新数据招生模板]
-     * @return x
-     */
-    @GetMapping("/downloadExl/{fileName}")
-    public R downloadExl(@PathVariable("fileName") String fileName, HttpServletResponse response) {
-        // 获取资源中的模板文件
-
-        return R.ok();
-    }
-
 
 
 }
diff --git a/src/main/java/com/qs/serve/modules/sys/controller/SysTenantController.java b/src/main/java/com/qs/serve/modules/sys/controller/SysTenantController.java
index 5bfb2ef..eef8ddd 100644
--- a/src/main/java/com/qs/serve/modules/sys/controller/SysTenantController.java
+++ b/src/main/java/com/qs/serve/modules/sys/controller/SysTenantController.java
@@ -15,7 +15,7 @@ import javax.validation.Valid;
 import java.util.List;
 
 /**
- * 系统：校区
+ * 系统：租户
  * @author YenHex
  * @since 2022-03-01
  */
diff --git a/src/main/resources/application-dev.yml b/src/main/resources/application-dev.yml
index 6c8f4da..649ded2 100644
--- a/src/main/resources/application-dev.yml
+++ b/src/main/resources/application-dev.yml
@@ -8,7 +8,7 @@ spring:
   datasource:
     driver-class-name: com.mysql.cj.jdbc.Driver
     #url: jdbc:mysql://192.168.0.9:3306/gy_oa_qs?useUnicode=true&characterEncoding=utf-8&serverTimezone=Asia/Shanghai
-    url: jdbc:mysql://192.168.0.9:3306/gy_oa_qs_dev?useUnicode=true&characterEncoding=utf-8&serverTimezone=Asia/Shanghai&allowPublicKeyRetrieval=true
+    url: jdbc:mysql://192.168.0.9:3333/qs-base?useUnicode=true&characterEncoding=utf-8&serverTimezone=Asia/Shanghai&allowPublicKeyRetrieval=true
     username: root
     password: 123456
   redis:
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index 1d4b4b1..2ff62e7 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -45,7 +45,7 @@ mybatis-plus:
 logging:
   level:
     ROOT: info
-    com.qs.gyoa.modules: debug
+    com.qs.serve.modules: debug
     org.xnio.nio: info
     org.springframework: info
     com.baomidou: info