diff --git a/.gitignore b/.gitignore
new file mode 100644
index 00000000..c85ae303
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,35 @@
+target/
+logs/
+.mvn/
+mvnw
+mvnw.cmd
+!**/src/main/**
+!**/src/test/**
+
+src/main/resources/docs/
+
+### STS ###
+.apt_generated
+.classpath
+.factorypath
+.project
+.settings
+.springBeans
+.sts4-cache
+
+### IntelliJ IDEA ###
+.idea
+*.iws
+*.iml
+*.ipr
+
+### NetBeans ###
+/nbproject/private/
+/nbbuild/
+/dist/
+/nbdist/
+/.nb-gradle/
+build/
+
+### VS Code ###
+.vscode/
diff --git a/dq-financial-api/pom.xml b/dq-financial-api/pom.xml
index fc4b6c1d..953d6176 100644
--- a/dq-financial-api/pom.xml
+++ b/dq-financial-api/pom.xml
@@ -15,31 +15,26 @@
系统API统一定义
-
+
com.daqing.framework
dq-framework-model
1.0-SNAPSHOT
-
+
+
+
org.springframework.boot
spring-boot-starter-test
diff --git a/dq-financial-crms-auth/pom.xml b/dq-financial-crms-auth/pom.xml
index 2e38007c..c48a935e 100644
--- a/dq-financial-crms-auth/pom.xml
+++ b/dq-financial-crms-auth/pom.xml
@@ -20,25 +20,33 @@
-
+
com.daqing.framework
dq-framework-model
1.0-SNAPSHOT
-
+
+
+
+
+
org.springframework.cloud
spring-cloud-starter-openfeign
-
+
org.springframework.security.oauth
spring-security-oauth2
diff --git a/dq-financial-guarantee/pom.xml b/dq-financial-guarantee/pom.xml
index 5fc6172d..8d030265 100644
--- a/dq-financial-guarantee/pom.xml
+++ b/dq-financial-guarantee/pom.xml
@@ -20,20 +20,20 @@
-
+
com.daqing.framework
dq-framework-model
1.0-SNAPSHOT
-
+
org.springframework.cloud
spring-cloud-starter-openfeign
diff --git a/dq-financial-hrms-auth/pom.xml b/dq-financial-hrms-auth/pom.xml
index eafd1d2a..c58d4e5e 100644
--- a/dq-financial-hrms-auth/pom.xml
+++ b/dq-financial-hrms-auth/pom.xml
@@ -20,11 +20,11 @@
-
+
com.daqing.framework
dq-framework-model
diff --git a/dq-financial-hrms/pom.xml b/dq-financial-hrms/pom.xml
index 13f8b1c2..695f05c0 100644
--- a/dq-financial-hrms/pom.xml
+++ b/dq-financial-hrms/pom.xml
@@ -20,21 +20,21 @@
-
+
com.daqing.framework
dq-framework-model
1.0-SNAPSHOT
-
+
com.daqing.financial
dq-financial-api
diff --git a/dq-financial-hrms/src/main/java/com/daqing/financial/hrms/controller/EmployeeController.java b/dq-financial-hrms/src/main/java/com/daqing/financial/hrms/controller/EmployeeController.java
index 7e7d20d0..a4f13137 100644
--- a/dq-financial-hrms/src/main/java/com/daqing/financial/hrms/controller/EmployeeController.java
+++ b/dq-financial-hrms/src/main/java/com/daqing/financial/hrms/controller/EmployeeController.java
@@ -10,9 +10,9 @@ import com.daqing.framework.utils.PageUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
+import javax.validation.Valid;
import java.util.Arrays;
import java.util.List;
-import java.util.Map;
/**
@@ -33,7 +33,7 @@ public class EmployeeController implements EmployeeControllerApi {
//@RequiresPermissions("hrms:employee:info")
public ResponseResult list(@RequestParam("page") Integer page,
@RequestParam("size") Integer size,
- EmployeeEntity employee) {
+ @Valid EmployeeEntity employee) {
PageUtils data = employeeService.queryPage(page, size, employee);
return new ResponseResult().SUCCESS(data);
}
diff --git a/dq-framework-common/pom.xml b/dq-framework-common/pom.xml
index fd22a415..4dd9b22a 100644
--- a/dq-framework-common/pom.xml
+++ b/dq-framework-common/pom.xml
@@ -27,16 +27,53 @@
mysql-connector-java
8.0.17
+
+
com.baomidou
mybatis-plus-boot-starter
- 3.3.1
+ 3.0.7.1
+
+ com.baomidou
+ mybatis-plus-generator
+ 3.0.7.1
+
+
org.projectlombok
lombok
1.18.12
+
+
+
+ io.springfox
+ springfox-swagger2
+ 2.7.0
+
+
+ io.springfox
+ springfox-swagger-ui
+ 2.7.0
+
+
+
+ org.springframework.boot
+ spring-boot-starter-web
+ 2.1.8.RELEASE
+
+
javax.servlet
@@ -49,6 +86,7 @@
spring-web
5.2.8.RELEASE
+
com.google.guava
guava
diff --git a/dq-framework-model/src/main/java/com/daqing/framework/domain/hrms/EmployeeEntity.java b/dq-framework-model/src/main/java/com/daqing/framework/domain/hrms/EmployeeEntity.java
index 5d5f4d65..0a3a20a7 100644
--- a/dq-framework-model/src/main/java/com/daqing/framework/domain/hrms/EmployeeEntity.java
+++ b/dq-framework-model/src/main/java/com/daqing/framework/domain/hrms/EmployeeEntity.java
@@ -3,10 +3,10 @@ package com.daqing.framework.domain.hrms;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
import java.io.Serializable;
import java.util.Date;
-import lombok.Data;
/**
* 记录员工的基本信息,如姓名、电话、部门等
diff --git a/dq-framework-utils/pom.xml b/dq-framework-utils/pom.xml
index 7f0d0315..6f28a8b5 100644
--- a/dq-framework-utils/pom.xml
+++ b/dq-framework-utils/pom.xml
@@ -48,5 +48,23 @@
9.0.37
compile
+
+ org.springframework
+ spring-web
+ 5.1.9.RELEASE
+ compile
+
+
\ No newline at end of file
diff --git a/dq-framework-utils/src/main/java/com/daqing/framework/utils/PageUtils.java b/dq-framework-utils/src/main/java/com/daqing/framework/utils/PageUtils.java
index 07c57f1a..392741c6 100644
--- a/dq-framework-utils/src/main/java/com/daqing/framework/utils/PageUtils.java
+++ b/dq-framework-utils/src/main/java/com/daqing/framework/utils/PageUtils.java
@@ -8,6 +8,7 @@
package com.daqing.framework.utils;
+
import com.baomidou.mybatisplus.core.metadata.IPage;
import java.io.Serializable;
diff --git a/dq-framework-utils/src/main/java/com/daqing/framework/utils/Query.java b/dq-framework-utils/src/main/java/com/daqing/framework/utils/Query.java
index 2d3f35fa..01c34625 100644
--- a/dq-framework-utils/src/main/java/com/daqing/framework/utils/Query.java
+++ b/dq-framework-utils/src/main/java/com/daqing/framework/utils/Query.java
@@ -9,7 +9,6 @@
package com.daqing.framework.utils;
import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.baomidou.mybatisplus.core.metadata.OrderItem;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.daqing.framework.model.Constant;
import com.daqing.framework.xss.SQLFilter;
@@ -53,13 +52,13 @@ public class Query {
//前端字段排序
- if (StringUtils.isNotEmpty(orderField) && StringUtils.isNotEmpty(order)) {
+ /*if (StringUtils.isNotEmpty(orderField) && StringUtils.isNotEmpty(order)) {
if (Constant.ASC.equalsIgnoreCase(order)) {
return page.addOrder(OrderItem.asc(orderField));
} else {
return page.addOrder(OrderItem.desc(orderField));
}
- }
+ }*/
//没有排序字段,则不排序
if (StringUtils.isBlank(defaultOrderField)) {
@@ -67,11 +66,11 @@ public class Query {
}
//默认排序
- if (isAsc) {
+ /* if (isAsc) {
page.addOrder(OrderItem.asc(defaultOrderField));
} else {
page.addOrder(OrderItem.desc(defaultOrderField));
- }
+ }*/
return page;
}
diff --git a/dq-govern-gateway/pom.xml b/dq-govern-gateway/pom.xml
index 8eda2099..f34cda2e 100644
--- a/dq-govern-gateway/pom.xml
+++ b/dq-govern-gateway/pom.xml
@@ -20,11 +20,11 @@
-
+
org.springframework.cloud
@@ -41,6 +41,18 @@
3.8.1
+
+ com.alibaba
+ fastjson
+ 1.2.70
+
+
+
+ org.projectlombok
+ lombok
+ 1.18.12
+
+
com.auth0
java-jwt