修改目录

ch-admin-api/src/main/java/com/wwdz/ch/admin/Application.java

@@ -14,7 +14,7 @@ import org.springframework.transaction.annotation.EnableTransactionManagement;
  */
 @SpringBootApplication(scanBasePackages = { "com.wwdz.ch.db", "com.wwdz.ch.core",
 		"com.wwdz.ch.admin" })
-@MapperScan({ "com.wwdz.ch.db.dao", "com.wwdz.ch.db.dao.ex" })
+@MapperScan({ "com.wwdz.ch.db.mapper", "com.wwdz.ch.db.mapper.ex" })
 @EnableTransactionManagement
 @EnableScheduling
 public class Application {

ch-admin-api/src/main/java/com/wwdz/ch/admin/controller/AdminGoodsController.java

@@ -14,7 +14,7 @@ import com.wwdz.ch.admin.service.AdminGoodsService;
 import com.wwdz.ch.admin.util.AuthSupport;
 import com.wwdz.ch.admin.util.CatVo;
 import com.wwdz.ch.db.domain.Category;
-import com.wwdz.ch.db.manager.impl.CategoryManagerImpl;
+import com.wwdz.ch.db.dao.impl.CategoryManagerImpl;
 import org.apache.shiro.authz.annotation.RequiresPermissions;
 import org.apache.shiro.util.CollectionUtils;
 import org.slf4j.Logger;

ch-admin-api/src/main/java/com/wwdz/ch/admin/controller/CategoryController.java

@@ -4,7 +4,6 @@ import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
-import java.util.stream.Collectors;
 
 import javax.validation.constraints.NotNull;
 
@@ -14,14 +13,11 @@ import com.wwdz.ch.admin.service.CategoryService;
 import com.wwdz.ch.admin.util.AuthSupport;
 import com.wwdz.ch.core.type.ListResult;
 import com.wwdz.ch.db.domain.Category;
-import com.wwdz.ch.db.manager.CategoryManager;
-import com.wwdz.ch.db.manager.impl.CategoryManagerImpl;
-import org.apache.commons.lang3.StringUtils;
+import com.wwdz.ch.db.dao.CategoryManager;
 import org.apache.shiro.authz.annotation.RequiresPermissions;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.util.CollectionUtils;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PostMapping;

ch-admin-api/src/main/java/com/wwdz/ch/admin/impl/BidRecordServiceImpl.java

 package com.wwdz.ch.admin.impl;
 
 import com.github.pagehelper.PageInfo;
-import com.wwdz.ch.admin.controller.AdminGoodsController;
 import com.wwdz.ch.admin.entity.vo.BidRecordVo;
 import com.wwdz.ch.core.util.ResponseUtil;
 import com.wwdz.ch.db.dto.request.BidRecordRequestDto;
 import com.wwdz.ch.admin.service.BidRecordService;
 import com.wwdz.ch.db.domain.BidRecord;
-import com.wwdz.ch.db.manager.BidRecordManager;
+import com.wwdz.ch.db.dao.BidRecordManager;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;

ch-admin-api/src/main/java/com/wwdz/ch/admin/impl/CategoryServiceImpl.java

 package com.wwdz.ch.admin.impl;
 
-import com.wwdz.ch.admin.controller.CategoryController;
 import com.wwdz.ch.admin.entity.vo.CategoryVo;
 import com.wwdz.ch.admin.service.CategoryService;
 import com.wwdz.ch.core.type.Result;
 import com.wwdz.ch.core.util.ResponseUtil;
 import com.wwdz.ch.db.domain.Category;
 import com.wwdz.ch.db.domain.GoodsCategoryObsolete;
-import com.wwdz.ch.db.domain.Item;
-import com.wwdz.ch.db.manager.CategoryManager;
-import com.wwdz.ch.db.manager.ItemManager;
-import com.xxdxxs.utils.JsonUtils;
+import com.wwdz.ch.db.dao.CategoryManager;
+import com.wwdz.ch.db.dao.ItemManager;
 import org.apache.commons.lang3.StringUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;

ch-admin-api/src/main/java/com/wwdz/ch/admin/impl/ItemServiceImpl.java

@@ -11,8 +11,8 @@ import com.wwdz.ch.db.domain.Category;
 import com.wwdz.ch.db.domain.Item;
 import com.wwdz.ch.db.domain.OperateLog;
 import com.wwdz.ch.db.dto.request.CoinRequestDto;
-import com.wwdz.ch.db.manager.CategoryManager;
-import com.wwdz.ch.db.manager.ItemManager;
+import com.wwdz.ch.db.dao.CategoryManager;
+import com.wwdz.ch.db.dao.ItemManager;
 import com.xxdxxs.utils.EntityMapper;
 import com.xxdxxs.utils.JsonUtils;
 import com.xxdxxs.utils.StringUtils;

ch-admin-api/src/main/java/com/wwdz/ch/admin/impl/OperateLogServiceImpl.java

@@ -2,7 +2,7 @@ package com.wwdz.ch.admin.impl;
 
 import com.wwdz.ch.admin.service.OperateLogService;
 import com.wwdz.ch.db.domain.OperateLog;
-import com.wwdz.ch.db.manager.OperateLogManager;
+import com.wwdz.ch.db.dao.OperateLogManager;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 

ch-admin-api/src/main/java/com/wwdz/ch/admin/service/AdminGoodsService.java

@@ -5,9 +5,8 @@ import java.util.stream.Collectors;
 
 import com.wwdz.ch.admin.entity.vo.ItemVo;
 import com.wwdz.ch.db.domain.*;
-import com.wwdz.ch.db.manager.CategoryManager;
-import com.wwdz.ch.db.manager.ItemManager;
-import com.wwdz.ch.db.manager.impl.CategoryManagerImpl;
+import com.wwdz.ch.db.dao.CategoryManager;
+import com.wwdz.ch.db.dao.ItemManager;
 import com.wwdz.ch.db.service.ItemService;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;

ch-admin-api/src/main/java/com/wwdz/ch/admin/shiro/AdminAuthorizingRealm.java

@@ -37,6 +37,7 @@ import com.wwdz.ch.db.service.DtsRoleService;
 public class AdminAuthorizingRealm extends AuthorizingRealm {
 
 	private static final Logger logger = LoggerFactory.getLogger(AdminAuthorizingRealm.class);
+
 	@Autowired
 	private DtsAdminService adminService;
 	@Autowired

ch-admin-api/src/test/java/com/wwdz/ch/admin/impl/ElasticsearchUtilTest.java

+package com.wwdz.ch.admin.impl;
+
+import com.wwdz.ch.core.entity.EsSearchParam;
+import com.wwdz.ch.core.util.ElasticsearchUtil;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
+import org.springframework.test.context.web.WebAppConfiguration;
+
+import javax.annotation.Resource;
+import java.util.List;
+
+@SpringBootTest
+@RunWith(SpringJUnit4ClassRunner.class)
+public class ElasticsearchUtilTest {
+
+    @Autowired
+    ElasticsearchUtil elasticsearchUtil;
+
+    @Test
+    public void findDocument() {
+        EsSearchParam esSearchParam = EsSearchParam.of("清代");
+        esSearchParam.setContent("清代");
+        List list = elasticsearchUtil.findDocument(esSearchParam);
+    }
+}
\ No newline at end of file

ch-core/src/main/java/com/wwdz/ch/core/config/ElasticsearchConfig.java

@@ -3,14 +3,22 @@ package com.wwdz.ch.core.config;
 import co.elastic.clients.elasticsearch.ElasticsearchAsyncClient;
 import co.elastic.clients.elasticsearch.ElasticsearchClient;
 import co.elastic.clients.json.jackson.JacksonJsonpMapper;
+import co.elastic.clients.transport.TransportUtils;
 import co.elastic.clients.transport.rest_client.RestClientTransport;
 import org.apache.http.HttpHost;
+import org.apache.http.auth.AuthScope;
+import org.apache.http.auth.UsernamePasswordCredentials;
+import org.apache.http.impl.client.BasicCredentialsProvider;
 import org.elasticsearch.client.RestClient;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.context.annotation.Bean;
 import org.springframework.stereotype.Component;
 import org.springframework.util.StringUtils;
 
+import javax.net.ssl.SSLContext;
+import java.io.File;
+import java.io.IOException;
+
 @Component
 public class ElasticsearchConfig {
 
@@ -26,13 +34,36 @@ public class ElasticsearchConfig {
      * @return
      */
     @Bean
-    public ElasticsearchClient elasticsearchClient() {
+    public ElasticsearchClient elasticsearchClient1() {
         HttpHost[] httpHosts = toHttpHost();
         RestClient restClient = RestClient.builder(httpHosts).build();
         RestClientTransport transport = new RestClientTransport(restClient, new JacksonJsonpMapper());
         return new ElasticsearchClient(transport);
     }
 
+ //   @Bean
+    public ElasticsearchClient elasticsearchClient() {
+        try {
+            File certFile = new File("/path/to/http_ca.crt");
+            SSLContext sslContext = TransportUtils.sslContextFromHttpCaCrt(certFile);
+            BasicCredentialsProvider credsProv = new BasicCredentialsProvider();
+           /* credsProv.setCredentials(
+                    AuthScope.ANY, new UsernamePasswordCredentials(login, password)
+            );*/
+            HttpHost[] httpHosts = toHttpHost();
+            RestClient restClient = RestClient.builder(httpHosts)
+                    .setHttpClientConfigCallback(hc -> hc
+                            .setSSLContext(sslContext)
+                            .setDefaultCredentialsProvider(credsProv)
+                    ).build();
+            RestClientTransport transport = new RestClientTransport(restClient, new JacksonJsonpMapper());
+            return new ElasticsearchClient(transport);
+        } catch (IOException e) {
+            throw new RuntimeException(e);
+        }
+    }
+
+
     /**
      * 异步方式
      * @return

ch-core/src/main/java/com/wwdz/ch/core/entity/EsSearchParam.java

@@ -15,6 +15,9 @@ public class EsSearchParam implements Entity {
     private int page = 1;
     private int size = 20;
 
+    public EsSearchParam() {
+    }
+
     public EsSearchParam(Map<String, String> paramMap, String content, String sortField, Boolean isDesc, int page, int size) {
         this.paramMap = paramMap;
         this.content = content;
@@ -32,13 +35,21 @@ public class EsSearchParam implements Entity {
         this.size = size;
     }
 
+    public EsSearchParam(String content) {
+        this.content = content;
+    }
+
     public EsSearchParam(String content, int page, int size) {
         this.content = content;
         this.page = page;
         this.size = size;
     }
 
-    public EsSearchParam of(String content, int page, int size) {
+    public static EsSearchParam of(String content, int page, int size) {
         return new EsSearchParam(content, page, size);
     }
+
+    public static EsSearchParam of(String content) {
+        return new EsSearchParam(content);
+    }
 }

ch-core/src/main/java/com/wwdz/ch/core/util/ElasticsearchUtil.java

@@ -2,9 +2,12 @@ package com.wwdz.ch.core.util;
 
 import co.elastic.clients.elasticsearch.ElasticsearchClient;
 import co.elastic.clients.elasticsearch._types.SortOrder;
+import co.elastic.clients.elasticsearch._types.query_dsl.Query;
+import co.elastic.clients.elasticsearch._types.query_dsl.TermQuery;
 import co.elastic.clients.elasticsearch.core.GetResponse;
 import co.elastic.clients.elasticsearch.core.SearchRequest;
 import co.elastic.clients.elasticsearch.core.SearchResponse;
+import co.elastic.clients.elasticsearch.core.search.Hit;
 import co.elastic.clients.util.ObjectBuilder;
 import com.wwdz.ch.core.entity.EsSearchParam;
 import com.wwdz.ch.db.bean.ItemOfEs;
@@ -33,22 +36,36 @@ public class ElasticsearchUtil {
             int page = esSearchParam.getPage();
             int size = esSearchParam.getSize();
             int from = (page - 1) * size;
+
             SearchRequest.Builder builder = new SearchRequest.Builder();
             builder.index(INDEX);
+            builder.query(queryBuild ->
+                    queryBuild.term(termQueryBuilder ->
+                    termQueryBuilder.field("name").value(esSearchParam.getContent())));
             builder.from(from);
             builder.size(size);
             builder.sort(f -> f.field(o -> o.field("coin_id")
                     .order(SortOrder.Desc)));
 
-            SearchRequest searchRequest = SearchRequest.of((Function<SearchRequest.Builder, ObjectBuilder<SearchRequest>>) builder);
-            SearchResponse<ItemOfEs> searchResponse = elasticsearchClient.search(searchRequest, ItemOfEs.class);
-            GetResponse<ItemOfEs> response = elasticsearchClient.get(s -> s.index("quanku")
-                    .id("e051445c-ae8c-47ef-ab18-97b34025d49a"), ItemOfEs.class);
-            logger.info("getResponse:{}", response.source());
-            if (response.found()) {
-                ItemOfEs itemOfEs = response.source();
-                assert itemOfEs != null;
-                logger.info("coin name= {} ", itemOfEs.getName());
+
+            Query nameQuery = TermQuery.of(m -> m
+                    .field("name")
+                    .value(esSearchParam.getContent())
+            )._toQuery();
+
+            SearchResponse<ItemOfEs> searchResponse = elasticsearchClient.search((Function<SearchRequest.Builder, ObjectBuilder<SearchRequest>>) builder,  ItemOfEs.class);
+
+          /*  SearchResponse<ItemOfEs> searchResponse = elasticsearchClient.search(s -> s
+                    .index(INDEX)
+                    .query(nameQuery)
+                    .from(page).size(size)
+                    .sort(f -> f.field(o -> o.field("coin_id").order(SortOrder.Desc))),
+                    ItemOfEs.class);*/
+            logger.info("getResponse:{}", searchResponse);
+            List<Hit<ItemOfEs>> hitList = searchResponse.hits().hits();
+            for (Hit<ItemOfEs> itemOfEsHit : hitList) {
+                ItemOfEs itemOfEs = itemOfEsHit.source();
+                logger.info("id : {}, item : {}", itemOfEs.getCoin_id(), itemOfEs);
             }
         } catch (Exception e) {
             e.printStackTrace();

ch-dao/src/main/java/com/wwdz/ch/db/manager/BidRecordManager.java → ch-dao/src/main/java/com/wwdz/ch/db/dao/BidRecordManager.java

-package com.wwdz.ch.db.manager;
+package com.wwdz.ch.db.dao;
 
 import com.wwdz.ch.db.domain.BidRecord;
 import com.wwdz.ch.db.dto.request.BidRecordRequestDto;

ch-dao/src/main/java/com/wwdz/ch/db/manager/CategoryManager.java → ch-dao/src/main/java/com/wwdz/ch/db/dao/CategoryManager.java

-package com.wwdz.ch.db.manager;
+package com.wwdz.ch.db.dao;
 
 import com.wwdz.ch.db.domain.Category;
 import java.util.List;

ch-dao/src/main/java/com/wwdz/ch/db/manager/FavoritesItemsRelationManager.java → ch-dao/src/main/java/com/wwdz/ch/db/dao/FavoritesItemsRelationManager.java

-package com.wwdz.ch.db.manager;
+package com.wwdz.ch.db.dao;
 
 import com.github.pagehelper.PageInfo;
 import com.wwdz.ch.db.domain.FavoritesItemsRelation;

ch-dao/src/main/java/com/wwdz/ch/db/manager/FavoritesManager.java → ch-dao/src/main/java/com/wwdz/ch/db/dao/FavoritesManager.java

-package com.wwdz.ch.db.manager;
+package com.wwdz.ch.db.dao;
 
 import com.github.pagehelper.PageInfo;
 import com.wwdz.ch.db.domain.Favorites;

ch-dao/src/main/java/com/wwdz/ch/db/manager/ItemManager.java → ch-dao/src/main/java/com/wwdz/ch/db/dao/ItemManager.java

-package com.wwdz.ch.db.manager;
+package com.wwdz.ch.db.dao;
 
 import com.wwdz.ch.db.domain.Item;
 import com.wwdz.ch.db.dto.request.CoinRequestDto;

ch-dao/src/main/java/com/wwdz/ch/db/manager/OperateLogManager.java → ch-dao/src/main/java/com/wwdz/ch/db/dao/OperateLogManager.java

-package com.wwdz.ch.db.manager;
+package com.wwdz.ch.db.dao;
 
 import com.wwdz.ch.db.domain.OperateLog;
 

ch-dao/src/main/java/com/wwdz/ch/db/manager/UserItemsRelationManager.java → ch-dao/src/main/java/com/wwdz/ch/db/dao/UserItemsRelationManager.java

-package com.wwdz.ch.db.manager;
+package com.wwdz.ch.db.dao;
 
 import com.wwdz.ch.db.domain.UserItemsRelation;
 

ch-dao/src/main/java/com/wwdz/ch/db/manager/impl/BidRecordManagerImpl.java → ch-dao/src/main/java/com/wwdz/ch/db/dao/impl/BidRecordManagerImpl.java

-package com.wwdz.ch.db.manager.impl;
+package com.wwdz.ch.db.dao.impl;
 
 import com.github.pagehelper.PageHelper;
-import com.wwdz.ch.db.dao.BidRecordMapper;
+import com.wwdz.ch.db.mapper.BidRecordMapper;
 import com.wwdz.ch.db.domain.BidRecord;
 import com.wwdz.ch.db.domain.BidRecordExample;
-import com.wwdz.ch.db.domain.FavoritesExample;
 import com.wwdz.ch.db.dto.request.BidRecordRequestDto;
-import com.wwdz.ch.db.manager.BidRecordManager;
+import com.wwdz.ch.db.dao.BidRecordManager;
 import com.xxdxxs.db.component.JdbcHelper;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
-import java.time.LocalDateTime;
 import java.util.Date;
 import java.util.List;
 

ch-dao/src/main/java/com/wwdz/ch/db/manager/impl/CategoryManagerImpl.java → ch-dao/src/main/java/com/wwdz/ch/db/dao/impl/CategoryManagerImpl.java

-package com.wwdz.ch.db.manager.impl;
+package com.wwdz.ch.db.dao.impl;
 
 import com.github.pagehelper.PageHelper;
-import com.wwdz.ch.db.dao.CategoryMapper;
+import com.wwdz.ch.db.mapper.CategoryMapper;
 import com.wwdz.ch.db.domain.Category;
 import com.wwdz.ch.db.domain.CategoryExample;
-import com.wwdz.ch.db.manager.CategoryManager;
+import com.wwdz.ch.db.dao.CategoryManager;
 import org.springframework.stereotype.Service;
 import org.springframework.util.StringUtils;
 

ch-dao/src/main/java/com/wwdz/ch/db/manager/impl/FavoritesItemsRelationManagerImpl.java → ch-dao/src/main/java/com/wwdz/ch/db/dao/impl/FavoritesItemsRelationManagerImpl.java

-package com.wwdz.ch.db.manager.impl;
+package com.wwdz.ch.db.dao.impl;
 
 import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
-import com.wwdz.ch.db.dao.FavoritesItemsRelationMapper;
+import com.wwdz.ch.db.mapper.FavoritesItemsRelationMapper;
 import com.wwdz.ch.db.domain.FavoritesItemsRelation;
 import com.wwdz.ch.db.domain.FavoritesItemsRelationExample;
-import com.wwdz.ch.db.manager.FavoritesItemsRelationManager;
+import com.wwdz.ch.db.dao.FavoritesItemsRelationManager;
 import com.xxdxxs.db.component.JdbcHelper;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Repository;

ch-dao/src/main/java/com/wwdz/ch/db/manager/impl/FavoritesManagerImpl.java → ch-dao/src/main/java/com/wwdz/ch/db/dao/impl/FavoritesManagerImpl.java

-package com.wwdz.ch.db.manager.impl;
+package com.wwdz.ch.db.dao.impl;
 
 import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
-import com.wwdz.ch.db.dao.FavoritesMapper;
+import com.wwdz.ch.db.mapper.FavoritesMapper;
 import com.wwdz.ch.db.domain.Favorites;
 import com.wwdz.ch.db.domain.FavoritesExample;
-import com.wwdz.ch.db.manager.FavoritesManager;
+import com.wwdz.ch.db.dao.FavoritesManager;
 import com.xxdxxs.db.component.JdbcHelper;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Repository;

ch-dao/src/main/java/com/wwdz/ch/db/manager/impl/ItemManagerImpl.java → ch-dao/src/main/java/com/wwdz/ch/db/dao/impl/ItemManagerImpl.java

-package com.wwdz.ch.db.manager.impl;
+package com.wwdz.ch.db.dao.impl;
 
-import com.github.pagehelper.PageHelper;
-import com.wwdz.ch.db.dao.ItemMapper;
+import com.wwdz.ch.db.mapper.ItemMapper;
 import com.wwdz.ch.db.domain.Item;
 import com.wwdz.ch.db.domain.ItemExample;
 import com.wwdz.ch.db.dto.request.CoinRequestDto;
-import com.wwdz.ch.db.manager.ItemManager;
+import com.wwdz.ch.db.dao.ItemManager;
 import com.xxdxxs.db.component.JdbcHelper;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Repository;

ch-dao/src/main/java/com/wwdz/ch/db/manager/impl/OperateLogManagerImpl.java → ch-dao/src/main/java/com/wwdz/ch/db/dao/impl/OperateLogManagerImpl.java

-package com.wwdz.ch.db.manager.impl;
+package com.wwdz.ch.db.dao.impl;
 
-import com.wwdz.ch.db.dao.OperateLogMapper;
+import com.wwdz.ch.db.mapper.OperateLogMapper;
 import com.wwdz.ch.db.domain.OperateLog;
-import com.wwdz.ch.db.manager.OperateLogManager;
-import org.apache.ibatis.annotations.Mapper;
+import com.wwdz.ch.db.dao.OperateLogManager;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Repository;
 

ch-dao/src/main/java/com/wwdz/ch/db/manager/impl/UserItemsRelationManagerImpl.java → ch-dao/src/main/java/com/wwdz/ch/db/dao/impl/UserItemsRelationManagerImpl.java

-package com.wwdz.ch.db.manager.impl;
+package com.wwdz.ch.db.dao.impl;
 
-import com.wwdz.ch.db.dao.UserItemsRelationMapper;
+import com.wwdz.ch.db.mapper.UserItemsRelationMapper;
 import com.wwdz.ch.db.domain.UserItemsRelation;
 import com.wwdz.ch.db.domain.UserItemsRelationExample;
-import com.wwdz.ch.db.manager.UserItemsRelationManager;
+import com.wwdz.ch.db.dao.UserItemsRelationManager;
 import com.xxdxxs.db.component.JdbcHelper;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Repository;

ch-dao/src/main/java/com/wwdz/ch/db/dao/AccountTraceObsoleteMapper.java → ch-dao/src/main/java/com/wwdz/ch/db/mapper/AccountTraceObsoleteMapper.java

-package com.wwdz.ch.db.dao;
+package com.wwdz.ch.db.mapper;
 
 import com.wwdz.ch.db.domain.AccountTraceObsolete;
 import com.wwdz.ch.db.domain.AccountTraceObsoleteExample;

ch-dao/src/main/java/com/wwdz/ch/db/dao/AdminMapper.java → ch-dao/src/main/java/com/wwdz/ch/db/mapper/AdminMapper.java

-package com.wwdz.ch.db.dao;
+package com.wwdz.ch.db.mapper;
 
 import com.wwdz.ch.db.domain.Admin;
 import com.wwdz.ch.db.domain.AdminExample;
 import java.util.List;
-
-import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 
 public interface AdminMapper {

ch-dao/src/main/java/com/wwdz/ch/db/dao/BidRecordMapper.java → ch-dao/src/main/java/com/wwdz/ch/db/mapper/BidRecordMapper.java

-package com.wwdz.ch.db.dao;
+package com.wwdz.ch.db.mapper;
 
 import com.wwdz.ch.db.domain.BidRecord;
 import com.wwdz.ch.db.domain.BidRecordExample;

ch-dao/src/main/java/com/wwdz/ch/db/dao/BookItemMapper.java → ch-dao/src/main/java/com/wwdz/ch/db/mapper/BookItemMapper.java

-package com.wwdz.ch.db.dao;
+package com.wwdz.ch.db.mapper;
 
 import com.wwdz.ch.db.domain.BookItem;
 import com.wwdz.ch.db.domain.BookItemExample;

ch-dao/src/main/java/com/wwdz/ch/db/dao/BookMapper.java → ch-dao/src/main/java/com/wwdz/ch/db/mapper/BookMapper.java

-package com.wwdz.ch.db.dao;
+package com.wwdz.ch.db.mapper;
 
 import com.wwdz.ch.db.domain.Book;
 import com.wwdz.ch.db.domain.BookExample;

ch-dao/src/main/java/com/wwdz/ch/db/dao/CategoryMapper.java → ch-dao/src/main/java/com/wwdz/ch/db/mapper/CategoryMapper.java

-package com.wwdz.ch.db.dao;
+package com.wwdz.ch.db.mapper;
 
 import com.wwdz.ch.db.domain.Category;
 import com.wwdz.ch.db.domain.CategoryExample;

ch-dao/src/main/java/com/wwdz/ch/db/dao/ChainNodeMapper.java → ch-dao/src/main/java/com/wwdz/ch/db/mapper/ChainNodeMapper.java

-package com.wwdz.ch.db.dao;
+package com.wwdz.ch.db.mapper;
 
 import com.wwdz.ch.db.domain.ChainNode;
 import com.wwdz.ch.db.domain.ChainNodeExample;

ch-dao/src/main/java/com/wwdz/ch/db/dao/CollectObsoleteMapper.java → ch-dao/src/main/java/com/wwdz/ch/db/mapper/CollectObsoleteMapper.java

-package com.wwdz.ch.db.dao;
+package com.wwdz.ch.db.mapper;
 
 import com.wwdz.ch.db.domain.CollectObsolete;
 import com.wwdz.ch.db.domain.CollectObsoleteExample;

ch-dao/src/main/java/com/wwdz/ch/db/dao/FavoritesItemsRelationMapper.java → ch-dao/src/main/java/com/wwdz/ch/db/mapper/FavoritesItemsRelationMapper.java

-package com.wwdz.ch.db.dao;
+package com.wwdz.ch.db.mapper;
 
 import com.wwdz.ch.db.domain.FavoritesItemsRelation;
 import com.wwdz.ch.db.domain.FavoritesItemsRelationExample;

ch-dao/src/main/java/com/wwdz/ch/db/dao/FavoritesMapper.java → ch-dao/src/main/java/com/wwdz/ch/db/mapper/FavoritesMapper.java

-package com.wwdz.ch.db.dao;
+package com.wwdz.ch.db.mapper;
 
 import com.wwdz.ch.db.domain.Favorites;
 import com.wwdz.ch.db.domain.FavoritesExample;
@@ -7,7 +7,6 @@ import org.apache.ibatis.annotations.Param;
 import java.util.List;
 
 import org.apache.ibatis.annotations.Mapper;
-import org.apache.ibatis.annotations.Param;
 
 @Mapper
 public interface FavoritesMapper {

ch-dao/src/main/java/com/wwdz/ch/db/dao/FeedbackMapper.java → ch-dao/src/main/java/com/wwdz/ch/db/mapper/FeedbackMapper.java

-package com.wwdz.ch.db.dao;
+package com.wwdz.ch.db.mapper;
 
 import com.wwdz.ch.db.domain.Feedback;
 import com.wwdz.ch.db.domain.FeedbackExample;

ch-dao/src/main/java/com/wwdz/ch/db/dao/FootprintMapper.java → ch-dao/src/main/java/com/wwdz/ch/db/mapper/FootprintMapper.java

-package com.wwdz.ch.db.dao;
+package com.wwdz.ch.db.mapper;
 
 import com.wwdz.ch.db.domain.Footprint;
 import com.wwdz.ch.db.domain.FootprintExample;

ch-dao/src/main/java/com/wwdz/ch/db/dao/GoodsAttributeObsoleteMapper.java → ch-dao/src/main/java/com/wwdz/ch/db/mapper/GoodsAttributeObsoleteMapper.java

-package com.wwdz.ch.db.dao;
+package com.wwdz.ch.db.mapper;
 
 import com.wwdz.ch.db.domain.GoodsAttributeObsolete;
 import com.wwdz.ch.db.domain.GoodsAttributeObsoleteExample;

ch-dao/src/main/java/com/wwdz/ch/db/dao/GoodsCategoryObsoleteMapper.java → ch-dao/src/main/java/com/wwdz/ch/db/mapper/GoodsCategoryObsoleteMapper.java

-package com.wwdz.ch.db.dao;
+package com.wwdz.ch.db.mapper;
 
 import com.wwdz.ch.db.domain.GoodsCategoryObsolete;
 import com.wwdz.ch.db.domain.GoodsCategoryObsoleteExample;

ch-dao/src/main/java/com/wwdz/ch/db/dao/GoodsObsoleteMapper.java → ch-dao/src/main/java/com/wwdz/ch/db/mapper/GoodsObsoleteMapper.java

-package com.wwdz.ch.db.dao;
+package com.wwdz.ch.db.mapper;
 
 import com.wwdz.ch.db.domain.GoodsObsolete;
 import com.wwdz.ch.db.domain.GoodsObsoleteExample;

ch-dao/src/main/java/com/wwdz/ch/db/dao/GoodsProductObsoleteMapper.java → ch-dao/src/main/java/com/wwdz/ch/db/mapper/GoodsProductObsoleteMapper.java

-package com.wwdz.ch.db.dao;
+package com.wwdz.ch.db.mapper;
 
 import com.wwdz.ch.db.domain.GoodsProductObsolete;
 import com.wwdz.ch.db.domain.GoodsProductObsoleteExample;

ch-dao/src/main/java/com/wwdz/ch/db/dao/GoodsSpecificationObsoleteMapper.java → ch-dao/src/main/java/com/wwdz/ch/db/mapper/GoodsSpecificationObsoleteMapper.java

-package com.wwdz.ch.db.dao;
+package com.wwdz.ch.db.mapper;
 
 import com.wwdz.ch.db.domain.GoodsSpecificationObsolete;
 import com.wwdz.ch.db.domain.GoodsSpecificationObsoleteExample;

ch-dao/src/main/java/com/wwdz/ch/db/dao/IssueMapper.java → ch-dao/src/main/java/com/wwdz/ch/db/mapper/IssueMapper.java

-package com.wwdz.ch.db.dao;
+package com.wwdz.ch.db.mapper;
 
 import com.wwdz.ch.db.domain.Issue;
 import com.wwdz.ch.db.domain.IssueExample;

ch-dao/src/main/java/com/wwdz/ch/db/dao/ItemMapper.java → ch-dao/src/main/java/com/wwdz/ch/db/mapper/ItemMapper.java

-package com.wwdz.ch.db.dao;
+package com.wwdz.ch.db.mapper;
 
 import com.wwdz.ch.db.domain.Item;
 import com.wwdz.ch.db.domain.ItemExample;

ch-dao/src/main/java/com/wwdz/ch/db/dao/KeywordMapper.java → ch-dao/src/main/java/com/wwdz/ch/db/mapper/KeywordMapper.java

-package com.wwdz.ch.db.dao;
+package com.wwdz.ch.db.mapper;
 
 import com.wwdz.ch.db.domain.Keyword;
 import com.wwdz.ch.db.domain.KeywordExample;

ch-dao/src/main/java/com/wwdz/ch/db/dao/OperateLogMapper.java → ch-dao/src/main/java/com/wwdz/ch/db/mapper/OperateLogMapper.java

-package com.wwdz.ch.db.dao;
+package com.wwdz.ch.db.mapper;
 
 import com.wwdz.ch.db.domain.OperateLog;
 import com.wwdz.ch.db.domain.OperateLogExample;

ch-dao/src/main/java/com/wwdz/ch/db/dao/PermissionMapper.java → ch-dao/src/main/java/com/wwdz/ch/db/mapper/PermissionMapper.java

-package com.wwdz.ch.db.dao;
+package com.wwdz.ch.db.mapper;
 
 import com.wwdz.ch.db.domain.Permission;
 import com.wwdz.ch.db.domain.PermissionExample;

ch-dao/src/main/java/com/wwdz/ch/db/dao/RoleMapper.java → ch-dao/src/main/java/com/wwdz/ch/db/mapper/RoleMapper.java

-package com.wwdz.ch.db.dao;
+package com.wwdz.ch.db.mapper;
 
 import com.wwdz.ch.db.domain.Role;
 import com.wwdz.ch.db.domain.RoleExample;

ch-dao/src/main/java/com/wwdz/ch/db/dao/SearchHistoryMapper.java → ch-dao/src/main/java/com/wwdz/ch/db/mapper/SearchHistoryMapper.java

-package com.wwdz.ch.db.dao;
+package com.wwdz.ch.db.mapper;
 
 import com.wwdz.ch.db.domain.SearchHistory;
 import com.wwdz.ch.db.domain.SearchHistoryExample;

ch-dao/src/main/java/com/wwdz/ch/db/dao/StorageMapper.java → ch-dao/src/main/java/com/wwdz/ch/db/mapper/StorageMapper.java

-package com.wwdz.ch.db.dao;
+package com.wwdz.ch.db.mapper;
 
 import com.wwdz.ch.db.domain.Storage;
 import com.wwdz.ch.db.domain.StorageExample;

ch-dao/src/main/java/com/wwdz/ch/db/dao/SystemMapper.java → ch-dao/src/main/java/com/wwdz/ch/db/mapper/SystemMapper.java

-package com.wwdz.ch.db.dao;
+package com.wwdz.ch.db.mapper;
 
 import com.wwdz.ch.db.domain.System;
 import com.wwdz.ch.db.domain.SystemExample;

ch-dao/src/main/java/com/wwdz/ch/db/dao/UgcCoinMapper.java → ch-dao/src/main/java/com/wwdz/ch/db/mapper/UgcCoinMapper.java

-package com.wwdz.ch.db.dao;
+package com.wwdz.ch.db.mapper;
 
 import com.wwdz.ch.db.domain.UgcCoin;
 import com.wwdz.ch.db.domain.UgcCoinExample;

ch-dao/src/main/java/com/wwdz/ch/db/dao/UserAccountObsoleteMapper.java → ch-dao/src/main/java/com/wwdz/ch/db/mapper/UserAccountObsoleteMapper.java

-package com.wwdz.ch.db.dao;
+package com.wwdz.ch.db.mapper;
 
 import com.wwdz.ch.db.domain.UserAccountObsolete;
 import com.wwdz.ch.db.domain.UserAccountObsoleteExample;

ch-dao/src/main/java/com/wwdz/ch/db/dao/UserFormidObsoleteMapper.java → ch-dao/src/main/java/com/wwdz/ch/db/mapper/UserFormidObsoleteMapper.java

-package com.wwdz.ch.db.dao;
+package com.wwdz.ch.db.mapper;
 
 import com.wwdz.ch.db.domain.UserFormidObsolete;
 import com.wwdz.ch.db.domain.UserFormidObsoleteExample;

ch-dao/src/main/java/com/wwdz/ch/db/dao/UserItemsRelationMapper.java → ch-dao/src/main/java/com/wwdz/ch/db/mapper/UserItemsRelationMapper.java

-package com.wwdz.ch.db.dao;
+package com.wwdz.ch.db.mapper;
 
 import com.wwdz.ch.db.domain.UserItemsRelation;
 import com.wwdz.ch.db.domain.UserItemsRelationExample;

ch-dao/src/main/java/com/wwdz/ch/db/dao/UserMapper.java → ch-dao/src/main/java/com/wwdz/ch/db/mapper/UserMapper.java

-package com.wwdz.ch.db.dao;
+package com.wwdz.ch.db.mapper;
 
 import com.wwdz.ch.db.domain.User;
 import com.wwdz.ch.db.domain.UserExample;

ch-dao/src/main/java/com/wwdz/ch/db/dao/ex/AccountMapperEx.java → ch-dao/src/main/java/com/wwdz/ch/db/mapper/ex/AccountMapperEx.java

-package com.wwdz.ch.db.dao.ex;
+package com.wwdz.ch.db.mapper.ex;
 
-import java.math.BigDecimal;
-import java.time.LocalDateTime;
 import java.util.List;
 
-import org.apache.ibatis.annotations.Param;
-
 /**
  * 用户账户统计扩展的dao层
  * 

ch-dao/src/main/java/com/wwdz/ch/db/dao/ex/GoodsProductMapper.java → ch-dao/src/main/java/com/wwdz/ch/db/mapper/ex/GoodsProductMapper.java

-package com.wwdz.ch.db.dao.ex;
+package com.wwdz.ch.db.mapper.ex;
 
 import org.apache.ibatis.annotations.Param;
 

ch-dao/src/main/java/com/wwdz/ch/db/dao/ex/StatMapper.java → ch-dao/src/main/java/com/wwdz/ch/db/mapper/ex/StatMapper.java

-package com.wwdz.ch.db.dao.ex;
+package com.wwdz.ch.db.mapper.ex;
 
 import java.util.List;
 import java.util.Map;

ch-dao/src/main/java/com/wwdz/ch/db/mybatis/MyBatisGeneratorRun.java

@@ -19,7 +19,7 @@ public class MyBatisGeneratorRun {
     public void generator() throws Exception{
         List<String> warnings = new ArrayList<String>();
         boolean overwrite = true;
-        InputStream resourceAsStream = this.getClass().getClassLoader().getResourceAsStream("ch-dao/mybatis-generator/generatorConfig_new.xml");
+        InputStream resourceAsStream = this.getClass().getClassLoader().getResourceAsStream("generatorConfig_new.xml");
         ConfigurationParser cp = new ConfigurationParser(warnings);
         Configuration config = cp.parseConfiguration(resourceAsStream);
         DefaultShellCallback callback = new DefaultShellCallback(overwrite);

ch-dao/src/main/java/com/wwdz/ch/db/service/DtsAccountService.java

@@ -18,9 +18,9 @@ import org.springframework.transaction.annotation.Transactional;
 import org.springframework.util.StringUtils;
 
 import com.github.pagehelper.PageHelper;
-import com.wwdz.ch.db.dao.AccountTraceObsoleteMapper;
-import com.wwdz.ch.db.dao.UserAccountObsoleteMapper;
-import com.wwdz.ch.db.dao.UserMapper;
+import com.wwdz.ch.db.mapper.AccountTraceObsoleteMapper;
+import com.wwdz.ch.db.mapper.UserAccountObsoleteMapper;
+import com.wwdz.ch.db.mapper.UserMapper;
 import com.wwdz.ch.db.domain.AccountTraceObsolete;
 import com.wwdz.ch.db.domain.AccountTraceObsoleteExample;
 import com.wwdz.ch.db.domain.User;

ch-dao/src/main/java/com/wwdz/ch/db/service/DtsAdminService.java

 package com.wwdz.ch.db.service;
 
 import com.github.pagehelper.PageHelper;
-import com.wwdz.ch.db.dao.AdminMapper;
+import com.wwdz.ch.db.mapper.AdminMapper;
 import com.wwdz.ch.db.domain.Admin;
 import com.wwdz.ch.db.domain.AdminExample;
 import com.wwdz.ch.db.domain.Admin.Column;
-
 import org.springframework.stereotype.Service;
 import org.springframework.util.StringUtils;
-
 import javax.annotation.Resource;
 import java.time.LocalDateTime;
 import java.util.List;

ch-dao/src/main/java/com/wwdz/ch/db/service/DtsCollectService.java

 package com.wwdz.ch.db.service;
 
 import com.github.pagehelper.PageHelper;
-import com.wwdz.ch.db.dao.CollectObsoleteMapper;
+import com.wwdz.ch.db.mapper.CollectObsoleteMapper;
 import com.wwdz.ch.db.domain.CollectObsolete;
 import com.wwdz.ch.db.domain.CollectObsoleteExample;
 

ch-dao/src/main/java/com/wwdz/ch/db/service/DtsFeedbackService.java

 package com.wwdz.ch.db.service;
 
 import com.github.pagehelper.PageHelper;
-import com.wwdz.ch.db.dao.FeedbackMapper;
+import com.wwdz.ch.db.mapper.FeedbackMapper;
 import com.wwdz.ch.db.domain.Feedback;
 import com.wwdz.ch.db.domain.FeedbackExample;
 

ch-dao/src/main/java/com/wwdz/ch/db/service/DtsFootprintService.java

 package com.wwdz.ch.db.service;
 
 import com.github.pagehelper.PageHelper;
-import com.wwdz.ch.db.dao.FootprintMapper;
+import com.wwdz.ch.db.mapper.FootprintMapper;
 import com.wwdz.ch.db.domain.Footprint;
 import com.wwdz.ch.db.domain.FootprintExample;
 

ch-dao/src/main/java/com/wwdz/ch/db/service/DtsGoodsAttributeService.java

@@ -2,7 +2,7 @@ package com.wwdz.ch.db.service;
 
 import org.springframework.stereotype.Service;
 
-import com.wwdz.ch.db.dao.GoodsAttributeObsoleteMapper;
+import com.wwdz.ch.db.mapper.GoodsAttributeObsoleteMapper;
 import com.wwdz.ch.db.domain.GoodsAttributeObsolete;
 import com.wwdz.ch.db.domain.GoodsAttributeObsoleteExample;
 

ch-dao/src/main/java/com/wwdz/ch/db/service/DtsGoodsProductService.java

@@ -7,8 +7,8 @@ import javax.annotation.Resource;
 
 import org.springframework.stereotype.Service;
 
-import com.wwdz.ch.db.dao.ex.GoodsProductMapper;
-import com.wwdz.ch.db.dao.GoodsProductObsoleteMapper;
+import com.wwdz.ch.db.mapper.ex.GoodsProductMapper;
+import com.wwdz.ch.db.mapper.GoodsProductObsoleteMapper;
 import com.wwdz.ch.db.domain.GoodsProductObsolete;
 import com.wwdz.ch.db.domain.GoodsProductObsoleteExample;
 

ch-dao/src/main/java/com/wwdz/ch/db/service/DtsGoodsSpecificationService.java

@@ -10,7 +10,7 @@ import javax.annotation.Resource;
 
 import org.springframework.stereotype.Service;
 
-import com.wwdz.ch.db.dao.GoodsSpecificationObsoleteMapper;
+import com.wwdz.ch.db.mapper.GoodsSpecificationObsoleteMapper;
 import com.wwdz.ch.db.domain.GoodsSpecificationObsolete;
 import com.wwdz.ch.db.domain.GoodsSpecificationObsoleteExample;
 

ch-dao/src/main/java/com/wwdz/ch/db/service/DtsIssueService.java

 package com.wwdz.ch.db.service;
 
 import com.github.pagehelper.PageHelper;
-import com.wwdz.ch.db.dao.IssueMapper;
+import com.wwdz.ch.db.mapper.IssueMapper;
 import com.wwdz.ch.db.domain.Issue;
 import com.wwdz.ch.db.domain.IssueExample;
 

ch-dao/src/main/java/com/wwdz/ch/db/service/DtsKeywordService.java

 package com.wwdz.ch.db.service;
 
 import com.github.pagehelper.PageHelper;
-import com.wwdz.ch.db.dao.KeywordMapper;
+import com.wwdz.ch.db.mapper.KeywordMapper;
 import com.wwdz.ch.db.domain.Keyword;
 import com.wwdz.ch.db.domain.KeywordExample;
 

ch-dao/src/main/java/com/wwdz/ch/db/service/DtsPermissionService.java

@@ -10,7 +10,7 @@ import javax.annotation.Resource;
 
 import org.springframework.stereotype.Service;
 
-import com.wwdz.ch.db.dao.PermissionMapper;
+import com.wwdz.ch.db.mapper.PermissionMapper;
 import com.wwdz.ch.db.domain.Permission;
 import com.wwdz.ch.db.domain.PermissionExample;
 

ch-dao/src/main/java/com/wwdz/ch/db/service/DtsRoleService.java

@@ -2,7 +2,7 @@ package com.wwdz.ch.db.service;
 
 import com.alibaba.druid.util.StringUtils;
 import com.github.pagehelper.PageHelper;
-import com.wwdz.ch.db.dao.RoleMapper;
+import com.wwdz.ch.db.mapper.RoleMapper;
 import com.wwdz.ch.db.domain.Role;
 import com.wwdz.ch.db.domain.RoleExample;
 

ch-dao/src/main/java/com/wwdz/ch/db/service/DtsSearchHistoryService.java

 package com.wwdz.ch.db.service;
 
 import com.github.pagehelper.PageHelper;
-import com.wwdz.ch.db.dao.SearchHistoryMapper;
+import com.wwdz.ch.db.mapper.SearchHistoryMapper;
 import com.wwdz.ch.db.domain.SearchHistory;
 import com.wwdz.ch.db.domain.SearchHistoryExample;
 

ch-dao/src/main/java/com/wwdz/ch/db/service/DtsStorageService.java

 package com.wwdz.ch.db.service;
 
 import com.github.pagehelper.PageHelper;
-import com.wwdz.ch.db.dao.StorageMapper;
+import com.wwdz.ch.db.mapper.StorageMapper;
 import com.wwdz.ch.db.domain.Storage;
 import com.wwdz.ch.db.domain.StorageExample;
 

ch-dao/src/main/java/com/wwdz/ch/db/service/DtsSystemConfigService.java

@@ -2,7 +2,7 @@ package com.wwdz.ch.db.service;
 
 import org.springframework.stereotype.Service;
 
-import com.wwdz.ch.db.dao.SystemMapper;
+import com.wwdz.ch.db.mapper.SystemMapper;
 import com.wwdz.ch.db.domain.System;
 import com.wwdz.ch.db.domain.SystemExample;
 

ch-dao/src/main/java/com/wwdz/ch/db/service/DtsUserFormIdService.java

@@ -2,7 +2,7 @@ package com.wwdz.ch.db.service;
 
 import org.springframework.stereotype.Service;
 
-import com.wwdz.ch.db.dao.UserFormidObsoleteMapper;
+import com.wwdz.ch.db.mapper.UserFormidObsoleteMapper;
 import com.wwdz.ch.db.domain.UserFormidObsolete;
 import com.wwdz.ch.db.domain.UserFormidObsoleteExample;
 

ch-dao/src/main/java/com/wwdz/ch/db/service/DtsUserService.java

@@ -10,9 +10,9 @@ import org.springframework.util.StringUtils;
 
 import com.github.pagehelper.PageHelper;
 import com.wwdz.ch.db.bean.DayStatis;
-import com.wwdz.ch.db.dao.UserAccountObsoleteMapper;
-import com.wwdz.ch.db.dao.UserMapper;
-import com.wwdz.ch.db.dao.ex.StatMapper;
+import com.wwdz.ch.db.mapper.UserAccountObsoleteMapper;
+import com.wwdz.ch.db.mapper.UserMapper;
+import com.wwdz.ch.db.mapper.ex.StatMapper;
 import com.wwdz.ch.db.domain.User;
 import com.wwdz.ch.db.domain.UserExample;
 import com.wwdz.ch.db.domain.UserVo;

ch-dao/src/main/java/com/wwdz/ch/db/service/ItemService.java

 package com.wwdz.ch.db.service;
 
 import com.github.pagehelper.PageHelper;
-import com.wwdz.ch.db.dao.ItemMapper;
+import com.wwdz.ch.db.mapper.ItemMapper;
 import com.wwdz.ch.db.domain.*;
 
 import org.springframework.stereotype.Service;

ch-dao/src/main/java/com/wwdz/ch/db/service/StatService.java

@@ -7,7 +7,7 @@ import javax.annotation.Resource;
 
 import org.springframework.stereotype.Service;
 
-import com.wwdz.ch.db.dao.ex.StatMapper;
+import com.wwdz.ch.db.mapper.ex.StatMapper;
 
 @Service
 @SuppressWarnings("rawtypes")

ch-dao/src/main/java/com/wwdz/ch/db/service/UgcCoinService.java

 package com.wwdz.ch.db.service;
 
 import com.github.pagehelper.PageHelper;
-import com.wwdz.ch.db.dao.UgcCoinMapper;
+import com.wwdz.ch.db.mapper.UgcCoinMapper;
 import com.wwdz.ch.db.domain.*;
 import org.springframework.stereotype.Service;
 

ch-dao/src/main/resources/com/wwdz/ch/db/dao/AccountTraceObsoleteMapper.xml → ch-dao/src/main/resources/com/wwdz/ch/db/mapper/AccountTraceObsoleteMapper.xml

 <?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.wwdz.ch.db.dao.AccountTraceObsoleteMapper">
+<mapper namespace="com.wwdz.ch.db.mapper.AccountTraceObsoleteMapper">
   <resultMap id="BaseResultMap" type="com.wwdz.ch.db.domain.AccountTraceObsolete">
     <!--
       WARNING - @mbg.generated

ch-dao/src/main/resources/com/wwdz/ch/db/dao/AdminMapper.xml → ch-dao/src/main/resources/com/wwdz/ch/db/mapper/AdminMapper.xml

 <?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.wwdz.ch.db.dao.AdminMapper">
+<mapper namespace="com.wwdz.ch.db.mapper.AdminMapper">
   <resultMap id="BaseResultMap" type="com.wwdz.ch.db.domain.Admin">
     <!--
       WARNING - @mbg.generated

ch-dao/src/main/resources/com/wwdz/ch/db/dao/BidRecordMapper.xml → ch-dao/src/main/resources/com/wwdz/ch/db/mapper/BidRecordMapper.xml

 <?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.wwdz.ch.db.dao.BidRecordMapper">
+<mapper namespace="com.wwdz.ch.db.mapper.BidRecordMapper">
   <resultMap id="BaseResultMap" type="com.wwdz.ch.db.domain.BidRecord">
     <id column="id" jdbcType="BIGINT" property="id" />
     <result column="extra" jdbcType="VARCHAR" property="extra" />

ch-dao/src/main/resources/com/wwdz/ch/db/dao/BookItemMapper.xml → ch-dao/src/main/resources/com/wwdz/ch/db/mapper/BookItemMapper.xml

 <?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.wwdz.ch.db.dao.BookItemMapper">
+<mapper namespace="com.wwdz.ch.db.mapper.BookItemMapper">
   <resultMap id="BaseResultMap" type="com.wwdz.ch.db.domain.BookItem">
     <!--
       WARNING - @mbg.generated

ch-dao/src/main/resources/com/wwdz/ch/db/dao/BookMapper.xml → ch-dao/src/main/resources/com/wwdz/ch/db/mapper/BookMapper.xml

 <?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.wwdz.ch.db.dao.BookMapper">
+<mapper namespace="com.wwdz.ch.db.mapper.BookMapper">
   <resultMap id="BaseResultMap" type="com.wwdz.ch.db.domain.Book">
     <!--
       WARNING - @mbg.generated

ch-dao/src/main/resources/com/wwdz/ch/db/dao/CategoryMapper.xml → ch-dao/src/main/resources/com/wwdz/ch/db/mapper/CategoryMapper.xml

 <?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.wwdz.ch.db.dao.CategoryMapper">
+<mapper namespace="com.wwdz.ch.db.mapper.CategoryMapper">
   <resultMap id="BaseResultMap" type="com.wwdz.ch.db.domain.Category">
     <!--
       WARNING - @mbg.generated

ch-dao/src/main/resources/com/wwdz/ch/db/dao/ChainNodeMapper.xml → ch-dao/src/main/resources/com/wwdz/ch/db/mapper/ChainNodeMapper.xml

 <?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.wwdz.ch.db.dao.ChainNodeMapper">
+<mapper namespace="com.wwdz.ch.db.mapper.ChainNodeMapper">
   <resultMap id="BaseResultMap" type="com.wwdz.ch.db.domain.ChainNode">
     <!--
       WARNING - @mbg.generated

ch-dao/src/main/resources/com/wwdz/ch/db/dao/CollectObsoleteMapper.xml → ch-dao/src/main/resources/com/wwdz/ch/db/mapper/CollectObsoleteMapper.xml

 <?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.wwdz.ch.db.dao.CollectObsoleteMapper">
+<mapper namespace="com.wwdz.ch.db.mapper.CollectObsoleteMapper">
   <resultMap id="BaseResultMap" type="com.wwdz.ch.db.domain.CollectObsolete">
     <!--
       WARNING - @mbg.generated

ch-dao/src/main/resources/com/wwdz/ch/db/dao/FavoritesItemsRelationMapper.xml → ch-dao/src/main/resources/com/wwdz/ch/db/mapper/FavoritesItemsRelationMapper.xml

 <?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.wwdz.ch.db.dao.FavoritesItemsRelationMapper">
+<mapper namespace="com.wwdz.ch.db.mapper.FavoritesItemsRelationMapper">
   <resultMap id="BaseResultMap" type="com.wwdz.ch.db.domain.FavoritesItemsRelation">
     <result column="favorites_id" jdbcType="BIGINT" property="favoritesId" />
     <result column="item_id" jdbcType="BIGINT" property="itemId" />

ch-dao/src/main/resources/com/wwdz/ch/db/dao/FavoritesMapper.xml → ch-dao/src/main/resources/com/wwdz/ch/db/mapper/FavoritesMapper.xml

 <?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.wwdz.ch.db.dao.FavoritesMapper">
+<mapper namespace="com.wwdz.ch.db.mapper.FavoritesMapper">
   <resultMap id="BaseResultMap" type="com.wwdz.ch.db.domain.Favorites">
     <id column="id" jdbcType="BIGINT" property="id" />
     <result column="user_id" jdbcType="BIGINT" property="userId" />

ch-dao/src/main/resources/com/wwdz/ch/db/dao/FeedbackMapper.xml → ch-dao/src/main/resources/com/wwdz/ch/db/mapper/FeedbackMapper.xml

 <?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.wwdz.ch.db.dao.FeedbackMapper">
+<mapper namespace="com.wwdz.ch.db.mapper.FeedbackMapper">
   <resultMap id="BaseResultMap" type="com.wwdz.ch.db.domain.Feedback">
     <!--
       WARNING - @mbg.generated

ch-dao/src/main/resources/com/wwdz/ch/db/dao/FootprintMapper.xml → ch-dao/src/main/resources/com/wwdz/ch/db/mapper/FootprintMapper.xml

 <?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.wwdz.ch.db.dao.FootprintMapper">
+<mapper namespace="com.wwdz.ch.db.mapper.FootprintMapper">
   <resultMap id="BaseResultMap" type="com.wwdz.ch.db.domain.Footprint">
     <!--
       WARNING - @mbg.generated

ch-dao/src/main/resources/com/wwdz/ch/db/dao/GoodsAttributeObsoleteMapper.xml → ch-dao/src/main/resources/com/wwdz/ch/db/mapper/GoodsAttributeObsoleteMapper.xml

 <?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.wwdz.ch.db.dao.GoodsAttributeObsoleteMapper">
+<mapper namespace="com.wwdz.ch.db.mapper.GoodsAttributeObsoleteMapper">
   <resultMap id="BaseResultMap" type="com.wwdz.ch.db.domain.GoodsAttributeObsolete">
     <!--
       WARNING - @mbg.generated

ch-dao/src/main/resources/com/wwdz/ch/db/dao/GoodsCategoryObsoleteMapper.xml → ch-dao/src/main/resources/com/wwdz/ch/db/mapper/GoodsCategoryObsoleteMapper.xml

 <?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.wwdz.ch.db.dao.GoodsCategoryObsoleteMapper">
+<mapper namespace="com.wwdz.ch.db.mapper.GoodsCategoryObsoleteMapper">
   <resultMap id="BaseResultMap" type="com.wwdz.ch.db.domain.GoodsCategoryObsolete">
     <!--
       WARNING - @mbg.generated

ch-dao/src/main/resources/com/wwdz/ch/db/dao/GoodsObsoleteMapper.xml → ch-dao/src/main/resources/com/wwdz/ch/db/mapper/GoodsObsoleteMapper.xml

 <?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.wwdz.ch.db.dao.GoodsObsoleteMapper">
+<mapper namespace="com.wwdz.ch.db.mapper.GoodsObsoleteMapper">
   <resultMap id="BaseResultMap" type="com.wwdz.ch.db.domain.GoodsObsolete">
     <!--
       WARNING - @mbg.generated

ch-dao/src/main/resources/com/wwdz/ch/db/dao/GoodsProductObsoleteMapper.xml → ch-dao/src/main/resources/com/wwdz/ch/db/mapper/GoodsProductObsoleteMapper.xml

 <?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.wwdz.ch.db.dao.GoodsProductObsoleteMapper">
+<mapper namespace="com.wwdz.ch.db.mapper.GoodsProductObsoleteMapper">
   <resultMap id="BaseResultMap" type="com.wwdz.ch.db.domain.GoodsProductObsolete">
     <!--
       WARNING - @mbg.generated

ch-dao/src/main/resources/com/wwdz/ch/db/dao/GoodsSpecificationObsoleteMapper.xml → ch-dao/src/main/resources/com/wwdz/ch/db/mapper/GoodsSpecificationObsoleteMapper.xml

 <?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.wwdz.ch.db.dao.GoodsSpecificationObsoleteMapper">
+<mapper namespace="com.wwdz.ch.db.mapper.GoodsSpecificationObsoleteMapper">
   <resultMap id="BaseResultMap" type="com.wwdz.ch.db.domain.GoodsSpecificationObsolete">
     <!--
       WARNING - @mbg.generated

ch-dao/src/main/resources/com/wwdz/ch/db/dao/IssueMapper.xml → ch-dao/src/main/resources/com/wwdz/ch/db/mapper/IssueMapper.xml

 <?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.wwdz.ch.db.dao.IssueMapper">
+<mapper namespace="com.wwdz.ch.db.mapper.IssueMapper">
   <resultMap id="BaseResultMap" type="com.wwdz.ch.db.domain.Issue">
     <!--
       WARNING - @mbg.generated