From abf19322da2584badba366cb0f2bc805bbc64417 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=83=91=E7=9A=87?= <236220500@qq.com> Date: Mon, 18 May 2020 22:21:44 +0800 Subject: [PATCH] 1 --- pom.xml | 2 +- src/main/java/com/kiisoo/ic/app/IcApplication.java | 3 +-- src/main/resources/application-dev.yml | 2 +- src/test/java/init/OrganizationInit.java | 4 ---- src/test/java/init/OrganizationInitPhone.java | 9 --------- src/test/java/init/OrganizationInitRegion.java | 7 ------- src/test/java/test/InitDataTest.java | 14 -------------- 7 files changed, 3 insertions(+), 38 deletions(-) diff --git a/pom.xml b/pom.xml index 28de73a..904174c 100644 --- a/pom.xml +++ b/pom.xml @@ -7,7 +7,7 @@ com.kiisoo ic 1.0-SNAPSHOT - war + jar youke diff --git a/src/main/java/com/kiisoo/ic/app/IcApplication.java b/src/main/java/com/kiisoo/ic/app/IcApplication.java index b0e1734..16c8a57 100644 --- a/src/main/java/com/kiisoo/ic/app/IcApplication.java +++ b/src/main/java/com/kiisoo/ic/app/IcApplication.java @@ -1,7 +1,6 @@ package com.kiisoo.ic.app; import lombok.extern.slf4j.Slf4j; -import org.mybatis.spring.annotation.MapperScan; import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.SpringBootApplication; import org.springframework.boot.autoconfigure.security.servlet.SecurityAutoConfiguration; @@ -12,7 +11,7 @@ import org.springframework.scheduling.annotation.EnableScheduling; @SpringBootApplication(exclude = SecurityAutoConfiguration.class) -@ComponentScan("com.kiisoo.ic") +@ComponentScan("com.kiisoo.ic.*") @EnableScheduling @Slf4j public class IcApplication extends SpringBootServletInitializer { diff --git a/src/main/resources/application-dev.yml b/src/main/resources/application-dev.yml index 637ea64..2c39380 100644 --- a/src/main/resources/application-dev.yml +++ b/src/main/resources/application-dev.yml @@ -18,7 +18,7 @@ spring: ##开发环境 server: - port: 8080 + port: 8777 servlet: context-path: /kiisoo-ic diff --git a/src/test/java/init/OrganizationInit.java b/src/test/java/init/OrganizationInit.java index cf734e7..b9b5140 100644 --- a/src/test/java/init/OrganizationInit.java +++ b/src/test/java/init/OrganizationInit.java @@ -12,7 +12,6 @@ import com.alibaba.fastjson.JSON; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.kiisoo.ic.app.IcApplication; import com.kiisoo.ic.common.utils.MD5FileUtil; -import com.kiisoo.ic.customer.entity.OpCustomer; import com.kiisoo.ic.employee.entity.PrivilageCpUserDO; import com.kiisoo.ic.employee.mapper.PrivilageCpUserDOMapper; import com.kiisoo.ic.generalize.entity.PrivilageOrganizational; @@ -25,12 +24,10 @@ import com.kiisoo.ic.store.entity.PrivilageCpUserStoreDO; import com.kiisoo.ic.store.mapper.PoiStoreDOMapper; import com.kiisoo.ic.store.mapper.PoiStoreStaffDOMapper; import com.kiisoo.ic.store.mapper.PrivilageCpUserStoreDOMapper; -import com.kiisoo.ic.store.service.PoiStoreStaffService; import com.kiisoo.ic.system.entity.PrivilageAccountDO; import com.kiisoo.ic.system.entity.PrivilageUserDO; import com.kiisoo.ic.system.entity.PrivilageUserRoleDO; import com.kiisoo.ic.system.mapper.PrivilageAccountDOMapper; -import com.kiisoo.ic.system.mapper.PrivilageRoleDOMapper; import com.kiisoo.ic.system.mapper.PrivilageUserDOMapper; import com.kiisoo.ic.system.mapper.PrivilageUserRoleDOMapper; import org.apache.commons.lang3.StringUtils; @@ -45,7 +42,6 @@ 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.stereotype.Service; import org.springframework.test.context.junit4.SpringRunner; /** diff --git a/src/test/java/init/OrganizationInitPhone.java b/src/test/java/init/OrganizationInitPhone.java index 2ae1c7a..fdfc5c4 100644 --- a/src/test/java/init/OrganizationInitPhone.java +++ b/src/test/java/init/OrganizationInitPhone.java @@ -3,22 +3,13 @@ package init; import com.alibaba.fastjson.JSON; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.kiisoo.ic.app.IcApplication; -import com.kiisoo.ic.common.utils.MD5FileUtil; -import com.kiisoo.ic.employee.entity.PrivilageCpUserDO; import com.kiisoo.ic.employee.mapper.PrivilageCpUserDOMapper; -import com.kiisoo.ic.generalize.entity.PrivilageOrganizational; -import com.kiisoo.ic.generalize.entity.PrivilageOrganizationalMember; import com.kiisoo.ic.generalize.mapper.OrganizationalMemberMapper; import com.kiisoo.ic.generalize.mapper.RetailCompanyMapper; -import com.kiisoo.ic.store.entity.PoiStore; -import com.kiisoo.ic.store.entity.PoiStoreStaff; -import com.kiisoo.ic.store.entity.PrivilageCpUserStoreDO; import com.kiisoo.ic.store.mapper.PoiStoreDOMapper; import com.kiisoo.ic.store.mapper.PoiStoreStaffDOMapper; import com.kiisoo.ic.store.mapper.PrivilageCpUserStoreDOMapper; -import com.kiisoo.ic.system.entity.PrivilageAccountDO; import com.kiisoo.ic.system.entity.PrivilageUserDO; -import com.kiisoo.ic.system.entity.PrivilageUserRoleDO; import com.kiisoo.ic.system.mapper.PrivilageAccountDOMapper; import com.kiisoo.ic.system.mapper.PrivilageUserDOMapper; import com.kiisoo.ic.system.mapper.PrivilageUserRoleDOMapper; diff --git a/src/test/java/init/OrganizationInitRegion.java b/src/test/java/init/OrganizationInitRegion.java index 2e3c1bd..1833b56 100644 --- a/src/test/java/init/OrganizationInitRegion.java +++ b/src/test/java/init/OrganizationInitRegion.java @@ -5,13 +5,6 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.kiisoo.ic.app.IcApplication; import com.kiisoo.ic.generalize.entity.PrivilageOrganizational; import com.kiisoo.ic.generalize.mapper.RetailCompanyMapper; -import com.kiisoo.ic.region.entity.RegionDO; -import com.kiisoo.ic.store.entity.PoiStore; -import com.kiisoo.ic.store.entity.PoiStoreStaff; -import com.kiisoo.ic.store.mapper.PoiStoreDOMapper; -import com.kiisoo.ic.store.mapper.PoiStoreStaffDOMapper; -import com.kiisoo.ic.system.entity.PrivilageUserDO; -import com.kiisoo.ic.system.mapper.PrivilageUserDOMapper; import org.apache.poi.hssf.usermodel.HSSFWorkbook; import org.apache.poi.ss.usermodel.*; import org.apache.poi.xssf.usermodel.XSSFWorkbook; diff --git a/src/test/java/test/InitDataTest.java b/src/test/java/test/InitDataTest.java index 80211a2..4678d8a 100644 --- a/src/test/java/test/InitDataTest.java +++ b/src/test/java/test/InitDataTest.java @@ -3,18 +3,14 @@ package test; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.kiisoo.ic.app.IcApplication; import com.kiisoo.ic.common.utils.MD5FileUtil; -import com.kiisoo.ic.config.WxCpConfiguration; import com.kiisoo.ic.domain.entity.PrivilageDomainDO; import com.kiisoo.ic.domain.entity.PrivilageDomainEntityDO; import com.kiisoo.ic.domain.mapper.PrivilageDomainDOMapper; import com.kiisoo.ic.domain.mapper.PrivilageDomainEntityDOMapper; import com.kiisoo.ic.employee.entity.PrivilageCpUserDO; -import com.kiisoo.ic.employee.entity.QrCodeDO; import com.kiisoo.ic.employee.mapper.PrivilageCpUserDOMapper; -import com.kiisoo.ic.generalize.entity.CompanyStoreDO; import com.kiisoo.ic.generalize.entity.PrivilageOrganizational; import com.kiisoo.ic.generalize.entity.PrivilageOrganizationalDomain; -import com.kiisoo.ic.generalize.entity.PrivilageOrganizationalMember; import com.kiisoo.ic.generalize.mapper.PrivilageOrganizationalDomainMapper; import com.kiisoo.ic.generalize.mapper.RetailCompanyMapper; import com.kiisoo.ic.store.entity.PoiStore; @@ -32,30 +28,20 @@ import com.kiisoo.ic.system.entity.PrivilageUserRoleDO; import com.kiisoo.ic.system.mapper.PrivilageAccountDOMapper; import com.kiisoo.ic.system.mapper.PrivilageUserDOMapper; import com.kiisoo.ic.system.mapper.PrivilageUserRoleDOMapper; -import init.ShopInitDO; -import me.chanjar.weixin.common.error.WxErrorException; -import me.chanjar.weixin.cp.api.WxCpService; -import me.chanjar.weixin.cp.api.impl.WxCpServiceImpl; -import me.chanjar.weixin.cp.bean.WxCpDepart; -import me.chanjar.weixin.cp.config.impl.WxCpDefaultConfigImpl; import org.apache.commons.collections.CollectionUtils; import org.apache.commons.io.FileUtils; import org.apache.commons.lang3.ArrayUtils; import org.apache.commons.lang3.StringUtils; import org.junit.Test; import org.junit.runner.RunWith; -import org.springframework.beans.BeanUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.test.context.SpringBootTest; import org.springframework.test.context.junit4.SpringRunner; -import org.springframework.transaction.annotation.Transactional; import java.io.File; import java.io.IOException; import java.util.*; -import static com.kiisoo.ic.config.WxCpConfiguration.APPLICATIONID; -import static com.kiisoo.ic.store.constant.Constants.BSD_REQ_QRCODE_TYPE_SELLER; import static com.kiisoo.ic.store.constant.Constants.BSD_REQ_QRCODE_TYPE_STORE; @RunWith(SpringRunner.class)