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

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

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

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

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

56
ruoyi-system/src/main/java/com/ruoyi/system/domain_yada/SysBaseEntity.java
View File

@ -15,61 +15,67 @@ public class SysBaseEntity implements Serializable
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;
/** 创建者 */ /** 创建者 */
private String createdBy; private String createBy;
/** 创建时间 */ /** 创建时间 */
private LocalDateTime createdTime; private LocalDateTime createTime;
/** 更新者 */ /** 更新者 */
private String updatedBy; private String updateBy;
/** 更新时间 */ /** 更新时间 */
private LocalDateTime updatedTime; private LocalDateTime updateTime;
/** 备注 */ /** 备注 */
private String remarks; private String remark;
/** 请求参数 */ /** 请求参数 */
private Map<String, Object> params; private Map<String, Object> params;
public String getCreatedBy() { public String getCreateBy()
return createdBy; {
return createBy;
} }
public void setCreatedBy(String createdBy) { public void setCreateBy(String createBy)
this.createdBy = createdBy; {
this.createBy = createBy;
} }
public LocalDateTime getCreatedTime() { public LocalDateTime getCreateTime() {
return createdTime; return createTime;
} }
public void setCreatedTime(LocalDateTime createdTime) { public void setCreateTime(LocalDateTime createTime) {
this.createdTime = createdTime; this.createTime = createTime;
} }
public String getUpdatedBy() { public String getUpdateBy()
return updatedBy; {
return updateBy;
} }
public void setUpdatedBy(String updatedBy) { public void setUpdateBy(String updateBy)
this.updatedBy = updatedBy; {
this.updateBy = updateBy;
} }
public LocalDateTime getUpdatedTime() { public LocalDateTime getUpdateTime() {
return updatedTime; return updateTime;
} }
public void setUpdatedTime(LocalDateTime updatedTime) { public void setUpdateTime(LocalDateTime updateTime) {
this.updatedTime = updatedTime; this.updateTime = updateTime;
} }
public String getRemarks() { public String getRemark()
return remarks; {
return remark;
} }
public void setRemarks(String remarks) { public void setRemark(String remark)
this.remarks = remarks; {
this.remark = remark;
} }
public Map<String, Object> getParams() public Map<String, Object> getParams()

2
ruoyi-ui/.env.development
View File

@ -5,7 +5,7 @@ VUE_APP_TITLE = 若依管理系统
ENV = 'development' ENV = 'development'
# 若依管理系统/开发环境 # 若依管理系统/开发环境
VUE_APP_BASE_API = 'http://192.168.2.105:9900' VUE_APP_BASE_API = '/dev-api'
# 路由懒加载 # 路由懒加载
VUE_CLI_BABEL_TRANSPILE_MODULES = true VUE_CLI_BABEL_TRANSPILE_MODULES = true