From 66d092dab09a28004d0bd77f3e193546a7b9bc62 Mon Sep 17 00:00:00 2001 From: wxz Date: Sun, 31 May 2020 23:04:03 +0800 Subject: [PATCH 1/4] =?UTF-8?q?1.=E5=A2=9E=E5=8A=A0flyway=E6=95=B0?= =?UTF-8?q?=E6=8D=AE=E5=BA=93=E8=BF=81=E7=A7=BB=E5=B7=A5=E5=85=B7=E7=9A=84?= =?UTF-8?q?=E4=BE=9D=E8=B5=96=E4=BB=A5=E5=8F=8Ademo=E9=85=8D=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- epmet-commons/epmet-commons-mybatis/pom.xml | 6 ++++ .../gov-access/gov-access-server/pom.xml | 14 ++++++--- .../java/com/epmet/GovAccessApplication.java | 8 ++--- .../com/epmet/config/DatabaseProperties.java | 15 ++++++++++ .../com/epmet/config/DbMigrationConfig.java | 29 +++++++++++++++++++ .../src/main/resources/bootstrap.yml | 11 +++++++ .../resources/db/migration/V2__DemoSql.sql | 4 +++ .../migration}/epmet_gov_access.sql | 0 8 files changed, 79 insertions(+), 8 deletions(-) create mode 100644 epmet-module/gov-access/gov-access-server/src/main/java/com/epmet/config/DatabaseProperties.java create mode 100644 epmet-module/gov-access/gov-access-server/src/main/java/com/epmet/config/DbMigrationConfig.java create mode 100644 epmet-module/gov-access/gov-access-server/src/main/resources/db/migration/V2__DemoSql.sql rename epmet-module/gov-access/gov-access-server/src/main/resources/{db.migration => db/migration}/epmet_gov_access.sql (100%) diff --git a/epmet-commons/epmet-commons-mybatis/pom.xml b/epmet-commons/epmet-commons-mybatis/pom.xml index 171b56af2f..502ef21e81 100644 --- a/epmet-commons/epmet-commons-mybatis/pom.xml +++ b/epmet-commons/epmet-commons-mybatis/pom.xml @@ -70,6 +70,12 @@ pagehelper-spring-boot-starter 1.2.12 + + + + org.flywaydb + flyway-core + diff --git a/epmet-module/gov-access/gov-access-server/pom.xml b/epmet-module/gov-access/gov-access-server/pom.xml index 53aec4fb80..bf5ac60a2c 100644 --- a/epmet-module/gov-access/gov-access-server/pom.xml +++ b/epmet-module/gov-access/gov-access-server/pom.xml @@ -110,13 +110,13 @@ - + - epmet_gov_access_user - EpmEt-db-UsEr + root + root 0 - 192.168.1.130 + localhost 6379 123456 @@ -127,6 +127,9 @@ false + + + false @@ -157,6 +160,9 @@ false + + + true diff --git a/epmet-module/gov-access/gov-access-server/src/main/java/com/epmet/GovAccessApplication.java b/epmet-module/gov-access/gov-access-server/src/main/java/com/epmet/GovAccessApplication.java index f4781aa923..469de9dc52 100644 --- a/epmet-module/gov-access/gov-access-server/src/main/java/com/epmet/GovAccessApplication.java +++ b/epmet-module/gov-access/gov-access-server/src/main/java/com/epmet/GovAccessApplication.java @@ -6,15 +6,15 @@ import org.springframework.cloud.client.discovery.EnableDiscoveryClient; import org.springframework.cloud.openfeign.EnableFeignClients; /** - * * @author Mark sunlightcs@gmail.com * @since 1.0.0 */ @SpringBootApplication @EnableDiscoveryClient @EnableFeignClients +//@EnableConfigurationProperties(value = {DatabaseProperties.class}) public class GovAccessApplication { - public static void main(String[] args) { - SpringApplication.run(GovAccessApplication.class, args); - } + public static void main(String[] args) { + SpringApplication.run(GovAccessApplication.class, args); + } } diff --git a/epmet-module/gov-access/gov-access-server/src/main/java/com/epmet/config/DatabaseProperties.java b/epmet-module/gov-access/gov-access-server/src/main/java/com/epmet/config/DatabaseProperties.java new file mode 100644 index 0000000000..e9282216d8 --- /dev/null +++ b/epmet-module/gov-access/gov-access-server/src/main/java/com/epmet/config/DatabaseProperties.java @@ -0,0 +1,15 @@ +//package com.epmet.config; +// +//import lombok.Data; +//import org.springframework.boot.context.properties.ConfigurationProperties; +// +//@ConfigurationProperties(prefix = "spring.datasource.druid") +//@Data +//public class DatabaseProperties { +// +// private String driverClassName; +// private String url; +// private String username; +// private String password; +// +//} diff --git a/epmet-module/gov-access/gov-access-server/src/main/java/com/epmet/config/DbMigrationConfig.java b/epmet-module/gov-access/gov-access-server/src/main/java/com/epmet/config/DbMigrationConfig.java new file mode 100644 index 0000000000..b9fcdfb160 --- /dev/null +++ b/epmet-module/gov-access/gov-access-server/src/main/java/com/epmet/config/DbMigrationConfig.java @@ -0,0 +1,29 @@ +//package com.epmet.config; +// +//import org.flywaydb.core.Flyway; +//import org.springframework.beans.factory.annotation.Autowired; +// +//import javax.annotation.PostConstruct; +// +///** +// * 数据库迁移配置 +// */ +//@Configuration +//public class DbMigrationConfig { +// +// @Autowired +// private DatabaseProperties databaseProperties; +// +// @PostConstruct +// public void migrate() { +// Flyway flyway = Flyway.configure().dataSource( +// databaseProperties.getUrl(), +// databaseProperties.getUsername(), +// databaseProperties.getPassword()) +// .baselineOnMigrate(true) +// .load(); +// +// flyway.migrate(); +// } +// +//} diff --git a/epmet-module/gov-access/gov-access-server/src/main/resources/bootstrap.yml b/epmet-module/gov-access/gov-access-server/src/main/resources/bootstrap.yml index cf118b769a..f1159f2892 100644 --- a/epmet-module/gov-access/gov-access-server/src/main/resources/bootstrap.yml +++ b/epmet-module/gov-access/gov-access-server/src/main/resources/bootstrap.yml @@ -50,6 +50,17 @@ spring: # - data-id: common.yaml # group: ${spring.cloud.nacos.config.group} # refresh: true + + # 数据迁移工具flyway + flyway: + enabled: @spring.flyway.enabled@ + locations: classpath:db/migration + url: @spring.datasource.druid.url@ + user: @spring.datasource.druid.username@ + password: @spring.datasource.druid.password@ + baseline-on-migrate: true + + management: endpoints: web: diff --git a/epmet-module/gov-access/gov-access-server/src/main/resources/db/migration/V2__DemoSql.sql b/epmet-module/gov-access/gov-access-server/src/main/resources/db/migration/V2__DemoSql.sql new file mode 100644 index 0000000000..ecd68455d3 --- /dev/null +++ b/epmet-module/gov-access/gov-access-server/src/main/resources/db/migration/V2__DemoSql.sql @@ -0,0 +1,4 @@ +-- CREATE TABLE epmet_gov_access.device_t ( +-- device_id bigint(11) primary KEY auto_increment, +-- device_name varchar(20) NOT NULL +-- ) \ No newline at end of file diff --git a/epmet-module/gov-access/gov-access-server/src/main/resources/db.migration/epmet_gov_access.sql b/epmet-module/gov-access/gov-access-server/src/main/resources/db/migration/epmet_gov_access.sql similarity index 100% rename from epmet-module/gov-access/gov-access-server/src/main/resources/db.migration/epmet_gov_access.sql rename to epmet-module/gov-access/gov-access-server/src/main/resources/db/migration/epmet_gov_access.sql From 4e07218f703520edbd157e9afe2e5636b12270dd Mon Sep 17 00:00:00 2001 From: wxz Date: Mon, 1 Jun 2020 10:11:48 +0800 Subject: [PATCH 2/4] =?UTF-8?q?1.=E5=88=86=E7=BB=84=E6=A0=A1=E9=AA=8Cdemo?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/epmet/controller/DemoController.java | 64 +++++++++++++++++++ 1 file changed, 64 insertions(+) create mode 100644 epmet-module/gov-access/gov-access-server/src/main/java/com/epmet/controller/DemoController.java diff --git a/epmet-module/gov-access/gov-access-server/src/main/java/com/epmet/controller/DemoController.java b/epmet-module/gov-access/gov-access-server/src/main/java/com/epmet/controller/DemoController.java new file mode 100644 index 0000000000..357ea2c9af --- /dev/null +++ b/epmet-module/gov-access/gov-access-server/src/main/java/com/epmet/controller/DemoController.java @@ -0,0 +1,64 @@ +package com.epmet.controller; + +import com.epmet.commons.tools.utils.Result; +import com.epmet.commons.tools.validator.ValidatorUtils; +import com.epmet.commons.tools.validator.group.CustomerClientShowGroup; +import lombok.Data; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import javax.validation.constraints.NotBlank; + +@RestController +@RequestMapping("demo") +public class DemoController { + + @PostMapping("adduser") + public Result addUser(@RequestBody UserFormDTO form) { + ValidatorUtils.validateEntity(form, UserFormDTO.AddUserShowGroup.class, UserFormDTO.AddUserInternalGroup.class); + System.out.println(form); + return new Result(); + } + +} + +@Data +class UserFormDTO { + //>>>>>>>>>>>>>>>>>校验分组开始>>>>>>>>>>>>>>>>>>>>> + /** + * 添加用户操作的内部异常分组 + * 出现错误会提示给前端7000错误码，返回信息为：服务器开小差... + */ + public interface AddUserInternalGroup {} + + /** + * 添加用户操作的用户可见异常分组 + * 该分组用于校验需要返回给前端错误信息提示的列，需要继承CustomerClientShowGroup + * 返回错误码为8999，提示信息为DTO中具体的列的校验注解message的内容 + */ + public interface AddUserShowGroup extends CustomerClientShowGroup {} + + // <<<<<<<<<<<<<<<<<<<校验分组结束<<<<<<<<<<<<<<<<<<<<<<<< + + /** + * 该字段在查询用户和添加用户的时候都要校验，所以在groups中会添加2个分组，校验器会优先校验继承了CustomerClientShowGroup + * 的分组 + * 1.该分组校验出错，直接将信息返回客户端，(多个字段有错误，多个字段的错误信息 + * 拼接起来，逗号分隔,详见ValidatorUtils#validadtorEntity()方法) + * 2.该分组校验成功，则继续往下，校验内部错误，若出现内部错误，则返回7000,服务器开小差... + */ + @NotBlank(message = "请输入姓名信息", groups = { AddUserInternalGroup.class, AddUserShowGroup.class }) + private String name; + + /** + * 用户别名，只在内部传输，因此它所属的分组不能继承CustomerClientShowGroup + */ + @NotBlank(message = "用户别名不能为空", groups = { AddUserInternalGroup.class }) + private String alias; + + @NotBlank(message = "请输入地址信息", groups = { AddUserShowGroup.class }) + private String address; + +} \ No newline at end of file From 586d6f4418ed24fa13b04225a068679a371945c7 Mon Sep 17 00:00:00 2001 From: wxz Date: Mon, 1 Jun 2020 11:05:04 +0800 Subject: [PATCH 3/4] =?UTF-8?q?1.=E4=BF=AE=E6=94=B9=EF=BC=9A=E5=88=9B?= =?UTF-8?q?=E5=BB=BA=E6=A0=B9=E7=BA=A7=E7=BB=84=E7=BB=87=EF=BC=8Cpids?= =?UTF-8?q?=E8=AE=BE=E7=BD=AE=E4=B8=BA"",=E4=B8=8D=E5=86=8D=E6=98=AF0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/epmet/service/impl/AgencyServiceImpl.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/AgencyServiceImpl.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/AgencyServiceImpl.java index 5df63831c7..186e6fa4dc 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/AgencyServiceImpl.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/AgencyServiceImpl.java @@ -281,7 +281,7 @@ public class AgencyServiceImpl implements AgencyService { CustomerAgencyEntity entity = ConvertUtils.sourceToTarget(form, CustomerAgencyEntity.class); entity.setAllParentName(""); entity.setOrganizationName(form.getAgencyName()); - entity.setPids("0"); + entity.setPids(""); entity.setPid("0"); entity.setTotalUser(0); entity.setCustomerId(form.getCustomerId()); From b7d495355282359fe14d79b2c871e9a81debfb02 Mon Sep 17 00:00:00 2001 From: wxz Date: Mon, 1 Jun 2020 11:08:00 +0800 Subject: [PATCH 4/4] =?UTF-8?q?1.=E4=BF=AE=E6=94=B9=EF=BC=9Agov-access-ser?= =?UTF-8?q?ver=20pom=E4=B8=AD=E7=9A=84=E9=94=99=E8=AF=AF=E9=85=8D=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- epmet-module/gov-access/gov-access-server/pom.xml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/epmet-module/gov-access/gov-access-server/pom.xml b/epmet-module/gov-access/gov-access-server/pom.xml index bf5ac60a2c..d59b1f9ac2 100644 --- a/epmet-module/gov-access/gov-access-server/pom.xml +++ b/epmet-module/gov-access/gov-access-server/pom.xml @@ -110,13 +110,13 @@ - + - root - root + epmet_gov_org_user + EpmEt-db-UsEr 0 - localhost + 192.168.1.130 6379 123456