diff --git a/pom.xml b/pom.xml index d15458b17b..b58f4c4fa3 100644 --- a/pom.xml +++ b/pom.xml @@ -3,253 +3,264 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 - - com.ruoyi - ruoyi - 3.3.0 + + cn.iocoder + dashboard + 1.0.0 ruoyi http://www.ruoyi.vip 若依管理系统 - + - 3.3.0 - UTF-8 UTF-8 + UTF-8 + @ 1.8 - 3.1.1 - 1.2.2 - 1.21 - 2.9.2 - 2.3.2 - 1.3.0 - 1.2.74 - 5.3.6 - 5.6.0 - 2.5 - 1.3.3 - 4.1.2 - 1.7 - 0.9.1 + ${java.version} + ${java.version} + 3.8.0 + + 2.4.1 + + + + + + + + + + + + + + + + + + + + + + 5.1.46 + 1.2.4 + 3.4.1 + + 1.16.14 + 1.3.0.Final - + - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + org.springframework.boot spring-boot-dependencies - 2.2.12.RELEASE + ${spring.boot.version} pom import - - - - com.alibaba - druid-spring-boot-starter - ${druid.version} - - - - - eu.bitwalker - UserAgentUtils - ${bitwalker.version} - - - - - com.github.pagehelper - pagehelper-spring-boot-starter - ${pagehelper.boot.version} - - - - - com.github.oshi - oshi-core - ${oshi.version} - - - - net.java.dev.jna - jna - ${jna.version} - - - - net.java.dev.jna - jna-platform - ${jna.version} - - - - - io.springfox - springfox-swagger2 - ${swagger.version} - - - io.swagger - swagger-annotations - - - io.swagger - swagger-models - - - - - - - io.springfox - springfox-swagger-ui - ${swagger.version} - - - - - commons-io - commons-io - ${commons.io.version} - - - - - commons-fileupload - commons-fileupload - ${commons.fileupload.version} - - - - - org.apache.poi - poi-ooxml - ${poi.version} - - - - - org.apache.velocity - velocity - ${velocity.version} - - - - - com.alibaba - fastjson - ${fastjson.version} - - - - - io.jsonwebtoken - jjwt - ${jwt.version} - - - - - com.github.penggle - kaptcha - ${kaptcha.version} - - - - - com.ruoyi - ruoyi-quartz - ${ruoyi.version} - - - - - com.ruoyi - ruoyi-generator - ${ruoyi.version} - - - - - com.ruoyi - ruoyi-framework - ${ruoyi.version} - - - - - com.ruoyi - ruoyi-system - ${ruoyi.version} - - - - - com.ruoyi - ruoyi-common - ${ruoyi.version} - - - - ruoyi-admin - ruoyi-framework - ruoyi-system - ruoyi-quartz - ruoyi-generator - ruoyi-common - - pom - + + + + + + + + + jar + + + org.springframework.boot + spring-boot-starter-web + + + + + mysql + mysql-connector-java + ${mysql-connector-java.version} + + + + com.alibaba + druid-spring-boot-starter + ${druid.version} + + + + com.baomidou + mybatis-plus-boot-starter + ${mybatis-plus.version} + + + + + org.projectlombok + lombok + ${org.projectlombok.version} + + - - - org.apache.maven.plugins - maven-compiler-plugin - 3.1 - - ${java.version} - ${java.version} - ${project.build.sourceEncoding} - - - + + + + + org.apache.maven.plugins + maven-compiler-plugin + ${maven-compiler-plugin.version} + + ${java.version} + ${java.version} + + + org.mapstruct + mapstruct-processor + ${org.mapstruct.version} + + + org.projectlombok + lombok + ${org.projectlombok.version} + + + + + + + + org.springframework.boot + spring-boot-maven-plugin + + true + + + + - - - public - aliyun nexus - http://maven.aliyun.com/nexus/content/groups/public/ - - true - - - - - - - public - aliyun nexus - http://maven.aliyun.com/nexus/content/groups/public/ - - true - - - false - - - - - \ No newline at end of file + diff --git a/src/main/java/cn/iocoder/dashboard/DashboardApplication.java b/src/main/java/cn/iocoder/dashboard/DashboardApplication.java new file mode 100644 index 0000000000..3161e147a4 --- /dev/null +++ b/src/main/java/cn/iocoder/dashboard/DashboardApplication.java @@ -0,0 +1,13 @@ +package cn.iocoder.dashboard; + +import org.springframework.boot.SpringApplication; +import org.springframework.boot.autoconfigure.SpringBootApplication; + +@SpringBootApplication +public class DashboardApplication { + + public static void main(String[] args) { + SpringApplication.run(DashboardApplication.class, args); + } + +} diff --git a/src/main/java/cn/iocoder/dashboard/framework/mybatis/core/BaseDO.java b/src/main/java/cn/iocoder/dashboard/framework/mybatis/core/BaseDO.java new file mode 100644 index 0000000000..d064228cde --- /dev/null +++ b/src/main/java/cn/iocoder/dashboard/framework/mybatis/core/BaseDO.java @@ -0,0 +1,40 @@ +package cn.iocoder.dashboard.framework.mybatis.core; + +import com.baomidou.mybatisplus.annotation.TableLogic; +import lombok.Data; + +import java.io.Serializable; +import java.util.Date; + +/** + * 基础实体对象 + */ +@Data +public class BaseDO implements Serializable { + + /** + * 创建时间 + */ + private Date createTime; + /** + * 最后更新时间 + */ + private Date updateTime; + /** + * 创建者 TODO 芋艿:迁移成编号 + */ + private String createBy; + /** + * 更新者 TODO 芋艿:迁移成编号 + */ + private String updateBy; + /** + * 是否删除 + */ + @TableLogic + private Integer deleted; + +// /** 备注 */ TODO 思考下,怎么解决 +// private String remark; + +} diff --git a/src/main/java/cn/iocoder/dashboard/framework/mybatis/package-info.java b/src/main/java/cn/iocoder/dashboard/framework/mybatis/package-info.java new file mode 100644 index 0000000000..30fb75d67b --- /dev/null +++ b/src/main/java/cn/iocoder/dashboard/framework/mybatis/package-info.java @@ -0,0 +1 @@ +package cn.iocoder.dashboard.framework.mybatis; diff --git a/src/main/java/cn/iocoder/dashboard/modules/system/dal/mysql/dataobject/package-info.java b/src/main/java/cn/iocoder/dashboard/modules/system/dal/mysql/dataobject/package-info.java new file mode 100644 index 0000000000..ddbb0e6239 --- /dev/null +++ b/src/main/java/cn/iocoder/dashboard/modules/system/dal/mysql/dataobject/package-info.java @@ -0,0 +1 @@ +package cn.iocoder.dashboard.modules.system.dal.mysql.dataobject; diff --git a/src/main/java/cn/iocoder/dashboard/modules/system/dal/redis/RedisKeyContants.java b/src/main/java/cn/iocoder/dashboard/modules/system/dal/redis/RedisKeyContants.java new file mode 100644 index 0000000000..cd4a5f17cf --- /dev/null +++ b/src/main/java/cn/iocoder/dashboard/modules/system/dal/redis/RedisKeyContants.java @@ -0,0 +1,4 @@ +package cn.iocoder.dashboard.modules.system.dal.redis; + +public class RedisKeyContants { +} diff --git a/src/main/java/cn/iocoder/dashboard/modules/system/service/package-info.java b/src/main/java/cn/iocoder/dashboard/modules/system/service/package-info.java new file mode 100644 index 0000000000..09c1d9d141 --- /dev/null +++ b/src/main/java/cn/iocoder/dashboard/modules/system/service/package-info.java @@ -0,0 +1 @@ +package cn.iocoder.dashboard.modules.system.service; diff --git a/src/main/resources/application.yaml b/src/main/resources/application.yaml new file mode 100644 index 0000000000..5d3a762196 --- /dev/null +++ b/src/main/resources/application.yaml @@ -0,0 +1,7 @@ +spring: + # 数据源配置项 + datasource: + url: jdbc:mysql://127.0.1:3306/ruoyi-vue-pro?useSSL=false&useUnicode=true&characterEncoding=UTF-8&serverTimezone=CTT + driver-class-name: com.mysql.jdbc.Driver + username: root + password: 123456