Song/xkrs_ms
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

合并更新

Browse Source
This commit is contained in:
songjinsheng
2022-05-23 09:49:01 +08:00
parent bb6fb94038
commit f4caf10bd3
5 changed files with 64 additions and 71 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
ruoyi-admin/src/main/java/com/ruoyi/RuoYiApplication.java
View File

@ -1,6 +1,5 @@
package com.ruoyi;
import org.mybatis.spring.annotation.MapperScan;
import org.springframework.boot.SpringApplication;
import org.springframework.boot.autoconfigure.SpringBootApplication;
import org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration;
@ -10,7 +9,6 @@ import org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration;
*
* @author ruoyi
*/
@MapperScan("com.ruoyi.system.mapper_yada")
@SpringBootApplication(exclude = { DataSourceAutoConfiguration.class })
public class RuoYiApplication
{

7
ruoyi-admin/src/main/resources/application.yml
View File

@ -18,7 +18,7 @@ ruoyi:
# 开发环境配置
server:
# 服务器的HTTP端口，默认为8080
port: 9900
port: 8080
servlet:
# 应用的访问路径
context-path: /
@ -97,9 +97,9 @@ token:
# MyBatis配置
mybatis:
# 搜索指定包别名
typeAliasesPackage: com.ruoyi.**.domain,com.ruoyi.**.domain_yada
typeAliasesPackage: com.ruoyi.**.domain
# 配置mapper的扫描，找到所有的mapper.xml映射文件
mapperLocations: classpath*:mapper/**/*Mapper.xml,classpath*:mapper_yada/*Mapper.xml
mapperLocations: classpath*:mapper/**/*Mapper.xml
# 加载全局的配置文件
configLocation: classpath:mybatis/mybatis-config.xml
@ -116,7 +116,6 @@ swagger:
# 请求前缀
pathMapping: /dev-api
# 防止XSS攻击
xss:
# 过滤开关

48
ruoyi-admin/src/main/resources/banner.txt
View File

@ -1,34 +1,24 @@
Application Version: ${ruoyi.version}
Spring Boot Version: ${spring-boot.version}
////////////////////////////////////////////////////////////////////
/\
| |
| |
.' '.
| |
| |
| /\ |
.' |__|'.
| | | |
.' | | '.
/\ | \__/ | /\
| | | | | | | |
/| | |,-\ | | /-,| | |\
|| |,-' | | | | '-,| ||
||-' | | | | '-||
|\ _,-' | | | | '-,_ /|
|| ,-' _ | | | | '-, ||
||-' =(*)= | | | | '-||
|| | \ / | ||
|\________....--------\ || /--------....________/|
/| || |\
/ | || | \
/ | \/ | \
/ | | \
// .| |. \\
.' |_./ | | \._| '.
/ _.-||| |||-._ \
\__.-' \||/\||/ '-.__/
// _ooOoo_ //
// o6666666o //
// 88" . "88 //
// (| ^_^ |) //
// O\ = /O //
// ____/`---'\____ //
// .' \\| |// `. //
// / \\||| : |||// \ //
// / _||||| -:- |||||- \ //
// | | \\\ - /// | | //
// | \_| ''\---/'' | | //
// \ .-\__ `-` ___/-. / //
// ___`. .' /--.--\ `. . ___ //
// ."" '< `.___\_<|>_/___.' >'"". //
// | | : `- \`.;`\ _ /`;.`/ - ` : | | //
// \ \ `-. \_ __\ /__ _/ .-` / / //
// ========`-.____`-.___\_____/___.-`____.-'======== //
// `=---=' //
// ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ //
// 飞机保佑 永不宕机 永无BUG //
// 佛祖保佑 永不宕机 永无BUG //
////////////////////////////////////////////////////////////////////