正在显示
4 个修改的文件
包含
11 行增加
和
5 行删除
| @@ -28,6 +28,7 @@ | @@ -28,6 +28,7 @@ | ||
| 28 | <jna.version>5.7.0</jna.version> | 28 | <jna.version>5.7.0</jna.version> |
| 29 | <commons.io.version>2.5</commons.io.version> | 29 | <commons.io.version>2.5</commons.io.version> |
| 30 | <commons.fileupload.version>1.3.3</commons.fileupload.version> | 30 | <commons.fileupload.version>1.3.3</commons.fileupload.version> |
| 31 | + <commons.collections.version>3.2.2</commons.collections.version> | ||
| 31 | <poi.version>4.1.2</poi.version> | 32 | <poi.version>4.1.2</poi.version> |
| 32 | <velocity.version>1.7</velocity.version> | 33 | <velocity.version>1.7</velocity.version> |
| 33 | <jwt.version>0.9.1</jwt.version> | 34 | <jwt.version>0.9.1</jwt.version> |
| @@ -143,11 +144,14 @@ | @@ -143,11 +144,14 @@ | ||
| 143 | </exclusion> | 144 | </exclusion> |
| 144 | </exclusions> | 145 | </exclusions> |
| 145 | </dependency> | 146 | </dependency> |
| 147 | + | ||
| 148 | + <!-- collections工具类 --> | ||
| 146 | <dependency> | 149 | <dependency> |
| 147 | <groupId>commons-collections</groupId> | 150 | <groupId>commons-collections</groupId> |
| 148 | <artifactId>commons-collections</artifactId> | 151 | <artifactId>commons-collections</artifactId> |
| 149 | - <version>3.2.2</version> | 152 | + <version>${commons.collections.version}</version> |
| 150 | </dependency> | 153 | </dependency> |
| 154 | + | ||
| 151 | <!-- 阿里JSON解析器 --> | 155 | <!-- 阿里JSON解析器 --> |
| 152 | <dependency> | 156 | <dependency> |
| 153 | <groupId>com.alibaba</groupId> | 157 | <groupId>com.alibaba</groupId> |
| @@ -43,8 +43,8 @@ spring: | @@ -43,8 +43,8 @@ spring: | ||
| 43 | allow: | 43 | allow: |
| 44 | url-pattern: /druid/* | 44 | url-pattern: /druid/* |
| 45 | # 控制台管理用户名和密码 | 45 | # 控制台管理用户名和密码 |
| 46 | - login-username: | ||
| 47 | - login-password: | 46 | + login-username: admin |
| 47 | + login-password: 123456 | ||
| 48 | filter: | 48 | filter: |
| 49 | stat: | 49 | stat: |
| 50 | enabled: true | 50 | enabled: true |
| @@ -25,7 +25,7 @@ import com.ruoyi.common.utils.sql.SqlUtil; | @@ -25,7 +25,7 @@ import com.ruoyi.common.utils.sql.SqlUtil; | ||
| 25 | */ | 25 | */ |
| 26 | public class BaseController | 26 | public class BaseController |
| 27 | { | 27 | { |
| 28 | - protected final Logger logger = LoggerFactory.getLogger(BaseController.class); | 28 | + protected final Logger logger = LoggerFactory.getLogger(this.getClass()); |
| 29 | 29 | ||
| 30 | /** | 30 | /** |
| 31 | * 将前台传递过来的日期格式的字符串,自动转化为Date类型 | 31 | * 将前台传递过来的日期格式的字符串,自动转化为Date类型 |
| @@ -22,11 +22,13 @@ | @@ -22,11 +22,13 @@ | ||
| 22 | <groupId>org.apache.velocity</groupId> | 22 | <groupId>org.apache.velocity</groupId> |
| 23 | <artifactId>velocity</artifactId> | 23 | <artifactId>velocity</artifactId> |
| 24 | </dependency> | 24 | </dependency> |
| 25 | - <!--commons-collections--> | 25 | + |
| 26 | + <!-- collections工具类 --> | ||
| 26 | <dependency> | 27 | <dependency> |
| 27 | <groupId>commons-collections</groupId> | 28 | <groupId>commons-collections</groupId> |
| 28 | <artifactId>commons-collections</artifactId> | 29 | <artifactId>commons-collections</artifactId> |
| 29 | </dependency> | 30 | </dependency> |
| 31 | + | ||
| 30 | <!-- 通用工具--> | 32 | <!-- 通用工具--> |
| 31 | <dependency> | 33 | <dependency> |
| 32 | <groupId>com.ruoyi</groupId> | 34 | <groupId>com.ruoyi</groupId> |
-
请 注册 或 登录 后发表评论