diff --git a/pom.xml b/pom.xml index 95bdf41..1db7ee5 100644 --- a/pom.xml +++ b/pom.xml @@ -112,6 +112,13 @@ mysql mysql-connector-java + + + org.postgresql + postgresql + 42.2.20 + + org.lazyluke log4jdbc-remix @@ -532,6 +539,7 @@ mysql-connector-java ${mysql.version} + org.lazyluke log4jdbc-remix diff --git a/pom.xml b/pom.xml index 95bdf41..1db7ee5 100644 --- a/pom.xml +++ b/pom.xml @@ -112,6 +112,13 @@ mysql mysql-connector-java + + + org.postgresql + postgresql + 42.2.20 + + org.lazyluke log4jdbc-remix @@ -532,6 +539,7 @@ mysql-connector-java ${mysql.version} + org.lazyluke log4jdbc-remix diff --git a/src/main/java/com/casic/accessControl/task/web/TaskController.java b/src/main/java/com/casic/accessControl/task/web/TaskController.java index 6273013..ff088c3 100644 --- a/src/main/java/com/casic/accessControl/task/web/TaskController.java +++ b/src/main/java/com/casic/accessControl/task/web/TaskController.java @@ -56,7 +56,6 @@ // @Resource // private FeatureManager featureManager; - @RequestMapping("task-info-list") public void list(@RequestParam(required = true) String jsonParam, @RequestParam(required = false) Integer status, @RequestParam(required = false) String startDate, @RequestParam(required = false) String endDate, HttpServletResponse response, HttpSession session) { try { diff --git a/pom.xml b/pom.xml index 95bdf41..1db7ee5 100644 --- a/pom.xml +++ b/pom.xml @@ -112,6 +112,13 @@ mysql mysql-connector-java + + + org.postgresql + postgresql + 42.2.20 + + org.lazyluke log4jdbc-remix @@ -532,6 +539,7 @@ mysql-connector-java ${mysql.version} + org.lazyluke log4jdbc-remix diff --git a/src/main/java/com/casic/accessControl/task/web/TaskController.java b/src/main/java/com/casic/accessControl/task/web/TaskController.java index 6273013..ff088c3 100644 --- a/src/main/java/com/casic/accessControl/task/web/TaskController.java +++ b/src/main/java/com/casic/accessControl/task/web/TaskController.java @@ -56,7 +56,6 @@ // @Resource // private FeatureManager featureManager; - @RequestMapping("task-info-list") public void list(@RequestParam(required = true) String jsonParam, @RequestParam(required = false) Integer status, @RequestParam(required = false) String startDate, @RequestParam(required = false) String endDate, HttpServletResponse response, HttpSession session) { try { diff --git a/src/main/java/com/casic/accessControl/user/domain/User.java b/src/main/java/com/casic/accessControl/user/domain/User.java index 70ace61..a3088ae 100644 --- a/src/main/java/com/casic/accessControl/user/domain/User.java +++ b/src/main/java/com/casic/accessControl/user/domain/User.java @@ -6,7 +6,7 @@ * Created by lenovo on 2016/5/16. */ @Entity -@Table(name = "user") +@Table(name = "user_info") public class User { private Long id; private String userName; diff --git a/pom.xml b/pom.xml index 95bdf41..1db7ee5 100644 --- a/pom.xml +++ b/pom.xml @@ -112,6 +112,13 @@ mysql mysql-connector-java + + + org.postgresql + postgresql + 42.2.20 + + org.lazyluke log4jdbc-remix @@ -532,6 +539,7 @@ mysql-connector-java ${mysql.version} + org.lazyluke log4jdbc-remix diff --git a/src/main/java/com/casic/accessControl/task/web/TaskController.java b/src/main/java/com/casic/accessControl/task/web/TaskController.java index 6273013..ff088c3 100644 --- a/src/main/java/com/casic/accessControl/task/web/TaskController.java +++ b/src/main/java/com/casic/accessControl/task/web/TaskController.java @@ -56,7 +56,6 @@ // @Resource // private FeatureManager featureManager; - @RequestMapping("task-info-list") public void list(@RequestParam(required = true) String jsonParam, @RequestParam(required = false) Integer status, @RequestParam(required = false) String startDate, @RequestParam(required = false) String endDate, HttpServletResponse response, HttpSession session) { try { diff --git a/src/main/java/com/casic/accessControl/user/domain/User.java b/src/main/java/com/casic/accessControl/user/domain/User.java index 70ace61..a3088ae 100644 --- a/src/main/java/com/casic/accessControl/user/domain/User.java +++ b/src/main/java/com/casic/accessControl/user/domain/User.java @@ -6,7 +6,7 @@ * Created by lenovo on 2016/5/16. */ @Entity -@Table(name = "user") +@Table(name = "user_info") public class User { private Long id; private String userName; diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties index fa407f3..8b7410d 100644 --- a/src/main/resources/application.properties +++ b/src/main/resources/application.properties @@ -15,10 +15,10 @@ # ============================================================================ # db # ============================================================================ -db.default.driverClassName=com.mysql.jdbc.Driver -db.default.url=jdbc:mysql://localhost:3306/ems_web?useUnicode=true&characterEncoding=UTF-8 -db.default.username=root -db.default.password=root +db.default.driverClassName=org.postgresql.Driver +db.default.url=jdbc:postgresql://127.0.0.1:11332/ems_tong +db.default.username=postgres +db.default.password=casic203 #db.default.username=emsweb #db.default.password=emsweb #db.default.url=jdbc:mysql://119.254.110.71:3307/ems?useUnicode=true&characterEncoding=UTF-8 diff --git a/pom.xml b/pom.xml index 95bdf41..1db7ee5 100644 --- a/pom.xml +++ b/pom.xml @@ -112,6 +112,13 @@ mysql mysql-connector-java + + + org.postgresql + postgresql + 42.2.20 + + org.lazyluke log4jdbc-remix @@ -532,6 +539,7 @@ mysql-connector-java ${mysql.version} + org.lazyluke log4jdbc-remix diff --git a/src/main/java/com/casic/accessControl/task/web/TaskController.java b/src/main/java/com/casic/accessControl/task/web/TaskController.java index 6273013..ff088c3 100644 --- a/src/main/java/com/casic/accessControl/task/web/TaskController.java +++ b/src/main/java/com/casic/accessControl/task/web/TaskController.java @@ -56,7 +56,6 @@ // @Resource // private FeatureManager featureManager; - @RequestMapping("task-info-list") public void list(@RequestParam(required = true) String jsonParam, @RequestParam(required = false) Integer status, @RequestParam(required = false) String startDate, @RequestParam(required = false) String endDate, HttpServletResponse response, HttpSession session) { try { diff --git a/src/main/java/com/casic/accessControl/user/domain/User.java b/src/main/java/com/casic/accessControl/user/domain/User.java index 70ace61..a3088ae 100644 --- a/src/main/java/com/casic/accessControl/user/domain/User.java +++ b/src/main/java/com/casic/accessControl/user/domain/User.java @@ -6,7 +6,7 @@ * Created by lenovo on 2016/5/16. */ @Entity -@Table(name = "user") +@Table(name = "user_info") public class User { private Long id; private String userName; diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties index fa407f3..8b7410d 100644 --- a/src/main/resources/application.properties +++ b/src/main/resources/application.properties @@ -15,10 +15,10 @@ # ============================================================================ # db # ============================================================================ -db.default.driverClassName=com.mysql.jdbc.Driver -db.default.url=jdbc:mysql://localhost:3306/ems_web?useUnicode=true&characterEncoding=UTF-8 -db.default.username=root -db.default.password=root +db.default.driverClassName=org.postgresql.Driver +db.default.url=jdbc:postgresql://127.0.0.1:11332/ems_tong +db.default.username=postgres +db.default.password=casic203 #db.default.username=emsweb #db.default.password=emsweb #db.default.url=jdbc:mysql://119.254.110.71:3307/ems?useUnicode=true&characterEncoding=UTF-8 diff --git "a/src/main/resources/cms_tong\346\216\245\345\217\243\346\265\213\350\257\225\346\203\205\345\206\265.xlsx" "b/src/main/resources/cms_tong\346\216\245\345\217\243\346\265\213\350\257\225\346\203\205\345\206\265.xlsx" new file mode 100644 index 0000000..c1f59c9 --- /dev/null +++ "b/src/main/resources/cms_tong\346\216\245\345\217\243\346\265\213\350\257\225\346\203\205\345\206\265.xlsx" Binary files differ