{
+
+}
diff --git a/springboot-mybatis/src/main/java/com/xncoding/pos/config/MybatisPlusConfig.java b/springboot-mybatis/src/main/java/com/xncoding/pos/config/MybatisPlusConfig.java
new file mode 100644
index 0000000..52a83d5
--- /dev/null
+++ b/springboot-mybatis/src/main/java/com/xncoding/pos/config/MybatisPlusConfig.java
@@ -0,0 +1,46 @@
+package com.xncoding.pos.config;
+
+import com.alibaba.druid.pool.DruidDataSource;
+import com.baomidou.mybatisplus.plugins.PaginationInterceptor;
+import com.xncoding.pos.config.properties.DruidProperties;
+import org.mybatis.spring.annotation.MapperScan;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.transaction.annotation.EnableTransactionManagement;
+
+import javax.annotation.Resource;
+
+/**
+ * MybatisPlus配置
+ *
+ * @author xiongneng
+ * @since 2017/5/20 21:58
+ */
+@Configuration
+@EnableTransactionManagement(order = 2)
+@MapperScan(basePackages = {
+ "com.xncoding.pos.common.dao.repository",
+ "com.xncoding.pos.dao.repository"})
+public class MybatisPlusConfig {
+
+ @Resource
+ private DruidProperties druidProperties;
+
+ /**
+ * 单数据源连接池配置
+ */
+ @Bean
+ public DruidDataSource singleDatasource() {
+ DruidDataSource dataSource = new DruidDataSource();
+ druidProperties.config(dataSource);
+ return dataSource;
+ }
+
+ /**
+ * mybatis-plus分页插件
+ */
+ @Bean
+ public PaginationInterceptor paginationInterceptor() {
+ return new PaginationInterceptor();
+ }
+}
diff --git a/springboot-mybatis/src/main/java/com/xncoding/pos/config/properties/DruidProperties.java b/springboot-mybatis/src/main/java/com/xncoding/pos/config/properties/DruidProperties.java
new file mode 100644
index 0000000..7cb4424
--- /dev/null
+++ b/springboot-mybatis/src/main/java/com/xncoding/pos/config/properties/DruidProperties.java
@@ -0,0 +1,249 @@
+package com.xncoding.pos.config.properties;
+
+import com.alibaba.druid.pool.DruidDataSource;
+import com.alibaba.druid.util.JdbcConstants;
+import org.springframework.boot.context.properties.ConfigurationProperties;
+import org.springframework.stereotype.Component;
+
+import java.sql.SQLException;
+
+/**
+ * 数据库数据源配置
+ * 说明:这个类中包含了许多默认配置,若这些配置符合您的情况,您可以不用管,若不符合,建议不要修改本类,建议直接在"application.yml"中配置即可
+ *
+ * @author xiongneng
+ * @since 2017-05-21 11:18
+ */
+@Component
+@ConfigurationProperties(prefix = "spring.datasource")
+public class DruidProperties {
+
+ private String url;
+
+ private String username;
+
+ private String password;
+
+ private String driverClassName = "com.mysql.cj.jdbc.Driver";
+
+ private Integer initialSize = 10;
+
+ private Integer minIdle = 3;
+
+ private Integer maxActive = 60;
+
+ private Integer maxWait = 60000;
+
+ private Boolean removeAbandoned = true;
+
+ private Integer removeAbandonedTimeout = 180;
+
+ private Integer timeBetweenEvictionRunsMillis = 60000;
+
+ private Integer minEvictableIdleTimeMillis = 300000;
+
+ private String validationQuery = "SELECT 'x'";
+
+ private Boolean testWhileIdle = true;
+
+ private Boolean testOnBorrow = false;
+
+ private Boolean testOnReturn = false;
+
+ private Boolean poolPreparedStatements = true;
+
+ private Integer maxPoolPreparedStatementPerConnectionSize = 50;
+
+ private String filters = "stat";
+
+ public void config(DruidDataSource dataSource) {
+ dataSource.setDbType(JdbcConstants.MYSQL);
+ dataSource.setUrl(url);
+ dataSource.setUsername(username);
+ dataSource.setPassword(password);
+ dataSource.setDriverClassName(driverClassName);
+ dataSource.setInitialSize(initialSize); // 定义初始连接数
+ dataSource.setMinIdle(minIdle); // 最小空闲
+ dataSource.setMaxActive(maxActive); // 定义最大连接数
+ dataSource.setMaxWait(maxWait); // 获取连接等待超时的时间
+ dataSource.setRemoveAbandoned(removeAbandoned); // 超过时间限制是否回收
+ dataSource.setRemoveAbandonedTimeout(removeAbandonedTimeout); // 超过时间限制多长
+
+ // 配置间隔多久才进行一次检测，检测需要关闭的空闲连接，单位是毫秒
+ dataSource.setTimeBetweenEvictionRunsMillis(timeBetweenEvictionRunsMillis);
+ // 配置一个连接在池中最小生存的时间，单位是毫秒
+ dataSource.setMinEvictableIdleTimeMillis(minEvictableIdleTimeMillis);
+ // 用来检测连接是否有效的sql，要求是一个查询语句
+ dataSource.setValidationQuery(validationQuery);
+ // 申请连接的时候检测
+ dataSource.setTestWhileIdle(testWhileIdle);
+ // 申请连接时执行validationQuery检测连接是否有效，配置为true会降低性能
+ dataSource.setTestOnBorrow(testOnBorrow);
+ // 归还连接时执行validationQuery检测连接是否有效，配置为true会降低性能
+ dataSource.setTestOnReturn(testOnReturn);
+ // 打开PSCache，并且指定每个连接上PSCache的大小
+ dataSource.setPoolPreparedStatements(poolPreparedStatements);
+ dataSource.setMaxPoolPreparedStatementPerConnectionSize(maxPoolPreparedStatementPerConnectionSize);
+ // 属性类型是字符串，通过别名的方式配置扩展插件，常用的插件有：
+ // 监控统计用的filter:stat
+ // 日志用的filter:log4j
+ // 防御SQL注入的filter:wall
+ try {
+ dataSource.setFilters(filters);
+ } catch (SQLException e) {
+ e.printStackTrace();
+ }
+ }
+
+ public String getUrl() {
+ return url;
+ }
+
+ public void setUrl(String url) {
+ this.url = url;
+ }
+
+ public String getUsername() {
+ return username;
+ }
+
+ public void setUsername(String username) {
+ this.username = username;
+ }
+
+ public String getPassword() {
+ return password;
+ }
+
+ public void setPassword(String password) {
+ this.password = password;
+ }
+
+ public String getDriverClassName() {
+ return driverClassName;
+ }
+
+ public void setDriverClassName(String driverClassName) {
+ this.driverClassName = driverClassName;
+ }
+
+ public Integer getInitialSize() {
+ return initialSize;
+ }
+
+ public void setInitialSize(Integer initialSize) {
+ this.initialSize = initialSize;
+ }
+
+ public Integer getMinIdle() {
+ return minIdle;
+ }
+
+ public void setMinIdle(Integer minIdle) {
+ this.minIdle = minIdle;
+ }
+
+ public Integer getMaxActive() {
+ return maxActive;
+ }
+
+ public void setMaxActive(Integer maxActive) {
+ this.maxActive = maxActive;
+ }
+
+ public Integer getMaxWait() {
+ return maxWait;
+ }
+
+ public void setMaxWait(Integer maxWait) {
+ this.maxWait = maxWait;
+ }
+
+ public Integer getTimeBetweenEvictionRunsMillis() {
+ return timeBetweenEvictionRunsMillis;
+ }
+
+ public void setTimeBetweenEvictionRunsMillis(Integer timeBetweenEvictionRunsMillis) {
+ this.timeBetweenEvictionRunsMillis = timeBetweenEvictionRunsMillis;
+ }
+
+ public Integer getMinEvictableIdleTimeMillis() {
+ return minEvictableIdleTimeMillis;
+ }
+
+ public void setMinEvictableIdleTimeMillis(Integer minEvictableIdleTimeMillis) {
+ this.minEvictableIdleTimeMillis = minEvictableIdleTimeMillis;
+ }
+
+ public String getValidationQuery() {
+ return validationQuery;
+ }
+
+ public void setValidationQuery(String validationQuery) {
+ this.validationQuery = validationQuery;
+ }
+
+ public Boolean getTestWhileIdle() {
+ return testWhileIdle;
+ }
+
+ public void setTestWhileIdle(Boolean testWhileIdle) {
+ this.testWhileIdle = testWhileIdle;
+ }
+
+ public Boolean getTestOnBorrow() {
+ return testOnBorrow;
+ }
+
+ public void setTestOnBorrow(Boolean testOnBorrow) {
+ this.testOnBorrow = testOnBorrow;
+ }
+
+ public Boolean getTestOnReturn() {
+ return testOnReturn;
+ }
+
+ public void setTestOnReturn(Boolean testOnReturn) {
+ this.testOnReturn = testOnReturn;
+ }
+
+ public Boolean getPoolPreparedStatements() {
+ return poolPreparedStatements;
+ }
+
+ public void setPoolPreparedStatements(Boolean poolPreparedStatements) {
+ this.poolPreparedStatements = poolPreparedStatements;
+ }
+
+ public Integer getMaxPoolPreparedStatementPerConnectionSize() {
+ return maxPoolPreparedStatementPerConnectionSize;
+ }
+
+ public void setMaxPoolPreparedStatementPerConnectionSize(Integer maxPoolPreparedStatementPerConnectionSize) {
+ this.maxPoolPreparedStatementPerConnectionSize = maxPoolPreparedStatementPerConnectionSize;
+ }
+
+ public String getFilters() {
+ return filters;
+ }
+
+ public void setFilters(String filters) {
+ this.filters = filters;
+ }
+
+ public Boolean getRemoveAbandoned() {
+ return removeAbandoned;
+ }
+
+ public void setRemoveAbandoned(Boolean removeAbandoned) {
+ this.removeAbandoned = removeAbandoned;
+ }
+
+ public Integer getRemoveAbandonedTimeout() {
+ return removeAbandonedTimeout;
+ }
+
+ public void setRemoveAbandonedTimeout(Integer removeAbandonedTimeout) {
+ this.removeAbandonedTimeout = removeAbandonedTimeout;
+ }
+}
diff --git a/springboot-mybatis/src/main/java/com/xncoding/pos/service/UserService.java b/springboot-mybatis/src/main/java/com/xncoding/pos/service/UserService.java
new file mode 100644
index 0000000..0b04ca9
--- /dev/null
+++ b/springboot-mybatis/src/main/java/com/xncoding/pos/service/UserService.java
@@ -0,0 +1,52 @@
+package com.xncoding.pos.service;
+
+import com.xncoding.pos.common.dao.entity.User;
+import com.xncoding.pos.common.dao.repository.UserMapper;
+import org.springframework.stereotype.Service;
+
+import javax.annotation.Resource;
+
+/**
+ * 后台用户管理
+ */
+
+@Service
+public class UserService {
+
+ @Resource
+ private UserMapper userMapper;
+
+ /**
+ * 通过ID查找用户
+ * @param id
+ * @return
+ */
+ public User findById(Integer id) {
+ return userMapper.selectById(id);
+ }
+
+ /**
+ * 新增用户
+ * @param user
+ */
+ public void insertUser(User user) {
+ userMapper.insert(user);
+ }
+
+ /**
+ * 修改用户
+ * @param user
+ */
+ public void updateUser(User user) {
+ userMapper.updateById(user);
+ }
+
+ /**
+ * 删除用户
+ * @param id
+ */
+ public void deleteUser(Integer id) {
+ userMapper.deleteById(id);
+ }
+
+}
diff --git a/springboot-mybatis/src/main/resources/application.yml b/springboot-mybatis/src/main/resources/application.yml
new file mode 100644
index 0000000..992edb8
--- /dev/null
+++ b/springboot-mybatis/src/main/resources/application.yml
@@ -0,0 +1,70 @@
+##########################################################
+################## 所有profile共有的配置 #################
+##########################################################
+
+################### spring配置 ###################
+spring:
+ profiles:
+ active: dev
+
+################### mybatis-plus配置 ###################
+mybatis-plus:
+ mapper-locations: classpath*:com/xncoding/pos/dao/repository/mapping/*.xml
+ typeAliasesPackage: >
+ com.xncoding.pos.common.dao.entity
+ global-config:
+ id-type: 0 # 0:数据库ID自增 1:用户输入id 2:全局唯一id(IdWorker) 3:全局唯一ID(uuid)
+ db-column-underline: false
+ refresh-mapper: true
+ configuration:
+ map-underscore-to-camel-case: true
+ cache-enabled: true #配置的缓存的全局开关
+ lazyLoadingEnabled: true #延时加载的开关
+ multipleResultSetsEnabled: true #开启的话，延时加载一个属性时会加载该对象全部属性，否则按需加载属性
+
+logging:
+ level:
+ org.springframework.web.servlet: ERROR
+
+---
+
+#####################################################################
+######################## 开发环境profile ##########################
+#####################################################################
+spring:
+ profiles: dev
+ datasource:
+ url: jdbc:mysql://123.207.66.156:3306/pos?useSSL=false&autoReconnect=true&tinyInt1isBit=false&useUnicode=true&characterEncoding=utf8
+ username: root
+ password: ******
+ thymeleaf:
+ cache: false
+
+logging:
+ level:
+ ROOT: INFO
+ com:
+ xncoding: DEBUG
+ file: E:/logs/app.log
+
+---
+
+#####################################################################
+######################## 测试环境profile ##########################
+#####################################################################
+
+spring:
+ profiles: test
+ datasource:
+ url: jdbc:mysql://123.207.66.156:3306/pos?useSSL=false&autoReconnect=true&tinyInt1isBit=false&useUnicode=true&characterEncoding=utf8
+ username: root
+ password: ******
+ thymeleaf:
+ cache: false
+
+logging:
+ level:
+ ROOT: INFO
+ com:
+ xncoding: DEBUG
+ file: /var/logs/app.log
diff --git a/springboot-mybatis/src/main/resources/banner.txt b/springboot-mybatis/src/main/resources/banner.txt
new file mode 100644
index 0000000..859b78f
--- /dev/null
+++ b/springboot-mybatis/src/main/resources/banner.txt
@@ -0,0 +1,23 @@
+
+ _____ _______ _____ _____
+ /\ \ /::\ \ /\ \ /\ \
+ /::\____\ /::::\ \ /::\____\ /::\ \
+ /:::/ / /::::::\ \ /:::/ / /::::\ \
+ /:::/ / /::::::::\ \ /:::/ / /::::::\ \
+ /:::/ / /:::/~~\:::\ \ /:::/ / /:::/\:::\ \
+ /:::/ / /:::/ \:::\ \ /:::/____/ /:::/__\:::\ \
+ /:::/ / /:::/ / \:::\ \ |::| | /::::\ \:::\ \
+ /:::/ / /:::/____/ \:::\____\ |::| | _____ /::::::\ \:::\ \
+ /:::/ / |:::| | |:::| | |::| | /\ \ /:::/\:::\ \:::\ \
+/:::/____/ |:::|____| |:::| | |::| | /::\____\/:::/__\:::\ \:::\____\
+\:::\ \ \:::\ \ /:::/ / |::| | /:::/ /\:::\ \:::\ \::/ /
+ \:::\ \ \:::\ \ /:::/ / |::| | /:::/ / \:::\ \:::\ \/____/
+ \:::\ \ \:::\ /:::/ / |::|____|/:::/ / \:::\ \:::\ \
+ \:::\ \ \:::\__/:::/ / |:::::::::::/ / \:::\ \:::\____\
+ \:::\ \ \::::::::/ / \::::::::::/____/ \:::\ \::/ /
+ \:::\ \ \::::::/ / ~~~~~~~~~~ \:::\ \/____/
+ \:::\ \ \::::/ / \:::\ \
+ \:::\____\ \::/____/ \:::\____\
+ \::/ / ~~ \::/ /
+ \/____/ \/____/
+
diff --git a/springboot-mybatis/src/main/resources/sql/schema.sql b/springboot-mybatis/src/main/resources/sql/schema.sql
new file mode 100644
index 0000000..b332fb1
--- /dev/null
+++ b/springboot-mybatis/src/main/resources/sql/schema.sql
@@ -0,0 +1,24 @@
+# -------------------------------------以下业务表开始-------------------------------------------
+# CREATE DATABASE IF NOT EXISTS pos default charset utf8 COLLATE utf8_general_ci;
+# SET FOREIGN_KEY_CHECKS=0;
+# USE pos;
+
+# -------------------------------------以下用户管理表开始-------------------------------------------
+
+-- 后台管理用户表
+DROP TABLE IF EXISTS `t_user`;
+CREATE TABLE `t_user` (
+ `id` INT(11) PRIMARY KEY AUTO_INCREMENT COMMENT '主键ID',
+ `username` VARCHAR(32) NOT NULL COMMENT '账号',
+ `name` VARCHAR(16) DEFAULT '' COMMENT '名字',
+ `password` VARCHAR(128) DEFAULT '' COMMENT '密码',
+ `salt` VARCHAR(64) DEFAULT '' COMMENT 'md5密码盐',
+ `phone` VARCHAR(32) DEFAULT '' COMMENT '联系电话',
+ `tips` VARCHAR(255) COMMENT '备注',
+ `state` TINYINT(1) DEFAULT 1 COMMENT '状态 1:正常 2:禁用',
+ `created_time` DATETIME DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间',
+ `updated_time` DATETIME DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT '更新时间'
+) ENGINE=InnoDB AUTO_INCREMENT=1 DEFAULT CHARSET=utf8 COMMENT='后台管理用户表';
+INSERT INTO `t_user` VALUES (1,'admin','系统管理员','123456','www', '17890908889', '系统管理员', 1, '2017-12-12 09:46:12', '2017-12-12 09:46:12');
+INSERT INTO `t_user` VALUES (2,'aix','张三','123456','eee', '17859569358', '', 1, '2017-12-12 09:46:12', '2017-12-12 09:46:12');
+
diff --git a/springboot-mybatis/src/test/java/com/xncoding/pos/ApplicationTests.java b/springboot-mybatis/src/test/java/com/xncoding/pos/ApplicationTests.java
new file mode 100644
index 0000000..71ff546
--- /dev/null
+++ b/springboot-mybatis/src/test/java/com/xncoding/pos/ApplicationTests.java
@@ -0,0 +1,56 @@
+package com.xncoding.pos;
+
+import com.xncoding.pos.common.dao.entity.User;
+import com.xncoding.pos.service.UserService;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.test.context.junit4.SpringRunner;
+
+import javax.annotation.Resource;
+
+import static org.hamcrest.MatcherAssert.assertThat;
+import static org.hamcrest.Matchers.is;
+import static org.hamcrest.Matchers.nullValue;
+
+/**
+ * 测试
+ */
+@RunWith(SpringRunner.class)
+@SpringBootTest
+public class ApplicationTests {
+ private static final Logger log = LoggerFactory.getLogger(ApplicationTests.class);
+
+ @Resource
+ private UserService userService;
+
+ /**
+ * 测试增删改查
+ */
+ @Test
+ public void test() {
+ User user = new User();
+ user.setUsername("xiaoxx");
+ user.setName("小星星");
+ user.setPassword("222222");
+ user.setPhone("13890907676");
+ userService.insertUser(user);
+
+ User user1 = userService.findById(user.getId());
+ assertThat(user1.getUsername(), is("xiaoxx"));
+ assertThat(user1.getName(), is("小星星"));
+
+ user1.setPassword("888888");
+ userService.updateUser(user1);
+ User user2 = userService.findById(user.getId());
+ assertThat(user2.getPassword(), is("888888"));
+
+ userService.deleteUser(user.getId());
+
+ User user3 = userService.findById(user.getId());
+ assertThat(user3, nullValue());
+
+ }
+}
diff --git a/springboot-redis/README.md b/springboot-redis/README.md
index b8b6061..07493b2 100644
--- a/springboot-redis/README.md
+++ b/springboot-redis/README.md
@@ -2,6 +2,14 @@
SpringBoot中通过RedisTemplate来直接操作Redis缓存数据库
+## 运行
+
+初始化sql文件在`resources/sql/t_user.sql`中
+
+另外还需要安装Redis，配置好`application.yml`文件中的redis地址
+
+测试用例：`com.xncoding.service.UserServiceTest.java`
+
## 许可证
Copyright (c) 2018 Xiong Neng
diff --git a/springboot-redis/pom.xml b/springboot-redis/pom.xml
index 1ab5fac..cfcb9ad 100644
--- a/springboot-redis/pom.xml
+++ b/springboot-redis/pom.xml
@@ -4,7 +4,7 @@
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
4.0.0
- com.enzhico
+ com.xncoding
springboot-redis
1.0.0-SNAPSHOT
jar
diff --git a/springboot-redis/src/main/java/com/enzhico/trans/Application.java b/springboot-redis/src/main/java/com/enzhico/trans/Application.java
deleted file mode 100644
index 77de9df..0000000
--- a/springboot-redis/src/main/java/com/enzhico/trans/Application.java
+++ /dev/null
@@ -1,12 +0,0 @@
-package com.enzhico.trans;
-
-import org.springframework.boot.SpringApplication;
-import org.springframework.boot.autoconfigure.SpringBootApplication;
-
-@SpringBootApplication
-public class Application {
- public static void main(String[] args) {
- SpringApplication.run(Application.class, args);
- }
-
-}
diff --git a/springboot-redis/src/main/java/com/xncoding/pos/Application.java b/springboot-redis/src/main/java/com/xncoding/pos/Application.java
new file mode 100644
index 0000000..adc4c48
--- /dev/null
+++ b/springboot-redis/src/main/java/com/xncoding/pos/Application.java
@@ -0,0 +1,12 @@
+package com.xncoding.pos;
+
+import org.springframework.boot.SpringApplication;
+import org.springframework.boot.autoconfigure.SpringBootApplication;
+
+@SpringBootApplication
+public class Application {
+ public static void main(String[] args) {
+ SpringApplication.run(Application.class, args);
+ }
+
+}
diff --git a/springboot-redis/src/main/java/com/enzhico/trans/config/DruidProperties.java b/springboot-redis/src/main/java/com/xncoding/pos/config/DruidProperties.java
similarity index 99%
rename from springboot-redis/src/main/java/com/enzhico/trans/config/DruidProperties.java
rename to springboot-redis/src/main/java/com/xncoding/pos/config/DruidProperties.java
index 31e1bf8..ea3dd72 100644
--- a/springboot-redis/src/main/java/com/enzhico/trans/config/DruidProperties.java
+++ b/springboot-redis/src/main/java/com/xncoding/pos/config/DruidProperties.java
@@ -1,4 +1,4 @@
-package com.enzhico.trans.config;
+package com.xncoding.pos.config;
import com.alibaba.druid.pool.DruidDataSource;
import com.alibaba.druid.util.JdbcConstants;
diff --git a/springboot-redis/src/main/java/com/enzhico/trans/config/MybatisPlusConfig.java b/springboot-redis/src/main/java/com/xncoding/pos/config/MybatisPlusConfig.java
similarity index 83%
rename from springboot-redis/src/main/java/com/enzhico/trans/config/MybatisPlusConfig.java
rename to springboot-redis/src/main/java/com/xncoding/pos/config/MybatisPlusConfig.java
index 036728b..35b3af4 100644
--- a/springboot-redis/src/main/java/com/enzhico/trans/config/MybatisPlusConfig.java
+++ b/springboot-redis/src/main/java/com/xncoding/pos/config/MybatisPlusConfig.java
@@ -1,10 +1,8 @@
-package com.enzhico.trans.config;
+package com.xncoding.pos.config;
import com.alibaba.druid.pool.DruidDataSource;
import com.baomidou.mybatisplus.plugins.PaginationInterceptor;
-import com.enzhico.trans.config.DruidProperties;
import org.mybatis.spring.annotation.MapperScan;
-import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
import org.springframework.transaction.annotation.EnableTransactionManagement;
@@ -19,7 +17,7 @@ import javax.annotation.Resource;
*/
@Configuration
@EnableTransactionManagement(order = 2)
-@MapperScan(basePackages = {"com.enzhico.trans.dao.repository"})
+@MapperScan(basePackages = {"com.xncoding.pos.dao.repository"})
public class MybatisPlusConfig {
@Resource
diff --git a/springboot-redis/src/main/java/com/enzhico/trans/config/RedisConfig.java b/springboot-redis/src/main/java/com/xncoding/pos/config/RedisConfig.java
similarity index 98%
rename from springboot-redis/src/main/java/com/enzhico/trans/config/RedisConfig.java
rename to springboot-redis/src/main/java/com/xncoding/pos/config/RedisConfig.java
index 765b9bd..0ffa92e 100644
--- a/springboot-redis/src/main/java/com/enzhico/trans/config/RedisConfig.java
+++ b/springboot-redis/src/main/java/com/xncoding/pos/config/RedisConfig.java
@@ -1,4 +1,4 @@
-package com.enzhico.trans.config;
+package com.xncoding.pos.config;
import com.fasterxml.jackson.annotation.JsonAutoDetect;
import com.fasterxml.jackson.annotation.PropertyAccessor;
diff --git a/springboot-redis/src/main/java/com/enzhico/trans/dao/entity/User.java b/springboot-redis/src/main/java/com/xncoding/pos/dao/entity/User.java
similarity index 96%
rename from springboot-redis/src/main/java/com/enzhico/trans/dao/entity/User.java
rename to springboot-redis/src/main/java/com/xncoding/pos/dao/entity/User.java
index 2e5c34c..3337cd5 100644
--- a/springboot-redis/src/main/java/com/enzhico/trans/dao/entity/User.java
+++ b/springboot-redis/src/main/java/com/xncoding/pos/dao/entity/User.java
@@ -1,4 +1,4 @@
-package com.enzhico.trans.dao.entity;
+package com.xncoding.pos.dao.entity;
import com.baomidou.mybatisplus.activerecord.Model;
import com.baomidou.mybatisplus.annotations.TableId;
diff --git a/springboot-batch/src/main/java/com/enzhico/trans/dao/repository/UserMapper.java b/springboot-redis/src/main/java/com/xncoding/pos/dao/repository/UserMapper.java
similarity index 56%
rename from springboot-batch/src/main/java/com/enzhico/trans/dao/repository/UserMapper.java
rename to springboot-redis/src/main/java/com/xncoding/pos/dao/repository/UserMapper.java
index a7800de..c3b5d14 100644
--- a/springboot-batch/src/main/java/com/enzhico/trans/dao/repository/UserMapper.java
+++ b/springboot-redis/src/main/java/com/xncoding/pos/dao/repository/UserMapper.java
@@ -1,7 +1,7 @@
-package com.enzhico.trans.dao.repository;
+package com.xncoding.pos.dao.repository;
import com.baomidou.mybatisplus.mapper.BaseMapper;
-import com.enzhico.trans.dao.entity.User;
+import com.xncoding.pos.dao.entity.User;
public interface UserMapper extends BaseMapper {
}
diff --git a/springboot-redis/src/main/java/com/enzhico/trans/service/UserService.java b/springboot-redis/src/main/java/com/xncoding/pos/service/UserService.java
similarity index 86%
rename from springboot-redis/src/main/java/com/enzhico/trans/service/UserService.java
rename to springboot-redis/src/main/java/com/xncoding/pos/service/UserService.java
index 100a658..534075b 100644
--- a/springboot-redis/src/main/java/com/enzhico/trans/service/UserService.java
+++ b/springboot-redis/src/main/java/com/xncoding/pos/service/UserService.java
@@ -1,14 +1,9 @@
-package com.enzhico.trans.service;
+package com.xncoding.pos.service;
-import com.enzhico.trans.dao.entity.User;
-import com.enzhico.trans.dao.repository.UserMapper;
+import com.xncoding.pos.dao.entity.User;
+import com.xncoding.pos.dao.repository.UserMapper;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.cache.annotation.CacheConfig;
-import org.springframework.cache.annotation.CacheEvict;
-import org.springframework.cache.annotation.CachePut;
-import org.springframework.cache.annotation.Cacheable;
import org.springframework.data.redis.core.RedisTemplate;
import org.springframework.data.redis.core.ValueOperations;
import org.springframework.stereotype.Service;
diff --git a/springboot-redis/src/main/resources/application.yml b/springboot-redis/src/main/resources/application.yml
index eb585e2..d36c7fc 100644
--- a/springboot-redis/src/main/resources/application.yml
+++ b/springboot-redis/src/main/resources/application.yml
@@ -2,14 +2,6 @@
################## 所有profile共有的配置 #################
##########################################################
-################### 自定义项目配置 ###################
-enzhico:
- kaptcha-open: true #是否开启登录时验证码 (true/false)
- session-open: false #是否开启session验证 (true/false)
-
-################### 项目启动端口 ###################
-server.port: 8092
-
################### spring配置 ###################
spring:
profiles:
@@ -17,13 +9,13 @@ spring:
datasource:
url: jdbc:mysql://123.207.66.156:3306/test?useSSL=false&autoReconnect=true&tinyInt1isBit=false&useUnicode=true&characterEncoding=utf8
username: root
- password: _EnZhi123
+ password: ******
################### mybatis-plus配置 ###################
mybatis-plus:
- mapper-locations: classpath*:com/enzhico/trans/dao/repository/mapping/*.xml
+ mapper-locations: classpath*:com/xncoding/pos/dao/repository/mapping/*.xml
typeAliasesPackage: >
- com.enzhico.trans.dao.entity
+ com.xncoding.pos.dao.entity
global-config:
id-type: 0 # 0:数据库ID自增 1:用户输入id 2:全局唯一id(IdWorker) 3:全局唯一ID(uuid)
db-column-underline: false
@@ -62,6 +54,6 @@ logging:
level:
ROOT: INFO
com:
- enzhico: DEBUG
- file: E:/logs/trans.log
+ xncoding: DEBUG
+ file: E:/logs/app.log
diff --git a/springboot-redis/src/main/resources/sql/t_user.sql b/springboot-redis/src/main/resources/sql/t_user.sql
new file mode 100644
index 0000000..9d042a4
--- /dev/null
+++ b/springboot-redis/src/main/resources/sql/t_user.sql
@@ -0,0 +1,32 @@
+/*
+Navicat MySQL Data Transfer
+
+Source Server : 123.207.66.156-mysql
+Source Server Version : 50718
+Source Host : 123.207.66.156:3306
+Source Database : test
+
+Target Server Type : MYSQL
+Target Server Version : 50718
+File Encoding : 65001
+
+Date: 2018-02-27 16:12:19
+*/
+
+SET FOREIGN_KEY_CHECKS=0;
+
+-- ----------------------------
+-- Table structure for t_user
+-- ----------------------------
+DROP TABLE IF EXISTS `t_user`;
+CREATE TABLE `t_user` (
+ `id` int(11) NOT NULL AUTO_INCREMENT,
+ `username` varchar(255) DEFAULT NULL,
+ `password` varchar(255) DEFAULT NULL,
+ PRIMARY KEY (`id`)
+) ENGINE=InnoDB AUTO_INCREMENT=96 DEFAULT CHARSET=utf8;
+
+-- ----------------------------
+-- Records of t_user
+-- ----------------------------
+INSERT INTO `t_user` VALUES ('52', 'admin', 'admin');
diff --git a/springboot-redis/src/test/java/com/enzhico/service/UserServiceTest.java b/springboot-redis/src/test/java/com/xncoding/service/UserServiceTest.java
similarity index 89%
rename from springboot-redis/src/test/java/com/enzhico/service/UserServiceTest.java
rename to springboot-redis/src/test/java/com/xncoding/service/UserServiceTest.java
index 77b68be..43783d9 100644
--- a/springboot-redis/src/test/java/com/enzhico/service/UserServiceTest.java
+++ b/springboot-redis/src/test/java/com/xncoding/service/UserServiceTest.java
@@ -1,8 +1,8 @@
-package com.enzhico.service;
+package com.xncoding.service;
-import com.enzhico.trans.Application;
-import com.enzhico.trans.dao.entity.User;
-import com.enzhico.trans.service.UserService;
+import com.xncoding.pos.Application;
+import com.xncoding.pos.dao.entity.User;
+import com.xncoding.pos.service.UserService;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.springframework.beans.factory.annotation.Autowired;
diff --git a/springboot-thymeleaf/src/main/resources/application.yml b/springboot-thymeleaf/src/main/resources/application.yml
index dc2a3ca..f373b6c 100644
--- a/springboot-thymeleaf/src/main/resources/application.yml
+++ b/springboot-thymeleaf/src/main/resources/application.yml
@@ -30,7 +30,7 @@ logging:
level:
ROOT: INFO
com:
- enzhico: DEBUG
+ xncoding: DEBUG
file: E:/logs/app.log
---
@@ -43,5 +43,5 @@ logging:
level:
ROOT: INFO
com:
- enzhico: DEBUG
+ xncoding: DEBUG
file: /var/logs/app.log
diff --git a/springboot-transaction/pom.xml b/springboot-transaction/pom.xml
index 8f7cf41..55610c9 100644
--- a/springboot-transaction/pom.xml
+++ b/springboot-transaction/pom.xml
@@ -4,7 +4,7 @@
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
4.0.0
- com.enzhico
+ com.xncoding
springboot-transaction
1.0.0-SNAPSHOT
jar
diff --git a/springboot-transaction/src/main/java/com/enzhico/trans/Application.java b/springboot-transaction/src/main/java/com/enzhico/trans/Application.java
deleted file mode 100644
index 77de9df..0000000
--- a/springboot-transaction/src/main/java/com/enzhico/trans/Application.java
+++ /dev/null
@@ -1,12 +0,0 @@
-package com.enzhico.trans;
-
-import org.springframework.boot.SpringApplication;
-import org.springframework.boot.autoconfigure.SpringBootApplication;
-
-@SpringBootApplication
-public class Application {
- public static void main(String[] args) {
- SpringApplication.run(Application.class, args);
- }
-
-}
diff --git a/springboot-transaction/src/main/java/com/xncoding/trans/Application.java b/springboot-transaction/src/main/java/com/xncoding/trans/Application.java
new file mode 100644
index 0000000..83e2203
--- /dev/null
+++ b/springboot-transaction/src/main/java/com/xncoding/trans/Application.java
@@ -0,0 +1,12 @@
+package com.xncoding.trans;
+
+import org.springframework.boot.SpringApplication;
+import org.springframework.boot.autoconfigure.SpringBootApplication;
+
+@SpringBootApplication
+public class Application {
+ public static void main(String[] args) {
+ SpringApplication.run(Application.class, args);
+ }
+
+}
diff --git a/springboot-cache/src/main/java/com/enzhico/trans/config/DruidProperties.java b/springboot-transaction/src/main/java/com/xncoding/trans/config/DruidProperties.java
similarity index 99%
rename from springboot-cache/src/main/java/com/enzhico/trans/config/DruidProperties.java
rename to springboot-transaction/src/main/java/com/xncoding/trans/config/DruidProperties.java
index 31e1bf8..6331d4c 100644
--- a/springboot-cache/src/main/java/com/enzhico/trans/config/DruidProperties.java
+++ b/springboot-transaction/src/main/java/com/xncoding/trans/config/DruidProperties.java
@@ -1,4 +1,4 @@
-package com.enzhico.trans.config;
+package com.xncoding.trans.config;
import com.alibaba.druid.pool.DruidDataSource;
import com.alibaba.druid.util.JdbcConstants;
diff --git a/springboot-transaction/src/main/java/com/enzhico/trans/config/MybatisPlusConfig.java b/springboot-transaction/src/main/java/com/xncoding/trans/config/MybatisPlusConfig.java
similarity index 83%
rename from springboot-transaction/src/main/java/com/enzhico/trans/config/MybatisPlusConfig.java
rename to springboot-transaction/src/main/java/com/xncoding/trans/config/MybatisPlusConfig.java
index 036728b..c71d3c6 100644
--- a/springboot-transaction/src/main/java/com/enzhico/trans/config/MybatisPlusConfig.java
+++ b/springboot-transaction/src/main/java/com/xncoding/trans/config/MybatisPlusConfig.java
@@ -1,10 +1,8 @@
-package com.enzhico.trans.config;
+package com.xncoding.trans.config;
import com.alibaba.druid.pool.DruidDataSource;
import com.baomidou.mybatisplus.plugins.PaginationInterceptor;
-import com.enzhico.trans.config.DruidProperties;
import org.mybatis.spring.annotation.MapperScan;
-import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
import org.springframework.transaction.annotation.EnableTransactionManagement;
@@ -19,7 +17,7 @@ import javax.annotation.Resource;
*/
@Configuration
@EnableTransactionManagement(order = 2)
-@MapperScan(basePackages = {"com.enzhico.trans.dao.repository"})
+@MapperScan(basePackages = {"com.xncoding.trans.dao.repository"})
public class MybatisPlusConfig {
@Resource
diff --git a/springboot-transaction/src/main/java/com/enzhico/trans/controller/UserController.java b/springboot-transaction/src/main/java/com/xncoding/trans/controller/UserController.java
similarity index 86%
rename from springboot-transaction/src/main/java/com/enzhico/trans/controller/UserController.java
rename to springboot-transaction/src/main/java/com/xncoding/trans/controller/UserController.java
index 7e8c08f..364d2a9 100644
--- a/springboot-transaction/src/main/java/com/enzhico/trans/controller/UserController.java
+++ b/springboot-transaction/src/main/java/com/xncoding/trans/controller/UserController.java
@@ -1,7 +1,7 @@
-package com.enzhico.trans.controller;
+package com.xncoding.trans.controller;
-import com.enzhico.trans.dao.entity.User;
-import com.enzhico.trans.service.UserService;
+import com.xncoding.trans.dao.entity.User;
+import com.xncoding.trans.service.UserService;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
diff --git a/springboot-transaction/src/main/java/com/enzhico/trans/dao/entity/User.java b/springboot-transaction/src/main/java/com/xncoding/trans/dao/entity/User.java
similarity index 96%
rename from springboot-transaction/src/main/java/com/enzhico/trans/dao/entity/User.java
rename to springboot-transaction/src/main/java/com/xncoding/trans/dao/entity/User.java
index 0e621a4..c648b31 100644
--- a/springboot-transaction/src/main/java/com/enzhico/trans/dao/entity/User.java
+++ b/springboot-transaction/src/main/java/com/xncoding/trans/dao/entity/User.java
@@ -1,4 +1,4 @@
-package com.enzhico.trans.dao.entity;
+package com.xncoding.trans.dao.entity;
import com.baomidou.mybatisplus.activerecord.Model;
import com.baomidou.mybatisplus.annotations.TableId;
diff --git a/springboot-transaction/src/main/java/com/enzhico/trans/dao/repository/UserMapper.java b/springboot-transaction/src/main/java/com/xncoding/trans/dao/repository/UserMapper.java
similarity index 56%
rename from springboot-transaction/src/main/java/com/enzhico/trans/dao/repository/UserMapper.java
rename to springboot-transaction/src/main/java/com/xncoding/trans/dao/repository/UserMapper.java
index a7800de..d038163 100644
--- a/springboot-transaction/src/main/java/com/enzhico/trans/dao/repository/UserMapper.java
+++ b/springboot-transaction/src/main/java/com/xncoding/trans/dao/repository/UserMapper.java
@@ -1,7 +1,7 @@
-package com.enzhico.trans.dao.repository;
+package com.xncoding.trans.dao.repository;
import com.baomidou.mybatisplus.mapper.BaseMapper;
-import com.enzhico.trans.dao.entity.User;
+import com.xncoding.trans.dao.entity.User;
public interface UserMapper extends BaseMapper {
}
diff --git a/springboot-transaction/src/main/java/com/enzhico/trans/exception/MyException.java b/springboot-transaction/src/main/java/com/xncoding/trans/exception/MyException.java
similarity index 82%
rename from springboot-transaction/src/main/java/com/enzhico/trans/exception/MyException.java
rename to springboot-transaction/src/main/java/com/xncoding/trans/exception/MyException.java
index 1f8e05f..a0d937c 100644
--- a/springboot-transaction/src/main/java/com/enzhico/trans/exception/MyException.java
+++ b/springboot-transaction/src/main/java/com/xncoding/trans/exception/MyException.java
@@ -1,4 +1,4 @@
-package com.enzhico.trans.exception;
+package com.xncoding.trans.exception;
public class MyException extends RuntimeException {
public MyException() {
diff --git a/springboot-transaction/src/main/java/com/enzhico/trans/service/UserService.java b/springboot-transaction/src/main/java/com/xncoding/trans/service/UserService.java
similarity index 85%
rename from springboot-transaction/src/main/java/com/enzhico/trans/service/UserService.java
rename to springboot-transaction/src/main/java/com/xncoding/trans/service/UserService.java
index d53cc9f..00fa239 100644
--- a/springboot-transaction/src/main/java/com/enzhico/trans/service/UserService.java
+++ b/springboot-transaction/src/main/java/com/xncoding/trans/service/UserService.java
@@ -1,8 +1,8 @@
-package com.enzhico.trans.service;
+package com.xncoding.trans.service;
-import com.enzhico.trans.dao.entity.User;
-import com.enzhico.trans.dao.repository.UserMapper;
-import com.enzhico.trans.exception.MyException;
+import com.xncoding.trans.dao.entity.User;
+import com.xncoding.trans.dao.repository.UserMapper;
+import com.xncoding.trans.exception.MyException;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
diff --git a/springboot-transaction/src/main/resources/application.yml b/springboot-transaction/src/main/resources/application.yml
index afbe05c..db6510c 100644
--- a/springboot-transaction/src/main/resources/application.yml
+++ b/springboot-transaction/src/main/resources/application.yml
@@ -3,7 +3,7 @@
##########################################################
################### 自定义项目配置 ###################
-enzhico:
+xncoding:
kaptcha-open: true #是否开启登录时验证码 (true/false)
session-open: false #是否开启session验证 (true/false)
@@ -17,13 +17,13 @@ spring:
datasource:
url: jdbc:mysql://123.207.66.156:3306/test?useSSL=false&autoReconnect=true&tinyInt1isBit=false&useUnicode=true&characterEncoding=utf8
username: root
- password: _EnZhi123
+ password: ******
################### mybatis-plus配置 ###################
mybatis-plus:
- mapper-locations: classpath*:com/enzhico/trans/dao/repository/mapping/*.xml
+ mapper-locations: classpath*:com/xncoding/trans/dao/repository/mapping/*.xml
typeAliasesPackage: >
- com.enzhico.trans.dao.entity
+ com.xncoding.trans.dao.entity
global-config:
id-type: 0 # 0:数据库ID自增 1:用户输入id 2:全局唯一id(IdWorker) 3:全局唯一ID(uuid)
db-column-underline: false
@@ -50,6 +50,6 @@ logging:
level:
ROOT: INFO
com:
- enzhico: DEBUG
+ xncoding: DEBUG
file: E:/logs/trans.log