Browse Source

调整系统模块

master
Yen 3 years ago
parent
commit
2f08db5be9
  1. 36
      pom.xml
  2. 12
      src/main/java/com/qs/serve/controller/CommonApi.java
  3. 2
      src/main/java/com/qs/serve/modules/sys/controller/SysTenantController.java
  4. 2
      src/main/resources/application-dev.yml
  5. 2
      src/main/resources/application.yml

36
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>

12
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();
}
}

2
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
*/

2
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:

2
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

Loading…
Cancel
Save