From 2f2c75fbf1e883f00b200a586335029f1704afb8 Mon Sep 17 00:00:00 2001 From: lsy <18332763730@163.com> Date: Tue, 13 Feb 2018 11:35:18 +0800 Subject: [PATCH] =?UTF-8?q?jwt,oauth=E7=99=BB=E5=BD=95=E5=BC=80=E5=8F=91?= =?UTF-8?q?=E5=AE=8C=E6=88=90,=E7=B3=BB=E7=BB=9F=E7=AE=A1=E7=90=86?= =?UTF-8?q?=E5=BC=80=E5=8F=91=E5=AE=8C=E6=88=90,=E4=BF=AE=E5=A4=8D?= =?UTF-8?q?=E4=BA=86=E8=8B=A5=E5=B9=B2bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- all/docker/mysql/docker-run-mysql.sh | 3 ++- .../src/main/resources/templates/SsmController.ftl | 6 +++--- boot-starter/boot-starter-ssm/README.md | 5 +++++ .../java/com/micro/fast/common/dao/SsmMapper.java | 4 +++- .../fast/common/service/impl/SsmServiceImpl.java | 2 +- .../fast/upms/controller/UpmsSystemController.java | 10 ++++++---- .../com/micro/fast/upms/dao/UpmsSystemMapper.java | 3 ++- .../java/com/micro/fast/upms/dao/UpmsUserMapper.java | 2 +- .../java/com/micro/fast/upms/pojo/UpmsSystem.java | 7 ++++--- .../src/main/resources/mappers/UpmsSystemMapper.xml | 11 +++++++---- ms/upms/src/main/resources/mappers/UpmsUserMapper.xml | 2 +- 11 files changed, 35 insertions(+), 20 deletions(-) diff --git a/all/docker/mysql/docker-run-mysql.sh b/all/docker/mysql/docker-run-mysql.sh index 3e53031..8cb6cfa 100644 --- a/all/docker/mysql/docker-run-mysql.sh +++ b/all/docker/mysql/docker-run-mysql.sh @@ -1,2 +1,3 @@ #!/usr/bin/env bash -docker run --name mysql-master -d -p 3317:3306 -v /opt/mysql-master:/var/lib/mysql -e MYSQL_ROOT_PASSWORD=studyj2e mysql:5.7 \ No newline at end of file +# 修复了数据库中文乱码问题 +docker run --name mysql-master -d -p 3317:3306 -v /opt/mysql-master:/var/lib/mysql -e MYSQL_ROOT_PASSWORD=studyj2e mysql:5.7 --character-set-server=utf8mb4 --collation-server=utf8mb4_unicode_ci \ No newline at end of file diff --git a/boot-starter/boot-starter-maven-plugin/mybatis-generator-extend-maven-plugin/src/main/resources/templates/SsmController.ftl b/boot-starter/boot-starter-maven-plugin/mybatis-generator-extend-maven-plugin/src/main/resources/templates/SsmController.ftl index 41c43d3..2bce244 100644 --- a/boot-starter/boot-starter-maven-plugin/mybatis-generator-extend-maven-plugin/src/main/resources/templates/SsmController.ftl +++ b/boot-starter/boot-starter-maven-plugin/mybatis-generator-extend-maven-plugin/src/main/resources/templates/SsmController.ftl @@ -13,7 +13,7 @@ import org.springframework.validation.BindException; import org.springframework.web.bind.annotation.*; import javax.validation.Valid; -import java.util.List; +import java.util.ArrayList; /** * @@ -51,7 +51,7 @@ public class ${pojoName}Controller { @ApiOperation("修改信息") @PutMapping("/{id}") - public ServerResponse update${pojoName}(${pojoName} ${varPojoName}, + public ServerResponse update${pojoName}(@Valid ${pojoName} ${varPojoName}, @NotBlank(message = BaseConst.BASEMSG_PREFIX+"请传入id") String id){ ${varPojoName}.setId(${mybatisGenerator.primaryKeyType}.valueOf(id)); return ${varPojoName}Service.update(${varPojoName}); @@ -59,7 +59,7 @@ public class ${pojoName}Controller { @ApiOperation("根据id删除，传入数组") @DeleteMapping - public ServerResponse delete${pojoName}(@NotEmpty(message = BaseConst.BASEMSG_PREFIX+"请传入ids") List<${mybatisGenerator.primaryKeyType}> ids){ + public ServerResponse delete${pojoName}(@NotEmpty(message = BaseConst.BASEMSG_PREFIX+"请传入ids") ArrayList<${mybatisGenerator.primaryKeyType}> ids){ return ${varPojoName}Service.deleteByIds(ids); } } diff --git a/boot-starter/boot-starter-ssm/README.md b/boot-starter/boot-starter-ssm/README.md index 652f601..6d97fcc 100644 --- a/boot-starter/boot-starter-ssm/README.md +++ b/boot-starter/boot-starter-ssm/README.md @@ -14,3 +14,8 @@ - 对于数据源的切换方法是使用aop的方式对`@SwitchDataSource('数据源的名字')`进行拦截动态切换数据源，主数据源的名字是`master`,从数据源的名字是`slave`.对于没有注解默认的数据源是`master`. - PageHelper只对紧跟着的第一个SQL语句起作用 - 如果向定义n个数据源，在自己项目使用中定义bean即可，但是数据源的名字请不要使用`salve` `master` `masterDataSource` `dataSource` `dynamicDataSource` +### mybatis中传入参数的注意事项,通过反射是无法取到参数的名字的,知道这个很重要 +- 如果传入的是单参数且参数类型是一个List的时候，collection属性值为list . +- 如果传入的是单参数且参数类型是一个array数组的时候，collection的属性值为array . +- 如果传入的参数是多个的时候，我们就需要把它们封装成一个Map了，当然单参数也可以封装成map，实际上如果你在传入参数的时候，在MyBatis里面也是会把它封装成一个Map的，map的key就是参数名，所以这个时候collection属性值就是传入的List或array对象在自己封装的map里面的key. + diff --git a/boot-starter/boot-starter-ssm/src/main/java/com/micro/fast/common/dao/SsmMapper.java b/boot-starter/boot-starter-ssm/src/main/java/com/micro/fast/common/dao/SsmMapper.java index badad16..c2bd186 100644 --- a/boot-starter/boot-starter-ssm/src/main/java/com/micro/fast/common/dao/SsmMapper.java +++ b/boot-starter/boot-starter-ssm/src/main/java/com/micro/fast/common/dao/SsmMapper.java @@ -1,6 +1,8 @@ package com.micro.fast.common.dao; +import org.apache.ibatis.annotations.Param; + import java.util.List; public interface SsmMapper { @@ -26,5 +28,5 @@ public interface SsmMapper { */ List selectByCondition(T record); - int deleteByPrimaryKeys(List id); + int deleteByPrimaryKeys(List ids); } diff --git a/boot-starter/boot-starter-ssm/src/main/java/com/micro/fast/common/service/impl/SsmServiceImpl.java b/boot-starter/boot-starter-ssm/src/main/java/com/micro/fast/common/service/impl/SsmServiceImpl.java index 55facd2..9d01641 100644 --- a/boot-starter/boot-starter-ssm/src/main/java/com/micro/fast/common/service/impl/SsmServiceImpl.java +++ b/boot-starter/boot-starter-ssm/src/main/java/com/micro/fast/common/service/impl/SsmServiceImpl.java @@ -44,7 +44,7 @@ public class SsmServiceImpl ids){ + @NotEmpty(message = BaseConst.BASEMSG_PREFIX+"请传入id") @RequestParam("ids") ArrayList ids){ return upmsSystemService.deleteByIds(ids); } } diff --git a/ms/upms/src/main/java/com/micro/fast/upms/dao/UpmsSystemMapper.java b/ms/upms/src/main/java/com/micro/fast/upms/dao/UpmsSystemMapper.java index 5bc69b0..f6fc734 100644 --- a/ms/upms/src/main/java/com/micro/fast/upms/dao/UpmsSystemMapper.java +++ b/ms/upms/src/main/java/com/micro/fast/upms/dao/UpmsSystemMapper.java @@ -2,6 +2,7 @@ package com.micro.fast.upms.dao; import com.micro.fast.common.dao.SsmMapper; import com.micro.fast.upms.pojo.UpmsSystem; +import feign.Param; import java.util.List; @@ -29,5 +30,5 @@ public interface UpmsSystemMapper extends SsmMapper { List selectByCondition(UpmsSystem record); @Override - int deleteByPrimaryKeys(List id); + int deleteByPrimaryKeys(List ids); } \ No newline at end of file diff --git a/ms/upms/src/main/java/com/micro/fast/upms/dao/UpmsUserMapper.java b/ms/upms/src/main/java/com/micro/fast/upms/dao/UpmsUserMapper.java index 7b851d3..cb77295 100644 --- a/ms/upms/src/main/java/com/micro/fast/upms/dao/UpmsUserMapper.java +++ b/ms/upms/src/main/java/com/micro/fast/upms/dao/UpmsUserMapper.java @@ -32,7 +32,7 @@ public interface UpmsUserMapper extends SsmMapper{ List selectByCondition(UpmsUser record); @Override - int deleteByPrimaryKeys(List id); + int deleteByPrimaryKeys(List ids); /** * 根据用户名查找用户 diff --git a/ms/upms/src/main/java/com/micro/fast/upms/pojo/UpmsSystem.java b/ms/upms/src/main/java/com/micro/fast/upms/pojo/UpmsSystem.java index 6fca65b..8dd822e 100644 --- a/ms/upms/src/main/java/com/micro/fast/upms/pojo/UpmsSystem.java +++ b/ms/upms/src/main/java/com/micro/fast/upms/pojo/UpmsSystem.java @@ -1,6 +1,7 @@ package com.micro.fast.upms.pojo; import com.micro.fast.boot.starter.common.response.BaseConst; +import org.hibernate.validator.constraints.NotBlank; import javax.validation.constraints.NotNull; import java.io.Serializable; @@ -14,17 +15,17 @@ public class UpmsSystem implements Serializable { private String theme; - @NotNull(message = BaseConst.BASEMSG_PREFIX+"请填写系统路径") + @NotBlank(message = BaseConst.BASEMSG_PREFIX+"请填写系统路径") private String basepath; private Byte status; - @NotNull(message = BaseConst.BASEMSG_PREFIX+"请填写系统名称") + @NotBlank(message = BaseConst.BASEMSG_PREFIX+"请填写系统名称") private String name; private String title; - @NotNull(message = BaseConst.BASEMSG_PREFIX+"请填写系统描述") + @NotBlank(message = BaseConst.BASEMSG_PREFIX+"请填写系统描述") private String description; private Long ctime; diff --git a/ms/upms/src/main/resources/mappers/UpmsSystemMapper.xml b/ms/upms/src/main/resources/mappers/UpmsSystemMapper.xml index 4c8157f..c630ad1 100644 --- a/ms/upms/src/main/resources/mappers/UpmsSystemMapper.xml +++ b/ms/upms/src/main/resources/mappers/UpmsSystemMapper.xml @@ -169,20 +169,23 @@ SELECT FROM upms_system - title like "%"#{title}"%" + and title like #{title} - and basepath like "%"#{basepath}"%" + and basepath like #{basepath} - and name like "%"#{name}"%" + and name like #{name} + + + and status = #{status} DELETE FROM upms_system WHERE id IN - + #{item} diff --git a/ms/upms/src/main/resources/mappers/UpmsUserMapper.xml b/ms/upms/src/main/resources/mappers/UpmsUserMapper.xml index 4c8e6f1..6eb5c8b 100644 --- a/ms/upms/src/main/resources/mappers/UpmsUserMapper.xml +++ b/ms/upms/src/main/resources/mappers/UpmsUserMapper.xml @@ -200,7 +200,7 @@ delete from upms_user where id IN - + #{item}