From f4caf10bd3b2ffb1ef4bcaed0c56f187ed16f2bc Mon Sep 17 00:00:00 2001 From: songjinsheng Date: Mon, 23 May 2022 09:49:01 +0800 Subject: [PATCH] =?UTF-8?q?=E5=90=88=E5=B9=B6=E6=9B=B4=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/ruoyi/RuoYiApplication.java | 2 - .../src/main/resources/application.yml | 7 +-- ruoyi-admin/src/main/resources/banner.txt | 48 +++++++--------- .../system/domain_yada/SysBaseEntity.java | 56 ++++++++++--------- ruoyi-ui/.env.development | 22 ++++---- 5 files changed, 64 insertions(+), 71 deletions(-) diff --git a/ruoyi-admin/src/main/java/com/ruoyi/RuoYiApplication.java b/ruoyi-admin/src/main/java/com/ruoyi/RuoYiApplication.java index 01606a4d8..9639bc9c3 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/RuoYiApplication.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/RuoYiApplication.java @@ -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 { diff --git a/ruoyi-admin/src/main/resources/application.yml b/ruoyi-admin/src/main/resources/application.yml index a65a211fe..eda7f36e9 100644 --- a/ruoyi-admin/src/main/resources/application.yml +++ b/ruoyi-admin/src/main/resources/application.yml @@ -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: # 过滤开关 diff --git a/ruoyi-admin/src/main/resources/banner.txt b/ruoyi-admin/src/main/resources/banner.txt index 8e65fd3ab..a02645ec3 100644 --- a/ruoyi-admin/src/main/resources/banner.txt +++ b/ruoyi-admin/src/main/resources/banner.txt @@ -1,34 +1,24 @@ Application Version: ${ruoyi.version} Spring Boot Version: ${spring-boot.version} //////////////////////////////////////////////////////////////////// - /\ - | | - | | - .' '. - | | - | | - | /\ | - .' |__|'. - | | | | - .' | | '. - /\ | \__/ | /\ - | | | | | | | | - /| | |,-\ | | /-,| | |\ - || |,-' | | | | '-,| || - ||-' | | | | '-|| -|\ _,-' | | | | '-,_ /| -|| ,-' _ | | | | '-, || -||-' =(*)= | | | | '-|| -|| | \ / | || -|\________....--------\ || /--------....________/| - /| || |\ - / | || | \ - / | \/ | \ - / | | \ - // .| |. \\ - .' |_./ | | \._| '. - / _.-||| |||-._ \ - \__.-' \||/\||/ '-.__/ +// _ooOoo_ // +// o6666666o // +// 88" . "88 // +// (| ^_^ |) // +// O\ = /O // +// ____/`---'\____ // +// .' \\| |// `. // +// / \\||| : |||// \ // +// / _||||| -:- |||||- \ // +// | | \\\ - /// | | // +// | \_| ''\---/'' | | // +// \ .-\__ `-` ___/-. / // +// ___`. .' /--.--\ `. . ___ // +// ."" '< `.___\_<|>_/___.' >'"". // +// | | : `- \`.;`\ _ /`;.`/ - ` : | | // +// \ \ `-. \_ __\ /__ _/ .-` / / // +// ========`-.____`-.___\_____/___.-`____.-'======== // +// `=---=' // // ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ // -// 飞机保佑 永不宕机 永无BUG // +// 佛祖保佑 永不宕机 永无BUG // //////////////////////////////////////////////////////////////////// \ No newline at end of file diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/domain_yada/SysBaseEntity.java b/ruoyi-system/src/main/java/com/ruoyi/system/domain_yada/SysBaseEntity.java index 527685c9c..bdef7faee 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/domain_yada/SysBaseEntity.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/domain_yada/SysBaseEntity.java @@ -15,61 +15,67 @@ public class SysBaseEntity implements Serializable 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 params; - public String getCreatedBy() { - return createdBy; + public String getCreateBy() + { + return createBy; } - public void setCreatedBy(String createdBy) { - this.createdBy = createdBy; + public void setCreateBy(String createBy) + { + this.createBy = createBy; } - public LocalDateTime getCreatedTime() { - return createdTime; + public LocalDateTime getCreateTime() { + return createTime; } - public void setCreatedTime(LocalDateTime createdTime) { - this.createdTime = createdTime; + public void setCreateTime(LocalDateTime createTime) { + this.createTime = createTime; } - public String getUpdatedBy() { - return updatedBy; + public String getUpdateBy() + { + return updateBy; } - public void setUpdatedBy(String updatedBy) { - this.updatedBy = updatedBy; + public void setUpdateBy(String updateBy) + { + this.updateBy = updateBy; } - public LocalDateTime getUpdatedTime() { - return updatedTime; + public LocalDateTime getUpdateTime() { + return updateTime; } - public void setUpdatedTime(LocalDateTime updatedTime) { - this.updatedTime = updatedTime; + public void setUpdateTime(LocalDateTime updateTime) { + this.updateTime = updateTime; } - public String getRemarks() { - return remarks; + public String getRemark() + { + return remark; } - public void setRemarks(String remarks) { - this.remarks = remarks; + public void setRemark(String remark) + { + this.remark = remark; } public Map getParams() diff --git a/ruoyi-ui/.env.development b/ruoyi-ui/.env.development index 6f3363e21..302ecd1ab 100644 --- a/ruoyi-ui/.env.development +++ b/ruoyi-ui/.env.development @@ -1,11 +1,11 @@ -# 页面标题 -VUE_APP_TITLE = 若依管理系统 - -# 开发环境配置 -ENV = 'development' - -# 若依管理系统/开发环境 -VUE_APP_BASE_API = 'http://192.168.2.105:9900' - -# 路由懒加载 -VUE_CLI_BABEL_TRANSPILE_MODULES = true +# 页面标题 +VUE_APP_TITLE = 若依管理系统 + +# 开发环境配置 +ENV = 'development' + +# 若依管理系统/开发环境 +VUE_APP_BASE_API = '/dev-api' + +# 路由懒加载 +VUE_CLI_BABEL_TRANSPILE_MODULES = true