diff --git a/boot-service/src/main/java/com/xwbing/datasource/JpaDataSourceConfig.java b/boot-service/src/main/java/com/xwbing/datasource/JpaDataSourceConfig.java index 4c8826a..41a9289 100644 --- a/boot-service/src/main/java/com/xwbing/datasource/JpaDataSourceConfig.java +++ b/boot-service/src/main/java/com/xwbing/datasource/JpaDataSourceConfig.java @@ -1,18 +1,17 @@ package com.xwbing.datasource; - import com.alibaba.druid.spring.boot.autoconfigure.DruidDataSourceBuilder; import org.springframework.boot.autoconfigure.orm.jpa.JpaProperties; import org.springframework.boot.context.properties.ConfigurationProperties; import org.springframework.boot.orm.jpa.EntityManagerFactoryBuilder; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; -import org.springframework.context.annotation.Primary; import org.springframework.context.annotation.PropertySource; import org.springframework.data.jpa.repository.config.EnableJpaRepositories; import org.springframework.orm.jpa.JpaTransactionManager; import org.springframework.orm.jpa.LocalContainerEntityManagerFactoryBean; import org.springframework.transaction.PlatformTransactionManager; +import org.springframework.transaction.annotation.EnableTransactionManagement; import javax.annotation.Resource; import javax.persistence.EntityManager; @@ -20,12 +19,13 @@ import javax.sql.DataSource; import java.util.Map; /** - * 项目名称: boot-module-demo - * 创建时间: 2018/5/31 21:38 - * 作者: xiangwb * 说明: JpaDataSourceConfig + * 项目名称: boot-module-demo + * 创建时间: 2017/12/10 16:36 + * 作者: xiangwb */ @Configuration +@EnableTransactionManagement @PropertySource("classpath:druid.properties") @EnableJpaRepositories( entityManagerFactoryRef = "jpaEntityManagerFactory", @@ -41,21 +41,39 @@ public class JpaDataSourceConfig { return DruidDataSourceBuilder.create().build(); } + /** + * 配置entityManagerFactory + * + * @param builder + * @return + */ @Bean(name = "jpaEntityManagerFactory") public LocalContainerEntityManagerFactoryBean entityManagerFactory(EntityManagerFactoryBuilder builder) { return builder .dataSource(dataSource()) - .properties(getProperties(dataSource())) + .properties(getVendorProperties(dataSource())) .packages("com.xwbing.domain.entity") .persistenceUnit("jpaPersistenceUnit") .build(); } + /** + * 配置entityManager + * + * @param builder + * @return + */ @Bean(name = "japEntityManager") public EntityManager entityManager(EntityManagerFactoryBuilder builder) { return entityManagerFactory(builder).getObject().createEntityManager(); } + /** + * 配置事务 + * + * @param builder + * @return + */ @Bean(name = "jpaTransactionManager") public PlatformTransactionManager dataSourceTransactionManager(EntityManagerFactoryBuilder builder) { return new JpaTransactionManager(entityManagerFactory(builder).getObject()); @@ -67,7 +85,7 @@ public class JpaDataSourceConfig { * @param dataSource * @return */ - private Map getProperties(DataSource dataSource) { + private Map getVendorProperties(DataSource dataSource) { return jpaProperties.getHibernateProperties(dataSource); } -} +} \ No newline at end of file diff --git a/boot-service/src/main/java/com/xwbing/domain/entity/sys/SysUser.java b/boot-service/src/main/java/com/xwbing/domain/entity/sys/SysUser.java index 617a633..6964a18 100644 --- a/boot-service/src/main/java/com/xwbing/domain/entity/sys/SysUser.java +++ b/boot-service/src/main/java/com/xwbing/domain/entity/sys/SysUser.java @@ -26,28 +26,28 @@ import java.util.List; public class SysUser extends BaseEntity { private static final long serialVersionUID = -2447528751353457021L; public static String table = "sys_user_info"; - @ApiModelProperty(value = "用户名",example = "xxx",required = true) @NotBlank(message = "用户名不能为空") @Length(min = 1, max = 20, message = "用户名长度为1-20") + @ApiModelProperty(value = "用户名", required = true) @Column(name = "user_name") private String userName; - @ApiModelProperty(value = "姓名",example = "xxx",required = true) @NotBlank(message = "姓名不能为空") - @Length(min = 1, max = 5, message = "姓名长度为1-5") + @Length(min = 1, max = 20, message = "姓名长度为1-5") + @ApiModelProperty(value = "姓名", required = true) private String name; - @ApiModelProperty(value = "邮箱",example = "@163.com",required = true) @NotBlank(message = "邮箱不能为空") @Email(message = "邮箱格式有误") + @ApiModelProperty(value = "邮箱", example = "@163.com", required = true) private String mail; - @ApiModelProperty(value = "性别",example = "1",required = true) @NotBlank(message = "性别不能为空") @Pattern(regexp = "[01]", message = "性别格式为0|1,0代表女,1代表男") + @ApiModelProperty(value = "性别(0|1)", example = "1", required = true) private String sex; - @ApiModelProperty(value = "盐值",hidden = true) + @ApiModelProperty(value = "盐值", hidden = true) private String salt; - @ApiModelProperty(value = "密码",hidden = true) + @ApiModelProperty(value = "密码", hidden = true) private String password; - @ApiModelProperty(value = "是否为管理员",hidden = true) + @ApiModelProperty(value = "是否为管理员", hidden = true) @Column(name = "is_admin") private String isAdmin; //临时字段 @@ -61,5 +61,4 @@ public class SysUser extends BaseEntity { private transient List menus; @ApiModelProperty(hidden = true) private transient List buttons; - } diff --git a/boot-service/src/main/java/com/xwbing/domain/mapper/BaseMapper.java b/boot-service/src/main/java/com/xwbing/domain/mapper/BaseMapper.java new file mode 100644 index 0000000..8484e2f --- /dev/null +++ b/boot-service/src/main/java/com/xwbing/domain/mapper/BaseMapper.java @@ -0,0 +1,32 @@ +package com.xwbing.domain.mapper; + +import java.util.List; +import java.util.Map; + +/** + * 项目名称: boot-module-demo + * 创建时间: 2018/6/2 10:32 + * 作者: xiangwb + * 说明: 基础mapper + */ +public interface BaseMapper { + int save(T t); + + int saveBatch(List list); + + int deleteById(String id); + + int deleteByIds(String[] ids); + + int delete(Map map); + + int update(T t); + + int updateBatch(List list); + + T findById(String id); + + List find(Map map); + + List findAll(); +} diff --git a/boot-service/src/main/java/com/xwbing/domain/mapper/SysUserMapper.java b/boot-service/src/main/java/com/xwbing/domain/mapper/sys/SysUserMapper.java similarity index 66% rename from boot-service/src/main/java/com/xwbing/domain/mapper/SysUserMapper.java rename to boot-service/src/main/java/com/xwbing/domain/mapper/sys/SysUserMapper.java index 18e08f1..7205792 100644 --- a/boot-service/src/main/java/com/xwbing/domain/mapper/SysUserMapper.java +++ b/boot-service/src/main/java/com/xwbing/domain/mapper/sys/SysUserMapper.java @@ -1,6 +1,7 @@ -package com.xwbing.domain.mapper; +package com.xwbing.domain.mapper.sys; import com.xwbing.domain.entity.sys.SysUser; +import com.xwbing.domain.mapper.BaseMapper; import java.util.List; @@ -10,7 +11,7 @@ import java.util.List; * 作者: xiangwb * 说明: */ -public interface SysUserMapper { +public interface SysUserMapper extends BaseMapper { // @Select("select * from sys_user_info") List findall(); int save(SysUser sysUser); diff --git a/boot-service/src/main/resources/druid.properties b/boot-service/src/main/resources/druid.properties index 5ed6bdb..1bd44ad 100644 --- a/boot-service/src/main/resources/druid.properties +++ b/boot-service/src/main/resources/druid.properties @@ -1,9 +1,9 @@ -##jdbc配置##################################### +##jdbc配置## db1.driver-class-name=com.mysql.jdbc.Driver db1.url=jdbc:mysql://127.0.0.1:3306/xwbing?useUnicode=true&characterEncoding=utf8&useSSL=false db1.username=root db1.password=xwbing -##连接池配置############################### +##连接池配置## # 初始化大小，最小，最大 db1.initial-size=1 db1.min-idle=3 @@ -28,28 +28,6 @@ db1.filters=stat,wall,slf4j db1.connect-properties=druid.stat.mergeSql=true;druid.stat.slowSqlMillis=5000 # 合并多个DruidDataSource的监控数据 #db1.useGlobalDataSourceStat=true -##WebStatFilter配置################################### -db1.web-stat-filter.enabled=false -db1.web-stat-filter.url-pattern=/* -db1.web-stat-filter.exclusions=*.js,*.gif,*.jpg,*.png,*.css,*.ico,/druid/* -#sesison统计 -db1.web-stat-filter.session-stat-enable=true -db1.web-stat-filter.session-stat-max-count=1000 -db1.web-stat-filter.principal-session-name= -db1.web-stat-filter.principal-cookie-name= -#监控单个url调用的sql列表 -db1.web-stat-filter.profile-enable=true -##StatViewServlet配置############################### -db1.stat-view-servlet.enabled=true -db1.stat-view-servlet.url-pattern=/druid/* -#禁用HTML页面上的"Reset All"功能 -db1.stat-view-servlet.reset-enable=true -db1.stat-view-servlet.login-username=admin -db1.stat-view-servlet.login-password=123456 -#IP白名单(没有配置或者为空,则允许所有访问) -db1.stat-view-servlet.allow= -#IP黑名单(存在共同时,deny优先于allow) -db1.stat-view-servlet.deny= ########################################################################################################### db2.driver-class-name=com.mysql.jdbc.Driver db2.url=jdbc:mysql://127.0.0.1:3306/xwbing?useUnicode=true&characterEncoding=utf8&useSSL=false @@ -69,4 +47,27 @@ db2.pool-prepared-statements=true db2.max-pool-prepared-statement-per-connection-size=20 db2.filters=stat,wall,slf4j db2.connect-properties=druid.stat.mergeSql=true;druid.stat.slowSqlMillis=5000 -#db2.useGlobalDataSourceStat=true \ No newline at end of file +#db2.useGlobalDataSourceStat=true +########################################################################################################### +##WebStatFilter配置## +spring.datasource.druid.web-stat-filter.enabled=false +spring.datasource.druid.web-stat-filter.url-pattern=/* +spring.datasource.druid.web-stat-filter.exclusions=*.js,*.gif,*.jpg,*.png,*.css,*.ico,/druid/* +#sesison统计 +spring.datasource.druid.web-stat-filter.session-stat-enable=true +spring.datasource.druid.web-stat-filter.session-stat-max-count=1000 +spring.datasource.druid.web-stat-filter.principal-session-name= +spring.datasource.druid.web-stat-filter.principal-cookie-name= +#监控单个url调用的sql列表 +spring.datasource.druid.web-stat-filter.profile-enable=true +##StatViewServlet配置## +spring.datasource.druid.stat-view-servlet.enabled=true +spring.datasource.druid.stat-view-servlet.url-pattern=/druid/* +#禁用HTML页面上的"Reset All"功能 +spring.datasource.druid.stat-view-servlet.reset-enable=true +spring.datasource.druid.stat-view-servlet.login-username=admin +spring.datasource.druid.stat-view-servlet.login-password=123456 +#IP白名单(没有配置或者为空,则允许所有访问) +spring.datasource.druid.stat-view-servlet.allow= +#IP黑名单(存在共同时,deny优先于allow) +spring.datasource.druid.stat-view-servlet.deny= \ No newline at end of file diff --git a/boot-service/src/main/resources/mapper/sys/sysRole.xml b/boot-service/src/main/resources/mapper/sys/sysRole.xml new file mode 100644 index 0000000..e69de29 diff --git a/boot-service/src/main/resources/mapper/sys/sysRoleAuthority.xml b/boot-service/src/main/resources/mapper/sys/sysRoleAuthority.xml new file mode 100644 index 0000000..e69de29 diff --git a/boot-service/src/main/resources/mapper/sysUser.xml b/boot-service/src/main/resources/mapper/sys/sysUser.xml similarity index 87% rename from boot-service/src/main/resources/mapper/sysUser.xml rename to boot-service/src/main/resources/mapper/sys/sysUser.xml index b98c278..1c528e4 100644 --- a/boot-service/src/main/resources/mapper/sysUser.xml +++ b/boot-service/src/main/resources/mapper/sys/sysUser.xml @@ -1,6 +1,6 @@ - + @@ -8,7 +8,10 @@ - + + sys_user_info + + user_id, user_name, password, phone diff --git a/boot-service/src/main/resources/mapper/sys/sysUserLoginInOut.xml b/boot-service/src/main/resources/mapper/sys/sysUserLoginInOut.xml new file mode 100644 index 0000000..e69de29 diff --git a/boot-service/src/main/resources/mapper/sys/sysUserRole.xml b/boot-service/src/main/resources/mapper/sys/sysUserRole.xml new file mode 100644 index 0000000..e69de29 diff --git a/boot-web/src/main/java/com/xwbing/Application.java b/boot-web/src/main/java/com/xwbing/Application.java index 2c80a67..ed9ad6e 100644 --- a/boot-web/src/main/java/com/xwbing/Application.java +++ b/boot-web/src/main/java/com/xwbing/Application.java @@ -11,7 +11,6 @@ import org.springframework.boot.autoconfigure.SpringBootApplication; */ @SpringBootApplication public class Application { - public static void main(String[] args) { SpringApplication.run(Application.class, args); } diff --git a/boot-web/src/main/java/com/xwbing/controller/rest/TestControl.java b/boot-web/src/main/java/com/xwbing/controller/rest/TestControl.java index 014e2c9..0456d21 100644 --- a/boot-web/src/main/java/com/xwbing/controller/rest/TestControl.java +++ b/boot-web/src/main/java/com/xwbing/controller/rest/TestControl.java @@ -5,8 +5,7 @@ import com.xwbing.annotation.LogInfo; import com.xwbing.domain.entity.ExpressInfo; import com.xwbing.domain.entity.sys.SysUser; import com.xwbing.domain.entity.vo.ExpressInfoVo; -import com.xwbing.domain.mapper.SysUserMapper; -import com.xwbing.exception.BusinessException; +import com.xwbing.domain.mapper.sys.SysUserMapper; import com.xwbing.rabbit.Sender; import com.xwbing.redis.RedisService; import com.xwbing.service.rest.CookieSessionService; @@ -56,6 +55,7 @@ public class TestControl { @PostMapping("save") public void save(@RequestBody SysUser sysUser) { int save = sysUserMapper.save(sysUser); + sysUserMapper.save(sysUser); System.out.println("shiwi"); } @GetMapping("send")