Commit 00cdbb49 authored by xiandafu's avatar xiandafu
Browse files

小调整,mysql驱动改成8,springboot改成2.2.2等

parent c802d6cf
...@@ -19,7 +19,6 @@ ...@@ -19,7 +19,6 @@
<dependency> <dependency>
<groupId>mysql</groupId> <groupId>mysql</groupId>
<artifactId>mysql-connector-java</artifactId> <artifactId>mysql-connector-java</artifactId>
<version>6.0.5</version>
</dependency> </dependency>
</dependencies> </dependencies>
......
...@@ -69,6 +69,15 @@ public class OrgConsoleController { ...@@ -69,6 +69,15 @@ public class OrgConsoleController {
view.addObject("org", org); view.addObject("org", org);
return view; return view;
} }
@GetMapping(MODEL + "/add.do")
@Function("org.add")
public ModelAndView add() {
ModelAndView view = new ModelAndView("/admin/org/add.html");
return view;
}
@GetMapping(MODEL + "/user/list.do") @GetMapping(MODEL + "/user/list.do")
......
spring.datasource.baseDataSource.url=jdbc:mysql://127.0.0.1:3306/starter?useUnicode=true&characterEncoding=UTF-8&serverTimezone=GMT%2B8&useSSL=false&useInformationSchema=true spring.datasource.baseDataSource.url=jdbc:mysql://127.0.0.1:3306/starter?useUnicode=true&characterEncoding=UTF-8&serverTimezone=GMT%2B8&useSSL=false&useInformationSchema=true
spring.datasource.baseDataSource.username=root spring.datasource.baseDataSource.username=root
spring.datasource.baseDataSource.password=123456 spring.datasource.baseDataSource.password=12345678
spring.datasource.baseDataSource.driver-class-name=com.mysql.cj.jdbc.Driver spring.datasource.baseDataSource.driver-class-name=com.mysql.cj.jdbc.Driver
beetlsql.ds.baseDataSource.basePackage=com beetlsql.ds.baseDataSource.basePackage=com
......
...@@ -44,7 +44,7 @@ ...@@ -44,7 +44,7 @@
<dependency> <dependency>
<groupId>com.ibeetl</groupId> <groupId>com.ibeetl</groupId>
<artifactId>beetl-framework-starter</artifactId> <artifactId>beetl-framework-starter</artifactId>
<version>1.2.14.RELEASE</version> <version>1.2.20.RELEASE</version>
</dependency> </dependency>
<dependency> <dependency>
......
...@@ -18,7 +18,7 @@ ...@@ -18,7 +18,7 @@
<parent> <parent>
<groupId>org.springframework.boot</groupId> <groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-parent</artifactId> <artifactId>spring-boot-starter-parent</artifactId>
<version>2.1.7.RELEASE</version> <version>2.2.2.RELEASE</version>
</parent> </parent>
<!-- Add typical dependencies for a web application --> <!-- Add typical dependencies for a web application -->
<dependencies> <dependencies>
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment