diff --git a/api/oms-api/src/main/java/cn/qihangerp/oms/controller/LogisticsController.java b/api/oms-api/src/main/java/cn/qihangerp/oms/controller/LogisticsController.java index 42c3de92..7bc0fa6d 100644 --- a/api/oms-api/src/main/java/cn/qihangerp/oms/controller/LogisticsController.java +++ b/api/oms-api/src/main/java/cn/qihangerp/oms/controller/LogisticsController.java @@ -10,16 +10,10 @@ import cn.qihangerp.domain.OShopPlatform; import cn.qihangerp.module.service.OLogisticsCompanyService; import cn.qihangerp.module.service.OShopPlatformService; import cn.qihangerp.module.service.OShopService; -import cn.qihangerp.oms.request.ShopBo; import cn.qihangerp.security.common.BaseController; -import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import lombok.AllArgsConstructor; -import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.web.bind.annotation.*; -import java.util.Arrays; -import java.util.List; - /** * 店铺Controller * diff --git a/api/oms-api/src/main/java/cn/qihangerp/oms/controller/ShopController.java b/api/oms-api/src/main/java/cn/qihangerp/oms/controller/ShopController.java index 31a41480..9a633ed0 100644 --- a/api/oms-api/src/main/java/cn/qihangerp/oms/controller/ShopController.java +++ b/api/oms-api/src/main/java/cn/qihangerp/oms/controller/ShopController.java @@ -1,7 +1,5 @@ package cn.qihangerp.oms.controller; -import cn.qihangerp.common.PageQuery; -import cn.qihangerp.common.PageResult; import cn.qihangerp.domain.OLogisticsCompany; import cn.qihangerp.domain.OShopPlatform; import cn.qihangerp.module.service.OLogisticsCompanyService; diff --git a/core/model/pom.xml b/core/model/pom.xml new file mode 100644 index 00000000..b2823bce --- /dev/null +++ b/core/model/pom.xml @@ -0,0 +1,72 @@ + + + 4.0.0 + + cn.qihangerp + qihangerp-cloud + 2.0.6 + ../../pom.xml + + + cn.qihangerp.model + model + + + 17 + 17 + UTF-8 + + + + org.apache.commons + commons-lang3 + 3.12.0 + + + + + + + + + org.hibernate.validator + hibernate-validator + 9.0.0.Final + + + org.mapstruct + mapstruct + 1.6.3 + + + + + + + + + + + + + + + + com.fasterxml.jackson.core + jackson-annotations + 2.20 + + + io.swagger.core.v3 + swagger-annotations + 2.2.36 + + + com.baomidou + mybatis-plus-spring-boot3-starter + 3.5.5 + + + \ No newline at end of file diff --git a/core/model/src/main/java/cn/qihangerp/model/Main.java b/core/model/src/main/java/cn/qihangerp/model/Main.java new file mode 100644 index 00000000..f689017e --- /dev/null +++ b/core/model/src/main/java/cn/qihangerp/model/Main.java @@ -0,0 +1,7 @@ +package cn.qihangerp.model; + +public class Main { + public static void main(String[] args) { + System.out.println("Hello, World!"); + } +} \ No newline at end of file diff --git a/core/common/src/main/java/cn/qihangerp/domain/BaseEntity.java b/core/model/src/main/java/cn/qihangerp/model/entity/BaseEntity.java similarity index 98% rename from core/common/src/main/java/cn/qihangerp/domain/BaseEntity.java rename to core/model/src/main/java/cn/qihangerp/model/entity/BaseEntity.java index 27dc9541..11d894c1 100644 --- a/core/common/src/main/java/cn/qihangerp/domain/BaseEntity.java +++ b/core/model/src/main/java/cn/qihangerp/model/entity/BaseEntity.java @@ -1,4 +1,4 @@ -package cn.qihangerp.domain; +package cn.qihangerp.model.entity; import java.io.Serializable; diff --git a/core/common/src/main/java/cn/qihangerp/domain/OGoodsSku.java b/core/model/src/main/java/cn/qihangerp/model/entity/OGoodsSku.java similarity index 100% rename from core/common/src/main/java/cn/qihangerp/domain/OGoodsSku.java rename to core/model/src/main/java/cn/qihangerp/model/entity/OGoodsSku.java diff --git a/core/common/src/main/java/cn/qihangerp/domain/OLogisticsCompany.java b/core/model/src/main/java/cn/qihangerp/model/entity/OLogisticsCompany.java similarity index 96% rename from core/common/src/main/java/cn/qihangerp/domain/OLogisticsCompany.java rename to core/model/src/main/java/cn/qihangerp/model/entity/OLogisticsCompany.java index 6f450cef..6dece293 100644 --- a/core/common/src/main/java/cn/qihangerp/domain/OLogisticsCompany.java +++ b/core/model/src/main/java/cn/qihangerp/model/entity/OLogisticsCompany.java @@ -1,4 +1,4 @@ -package cn.qihangerp.domain; +package cn.qihangerp.model.entity; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; diff --git a/core/common/src/main/java/cn/qihangerp/domain/OShop.java b/core/model/src/main/java/cn/qihangerp/model/entity/OShop.java similarity index 98% rename from core/common/src/main/java/cn/qihangerp/domain/OShop.java rename to core/model/src/main/java/cn/qihangerp/model/entity/OShop.java index 521fcb9c..dbcccefc 100644 --- a/core/common/src/main/java/cn/qihangerp/domain/OShop.java +++ b/core/model/src/main/java/cn/qihangerp/model/entity/OShop.java @@ -1,4 +1,4 @@ -package cn.qihangerp.domain; +package cn.qihangerp.model.entity; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableField; diff --git a/core/common/src/main/java/cn/qihangerp/domain/OShopPlatform.java b/core/model/src/main/java/cn/qihangerp/model/entity/OShopPlatform.java similarity index 96% rename from core/common/src/main/java/cn/qihangerp/domain/OShopPlatform.java rename to core/model/src/main/java/cn/qihangerp/model/entity/OShopPlatform.java index de55f248..5b385872 100644 --- a/core/common/src/main/java/cn/qihangerp/domain/OShopPlatform.java +++ b/core/model/src/main/java/cn/qihangerp/model/entity/OShopPlatform.java @@ -1,4 +1,4 @@ -package cn.qihangerp.domain; +package cn.qihangerp.model.entity; import java.io.Serializable; diff --git a/core/common/src/main/java/cn/qihangerp/domain/OShopPullLasttime.java b/core/model/src/main/java/cn/qihangerp/model/entity/OShopPullLasttime.java similarity index 97% rename from core/common/src/main/java/cn/qihangerp/domain/OShopPullLasttime.java rename to core/model/src/main/java/cn/qihangerp/model/entity/OShopPullLasttime.java index 27718004..5ceced08 100644 --- a/core/common/src/main/java/cn/qihangerp/domain/OShopPullLasttime.java +++ b/core/model/src/main/java/cn/qihangerp/model/entity/OShopPullLasttime.java @@ -1,4 +1,4 @@ -package cn.qihangerp.domain; +package cn.qihangerp.model.entity; import java.io.Serializable; import java.time.LocalDateTime; diff --git a/core/common/src/main/java/cn/qihangerp/domain/OShopPullLogs.java b/core/model/src/main/java/cn/qihangerp/model/entity/OShopPullLogs.java similarity index 97% rename from core/common/src/main/java/cn/qihangerp/domain/OShopPullLogs.java rename to core/model/src/main/java/cn/qihangerp/model/entity/OShopPullLogs.java index 10c1e1ca..a912a0fa 100644 --- a/core/common/src/main/java/cn/qihangerp/domain/OShopPullLogs.java +++ b/core/model/src/main/java/cn/qihangerp/model/entity/OShopPullLogs.java @@ -1,4 +1,4 @@ -package cn.qihangerp.domain; +package cn.qihangerp.model.entity; import java.io.Serializable; import java.util.Date; diff --git a/core/common/src/main/java/cn/qihangerp/domain/SysDictData.java b/core/model/src/main/java/cn/qihangerp/model/entity/SysDictData.java similarity index 98% rename from core/common/src/main/java/cn/qihangerp/domain/SysDictData.java rename to core/model/src/main/java/cn/qihangerp/model/entity/SysDictData.java index d7672693..195c3999 100644 --- a/core/common/src/main/java/cn/qihangerp/domain/SysDictData.java +++ b/core/model/src/main/java/cn/qihangerp/model/entity/SysDictData.java @@ -1,4 +1,4 @@ -package cn.qihangerp.domain; +package cn.qihangerp.model.entity; import cn.qihangerp.common.constant.UserConstants; diff --git a/core/common/src/main/java/cn/qihangerp/domain/SysRole.java b/core/model/src/main/java/cn/qihangerp/model/entity/SysRole.java similarity index 99% rename from core/common/src/main/java/cn/qihangerp/domain/SysRole.java rename to core/model/src/main/java/cn/qihangerp/model/entity/SysRole.java index bc3a58c0..76593597 100644 --- a/core/common/src/main/java/cn/qihangerp/domain/SysRole.java +++ b/core/model/src/main/java/cn/qihangerp/model/entity/SysRole.java @@ -1,4 +1,4 @@ -package cn.qihangerp.domain; +package cn.qihangerp.model.entity; import java.util.Date; import java.util.Map; diff --git a/core/common/src/main/java/cn/qihangerp/domain/SysTask.java b/core/model/src/main/java/cn/qihangerp/model/entity/SysTask.java similarity index 95% rename from core/common/src/main/java/cn/qihangerp/domain/SysTask.java rename to core/model/src/main/java/cn/qihangerp/model/entity/SysTask.java index 7dfbc181..7f7ba7b4 100644 --- a/core/common/src/main/java/cn/qihangerp/domain/SysTask.java +++ b/core/model/src/main/java/cn/qihangerp/model/entity/SysTask.java @@ -1,4 +1,4 @@ -package cn.qihangerp.domain; +package cn.qihangerp.model.entity; import java.io.Serializable; import java.util.Date; diff --git a/core/common/src/main/java/cn/qihangerp/domain/SysTaskLogs.java b/core/model/src/main/java/cn/qihangerp/model/entity/SysTaskLogs.java similarity index 95% rename from core/common/src/main/java/cn/qihangerp/domain/SysTaskLogs.java rename to core/model/src/main/java/cn/qihangerp/model/entity/SysTaskLogs.java index 35223d4a..aab1a6be 100644 --- a/core/common/src/main/java/cn/qihangerp/domain/SysTaskLogs.java +++ b/core/model/src/main/java/cn/qihangerp/model/entity/SysTaskLogs.java @@ -1,4 +1,4 @@ -package cn.qihangerp.domain; +package cn.qihangerp.model.entity; import java.io.Serializable; import java.util.Date; diff --git a/core/common/src/main/java/cn/qihangerp/domain/SysUser.java b/core/model/src/main/java/cn/qihangerp/model/entity/SysUser.java similarity index 99% rename from core/common/src/main/java/cn/qihangerp/domain/SysUser.java rename to core/model/src/main/java/cn/qihangerp/model/entity/SysUser.java index 2d99d785..a7979219 100644 --- a/core/common/src/main/java/cn/qihangerp/domain/SysUser.java +++ b/core/model/src/main/java/cn/qihangerp/model/entity/SysUser.java @@ -1,4 +1,4 @@ -package cn.qihangerp.domain; +package cn.qihangerp.model.entity; import java.util.Date; diff --git a/microservices/dou-api/src/main/java/cn/qihangerp/api/dou/DouApiCommon.java b/microservices/dou-api/src/main/java/cn/qihangerp/api/dou/DouApiCommon.java index d66ae5c3..37ada00f 100644 --- a/microservices/dou-api/src/main/java/cn/qihangerp/api/dou/DouApiCommon.java +++ b/microservices/dou-api/src/main/java/cn/qihangerp/api/dou/DouApiCommon.java @@ -6,7 +6,6 @@ import cn.qihangerp.common.api.ShopApiParams; import cn.qihangerp.common.enums.EnumShopType; import cn.qihangerp.common.enums.HttpStatus; import cn.qihangerp.domain.OShopPlatform; -import cn.qihangerp.module.service.OShopPlatformService; import cn.qihangerp.module.service.OShopService; import cn.qihangerp.open.common.ApiResultVo; import cn.qihangerp.sdk.dou.DouTokenApiHelper; diff --git a/microservices/dou-api/src/main/java/cn/qihangerp/api/dou/controller/DouOrderApiController.java b/microservices/dou-api/src/main/java/cn/qihangerp/api/dou/controller/DouOrderApiController.java index 2702c21a..46c13e8f 100644 --- a/microservices/dou-api/src/main/java/cn/qihangerp/api/dou/controller/DouOrderApiController.java +++ b/microservices/dou-api/src/main/java/cn/qihangerp/api/dou/controller/DouOrderApiController.java @@ -18,7 +18,6 @@ import cn.qihangerp.module.service.OShopPullLasttimeService; import cn.qihangerp.module.service.OShopPullLogsService; import cn.qihangerp.open.common.ApiResultVo; import cn.qihangerp.open.dou.DouOrderApiHelper; -import cn.qihangerp.open.dou.model.Token; import cn.qihangerp.open.dou.model.order.Order; import cn.qihangerp.sdk.dou.PullRequest; import com.alibaba.fastjson2.JSONObject; diff --git a/microservices/dou-api/src/main/java/cn/qihangerp/api/dou/controller/DouRefundApiController.java b/microservices/dou-api/src/main/java/cn/qihangerp/api/dou/controller/DouRefundApiController.java index 9605195b..2cc9c539 100644 --- a/microservices/dou-api/src/main/java/cn/qihangerp/api/dou/controller/DouRefundApiController.java +++ b/microservices/dou-api/src/main/java/cn/qihangerp/api/dou/controller/DouRefundApiController.java @@ -16,7 +16,6 @@ import cn.qihangerp.module.service.OShopPullLasttimeService; import cn.qihangerp.module.service.OShopPullLogsService; import cn.qihangerp.open.common.ApiResultVo; import cn.qihangerp.open.dou.DouRefundApiHelper; -import cn.qihangerp.open.dou.model.Token; import cn.qihangerp.open.dou.model.after.AfterSale; import cn.qihangerp.sdk.dou.PullRequest; import com.alibaba.fastjson2.JSONObject; diff --git a/microservices/jd-api/src/main/java/cn/qihangerp/api/jd/JdApiCommon.java b/microservices/jd-api/src/main/java/cn/qihangerp/api/jd/JdApiCommon.java index d34f0cd6..8f1fdba3 100644 --- a/microservices/jd-api/src/main/java/cn/qihangerp/api/jd/JdApiCommon.java +++ b/microservices/jd-api/src/main/java/cn/qihangerp/api/jd/JdApiCommon.java @@ -6,7 +6,6 @@ import cn.qihangerp.common.api.ShopApiParams; import cn.qihangerp.common.enums.EnumShopType; import cn.qihangerp.common.enums.HttpStatus; import cn.qihangerp.domain.OShopPlatform; -import cn.qihangerp.module.service.OShopPlatformService; import cn.qihangerp.module.service.OShopService; import lombok.AllArgsConstructor; import org.springframework.stereotype.Component; diff --git a/microservices/pdd-api/src/main/java/cn/qihangerp/api/pdd/PddApiCommon.java b/microservices/pdd-api/src/main/java/cn/qihangerp/api/pdd/PddApiCommon.java index a55bd1e0..d32d63fa 100644 --- a/microservices/pdd-api/src/main/java/cn/qihangerp/api/pdd/PddApiCommon.java +++ b/microservices/pdd-api/src/main/java/cn/qihangerp/api/pdd/PddApiCommon.java @@ -6,7 +6,6 @@ import cn.qihangerp.common.api.ShopApiParams; import cn.qihangerp.common.enums.EnumShopType; import cn.qihangerp.common.enums.HttpStatus; import cn.qihangerp.domain.OShopPlatform; -import cn.qihangerp.module.service.OShopPlatformService; import cn.qihangerp.module.service.OShopService; import lombok.AllArgsConstructor; import org.springframework.stereotype.Component; diff --git a/microservices/tao-api/src/main/java/cn/qihangerp/api/tao/TaoApiCommon.java b/microservices/tao-api/src/main/java/cn/qihangerp/api/tao/TaoApiCommon.java index 650fe650..e9836654 100644 --- a/microservices/tao-api/src/main/java/cn/qihangerp/api/tao/TaoApiCommon.java +++ b/microservices/tao-api/src/main/java/cn/qihangerp/api/tao/TaoApiCommon.java @@ -6,7 +6,6 @@ import cn.qihangerp.common.api.ShopApiParams; import cn.qihangerp.common.enums.EnumShopType; import cn.qihangerp.common.enums.HttpStatus; import cn.qihangerp.domain.OShopPlatform; -import cn.qihangerp.module.service.OShopPlatformService; import cn.qihangerp.module.service.OShopService; import lombok.AllArgsConstructor; import org.springframework.stereotype.Component; diff --git a/module/order/src/main/java/cn/qihangerp/module/order/service/impl/OOrderServiceImpl.java b/module/order/src/main/java/cn/qihangerp/module/order/service/impl/OOrderServiceImpl.java index 4b7c20a7..5ad7a8a6 100644 --- a/module/order/src/main/java/cn/qihangerp/module/order/service/impl/OOrderServiceImpl.java +++ b/module/order/src/main/java/cn/qihangerp/module/order/service/impl/OOrderServiceImpl.java @@ -1,8 +1,6 @@ package cn.qihangerp.module.order.service.impl; -import cn.qihangerp.common.bo.ShipOrderAllocateShipBo; -import cn.qihangerp.common.bo.ShopOrderShipBo; import cn.qihangerp.domain.OLogisticsCompany; import cn.qihangerp.module.goods.domain.OGoods; import cn.qihangerp.module.goods.domain.OGoodsSku; diff --git a/module/shop/src/main/resources/mapper/OLogisticsCompanyMapper.xml b/module/shop/src/main/resources/mapper/OLogisticsCompanyMapper.xml index a0ac8e32..21af5b21 100644 --- a/module/shop/src/main/resources/mapper/OLogisticsCompanyMapper.xml +++ b/module/shop/src/main/resources/mapper/OLogisticsCompanyMapper.xml @@ -4,7 +4,7 @@ "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> - + diff --git a/module/shop/src/main/resources/mapper/OShopMapper.xml b/module/shop/src/main/resources/mapper/OShopMapper.xml index 3cb31d53..373761d8 100644 --- a/module/shop/src/main/resources/mapper/OShopMapper.xml +++ b/module/shop/src/main/resources/mapper/OShopMapper.xml @@ -4,7 +4,7 @@ "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> - + diff --git a/module/shop/src/main/resources/mapper/OShopPlatformMapper.xml b/module/shop/src/main/resources/mapper/OShopPlatformMapper.xml index d156cd0f..811f8eef 100644 --- a/module/shop/src/main/resources/mapper/OShopPlatformMapper.xml +++ b/module/shop/src/main/resources/mapper/OShopPlatformMapper.xml @@ -4,7 +4,7 @@ "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> - + diff --git a/module/shop/src/main/resources/mapper/OShopPullLasttimeMapper.xml b/module/shop/src/main/resources/mapper/OShopPullLasttimeMapper.xml index 2ea3d101..306ed8f2 100644 --- a/module/shop/src/main/resources/mapper/OShopPullLasttimeMapper.xml +++ b/module/shop/src/main/resources/mapper/OShopPullLasttimeMapper.xml @@ -4,7 +4,7 @@ "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> - + diff --git a/module/shop/src/main/resources/mapper/OShopPullLogsMapper.xml b/module/shop/src/main/resources/mapper/OShopPullLogsMapper.xml index 3c35f738..e7228fab 100644 --- a/module/shop/src/main/resources/mapper/OShopPullLogsMapper.xml +++ b/module/shop/src/main/resources/mapper/OShopPullLogsMapper.xml @@ -4,7 +4,7 @@ "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> - + diff --git a/module/shop/src/main/resources/mapper/SysTaskLogsMapper.xml b/module/shop/src/main/resources/mapper/SysTaskLogsMapper.xml index 3825b032..c8e527b9 100644 --- a/module/shop/src/main/resources/mapper/SysTaskLogsMapper.xml +++ b/module/shop/src/main/resources/mapper/SysTaskLogsMapper.xml @@ -4,7 +4,7 @@ "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> - + diff --git a/module/shop/src/main/resources/mapper/SysTaskMapper.xml b/module/shop/src/main/resources/mapper/SysTaskMapper.xml index 5a981cec..eb51a934 100644 --- a/module/shop/src/main/resources/mapper/SysTaskMapper.xml +++ b/module/shop/src/main/resources/mapper/SysTaskMapper.xml @@ -4,7 +4,7 @@ "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> - + diff --git a/module/sys/src/main/resources/mapper/SysDictDataMapper.xml b/module/sys/src/main/resources/mapper/SysDictDataMapper.xml index 249809dd..6b21897e 100644 --- a/module/sys/src/main/resources/mapper/SysDictDataMapper.xml +++ b/module/sys/src/main/resources/mapper/SysDictDataMapper.xml @@ -4,7 +4,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> - + @@ -25,7 +25,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" from sys_dict_data - @@ -41,7 +41,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" order by dict_sort asc - where status = '0' and dict_type = #{dictType} order by dict_sort asc @@ -71,7 +71,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - + update sys_dict_data dict_sort = #{dictSort}, @@ -93,7 +93,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" update sys_dict_data set dict_type = #{newDictType} where dict_type = #{oldDictType} - + insert into sys_dict_data( dict_sort, dict_label, diff --git a/module/sys/src/main/resources/mapper/SysRoleMapper.xml b/module/sys/src/main/resources/mapper/SysRoleMapper.xml index cf15f10c..262a2cc4 100644 --- a/module/sys/src/main/resources/mapper/SysRoleMapper.xml +++ b/module/sys/src/main/resources/mapper/SysRoleMapper.xml @@ -4,7 +4,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> - + @@ -30,7 +30,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" left join sys_dept d on u.dept_id = d.dept_id - where r.del_flag = '0' @@ -93,7 +93,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" where r.role_key=#{roleKey} and r.del_flag = '0' limit 1 - + insert into sys_role( role_id, role_name, @@ -121,7 +121,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" ) - + update sys_role role_name = #{roleName}, diff --git a/module/sys/src/main/resources/mapper/SysUserMapper.xml b/module/sys/src/main/resources/mapper/SysUserMapper.xml index 152c2fdc..20ea986e 100644 --- a/module/sys/src/main/resources/mapper/SysUserMapper.xml +++ b/module/sys/src/main/resources/mapper/SysUserMapper.xml @@ -4,7 +4,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> - + @@ -38,7 +38,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - select u.user_id, u.dept_id, u.nick_name, u.user_name, u.email, u.avatar, u.phonenumber, u.sex, u.status, u.del_flag, u.login_ip, u.login_date, u.create_by, u.create_time, u.remark, d.dept_name, d.leader from sys_user u left join sys_dept d on u.dept_id = d.dept_id where u.del_flag = '0' @@ -67,7 +67,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" ${params.dataScope} - select distinct u.user_id, u.dept_id, u.user_name, u.nick_name, u.email, u.phonenumber, u.status, u.create_time from sys_user u left join sys_dept d on u.dept_id = d.dept_id @@ -84,7 +84,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" ${params.dataScope} - select distinct u.user_id, u.dept_id, u.user_name, u.nick_name, u.email, u.phonenumber, u.status, u.create_time from sys_user u left join sys_dept d on u.dept_id = d.dept_id @@ -124,7 +124,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" select user_id, email from sys_user where email = #{email} and del_flag = '0' limit 1 - + insert into sys_user( user_id, dept_id, @@ -156,7 +156,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" ) - + update sys_user dept_id = #{deptId}, @@ -177,15 +177,15 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" where user_id = #{userId} - + update sys_user set status = #{status} where user_id = #{userId} - + update sys_user set avatar = #{avatar} where user_name = #{userName} - + update sys_user set password = #{password} where user_name = #{userName} diff --git a/pom.xml b/pom.xml index 05d08ca1..7bdb5f73 100644 --- a/pom.xml +++ b/pom.xml @@ -14,6 +14,7 @@ core module microservices + core/model diff --git a/vue/src/assets/images/login-background.jpg b/vue/src/assets/images/login-background.jpg deleted file mode 100644 index 8a89eb82..00000000 Binary files a/vue/src/assets/images/login-background.jpg and /dev/null differ diff --git a/vue/src/assets/images/pay.png b/vue/src/assets/images/pay.png deleted file mode 100644 index bb8b9672..00000000 Binary files a/vue/src/assets/images/pay.png and /dev/null differ diff --git a/vue/src/assets/images/profile.gif b/vue/src/assets/images/profile.gif new file mode 100644 index 00000000..fdbd32c6 Binary files /dev/null and b/vue/src/assets/images/profile.gif differ diff --git a/vue/src/store/modules/user.js b/vue/src/store/modules/user.js index ab0a6fea..96cc90d5 100644 --- a/vue/src/store/modules/user.js +++ b/vue/src/store/modules/user.js @@ -51,7 +51,7 @@ const user = { return new Promise((resolve, reject) => { getInfo().then(res => { const user = res.user - const avatar = (user.avatar == "" || user.avatar == null) ? require("@/assets/images/profile.jpg") : process.env.VUE_APP_BASE_API + user.avatar; + const avatar = (user.avatar == "" || user.avatar == null) ? require("@/assets/images/profile.gif") : process.env.VUE_APP_BASE_API + user.avatar; if (res.roles && res.roles.length > 0) { // 验证返回的roles是否是一个非空数组 commit('SET_ROLES', res.roles) commit('SET_PERMISSIONS', res.permissions) diff --git a/vue/src/views/index22.vue b/vue/src/views/index22.vue deleted file mode 100644 index d2d2ec63..00000000 --- a/vue/src/views/index22.vue +++ /dev/null @@ -1,98 +0,0 @@ - - - - - diff --git a/vue/src/views/login2.vue b/vue/src/views/login2.vue deleted file mode 100644 index 9d04efe0..00000000 --- a/vue/src/views/login2.vue +++ /dev/null @@ -1,207 +0,0 @@ - - - - -