Merge branch 'master' of http://git.huojutech.com/wzwHUOJU/huo_zuan.git

Conflicts:
	huozuan/src/main/resources/application-dev.properties

huozuan/.gitignore

@@ -1,25 +1,25 @@
-/target/
-!.mvn/wrapper/maven-wrapper.jar
-
-### STS ###
-.apt_generated
-.classpath
-.factorypath
-.project
-.settings
-.springBeans
-.sts4-cache
-
-### IntelliJ IDEA ###
-.idea
-*.iws
-*.iml
-*.ipr
-
-### NetBeans ###
-/nbproject/private/
-/build/
-/nbbuild/
-/dist/
-/nbdist/
+/target/
+!.mvn/wrapper/maven-wrapper.jar
+
+### STS ###
+.apt_generated
+.classpath
+.factorypath
+.project
+.settings
+.springBeans
+.sts4-cache
+
+### IntelliJ IDEA ###
+.idea
+*.iws
+*.iml
+*.ipr
+
+### NetBeans ###
+/nbproject/private/
+/build/
+/nbbuild/
+/dist/
+/nbdist/
 /.nb-gradle/

huozuan/README.md

@@ -1,17 +1,17 @@
-# spring_boot_demo
-
-#README
-
-#现集成功能：
-    springboot
-    Mybatis 
-    Druid
-    Redis
-    Mongodb
-    Swagger
-    
-	
-##
-swagger访问地址：服务基地址+/swagger-ui.html   eg:http://localhost:8080/swagger-ui.html
-##
-Druid监控访问地址:服务基地址+/druid/index.html
+# spring_boot_demo
+
+#README
+
+#现集成功能：
+    springboot
+    Mybatis 
+    Druid
+    Redis
+    Mongodb
+    Swagger
+    
+	
+##
+swagger访问地址：服务基地址+/swagger-ui.html   eg:http://localhost:8080/swagger-ui.html
+##
+Druid监控访问地址:服务基地址+/druid/index.html

huozuan/src/main/java/com/huojutech/DTO/TestDTO.java

@@ -1,25 +1,25 @@
-package com.huojutech.DTO;
-
-/**
- * Created by Wangzw on 2018\4\16 0016.
- */
-
-public class TestDTO {
-
-    private String name;
-
-    private String pwd;
-
-    public String getName() {
-        return name;
-    }
-
-    public void setName(String name) {
-        this.name = name;
-    }
-
-    public String getPwd() {
-        return pwd;
-    }
-}
-
+package com.huojutech.DTO;
+
+/**
+ * Created by Wangzw on 2018\4\16 0016.
+ */
+
+public class TestDTO {
+
+    private String name;
+
+    private String pwd;
+
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+
+    public String getPwd() {
+        return pwd;
+    }
+}
+

huozuan/src/main/java/com/huojutech/HuozuanApplication.java

@@ -1,22 +1,22 @@
-package com.huojutech;
-
-
-import org.mybatis.spring.annotation.MapperScan;
-import org.springframework.boot.SpringApplication;
-import org.springframework.boot.autoconfigure.SpringBootApplication;
-import org.springframework.boot.web.servlet.ServletComponentScan;
-import org.springframework.cache.annotation.EnableCaching;
-import org.springframework.transaction.annotation.EnableTransactionManagement;
-
-@ServletComponentScan
-//设置启动时spring能够扫描到我们自己编写的servlet和filter, 用于Druid监控@ServletComponentScan
-@SpringBootApplication
-@MapperScan(basePackages = "com.huojutech.dao")
-@EnableCaching
-@EnableTransactionManagement
-public class HuozuanApplication {
-
-	public static void main(String[] args) {
-		SpringApplication.run(HuozuanApplication.class, args);
-	}
-}
+package com.huojutech;
+
+
+import org.mybatis.spring.annotation.MapperScan;
+import org.springframework.boot.SpringApplication;
+import org.springframework.boot.autoconfigure.SpringBootApplication;
+import org.springframework.boot.web.servlet.ServletComponentScan;
+import org.springframework.cache.annotation.EnableCaching;
+import org.springframework.transaction.annotation.EnableTransactionManagement;
+
+@ServletComponentScan
+//设置启动时spring能够扫描到我们自己编写的servlet和filter, 用于Druid监控@ServletComponentScan
+@SpringBootApplication
+@MapperScan(basePackages = "com.huojutech.dao")
+@EnableCaching
+@EnableTransactionManagement
+public class HuozuanApplication {
+
+	public static void main(String[] args) {
+		SpringApplication.run(HuozuanApplication.class, args);
+	}
+}

huozuan/src/main/java/com/huojutech/config/DruidDataSourceConfig.java

@@ -1,104 +1,104 @@
-package com.huojutech.config;
-
-import com.alibaba.druid.pool.DruidDataSource;
-import com.alibaba.druid.support.http.StatViewServlet;
-import com.alibaba.druid.support.http.WebStatFilter;
-import com.alibaba.druid.support.spring.stat.DruidStatInterceptor;
-import org.springframework.aop.framework.autoproxy.BeanNameAutoProxyCreator;
-import org.springframework.boot.bind.RelaxedPropertyResolver;
-import org.springframework.boot.web.servlet.FilterRegistrationBean;
-import org.springframework.boot.web.servlet.ServletRegistrationBean;
-import org.springframework.context.EnvironmentAware;
-import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.Configuration;
-import org.springframework.core.env.Environment;
-import org.springframework.transaction.annotation.EnableTransactionManagement;
-
-import javax.sql.DataSource;
-import java.sql.SQLException;
-import java.util.HashMap;
-import java.util.Map;
-
-/**
- * TODO Druid的DataResource配置类
- * 凡是被Spring管理的类，实现接口 EnvironmentAware 重写方法 setEnvironment 可以在工程启动时，
- * 获取到系统环境变量和application配置文件中的变量。 还有一种方式是采用注解的方式获取 @value("${变量的key值}")
- * 获取application配置文件中的变量
- * Created by Wangzw on 2018\4\11 0011.
- */
-@Configuration
-@EnableTransactionManagement
-public class DruidDataSourceConfig implements EnvironmentAware{
-
-
-    private RelaxedPropertyResolver propertyResolver;
-
-    public void setEnvironment(Environment env) {
-        this.propertyResolver = new RelaxedPropertyResolver(env, "spring.datasource.");
-    }
-
-    @Bean
-    public DataSource dataSource() {
-        DruidDataSource datasource = new DruidDataSource();
-        datasource.setUrl(propertyResolver.getProperty("url"));
-        datasource.setDriverClassName(propertyResolver.getProperty("driver-class-name"));
-        datasource.setUsername(propertyResolver.getProperty("username"));
-        datasource.setPassword(propertyResolver.getProperty("password"));
-        datasource.setInitialSize(Integer.valueOf(propertyResolver.getProperty("initialSize")));
-        datasource.setMinIdle(Integer.valueOf(propertyResolver.getProperty("minIdle")));
-        datasource.setMaxWait(Long.valueOf(propertyResolver.getProperty("maxWait")));
-        datasource.setMaxActive(Integer.valueOf(propertyResolver.getProperty("maxActive")));
-        datasource.setMinEvictableIdleTimeMillis(
-                Long.valueOf(propertyResolver.getProperty("minEvictableIdleTimeMillis")));
-        try {
-            datasource.setFilters("stat,wall");
-        } catch (SQLException e) {
-            e.printStackTrace();
-        }
-        return datasource;
-    }
-
-    @Bean
-    public ServletRegistrationBean druidServlet() {
-        ServletRegistrationBean servletRegistrationBean = new ServletRegistrationBean();
-        servletRegistrationBean.setServlet(new StatViewServlet());
-        servletRegistrationBean.addUrlMappings("/druid/*");
-        Map<String, String> initParameters = new HashMap<String, String>();
-        // initParameters.put("loginUsername", "druid");// 用户名
-        // initParameters.put("loginPassword", "druid");// 密码
-        initParameters.put("resetEnable", "false");// 禁用HTML页面上的“Reset All”功能
-        //initParameters.put("allow", "127.0.0.1"); // IP白名单 (没有配置或者为空，则允许所有访问)
-        // initParameters.put("deny", "192.168.20.38");// IP黑名单
-        // (存在共同时，deny优先于allow)
-        servletRegistrationBean.setInitParameters(initParameters);
-        return servletRegistrationBean;
-    }
-
-    @Bean
-    public FilterRegistrationBean filterRegistrationBean() {
-        FilterRegistrationBean filterRegistrationBean = new FilterRegistrationBean();
-        filterRegistrationBean.setFilter(new WebStatFilter());
-        filterRegistrationBean.addUrlPatterns("/*");
-        //忽略资源
-        filterRegistrationBean.addInitParameter("exclusions", "*.js,*.gif,*.jpg,*.bmp,*.png,*.css,*.ico,/druid/*");
-        return filterRegistrationBean;
-    }
-
-    // 按照BeanId来拦截配置 用来bean的监控
-    @Bean(value = "druid-stat-interceptor")
-    public DruidStatInterceptor DruidStatInterceptor() {
-        DruidStatInterceptor druidStatInterceptor = new DruidStatInterceptor();
-        return druidStatInterceptor;
-    }
-
-    @Bean
-    public BeanNameAutoProxyCreator beanNameAutoProxyCreator() {
-        BeanNameAutoProxyCreator beanNameAutoProxyCreator = new BeanNameAutoProxyCreator();
-        beanNameAutoProxyCreator.setProxyTargetClass(true);
-        // 设置要监控的bean的id
-        //beanNameAutoProxyCreator.setBeanNames("sysRoleMapper","loginController");
-        beanNameAutoProxyCreator.setInterceptorNames("druid-stat-interceptor");
-        return beanNameAutoProxyCreator;
-    }
-}
-
+package com.huojutech.config;
+
+import com.alibaba.druid.pool.DruidDataSource;
+import com.alibaba.druid.support.http.StatViewServlet;
+import com.alibaba.druid.support.http.WebStatFilter;
+import com.alibaba.druid.support.spring.stat.DruidStatInterceptor;
+import org.springframework.aop.framework.autoproxy.BeanNameAutoProxyCreator;
+import org.springframework.boot.bind.RelaxedPropertyResolver;
+import org.springframework.boot.web.servlet.FilterRegistrationBean;
+import org.springframework.boot.web.servlet.ServletRegistrationBean;
+import org.springframework.context.EnvironmentAware;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.core.env.Environment;
+import org.springframework.transaction.annotation.EnableTransactionManagement;
+
+import javax.sql.DataSource;
+import java.sql.SQLException;
+import java.util.HashMap;
+import java.util.Map;
+
+/**
+ * TODO Druid的DataResource配置类
+ * 凡是被Spring管理的类，实现接口 EnvironmentAware 重写方法 setEnvironment 可以在工程启动时，
+ * 获取到系统环境变量和application配置文件中的变量。 还有一种方式是采用注解的方式获取 @value("${变量的key值}")
+ * 获取application配置文件中的变量
+ * Created by Wangzw on 2018\4\11 0011.
+ */
+@Configuration
+@EnableTransactionManagement
+public class DruidDataSourceConfig implements EnvironmentAware{
+
+
+    private RelaxedPropertyResolver propertyResolver;
+
+    public void setEnvironment(Environment env) {
+        this.propertyResolver = new RelaxedPropertyResolver(env, "spring.datasource.");
+    }
+
+    @Bean
+    public DataSource dataSource() {
+        DruidDataSource datasource = new DruidDataSource();
+        datasource.setUrl(propertyResolver.getProperty("url"));
+        datasource.setDriverClassName(propertyResolver.getProperty("driver-class-name"));
+        datasource.setUsername(propertyResolver.getProperty("username"));
+        datasource.setPassword(propertyResolver.getProperty("password"));
+        datasource.setInitialSize(Integer.valueOf(propertyResolver.getProperty("initialSize")));
+        datasource.setMinIdle(Integer.valueOf(propertyResolver.getProperty("minIdle")));
+        datasource.setMaxWait(Long.valueOf(propertyResolver.getProperty("maxWait")));
+        datasource.setMaxActive(Integer.valueOf(propertyResolver.getProperty("maxActive")));
+        datasource.setMinEvictableIdleTimeMillis(
+                Long.valueOf(propertyResolver.getProperty("minEvictableIdleTimeMillis")));
+        try {
+            datasource.setFilters("stat,wall");
+        } catch (SQLException e) {
+            e.printStackTrace();
+        }
+        return datasource;
+    }
+
+    @Bean
+    public ServletRegistrationBean druidServlet() {
+        ServletRegistrationBean servletRegistrationBean = new ServletRegistrationBean();
+        servletRegistrationBean.setServlet(new StatViewServlet());
+        servletRegistrationBean.addUrlMappings("/druid/*");
+        Map<String, String> initParameters = new HashMap<String, String>();
+        // initParameters.put("loginUsername", "druid");// 用户名
+        // initParameters.put("loginPassword", "druid");// 密码
+        initParameters.put("resetEnable", "false");// 禁用HTML页面上的“Reset All”功能
+        //initParameters.put("allow", "127.0.0.1"); // IP白名单 (没有配置或者为空，则允许所有访问)
+        // initParameters.put("deny", "192.168.20.38");// IP黑名单
+        // (存在共同时，deny优先于allow)
+        servletRegistrationBean.setInitParameters(initParameters);
+        return servletRegistrationBean;
+    }
+
+    @Bean
+    public FilterRegistrationBean filterRegistrationBean() {
+        FilterRegistrationBean filterRegistrationBean = new FilterRegistrationBean();
+        filterRegistrationBean.setFilter(new WebStatFilter());
+        filterRegistrationBean.addUrlPatterns("/*");
+        //忽略资源
+        filterRegistrationBean.addInitParameter("exclusions", "*.js,*.gif,*.jpg,*.bmp,*.png,*.css,*.ico,/druid/*");
+        return filterRegistrationBean;
+    }
+
+    // 按照BeanId来拦截配置 用来bean的监控
+    @Bean(value = "druid-stat-interceptor")
+    public DruidStatInterceptor DruidStatInterceptor() {
+        DruidStatInterceptor druidStatInterceptor = new DruidStatInterceptor();
+        return druidStatInterceptor;
+    }
+
+    @Bean
+    public BeanNameAutoProxyCreator beanNameAutoProxyCreator() {
+        BeanNameAutoProxyCreator beanNameAutoProxyCreator = new BeanNameAutoProxyCreator();
+        beanNameAutoProxyCreator.setProxyTargetClass(true);
+        // 设置要监控的bean的id
+        //beanNameAutoProxyCreator.setBeanNames("sysRoleMapper","loginController");
+        beanNameAutoProxyCreator.setInterceptorNames("druid-stat-interceptor");
+        return beanNameAutoProxyCreator;
+    }
+}
+

huozuan/src/main/java/com/huojutech/config/MybatisConfig.java

@@ -1,27 +1,27 @@
-package com.huojutech.config;
-
-import com.github.pagehelper.PageHelper;
-import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.Configuration;
-
-import java.util.Properties;
-
-/**
- * TODO Mybatis 插件pageHelper配置
- * Created by Wangzw on 2018\4\11 0011.
- */
-@Configuration
-public class MybatisConfig {
-    @Bean
-    public PageHelper pageHelper() {
-        System.out.println("MyBatisConfiguration.pageHelper()");
-        PageHelper pageHelper = new PageHelper();
-        Properties p = new Properties();
-        p.setProperty("offsetAsPageNum", "true");
-        p.setProperty("rowBoundsWithCount", "true");
-        p.setProperty("reasonable", "true");
-        pageHelper.setProperties(p);
-        return pageHelper;
-    }
-}
-
+package com.huojutech.config;
+
+import com.github.pagehelper.PageHelper;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+
+import java.util.Properties;
+
+/**
+ * TODO Mybatis 插件pageHelper配置
+ * Created by Wangzw on 2018\4\11 0011.
+ */
+@Configuration
+public class MybatisConfig {
+    @Bean
+    public PageHelper pageHelper() {
+        System.out.println("MyBatisConfiguration.pageHelper()");
+        PageHelper pageHelper = new PageHelper();
+        Properties p = new Properties();
+        p.setProperty("offsetAsPageNum", "true");
+        p.setProperty("rowBoundsWithCount", "true");
+        p.setProperty("reasonable", "true");
+        pageHelper.setProperties(p);
+        return pageHelper;
+    }
+}
+

huozuan/src/main/java/com/huojutech/config/RedisCacheConfig.java

@@ -1,61 +1,61 @@
-package com.huojutech.config;
-
-import com.fasterxml.jackson.annotation.JsonAutoDetect;
-import com.fasterxml.jackson.annotation.PropertyAccessor;
-import com.fasterxml.jackson.databind.ObjectMapper;
-import org.springframework.cache.CacheManager;
-import org.springframework.cache.annotation.EnableCaching;
-import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.Configuration;
-import org.springframework.data.redis.cache.RedisCacheManager;
-import org.springframework.data.redis.connection.RedisConnectionFactory;
-import org.springframework.data.redis.core.RedisTemplate;
-import org.springframework.data.redis.serializer.Jackson2JsonRedisSerializer;
-import org.springframework.data.redis.serializer.StringRedisSerializer;
-
-/**
- * TODO  redis配置类
- * Created by Wangzw on 2018\4\11 0011.
- */
-@Configuration
-@EnableCaching
-public class RedisCacheConfig {
-
-    @SuppressWarnings("rawtypes")
-    @Bean
-    public CacheManager cacheManager(RedisTemplate redisTemplate) {
-        RedisCacheManager rcm = new RedisCacheManager(redisTemplate);
-        // 多个缓存的名称,目前只定义了一个
-//        rcm.setCacheNames(Arrays.asList("redis-one"));
-        //设置缓存过期时间(秒)
-        rcm.setDefaultExpiration(10000);
-        return rcm;
-    }
-
-    /**
-     * redisTemplate 序列化使用的jdkSerializeable, 存储二进制字节码, 所以自定义序列化类
-     * @param redisConnectionFactory redis连接工厂类
-     * @return RedisTemplate
-     */
-    @Bean
-    public RedisTemplate<Object, Object> redisTemplate(RedisConnectionFactory redisConnectionFactory) {
-        RedisTemplate<Object, Object> redisTemplate = new RedisTemplate<>();
-        redisTemplate.setConnectionFactory(redisConnectionFactory);
-
-        // 使用Jackson2JsonRedisSerialize 替换默认序列化
-        Jackson2JsonRedisSerializer jackson2JsonRedisSerializer = new Jackson2JsonRedisSerializer(Object.class);
-
-        ObjectMapper objectMapper = new ObjectMapper();
-        objectMapper.setVisibility(PropertyAccessor.ALL, JsonAutoDetect.Visibility.ANY);
-        objectMapper.enableDefaultTyping(ObjectMapper.DefaultTyping.NON_FINAL);
-
-        jackson2JsonRedisSerializer.setObjectMapper(objectMapper);
-
-        // 设置value的序列化规则和 key的序列化规则
-        redisTemplate.setKeySerializer(new StringRedisSerializer());
-        redisTemplate.setValueSerializer(jackson2JsonRedisSerializer);
-        redisTemplate.afterPropertiesSet();
-        return redisTemplate;
-    }
-}
-
+package com.huojutech.config;
+
+import com.fasterxml.jackson.annotation.JsonAutoDetect;
+import com.fasterxml.jackson.annotation.PropertyAccessor;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import org.springframework.cache.CacheManager;
+import org.springframework.cache.annotation.EnableCaching;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.data.redis.cache.RedisCacheManager;
+import org.springframework.data.redis.connection.RedisConnectionFactory;
+import org.springframework.data.redis.core.RedisTemplate;
+import org.springframework.data.redis.serializer.Jackson2JsonRedisSerializer;
+import org.springframework.data.redis.serializer.StringRedisSerializer;
+
+/**
+ * TODO  redis配置类
+ * Created by Wangzw on 2018\4\11 0011.
+ */
+@Configuration
+@EnableCaching
+public class RedisCacheConfig {
+
+    @SuppressWarnings("rawtypes")
+    @Bean
+    public CacheManager cacheManager(RedisTemplate redisTemplate) {
+        RedisCacheManager rcm = new RedisCacheManager(redisTemplate);
+        // 多个缓存的名称,目前只定义了一个
+//        rcm.setCacheNames(Arrays.asList("redis-one"));
+        //设置缓存过期时间(秒)
+        rcm.setDefaultExpiration(10000);
+        return rcm;
+    }
+
+    /**
+     * redisTemplate 序列化使用的jdkSerializeable, 存储二进制字节码, 所以自定义序列化类
+     * @param redisConnectionFactory redis连接工厂类
+     * @return RedisTemplate
+     */
+    @Bean
+    public RedisTemplate<Object, Object> redisTemplate(RedisConnectionFactory redisConnectionFactory) {
+        RedisTemplate<Object, Object> redisTemplate = new RedisTemplate<>();
+        redisTemplate.setConnectionFactory(redisConnectionFactory);
+
+        // 使用Jackson2JsonRedisSerialize 替换默认序列化
+        Jackson2JsonRedisSerializer jackson2JsonRedisSerializer = new Jackson2JsonRedisSerializer(Object.class);
+
+        ObjectMapper objectMapper = new ObjectMapper();
+        objectMapper.setVisibility(PropertyAccessor.ALL, JsonAutoDetect.Visibility.ANY);
+        objectMapper.enableDefaultTyping(ObjectMapper.DefaultTyping.NON_FINAL);
+
+        jackson2JsonRedisSerializer.setObjectMapper(objectMapper);
+
+        // 设置value的序列化规则和 key的序列化规则
+        redisTemplate.setKeySerializer(new StringRedisSerializer());
+        redisTemplate.setValueSerializer(jackson2JsonRedisSerializer);
+        redisTemplate.afterPropertiesSet();
+        return redisTemplate;
+    }
+}
+

huozuan/src/main/java/com/huojutech/config/Swagger2Configuration.java

@@ -1,49 +1,49 @@
-package com.huojutech.config;
-
-
-import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.Configuration;
-
-import com.google.common.collect.Sets;
-
-import springfox.documentation.builders.ApiInfoBuilder;
-import springfox.documentation.builders.PathSelectors;
-import springfox.documentation.builders.RequestHandlerSelectors;
-import springfox.documentation.service.ApiInfo;
-import springfox.documentation.service.Contact;
-import springfox.documentation.spi.DocumentationType;
-import springfox.documentation.spring.web.plugins.Docket;
-import springfox.documentation.swagger2.annotations.EnableSwagger2;
-
-/***
-  * TODO  日志配置文件
-  * Create_By  Wangzw
-  * 2018\4\11 0011
- */
-@Configuration
-@EnableSwagger2
-public class Swagger2Configuration {
-	
-	@Bean
-	public Docket configSpringfoxDocketForAgent() {
-		return new Docket(DocumentationType.SWAGGER_2)
-				.groupName("火钻接口文档")
-				.protocols(Sets.newHashSet("http"))
-//				.enable(Constants.SWAGGER_ENABLE)
-				.forCodeGeneration(true).select()
-				.paths(PathSelectors.any())
-//				.paths(regex("/account/.*"))//只显示请求路径是account下的注释
-				.apis(RequestHandlerSelectors.basePackage("com.huojutech.controller"))
-				.build().apiInfo(apiInfo());
-	}
-
-	private ApiInfo apiInfo() {
-		return new ApiInfoBuilder()
-				.title("火钻接口服务")// 标题
-				.description("系统API接口文档")// 描述
-				.termsOfServiceUrl("http://www.huojutech.com")//
-				.contact(new Contact("Wangzw", "http://www.huojutech.com", "997663551@qq.com"))// 联系，创建人
-				.version("1.0")// 版本
-				.build();
-	}
-}
+package com.huojutech.config;
+
+
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+
+import com.google.common.collect.Sets;
+
+import springfox.documentation.builders.ApiInfoBuilder;
+import springfox.documentation.builders.PathSelectors;
+import springfox.documentation.builders.RequestHandlerSelectors;
+import springfox.documentation.service.ApiInfo;
+import springfox.documentation.service.Contact;
+import springfox.documentation.spi.DocumentationType;
+import springfox.documentation.spring.web.plugins.Docket;
+import springfox.documentation.swagger2.annotations.EnableSwagger2;
+
+/***
+  * TODO  日志配置文件
+  * Create_By  Wangzw
+  * 2018\4\11 0011
+ */
+@Configuration
+@EnableSwagger2
+public class Swagger2Configuration {
+	
+	@Bean
+	public Docket configSpringfoxDocketForAgent() {
+		return new Docket(DocumentationType.SWAGGER_2)
+				.groupName("火钻接口文档")
+				.protocols(Sets.newHashSet("http"))
+//				.enable(Constants.SWAGGER_ENABLE)
+				.forCodeGeneration(true).select()
+				.paths(PathSelectors.any())
+//				.paths(regex("/account/.*"))//只显示请求路径是account下的注释
+				.apis(RequestHandlerSelectors.basePackage("com.huojutech.controller"))
+				.build().apiInfo(apiInfo());
+	}
+
+	private ApiInfo apiInfo() {
+		return new ApiInfoBuilder()
+				.title("火钻接口服务")// 标题
+				.description("系统API接口文档")// 描述
+				.termsOfServiceUrl("http://www.huojutech.com")//
+				.contact(new Contact("Wangzw", "http://www.huojutech.com", "997663551@qq.com"))// 联系，创建人
+				.version("1.0")// 版本
+				.build();
+	}
+}

huozuan/src/main/java/com/huojutech/config/txConfig.java

@@ -1,64 +1,64 @@
-package com.huojutech.config;
-
-import org.aspectj.lang.annotation.Aspect;
-import org.springframework.aop.Advisor;
-import org.springframework.aop.aspectj.AspectJExpressionPointcut;
-import org.springframework.aop.support.DefaultPointcutAdvisor;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.Configuration;
-import org.springframework.transaction.PlatformTransactionManager;
-import org.springframework.transaction.TransactionDefinition;
-import org.springframework.transaction.interceptor.*;
-
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.Map;
-
-/**
- * TODO 事务管理器配置
- * Created by Wangzw on 2018\4\11 0011.
- */
-@Aspect
-@Configuration
-public class txConfig {
-    private static final int TX_METHOD_TIMEOUT = 5;
-    private static final String AOP_POINTCUT_EXPRESSION = "execution (* com.huojutech.service.*.*(..))";
-    @Autowired
-    private PlatformTransactionManager transactionManager;
-    @Bean
-    public TransactionInterceptor txAdvice() {
-        NameMatchTransactionAttributeSource source = new NameMatchTransactionAttributeSource();
-     /*只读事务，不做更新操作*/
-        RuleBasedTransactionAttribute readOnlyTx = new RuleBasedTransactionAttribute();
-        readOnlyTx.setReadOnly(true);
-        readOnlyTx.setPropagationBehavior(TransactionDefinition.PROPAGATION_NOT_SUPPORTED );
-    /*当前存在事务就使用当前事务，当前不存在事务就创建一个新的事务*/
-        RuleBasedTransactionAttribute requiredTx = new RuleBasedTransactionAttribute();
-        requiredTx.setRollbackRules(
-                Collections.singletonList(new RollbackRuleAttribute(Exception.class)));
-        requiredTx.setPropagationBehavior(TransactionDefinition.PROPAGATION_REQUIRED);
-        requiredTx.setTimeout(TX_METHOD_TIMEOUT);
-        Map<String, TransactionAttribute> txMap = new HashMap<>();
-        txMap.put("add*", requiredTx);
-        txMap.put("save*", requiredTx);
-        txMap.put("insert*", requiredTx);
-        txMap.put("update*", requiredTx);
-        txMap.put("delete*", requiredTx);
-        txMap.put("get*", readOnlyTx);
-        txMap.put("query*", readOnlyTx);
-        source.setNameMap( txMap );
-        TransactionInterceptor txAdvice = new TransactionInterceptor(transactionManager, source);
-        return txAdvice;
-    }
-    @Bean
-    public Advisor txAdviceAdvisor() {
-        AspectJExpressionPointcut pointcut = new AspectJExpressionPointcut();
-        pointcut.setExpression(AOP_POINTCUT_EXPRESSION);
-        return new DefaultPointcutAdvisor(pointcut, txAdvice());
-        //return new DefaultPointcutAdvisor(pointcut, txAdvice);
-    }
-
-
-}
-
+package com.huojutech.config;
+
+import org.aspectj.lang.annotation.Aspect;
+import org.springframework.aop.Advisor;
+import org.springframework.aop.aspectj.AspectJExpressionPointcut;
+import org.springframework.aop.support.DefaultPointcutAdvisor;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.transaction.PlatformTransactionManager;
+import org.springframework.transaction.TransactionDefinition;
+import org.springframework.transaction.interceptor.*;
+
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.Map;
+
+/**
+ * TODO 事务管理器配置
+ * Created by Wangzw on 2018\4\11 0011.
+ */
+@Aspect
+@Configuration
+public class txConfig {
+    private static final int TX_METHOD_TIMEOUT = 5;
+    private static final String AOP_POINTCUT_EXPRESSION = "execution (* com.huojutech.service.*.*(..))";
+    @Autowired
+    private PlatformTransactionManager transactionManager;
+    @Bean
+    public TransactionInterceptor txAdvice() {
+        NameMatchTransactionAttributeSource source = new NameMatchTransactionAttributeSource();
+     /*只读事务，不做更新操作*/
+        RuleBasedTransactionAttribute readOnlyTx = new RuleBasedTransactionAttribute();
+        readOnlyTx.setReadOnly(true);
+        readOnlyTx.setPropagationBehavior(TransactionDefinition.PROPAGATION_NOT_SUPPORTED );
+    /*当前存在事务就使用当前事务，当前不存在事务就创建一个新的事务*/
+        RuleBasedTransactionAttribute requiredTx = new RuleBasedTransactionAttribute();
+        requiredTx.setRollbackRules(
+                Collections.singletonList(new RollbackRuleAttribute(Exception.class)));
+        requiredTx.setPropagationBehavior(TransactionDefinition.PROPAGATION_REQUIRED);
+        requiredTx.setTimeout(TX_METHOD_TIMEOUT);
+        Map<String, TransactionAttribute> txMap = new HashMap<>();
+        txMap.put("add*", requiredTx);
+        txMap.put("save*", requiredTx);
+        txMap.put("insert*", requiredTx);
+        txMap.put("update*", requiredTx);
+        txMap.put("delete*", requiredTx);
+        txMap.put("get*", readOnlyTx);
+        txMap.put("query*", readOnlyTx);
+        source.setNameMap( txMap );
+        TransactionInterceptor txAdvice = new TransactionInterceptor(transactionManager, source);
+        return txAdvice;
+    }
+    @Bean
+    public Advisor txAdviceAdvisor() {
+        AspectJExpressionPointcut pointcut = new AspectJExpressionPointcut();
+        pointcut.setExpression(AOP_POINTCUT_EXPRESSION);
+        return new DefaultPointcutAdvisor(pointcut, txAdvice());
+        //return new DefaultPointcutAdvisor(pointcut, txAdvice);
+    }
+
+
+}
+

huozuan/src/main/java/com/huojutech/controller/TestController.java

@@ -28,7 +28,7 @@ public class TestController {
 
 
     @ApiOperation(value="获取用户",notes="根据id获取用户",response = String.class)
-    @RequestMapping(value="/person",method = RequestMethod.GET)
+    @RequestMapping(value="/person",method = RequestMethod.GET, produces = "application/json;charset=utf-8")
     public String getString(@ApiParam(value = "用户id") @RequestParam Integer id){
 
         String person= id+" 用户1";

huozuan/src/main/java/com/huojutech/dao/DiamondRecordMapper.java

@@ -1,23 +1,23 @@
-package com.huojutech.dao;
-
-import com.huojutech.entity.DiamondRecord;
-import com.huojutech.entity.DiamondRecordExample;
-import java.util.List;
-
-public interface DiamondRecordMapper {
-    int countByExample(DiamondRecordExample example);
-
-    int deleteByPrimaryKey(Integer id);
-
-    int insert(DiamondRecord record);
-
-    int insertSelective(DiamondRecord record);
-
-    List<DiamondRecord> selectByExample(DiamondRecordExample example);
-
-    DiamondRecord selectByPrimaryKey(Integer id);
-
-    int updateByPrimaryKeySelective(DiamondRecord record);
-
-    int updateByPrimaryKey(DiamondRecord record);
+package com.huojutech.dao;
+
+import com.huojutech.entity.DiamondRecord;
+import com.huojutech.entity.DiamondRecordExample;
+import java.util.List;
+
+public interface DiamondRecordMapper {
+    int countByExample(DiamondRecordExample example);
+
+    int deleteByPrimaryKey(Integer id);
+
+    int insert(DiamondRecord record);
+
+    int insertSelective(DiamondRecord record);
+
+    List<DiamondRecord> selectByExample(DiamondRecordExample example);
+
+    DiamondRecord selectByPrimaryKey(Integer id);
+
+    int updateByPrimaryKeySelective(DiamondRecord record);
+
+    int updateByPrimaryKey(DiamondRecord record);
 }

huozuan/src/main/java/com/huojutech/dao/StockForecastCollectMapper.java

@@ -1,23 +1,23 @@
-package com.huojutech.dao;
-
-import com.huojutech.entity.StockForecastCollect;
-import com.huojutech.entity.StockForecastCollectExample;
-import java.util.List;
-
-public interface StockForecastCollectMapper {
-    int countByExample(StockForecastCollectExample example);
-
-    int deleteByPrimaryKey(Integer id);
-
-    int insert(StockForecastCollect record);
-
-    int insertSelective(StockForecastCollect record);
-
-    List<StockForecastCollect> selectByExample(StockForecastCollectExample example);
-
-    StockForecastCollect selectByPrimaryKey(Integer id);
-
-    int updateByPrimaryKeySelective(StockForecastCollect record);
-
-    int updateByPrimaryKey(StockForecastCollect record);
+package com.huojutech.dao;
+
+import com.huojutech.entity.StockForecastCollect;
+import com.huojutech.entity.StockForecastCollectExample;
+import java.util.List;
+
+public interface StockForecastCollectMapper {
+    int countByExample(StockForecastCollectExample example);
+
+    int deleteByPrimaryKey(Integer id);
+
+    int insert(StockForecastCollect record);
+
+    int insertSelective(StockForecastCollect record);
+
+    List<StockForecastCollect> selectByExample(StockForecastCollectExample example);
+
+    StockForecastCollect selectByPrimaryKey(Integer id);
+
+    int updateByPrimaryKeySelective(StockForecastCollect record);
+
+    int updateByPrimaryKey(StockForecastCollect record);
 }

huozuan/src/main/java/com/huojutech/dao/StockForecastMapper.java

@@ -1,27 +1,27 @@
-package com.huojutech.dao;
-
-import com.huojutech.entity.StockForecast;
-import com.huojutech.entity.StockForecastExample;
-import java.util.List;
-
-public interface StockForecastMapper {
-    int countByExample(StockForecastExample example);
-
-    int deleteByPrimaryKey(Integer id);
-
-    int insert(StockForecast record);
-
-    int insertSelective(StockForecast record);
-
-    List<StockForecast> selectByExampleWithBLOBs(StockForecastExample example);
-
-    List<StockForecast> selectByExample(StockForecastExample example);
-
-    StockForecast selectByPrimaryKey(Integer id);
-
-    int updateByPrimaryKeySelective(StockForecast record);
-
-    int updateByPrimaryKeyWithBLOBs(StockForecast record);
-
-    int updateByPrimaryKey(StockForecast record);
+package com.huojutech.dao;
+
+import com.huojutech.entity.StockForecast;
+import com.huojutech.entity.StockForecastExample;
+import java.util.List;
+
+public interface StockForecastMapper {
+    int countByExample(StockForecastExample example);
+
+    int deleteByPrimaryKey(Integer id);
+
+    int insert(StockForecast record);
+
+    int insertSelective(StockForecast record);
+
+    List<StockForecast> selectByExampleWithBLOBs(StockForecastExample example);
+
+    List<StockForecast> selectByExample(StockForecastExample example);
+
+    StockForecast selectByPrimaryKey(Integer id);
+
+    int updateByPrimaryKeySelective(StockForecast record);
+
+    int updateByPrimaryKeyWithBLOBs(StockForecast record);
+
+    int updateByPrimaryKey(StockForecast record);
 }

huozuan/src/main/java/com/huojutech/dao/StockForecastVoteMapper.java

@@ -1,23 +1,23 @@
-package com.huojutech.dao;
-
-import com.huojutech.entity.StockForecastVote;
-import com.huojutech.entity.StockForecastVoteExample;
-import java.util.List;
-
-public interface StockForecastVoteMapper {
-    int countByExample(StockForecastVoteExample example);
-
-    int deleteByPrimaryKey(Integer id);
-
-    int insert(StockForecastVote record);
-
-    int insertSelective(StockForecastVote record);
-
-    List<StockForecastVote> selectByExample(StockForecastVoteExample example);
-
-    StockForecastVote selectByPrimaryKey(Integer id);
-
-    int updateByPrimaryKeySelective(StockForecastVote record);
-
-    int updateByPrimaryKey(StockForecastVote record);
+package com.huojutech.dao;
+
+import com.huojutech.entity.StockForecastVote;
+import com.huojutech.entity.StockForecastVoteExample;
+import java.util.List;
+
+public interface StockForecastVoteMapper {
+    int countByExample(StockForecastVoteExample example);
+
+    int deleteByPrimaryKey(Integer id);
+
+    int insert(StockForecastVote record);
+
+    int insertSelective(StockForecastVote record);
+
+    List<StockForecastVote> selectByExample(StockForecastVoteExample example);
+
+    StockForecastVote selectByPrimaryKey(Integer id);
+
+    int updateByPrimaryKeySelective(StockForecastVote record);
+
+    int updateByPrimaryKey(StockForecastVote record);
 }

huozuan/src/main/java/com/huojutech/dao/StockOptionalMapper.java

@@ -1,23 +1,23 @@
-package com.huojutech.dao;
-
-import com.huojutech.entity.StockOptional;
-import com.huojutech.entity.StockOptionalExample;
-import java.util.List;
-
-public interface StockOptionalMapper {
-    int countByExample(StockOptionalExample example);
-
-    int deleteByPrimaryKey(Integer id);
-
-    int insert(StockOptional record);
-
-    int insertSelective(StockOptional record);
-
-    List<StockOptional> selectByExample(StockOptionalExample example);
-
-    StockOptional selectByPrimaryKey(Integer id);
-
-    int updateByPrimaryKeySelective(StockOptional record);
-
-    int updateByPrimaryKey(StockOptional record);
+package com.huojutech.dao;
+
+import com.huojutech.entity.StockOptional;
+import com.huojutech.entity.StockOptionalExample;
+import java.util.List;
+
+public interface StockOptionalMapper {
+    int countByExample(StockOptionalExample example);
+
+    int deleteByPrimaryKey(Integer id);
+
+    int insert(StockOptional record);
+
+    int insertSelective(StockOptional record);
+
+    List<StockOptional> selectByExample(StockOptionalExample example);
+
+    StockOptional selectByPrimaryKey(Integer id);
+
+    int updateByPrimaryKeySelective(StockOptional record);
+
+    int updateByPrimaryKey(StockOptional record);
 }

huozuan/src/main/java/com/huojutech/dao/SystemConfigMapper.java

@@ -1,23 +1,23 @@
-package com.huojutech.dao;
-
-import com.huojutech.entity.SystemConfig;
-import com.huojutech.entity.SystemConfigExample;
-import java.util.List;
-
-public interface SystemConfigMapper {
-    int countByExample(SystemConfigExample example);
-
-    int deleteByPrimaryKey(Integer id);
-
-    int insert(SystemConfig record);
-
-    int insertSelective(SystemConfig record);
-
-    List<SystemConfig> selectByExample(SystemConfigExample example);
-
-    SystemConfig selectByPrimaryKey(Integer id);
-
-    int updateByPrimaryKeySelective(SystemConfig record);
-
-    int updateByPrimaryKey(SystemConfig record);
+package com.huojutech.dao;
+
+import com.huojutech.entity.SystemConfig;
+import com.huojutech.entity.SystemConfigExample;
+import java.util.List;
+
+public interface SystemConfigMapper {
+    int countByExample(SystemConfigExample example);
+
+    int deleteByPrimaryKey(Integer id);
+
+    int insert(SystemConfig record);
+
+    int insertSelective(SystemConfig record);
+
+    List<SystemConfig> selectByExample(SystemConfigExample example);
+
+    SystemConfig selectByPrimaryKey(Integer id);
+
+    int updateByPrimaryKeySelective(SystemConfig record);
+
+    int updateByPrimaryKey(SystemConfig record);
 }

huozuan/src/main/java/com/huojutech/dao/TestDao.java

@@ -1,18 +1,18 @@
-package com.huojutech.dao;
-
-import com.huojutech.entity.User;
-import org.apache.ibatis.annotations.Mapper;
-import org.apache.ibatis.annotations.Param;
-
-/**
- * Created by Wangzw on 2018\4\10 0010.
- */
-@Mapper
-public interface TestDao{
-
-     User getUserById(Integer id);
-
-     Integer updateTestTx(@Param("id") Integer id,@Param("name") String name);
-
-}
-
+package com.huojutech.dao;
+
+import com.huojutech.entity.User;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+/**
+ * Created by Wangzw on 2018\4\10 0010.
+ */
+@Mapper
+public interface TestDao{
+
+     User getUserById(Integer id);
+
+     Integer updateTestTx(@Param("id") Integer id,@Param("name") String name);
+
+}
+

huozuan/src/main/java/com/huojutech/dao/UserConcernMapper.java

@@ -1,23 +1,23 @@
-package com.huojutech.dao;
-
-import com.huojutech.entity.UserConcern;
-import com.huojutech.entity.UserConcernExample;
-import java.util.List;
-
-public interface UserConcernMapper {
-    int countByExample(UserConcernExample example);
-
-    int deleteByPrimaryKey(Integer id);
-
-    int insert(UserConcern record);
-
-    int insertSelective(UserConcern record);
-
-    List<UserConcern> selectByExample(UserConcernExample example);
-
-    UserConcern selectByPrimaryKey(Integer id);
-
-    int updateByPrimaryKeySelective(UserConcern record);
-
-    int updateByPrimaryKey(UserConcern record);
+package com.huojutech.dao;
+
+import com.huojutech.entity.UserConcern;
+import com.huojutech.entity.UserConcernExample;
+import java.util.List;
+
+public interface UserConcernMapper {
+    int countByExample(UserConcernExample example);
+
+    int deleteByPrimaryKey(Integer id);
+
+    int insert(UserConcern record);
+
+    int insertSelective(UserConcern record);
+
+    List<UserConcern> selectByExample(UserConcernExample example);
+
+    UserConcern selectByPrimaryKey(Integer id);
+
+    int updateByPrimaryKeySelective(UserConcern record);
+
+    int updateByPrimaryKey(UserConcern record);
 }

huozuan/src/main/java/com/huojutech/dao/UserMapper.java

@@ -1,23 +1,23 @@
-package com.huojutech.dao;
-
-import com.huojutech.entity.User;
-import com.huojutech.entity.UserExample;
-import java.util.List;
-
-public interface UserMapper {
-    int countByExample(UserExample example);
-
-    int deleteByPrimaryKey(Integer id);
-
-    int insert(User record);
-
-    int insertSelective(User record);
-
-    List<User> selectByExample(UserExample example);
-
-    User selectByPrimaryKey(Integer id);
-
-    int updateByPrimaryKeySelective(User record);
-
-    int updateByPrimaryKey(User record);
+package com.huojutech.dao;
+
+import com.huojutech.entity.User;
+import com.huojutech.entity.UserExample;
+import java.util.List;
+
+public interface UserMapper {
+    int countByExample(UserExample example);
+
+    int deleteByPrimaryKey(Integer id);
+
+    int insert(User record);
+
+    int insertSelective(User record);
+
+    List<User> selectByExample(UserExample example);
+
+    User selectByPrimaryKey(Integer id);
+
+    int updateByPrimaryKeySelective(User record);
+
+    int updateByPrimaryKey(User record);
 }

huozuan/src/main/java/com/huojutech/entity/DiamondRecord.java

@@ -1,86 +1,86 @@
-package com.huojutech.entity;
-
-import java.math.BigDecimal;
-import java.util.Date;
-
-public class DiamondRecord {
-    private Integer id;
-
-    private Integer uid;
-
-    private String name;
-
-    private String descr;
-
-    private BigDecimal amount;
-
-    private Integer status;
-
-    private Date crtTime;
-
-    private Date updTime;
-
-    public Integer getId() {
-        return id;
-    }
-
-    public void setId(Integer id) {
-        this.id = id;
-    }
-
-    public Integer getUid() {
-        return uid;
-    }
-
-    public void setUid(Integer uid) {
-        this.uid = uid;
-    }
-
-    public String getName() {
-        return name;
-    }
-
-    public void setName(String name) {
-        this.name = name == null ? null : name.trim();
-    }
-
-    public String getDescr() {
-        return descr;
-    }
-
-    public void setDescr(String descr) {
-        this.descr = descr == null ? null : descr.trim();
-    }
-
-    public BigDecimal getAmount() {
-        return amount;
-    }
-
-    public void setAmount(BigDecimal amount) {
-        this.amount = amount;
-    }
-
-    public Integer getStatus() {
-        return status;
-    }
-
-    public void setStatus(Integer status) {
-        this.status = status;
-    }
-
-    public Date getCrtTime() {
-        return crtTime;
-    }
-
-    public void setCrtTime(Date crtTime) {
-        this.crtTime = crtTime;
-    }
-
-    public Date getUpdTime() {
-        return updTime;
-    }
-
-    public void setUpdTime(Date updTime) {
-        this.updTime = updTime;
-    }
+package com.huojutech.entity;
+
+import java.math.BigDecimal;
+import java.util.Date;
+
+public class DiamondRecord {
+    private Integer id;
+
+    private Integer uid;
+
+    private String name;
+
+    private String descr;
+
+    private BigDecimal amount;
+
+    private Integer status;
+
+    private Date crtTime;
+
+    private Date updTime;
+
+    public Integer getId() {
+        return id;
+    }
+
+    public void setId(Integer id) {
+        this.id = id;
+    }
+
+    public Integer getUid() {
+        return uid;
+    }
+
+    public void setUid(Integer uid) {
+        this.uid = uid;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name == null ? null : name.trim();
+    }
+
+    public String getDescr() {
+        return descr;
+    }
+
+    public void setDescr(String descr) {
+        this.descr = descr == null ? null : descr.trim();
+    }
+
+    public BigDecimal getAmount() {
+        return amount;
+    }
+
+    public void setAmount(BigDecimal amount) {
+        this.amount = amount;
+    }
+
+    public Integer getStatus() {
+        return status;
+    }
+
+    public void setStatus(Integer status) {
+        this.status = status;
+    }
+
+    public Date getCrtTime() {
+        return crtTime;
+    }
+
+    public void setCrtTime(Date crtTime) {
+        this.crtTime = crtTime;
+    }
+
+    public Date getUpdTime() {
+        return updTime;
+    }
+
+    public void setUpdTime(Date updTime) {
+        this.updTime = updTime;
+    }
 }

huozuan/src/main/java/com/huojutech/entity/StockForecast.java

@@ -1,156 +1,156 @@
-package com.huojutech.entity;
-
-import java.math.BigDecimal;
-import java.util.Date;
-
-public class StockForecast {
-    private Integer id;
-
-    private Integer uid;
-
-    private String stockName;
-
-    private String stockCode;
-
-    private Integer expect;
-
-    private BigDecimal bet;
-
-    private BigDecimal currentPrice;
-
-    private BigDecimal targetPrice;
-
-    private Integer cycle;
-
-    private Date startDate;
-
-    private Date endDate;
-
-    private Integer status;
-
-    private Date crtTime;
-
-    private Date updTime;
-
-    private String reason;
-
-    public Integer getId() {
-        return id;
-    }
-
-    public void setId(Integer id) {
-        this.id = id;
-    }
-
-    public Integer getUid() {
-        return uid;
-    }
-
-    public void setUid(Integer uid) {
-        this.uid = uid;
-    }
-
-    public String getStockName() {
-        return stockName;
-    }
-
-    public void setStockName(String stockName) {
-        this.stockName = stockName == null ? null : stockName.trim();
-    }
-
-    public String getStockCode() {
-        return stockCode;
-    }
-
-    public void setStockCode(String stockCode) {
-        this.stockCode = stockCode == null ? null : stockCode.trim();
-    }
-
-    public Integer getExpect() {
-        return expect;
-    }
-
-    public void setExpect(Integer expect) {
-        this.expect = expect;
-    }
-
-    public BigDecimal getBet() {
-        return bet;
-    }
-
-    public void setBet(BigDecimal bet) {
-        this.bet = bet;
-    }
-
-    public BigDecimal getCurrentPrice() {
-        return currentPrice;
-    }
-
-    public void setCurrentPrice(BigDecimal currentPrice) {
-        this.currentPrice = currentPrice;
-    }
-
-    public BigDecimal getTargetPrice() {
-        return targetPrice;
-    }
-
-    public void setTargetPrice(BigDecimal targetPrice) {
-        this.targetPrice = targetPrice;
-    }
-
-    public Integer getCycle() {
-        return cycle;
-    }
-
-    public void setCycle(Integer cycle) {
-        this.cycle = cycle;
-    }
-
-    public Date getStartDate() {
-        return startDate;
-    }
-
-    public void setStartDate(Date startDate) {
-        this.startDate = startDate;
-    }
-
-    public Date getEndDate() {
-        return endDate;
-    }
-
-    public void setEndDate(Date endDate) {
-        this.endDate = endDate;
-    }
-
-    public Integer getStatus() {
-        return status;
-    }
-
-    public void setStatus(Integer status) {
-        this.status = status;
-    }
-
-    public Date getCrtTime() {
-        return crtTime;
-    }
-
-    public void setCrtTime(Date crtTime) {
-        this.crtTime = crtTime;
-    }
-
-    public Date getUpdTime() {
-        return updTime;
-    }
-
-    public void setUpdTime(Date updTime) {
-        this.updTime = updTime;
-    }
-
-    public String getReason() {
-        return reason;
-    }
-
-    public void setReason(String reason) {
-        this.reason = reason == null ? null : reason.trim();
-    }
+package com.huojutech.entity;
+
+import java.math.BigDecimal;
+import java.util.Date;
+
+public class StockForecast {
+    private Integer id;
+
+    private Integer uid;
+
+    private String stockName;
+
+    private String stockCode;
+
+    private Integer expect;
+
+    private BigDecimal bet;
+
+    private BigDecimal currentPrice;
+
+    private BigDecimal targetPrice;
+
+    private Integer cycle;
+
+    private Date startDate;
+
+    private Date endDate;
+
+    private Integer status;
+
+    private Date crtTime;
+
+    private Date updTime;
+
+    private String reason;
+
+    public Integer getId() {
+        return id;
+    }
+
+    public void setId(Integer id) {
+        this.id = id;
+    }
+
+    public Integer getUid() {
+        return uid;
+    }
+
+    public void setUid(Integer uid) {
+        this.uid = uid;
+    }
+
+    public String getStockName() {
+        return stockName;
+    }
+
+    public void setStockName(String stockName) {
+        this.stockName = stockName == null ? null : stockName.trim();
+    }
+
+    public String getStockCode() {
+        return stockCode;
+    }
+
+    public void setStockCode(String stockCode) {
+        this.stockCode = stockCode == null ? null : stockCode.trim();
+    }
+
+    public Integer getExpect() {
+        return expect;
+    }
+
+    public void setExpect(Integer expect) {
+        this.expect = expect;
+    }
+
+    public BigDecimal getBet() {
+        return bet;
+    }
+
+    public void setBet(BigDecimal bet) {
+        this.bet = bet;
+    }
+
+    public BigDecimal getCurrentPrice() {
+        return currentPrice;
+    }
+
+    public void setCurrentPrice(BigDecimal currentPrice) {
+        this.currentPrice = currentPrice;
+    }
+
+    public BigDecimal getTargetPrice() {
+        return targetPrice;
+    }
+
+    public void setTargetPrice(BigDecimal targetPrice) {
+        this.targetPrice = targetPrice;
+    }
+
+    public Integer getCycle() {
+        return cycle;
+    }
+
+    public void setCycle(Integer cycle) {
+        this.cycle = cycle;
+    }
+
+    public Date getStartDate() {
+        return startDate;
+    }
+
+    public void setStartDate(Date startDate) {
+        this.startDate = startDate;
+    }
+
+    public Date getEndDate() {
+        return endDate;
+    }
+
+    public void setEndDate(Date endDate) {
+        this.endDate = endDate;
+    }
+
+    public Integer getStatus() {
+        return status;
+    }
+
+    public void setStatus(Integer status) {
+        this.status = status;
+    }
+
+    public Date getCrtTime() {
+        return crtTime;
+    }
+
+    public void setCrtTime(Date crtTime) {
+        this.crtTime = crtTime;
+    }
+
+    public Date getUpdTime() {
+        return updTime;
+    }
+
+    public void setUpdTime(Date updTime) {
+        this.updTime = updTime;
+    }
+
+    public String getReason() {
+        return reason;
+    }
+
+    public void setReason(String reason) {
+        this.reason = reason == null ? null : reason.trim();
+    }
 }

huozuan/src/main/java/com/huojutech/entity/StockForecastCollect.java

@@ -1,55 +1,55 @@
-package com.huojutech.entity;
-
-import java.util.Date;
-
-public class StockForecastCollect {
-    private Integer id;
-
-    private Integer uid;
-
-    private Integer forecastId;
-
-    private Date crtTime;
-
-    private Date updTime;
-
-    public Integer getId() {
-        return id;
-    }
-
-    public void setId(Integer id) {
-        this.id = id;
-    }
-
-    public Integer getUid() {
-        return uid;
-    }
-
-    public void setUid(Integer uid) {
-        this.uid = uid;
-    }
-
-    public Integer getForecastId() {
-        return forecastId;
-    }
-
-    public void setForecastId(Integer forecastId) {
-        this.forecastId = forecastId;
-    }
-
-    public Date getCrtTime() {
-        return crtTime;
-    }
-
-    public void setCrtTime(Date crtTime) {
-        this.crtTime = crtTime;
-    }
-
-    public Date getUpdTime() {
-        return updTime;
-    }
-
-    public void setUpdTime(Date updTime) {
-        this.updTime = updTime;
-    }
+package com.huojutech.entity;
+
+import java.util.Date;
+
+public class StockForecastCollect {
+    private Integer id;
+
+    private Integer uid;
+
+    private Integer forecastId;
+
+    private Date crtTime;
+
+    private Date updTime;
+
+    public Integer getId() {
+        return id;
+    }
+
+    public void setId(Integer id) {
+        this.id = id;
+    }
+
+    public Integer getUid() {
+        return uid;
+    }
+
+    public void setUid(Integer uid) {
+        this.uid = uid;
+    }
+
+    public Integer getForecastId() {
+        return forecastId;
+    }
+
+    public void setForecastId(Integer forecastId) {
+        this.forecastId = forecastId;
+    }
+
+    public Date getCrtTime() {
+        return crtTime;
+    }
+
+    public void setCrtTime(Date crtTime) {
+        this.crtTime = crtTime;
+    }
+
+    public Date getUpdTime() {
+        return updTime;
+    }
+
+    public void setUpdTime(Date updTime) {
+        this.updTime = updTime;
+    }
 }

huozuan/src/main/java/com/huojutech/entity/StockForecastVote.java

@@ -1,86 +1,86 @@
-package com.huojutech.entity;
-
-import java.math.BigDecimal;
-import java.util.Date;
-
-public class StockForecastVote {
-    private Integer id;
-
-    private Integer uid;
-
-    private Integer forecastId;
-
-    private Integer vtype;
-
-    private BigDecimal bet;
-
-    private Integer status;
-
-    private Date crtTime;
-
-    private Date updTime;
-
-    public Integer getId() {
-        return id;
-    }
-
-    public void setId(Integer id) {
-        this.id = id;
-    }
-
-    public Integer getUid() {
-        return uid;
-    }
-
-    public void setUid(Integer uid) {
-        this.uid = uid;
-    }
-
-    public Integer getForecastId() {
-        return forecastId;
-    }
-
-    public void setForecastId(Integer forecastId) {
-        this.forecastId = forecastId;
-    }
-
-    public Integer getVtype() {
-        return vtype;
-    }
-
-    public void setVtype(Integer vtype) {
-        this.vtype = vtype;
-    }
-
-    public BigDecimal getBet() {
-        return bet;
-    }
-
-    public void setBet(BigDecimal bet) {
-        this.bet = bet;
-    }
-
-    public Integer getStatus() {
-        return status;
-    }
-
-    public void setStatus(Integer status) {
-        this.status = status;
-    }
-
-    public Date getCrtTime() {
-        return crtTime;
-    }
-
-    public void setCrtTime(Date crtTime) {
-        this.crtTime = crtTime;
-    }
-
-    public Date getUpdTime() {
-        return updTime;
-    }
-
-    public void setUpdTime(Date updTime) {
-        this.updTime = updTime;
-    }
+package com.huojutech.entity;
+
+import java.math.BigDecimal;
+import java.util.Date;
+
+public class StockForecastVote {
+    private Integer id;
+
+    private Integer uid;
+
+    private Integer forecastId;
+
+    private Integer vtype;
+
+    private BigDecimal bet;
+
+    private Integer status;
+
+    private Date crtTime;
+
+    private Date updTime;
+
+    public Integer getId() {
+        return id;
+    }
+
+    public void setId(Integer id) {
+        this.id = id;
+    }
+
+    public Integer getUid() {
+        return uid;
+    }
+
+    public void setUid(Integer uid) {
+        this.uid = uid;
+    }
+
+    public Integer getForecastId() {
+        return forecastId;
+    }
+
+    public void setForecastId(Integer forecastId) {
+        this.forecastId = forecastId;
+    }
+
+    public Integer getVtype() {
+        return vtype;
+    }
+
+    public void setVtype(Integer vtype) {
+        this.vtype = vtype;
+    }
+
+    public BigDecimal getBet() {
+        return bet;
+    }
+
+    public void setBet(BigDecimal bet) {
+        this.bet = bet;
+    }
+
+    public Integer getStatus() {
+        return status;
+    }
+
+    public void setStatus(Integer status) {
+        this.status = status;
+    }
+
+    public Date getCrtTime() {
+        return crtTime;
+    }
+
+    public void setCrtTime(Date crtTime) {
+        this.crtTime = crtTime;
+    }
+
+    public Date getUpdTime() {
+        return updTime;
+    }
+
+    public void setUpdTime(Date updTime) {
+        this.updTime = updTime;
+    }
 }

huozuan/src/main/java/com/huojutech/entity/StockOptional.java

@@ -1,65 +1,65 @@
-package com.huojutech.entity;
-
-import java.util.Date;
-
-public class StockOptional {
-    private Integer id;
-
-    private Integer uid;
-
-    private String stockName;
-
-    private String stockCode;
-
-    private Date crtTime;
-
-    private Date updTime;
-
-    public Integer getId() {
-        return id;
-    }
-
-    public void setId(Integer id) {
-        this.id = id;
-    }
-
-    public Integer getUid() {
-        return uid;
-    }
-
-    public void setUid(Integer uid) {
-        this.uid = uid;
-    }
-
-    public String getStockName() {
-        return stockName;
-    }
-
-    public void setStockName(String stockName) {
-        this.stockName = stockName == null ? null : stockName.trim();
-    }
-
-    public String getStockCode() {
-        return stockCode;
-    }
-
-    public void setStockCode(String stockCode) {
-        this.stockCode = stockCode == null ? null : stockCode.trim();
-    }
-
-    public Date getCrtTime() {
-        return crtTime;
-    }
-
-    public void setCrtTime(Date crtTime) {
-        this.crtTime = crtTime;
-    }
-
-    public Date getUpdTime() {
-        return updTime;
-    }
-
-    public void setUpdTime(Date updTime) {
-        this.updTime = updTime;
-    }
+package com.huojutech.entity;
+
+import java.util.Date;
+
+public class StockOptional {
+    private Integer id;
+
+    private Integer uid;
+
+    private String stockName;
+
+    private String stockCode;
+
+    private Date crtTime;
+
+    private Date updTime;
+
+    public Integer getId() {
+        return id;
+    }
+
+    public void setId(Integer id) {
+        this.id = id;
+    }
+
+    public Integer getUid() {
+        return uid;
+    }
+
+    public void setUid(Integer uid) {
+        this.uid = uid;
+    }
+
+    public String getStockName() {
+        return stockName;
+    }
+
+    public void setStockName(String stockName) {
+        this.stockName = stockName == null ? null : stockName.trim();
+    }
+
+    public String getStockCode() {
+        return stockCode;
+    }
+
+    public void setStockCode(String stockCode) {
+        this.stockCode = stockCode == null ? null : stockCode.trim();
+    }
+
+    public Date getCrtTime() {
+        return crtTime;
+    }
+
+    public void setCrtTime(Date crtTime) {
+        this.crtTime = crtTime;
+    }
+
+    public Date getUpdTime() {
+        return updTime;
+    }
+
+    public void setUpdTime(Date updTime) {
+        this.updTime = updTime;
+    }
 }

huozuan/src/main/java/com/huojutech/entity/SystemConfig.java

@@ -1,65 +1,65 @@
-package com.huojutech.entity;
-
-import java.util.Date;
-
-public class SystemConfig {
-    private Integer id;
-
-    private String cfgKey;
-
-    private String cfgVal;
-
-    private Integer status;
-
-    private Date crtTime;
-
-    private Date updTime;
-
-    public Integer getId() {
-        return id;
-    }
-
-    public void setId(Integer id) {
-        this.id = id;
-    }
-
-    public String getCfgKey() {
-        return cfgKey;
-    }
-
-    public void setCfgKey(String cfgKey) {
-        this.cfgKey = cfgKey == null ? null : cfgKey.trim();
-    }
-
-    public String getCfgVal() {
-        return cfgVal;
-    }
-
-    public void setCfgVal(String cfgVal) {
-        this.cfgVal = cfgVal == null ? null : cfgVal.trim();
-    }
-
-    public Integer getStatus() {
-        return status;
-    }
-
-    public void setStatus(Integer status) {
-        this.status = status;
-    }
-
-    public Date getCrtTime() {
-        return crtTime;
-    }
-
-    public void setCrtTime(Date crtTime) {
-        this.crtTime = crtTime;
-    }
-
-    public Date getUpdTime() {
-        return updTime;
-    }
-
-    public void setUpdTime(Date updTime) {
-        this.updTime = updTime;
-    }
+package com.huojutech.entity;
+
+import java.util.Date;
+
+public class SystemConfig {
+    private Integer id;
+
+    private String cfgKey;
+
+    private String cfgVal;
+
+    private Integer status;
+
+    private Date crtTime;
+
+    private Date updTime;
+
+    public Integer getId() {
+        return id;
+    }
+
+    public void setId(Integer id) {
+        this.id = id;
+    }
+
+    public String getCfgKey() {
+        return cfgKey;
+    }
+
+    public void setCfgKey(String cfgKey) {
+        this.cfgKey = cfgKey == null ? null : cfgKey.trim();
+    }
+
+    public String getCfgVal() {
+        return cfgVal;
+    }
+
+    public void setCfgVal(String cfgVal) {
+        this.cfgVal = cfgVal == null ? null : cfgVal.trim();
+    }
+
+    public Integer getStatus() {
+        return status;
+    }
+
+    public void setStatus(Integer status) {
+        this.status = status;
+    }
+
+    public Date getCrtTime() {
+        return crtTime;
+    }
+
+    public void setCrtTime(Date crtTime) {
+        this.crtTime = crtTime;
+    }
+
+    public Date getUpdTime() {
+        return updTime;
+    }
+
+    public void setUpdTime(Date updTime) {
+        this.updTime = updTime;
+    }
 }

huozuan/src/main/java/com/huojutech/entity/User.java

@@ -1,126 +1,126 @@
-package com.huojutech.entity;
-
-import java.math.BigDecimal;
-import java.util.Date;
-
-public class User {
-    private Integer id;
-
-    private String name;
-
-    private String nickname;
-
-    private String avatar;
-
-    private BigDecimal amount;
-
-    private Double forecastRateSuccess;
-
-    private Double voteRateSuccess;
-
-    private String wxOpenid;
-
-    private String wxUnionid;
-
-    private Integer status;
-
-    private Date crtTime;
-
-    private Date updTime;
-
-    public Integer getId() {
-        return id;
-    }
-
-    public void setId(Integer id) {
-        this.id = id;
-    }
-
-    public String getName() {
-        return name;
-    }
-
-    public void setName(String name) {
-        this.name = name == null ? null : name.trim();
-    }
-
-    public String getNickname() {
-        return nickname;
-    }
-
-    public void setNickname(String nickname) {
-        this.nickname = nickname == null ? null : nickname.trim();
-    }
-
-    public String getAvatar() {
-        return avatar;
-    }
-
-    public void setAvatar(String avatar) {
-        this.avatar = avatar == null ? null : avatar.trim();
-    }
-
-    public BigDecimal getAmount() {
-        return amount;
-    }
-
-    public void setAmount(BigDecimal amount) {
-        this.amount = amount;
-    }
-
-    public Double getForecastRateSuccess() {
-        return forecastRateSuccess;
-    }
-
-    public void setForecastRateSuccess(Double forecastRateSuccess) {
-        this.forecastRateSuccess = forecastRateSuccess;
-    }
-
-    public Double getVoteRateSuccess() {
-        return voteRateSuccess;
-    }
-
-    public void setVoteRateSuccess(Double voteRateSuccess) {
-        this.voteRateSuccess = voteRateSuccess;
-    }
-
-    public String getWxOpenid() {
-        return wxOpenid;
-    }
-
-    public void setWxOpenid(String wxOpenid) {
-        this.wxOpenid = wxOpenid == null ? null : wxOpenid.trim();
-    }
-
-    public String getWxUnionid() {
-        return wxUnionid;
-    }
-
-    public void setWxUnionid(String wxUnionid) {
-        this.wxUnionid = wxUnionid == null ? null : wxUnionid.trim();
-    }
-
-    public Integer getStatus() {
-        return status;
-    }
-
-    public void setStatus(Integer status) {
-        this.status = status;
-    }
-
-    public Date getCrtTime() {
-        return crtTime;
-    }
-
-    public void setCrtTime(Date crtTime) {
-        this.crtTime = crtTime;
-    }
-
-    public Date getUpdTime() {
-        return updTime;
-    }
-
-    public void setUpdTime(Date updTime) {
-        this.updTime = updTime;
-    }
+package com.huojutech.entity;
+
+import java.math.BigDecimal;
+import java.util.Date;
+
+public class User {
+    private Integer id;
+
+    private String name;
+
+    private String nickname;
+
+    private String avatar;
+
+    private BigDecimal amount;
+
+    private Double forecastRateSuccess;
+
+    private Double voteRateSuccess;
+
+    private String wxOpenid;
+
+    private String wxUnionid;
+
+    private Integer status;
+
+    private Date crtTime;
+
+    private Date updTime;
+
+    public Integer getId() {
+        return id;
+    }
+
+    public void setId(Integer id) {
+        this.id = id;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name == null ? null : name.trim();
+    }
+
+    public String getNickname() {
+        return nickname;
+    }
+
+    public void setNickname(String nickname) {
+        this.nickname = nickname == null ? null : nickname.trim();
+    }
+
+    public String getAvatar() {
+        return avatar;
+    }
+
+    public void setAvatar(String avatar) {
+        this.avatar = avatar == null ? null : avatar.trim();
+    }
+
+    public BigDecimal getAmount() {
+        return amount;
+    }
+
+    public void setAmount(BigDecimal amount) {
+        this.amount = amount;
+    }
+
+    public Double getForecastRateSuccess() {
+        return forecastRateSuccess;
+    }
+
+    public void setForecastRateSuccess(Double forecastRateSuccess) {
+        this.forecastRateSuccess = forecastRateSuccess;
+    }
+
+    public Double getVoteRateSuccess() {
+        return voteRateSuccess;
+    }
+
+    public void setVoteRateSuccess(Double voteRateSuccess) {
+        this.voteRateSuccess = voteRateSuccess;
+    }
+
+    public String getWxOpenid() {
+        return wxOpenid;
+    }
+
+    public void setWxOpenid(String wxOpenid) {
+        this.wxOpenid = wxOpenid == null ? null : wxOpenid.trim();
+    }
+
+    public String getWxUnionid() {
+        return wxUnionid;
+    }
+
+    public void setWxUnionid(String wxUnionid) {
+        this.wxUnionid = wxUnionid == null ? null : wxUnionid.trim();
+    }
+
+    public Integer getStatus() {
+        return status;
+    }
+
+    public void setStatus(Integer status) {
+        this.status = status;
+    }
+
+    public Date getCrtTime() {
+        return crtTime;
+    }
+
+    public void setCrtTime(Date crtTime) {
+        this.crtTime = crtTime;
+    }
+
+    public Date getUpdTime() {
+        return updTime;
+    }
+
+    public void setUpdTime(Date updTime) {
+        this.updTime = updTime;
+    }
 }

huozuan/src/main/java/com/huojutech/entity/UserConcern.java

@@ -1,55 +1,55 @@
-package com.huojutech.entity;
-
-import java.util.Date;
-
-public class UserConcern {
-    private Integer id;
-
-    private Integer uid;
-
-    private Integer cuid;
-
-    private Date crtTime;
-
-    private Date updTime;
-
-    public Integer getId() {
-        return id;
-    }
-
-    public void setId(Integer id) {
-        this.id = id;
-    }
-
-    public Integer getUid() {
-        return uid;
-    }
-
-    public void setUid(Integer uid) {
-        this.uid = uid;
-    }
-
-    public Integer getCuid() {
-        return cuid;
-    }
-
-    public void setCuid(Integer cuid) {
-        this.cuid = cuid;
-    }
-
-    public Date getCrtTime() {
-        return crtTime;
-    }
-
-    public void setCrtTime(Date crtTime) {
-        this.crtTime = crtTime;
-    }
-
-    public Date getUpdTime() {
-        return updTime;
-    }
-
-    public void setUpdTime(Date updTime) {
-        this.updTime = updTime;
-    }
+package com.huojutech.entity;
+
+import java.util.Date;
+
+public class UserConcern {
+    private Integer id;
+
+    private Integer uid;
+
+    private Integer cuid;
+
+    private Date crtTime;
+
+    private Date updTime;
+
+    public Integer getId() {
+        return id;
+    }
+
+    public void setId(Integer id) {
+        this.id = id;
+    }
+
+    public Integer getUid() {
+        return uid;
+    }
+
+    public void setUid(Integer uid) {
+        this.uid = uid;
+    }
+
+    public Integer getCuid() {
+        return cuid;
+    }
+
+    public void setCuid(Integer cuid) {
+        this.cuid = cuid;
+    }
+
+    public Date getCrtTime() {
+        return crtTime;
+    }
+
+    public void setCrtTime(Date crtTime) {
+        this.crtTime = crtTime;
+    }
+
+    public Date getUpdTime() {
+        return updTime;
+    }
+
+    public void setUpdTime(Date updTime) {
+        this.updTime = updTime;
+    }
 }

huozuan/src/main/java/com/huojutech/enums/ResultEnum.java

@@ -1,33 +1,33 @@
-package com.huojutech.enums;
-
-
-/***
-    * TODO  枚举类
-    * Create_By  Wangzw
-    * 2018\4\10 0010
- */
-public enum ResultEnum {
-
-    SUCCESS(0, "成功"),
-    FAILED(1, "失败");
-
-    private Integer code;
-
-    private String message;
-
-    ResultEnum() {
-    }
-
-    ResultEnum(Integer code, String message) {
-        this.code = code;
-        this.message = message;
-    }
-
-    public Integer getCode() {
-        return code;
-    }
-
-    public String getMessage() {
-        return message;
-    }
+package com.huojutech.enums;
+
+
+/***
+    * TODO  枚举类
+    * Create_By  Wangzw
+    * 2018\4\10 0010
+ */
+public enum ResultEnum {
+
+    SUCCESS(0, "成功"),
+    FAILED(1, "失败");
+
+    private Integer code;
+
+    private String message;
+
+    ResultEnum() {
+    }
+
+    ResultEnum(Integer code, String message) {
+        this.code = code;
+        this.message = message;
+    }
+
+    public Integer getCode() {
+        return code;
+    }
+
+    public String getMessage() {
+        return message;
+    }
 }

huozuan/src/main/java/com/huojutech/exception/GlobalExceptionHandler.java

@@ -1,29 +1,29 @@
-package com.huojutech.exception;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.web.bind.annotation.ControllerAdvice;
-import org.springframework.web.bind.annotation.ExceptionHandler;
-import org.springframework.web.bind.annotation.ResponseBody;
-
-import javax.servlet.http.HttpServletRequest;
-
-/**
- * Created by Wangzw on 2018\4\10 0010.
- */
-@ControllerAdvice
-public class GlobalExceptionHandler {
-
-    private static Logger logger = LoggerFactory.getLogger(GlobalExceptionHandler.class);
-
-    @ExceptionHandler(value = Exception.class)
-    @ResponseBody
-    public String defaultErrorHandler(HttpServletRequest req, Exception e) throws Exception {
-        logger.error(e.getMessage(), e);
-        StringBuffer requestURL = req.getRequestURL();
-        System.out.println(requestURL);
-        return "error happens";
-    }
-
-}
-
+package com.huojutech.exception;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.web.bind.annotation.ControllerAdvice;
+import org.springframework.web.bind.annotation.ExceptionHandler;
+import org.springframework.web.bind.annotation.ResponseBody;
+
+import javax.servlet.http.HttpServletRequest;
+
+/**
+ * Created by Wangzw on 2018\4\10 0010.
+ */
+@ControllerAdvice
+public class GlobalExceptionHandler {
+
+    private static Logger logger = LoggerFactory.getLogger(GlobalExceptionHandler.class);
+
+    @ExceptionHandler(value = Exception.class)
+    @ResponseBody
+    public String defaultErrorHandler(HttpServletRequest req, Exception e) throws Exception {
+        logger.error(e.getMessage(), e);
+        StringBuffer requestURL = req.getRequestURL();
+        System.out.println(requestURL);
+        return "error happens";
+    }
+
+}
+

huozuan/src/main/java/com/huojutech/service/Impl/TestServiceImpl.java

@@ -1,38 +1,38 @@
-package com.huojutech.service.Impl;
-
-import com.huojutech.dao.TestDao;
-import com.huojutech.entity.User;
-import com.huojutech.service.TestService;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-
-/**
- * Created by Wangzw on 2018\4\11 0011.
- */
-@Service
-public class TestServiceImpl implements TestService{
-
-    private final Logger log = LoggerFactory.getLogger(TestServiceImpl.class);
-
-    @Autowired
-    private TestDao testDao;
-
-    @Override
-    public User getUserById(Integer id) {
-        return testDao.getUserById(id);
-    }
-
-
-//    @Transactional
-    public Integer updateTestTx(Integer id, String name) {
-        int i = testDao.updateTestTx(id, name);
-//        int g =1/0;测试事务是否回滚
-        log.info("返回的数据！"+i);
-        return i;
-    }
-
-
-}
-
+package com.huojutech.service.Impl;
+
+import com.huojutech.dao.TestDao;
+import com.huojutech.entity.User;
+import com.huojutech.service.TestService;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+/**
+ * Created by Wangzw on 2018\4\11 0011.
+ */
+@Service
+public class TestServiceImpl implements TestService{
+
+    private final Logger log = LoggerFactory.getLogger(TestServiceImpl.class);
+
+    @Autowired
+    private TestDao testDao;
+
+    @Override
+    public User getUserById(Integer id) {
+        return testDao.getUserById(id);
+    }
+
+
+//    @Transactional
+    public Integer updateTestTx(Integer id, String name) {
+        int i = testDao.updateTestTx(id, name);
+//        int g =1/0;测试事务是否回滚
+        log.info("返回的数据！"+i);
+        return i;
+    }
+
+
+}
+

huozuan/src/main/java/com/huojutech/service/TestService.java

@@ -1,12 +1,12 @@
-package com.huojutech.service;
-
-import com.huojutech.entity.User;
-
-/**
- * Created by Wangzw on 2018\4\11 0011.
- */
-public interface TestService {
-    User getUserById(Integer id);
-    Integer updateTestTx(Integer id,String name);
-
-}
+package com.huojutech.service;
+
+import com.huojutech.entity.User;
+
+/**
+ * Created by Wangzw on 2018\4\11 0011.
+ */
+public interface TestService {
+    User getUserById(Integer id);
+    Integer updateTestTx(Integer id,String name);
+
+}

huozuan/src/main/java/com/huojutech/utils/ResultVOUtil.java

@@ -1,28 +1,28 @@
-package com.huojutech.utils;
-
-
-import com.huojutech.vo.ResultVO;
-
-
-public class ResultVOUtil {
-
-    public static ResultVO success(Object object) {
-        ResultVO resultVO = new ResultVO();
-        resultVO.setData(object);
-        resultVO.setCode(0);
-        resultVO.setMsg("成功");
-        return resultVO;
-    }
-
-
-    public static ResultVO success() {
-        return success(null);
-    }
-
-    public static ResultVO error(Integer code, String msg) {
-        ResultVO resultVO = new ResultVO();
-        resultVO.setCode(code);
-        resultVO.setMsg(msg);
-        return resultVO;
-    }
-}
+package com.huojutech.utils;
+
+
+import com.huojutech.vo.ResultVO;
+
+
+public class ResultVOUtil {
+
+    public static ResultVO success(Object object) {
+        ResultVO resultVO = new ResultVO();
+        resultVO.setData(object);
+        resultVO.setCode(0);
+        resultVO.setMsg("成功");
+        return resultVO;
+    }
+
+
+    public static ResultVO success() {
+        return success(null);
+    }
+
+    public static ResultVO error(Integer code, String msg) {
+        ResultVO resultVO = new ResultVO();
+        resultVO.setCode(code);
+        resultVO.setMsg(msg);
+        return resultVO;
+    }
+}

huozuan/src/main/java/com/huojutech/vo/ResultVO.java

@@ -1,42 +1,42 @@
-package com.huojutech.vo;
-
-/**
-    * TODO   http请求返回的最外层对象
-    * Create_By  Wangzw
-    * 2018\4\10 0010
- */
-public class ResultVO<T> {
-
-    /** 错误码. */
-    private Integer code;
-
-    /** 提示信息. */
-    private String msg;
-
-    /** 具体内容. */
-    private T data;
-
-    public Integer getCode() {
-        return code;
-    }
-
-    public void setCode(Integer code) {
-        this.code = code;
-    }
-
-    public String getMsg() {
-        return msg;
-    }
-
-    public void setMsg(String msg) {
-        this.msg = msg;
-    }
-
-    public T getData() {
-        return data;
-    }
-
-    public void setData(T data) {
-        this.data = data;
-    }
-}
+package com.huojutech.vo;
+
+/**
+    * TODO   http请求返回的最外层对象
+    * Create_By  Wangzw
+    * 2018\4\10 0010
+ */
+public class ResultVO<T> {
+
+    /** 错误码. */
+    private Integer code;
+
+    /** 提示信息. */
+    private String msg;
+
+    /** 具体内容. */
+    private T data;
+
+    public Integer getCode() {
+        return code;
+    }
+
+    public void setCode(Integer code) {
+        this.code = code;
+    }
+
+    public String getMsg() {
+        return msg;
+    }
+
+    public void setMsg(String msg) {
+        this.msg = msg;
+    }
+
+    public T getData() {
+        return data;
+    }
+
+    public void setData(T data) {
+        this.data = data;
+    }
+}

huozuan/src/main/resources/application-dev.properties

@@ -1,9 +1,10 @@
+server.context-path=/huozuan
 server.port=8080
 
 # mysql
 spring.datasource.url=jdbc:mysql://47.96.144.239/diamond?useUnicode=true&characterEncoding=utf-8
-spring.datasource.username=root
-spring.datasource.password=123456
+spring.datasource.username=writer
+spring.datasource.password=diamond0413
 spring.datasource.driver-class-name=com.mysql.jdbc.Driver
 
 # dataSource

huozuan/src/main/resources/application-loc.properties

@@ -1,49 +1,49 @@
-server.port=8081
-
-# mysql
-spring.datasource.url=jdbc:mysql://localhost/test?useUnicode=true&characterEncoding=utf-8
-spring.datasource.username=root
-spring.datasource.password=123456
-spring.datasource.driver-class-name=com.mysql.jdbc.Driver
-
-# dataSource
-spring.datasource.type= com.alibaba.druid.pool.DruidDataSource
-spring.datasource.filters= stat,wall,log4j
-spring.datasource.maxActive= 200
-spring.datasource.initialSize= 1
-spring.datasource.maxWait= 60000
-spring.datasource.minIdle= 1
-spring.datasource.timeBetweenEvictionRunsMillis= 60000
-spring.datasource.minEvictableIdleTimeMillis= 300000
-spring.datasource.validationQuery= select 'x'
-spring.datasource.testWhileIdle= true
-spring.datasource.testOnBorrow= false
-spring.datasource.testOnReturn= false
-spring.datasource.poolPreparedStatements= true
-spring.datasource.maxOpenPreparedStatements= 20
-# 通过connectProperties属性来打开mergeSql功能；慢SQL记录
-connectionProperties: druid.stat.mergeSql=true;druid.stat.slowSqlMillis=5000
-#useGlobalDataSourceStat: true
-
-# redis
-# Redis服务器地址
-spring.redis.host=127.0.0.1
-# Redis服务器连接端口
-spring.redis.port=6379
-# 连接池最大连接数（使用负值表示没有限制）
-spring.redis.pool.max-active=8
-# 连接池最大阻塞等待时间（使用负值表示没有限制）
-spring.redis.pool.max-wait=-1
-# 连接池中的最大空闲连接
-spring.redis.pool.max-idle=8
-# 连接池中的最小空闲连接
-spring.redis.pool.min-idle=0
-# 连接超时时间（毫秒）
-spring.redis.timeout=0
-
-# MongoDB
-#spring.data.mongodb.uri=mongodb://localhost:27017/test
-
-#Mybatis
-mybatis.mapper-locations=classpath:mappers/*.xml
-mybatis.type-aliases-package=com.huojutech.entity
+server.port=8081
+
+# mysql
+spring.datasource.url=jdbc:mysql://localhost/test?useUnicode=true&characterEncoding=utf-8
+spring.datasource.username=root
+spring.datasource.password=123456
+spring.datasource.driver-class-name=com.mysql.jdbc.Driver
+
+# dataSource
+spring.datasource.type= com.alibaba.druid.pool.DruidDataSource
+spring.datasource.filters= stat,wall,log4j
+spring.datasource.maxActive= 200
+spring.datasource.initialSize= 1
+spring.datasource.maxWait= 60000
+spring.datasource.minIdle= 1
+spring.datasource.timeBetweenEvictionRunsMillis= 60000
+spring.datasource.minEvictableIdleTimeMillis= 300000
+spring.datasource.validationQuery= select 'x'
+spring.datasource.testWhileIdle= true
+spring.datasource.testOnBorrow= false
+spring.datasource.testOnReturn= false
+spring.datasource.poolPreparedStatements= true
+spring.datasource.maxOpenPreparedStatements= 20
+# 通过connectProperties属性来打开mergeSql功能；慢SQL记录
+connectionProperties: druid.stat.mergeSql=true;druid.stat.slowSqlMillis=5000
+#useGlobalDataSourceStat: true
+
+# redis
+# Redis服务器地址
+spring.redis.host=127.0.0.1
+# Redis服务器连接端口
+spring.redis.port=6379
+# 连接池最大连接数（使用负值表示没有限制）
+spring.redis.pool.max-active=8
+# 连接池最大阻塞等待时间（使用负值表示没有限制）
+spring.redis.pool.max-wait=-1
+# 连接池中的最大空闲连接
+spring.redis.pool.max-idle=8
+# 连接池中的最小空闲连接
+spring.redis.pool.min-idle=0
+# 连接超时时间（毫秒）
+spring.redis.timeout=0
+
+# MongoDB
+#spring.data.mongodb.uri=mongodb://localhost:27017/test
+
+#Mybatis
+mybatis.mapper-locations=classpath:mappers/*.xml
+mybatis.type-aliases-package=com.huojutech.entity

huozuan/src/main/resources/generatorConfig.xml

@@ -1,84 +1,84 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE generatorConfiguration
-        PUBLIC "-//mybatis.org//DTD MyBatis Generator Configuration 1.0//EN"
-        "http://mybatis.org/dtd/mybatis-generator-config_1_0.dtd">
-
-<generatorConfiguration>
-    <!--mysql 连接数据库jar 这里选择自己本地位置-->
-    <classPathEntry location="D:/mysql-connector-java-5.1.46-bin.jar" />
-    <context id="testTables" targetRuntime="MyBatis3">
-        <commentGenerator>
-            <!-- 是否去除自动生成的注释 true：是 ： false:否 -->
-            <property name="suppressAllComments" value="true" />
-        </commentGenerator>
-        <!--数据库连接的信息：驱动类、连接地址、用户名、密码 -->
-        <jdbcConnection driverClass="com.mysql.jdbc.Driver"
-                        connectionURL="jdbc:mysql://121.41.17.212:3306/diamond" userId="yxb"
-                        password="123456">
-        </jdbcConnection>
-        <!-- 默认false，把JDBC DECIMAL 和 NUMERIC 类型解析为 Integer，为 true时把JDBC DECIMAL 和
-           NUMERIC 类型解析为java.math.BigDecimal -->
-        <javaTypeResolver>
-            <property name="forceBigDecimals" value="false" />
-        </javaTypeResolver>
-
-        <!-- targetProject:生成PO类的位置 -->
-        <javaModelGenerator targetPackage="com.huojutech.entity"
-                            targetProject="src/main/java">
-            <!-- enableSubPackages:是否让schema作为包的后缀 -->
-            <property name="enableSubPackages" value="false" />
-            <!-- 从数据库返回的值被清理前后的空格 -->
-            <property name="trimStrings" value="true" />
-        </javaModelGenerator>
-        <!-- targetProject:mapper映射文件生成的位置
-           如果maven工程只是单独的一个工程，targetProject="src/main/java"
-           若果maven工程是分模块的工程，targetProject="所属模块的名称"，例如：
-           targetProject="ecps-manager-mapper"，下同-->
-        <sqlMapGenerator targetPackage="com.huojutech.dao"
-                         targetProject="src/main/java">
-            <!-- enableSubPackages:是否让schema作为包的后缀 -->
-            <property name="enableSubPackages" value="false" />
-        </sqlMapGenerator>
-        <!-- targetPackage：mapper接口生成的位置 -->
-        <javaClientGenerator type="XMLMAPPER"
-                             targetPackage="com.huojutech.dao"
-                             targetProject="src/main/java">
-            <!-- enableSubPackages:是否让schema作为包的后缀 -->
-            <property name="enableSubPackages" value="false" />
-        </javaClientGenerator>
-
-
-        <!-- 指定数据库表 -->
-        <table tableName="diamond_record" domainObjectName="DiamondRecord" enableCountByExample="true" enableUpdateByExample="false" enableDeleteByExample="false" enableSelectByExample="true" selectByExampleQueryId="true">
-            <generatedKey column="id" sqlStatement="JDBC"/>
-        </table>
-        <table tableName="stock_forecast" domainObjectName="StockForecast" enableCountByExample="true" enableUpdateByExample="false" enableDeleteByExample="false" enableSelectByExample="true" selectByExampleQueryId="true">
-            <generatedKey column="id" sqlStatement="JDBC"/>
-        </table>
-        <table tableName="stock_forecast_collect" domainObjectName="StockForecastCollect" enableCountByExample="true" enableUpdateByExample="false" enableDeleteByExample="false" enableSelectByExample="true" selectByExampleQueryId="true">
-            <generatedKey column="id" sqlStatement="JDBC"/>
-        </table>
-        <table tableName="stock_forecast_vote" domainObjectName="StockForecastVote" enableCountByExample="true" enableUpdateByExample="false" enableDeleteByExample="false" enableSelectByExample="true" selectByExampleQueryId="true">
-            <generatedKey column="id" sqlStatement="JDBC"/>
-        </table>
-        <table tableName="stock_optional" domainObjectName="StockOptional" enableCountByExample="true" enableUpdateByExample="false" enableDeleteByExample="false" enableSelectByExample="true" selectByExampleQueryId="true">
-            <generatedKey column="id" sqlStatement="JDBC"/>
-        </table>
-        <table tableName="system_config" domainObjectName="SystemConfig" enableCountByExample="true" enableUpdateByExample="false" enableDeleteByExample="false" enableSelectByExample="true" selectByExampleQueryId="true">
-            <generatedKey column="id" sqlStatement="JDBC"/>
-        </table>
-        <table tableName="user" domainObjectName="User" enableCountByExample="true" enableUpdateByExample="false" enableDeleteByExample="false" enableSelectByExample="true" selectByExampleQueryId="true">
-            <generatedKey column="id" sqlStatement="JDBC"/>
-        </table>
-        <table tableName="user_concern" domainObjectName="UserConcern" enableCountByExample="true" enableUpdateByExample="false" enableDeleteByExample="false" enableSelectByExample="true" selectByExampleQueryId="true">
-            <generatedKey column="id" sqlStatement="JDBC"/>
-        </table>
-
-
-
-
-
-
-
-    </context>
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE generatorConfiguration
+        PUBLIC "-//mybatis.org//DTD MyBatis Generator Configuration 1.0//EN"
+        "http://mybatis.org/dtd/mybatis-generator-config_1_0.dtd">
+
+<generatorConfiguration>
+    <!--mysql 连接数据库jar 这里选择自己本地位置-->
+    <classPathEntry location="D:/mysql-connector-java-5.1.46-bin.jar" />
+    <context id="testTables" targetRuntime="MyBatis3">
+        <commentGenerator>
+            <!-- 是否去除自动生成的注释 true：是 ： false:否 -->
+            <property name="suppressAllComments" value="true" />
+        </commentGenerator>
+        <!--数据库连接的信息：驱动类、连接地址、用户名、密码 -->
+        <jdbcConnection driverClass="com.mysql.jdbc.Driver"
+                        connectionURL="jdbc:mysql://121.41.17.212:3306/diamond" userId="yxb"
+                        password="123456">
+        </jdbcConnection>
+        <!-- 默认false，把JDBC DECIMAL 和 NUMERIC 类型解析为 Integer，为 true时把JDBC DECIMAL 和
+           NUMERIC 类型解析为java.math.BigDecimal -->
+        <javaTypeResolver>
+            <property name="forceBigDecimals" value="false" />
+        </javaTypeResolver>
+
+        <!-- targetProject:生成PO类的位置 -->
+        <javaModelGenerator targetPackage="com.huojutech.entity"
+                            targetProject="src/main/java">
+            <!-- enableSubPackages:是否让schema作为包的后缀 -->
+            <property name="enableSubPackages" value="false" />
+            <!-- 从数据库返回的值被清理前后的空格 -->
+            <property name="trimStrings" value="true" />
+        </javaModelGenerator>
+        <!-- targetProject:mapper映射文件生成的位置
+           如果maven工程只是单独的一个工程，targetProject="src/main/java"
+           若果maven工程是分模块的工程，targetProject="所属模块的名称"，例如：
+           targetProject="ecps-manager-mapper"，下同-->
+        <sqlMapGenerator targetPackage="com.huojutech.dao"
+                         targetProject="src/main/java">
+            <!-- enableSubPackages:是否让schema作为包的后缀 -->
+            <property name="enableSubPackages" value="false" />
+        </sqlMapGenerator>
+        <!-- targetPackage：mapper接口生成的位置 -->
+        <javaClientGenerator type="XMLMAPPER"
+                             targetPackage="com.huojutech.dao"
+                             targetProject="src/main/java">
+            <!-- enableSubPackages:是否让schema作为包的后缀 -->
+            <property name="enableSubPackages" value="false" />
+        </javaClientGenerator>
+
+
+        <!-- 指定数据库表 -->
+        <table tableName="diamond_record" domainObjectName="DiamondRecord" enableCountByExample="true" enableUpdateByExample="false" enableDeleteByExample="false" enableSelectByExample="true" selectByExampleQueryId="true">
+            <generatedKey column="id" sqlStatement="JDBC"/>
+        </table>
+        <table tableName="stock_forecast" domainObjectName="StockForecast" enableCountByExample="true" enableUpdateByExample="false" enableDeleteByExample="false" enableSelectByExample="true" selectByExampleQueryId="true">
+            <generatedKey column="id" sqlStatement="JDBC"/>
+        </table>
+        <table tableName="stock_forecast_collect" domainObjectName="StockForecastCollect" enableCountByExample="true" enableUpdateByExample="false" enableDeleteByExample="false" enableSelectByExample="true" selectByExampleQueryId="true">
+            <generatedKey column="id" sqlStatement="JDBC"/>
+        </table>
+        <table tableName="stock_forecast_vote" domainObjectName="StockForecastVote" enableCountByExample="true" enableUpdateByExample="false" enableDeleteByExample="false" enableSelectByExample="true" selectByExampleQueryId="true">
+            <generatedKey column="id" sqlStatement="JDBC"/>
+        </table>
+        <table tableName="stock_optional" domainObjectName="StockOptional" enableCountByExample="true" enableUpdateByExample="false" enableDeleteByExample="false" enableSelectByExample="true" selectByExampleQueryId="true">
+            <generatedKey column="id" sqlStatement="JDBC"/>
+        </table>
+        <table tableName="system_config" domainObjectName="SystemConfig" enableCountByExample="true" enableUpdateByExample="false" enableDeleteByExample="false" enableSelectByExample="true" selectByExampleQueryId="true">
+            <generatedKey column="id" sqlStatement="JDBC"/>
+        </table>
+        <table tableName="user" domainObjectName="User" enableCountByExample="true" enableUpdateByExample="false" enableDeleteByExample="false" enableSelectByExample="true" selectByExampleQueryId="true">
+            <generatedKey column="id" sqlStatement="JDBC"/>
+        </table>
+        <table tableName="user_concern" domainObjectName="UserConcern" enableCountByExample="true" enableUpdateByExample="false" enableDeleteByExample="false" enableSelectByExample="true" selectByExampleQueryId="true">
+            <generatedKey column="id" sqlStatement="JDBC"/>
+        </table>
+
+
+
+
+
+
+
+    </context>
 </generatorConfiguration>

huozuan/src/main/resources/logback.xml

@@ -1,60 +1,60 @@
-<!-- Logback configuration. See http://logback.qos.ch/manual/index.html -->
-<configuration scan="true" scanPeriod="10 seconds">
-    <include resource="org/springframework/boot/logging/logback/base.xml" />
-    
-    <property name="log.path" value="/data/spring_logs/demo" />
-
-    <appender name="INFO_FILE" class="ch.qos.logback.core.rolling.RollingFileAppender">
-        <File>${LOG_PATH}/info.log</File>
-        <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
-            <fileNamePattern>${LOG_PATH}/info-%d{yyyyMMdd}.log.%i</fileNamePattern>
-            <timeBasedFileNamingAndTriggeringPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedFNATP">
-                <maxFileSize>500MB</maxFileSize>
-            </timeBasedFileNamingAndTriggeringPolicy>
-            <maxHistory>2</maxHistory>
-        </rollingPolicy>
-        <layout class="ch.qos.logback.classic.PatternLayout">
-            <Pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{36} -%msg%n
-            </Pattern>
-        </layout>
-    </appender>
-
-    <appender name="ERROR_FILE" class="ch.qos.logback.core.rolling.RollingFileAppender">
-        <filter class="ch.qos.logback.classic.filter.ThresholdFilter">
-            <level>ERROR</level>
-        </filter>
-        <File>${LOG_PATH}/error.log</File>
-        <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
-            <fileNamePattern>${LOG_PATH}/error-%d{yyyyMMdd}.log.%i
-            </fileNamePattern>
-            <timeBasedFileNamingAndTriggeringPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedFNATP">
-                <maxFileSize>500MB</maxFileSize>
-            </timeBasedFileNamingAndTriggeringPolicy>
-            <maxHistory>2</maxHistory>
-        </rollingPolicy>
-        <layout class="ch.qos.logback.classic.PatternLayout">
-            <Pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{36} -%msg%n
-
-            </Pattern>
-        </layout>
-    </appender>
-    
-<!--     <logger name="org.springframework.web" level="DEBUG" /> -->
-    <!-- hibernate日志输入 -->
-    <!-- <logger name="org.hibernate.type.descriptor.sql.BasicBinder"
-        level="TRACE" />
-    <logger name="org.hibernate.type.descriptor.sql.BasicExtractor"
-        level="TRACE" />
-    <logger name="org.hibernate.SQL" level="INFO" />
-    <logger name="org.hibernate.engine.QueryParameters" level="INFO" />
-    <logger name="org.hibernate.engine.query.HQLQueryPlan" level="INFO" /> -->
-
-    <root level="INFO">
-        <appender-ref ref="INFO_FILE" />
-        <appender-ref ref="ERROR_FILE" />
-    </root>
-
-    <!--在控制台打印sql-->
-    <logger name="com.huojutech" level="debug" />
-
+<!-- Logback configuration. See http://logback.qos.ch/manual/index.html -->
+<configuration scan="true" scanPeriod="10 seconds">
+    <include resource="org/springframework/boot/logging/logback/base.xml" />
+    
+    <property name="log.path" value="/data/spring_logs/demo" />
+
+    <appender name="INFO_FILE" class="ch.qos.logback.core.rolling.RollingFileAppender">
+        <File>${LOG_PATH}/info.log</File>
+        <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
+            <fileNamePattern>${LOG_PATH}/info-%d{yyyyMMdd}.log.%i</fileNamePattern>
+            <timeBasedFileNamingAndTriggeringPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedFNATP">
+                <maxFileSize>500MB</maxFileSize>
+            </timeBasedFileNamingAndTriggeringPolicy>
+            <maxHistory>2</maxHistory>
+        </rollingPolicy>
+        <layout class="ch.qos.logback.classic.PatternLayout">
+            <Pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{36} -%msg%n
+            </Pattern>
+        </layout>
+    </appender>
+
+    <appender name="ERROR_FILE" class="ch.qos.logback.core.rolling.RollingFileAppender">
+        <filter class="ch.qos.logback.classic.filter.ThresholdFilter">
+            <level>ERROR</level>
+        </filter>
+        <File>${LOG_PATH}/error.log</File>
+        <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
+            <fileNamePattern>${LOG_PATH}/error-%d{yyyyMMdd}.log.%i
+            </fileNamePattern>
+            <timeBasedFileNamingAndTriggeringPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedFNATP">
+                <maxFileSize>500MB</maxFileSize>
+            </timeBasedFileNamingAndTriggeringPolicy>
+            <maxHistory>2</maxHistory>
+        </rollingPolicy>
+        <layout class="ch.qos.logback.classic.PatternLayout">
+            <Pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{36} -%msg%n
+
+            </Pattern>
+        </layout>
+    </appender>
+    
+<!--     <logger name="org.springframework.web" level="DEBUG" /> -->
+    <!-- hibernate日志输入 -->
+    <!-- <logger name="org.hibernate.type.descriptor.sql.BasicBinder"
+        level="TRACE" />
+    <logger name="org.hibernate.type.descriptor.sql.BasicExtractor"
+        level="TRACE" />
+    <logger name="org.hibernate.SQL" level="INFO" />
+    <logger name="org.hibernate.engine.QueryParameters" level="INFO" />
+    <logger name="org.hibernate.engine.query.HQLQueryPlan" level="INFO" /> -->
+
+    <root level="INFO">
+        <appender-ref ref="INFO_FILE" />
+        <appender-ref ref="ERROR_FILE" />
+    </root>
+
+    <!--在控制台打印sql-->
+    <logger name="com.huojutech" level="debug" />
+
 </configuration>

huozuan/src/main/resources/mappers/DiamondRecordMapper.xml

@@ -1,172 +1,172 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
-<mapper namespace="com.huojutech.dao.DiamondRecordMapper" >
-  <resultMap id="BaseResultMap" type="com.huojutech.entity.DiamondRecord" >
-    <id column="id" property="id" jdbcType="INTEGER" />
-    <result column="uid" property="uid" jdbcType="INTEGER" />
-    <result column="name" property="name" jdbcType="VARCHAR" />
-    <result column="descr" property="descr" jdbcType="VARCHAR" />
-    <result column="amount" property="amount" jdbcType="DECIMAL" />
-    <result column="status" property="status" jdbcType="INTEGER" />
-    <result column="crt_time" property="crtTime" jdbcType="TIMESTAMP" />
-    <result column="upd_time" property="updTime" jdbcType="TIMESTAMP" />
-  </resultMap>
-  <sql id="Example_Where_Clause" >
-    <where >
-      <foreach collection="oredCriteria" item="criteria" separator="or" >
-        <if test="criteria.valid" >
-          <trim prefix="(" suffix=")" prefixOverrides="and" >
-            <foreach collection="criteria.criteria" item="criterion" >
-              <choose >
-                <when test="criterion.noValue" >
-                  and ${criterion.condition}
-                </when>
-                <when test="criterion.singleValue" >
-                  and ${criterion.condition} #{criterion.value}
-                </when>
-                <when test="criterion.betweenValue" >
-                  and ${criterion.condition} #{criterion.value} and #{criterion.secondValue}
-                </when>
-                <when test="criterion.listValue" >
-                  and ${criterion.condition}
-                  <foreach collection="criterion.value" item="listItem" open="(" close=")" separator="," >
-                    #{listItem}
-                  </foreach>
-                </when>
-              </choose>
-            </foreach>
-          </trim>
-        </if>
-      </foreach>
-    </where>
-  </sql>
-  <sql id="Base_Column_List" >
-    id, uid, name, descr, amount, status, crt_time, upd_time
-  </sql>
-  <select id="selectByExample" resultMap="BaseResultMap" parameterType="com.huojutech.entity.DiamondRecordExample" >
-    select
-    <if test="distinct" >
-      distinct
-    </if>
-    'true' as QUERYID,
-    <include refid="Base_Column_List" />
-    from diamond_record
-    <if test="_parameter != null" >
-      <include refid="Example_Where_Clause" />
-    </if>
-    <if test="orderByClause != null" >
-      order by ${orderByClause}
-    </if>
-  </select>
-  <select id="selectByPrimaryKey" resultMap="BaseResultMap" parameterType="java.lang.Integer" >
-    select 
-    <include refid="Base_Column_List" />
-    from diamond_record
-    where id = #{id,jdbcType=INTEGER}
-  </select>
-  <delete id="deleteByPrimaryKey" parameterType="java.lang.Integer" >
-    delete from diamond_record
-    where id = #{id,jdbcType=INTEGER}
-  </delete>
-  <insert id="insert" parameterType="com.huojutech.entity.DiamondRecord" useGeneratedKeys="true" keyProperty="id" >
-    insert into diamond_record (uid, name, descr, 
-      amount, status, crt_time, 
-      upd_time)
-    values (#{uid,jdbcType=INTEGER}, #{name,jdbcType=VARCHAR}, #{descr,jdbcType=VARCHAR}, 
-      #{amount,jdbcType=DECIMAL}, #{status,jdbcType=INTEGER}, #{crtTime,jdbcType=TIMESTAMP}, 
-      #{updTime,jdbcType=TIMESTAMP})
-  </insert>
-  <insert id="insertSelective" parameterType="com.huojutech.entity.DiamondRecord" useGeneratedKeys="true" keyProperty="id" >
-    insert into diamond_record
-    <trim prefix="(" suffix=")" suffixOverrides="," >
-      <if test="uid != null" >
-        uid,
-      </if>
-      <if test="name != null" >
-        name,
-      </if>
-      <if test="descr != null" >
-        descr,
-      </if>
-      <if test="amount != null" >
-        amount,
-      </if>
-      <if test="status != null" >
-        status,
-      </if>
-      <if test="crtTime != null" >
-        crt_time,
-      </if>
-      <if test="updTime != null" >
-        upd_time,
-      </if>
-    </trim>
-    <trim prefix="values (" suffix=")" suffixOverrides="," >
-      <if test="uid != null" >
-        #{uid,jdbcType=INTEGER},
-      </if>
-      <if test="name != null" >
-        #{name,jdbcType=VARCHAR},
-      </if>
-      <if test="descr != null" >
-        #{descr,jdbcType=VARCHAR},
-      </if>
-      <if test="amount != null" >
-        #{amount,jdbcType=DECIMAL},
-      </if>
-      <if test="status != null" >
-        #{status,jdbcType=INTEGER},
-      </if>
-      <if test="crtTime != null" >
-        #{crtTime,jdbcType=TIMESTAMP},
-      </if>
-      <if test="updTime != null" >
-        #{updTime,jdbcType=TIMESTAMP},
-      </if>
-    </trim>
-  </insert>
-  <select id="countByExample" parameterType="com.huojutech.entity.DiamondRecordExample" resultType="java.lang.Integer" >
-    select count(*) from diamond_record
-    <if test="_parameter != null" >
-      <include refid="Example_Where_Clause" />
-    </if>
-  </select>
-  <update id="updateByPrimaryKeySelective" parameterType="com.huojutech.entity.DiamondRecord" >
-    update diamond_record
-    <set >
-      <if test="uid != null" >
-        uid = #{uid,jdbcType=INTEGER},
-      </if>
-      <if test="name != null" >
-        name = #{name,jdbcType=VARCHAR},
-      </if>
-      <if test="descr != null" >
-        descr = #{descr,jdbcType=VARCHAR},
-      </if>
-      <if test="amount != null" >
-        amount = #{amount,jdbcType=DECIMAL},
-      </if>
-      <if test="status != null" >
-        status = #{status,jdbcType=INTEGER},
-      </if>
-      <if test="crtTime != null" >
-        crt_time = #{crtTime,jdbcType=TIMESTAMP},
-      </if>
-      <if test="updTime != null" >
-        upd_time = #{updTime,jdbcType=TIMESTAMP},
-      </if>
-    </set>
-    where id = #{id,jdbcType=INTEGER}
-  </update>
-  <update id="updateByPrimaryKey" parameterType="com.huojutech.entity.DiamondRecord" >
-    update diamond_record
-    set uid = #{uid,jdbcType=INTEGER},
-      name = #{name,jdbcType=VARCHAR},
-      descr = #{descr,jdbcType=VARCHAR},
-      amount = #{amount,jdbcType=DECIMAL},
-      status = #{status,jdbcType=INTEGER},
-      crt_time = #{crtTime,jdbcType=TIMESTAMP},
-      upd_time = #{updTime,jdbcType=TIMESTAMP}
-    where id = #{id,jdbcType=INTEGER}
-  </update>
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
+<mapper namespace="com.huojutech.dao.DiamondRecordMapper" >
+  <resultMap id="BaseResultMap" type="com.huojutech.entity.DiamondRecord" >
+    <id column="id" property="id" jdbcType="INTEGER" />
+    <result column="uid" property="uid" jdbcType="INTEGER" />
+    <result column="name" property="name" jdbcType="VARCHAR" />
+    <result column="descr" property="descr" jdbcType="VARCHAR" />
+    <result column="amount" property="amount" jdbcType="DECIMAL" />
+    <result column="status" property="status" jdbcType="INTEGER" />
+    <result column="crt_time" property="crtTime" jdbcType="TIMESTAMP" />
+    <result column="upd_time" property="updTime" jdbcType="TIMESTAMP" />
+  </resultMap>
+  <sql id="Example_Where_Clause" >
+    <where >
+      <foreach collection="oredCriteria" item="criteria" separator="or" >
+        <if test="criteria.valid" >
+          <trim prefix="(" suffix=")" prefixOverrides="and" >
+            <foreach collection="criteria.criteria" item="criterion" >
+              <choose >
+                <when test="criterion.noValue" >
+                  and ${criterion.condition}
+                </when>
+                <when test="criterion.singleValue" >
+                  and ${criterion.condition} #{criterion.value}
+                </when>
+                <when test="criterion.betweenValue" >
+                  and ${criterion.condition} #{criterion.value} and #{criterion.secondValue}
+                </when>
+                <when test="criterion.listValue" >
+                  and ${criterion.condition}
+                  <foreach collection="criterion.value" item="listItem" open="(" close=")" separator="," >
+                    #{listItem}
+                  </foreach>
+                </when>
+              </choose>
+            </foreach>
+          </trim>
+        </if>
+      </foreach>
+    </where>
+  </sql>
+  <sql id="Base_Column_List" >
+    id, uid, name, descr, amount, status, crt_time, upd_time
+  </sql>
+  <select id="selectByExample" resultMap="BaseResultMap" parameterType="com.huojutech.entity.DiamondRecordExample" >
+    select
+    <if test="distinct" >
+      distinct
+    </if>
+    'true' as QUERYID,
+    <include refid="Base_Column_List" />
+    from diamond_record
+    <if test="_parameter != null" >
+      <include refid="Example_Where_Clause" />
+    </if>
+    <if test="orderByClause != null" >
+      order by ${orderByClause}
+    </if>
+  </select>
+  <select id="selectByPrimaryKey" resultMap="BaseResultMap" parameterType="java.lang.Integer" >
+    select 
+    <include refid="Base_Column_List" />
+    from diamond_record
+    where id = #{id,jdbcType=INTEGER}
+  </select>
+  <delete id="deleteByPrimaryKey" parameterType="java.lang.Integer" >
+    delete from diamond_record
+    where id = #{id,jdbcType=INTEGER}
+  </delete>
+  <insert id="insert" parameterType="com.huojutech.entity.DiamondRecord" useGeneratedKeys="true" keyProperty="id" >
+    insert into diamond_record (uid, name, descr, 
+      amount, status, crt_time, 
+      upd_time)
+    values (#{uid,jdbcType=INTEGER}, #{name,jdbcType=VARCHAR}, #{descr,jdbcType=VARCHAR}, 
+      #{amount,jdbcType=DECIMAL}, #{status,jdbcType=INTEGER}, #{crtTime,jdbcType=TIMESTAMP}, 
+      #{updTime,jdbcType=TIMESTAMP})
+  </insert>
+  <insert id="insertSelective" parameterType="com.huojutech.entity.DiamondRecord" useGeneratedKeys="true" keyProperty="id" >
+    insert into diamond_record
+    <trim prefix="(" suffix=")" suffixOverrides="," >
+      <if test="uid != null" >
+        uid,
+      </if>
+      <if test="name != null" >
+        name,
+      </if>
+      <if test="descr != null" >
+        descr,
+      </if>
+      <if test="amount != null" >
+        amount,
+      </if>
+      <if test="status != null" >
+        status,
+      </if>
+      <if test="crtTime != null" >
+        crt_time,
+      </if>
+      <if test="updTime != null" >
+        upd_time,
+      </if>
+    </trim>
+    <trim prefix="values (" suffix=")" suffixOverrides="," >
+      <if test="uid != null" >
+        #{uid,jdbcType=INTEGER},
+      </if>
+      <if test="name != null" >
+        #{name,jdbcType=VARCHAR},
+      </if>
+      <if test="descr != null" >
+        #{descr,jdbcType=VARCHAR},
+      </if>
+      <if test="amount != null" >
+        #{amount,jdbcType=DECIMAL},
+      </if>
+      <if test="status != null" >
+        #{status,jdbcType=INTEGER},
+      </if>
+      <if test="crtTime != null" >
+        #{crtTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="updTime != null" >
+        #{updTime,jdbcType=TIMESTAMP},
+      </if>
+    </trim>
+  </insert>
+  <select id="countByExample" parameterType="com.huojutech.entity.DiamondRecordExample" resultType="java.lang.Integer" >
+    select count(*) from diamond_record
+    <if test="_parameter != null" >
+      <include refid="Example_Where_Clause" />
+    </if>
+  </select>
+  <update id="updateByPrimaryKeySelective" parameterType="com.huojutech.entity.DiamondRecord" >
+    update diamond_record
+    <set >
+      <if test="uid != null" >
+        uid = #{uid,jdbcType=INTEGER},
+      </if>
+      <if test="name != null" >
+        name = #{name,jdbcType=VARCHAR},
+      </if>
+      <if test="descr != null" >
+        descr = #{descr,jdbcType=VARCHAR},
+      </if>
+      <if test="amount != null" >
+        amount = #{amount,jdbcType=DECIMAL},
+      </if>
+      <if test="status != null" >
+        status = #{status,jdbcType=INTEGER},
+      </if>
+      <if test="crtTime != null" >
+        crt_time = #{crtTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="updTime != null" >
+        upd_time = #{updTime,jdbcType=TIMESTAMP},
+      </if>
+    </set>
+    where id = #{id,jdbcType=INTEGER}
+  </update>
+  <update id="updateByPrimaryKey" parameterType="com.huojutech.entity.DiamondRecord" >
+    update diamond_record
+    set uid = #{uid,jdbcType=INTEGER},
+      name = #{name,jdbcType=VARCHAR},
+      descr = #{descr,jdbcType=VARCHAR},
+      amount = #{amount,jdbcType=DECIMAL},
+      status = #{status,jdbcType=INTEGER},
+      crt_time = #{crtTime,jdbcType=TIMESTAMP},
+      upd_time = #{updTime,jdbcType=TIMESTAMP}
+    where id = #{id,jdbcType=INTEGER}
+  </update>
 </mapper>

huozuan/src/main/resources/mappers/StockForecastCollectMapper.xml

@@ -1,137 +1,137 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
-<mapper namespace="com.huojutech.dao.StockForecastCollectMapper" >
-  <resultMap id="BaseResultMap" type="com.huojutech.entity.StockForecastCollect" >
-    <id column="id" property="id" jdbcType="INTEGER" />
-    <result column="uid" property="uid" jdbcType="INTEGER" />
-    <result column="forecast_id" property="forecastId" jdbcType="INTEGER" />
-    <result column="crt_time" property="crtTime" jdbcType="TIMESTAMP" />
-    <result column="upd_time" property="updTime" jdbcType="TIMESTAMP" />
-  </resultMap>
-  <sql id="Example_Where_Clause" >
-    <where >
-      <foreach collection="oredCriteria" item="criteria" separator="or" >
-        <if test="criteria.valid" >
-          <trim prefix="(" suffix=")" prefixOverrides="and" >
-            <foreach collection="criteria.criteria" item="criterion" >
-              <choose >
-                <when test="criterion.noValue" >
-                  and ${criterion.condition}
-                </when>
-                <when test="criterion.singleValue" >
-                  and ${criterion.condition} #{criterion.value}
-                </when>
-                <when test="criterion.betweenValue" >
-                  and ${criterion.condition} #{criterion.value} and #{criterion.secondValue}
-                </when>
-                <when test="criterion.listValue" >
-                  and ${criterion.condition}
-                  <foreach collection="criterion.value" item="listItem" open="(" close=")" separator="," >
-                    #{listItem}
-                  </foreach>
-                </when>
-              </choose>
-            </foreach>
-          </trim>
-        </if>
-      </foreach>
-    </where>
-  </sql>
-  <sql id="Base_Column_List" >
-    id, uid, forecast_id, crt_time, upd_time
-  </sql>
-  <select id="selectByExample" resultMap="BaseResultMap" parameterType="com.huojutech.entity.StockForecastCollectExample" >
-    select
-    <if test="distinct" >
-      distinct
-    </if>
-    'true' as QUERYID,
-    <include refid="Base_Column_List" />
-    from stock_forecast_collect
-    <if test="_parameter != null" >
-      <include refid="Example_Where_Clause" />
-    </if>
-    <if test="orderByClause != null" >
-      order by ${orderByClause}
-    </if>
-  </select>
-  <select id="selectByPrimaryKey" resultMap="BaseResultMap" parameterType="java.lang.Integer" >
-    select 
-    <include refid="Base_Column_List" />
-    from stock_forecast_collect
-    where id = #{id,jdbcType=INTEGER}
-  </select>
-  <delete id="deleteByPrimaryKey" parameterType="java.lang.Integer" >
-    delete from stock_forecast_collect
-    where id = #{id,jdbcType=INTEGER}
-  </delete>
-  <insert id="insert" parameterType="com.huojutech.entity.StockForecastCollect" useGeneratedKeys="true" keyProperty="id" >
-    insert into stock_forecast_collect (uid, forecast_id, crt_time, 
-      upd_time)
-    values (#{uid,jdbcType=INTEGER}, #{forecastId,jdbcType=INTEGER}, #{crtTime,jdbcType=TIMESTAMP}, 
-      #{updTime,jdbcType=TIMESTAMP})
-  </insert>
-  <insert id="insertSelective" parameterType="com.huojutech.entity.StockForecastCollect" useGeneratedKeys="true" keyProperty="id" >
-    insert into stock_forecast_collect
-    <trim prefix="(" suffix=")" suffixOverrides="," >
-      <if test="uid != null" >
-        uid,
-      </if>
-      <if test="forecastId != null" >
-        forecast_id,
-      </if>
-      <if test="crtTime != null" >
-        crt_time,
-      </if>
-      <if test="updTime != null" >
-        upd_time,
-      </if>
-    </trim>
-    <trim prefix="values (" suffix=")" suffixOverrides="," >
-      <if test="uid != null" >
-        #{uid,jdbcType=INTEGER},
-      </if>
-      <if test="forecastId != null" >
-        #{forecastId,jdbcType=INTEGER},
-      </if>
-      <if test="crtTime != null" >
-        #{crtTime,jdbcType=TIMESTAMP},
-      </if>
-      <if test="updTime != null" >
-        #{updTime,jdbcType=TIMESTAMP},
-      </if>
-    </trim>
-  </insert>
-  <select id="countByExample" parameterType="com.huojutech.entity.StockForecastCollectExample" resultType="java.lang.Integer" >
-    select count(*) from stock_forecast_collect
-    <if test="_parameter != null" >
-      <include refid="Example_Where_Clause" />
-    </if>
-  </select>
-  <update id="updateByPrimaryKeySelective" parameterType="com.huojutech.entity.StockForecastCollect" >
-    update stock_forecast_collect
-    <set >
-      <if test="uid != null" >
-        uid = #{uid,jdbcType=INTEGER},
-      </if>
-      <if test="forecastId != null" >
-        forecast_id = #{forecastId,jdbcType=INTEGER},
-      </if>
-      <if test="crtTime != null" >
-        crt_time = #{crtTime,jdbcType=TIMESTAMP},
-      </if>
-      <if test="updTime != null" >
-        upd_time = #{updTime,jdbcType=TIMESTAMP},
-      </if>
-    </set>
-    where id = #{id,jdbcType=INTEGER}
-  </update>
-  <update id="updateByPrimaryKey" parameterType="com.huojutech.entity.StockForecastCollect" >
-    update stock_forecast_collect
-    set uid = #{uid,jdbcType=INTEGER},
-      forecast_id = #{forecastId,jdbcType=INTEGER},
-      crt_time = #{crtTime,jdbcType=TIMESTAMP},
-      upd_time = #{updTime,jdbcType=TIMESTAMP}
-    where id = #{id,jdbcType=INTEGER}
-  </update>
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
+<mapper namespace="com.huojutech.dao.StockForecastCollectMapper" >
+  <resultMap id="BaseResultMap" type="com.huojutech.entity.StockForecastCollect" >
+    <id column="id" property="id" jdbcType="INTEGER" />
+    <result column="uid" property="uid" jdbcType="INTEGER" />
+    <result column="forecast_id" property="forecastId" jdbcType="INTEGER" />
+    <result column="crt_time" property="crtTime" jdbcType="TIMESTAMP" />
+    <result column="upd_time" property="updTime" jdbcType="TIMESTAMP" />
+  </resultMap>
+  <sql id="Example_Where_Clause" >
+    <where >
+      <foreach collection="oredCriteria" item="criteria" separator="or" >
+        <if test="criteria.valid" >
+          <trim prefix="(" suffix=")" prefixOverrides="and" >
+            <foreach collection="criteria.criteria" item="criterion" >
+              <choose >
+                <when test="criterion.noValue" >
+                  and ${criterion.condition}
+                </when>
+                <when test="criterion.singleValue" >
+                  and ${criterion.condition} #{criterion.value}
+                </when>
+                <when test="criterion.betweenValue" >
+                  and ${criterion.condition} #{criterion.value} and #{criterion.secondValue}
+                </when>
+                <when test="criterion.listValue" >
+                  and ${criterion.condition}
+                  <foreach collection="criterion.value" item="listItem" open="(" close=")" separator="," >
+                    #{listItem}
+                  </foreach>
+                </when>
+              </choose>
+            </foreach>
+          </trim>
+        </if>
+      </foreach>
+    </where>
+  </sql>
+  <sql id="Base_Column_List" >
+    id, uid, forecast_id, crt_time, upd_time
+  </sql>
+  <select id="selectByExample" resultMap="BaseResultMap" parameterType="com.huojutech.entity.StockForecastCollectExample" >
+    select
+    <if test="distinct" >
+      distinct
+    </if>
+    'true' as QUERYID,
+    <include refid="Base_Column_List" />
+    from stock_forecast_collect
+    <if test="_parameter != null" >
+      <include refid="Example_Where_Clause" />
+    </if>
+    <if test="orderByClause != null" >
+      order by ${orderByClause}
+    </if>
+  </select>
+  <select id="selectByPrimaryKey" resultMap="BaseResultMap" parameterType="java.lang.Integer" >
+    select 
+    <include refid="Base_Column_List" />
+    from stock_forecast_collect
+    where id = #{id,jdbcType=INTEGER}
+  </select>
+  <delete id="deleteByPrimaryKey" parameterType="java.lang.Integer" >
+    delete from stock_forecast_collect
+    where id = #{id,jdbcType=INTEGER}
+  </delete>
+  <insert id="insert" parameterType="com.huojutech.entity.StockForecastCollect" useGeneratedKeys="true" keyProperty="id" >
+    insert into stock_forecast_collect (uid, forecast_id, crt_time, 
+      upd_time)
+    values (#{uid,jdbcType=INTEGER}, #{forecastId,jdbcType=INTEGER}, #{crtTime,jdbcType=TIMESTAMP}, 
+      #{updTime,jdbcType=TIMESTAMP})
+  </insert>
+  <insert id="insertSelective" parameterType="com.huojutech.entity.StockForecastCollect" useGeneratedKeys="true" keyProperty="id" >
+    insert into stock_forecast_collect
+    <trim prefix="(" suffix=")" suffixOverrides="," >
+      <if test="uid != null" >
+        uid,
+      </if>
+      <if test="forecastId != null" >
+        forecast_id,
+      </if>
+      <if test="crtTime != null" >
+        crt_time,
+      </if>
+      <if test="updTime != null" >
+        upd_time,
+      </if>
+    </trim>
+    <trim prefix="values (" suffix=")" suffixOverrides="," >
+      <if test="uid != null" >
+        #{uid,jdbcType=INTEGER},
+      </if>
+      <if test="forecastId != null" >
+        #{forecastId,jdbcType=INTEGER},
+      </if>
+      <if test="crtTime != null" >
+        #{crtTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="updTime != null" >
+        #{updTime,jdbcType=TIMESTAMP},
+      </if>
+    </trim>
+  </insert>
+  <select id="countByExample" parameterType="com.huojutech.entity.StockForecastCollectExample" resultType="java.lang.Integer" >
+    select count(*) from stock_forecast_collect
+    <if test="_parameter != null" >
+      <include refid="Example_Where_Clause" />
+    </if>
+  </select>
+  <update id="updateByPrimaryKeySelective" parameterType="com.huojutech.entity.StockForecastCollect" >
+    update stock_forecast_collect
+    <set >
+      <if test="uid != null" >
+        uid = #{uid,jdbcType=INTEGER},
+      </if>
+      <if test="forecastId != null" >
+        forecast_id = #{forecastId,jdbcType=INTEGER},
+      </if>
+      <if test="crtTime != null" >
+        crt_time = #{crtTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="updTime != null" >
+        upd_time = #{updTime,jdbcType=TIMESTAMP},
+      </if>
+    </set>
+    where id = #{id,jdbcType=INTEGER}
+  </update>
+  <update id="updateByPrimaryKey" parameterType="com.huojutech.entity.StockForecastCollect" >
+    update stock_forecast_collect
+    set uid = #{uid,jdbcType=INTEGER},
+      forecast_id = #{forecastId,jdbcType=INTEGER},
+      crt_time = #{crtTime,jdbcType=TIMESTAMP},
+      upd_time = #{updTime,jdbcType=TIMESTAMP}
+    where id = #{id,jdbcType=INTEGER}
+  </update>
 </mapper>

huozuan/src/main/resources/mappers/StockForecastMapper.xml

@@ -1,295 +1,295 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
-<mapper namespace="com.huojutech.dao.StockForecastMapper" >
-  <resultMap id="BaseResultMap" type="com.huojutech.entity.StockForecast" >
-    <id column="id" property="id" jdbcType="INTEGER" />
-    <result column="uid" property="uid" jdbcType="INTEGER" />
-    <result column="stock_name" property="stockName" jdbcType="VARCHAR" />
-    <result column="stock_code" property="stockCode" jdbcType="VARCHAR" />
-    <result column="expect" property="expect" jdbcType="INTEGER" />
-    <result column="bet" property="bet" jdbcType="DECIMAL" />
-    <result column="current_price" property="currentPrice" jdbcType="DECIMAL" />
-    <result column="target_price" property="targetPrice" jdbcType="DECIMAL" />
-    <result column="cycle" property="cycle" jdbcType="INTEGER" />
-    <result column="start_date" property="startDate" jdbcType="DATE" />
-    <result column="end_date" property="endDate" jdbcType="DATE" />
-    <result column="status" property="status" jdbcType="INTEGER" />
-    <result column="crt_time" property="crtTime" jdbcType="TIMESTAMP" />
-    <result column="upd_time" property="updTime" jdbcType="TIMESTAMP" />
-  </resultMap>
-  <resultMap id="ResultMapWithBLOBs" type="com.huojutech.entity.StockForecast" extends="BaseResultMap" >
-    <result column="reason" property="reason" jdbcType="LONGVARCHAR" />
-  </resultMap>
-  <sql id="Example_Where_Clause" >
-    <where >
-      <foreach collection="oredCriteria" item="criteria" separator="or" >
-        <if test="criteria.valid" >
-          <trim prefix="(" suffix=")" prefixOverrides="and" >
-            <foreach collection="criteria.criteria" item="criterion" >
-              <choose >
-                <when test="criterion.noValue" >
-                  and ${criterion.condition}
-                </when>
-                <when test="criterion.singleValue" >
-                  and ${criterion.condition} #{criterion.value}
-                </when>
-                <when test="criterion.betweenValue" >
-                  and ${criterion.condition} #{criterion.value} and #{criterion.secondValue}
-                </when>
-                <when test="criterion.listValue" >
-                  and ${criterion.condition}
-                  <foreach collection="criterion.value" item="listItem" open="(" close=")" separator="," >
-                    #{listItem}
-                  </foreach>
-                </when>
-              </choose>
-            </foreach>
-          </trim>
-        </if>
-      </foreach>
-    </where>
-  </sql>
-  <sql id="Base_Column_List" >
-    id, uid, stock_name, stock_code, expect, bet, current_price, target_price, cycle, 
-    start_date, end_date, status, crt_time, upd_time
-  </sql>
-  <sql id="Blob_Column_List" >
-    reason
-  </sql>
-  <select id="selectByExampleWithBLOBs" resultMap="ResultMapWithBLOBs" parameterType="com.huojutech.entity.StockForecastExample" >
-    select
-    <if test="distinct" >
-      distinct
-    </if>
-    'true' as QUERYID,
-    <include refid="Base_Column_List" />
-    ,
-    <include refid="Blob_Column_List" />
-    from stock_forecast
-    <if test="_parameter != null" >
-      <include refid="Example_Where_Clause" />
-    </if>
-    <if test="orderByClause != null" >
-      order by ${orderByClause}
-    </if>
-  </select>
-  <select id="selectByExample" resultMap="BaseResultMap" parameterType="com.huojutech.entity.StockForecastExample" >
-    select
-    <if test="distinct" >
-      distinct
-    </if>
-    'true' as QUERYID,
-    <include refid="Base_Column_List" />
-    from stock_forecast
-    <if test="_parameter != null" >
-      <include refid="Example_Where_Clause" />
-    </if>
-    <if test="orderByClause != null" >
-      order by ${orderByClause}
-    </if>
-  </select>
-  <select id="selectByPrimaryKey" resultMap="ResultMapWithBLOBs" parameterType="java.lang.Integer" >
-    select 
-    <include refid="Base_Column_List" />
-    ,
-    <include refid="Blob_Column_List" />
-    from stock_forecast
-    where id = #{id,jdbcType=INTEGER}
-  </select>
-  <delete id="deleteByPrimaryKey" parameterType="java.lang.Integer" >
-    delete from stock_forecast
-    where id = #{id,jdbcType=INTEGER}
-  </delete>
-  <insert id="insert" parameterType="com.huojutech.entity.StockForecast" useGeneratedKeys="true" keyProperty="id" >
-    insert into stock_forecast (uid, stock_name, stock_code, 
-      expect, bet, current_price, 
-      target_price, cycle, start_date, 
-      end_date, status, crt_time, 
-      upd_time, reason)
-    values (#{uid,jdbcType=INTEGER}, #{stockName,jdbcType=VARCHAR}, #{stockCode,jdbcType=VARCHAR}, 
-      #{expect,jdbcType=INTEGER}, #{bet,jdbcType=DECIMAL}, #{currentPrice,jdbcType=DECIMAL}, 
-      #{targetPrice,jdbcType=DECIMAL}, #{cycle,jdbcType=INTEGER}, #{startDate,jdbcType=DATE}, 
-      #{endDate,jdbcType=DATE}, #{status,jdbcType=INTEGER}, #{crtTime,jdbcType=TIMESTAMP}, 
-      #{updTime,jdbcType=TIMESTAMP}, #{reason,jdbcType=LONGVARCHAR})
-  </insert>
-  <insert id="insertSelective" parameterType="com.huojutech.entity.StockForecast" useGeneratedKeys="true" keyProperty="id" >
-    insert into stock_forecast
-    <trim prefix="(" suffix=")" suffixOverrides="," >
-      <if test="uid != null" >
-        uid,
-      </if>
-      <if test="stockName != null" >
-        stock_name,
-      </if>
-      <if test="stockCode != null" >
-        stock_code,
-      </if>
-      <if test="expect != null" >
-        expect,
-      </if>
-      <if test="bet != null" >
-        bet,
-      </if>
-      <if test="currentPrice != null" >
-        current_price,
-      </if>
-      <if test="targetPrice != null" >
-        target_price,
-      </if>
-      <if test="cycle != null" >
-        cycle,
-      </if>
-      <if test="startDate != null" >
-        start_date,
-      </if>
-      <if test="endDate != null" >
-        end_date,
-      </if>
-      <if test="status != null" >
-        status,
-      </if>
-      <if test="crtTime != null" >
-        crt_time,
-      </if>
-      <if test="updTime != null" >
-        upd_time,
-      </if>
-      <if test="reason != null" >
-        reason,
-      </if>
-    </trim>
-    <trim prefix="values (" suffix=")" suffixOverrides="," >
-      <if test="uid != null" >
-        #{uid,jdbcType=INTEGER},
-      </if>
-      <if test="stockName != null" >
-        #{stockName,jdbcType=VARCHAR},
-      </if>
-      <if test="stockCode != null" >
-        #{stockCode,jdbcType=VARCHAR},
-      </if>
-      <if test="expect != null" >
-        #{expect,jdbcType=INTEGER},
-      </if>
-      <if test="bet != null" >
-        #{bet,jdbcType=DECIMAL},
-      </if>
-      <if test="currentPrice != null" >
-        #{currentPrice,jdbcType=DECIMAL},
-      </if>
-      <if test="targetPrice != null" >
-        #{targetPrice,jdbcType=DECIMAL},
-      </if>
-      <if test="cycle != null" >
-        #{cycle,jdbcType=INTEGER},
-      </if>
-      <if test="startDate != null" >
-        #{startDate,jdbcType=DATE},
-      </if>
-      <if test="endDate != null" >
-        #{endDate,jdbcType=DATE},
-      </if>
-      <if test="status != null" >
-        #{status,jdbcType=INTEGER},
-      </if>
-      <if test="crtTime != null" >
-        #{crtTime,jdbcType=TIMESTAMP},
-      </if>
-      <if test="updTime != null" >
-        #{updTime,jdbcType=TIMESTAMP},
-      </if>
-      <if test="reason != null" >
-        #{reason,jdbcType=LONGVARCHAR},
-      </if>
-    </trim>
-  </insert>
-  <select id="countByExample" parameterType="com.huojutech.entity.StockForecastExample" resultType="java.lang.Integer" >
-    select count(*) from stock_forecast
-    <if test="_parameter != null" >
-      <include refid="Example_Where_Clause" />
-    </if>
-  </select>
-  <update id="updateByPrimaryKeySelective" parameterType="com.huojutech.entity.StockForecast" >
-    update stock_forecast
-    <set >
-      <if test="uid != null" >
-        uid = #{uid,jdbcType=INTEGER},
-      </if>
-      <if test="stockName != null" >
-        stock_name = #{stockName,jdbcType=VARCHAR},
-      </if>
-      <if test="stockCode != null" >
-        stock_code = #{stockCode,jdbcType=VARCHAR},
-      </if>
-      <if test="expect != null" >
-        expect = #{expect,jdbcType=INTEGER},
-      </if>
-      <if test="bet != null" >
-        bet = #{bet,jdbcType=DECIMAL},
-      </if>
-      <if test="currentPrice != null" >
-        current_price = #{currentPrice,jdbcType=DECIMAL},
-      </if>
-      <if test="targetPrice != null" >
-        target_price = #{targetPrice,jdbcType=DECIMAL},
-      </if>
-      <if test="cycle != null" >
-        cycle = #{cycle,jdbcType=INTEGER},
-      </if>
-      <if test="startDate != null" >
-        start_date = #{startDate,jdbcType=DATE},
-      </if>
-      <if test="endDate != null" >
-        end_date = #{endDate,jdbcType=DATE},
-      </if>
-      <if test="status != null" >
-        status = #{status,jdbcType=INTEGER},
-      </if>
-      <if test="crtTime != null" >
-        crt_time = #{crtTime,jdbcType=TIMESTAMP},
-      </if>
-      <if test="updTime != null" >
-        upd_time = #{updTime,jdbcType=TIMESTAMP},
-      </if>
-      <if test="reason != null" >
-        reason = #{reason,jdbcType=LONGVARCHAR},
-      </if>
-    </set>
-    where id = #{id,jdbcType=INTEGER}
-  </update>
-  <update id="updateByPrimaryKeyWithBLOBs" parameterType="com.huojutech.entity.StockForecast" >
-    update stock_forecast
-    set uid = #{uid,jdbcType=INTEGER},
-      stock_name = #{stockName,jdbcType=VARCHAR},
-      stock_code = #{stockCode,jdbcType=VARCHAR},
-      expect = #{expect,jdbcType=INTEGER},
-      bet = #{bet,jdbcType=DECIMAL},
-      current_price = #{currentPrice,jdbcType=DECIMAL},
-      target_price = #{targetPrice,jdbcType=DECIMAL},
-      cycle = #{cycle,jdbcType=INTEGER},
-      start_date = #{startDate,jdbcType=DATE},
-      end_date = #{endDate,jdbcType=DATE},
-      status = #{status,jdbcType=INTEGER},
-      crt_time = #{crtTime,jdbcType=TIMESTAMP},
-      upd_time = #{updTime,jdbcType=TIMESTAMP},
-      reason = #{reason,jdbcType=LONGVARCHAR}
-    where id = #{id,jdbcType=INTEGER}
-  </update>
-  <update id="updateByPrimaryKey" parameterType="com.huojutech.entity.StockForecast" >
-    update stock_forecast
-    set uid = #{uid,jdbcType=INTEGER},
-      stock_name = #{stockName,jdbcType=VARCHAR},
-      stock_code = #{stockCode,jdbcType=VARCHAR},
-      expect = #{expect,jdbcType=INTEGER},
-      bet = #{bet,jdbcType=DECIMAL},
-      current_price = #{currentPrice,jdbcType=DECIMAL},
-      target_price = #{targetPrice,jdbcType=DECIMAL},
-      cycle = #{cycle,jdbcType=INTEGER},
-      start_date = #{startDate,jdbcType=DATE},
-      end_date = #{endDate,jdbcType=DATE},
-      status = #{status,jdbcType=INTEGER},
-      crt_time = #{crtTime,jdbcType=TIMESTAMP},
-      upd_time = #{updTime,jdbcType=TIMESTAMP}
-    where id = #{id,jdbcType=INTEGER}
-  </update>
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
+<mapper namespace="com.huojutech.dao.StockForecastMapper" >
+  <resultMap id="BaseResultMap" type="com.huojutech.entity.StockForecast" >
+    <id column="id" property="id" jdbcType="INTEGER" />
+    <result column="uid" property="uid" jdbcType="INTEGER" />
+    <result column="stock_name" property="stockName" jdbcType="VARCHAR" />
+    <result column="stock_code" property="stockCode" jdbcType="VARCHAR" />
+    <result column="expect" property="expect" jdbcType="INTEGER" />
+    <result column="bet" property="bet" jdbcType="DECIMAL" />
+    <result column="current_price" property="currentPrice" jdbcType="DECIMAL" />
+    <result column="target_price" property="targetPrice" jdbcType="DECIMAL" />
+    <result column="cycle" property="cycle" jdbcType="INTEGER" />
+    <result column="start_date" property="startDate" jdbcType="DATE" />
+    <result column="end_date" property="endDate" jdbcType="DATE" />
+    <result column="status" property="status" jdbcType="INTEGER" />
+    <result column="crt_time" property="crtTime" jdbcType="TIMESTAMP" />
+    <result column="upd_time" property="updTime" jdbcType="TIMESTAMP" />
+  </resultMap>
+  <resultMap id="ResultMapWithBLOBs" type="com.huojutech.entity.StockForecast" extends="BaseResultMap" >
+    <result column="reason" property="reason" jdbcType="LONGVARCHAR" />
+  </resultMap>
+  <sql id="Example_Where_Clause" >
+    <where >
+      <foreach collection="oredCriteria" item="criteria" separator="or" >
+        <if test="criteria.valid" >
+          <trim prefix="(" suffix=")" prefixOverrides="and" >
+            <foreach collection="criteria.criteria" item="criterion" >
+              <choose >
+                <when test="criterion.noValue" >
+                  and ${criterion.condition}
+                </when>
+                <when test="criterion.singleValue" >
+                  and ${criterion.condition} #{criterion.value}
+                </when>
+                <when test="criterion.betweenValue" >
+                  and ${criterion.condition} #{criterion.value} and #{criterion.secondValue}
+                </when>
+                <when test="criterion.listValue" >
+                  and ${criterion.condition}
+                  <foreach collection="criterion.value" item="listItem" open="(" close=")" separator="," >
+                    #{listItem}
+                  </foreach>
+                </when>
+              </choose>
+            </foreach>
+          </trim>
+        </if>
+      </foreach>
+    </where>
+  </sql>
+  <sql id="Base_Column_List" >
+    id, uid, stock_name, stock_code, expect, bet, current_price, target_price, cycle, 
+    start_date, end_date, status, crt_time, upd_time
+  </sql>
+  <sql id="Blob_Column_List" >
+    reason
+  </sql>
+  <select id="selectByExampleWithBLOBs" resultMap="ResultMapWithBLOBs" parameterType="com.huojutech.entity.StockForecastExample" >
+    select
+    <if test="distinct" >
+      distinct
+    </if>
+    'true' as QUERYID,
+    <include refid="Base_Column_List" />
+    ,
+    <include refid="Blob_Column_List" />
+    from stock_forecast
+    <if test="_parameter != null" >
+      <include refid="Example_Where_Clause" />
+    </if>
+    <if test="orderByClause != null" >
+      order by ${orderByClause}
+    </if>
+  </select>
+  <select id="selectByExample" resultMap="BaseResultMap" parameterType="com.huojutech.entity.StockForecastExample" >
+    select
+    <if test="distinct" >
+      distinct
+    </if>
+    'true' as QUERYID,
+    <include refid="Base_Column_List" />
+    from stock_forecast
+    <if test="_parameter != null" >
+      <include refid="Example_Where_Clause" />
+    </if>
+    <if test="orderByClause != null" >
+      order by ${orderByClause}
+    </if>
+  </select>
+  <select id="selectByPrimaryKey" resultMap="ResultMapWithBLOBs" parameterType="java.lang.Integer" >
+    select 
+    <include refid="Base_Column_List" />
+    ,
+    <include refid="Blob_Column_List" />
+    from stock_forecast
+    where id = #{id,jdbcType=INTEGER}
+  </select>
+  <delete id="deleteByPrimaryKey" parameterType="java.lang.Integer" >
+    delete from stock_forecast
+    where id = #{id,jdbcType=INTEGER}
+  </delete>
+  <insert id="insert" parameterType="com.huojutech.entity.StockForecast" useGeneratedKeys="true" keyProperty="id" >
+    insert into stock_forecast (uid, stock_name, stock_code, 
+      expect, bet, current_price, 
+      target_price, cycle, start_date, 
+      end_date, status, crt_time, 
+      upd_time, reason)
+    values (#{uid,jdbcType=INTEGER}, #{stockName,jdbcType=VARCHAR}, #{stockCode,jdbcType=VARCHAR}, 
+      #{expect,jdbcType=INTEGER}, #{bet,jdbcType=DECIMAL}, #{currentPrice,jdbcType=DECIMAL}, 
+      #{targetPrice,jdbcType=DECIMAL}, #{cycle,jdbcType=INTEGER}, #{startDate,jdbcType=DATE}, 
+      #{endDate,jdbcType=DATE}, #{status,jdbcType=INTEGER}, #{crtTime,jdbcType=TIMESTAMP}, 
+      #{updTime,jdbcType=TIMESTAMP}, #{reason,jdbcType=LONGVARCHAR})
+  </insert>
+  <insert id="insertSelective" parameterType="com.huojutech.entity.StockForecast" useGeneratedKeys="true" keyProperty="id" >
+    insert into stock_forecast
+    <trim prefix="(" suffix=")" suffixOverrides="," >
+      <if test="uid != null" >
+        uid,
+      </if>
+      <if test="stockName != null" >
+        stock_name,
+      </if>
+      <if test="stockCode != null" >
+        stock_code,
+      </if>
+      <if test="expect != null" >
+        expect,
+      </if>
+      <if test="bet != null" >
+        bet,
+      </if>
+      <if test="currentPrice != null" >
+        current_price,
+      </if>
+      <if test="targetPrice != null" >
+        target_price,
+      </if>
+      <if test="cycle != null" >
+        cycle,
+      </if>
+      <if test="startDate != null" >
+        start_date,
+      </if>
+      <if test="endDate != null" >
+        end_date,
+      </if>
+      <if test="status != null" >
+        status,
+      </if>
+      <if test="crtTime != null" >
+        crt_time,
+      </if>
+      <if test="updTime != null" >
+        upd_time,
+      </if>
+      <if test="reason != null" >
+        reason,
+      </if>
+    </trim>
+    <trim prefix="values (" suffix=")" suffixOverrides="," >
+      <if test="uid != null" >
+        #{uid,jdbcType=INTEGER},
+      </if>
+      <if test="stockName != null" >
+        #{stockName,jdbcType=VARCHAR},
+      </if>
+      <if test="stockCode != null" >
+        #{stockCode,jdbcType=VARCHAR},
+      </if>
+      <if test="expect != null" >
+        #{expect,jdbcType=INTEGER},
+      </if>
+      <if test="bet != null" >
+        #{bet,jdbcType=DECIMAL},
+      </if>
+      <if test="currentPrice != null" >
+        #{currentPrice,jdbcType=DECIMAL},
+      </if>
+      <if test="targetPrice != null" >
+        #{targetPrice,jdbcType=DECIMAL},
+      </if>
+      <if test="cycle != null" >
+        #{cycle,jdbcType=INTEGER},
+      </if>
+      <if test="startDate != null" >
+        #{startDate,jdbcType=DATE},
+      </if>
+      <if test="endDate != null" >
+        #{endDate,jdbcType=DATE},
+      </if>
+      <if test="status != null" >
+        #{status,jdbcType=INTEGER},
+      </if>
+      <if test="crtTime != null" >
+        #{crtTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="updTime != null" >
+        #{updTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="reason != null" >
+        #{reason,jdbcType=LONGVARCHAR},
+      </if>
+    </trim>
+  </insert>
+  <select id="countByExample" parameterType="com.huojutech.entity.StockForecastExample" resultType="java.lang.Integer" >
+    select count(*) from stock_forecast
+    <if test="_parameter != null" >
+      <include refid="Example_Where_Clause" />
+    </if>
+  </select>
+  <update id="updateByPrimaryKeySelective" parameterType="com.huojutech.entity.StockForecast" >
+    update stock_forecast
+    <set >
+      <if test="uid != null" >
+        uid = #{uid,jdbcType=INTEGER},
+      </if>
+      <if test="stockName != null" >
+        stock_name = #{stockName,jdbcType=VARCHAR},
+      </if>
+      <if test="stockCode != null" >
+        stock_code = #{stockCode,jdbcType=VARCHAR},
+      </if>
+      <if test="expect != null" >
+        expect = #{expect,jdbcType=INTEGER},
+      </if>
+      <if test="bet != null" >
+        bet = #{bet,jdbcType=DECIMAL},
+      </if>
+      <if test="currentPrice != null" >
+        current_price = #{currentPrice,jdbcType=DECIMAL},
+      </if>
+      <if test="targetPrice != null" >
+        target_price = #{targetPrice,jdbcType=DECIMAL},
+      </if>
+      <if test="cycle != null" >
+        cycle = #{cycle,jdbcType=INTEGER},
+      </if>
+      <if test="startDate != null" >
+        start_date = #{startDate,jdbcType=DATE},
+      </if>
+      <if test="endDate != null" >
+        end_date = #{endDate,jdbcType=DATE},
+      </if>
+      <if test="status != null" >
+        status = #{status,jdbcType=INTEGER},
+      </if>
+      <if test="crtTime != null" >
+        crt_time = #{crtTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="updTime != null" >
+        upd_time = #{updTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="reason != null" >
+        reason = #{reason,jdbcType=LONGVARCHAR},
+      </if>
+    </set>
+    where id = #{id,jdbcType=INTEGER}
+  </update>
+  <update id="updateByPrimaryKeyWithBLOBs" parameterType="com.huojutech.entity.StockForecast" >
+    update stock_forecast
+    set uid = #{uid,jdbcType=INTEGER},
+      stock_name = #{stockName,jdbcType=VARCHAR},
+      stock_code = #{stockCode,jdbcType=VARCHAR},
+      expect = #{expect,jdbcType=INTEGER},
+      bet = #{bet,jdbcType=DECIMAL},
+      current_price = #{currentPrice,jdbcType=DECIMAL},
+      target_price = #{targetPrice,jdbcType=DECIMAL},
+      cycle = #{cycle,jdbcType=INTEGER},
+      start_date = #{startDate,jdbcType=DATE},
+      end_date = #{endDate,jdbcType=DATE},
+      status = #{status,jdbcType=INTEGER},
+      crt_time = #{crtTime,jdbcType=TIMESTAMP},
+      upd_time = #{updTime,jdbcType=TIMESTAMP},
+      reason = #{reason,jdbcType=LONGVARCHAR}
+    where id = #{id,jdbcType=INTEGER}
+  </update>
+  <update id="updateByPrimaryKey" parameterType="com.huojutech.entity.StockForecast" >
+    update stock_forecast
+    set uid = #{uid,jdbcType=INTEGER},
+      stock_name = #{stockName,jdbcType=VARCHAR},
+      stock_code = #{stockCode,jdbcType=VARCHAR},
+      expect = #{expect,jdbcType=INTEGER},
+      bet = #{bet,jdbcType=DECIMAL},
+      current_price = #{currentPrice,jdbcType=DECIMAL},
+      target_price = #{targetPrice,jdbcType=DECIMAL},
+      cycle = #{cycle,jdbcType=INTEGER},
+      start_date = #{startDate,jdbcType=DATE},
+      end_date = #{endDate,jdbcType=DATE},
+      status = #{status,jdbcType=INTEGER},
+      crt_time = #{crtTime,jdbcType=TIMESTAMP},
+      upd_time = #{updTime,jdbcType=TIMESTAMP}
+    where id = #{id,jdbcType=INTEGER}
+  </update>
 </mapper>

huozuan/src/main/resources/mappers/StockForecastVoteMapper.xml

@@ -1,172 +1,172 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
-<mapper namespace="com.huojutech.dao.StockForecastVoteMapper" >
-  <resultMap id="BaseResultMap" type="com.huojutech.entity.StockForecastVote" >
-    <id column="id" property="id" jdbcType="INTEGER" />
-    <result column="uid" property="uid" jdbcType="INTEGER" />
-    <result column="forecast_id" property="forecastId" jdbcType="INTEGER" />
-    <result column="vtype" property="vtype" jdbcType="INTEGER" />
-    <result column="bet" property="bet" jdbcType="DECIMAL" />
-    <result column="status" property="status" jdbcType="INTEGER" />
-    <result column="crt_time" property="crtTime" jdbcType="TIMESTAMP" />
-    <result column="upd_time" property="updTime" jdbcType="TIMESTAMP" />
-  </resultMap>
-  <sql id="Example_Where_Clause" >
-    <where >
-      <foreach collection="oredCriteria" item="criteria" separator="or" >
-        <if test="criteria.valid" >
-          <trim prefix="(" suffix=")" prefixOverrides="and" >
-            <foreach collection="criteria.criteria" item="criterion" >
-              <choose >
-                <when test="criterion.noValue" >
-                  and ${criterion.condition}
-                </when>
-                <when test="criterion.singleValue" >
-                  and ${criterion.condition} #{criterion.value}
-                </when>
-                <when test="criterion.betweenValue" >
-                  and ${criterion.condition} #{criterion.value} and #{criterion.secondValue}
-                </when>
-                <when test="criterion.listValue" >
-                  and ${criterion.condition}
-                  <foreach collection="criterion.value" item="listItem" open="(" close=")" separator="," >
-                    #{listItem}
-                  </foreach>
-                </when>
-              </choose>
-            </foreach>
-          </trim>
-        </if>
-      </foreach>
-    </where>
-  </sql>
-  <sql id="Base_Column_List" >
-    id, uid, forecast_id, vtype, bet, status, crt_time, upd_time
-  </sql>
-  <select id="selectByExample" resultMap="BaseResultMap" parameterType="com.huojutech.entity.StockForecastVoteExample" >
-    select
-    <if test="distinct" >
-      distinct
-    </if>
-    'true' as QUERYID,
-    <include refid="Base_Column_List" />
-    from stock_forecast_vote
-    <if test="_parameter != null" >
-      <include refid="Example_Where_Clause" />
-    </if>
-    <if test="orderByClause != null" >
-      order by ${orderByClause}
-    </if>
-  </select>
-  <select id="selectByPrimaryKey" resultMap="BaseResultMap" parameterType="java.lang.Integer" >
-    select 
-    <include refid="Base_Column_List" />
-    from stock_forecast_vote
-    where id = #{id,jdbcType=INTEGER}
-  </select>
-  <delete id="deleteByPrimaryKey" parameterType="java.lang.Integer" >
-    delete from stock_forecast_vote
-    where id = #{id,jdbcType=INTEGER}
-  </delete>
-  <insert id="insert" parameterType="com.huojutech.entity.StockForecastVote" useGeneratedKeys="true" keyProperty="id" >
-    insert into stock_forecast_vote (uid, forecast_id, vtype, 
-      bet, status, crt_time, 
-      upd_time)
-    values (#{uid,jdbcType=INTEGER}, #{forecastId,jdbcType=INTEGER}, #{vtype,jdbcType=INTEGER}, 
-      #{bet,jdbcType=DECIMAL}, #{status,jdbcType=INTEGER}, #{crtTime,jdbcType=TIMESTAMP}, 
-      #{updTime,jdbcType=TIMESTAMP})
-  </insert>
-  <insert id="insertSelective" parameterType="com.huojutech.entity.StockForecastVote" useGeneratedKeys="true" keyProperty="id" >
-    insert into stock_forecast_vote
-    <trim prefix="(" suffix=")" suffixOverrides="," >
-      <if test="uid != null" >
-        uid,
-      </if>
-      <if test="forecastId != null" >
-        forecast_id,
-      </if>
-      <if test="vtype != null" >
-        vtype,
-      </if>
-      <if test="bet != null" >
-        bet,
-      </if>
-      <if test="status != null" >
-        status,
-      </if>
-      <if test="crtTime != null" >
-        crt_time,
-      </if>
-      <if test="updTime != null" >
-        upd_time,
-      </if>
-    </trim>
-    <trim prefix="values (" suffix=")" suffixOverrides="," >
-      <if test="uid != null" >
-        #{uid,jdbcType=INTEGER},
-      </if>
-      <if test="forecastId != null" >
-        #{forecastId,jdbcType=INTEGER},
-      </if>
-      <if test="vtype != null" >
-        #{vtype,jdbcType=INTEGER},
-      </if>
-      <if test="bet != null" >
-        #{bet,jdbcType=DECIMAL},
-      </if>
-      <if test="status != null" >
-        #{status,jdbcType=INTEGER},
-      </if>
-      <if test="crtTime != null" >
-        #{crtTime,jdbcType=TIMESTAMP},
-      </if>
-      <if test="updTime != null" >
-        #{updTime,jdbcType=TIMESTAMP},
-      </if>
-    </trim>
-  </insert>
-  <select id="countByExample" parameterType="com.huojutech.entity.StockForecastVoteExample" resultType="java.lang.Integer" >
-    select count(*) from stock_forecast_vote
-    <if test="_parameter != null" >
-      <include refid="Example_Where_Clause" />
-    </if>
-  </select>
-  <update id="updateByPrimaryKeySelective" parameterType="com.huojutech.entity.StockForecastVote" >
-    update stock_forecast_vote
-    <set >
-      <if test="uid != null" >
-        uid = #{uid,jdbcType=INTEGER},
-      </if>
-      <if test="forecastId != null" >
-        forecast_id = #{forecastId,jdbcType=INTEGER},
-      </if>
-      <if test="vtype != null" >
-        vtype = #{vtype,jdbcType=INTEGER},
-      </if>
-      <if test="bet != null" >
-        bet = #{bet,jdbcType=DECIMAL},
-      </if>
-      <if test="status != null" >
-        status = #{status,jdbcType=INTEGER},
-      </if>
-      <if test="crtTime != null" >
-        crt_time = #{crtTime,jdbcType=TIMESTAMP},
-      </if>
-      <if test="updTime != null" >
-        upd_time = #{updTime,jdbcType=TIMESTAMP},
-      </if>
-    </set>
-    where id = #{id,jdbcType=INTEGER}
-  </update>
-  <update id="updateByPrimaryKey" parameterType="com.huojutech.entity.StockForecastVote" >
-    update stock_forecast_vote
-    set uid = #{uid,jdbcType=INTEGER},
-      forecast_id = #{forecastId,jdbcType=INTEGER},
-      vtype = #{vtype,jdbcType=INTEGER},
-      bet = #{bet,jdbcType=DECIMAL},
-      status = #{status,jdbcType=INTEGER},
-      crt_time = #{crtTime,jdbcType=TIMESTAMP},
-      upd_time = #{updTime,jdbcType=TIMESTAMP}
-    where id = #{id,jdbcType=INTEGER}
-  </update>
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
+<mapper namespace="com.huojutech.dao.StockForecastVoteMapper" >
+  <resultMap id="BaseResultMap" type="com.huojutech.entity.StockForecastVote" >
+    <id column="id" property="id" jdbcType="INTEGER" />
+    <result column="uid" property="uid" jdbcType="INTEGER" />
+    <result column="forecast_id" property="forecastId" jdbcType="INTEGER" />
+    <result column="vtype" property="vtype" jdbcType="INTEGER" />
+    <result column="bet" property="bet" jdbcType="DECIMAL" />
+    <result column="status" property="status" jdbcType="INTEGER" />
+    <result column="crt_time" property="crtTime" jdbcType="TIMESTAMP" />
+    <result column="upd_time" property="updTime" jdbcType="TIMESTAMP" />
+  </resultMap>
+  <sql id="Example_Where_Clause" >
+    <where >
+      <foreach collection="oredCriteria" item="criteria" separator="or" >
+        <if test="criteria.valid" >
+          <trim prefix="(" suffix=")" prefixOverrides="and" >
+            <foreach collection="criteria.criteria" item="criterion" >
+              <choose >
+                <when test="criterion.noValue" >
+                  and ${criterion.condition}
+                </when>
+                <when test="criterion.singleValue" >
+                  and ${criterion.condition} #{criterion.value}
+                </when>
+                <when test="criterion.betweenValue" >
+                  and ${criterion.condition} #{criterion.value} and #{criterion.secondValue}
+                </when>
+                <when test="criterion.listValue" >
+                  and ${criterion.condition}
+                  <foreach collection="criterion.value" item="listItem" open="(" close=")" separator="," >
+                    #{listItem}
+                  </foreach>
+                </when>
+              </choose>
+            </foreach>
+          </trim>
+        </if>
+      </foreach>
+    </where>
+  </sql>
+  <sql id="Base_Column_List" >
+    id, uid, forecast_id, vtype, bet, status, crt_time, upd_time
+  </sql>
+  <select id="selectByExample" resultMap="BaseResultMap" parameterType="com.huojutech.entity.StockForecastVoteExample" >
+    select
+    <if test="distinct" >
+      distinct
+    </if>
+    'true' as QUERYID,
+    <include refid="Base_Column_List" />
+    from stock_forecast_vote
+    <if test="_parameter != null" >
+      <include refid="Example_Where_Clause" />
+    </if>
+    <if test="orderByClause != null" >
+      order by ${orderByClause}
+    </if>
+  </select>
+  <select id="selectByPrimaryKey" resultMap="BaseResultMap" parameterType="java.lang.Integer" >
+    select 
+    <include refid="Base_Column_List" />
+    from stock_forecast_vote
+    where id = #{id,jdbcType=INTEGER}
+  </select>
+  <delete id="deleteByPrimaryKey" parameterType="java.lang.Integer" >
+    delete from stock_forecast_vote
+    where id = #{id,jdbcType=INTEGER}
+  </delete>
+  <insert id="insert" parameterType="com.huojutech.entity.StockForecastVote" useGeneratedKeys="true" keyProperty="id" >
+    insert into stock_forecast_vote (uid, forecast_id, vtype, 
+      bet, status, crt_time, 
+      upd_time)
+    values (#{uid,jdbcType=INTEGER}, #{forecastId,jdbcType=INTEGER}, #{vtype,jdbcType=INTEGER}, 
+      #{bet,jdbcType=DECIMAL}, #{status,jdbcType=INTEGER}, #{crtTime,jdbcType=TIMESTAMP}, 
+      #{updTime,jdbcType=TIMESTAMP})
+  </insert>
+  <insert id="insertSelective" parameterType="com.huojutech.entity.StockForecastVote" useGeneratedKeys="true" keyProperty="id" >
+    insert into stock_forecast_vote
+    <trim prefix="(" suffix=")" suffixOverrides="," >
+      <if test="uid != null" >
+        uid,
+      </if>
+      <if test="forecastId != null" >
+        forecast_id,
+      </if>
+      <if test="vtype != null" >
+        vtype,
+      </if>
+      <if test="bet != null" >
+        bet,
+      </if>
+      <if test="status != null" >
+        status,
+      </if>
+      <if test="crtTime != null" >
+        crt_time,
+      </if>
+      <if test="updTime != null" >
+        upd_time,
+      </if>
+    </trim>
+    <trim prefix="values (" suffix=")" suffixOverrides="," >
+      <if test="uid != null" >
+        #{uid,jdbcType=INTEGER},
+      </if>
+      <if test="forecastId != null" >
+        #{forecastId,jdbcType=INTEGER},
+      </if>
+      <if test="vtype != null" >
+        #{vtype,jdbcType=INTEGER},
+      </if>
+      <if test="bet != null" >
+        #{bet,jdbcType=DECIMAL},
+      </if>
+      <if test="status != null" >
+        #{status,jdbcType=INTEGER},
+      </if>
+      <if test="crtTime != null" >
+        #{crtTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="updTime != null" >
+        #{updTime,jdbcType=TIMESTAMP},
+      </if>
+    </trim>
+  </insert>
+  <select id="countByExample" parameterType="com.huojutech.entity.StockForecastVoteExample" resultType="java.lang.Integer" >
+    select count(*) from stock_forecast_vote
+    <if test="_parameter != null" >
+      <include refid="Example_Where_Clause" />
+    </if>
+  </select>
+  <update id="updateByPrimaryKeySelective" parameterType="com.huojutech.entity.StockForecastVote" >
+    update stock_forecast_vote
+    <set >
+      <if test="uid != null" >
+        uid = #{uid,jdbcType=INTEGER},
+      </if>
+      <if test="forecastId != null" >
+        forecast_id = #{forecastId,jdbcType=INTEGER},
+      </if>
+      <if test="vtype != null" >
+        vtype = #{vtype,jdbcType=INTEGER},
+      </if>
+      <if test="bet != null" >
+        bet = #{bet,jdbcType=DECIMAL},
+      </if>
+      <if test="status != null" >
+        status = #{status,jdbcType=INTEGER},
+      </if>
+      <if test="crtTime != null" >
+        crt_time = #{crtTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="updTime != null" >
+        upd_time = #{updTime,jdbcType=TIMESTAMP},
+      </if>
+    </set>
+    where id = #{id,jdbcType=INTEGER}
+  </update>
+  <update id="updateByPrimaryKey" parameterType="com.huojutech.entity.StockForecastVote" >
+    update stock_forecast_vote
+    set uid = #{uid,jdbcType=INTEGER},
+      forecast_id = #{forecastId,jdbcType=INTEGER},
+      vtype = #{vtype,jdbcType=INTEGER},
+      bet = #{bet,jdbcType=DECIMAL},
+      status = #{status,jdbcType=INTEGER},
+      crt_time = #{crtTime,jdbcType=TIMESTAMP},
+      upd_time = #{updTime,jdbcType=TIMESTAMP}
+    where id = #{id,jdbcType=INTEGER}
+  </update>
 </mapper>

huozuan/src/main/resources/mappers/StockOptionalMapper.xml

@@ -1,148 +1,148 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
-<mapper namespace="com.huojutech.dao.StockOptionalMapper" >
-  <resultMap id="BaseResultMap" type="com.huojutech.entity.StockOptional" >
-    <id column="id" property="id" jdbcType="INTEGER" />
-    <result column="uid" property="uid" jdbcType="INTEGER" />
-    <result column="stock_name" property="stockName" jdbcType="VARCHAR" />
-    <result column="stock_code" property="stockCode" jdbcType="VARCHAR" />
-    <result column="crt_time" property="crtTime" jdbcType="TIMESTAMP" />
-    <result column="upd_time" property="updTime" jdbcType="TIMESTAMP" />
-  </resultMap>
-  <sql id="Example_Where_Clause" >
-    <where >
-      <foreach collection="oredCriteria" item="criteria" separator="or" >
-        <if test="criteria.valid" >
-          <trim prefix="(" suffix=")" prefixOverrides="and" >
-            <foreach collection="criteria.criteria" item="criterion" >
-              <choose >
-                <when test="criterion.noValue" >
-                  and ${criterion.condition}
-                </when>
-                <when test="criterion.singleValue" >
-                  and ${criterion.condition} #{criterion.value}
-                </when>
-                <when test="criterion.betweenValue" >
-                  and ${criterion.condition} #{criterion.value} and #{criterion.secondValue}
-                </when>
-                <when test="criterion.listValue" >
-                  and ${criterion.condition}
-                  <foreach collection="criterion.value" item="listItem" open="(" close=")" separator="," >
-                    #{listItem}
-                  </foreach>
-                </when>
-              </choose>
-            </foreach>
-          </trim>
-        </if>
-      </foreach>
-    </where>
-  </sql>
-  <sql id="Base_Column_List" >
-    id, uid, stock_name, stock_code, crt_time, upd_time
-  </sql>
-  <select id="selectByExample" resultMap="BaseResultMap" parameterType="com.huojutech.entity.StockOptionalExample" >
-    select
-    <if test="distinct" >
-      distinct
-    </if>
-    'true' as QUERYID,
-    <include refid="Base_Column_List" />
-    from stock_optional
-    <if test="_parameter != null" >
-      <include refid="Example_Where_Clause" />
-    </if>
-    <if test="orderByClause != null" >
-      order by ${orderByClause}
-    </if>
-  </select>
-  <select id="selectByPrimaryKey" resultMap="BaseResultMap" parameterType="java.lang.Integer" >
-    select 
-    <include refid="Base_Column_List" />
-    from stock_optional
-    where id = #{id,jdbcType=INTEGER}
-  </select>
-  <delete id="deleteByPrimaryKey" parameterType="java.lang.Integer" >
-    delete from stock_optional
-    where id = #{id,jdbcType=INTEGER}
-  </delete>
-  <insert id="insert" parameterType="com.huojutech.entity.StockOptional" useGeneratedKeys="true" keyProperty="id" >
-    insert into stock_optional (uid, stock_name, stock_code, 
-      crt_time, upd_time)
-    values (#{uid,jdbcType=INTEGER}, #{stockName,jdbcType=VARCHAR}, #{stockCode,jdbcType=VARCHAR}, 
-      #{crtTime,jdbcType=TIMESTAMP}, #{updTime,jdbcType=TIMESTAMP})
-  </insert>
-  <insert id="insertSelective" parameterType="com.huojutech.entity.StockOptional" useGeneratedKeys="true" keyProperty="id" >
-    insert into stock_optional
-    <trim prefix="(" suffix=")" suffixOverrides="," >
-      <if test="uid != null" >
-        uid,
-      </if>
-      <if test="stockName != null" >
-        stock_name,
-      </if>
-      <if test="stockCode != null" >
-        stock_code,
-      </if>
-      <if test="crtTime != null" >
-        crt_time,
-      </if>
-      <if test="updTime != null" >
-        upd_time,
-      </if>
-    </trim>
-    <trim prefix="values (" suffix=")" suffixOverrides="," >
-      <if test="uid != null" >
-        #{uid,jdbcType=INTEGER},
-      </if>
-      <if test="stockName != null" >
-        #{stockName,jdbcType=VARCHAR},
-      </if>
-      <if test="stockCode != null" >
-        #{stockCode,jdbcType=VARCHAR},
-      </if>
-      <if test="crtTime != null" >
-        #{crtTime,jdbcType=TIMESTAMP},
-      </if>
-      <if test="updTime != null" >
-        #{updTime,jdbcType=TIMESTAMP},
-      </if>
-    </trim>
-  </insert>
-  <select id="countByExample" parameterType="com.huojutech.entity.StockOptionalExample" resultType="java.lang.Integer" >
-    select count(*) from stock_optional
-    <if test="_parameter != null" >
-      <include refid="Example_Where_Clause" />
-    </if>
-  </select>
-  <update id="updateByPrimaryKeySelective" parameterType="com.huojutech.entity.StockOptional" >
-    update stock_optional
-    <set >
-      <if test="uid != null" >
-        uid = #{uid,jdbcType=INTEGER},
-      </if>
-      <if test="stockName != null" >
-        stock_name = #{stockName,jdbcType=VARCHAR},
-      </if>
-      <if test="stockCode != null" >
-        stock_code = #{stockCode,jdbcType=VARCHAR},
-      </if>
-      <if test="crtTime != null" >
-        crt_time = #{crtTime,jdbcType=TIMESTAMP},
-      </if>
-      <if test="updTime != null" >
-        upd_time = #{updTime,jdbcType=TIMESTAMP},
-      </if>
-    </set>
-    where id = #{id,jdbcType=INTEGER}
-  </update>
-  <update id="updateByPrimaryKey" parameterType="com.huojutech.entity.StockOptional" >
-    update stock_optional
-    set uid = #{uid,jdbcType=INTEGER},
-      stock_name = #{stockName,jdbcType=VARCHAR},
-      stock_code = #{stockCode,jdbcType=VARCHAR},
-      crt_time = #{crtTime,jdbcType=TIMESTAMP},
-      upd_time = #{updTime,jdbcType=TIMESTAMP}
-    where id = #{id,jdbcType=INTEGER}
-  </update>
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
+<mapper namespace="com.huojutech.dao.StockOptionalMapper" >
+  <resultMap id="BaseResultMap" type="com.huojutech.entity.StockOptional" >
+    <id column="id" property="id" jdbcType="INTEGER" />
+    <result column="uid" property="uid" jdbcType="INTEGER" />
+    <result column="stock_name" property="stockName" jdbcType="VARCHAR" />
+    <result column="stock_code" property="stockCode" jdbcType="VARCHAR" />
+    <result column="crt_time" property="crtTime" jdbcType="TIMESTAMP" />
+    <result column="upd_time" property="updTime" jdbcType="TIMESTAMP" />
+  </resultMap>
+  <sql id="Example_Where_Clause" >
+    <where >
+      <foreach collection="oredCriteria" item="criteria" separator="or" >
+        <if test="criteria.valid" >
+          <trim prefix="(" suffix=")" prefixOverrides="and" >
+            <foreach collection="criteria.criteria" item="criterion" >
+              <choose >
+                <when test="criterion.noValue" >
+                  and ${criterion.condition}
+                </when>
+                <when test="criterion.singleValue" >
+                  and ${criterion.condition} #{criterion.value}
+                </when>
+                <when test="criterion.betweenValue" >
+                  and ${criterion.condition} #{criterion.value} and #{criterion.secondValue}
+                </when>
+                <when test="criterion.listValue" >
+                  and ${criterion.condition}
+                  <foreach collection="criterion.value" item="listItem" open="(" close=")" separator="," >
+                    #{listItem}
+                  </foreach>
+                </when>
+              </choose>
+            </foreach>
+          </trim>
+        </if>
+      </foreach>
+    </where>
+  </sql>
+  <sql id="Base_Column_List" >
+    id, uid, stock_name, stock_code, crt_time, upd_time
+  </sql>
+  <select id="selectByExample" resultMap="BaseResultMap" parameterType="com.huojutech.entity.StockOptionalExample" >
+    select
+    <if test="distinct" >
+      distinct
+    </if>
+    'true' as QUERYID,
+    <include refid="Base_Column_List" />
+    from stock_optional
+    <if test="_parameter != null" >
+      <include refid="Example_Where_Clause" />
+    </if>
+    <if test="orderByClause != null" >
+      order by ${orderByClause}
+    </if>
+  </select>
+  <select id="selectByPrimaryKey" resultMap="BaseResultMap" parameterType="java.lang.Integer" >
+    select 
+    <include refid="Base_Column_List" />
+    from stock_optional
+    where id = #{id,jdbcType=INTEGER}
+  </select>
+  <delete id="deleteByPrimaryKey" parameterType="java.lang.Integer" >
+    delete from stock_optional
+    where id = #{id,jdbcType=INTEGER}
+  </delete>
+  <insert id="insert" parameterType="com.huojutech.entity.StockOptional" useGeneratedKeys="true" keyProperty="id" >
+    insert into stock_optional (uid, stock_name, stock_code, 
+      crt_time, upd_time)
+    values (#{uid,jdbcType=INTEGER}, #{stockName,jdbcType=VARCHAR}, #{stockCode,jdbcType=VARCHAR}, 
+      #{crtTime,jdbcType=TIMESTAMP}, #{updTime,jdbcType=TIMESTAMP})
+  </insert>
+  <insert id="insertSelective" parameterType="com.huojutech.entity.StockOptional" useGeneratedKeys="true" keyProperty="id" >
+    insert into stock_optional
+    <trim prefix="(" suffix=")" suffixOverrides="," >
+      <if test="uid != null" >
+        uid,
+      </if>
+      <if test="stockName != null" >
+        stock_name,
+      </if>
+      <if test="stockCode != null" >
+        stock_code,
+      </if>
+      <if test="crtTime != null" >
+        crt_time,
+      </if>
+      <if test="updTime != null" >
+        upd_time,
+      </if>
+    </trim>
+    <trim prefix="values (" suffix=")" suffixOverrides="," >
+      <if test="uid != null" >
+        #{uid,jdbcType=INTEGER},
+      </if>
+      <if test="stockName != null" >
+        #{stockName,jdbcType=VARCHAR},
+      </if>
+      <if test="stockCode != null" >
+        #{stockCode,jdbcType=VARCHAR},
+      </if>
+      <if test="crtTime != null" >
+        #{crtTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="updTime != null" >
+        #{updTime,jdbcType=TIMESTAMP},
+      </if>
+    </trim>
+  </insert>
+  <select id="countByExample" parameterType="com.huojutech.entity.StockOptionalExample" resultType="java.lang.Integer" >
+    select count(*) from stock_optional
+    <if test="_parameter != null" >
+      <include refid="Example_Where_Clause" />
+    </if>
+  </select>
+  <update id="updateByPrimaryKeySelective" parameterType="com.huojutech.entity.StockOptional" >
+    update stock_optional
+    <set >
+      <if test="uid != null" >
+        uid = #{uid,jdbcType=INTEGER},
+      </if>
+      <if test="stockName != null" >
+        stock_name = #{stockName,jdbcType=VARCHAR},
+      </if>
+      <if test="stockCode != null" >
+        stock_code = #{stockCode,jdbcType=VARCHAR},
+      </if>
+      <if test="crtTime != null" >
+        crt_time = #{crtTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="updTime != null" >
+        upd_time = #{updTime,jdbcType=TIMESTAMP},
+      </if>
+    </set>
+    where id = #{id,jdbcType=INTEGER}
+  </update>
+  <update id="updateByPrimaryKey" parameterType="com.huojutech.entity.StockOptional" >
+    update stock_optional
+    set uid = #{uid,jdbcType=INTEGER},
+      stock_name = #{stockName,jdbcType=VARCHAR},
+      stock_code = #{stockCode,jdbcType=VARCHAR},
+      crt_time = #{crtTime,jdbcType=TIMESTAMP},
+      upd_time = #{updTime,jdbcType=TIMESTAMP}
+    where id = #{id,jdbcType=INTEGER}
+  </update>
 </mapper>

huozuan/src/main/resources/mappers/SystemConfigMapper.xml

@@ -1,148 +1,148 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
-<mapper namespace="com.huojutech.dao.SystemConfigMapper" >
-  <resultMap id="BaseResultMap" type="com.huojutech.entity.SystemConfig" >
-    <id column="id" property="id" jdbcType="INTEGER" />
-    <result column="cfg_key" property="cfgKey" jdbcType="VARCHAR" />
-    <result column="cfg_val" property="cfgVal" jdbcType="VARCHAR" />
-    <result column="status" property="status" jdbcType="INTEGER" />
-    <result column="crt_time" property="crtTime" jdbcType="TIMESTAMP" />
-    <result column="upd_time" property="updTime" jdbcType="TIMESTAMP" />
-  </resultMap>
-  <sql id="Example_Where_Clause" >
-    <where >
-      <foreach collection="oredCriteria" item="criteria" separator="or" >
-        <if test="criteria.valid" >
-          <trim prefix="(" suffix=")" prefixOverrides="and" >
-            <foreach collection="criteria.criteria" item="criterion" >
-              <choose >
-                <when test="criterion.noValue" >
-                  and ${criterion.condition}
-                </when>
-                <when test="criterion.singleValue" >
-                  and ${criterion.condition} #{criterion.value}
-                </when>
-                <when test="criterion.betweenValue" >
-                  and ${criterion.condition} #{criterion.value} and #{criterion.secondValue}
-                </when>
-                <when test="criterion.listValue" >
-                  and ${criterion.condition}
-                  <foreach collection="criterion.value" item="listItem" open="(" close=")" separator="," >
-                    #{listItem}
-                  </foreach>
-                </when>
-              </choose>
-            </foreach>
-          </trim>
-        </if>
-      </foreach>
-    </where>
-  </sql>
-  <sql id="Base_Column_List" >
-    id, cfg_key, cfg_val, status, crt_time, upd_time
-  </sql>
-  <select id="selectByExample" resultMap="BaseResultMap" parameterType="com.huojutech.entity.SystemConfigExample" >
-    select
-    <if test="distinct" >
-      distinct
-    </if>
-    'true' as QUERYID,
-    <include refid="Base_Column_List" />
-    from system_config
-    <if test="_parameter != null" >
-      <include refid="Example_Where_Clause" />
-    </if>
-    <if test="orderByClause != null" >
-      order by ${orderByClause}
-    </if>
-  </select>
-  <select id="selectByPrimaryKey" resultMap="BaseResultMap" parameterType="java.lang.Integer" >
-    select 
-    <include refid="Base_Column_List" />
-    from system_config
-    where id = #{id,jdbcType=INTEGER}
-  </select>
-  <delete id="deleteByPrimaryKey" parameterType="java.lang.Integer" >
-    delete from system_config
-    where id = #{id,jdbcType=INTEGER}
-  </delete>
-  <insert id="insert" parameterType="com.huojutech.entity.SystemConfig" useGeneratedKeys="true" keyProperty="id" >
-    insert into system_config (cfg_key, cfg_val, status, 
-      crt_time, upd_time)
-    values (#{cfgKey,jdbcType=VARCHAR}, #{cfgVal,jdbcType=VARCHAR}, #{status,jdbcType=INTEGER}, 
-      #{crtTime,jdbcType=TIMESTAMP}, #{updTime,jdbcType=TIMESTAMP})
-  </insert>
-  <insert id="insertSelective" parameterType="com.huojutech.entity.SystemConfig" useGeneratedKeys="true" keyProperty="id" >
-    insert into system_config
-    <trim prefix="(" suffix=")" suffixOverrides="," >
-      <if test="cfgKey != null" >
-        cfg_key,
-      </if>
-      <if test="cfgVal != null" >
-        cfg_val,
-      </if>
-      <if test="status != null" >
-        status,
-      </if>
-      <if test="crtTime != null" >
-        crt_time,
-      </if>
-      <if test="updTime != null" >
-        upd_time,
-      </if>
-    </trim>
-    <trim prefix="values (" suffix=")" suffixOverrides="," >
-      <if test="cfgKey != null" >
-        #{cfgKey,jdbcType=VARCHAR},
-      </if>
-      <if test="cfgVal != null" >
-        #{cfgVal,jdbcType=VARCHAR},
-      </if>
-      <if test="status != null" >
-        #{status,jdbcType=INTEGER},
-      </if>
-      <if test="crtTime != null" >
-        #{crtTime,jdbcType=TIMESTAMP},
-      </if>
-      <if test="updTime != null" >
-        #{updTime,jdbcType=TIMESTAMP},
-      </if>
-    </trim>
-  </insert>
-  <select id="countByExample" parameterType="com.huojutech.entity.SystemConfigExample" resultType="java.lang.Integer" >
-    select count(*) from system_config
-    <if test="_parameter != null" >
-      <include refid="Example_Where_Clause" />
-    </if>
-  </select>
-  <update id="updateByPrimaryKeySelective" parameterType="com.huojutech.entity.SystemConfig" >
-    update system_config
-    <set >
-      <if test="cfgKey != null" >
-        cfg_key = #{cfgKey,jdbcType=VARCHAR},
-      </if>
-      <if test="cfgVal != null" >
-        cfg_val = #{cfgVal,jdbcType=VARCHAR},
-      </if>
-      <if test="status != null" >
-        status = #{status,jdbcType=INTEGER},
-      </if>
-      <if test="crtTime != null" >
-        crt_time = #{crtTime,jdbcType=TIMESTAMP},
-      </if>
-      <if test="updTime != null" >
-        upd_time = #{updTime,jdbcType=TIMESTAMP},
-      </if>
-    </set>
-    where id = #{id,jdbcType=INTEGER}
-  </update>
-  <update id="updateByPrimaryKey" parameterType="com.huojutech.entity.SystemConfig" >
-    update system_config
-    set cfg_key = #{cfgKey,jdbcType=VARCHAR},
-      cfg_val = #{cfgVal,jdbcType=VARCHAR},
-      status = #{status,jdbcType=INTEGER},
-      crt_time = #{crtTime,jdbcType=TIMESTAMP},
-      upd_time = #{updTime,jdbcType=TIMESTAMP}
-    where id = #{id,jdbcType=INTEGER}
-  </update>
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
+<mapper namespace="com.huojutech.dao.SystemConfigMapper" >
+  <resultMap id="BaseResultMap" type="com.huojutech.entity.SystemConfig" >
+    <id column="id" property="id" jdbcType="INTEGER" />
+    <result column="cfg_key" property="cfgKey" jdbcType="VARCHAR" />
+    <result column="cfg_val" property="cfgVal" jdbcType="VARCHAR" />
+    <result column="status" property="status" jdbcType="INTEGER" />
+    <result column="crt_time" property="crtTime" jdbcType="TIMESTAMP" />
+    <result column="upd_time" property="updTime" jdbcType="TIMESTAMP" />
+  </resultMap>
+  <sql id="Example_Where_Clause" >
+    <where >
+      <foreach collection="oredCriteria" item="criteria" separator="or" >
+        <if test="criteria.valid" >
+          <trim prefix="(" suffix=")" prefixOverrides="and" >
+            <foreach collection="criteria.criteria" item="criterion" >
+              <choose >
+                <when test="criterion.noValue" >
+                  and ${criterion.condition}
+                </when>
+                <when test="criterion.singleValue" >
+                  and ${criterion.condition} #{criterion.value}
+                </when>
+                <when test="criterion.betweenValue" >
+                  and ${criterion.condition} #{criterion.value} and #{criterion.secondValue}
+                </when>
+                <when test="criterion.listValue" >
+                  and ${criterion.condition}
+                  <foreach collection="criterion.value" item="listItem" open="(" close=")" separator="," >
+                    #{listItem}
+                  </foreach>
+                </when>
+              </choose>
+            </foreach>
+          </trim>
+        </if>
+      </foreach>
+    </where>
+  </sql>
+  <sql id="Base_Column_List" >
+    id, cfg_key, cfg_val, status, crt_time, upd_time
+  </sql>
+  <select id="selectByExample" resultMap="BaseResultMap" parameterType="com.huojutech.entity.SystemConfigExample" >
+    select
+    <if test="distinct" >
+      distinct
+    </if>
+    'true' as QUERYID,
+    <include refid="Base_Column_List" />
+    from system_config
+    <if test="_parameter != null" >
+      <include refid="Example_Where_Clause" />
+    </if>
+    <if test="orderByClause != null" >
+      order by ${orderByClause}
+    </if>
+  </select>
+  <select id="selectByPrimaryKey" resultMap="BaseResultMap" parameterType="java.lang.Integer" >
+    select 
+    <include refid="Base_Column_List" />
+    from system_config
+    where id = #{id,jdbcType=INTEGER}
+  </select>
+  <delete id="deleteByPrimaryKey" parameterType="java.lang.Integer" >
+    delete from system_config
+    where id = #{id,jdbcType=INTEGER}
+  </delete>
+  <insert id="insert" parameterType="com.huojutech.entity.SystemConfig" useGeneratedKeys="true" keyProperty="id" >
+    insert into system_config (cfg_key, cfg_val, status, 
+      crt_time, upd_time)
+    values (#{cfgKey,jdbcType=VARCHAR}, #{cfgVal,jdbcType=VARCHAR}, #{status,jdbcType=INTEGER}, 
+      #{crtTime,jdbcType=TIMESTAMP}, #{updTime,jdbcType=TIMESTAMP})
+  </insert>
+  <insert id="insertSelective" parameterType="com.huojutech.entity.SystemConfig" useGeneratedKeys="true" keyProperty="id" >
+    insert into system_config
+    <trim prefix="(" suffix=")" suffixOverrides="," >
+      <if test="cfgKey != null" >
+        cfg_key,
+      </if>
+      <if test="cfgVal != null" >
+        cfg_val,
+      </if>
+      <if test="status != null" >
+        status,
+      </if>
+      <if test="crtTime != null" >
+        crt_time,
+      </if>
+      <if test="updTime != null" >
+        upd_time,
+      </if>
+    </trim>
+    <trim prefix="values (" suffix=")" suffixOverrides="," >
+      <if test="cfgKey != null" >
+        #{cfgKey,jdbcType=VARCHAR},
+      </if>
+      <if test="cfgVal != null" >
+        #{cfgVal,jdbcType=VARCHAR},
+      </if>
+      <if test="status != null" >
+        #{status,jdbcType=INTEGER},
+      </if>
+      <if test="crtTime != null" >
+        #{crtTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="updTime != null" >
+        #{updTime,jdbcType=TIMESTAMP},
+      </if>
+    </trim>
+  </insert>
+  <select id="countByExample" parameterType="com.huojutech.entity.SystemConfigExample" resultType="java.lang.Integer" >
+    select count(*) from system_config
+    <if test="_parameter != null" >
+      <include refid="Example_Where_Clause" />
+    </if>
+  </select>
+  <update id="updateByPrimaryKeySelective" parameterType="com.huojutech.entity.SystemConfig" >
+    update system_config
+    <set >
+      <if test="cfgKey != null" >
+        cfg_key = #{cfgKey,jdbcType=VARCHAR},
+      </if>
+      <if test="cfgVal != null" >
+        cfg_val = #{cfgVal,jdbcType=VARCHAR},
+      </if>
+      <if test="status != null" >
+        status = #{status,jdbcType=INTEGER},
+      </if>
+      <if test="crtTime != null" >
+        crt_time = #{crtTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="updTime != null" >
+        upd_time = #{updTime,jdbcType=TIMESTAMP},
+      </if>
+    </set>
+    where id = #{id,jdbcType=INTEGER}
+  </update>
+  <update id="updateByPrimaryKey" parameterType="com.huojutech.entity.SystemConfig" >
+    update system_config
+    set cfg_key = #{cfgKey,jdbcType=VARCHAR},
+      cfg_val = #{cfgVal,jdbcType=VARCHAR},
+      status = #{status,jdbcType=INTEGER},
+      crt_time = #{crtTime,jdbcType=TIMESTAMP},
+      upd_time = #{updTime,jdbcType=TIMESTAMP}
+    where id = #{id,jdbcType=INTEGER}
+  </update>
 </mapper>

huozuan/src/main/resources/mappers/TestDao.xml

@@ -1,11 +1,11 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.huojutech.dao.TestDao">
-    <select id="getUserById" parameterType="Integer" resultType="user">
-        select * from USER  where id = #{id}
-    </select>
-
-    <insert id="updateTestTx">
-        INSERT INTO  user (id,name) VALUES(#{id},#{name})
-    </insert>
-</mapper>
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.huojutech.dao.TestDao">
+    <select id="getUserById" parameterType="Integer" resultType="user">
+        select * from USER  where id = #{id}
+    </select>
+
+    <insert id="updateTestTx">
+        INSERT INTO  user (id,name) VALUES(#{id},#{name})
+    </insert>
+</mapper>

huozuan/src/main/resources/mappers/UserConcernMapper.xml

@@ -1,137 +1,137 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
-<mapper namespace="com.huojutech.dao.UserConcernMapper" >
-  <resultMap id="BaseResultMap" type="com.huojutech.entity.UserConcern" >
-    <id column="id" property="id" jdbcType="INTEGER" />
-    <result column="uid" property="uid" jdbcType="INTEGER" />
-    <result column="cuid" property="cuid" jdbcType="INTEGER" />
-    <result column="crt_time" property="crtTime" jdbcType="TIMESTAMP" />
-    <result column="upd_time" property="updTime" jdbcType="TIMESTAMP" />
-  </resultMap>
-  <sql id="Example_Where_Clause" >
-    <where >
-      <foreach collection="oredCriteria" item="criteria" separator="or" >
-        <if test="criteria.valid" >
-          <trim prefix="(" suffix=")" prefixOverrides="and" >
-            <foreach collection="criteria.criteria" item="criterion" >
-              <choose >
-                <when test="criterion.noValue" >
-                  and ${criterion.condition}
-                </when>
-                <when test="criterion.singleValue" >
-                  and ${criterion.condition} #{criterion.value}
-                </when>
-                <when test="criterion.betweenValue" >
-                  and ${criterion.condition} #{criterion.value} and #{criterion.secondValue}
-                </when>
-                <when test="criterion.listValue" >
-                  and ${criterion.condition}
-                  <foreach collection="criterion.value" item="listItem" open="(" close=")" separator="," >
-                    #{listItem}
-                  </foreach>
-                </when>
-              </choose>
-            </foreach>
-          </trim>
-        </if>
-      </foreach>
-    </where>
-  </sql>
-  <sql id="Base_Column_List" >
-    id, uid, cuid, crt_time, upd_time
-  </sql>
-  <select id="selectByExample" resultMap="BaseResultMap" parameterType="com.huojutech.entity.UserConcernExample" >
-    select
-    <if test="distinct" >
-      distinct
-    </if>
-    'true' as QUERYID,
-    <include refid="Base_Column_List" />
-    from user_concern
-    <if test="_parameter != null" >
-      <include refid="Example_Where_Clause" />
-    </if>
-    <if test="orderByClause != null" >
-      order by ${orderByClause}
-    </if>
-  </select>
-  <select id="selectByPrimaryKey" resultMap="BaseResultMap" parameterType="java.lang.Integer" >
-    select 
-    <include refid="Base_Column_List" />
-    from user_concern
-    where id = #{id,jdbcType=INTEGER}
-  </select>
-  <delete id="deleteByPrimaryKey" parameterType="java.lang.Integer" >
-    delete from user_concern
-    where id = #{id,jdbcType=INTEGER}
-  </delete>
-  <insert id="insert" parameterType="com.huojutech.entity.UserConcern" useGeneratedKeys="true" keyProperty="id" >
-    insert into user_concern (uid, cuid, crt_time, 
-      upd_time)
-    values (#{uid,jdbcType=INTEGER}, #{cuid,jdbcType=INTEGER}, #{crtTime,jdbcType=TIMESTAMP}, 
-      #{updTime,jdbcType=TIMESTAMP})
-  </insert>
-  <insert id="insertSelective" parameterType="com.huojutech.entity.UserConcern" useGeneratedKeys="true" keyProperty="id" >
-    insert into user_concern
-    <trim prefix="(" suffix=")" suffixOverrides="," >
-      <if test="uid != null" >
-        uid,
-      </if>
-      <if test="cuid != null" >
-        cuid,
-      </if>
-      <if test="crtTime != null" >
-        crt_time,
-      </if>
-      <if test="updTime != null" >
-        upd_time,
-      </if>
-    </trim>
-    <trim prefix="values (" suffix=")" suffixOverrides="," >
-      <if test="uid != null" >
-        #{uid,jdbcType=INTEGER},
-      </if>
-      <if test="cuid != null" >
-        #{cuid,jdbcType=INTEGER},
-      </if>
-      <if test="crtTime != null" >
-        #{crtTime,jdbcType=TIMESTAMP},
-      </if>
-      <if test="updTime != null" >
-        #{updTime,jdbcType=TIMESTAMP},
-      </if>
-    </trim>
-  </insert>
-  <select id="countByExample" parameterType="com.huojutech.entity.UserConcernExample" resultType="java.lang.Integer" >
-    select count(*) from user_concern
-    <if test="_parameter != null" >
-      <include refid="Example_Where_Clause" />
-    </if>
-  </select>
-  <update id="updateByPrimaryKeySelective" parameterType="com.huojutech.entity.UserConcern" >
-    update user_concern
-    <set >
-      <if test="uid != null" >
-        uid = #{uid,jdbcType=INTEGER},
-      </if>
-      <if test="cuid != null" >
-        cuid = #{cuid,jdbcType=INTEGER},
-      </if>
-      <if test="crtTime != null" >
-        crt_time = #{crtTime,jdbcType=TIMESTAMP},
-      </if>
-      <if test="updTime != null" >
-        upd_time = #{updTime,jdbcType=TIMESTAMP},
-      </if>
-    </set>
-    where id = #{id,jdbcType=INTEGER}
-  </update>
-  <update id="updateByPrimaryKey" parameterType="com.huojutech.entity.UserConcern" >
-    update user_concern
-    set uid = #{uid,jdbcType=INTEGER},
-      cuid = #{cuid,jdbcType=INTEGER},
-      crt_time = #{crtTime,jdbcType=TIMESTAMP},
-      upd_time = #{updTime,jdbcType=TIMESTAMP}
-    where id = #{id,jdbcType=INTEGER}
-  </update>
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
+<mapper namespace="com.huojutech.dao.UserConcernMapper" >
+  <resultMap id="BaseResultMap" type="com.huojutech.entity.UserConcern" >
+    <id column="id" property="id" jdbcType="INTEGER" />
+    <result column="uid" property="uid" jdbcType="INTEGER" />
+    <result column="cuid" property="cuid" jdbcType="INTEGER" />
+    <result column="crt_time" property="crtTime" jdbcType="TIMESTAMP" />
+    <result column="upd_time" property="updTime" jdbcType="TIMESTAMP" />
+  </resultMap>
+  <sql id="Example_Where_Clause" >
+    <where >
+      <foreach collection="oredCriteria" item="criteria" separator="or" >
+        <if test="criteria.valid" >
+          <trim prefix="(" suffix=")" prefixOverrides="and" >
+            <foreach collection="criteria.criteria" item="criterion" >
+              <choose >
+                <when test="criterion.noValue" >
+                  and ${criterion.condition}
+                </when>
+                <when test="criterion.singleValue" >
+                  and ${criterion.condition} #{criterion.value}
+                </when>
+                <when test="criterion.betweenValue" >
+                  and ${criterion.condition} #{criterion.value} and #{criterion.secondValue}
+                </when>
+                <when test="criterion.listValue" >
+                  and ${criterion.condition}
+                  <foreach collection="criterion.value" item="listItem" open="(" close=")" separator="," >
+                    #{listItem}
+                  </foreach>
+                </when>
+              </choose>
+            </foreach>
+          </trim>
+        </if>
+      </foreach>
+    </where>
+  </sql>
+  <sql id="Base_Column_List" >
+    id, uid, cuid, crt_time, upd_time
+  </sql>
+  <select id="selectByExample" resultMap="BaseResultMap" parameterType="com.huojutech.entity.UserConcernExample" >
+    select
+    <if test="distinct" >
+      distinct
+    </if>
+    'true' as QUERYID,
+    <include refid="Base_Column_List" />
+    from user_concern
+    <if test="_parameter != null" >
+      <include refid="Example_Where_Clause" />
+    </if>
+    <if test="orderByClause != null" >
+      order by ${orderByClause}
+    </if>
+  </select>
+  <select id="selectByPrimaryKey" resultMap="BaseResultMap" parameterType="java.lang.Integer" >
+    select 
+    <include refid="Base_Column_List" />
+    from user_concern
+    where id = #{id,jdbcType=INTEGER}
+  </select>
+  <delete id="deleteByPrimaryKey" parameterType="java.lang.Integer" >
+    delete from user_concern
+    where id = #{id,jdbcType=INTEGER}
+  </delete>
+  <insert id="insert" parameterType="com.huojutech.entity.UserConcern" useGeneratedKeys="true" keyProperty="id" >
+    insert into user_concern (uid, cuid, crt_time, 
+      upd_time)
+    values (#{uid,jdbcType=INTEGER}, #{cuid,jdbcType=INTEGER}, #{crtTime,jdbcType=TIMESTAMP}, 
+      #{updTime,jdbcType=TIMESTAMP})
+  </insert>
+  <insert id="insertSelective" parameterType="com.huojutech.entity.UserConcern" useGeneratedKeys="true" keyProperty="id" >
+    insert into user_concern
+    <trim prefix="(" suffix=")" suffixOverrides="," >
+      <if test="uid != null" >
+        uid,
+      </if>
+      <if test="cuid != null" >
+        cuid,
+      </if>
+      <if test="crtTime != null" >
+        crt_time,
+      </if>
+      <if test="updTime != null" >
+        upd_time,
+      </if>
+    </trim>
+    <trim prefix="values (" suffix=")" suffixOverrides="," >
+      <if test="uid != null" >
+        #{uid,jdbcType=INTEGER},
+      </if>
+      <if test="cuid != null" >
+        #{cuid,jdbcType=INTEGER},
+      </if>
+      <if test="crtTime != null" >
+        #{crtTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="updTime != null" >
+        #{updTime,jdbcType=TIMESTAMP},
+      </if>
+    </trim>
+  </insert>
+  <select id="countByExample" parameterType="com.huojutech.entity.UserConcernExample" resultType="java.lang.Integer" >
+    select count(*) from user_concern
+    <if test="_parameter != null" >
+      <include refid="Example_Where_Clause" />
+    </if>
+  </select>
+  <update id="updateByPrimaryKeySelective" parameterType="com.huojutech.entity.UserConcern" >
+    update user_concern
+    <set >
+      <if test="uid != null" >
+        uid = #{uid,jdbcType=INTEGER},
+      </if>
+      <if test="cuid != null" >
+        cuid = #{cuid,jdbcType=INTEGER},
+      </if>
+      <if test="crtTime != null" >
+        crt_time = #{crtTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="updTime != null" >
+        upd_time = #{updTime,jdbcType=TIMESTAMP},
+      </if>
+    </set>
+    where id = #{id,jdbcType=INTEGER}
+  </update>
+  <update id="updateByPrimaryKey" parameterType="com.huojutech.entity.UserConcern" >
+    update user_concern
+    set uid = #{uid,jdbcType=INTEGER},
+      cuid = #{cuid,jdbcType=INTEGER},
+      crt_time = #{crtTime,jdbcType=TIMESTAMP},
+      upd_time = #{updTime,jdbcType=TIMESTAMP}
+    where id = #{id,jdbcType=INTEGER}
+  </update>
 </mapper>

huozuan/src/main/resources/mappers/UserMapper.xml

@@ -1,219 +1,219 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
-<mapper namespace="com.huojutech.dao.UserMapper" >
-  <resultMap id="BaseResultMap" type="com.huojutech.entity.User" >
-    <id column="id" property="id" jdbcType="INTEGER" />
-    <result column="name" property="name" jdbcType="VARCHAR" />
-    <result column="nickname" property="nickname" jdbcType="VARCHAR" />
-    <result column="avatar" property="avatar" jdbcType="VARCHAR" />
-    <result column="amount" property="amount" jdbcType="DECIMAL" />
-    <result column="forecast_rate_success" property="forecastRateSuccess" jdbcType="DOUBLE" />
-    <result column="vote_rate_success" property="voteRateSuccess" jdbcType="DOUBLE" />
-    <result column="wx_openid" property="wxOpenid" jdbcType="VARCHAR" />
-    <result column="wx_unionid" property="wxUnionid" jdbcType="VARCHAR" />
-    <result column="status" property="status" jdbcType="INTEGER" />
-    <result column="crt_time" property="crtTime" jdbcType="TIMESTAMP" />
-    <result column="upd_time" property="updTime" jdbcType="TIMESTAMP" />
-  </resultMap>
-  <sql id="Example_Where_Clause" >
-    <where >
-      <foreach collection="oredCriteria" item="criteria" separator="or" >
-        <if test="criteria.valid" >
-          <trim prefix="(" suffix=")" prefixOverrides="and" >
-            <foreach collection="criteria.criteria" item="criterion" >
-              <choose >
-                <when test="criterion.noValue" >
-                  and ${criterion.condition}
-                </when>
-                <when test="criterion.singleValue" >
-                  and ${criterion.condition} #{criterion.value}
-                </when>
-                <when test="criterion.betweenValue" >
-                  and ${criterion.condition} #{criterion.value} and #{criterion.secondValue}
-                </when>
-                <when test="criterion.listValue" >
-                  and ${criterion.condition}
-                  <foreach collection="criterion.value" item="listItem" open="(" close=")" separator="," >
-                    #{listItem}
-                  </foreach>
-                </when>
-              </choose>
-            </foreach>
-          </trim>
-        </if>
-      </foreach>
-    </where>
-  </sql>
-  <sql id="Base_Column_List" >
-    id, name, nickname, avatar, amount, forecast_rate_success, vote_rate_success, wx_openid, 
-    wx_unionid, status, crt_time, upd_time
-  </sql>
-  <select id="selectByExample" resultMap="BaseResultMap" parameterType="com.huojutech.entity.UserExample" >
-    select
-    <if test="distinct" >
-      distinct
-    </if>
-    'true' as QUERYID,
-    <include refid="Base_Column_List" />
-    from user
-    <if test="_parameter != null" >
-      <include refid="Example_Where_Clause" />
-    </if>
-    <if test="orderByClause != null" >
-      order by ${orderByClause}
-    </if>
-  </select>
-  <select id="selectByPrimaryKey" resultMap="BaseResultMap" parameterType="java.lang.Integer" >
-    select 
-    <include refid="Base_Column_List" />
-    from user
-    where id = #{id,jdbcType=INTEGER}
-  </select>
-  <delete id="deleteByPrimaryKey" parameterType="java.lang.Integer" >
-    delete from user
-    where id = #{id,jdbcType=INTEGER}
-  </delete>
-  <insert id="insert" parameterType="com.huojutech.entity.User" useGeneratedKeys="true" keyProperty="id" >
-    insert into user (name, nickname, avatar, 
-      amount, forecast_rate_success, vote_rate_success, 
-      wx_openid, wx_unionid, status, 
-      crt_time, upd_time)
-    values (#{name,jdbcType=VARCHAR}, #{nickname,jdbcType=VARCHAR}, #{avatar,jdbcType=VARCHAR}, 
-      #{amount,jdbcType=DECIMAL}, #{forecastRateSuccess,jdbcType=DOUBLE}, #{voteRateSuccess,jdbcType=DOUBLE}, 
-      #{wxOpenid,jdbcType=VARCHAR}, #{wxUnionid,jdbcType=VARCHAR}, #{status,jdbcType=INTEGER}, 
-      #{crtTime,jdbcType=TIMESTAMP}, #{updTime,jdbcType=TIMESTAMP})
-  </insert>
-  <insert id="insertSelective" parameterType="com.huojutech.entity.User" useGeneratedKeys="true" keyProperty="id" >
-    insert into user
-    <trim prefix="(" suffix=")" suffixOverrides="," >
-      <if test="name != null" >
-        name,
-      </if>
-      <if test="nickname != null" >
-        nickname,
-      </if>
-      <if test="avatar != null" >
-        avatar,
-      </if>
-      <if test="amount != null" >
-        amount,
-      </if>
-      <if test="forecastRateSuccess != null" >
-        forecast_rate_success,
-      </if>
-      <if test="voteRateSuccess != null" >
-        vote_rate_success,
-      </if>
-      <if test="wxOpenid != null" >
-        wx_openid,
-      </if>
-      <if test="wxUnionid != null" >
-        wx_unionid,
-      </if>
-      <if test="status != null" >
-        status,
-      </if>
-      <if test="crtTime != null" >
-        crt_time,
-      </if>
-      <if test="updTime != null" >
-        upd_time,
-      </if>
-    </trim>
-    <trim prefix="values (" suffix=")" suffixOverrides="," >
-      <if test="name != null" >
-        #{name,jdbcType=VARCHAR},
-      </if>
-      <if test="nickname != null" >
-        #{nickname,jdbcType=VARCHAR},
-      </if>
-      <if test="avatar != null" >
-        #{avatar,jdbcType=VARCHAR},
-      </if>
-      <if test="amount != null" >
-        #{amount,jdbcType=DECIMAL},
-      </if>
-      <if test="forecastRateSuccess != null" >
-        #{forecastRateSuccess,jdbcType=DOUBLE},
-      </if>
-      <if test="voteRateSuccess != null" >
-        #{voteRateSuccess,jdbcType=DOUBLE},
-      </if>
-      <if test="wxOpenid != null" >
-        #{wxOpenid,jdbcType=VARCHAR},
-      </if>
-      <if test="wxUnionid != null" >
-        #{wxUnionid,jdbcType=VARCHAR},
-      </if>
-      <if test="status != null" >
-        #{status,jdbcType=INTEGER},
-      </if>
-      <if test="crtTime != null" >
-        #{crtTime,jdbcType=TIMESTAMP},
-      </if>
-      <if test="updTime != null" >
-        #{updTime,jdbcType=TIMESTAMP},
-      </if>
-    </trim>
-  </insert>
-  <select id="countByExample" parameterType="com.huojutech.entity.UserExample" resultType="java.lang.Integer" >
-    select count(*) from user
-    <if test="_parameter != null" >
-      <include refid="Example_Where_Clause" />
-    </if>
-  </select>
-  <update id="updateByPrimaryKeySelective" parameterType="com.huojutech.entity.User" >
-    update user
-    <set >
-      <if test="name != null" >
-        name = #{name,jdbcType=VARCHAR},
-      </if>
-      <if test="nickname != null" >
-        nickname = #{nickname,jdbcType=VARCHAR},
-      </if>
-      <if test="avatar != null" >
-        avatar = #{avatar,jdbcType=VARCHAR},
-      </if>
-      <if test="amount != null" >
-        amount = #{amount,jdbcType=DECIMAL},
-      </if>
-      <if test="forecastRateSuccess != null" >
-        forecast_rate_success = #{forecastRateSuccess,jdbcType=DOUBLE},
-      </if>
-      <if test="voteRateSuccess != null" >
-        vote_rate_success = #{voteRateSuccess,jdbcType=DOUBLE},
-      </if>
-      <if test="wxOpenid != null" >
-        wx_openid = #{wxOpenid,jdbcType=VARCHAR},
-      </if>
-      <if test="wxUnionid != null" >
-        wx_unionid = #{wxUnionid,jdbcType=VARCHAR},
-      </if>
-      <if test="status != null" >
-        status = #{status,jdbcType=INTEGER},
-      </if>
-      <if test="crtTime != null" >
-        crt_time = #{crtTime,jdbcType=TIMESTAMP},
-      </if>
-      <if test="updTime != null" >
-        upd_time = #{updTime,jdbcType=TIMESTAMP},
-      </if>
-    </set>
-    where id = #{id,jdbcType=INTEGER}
-  </update>
-  <update id="updateByPrimaryKey" parameterType="com.huojutech.entity.User" >
-    update user
-    set name = #{name,jdbcType=VARCHAR},
-      nickname = #{nickname,jdbcType=VARCHAR},
-      avatar = #{avatar,jdbcType=VARCHAR},
-      amount = #{amount,jdbcType=DECIMAL},
-      forecast_rate_success = #{forecastRateSuccess,jdbcType=DOUBLE},
-      vote_rate_success = #{voteRateSuccess,jdbcType=DOUBLE},
-      wx_openid = #{wxOpenid,jdbcType=VARCHAR},
-      wx_unionid = #{wxUnionid,jdbcType=VARCHAR},
-      status = #{status,jdbcType=INTEGER},
-      crt_time = #{crtTime,jdbcType=TIMESTAMP},
-      upd_time = #{updTime,jdbcType=TIMESTAMP}
-    where id = #{id,jdbcType=INTEGER}
-  </update>
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
+<mapper namespace="com.huojutech.dao.UserMapper" >
+  <resultMap id="BaseResultMap" type="com.huojutech.entity.User" >
+    <id column="id" property="id" jdbcType="INTEGER" />
+    <result column="name" property="name" jdbcType="VARCHAR" />
+    <result column="nickname" property="nickname" jdbcType="VARCHAR" />
+    <result column="avatar" property="avatar" jdbcType="VARCHAR" />
+    <result column="amount" property="amount" jdbcType="DECIMAL" />
+    <result column="forecast_rate_success" property="forecastRateSuccess" jdbcType="DOUBLE" />
+    <result column="vote_rate_success" property="voteRateSuccess" jdbcType="DOUBLE" />
+    <result column="wx_openid" property="wxOpenid" jdbcType="VARCHAR" />
+    <result column="wx_unionid" property="wxUnionid" jdbcType="VARCHAR" />
+    <result column="status" property="status" jdbcType="INTEGER" />
+    <result column="crt_time" property="crtTime" jdbcType="TIMESTAMP" />
+    <result column="upd_time" property="updTime" jdbcType="TIMESTAMP" />
+  </resultMap>
+  <sql id="Example_Where_Clause" >
+    <where >
+      <foreach collection="oredCriteria" item="criteria" separator="or" >
+        <if test="criteria.valid" >
+          <trim prefix="(" suffix=")" prefixOverrides="and" >
+            <foreach collection="criteria.criteria" item="criterion" >
+              <choose >
+                <when test="criterion.noValue" >
+                  and ${criterion.condition}
+                </when>
+                <when test="criterion.singleValue" >
+                  and ${criterion.condition} #{criterion.value}
+                </when>
+                <when test="criterion.betweenValue" >
+                  and ${criterion.condition} #{criterion.value} and #{criterion.secondValue}
+                </when>
+                <when test="criterion.listValue" >
+                  and ${criterion.condition}
+                  <foreach collection="criterion.value" item="listItem" open="(" close=")" separator="," >
+                    #{listItem}
+                  </foreach>
+                </when>
+              </choose>
+            </foreach>
+          </trim>
+        </if>
+      </foreach>
+    </where>
+  </sql>
+  <sql id="Base_Column_List" >
+    id, name, nickname, avatar, amount, forecast_rate_success, vote_rate_success, wx_openid, 
+    wx_unionid, status, crt_time, upd_time
+  </sql>
+  <select id="selectByExample" resultMap="BaseResultMap" parameterType="com.huojutech.entity.UserExample" >
+    select
+    <if test="distinct" >
+      distinct
+    </if>
+    'true' as QUERYID,
+    <include refid="Base_Column_List" />
+    from user
+    <if test="_parameter != null" >
+      <include refid="Example_Where_Clause" />
+    </if>
+    <if test="orderByClause != null" >
+      order by ${orderByClause}
+    </if>
+  </select>
+  <select id="selectByPrimaryKey" resultMap="BaseResultMap" parameterType="java.lang.Integer" >
+    select 
+    <include refid="Base_Column_List" />
+    from user
+    where id = #{id,jdbcType=INTEGER}
+  </select>
+  <delete id="deleteByPrimaryKey" parameterType="java.lang.Integer" >
+    delete from user
+    where id = #{id,jdbcType=INTEGER}
+  </delete>
+  <insert id="insert" parameterType="com.huojutech.entity.User" useGeneratedKeys="true" keyProperty="id" >
+    insert into user (name, nickname, avatar, 
+      amount, forecast_rate_success, vote_rate_success, 
+      wx_openid, wx_unionid, status, 
+      crt_time, upd_time)
+    values (#{name,jdbcType=VARCHAR}, #{nickname,jdbcType=VARCHAR}, #{avatar,jdbcType=VARCHAR}, 
+      #{amount,jdbcType=DECIMAL}, #{forecastRateSuccess,jdbcType=DOUBLE}, #{voteRateSuccess,jdbcType=DOUBLE}, 
+      #{wxOpenid,jdbcType=VARCHAR}, #{wxUnionid,jdbcType=VARCHAR}, #{status,jdbcType=INTEGER}, 
+      #{crtTime,jdbcType=TIMESTAMP}, #{updTime,jdbcType=TIMESTAMP})
+  </insert>
+  <insert id="insertSelective" parameterType="com.huojutech.entity.User" useGeneratedKeys="true" keyProperty="id" >
+    insert into user
+    <trim prefix="(" suffix=")" suffixOverrides="," >
+      <if test="name != null" >
+        name,
+      </if>
+      <if test="nickname != null" >
+        nickname,
+      </if>
+      <if test="avatar != null" >
+        avatar,
+      </if>
+      <if test="amount != null" >
+        amount,
+      </if>
+      <if test="forecastRateSuccess != null" >
+        forecast_rate_success,
+      </if>
+      <if test="voteRateSuccess != null" >
+        vote_rate_success,
+      </if>
+      <if test="wxOpenid != null" >
+        wx_openid,
+      </if>
+      <if test="wxUnionid != null" >
+        wx_unionid,
+      </if>
+      <if test="status != null" >
+        status,
+      </if>
+      <if test="crtTime != null" >
+        crt_time,
+      </if>
+      <if test="updTime != null" >
+        upd_time,
+      </if>
+    </trim>
+    <trim prefix="values (" suffix=")" suffixOverrides="," >
+      <if test="name != null" >
+        #{name,jdbcType=VARCHAR},
+      </if>
+      <if test="nickname != null" >
+        #{nickname,jdbcType=VARCHAR},
+      </if>
+      <if test="avatar != null" >
+        #{avatar,jdbcType=VARCHAR},
+      </if>
+      <if test="amount != null" >
+        #{amount,jdbcType=DECIMAL},
+      </if>
+      <if test="forecastRateSuccess != null" >
+        #{forecastRateSuccess,jdbcType=DOUBLE},
+      </if>
+      <if test="voteRateSuccess != null" >
+        #{voteRateSuccess,jdbcType=DOUBLE},
+      </if>
+      <if test="wxOpenid != null" >
+        #{wxOpenid,jdbcType=VARCHAR},
+      </if>
+      <if test="wxUnionid != null" >
+        #{wxUnionid,jdbcType=VARCHAR},
+      </if>
+      <if test="status != null" >
+        #{status,jdbcType=INTEGER},
+      </if>
+      <if test="crtTime != null" >
+        #{crtTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="updTime != null" >
+        #{updTime,jdbcType=TIMESTAMP},
+      </if>
+    </trim>
+  </insert>
+  <select id="countByExample" parameterType="com.huojutech.entity.UserExample" resultType="java.lang.Integer" >
+    select count(*) from user
+    <if test="_parameter != null" >
+      <include refid="Example_Where_Clause" />
+    </if>
+  </select>
+  <update id="updateByPrimaryKeySelective" parameterType="com.huojutech.entity.User" >
+    update user
+    <set >
+      <if test="name != null" >
+        name = #{name,jdbcType=VARCHAR},
+      </if>
+      <if test="nickname != null" >
+        nickname = #{nickname,jdbcType=VARCHAR},
+      </if>
+      <if test="avatar != null" >
+        avatar = #{avatar,jdbcType=VARCHAR},
+      </if>
+      <if test="amount != null" >
+        amount = #{amount,jdbcType=DECIMAL},
+      </if>
+      <if test="forecastRateSuccess != null" >
+        forecast_rate_success = #{forecastRateSuccess,jdbcType=DOUBLE},
+      </if>
+      <if test="voteRateSuccess != null" >
+        vote_rate_success = #{voteRateSuccess,jdbcType=DOUBLE},
+      </if>
+      <if test="wxOpenid != null" >
+        wx_openid = #{wxOpenid,jdbcType=VARCHAR},
+      </if>
+      <if test="wxUnionid != null" >
+        wx_unionid = #{wxUnionid,jdbcType=VARCHAR},
+      </if>
+      <if test="status != null" >
+        status = #{status,jdbcType=INTEGER},
+      </if>
+      <if test="crtTime != null" >
+        crt_time = #{crtTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="updTime != null" >
+        upd_time = #{updTime,jdbcType=TIMESTAMP},
+      </if>
+    </set>
+    where id = #{id,jdbcType=INTEGER}
+  </update>
+  <update id="updateByPrimaryKey" parameterType="com.huojutech.entity.User" >
+    update user
+    set name = #{name,jdbcType=VARCHAR},
+      nickname = #{nickname,jdbcType=VARCHAR},
+      avatar = #{avatar,jdbcType=VARCHAR},
+      amount = #{amount,jdbcType=DECIMAL},
+      forecast_rate_success = #{forecastRateSuccess,jdbcType=DOUBLE},
+      vote_rate_success = #{voteRateSuccess,jdbcType=DOUBLE},
+      wx_openid = #{wxOpenid,jdbcType=VARCHAR},
+      wx_unionid = #{wxUnionid,jdbcType=VARCHAR},
+      status = #{status,jdbcType=INTEGER},
+      crt_time = #{crtTime,jdbcType=TIMESTAMP},
+      upd_time = #{updTime,jdbcType=TIMESTAMP}
+    where id = #{id,jdbcType=INTEGER}
+  </update>
 </mapper>

huozuan/src/test/java/com/huojutech/HuozuanApplicationTests.java

@@ -1,16 +1,16 @@
-package com.huojutech;
-
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.springframework.boot.test.context.SpringBootTest;
-import org.springframework.test.context.junit4.SpringRunner;
-
-@RunWith(SpringRunner.class)
-@SpringBootTest
-public class HuozuanApplicationTests {
-
-	@Test
-	public void contextLoads() {
-	}
-
-}
+package com.huojutech;
+
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.test.context.junit4.SpringRunner;
+
+@RunWith(SpringRunner.class)
+@SpringBootTest
+public class HuozuanApplicationTests {
+
+	@Test
+	public void contextLoads() {
+	}
+
+}

huozuan/src/test/java/com/huojutech/TestString.java

@@ -1,25 +1,25 @@
-package com.huojutech;
-
-/**
- * Created by Wangzw on 2018\4\12 0012.
- */
-
-public class TestString {
-    public static String Web_access_tokenhttps = "https://api.weixin.qq.com/sns/jscode2session?appid=%s&secret=%s&js_code=%s&grant_type=authorization_code";
-    public static final String APPID = "wx9aed188a08232742";
-    public static final String SECRET = "a2475aa957cc28bd6806c5f18d7a6ca9";
-    public static String getWebAccess(String code) {
-        return String.format(Web_access_tokenhttps, APPID, SECRET, code);
-    }
-    public static void main(String[] args) {
-
-        String code ="123";
-
-        String webAccess = TestString.getWebAccess(code);
-        System.out.printf(webAccess);
-
-
-    }
-
-}
-
+package com.huojutech;
+
+/**
+ * Created by Wangzw on 2018\4\12 0012.
+ */
+
+public class TestString {
+    public static String Web_access_tokenhttps = "https://api.weixin.qq.com/sns/jscode2session?appid=%s&secret=%s&js_code=%s&grant_type=authorization_code";
+    public static final String APPID = "wx9aed188a08232742";
+    public static final String SECRET = "a2475aa957cc28bd6806c5f18d7a6ca9";
+    public static String getWebAccess(String code) {
+        return String.format(Web_access_tokenhttps, APPID, SECRET, code);
+    }
+    public static void main(String[] args) {
+
+        String code ="123";
+
+        String webAccess = TestString.getWebAccess(code);
+        System.out.printf(webAccess);
+
+
+    }
+
+}
+