BJ_ZTEITS-Developers / parking-cloud-yudao

Commit f574eec4ba0574e80239c49e0c8080f62cad9b19

Authored by YunaiV
1 parent 01873447

合并成单 module 的初始化 

使用 spring boot 2.4.1 启动项目
Inline Side-by-side
Showing 8 changed files with 299 additions and 221 deletions
... ... @@ -3,253 +3,264 @@
3 3 xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
4 4 xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
5 5 <modelVersion>4.0.0</modelVersion>
6   -
7   - <groupId>com.ruoyi</groupId>
8   - <artifactId>ruoyi</artifactId>
9   - <version>3.3.0</version>
  6 +
  7 + <groupId>cn.iocoder</groupId>
  8 + <artifactId>dashboard</artifactId>
  9 + <version>1.0.0</version>
10 10  
11 11 <name>ruoyi</name>
12 12 <url>http://www.ruoyi.vip</url>
13 13 <description>若依管理系统</description>
14   -
  14 +
15 15 <properties>
16   - <ruoyi.version>3.3.0</ruoyi.version>
17   - <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
18 16 <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
  17 + <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
  18 + <resource.delimiter>@</resource.delimiter>
19 19 <java.version>1.8</java.version>
20   - <maven-jar-plugin.version>3.1.1</maven-jar-plugin.version>
21   - <druid.version>1.2.2</druid.version>
22   - <bitwalker.version>1.21</bitwalker.version>
23   - <swagger.version>2.9.2</swagger.version>
24   - <kaptcha.version>2.3.2</kaptcha.version>
25   - <pagehelper.boot.version>1.3.0</pagehelper.boot.version>
26   - <fastjson.version>1.2.74</fastjson.version>
27   - <oshi.version>5.3.6</oshi.version>
28   - <jna.version>5.6.0</jna.version>
29   - <commons.io.version>2.5</commons.io.version>
30   - <commons.fileupload.version>1.3.3</commons.fileupload.version>
31   - <poi.version>4.1.2</poi.version>
32   - <velocity.version>1.7</velocity.version>
33   - <jwt.version>0.9.1</jwt.version>
  20 + <maven.compiler.source>${java.version}</maven.compiler.source>
  21 + <maven.compiler.target>${java.version}</maven.compiler.target>
  22 + <maven-compiler-plugin.version>3.8.0</maven-compiler-plugin.version>
  23 + <!-- 统一依赖管理 -->
  24 + <spring.boot.version>2.4.1</spring.boot.version>
  25 +
  26 +<!-- <ruoyi.version>3.3.0</ruoyi.version>-->
  27 +<!-- <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>-->
  28 +<!-- <maven-jar-plugin.version>3.1.1</maven-jar-plugin.version>-->
  29 +<!-- <druid.version>1.2.2</druid.version>-->
  30 +<!-- <bitwalker.version>1.21</bitwalker.version>-->
  31 +<!-- <swagger.version>2.9.2</swagger.version>-->
  32 +<!-- <kaptcha.version>2.3.2</kaptcha.version>-->
  33 +<!-- <pagehelper.boot.version>1.3.0</pagehelper.boot.version>-->
  34 +<!-- <fastjson.version>1.2.74</fastjson.version>-->
  35 +<!-- <oshi.version>5.3.6</oshi.version>-->
  36 +<!-- <jna.version>5.6.0</jna.version>-->
  37 +<!-- <commons.io.version>2.5</commons.io.version>-->
  38 +<!-- <commons.fileupload.version>1.3.3</commons.fileupload.version>-->
  39 +<!-- <poi.version>4.1.2</poi.version>-->
  40 +<!-- <velocity.version>1.7</velocity.version>-->
  41 +<!-- <jwt.version>0.9.1</jwt.version>-->
  42 +
  43 + <!-- Web 相关 -->
  44 +
  45 + <!-- DB 相关 -->
  46 + <mysql-connector-java.version>5.1.46</mysql-connector-java.version>
  47 + <druid.version>1.2.4</druid.version>
  48 + <mybatis-plus.version>3.4.1</mybatis-plus.version>
  49 + <!-- 工具类相关 -->
  50 + <org.projectlombok.version>1.16.14</org.projectlombok.version>
  51 + <org.mapstruct.version>1.3.0.Final</org.mapstruct.version>
34 52 </properties>
35   -
  53 +
36 54 <!-- 依赖声明 -->
37 55 <dependencyManagement>
38 56 <dependencies>
39   -
40   - <!-- SpringBoot的依赖配置-->
  57 +
  58 +<!-- &lt;!&ndash;阿里数据库连接池 &ndash;&gt;-->
  59 +<!-- <dependency>-->
  60 +<!-- <groupId>com.alibaba</groupId>-->
  61 +<!-- <artifactId>druid-spring-boot-starter</artifactId>-->
  62 +<!-- <version>${druid.version}</version>-->
  63 +<!-- </dependency>-->
  64 +
  65 +<!-- &lt;!&ndash; 解析客户端操作系统、浏览器等 &ndash;&gt;-->
  66 +<!-- <dependency>-->
  67 +<!-- <groupId>eu.bitwalker</groupId>-->
  68 +<!-- <artifactId>UserAgentUtils</artifactId>-->
  69 +<!-- <version>${bitwalker.version}</version>-->
  70 +<!-- </dependency>-->
  71 +
  72 +<!-- &lt;!&ndash; pagehelper 分页插件 &ndash;&gt;-->
  73 +<!-- <dependency>-->
  74 +<!-- <groupId>com.github.pagehelper</groupId>-->
  75 +<!-- <artifactId>pagehelper-spring-boot-starter</artifactId>-->
  76 +<!-- <version>${pagehelper.boot.version}</version>-->
  77 +<!-- </dependency>-->
  78 +
  79 +<!-- &lt;!&ndash; 获取系统信息 &ndash;&gt;-->
  80 +<!-- <dependency>-->
  81 +<!-- <groupId>com.github.oshi</groupId>-->
  82 +<!-- <artifactId>oshi-core</artifactId>-->
  83 +<!-- <version>${oshi.version}</version>-->
  84 +<!-- </dependency>-->
  85 +
  86 +<!-- <dependency>-->
  87 +<!-- <groupId>net.java.dev.jna</groupId>-->
  88 +<!-- <artifactId>jna</artifactId>-->
  89 +<!-- <version>${jna.version}</version>-->
  90 +<!-- </dependency>-->
  91 +
  92 +<!-- <dependency>-->
  93 +<!-- <groupId>net.java.dev.jna</groupId>-->
  94 +<!-- <artifactId>jna-platform</artifactId>-->
  95 +<!-- <version>${jna.version}</version>-->
  96 +<!-- </dependency>-->
  97 +
  98 +<!-- &lt;!&ndash; swagger2&ndash;&gt;-->
  99 +<!-- <dependency>-->
  100 +<!-- <groupId>io.springfox</groupId>-->
  101 +<!-- <artifactId>springfox-swagger2</artifactId>-->
  102 +<!-- <version>${swagger.version}</version>-->
  103 +<!-- <exclusions>-->
  104 +<!-- <exclusion>-->
  105 +<!-- <groupId>io.swagger</groupId>-->
  106 +<!-- <artifactId>swagger-annotations</artifactId>-->
  107 +<!-- </exclusion>-->
  108 +<!-- <exclusion>-->
  109 +<!-- <groupId>io.swagger</groupId>-->
  110 +<!-- <artifactId>swagger-models</artifactId>-->
  111 +<!-- </exclusion>-->
  112 +<!-- </exclusions>-->
  113 +<!-- </dependency>-->
  114 +
  115 +<!-- &lt;!&ndash; swagger2-UI&ndash;&gt;-->
  116 +<!-- <dependency>-->
  117 +<!-- <groupId>io.springfox</groupId>-->
  118 +<!-- <artifactId>springfox-swagger-ui</artifactId>-->
  119 +<!-- <version>${swagger.version}</version>-->
  120 +<!-- </dependency>-->
  121 +
  122 +<!-- &lt;!&ndash;io常用工具类 &ndash;&gt;-->
  123 +<!-- <dependency>-->
  124 +<!-- <groupId>commons-io</groupId>-->
  125 +<!-- <artifactId>commons-io</artifactId>-->
  126 +<!-- <version>${commons.io.version}</version>-->
  127 +<!-- </dependency>-->
  128 +
  129 +<!-- &lt;!&ndash;文件上传工具类 &ndash;&gt;-->
  130 +<!-- <dependency>-->
  131 +<!-- <groupId>commons-fileupload</groupId>-->
  132 +<!-- <artifactId>commons-fileupload</artifactId>-->
  133 +<!-- <version>${commons.fileupload.version}</version>-->
  134 +<!-- </dependency>-->
  135 +
  136 +<!-- &lt;!&ndash; excel工具 &ndash;&gt;-->
  137 +<!-- <dependency>-->
  138 +<!-- <groupId>org.apache.poi</groupId>-->
  139 +<!-- <artifactId>poi-ooxml</artifactId>-->
  140 +<!-- <version>${poi.version}</version>-->
  141 +<!-- </dependency>-->
  142 +
  143 +<!-- &lt;!&ndash;velocity代码生成使用模板 &ndash;&gt;-->
  144 +<!-- <dependency>-->
  145 +<!-- <groupId>org.apache.velocity</groupId>-->
  146 +<!-- <artifactId>velocity</artifactId>-->
  147 +<!-- <version>${velocity.version}</version>-->
  148 +<!-- </dependency>-->
  149 +
  150 +<!-- &lt;!&ndash; 阿里JSON解析器 &ndash;&gt;-->
  151 +<!-- <dependency>-->
  152 +<!-- <groupId>com.alibaba</groupId>-->
  153 +<!-- <artifactId>fastjson</artifactId>-->
  154 +<!-- <version>${fastjson.version}</version>-->
  155 +<!-- </dependency>-->
  156 +
  157 +<!-- &lt;!&ndash;Token生成与解析&ndash;&gt;-->
  158 +<!-- <dependency>-->
  159 +<!-- <groupId>io.jsonwebtoken</groupId>-->
  160 +<!-- <artifactId>jjwt</artifactId>-->
  161 +<!-- <version>${jwt.version}</version>-->
  162 +<!-- </dependency>-->
  163 +
  164 +<!-- &lt;!&ndash;验证码 &ndash;&gt;-->
  165 +<!-- <dependency>-->
  166 +<!-- <groupId>com.github.penggle</groupId>-->
  167 +<!-- <artifactId>kaptcha</artifactId>-->
  168 +<!-- <version>${kaptcha.version}</version>-->
  169 +<!-- </dependency>-->
  170 +
  171 + <!-- 统一依赖管理 -->
41 172 <dependency>
42 173 <groupId>org.springframework.boot</groupId>
43 174 <artifactId>spring-boot-dependencies</artifactId>
44   - <version>2.2.12.RELEASE</version>
  175 + <version>${spring.boot.version}</version>
45 176 <type>pom</type>
46 177 <scope>import</scope>
47 178 </dependency>
48   -
49   - <!--阿里数据库连接池 -->
50   - <dependency>
51   - <groupId>com.alibaba</groupId>
52   - <artifactId>druid-spring-boot-starter</artifactId>
53   - <version>${druid.version}</version>
54   - </dependency>
55   -
56   - <!-- 解析客户端操作系统、浏览器等 -->
57   - <dependency>
58   - <groupId>eu.bitwalker</groupId>
59   - <artifactId>UserAgentUtils</artifactId>
60   - <version>${bitwalker.version}</version>
61   - </dependency>
62   -
63   - <!-- pagehelper 分页插件 -->
64   - <dependency>
65   - <groupId>com.github.pagehelper</groupId>
66   - <artifactId>pagehelper-spring-boot-starter</artifactId>
67   - <version>${pagehelper.boot.version}</version>
68   - </dependency>
69   -
70   - <!-- 获取系统信息 -->
71   - <dependency>
72   - <groupId>com.github.oshi</groupId>
73   - <artifactId>oshi-core</artifactId>
74   - <version>${oshi.version}</version>
75   - </dependency>
  179 + </dependencies>
  180 + </dependencyManagement>
76 181  
77   - <dependency>
78   - <groupId>net.java.dev.jna</groupId>
79   - <artifactId>jna</artifactId>
80   - <version>${jna.version}</version>
81   - </dependency>
  182 +<!-- <modules>-->
  183 +<!-- <module>ruoyi-admin</module>-->
  184 +<!-- <module>ruoyi-framework</module>-->
  185 +<!-- <module>ruoyi-system</module>-->
  186 +<!-- <module>ruoyi-quartz</module>-->
  187 +<!-- <module>ruoyi-generator</module>-->
  188 +<!-- <module>ruoyi-common</module>-->
  189 +<!-- </modules>-->
  190 + <packaging>jar</packaging>
82 191  
83   - <dependency>
84   - <groupId>net.java.dev.jna</groupId>
85   - <artifactId>jna-platform</artifactId>
86   - <version>${jna.version}</version>
87   - </dependency>
88   -
89   - <!-- swagger2-->
90   - <dependency>
91   - <groupId>io.springfox</groupId>
92   - <artifactId>springfox-swagger2</artifactId>
93   - <version>${swagger.version}</version>
94   - <exclusions>
95   - <exclusion>
96   - <groupId>io.swagger</groupId>
97   - <artifactId>swagger-annotations</artifactId>
98   - </exclusion>
99   - <exclusion>
100   - <groupId>io.swagger</groupId>
101   - <artifactId>swagger-models</artifactId>
102   - </exclusion>
103   - </exclusions>
104   - </dependency>
105   -
106   - <!-- swagger2-UI-->
107   - <dependency>
108   - <groupId>io.springfox</groupId>
109   - <artifactId>springfox-swagger-ui</artifactId>
110   - <version>${swagger.version}</version>
111   - </dependency>
112   -
113   - <!--io常用工具类 -->
114   - <dependency>
115   - <groupId>commons-io</groupId>
116   - <artifactId>commons-io</artifactId>
117   - <version>${commons.io.version}</version>
118   - </dependency>
119   -
120   - <!--文件上传工具类 -->
121   - <dependency>
122   - <groupId>commons-fileupload</groupId>
123   - <artifactId>commons-fileupload</artifactId>
124   - <version>${commons.fileupload.version}</version>
125   - </dependency>
126   -
127   - <!-- excel工具 -->
128   - <dependency>
129   - <groupId>org.apache.poi</groupId>
130   - <artifactId>poi-ooxml</artifactId>
131   - <version>${poi.version}</version>
132   - </dependency>
133   -
134   - <!--velocity代码生成使用模板 -->
135   - <dependency>
136   - <groupId>org.apache.velocity</groupId>
137   - <artifactId>velocity</artifactId>
138   - <version>${velocity.version}</version>
139   - </dependency>
140   -
141   - <!-- 阿里JSON解析器 -->
142   - <dependency>
143   - <groupId>com.alibaba</groupId>
144   - <artifactId>fastjson</artifactId>
145   - <version>${fastjson.version}</version>
146   - </dependency>
147   -
148   - <!--Token生成与解析-->
149   - <dependency>
150   - <groupId>io.jsonwebtoken</groupId>
151   - <artifactId>jjwt</artifactId>
152   - <version>${jwt.version}</version>
153   - </dependency>
154   -
155   - <!--验证码 -->
156   - <dependency>
157   - <groupId>com.github.penggle</groupId>
158   - <artifactId>kaptcha</artifactId>
159   - <version>${kaptcha.version}</version>
160   - </dependency>
161   -
162   - <!-- 定时任务-->
163   - <dependency>
164   - <groupId>com.ruoyi</groupId>
165   - <artifactId>ruoyi-quartz</artifactId>
166   - <version>${ruoyi.version}</version>
167   - </dependency>
168   -
169   - <!-- 代码生成-->
170   - <dependency>
171   - <groupId>com.ruoyi</groupId>
172   - <artifactId>ruoyi-generator</artifactId>
173   - <version>${ruoyi.version}</version>
174   - </dependency>
175   -
176   - <!-- 核心模块-->
177   - <dependency>
178   - <groupId>com.ruoyi</groupId>
179   - <artifactId>ruoyi-framework</artifactId>
180   - <version>${ruoyi.version}</version>
181   - </dependency>
182   -
183   - <!-- 系统模块-->
184   - <dependency>
185   - <groupId>com.ruoyi</groupId>
186   - <artifactId>ruoyi-system</artifactId>
187   - <version>${ruoyi.version}</version>
188   - </dependency>
189   -
190   - <!-- 通用工具-->
191   - <dependency>
192   - <groupId>com.ruoyi</groupId>
193   - <artifactId>ruoyi-common</artifactId>
194   - <version>${ruoyi.version}</version>
195   - </dependency>
  192 + <dependencies>
196 193  
197   - </dependencies>
198   - </dependencyManagement>
  194 + <!-- Web 相关 -->
  195 + <dependency>
  196 + <groupId>org.springframework.boot</groupId>
  197 + <artifactId>spring-boot-starter-web</artifactId>
  198 + </dependency>
199 199  
200   - <modules>
201   - <module>ruoyi-admin</module>
202   - <module>ruoyi-framework</module>
203   - <module>ruoyi-system</module>
204   - <module>ruoyi-quartz</module>
205   - <module>ruoyi-generator</module>
206   - <module>ruoyi-common</module>
207   - </modules>
208   - <packaging>pom</packaging>
  200 + <!-- DB 相关 -->
  201 + <dependency>
  202 + <groupId>mysql</groupId>
  203 + <artifactId>mysql-connector-java</artifactId>
  204 + <version>${mysql-connector-java.version}</version>
  205 + </dependency>
209 206  
  207 + <dependency>
  208 + <groupId>com.alibaba</groupId>
  209 + <artifactId>druid-spring-boot-starter</artifactId>
  210 + <version>${druid.version}</version>
  211 + </dependency>
210 212  
211   - <dependencies>
  213 + <dependency>
  214 + <groupId>com.baomidou</groupId>
  215 + <artifactId>mybatis-plus-boot-starter</artifactId>
  216 + <version>${mybatis-plus.version}</version>
  217 + </dependency>
212 218  
  219 + <!-- 工具类相关 -->
  220 + <dependency>
  221 + <groupId>org.projectlombok</groupId>
  222 + <artifactId>lombok</artifactId>
  223 + <version>${org.projectlombok.version}</version>
  224 + </dependency>
213 225 </dependencies>
214 226  
  227 +
215 228 <build>
216   - <plugins>
217   - <plugin>
218   - <groupId>org.apache.maven.plugins</groupId>
219   - <artifactId>maven-compiler-plugin</artifactId>
220   - <version>3.1</version>
221   - <configuration>
222   - <source>${java.version}</source>
223   - <target>${java.version}</target>
224   - <encoding>${project.build.sourceEncoding}</encoding>
225   - </configuration>
226   - </plugin>
227   - </plugins>
  229 + <pluginManagement>
  230 + <plugins>
  231 + <!-- 提供给 mapstruct 使用 -->
  232 + <plugin>
  233 + <groupId>org.apache.maven.plugins</groupId>
  234 + <artifactId>maven-compiler-plugin</artifactId>
  235 + <version>${maven-compiler-plugin.version}</version>
  236 + <configuration>
  237 + <source>${java.version}</source> <!-- or higher, depending on your project -->
  238 + <target>${java.version}</target> <!-- or higher, depending on your project -->
  239 + <annotationProcessorPaths>
  240 + <path>
  241 + <groupId>org.mapstruct</groupId>
  242 + <artifactId>mapstruct-processor</artifactId>
  243 + <version>${org.mapstruct.version}</version>
  244 + </path>
  245 + <path>
  246 + <groupId>org.projectlombok</groupId>
  247 + <artifactId>lombok</artifactId>
  248 + <version>${org.projectlombok.version}</version>
  249 + </path>
  250 + </annotationProcessorPaths>
  251 + </configuration>
  252 + </plugin>
  253 +
  254 + <!-- 打包 -->
  255 + <plugin>
  256 + <groupId>org.springframework.boot</groupId>
  257 + <artifactId>spring-boot-maven-plugin</artifactId>
  258 + <configuration>
  259 + <fork>true</fork>
  260 + </configuration>
  261 + </plugin>
  262 + </plugins>
  263 + </pluginManagement>
228 264 </build>
229 265  
230   - <repositories>
231   - <repository>
232   - <id>public</id>
233   - <name>aliyun nexus</name>
234   - <url>http://maven.aliyun.com/nexus/content/groups/public/</url>
235   - <releases>
236   - <enabled>true</enabled>
237   - </releases>
238   - </repository>
239   - </repositories>
240   -
241   - <pluginRepositories>
242   - <pluginRepository>
243   - <id>public</id>
244   - <name>aliyun nexus</name>
245   - <url>http://maven.aliyun.com/nexus/content/groups/public/</url>
246   - <releases>
247   - <enabled>true</enabled>
248   - </releases>
249   - <snapshots>
250   - <enabled>false</enabled>
251   - </snapshots>
252   - </pluginRepository>
253   - </pluginRepositories>
254   -
255   -</project>
256 266 \ No newline at end of file
  267 +</project>
... ...
src/main/java/cn/iocoder/dashboard/DashboardApplication.java 0 → 100644
  View file @f574eec
  1 +package cn.iocoder.dashboard;
  2 +
  3 +import org.springframework.boot.SpringApplication;
  4 +import org.springframework.boot.autoconfigure.SpringBootApplication;
  5 +
  6 +@SpringBootApplication
  7 +public class DashboardApplication {
  8 +
  9 + public static void main(String[] args) {
  10 + SpringApplication.run(DashboardApplication.class, args);
  11 + }
  12 +
  13 +}
... ...
src/main/java/cn/iocoder/dashboard/framework/mybatis/core/BaseDO.java 0 → 100644
  View file @f574eec
  1 +package cn.iocoder.dashboard.framework.mybatis.core;
  2 +
  3 +import com.baomidou.mybatisplus.annotation.TableLogic;
  4 +import lombok.Data;
  5 +
  6 +import java.io.Serializable;
  7 +import java.util.Date;
  8 +
  9 +/**
  10 + * 基础实体对象
  11 + */
  12 +@Data
  13 +public class BaseDO implements Serializable {
  14 +
  15 + /**
  16 + * 创建时间
  17 + */
  18 + private Date createTime;
  19 + /**
  20 + * 最后更新时间
  21 + */
  22 + private Date updateTime;
  23 + /**
  24 + * 创建者 TODO 芋艿：迁移成编号
  25 + */
  26 + private String createBy;
  27 + /**
  28 + * 更新者 TODO 芋艿：迁移成编号
  29 + */
  30 + private String updateBy;
  31 + /**
  32 + * 是否删除
  33 + */
  34 + @TableLogic
  35 + private Integer deleted;
  36 +
  37 +// /** 备注 */ TODO 思考下，怎么解决
  38 +// private String remark;
  39 +
  40 +}
... ...
src/main/java/cn/iocoder/dashboard/framework/mybatis/package-info.java 0 → 100644
  View file @f574eec
  1 +package cn.iocoder.dashboard.framework.mybatis;
... ...
src/main/java/cn/iocoder/dashboard/modules/system/dal/mysql/dataobject/package-info.java 0 → 100644
  View file @f574eec
  1 +package cn.iocoder.dashboard.modules.system.dal.mysql.dataobject;
... ...
src/main/java/cn/iocoder/dashboard/modules/system/dal/redis/RedisKeyContants.java 0 → 100644
  View file @f574eec
  1 +package cn.iocoder.dashboard.modules.system.dal.redis;
  2 +
  3 +public class RedisKeyContants {
  4 +}
... ...
src/main/java/cn/iocoder/dashboard/modules/system/service/package-info.java 0 → 100644
  View file @f574eec
  1 +package cn.iocoder.dashboard.modules.system.service;
... ...
src/main/resources/application.yaml 0 → 100644
  View file @f574eec
  1 +spring:
  2 + # 数据源配置项
  3 + datasource:
  4 + url: jdbc:mysql://127.0.1:3306/ruoyi-vue-pro?useSSL=false&useUnicode=true&characterEncoding=UTF-8&serverTimezone=CTT
  5 + driver-class-name: com.mysql.jdbc.Driver
  6 + username: root
  7 + password: 123456
... ...