angelo
/
java-base-app
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

## 调整部分国际化；调整打包配置；

This commit is contained in:
cabbage 2025-04-06 09:42:17 +08:00
parent ebd37ee2af
commit afd9c4f933
38 changed files with 217 additions and 353 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
code-util/pom.xml
View File

@ -4,9 +4,9 @@
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>com.hzs</groupId>
<groupId>com.bd</groupId>
<artifactId>hzs</artifactId>
<version>3.0.0-SNAPSHOT</version>
<version>1.0.0-SNAPSHOT</version>
</parent>
<artifactId>code-util</artifactId>

6
hzs-api-lenjoy/hzs-api-lenjoy-member/pom.xml
View File

@ -5,9 +5,9 @@
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>com.hzs</groupId>
<groupId>com.bd</groupId>
<artifactId>hzs-api-lenjoy</artifactId>
<version>3.0.0-SNAPSHOT</version>
<version>1.0.0-SNAPSHOT</version>
</parent>
<artifactId>hzs-api-lenjoy-member</artifactId>
@ -19,7 +19,7 @@
<dependencies>
<dependency>
<groupId>com.hzs</groupId>
<groupId>com.bd</groupId>
<artifactId>hzs-api-system</artifactId>
</dependency>

6
hzs-api-lenjoy/hzs-api-lenjoy-sale/pom.xml
View File

@ -5,9 +5,9 @@
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>com.hzs</groupId>
<groupId>com.bd</groupId>
<artifactId>hzs-api-lenjoy</artifactId>
<version>3.0.0-SNAPSHOT</version>
<version>1.0.0-SNAPSHOT</version>
</parent>
<artifactId>hzs-api-lenjoy-sale</artifactId>
@ -19,7 +19,7 @@
<dependencies>
<dependency>
<groupId>com.hzs</groupId>
<groupId>com.bd</groupId>
<artifactId>hzs-api-system</artifactId>
</dependency>

6
hzs-api-lenjoy/pom.xml
View File

@ -4,9 +4,9 @@
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>com.hzs</groupId>
<groupId>com.bd</groupId>
<artifactId>hzs</artifactId>
<version>3.0.0-SNAPSHOT</version>
<version>1.0.0-SNAPSHOT</version>
</parent>
<artifactId>hzs-api-lenjoy</artifactId>
@ -21,7 +21,7 @@
<!-- hzs common domain-->
<dependency>
<groupId>com.hzs</groupId>
<groupId>com.bd</groupId>
<artifactId>hzs-common-domain</artifactId>
</dependency>

6
hzs-api/hzs-api-activity/pom.xml
View File

@ -5,9 +5,9 @@
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>com.hzs</groupId>
<groupId>com.bd</groupId>
<artifactId>hzs-api</artifactId>
<version>3.0.0-SNAPSHOT</version>
<version>1.0.0-SNAPSHOT</version>
</parent>
<artifactId>hzs-api-activity</artifactId>
@ -19,7 +19,7 @@
<dependencies>
<dependency>
<groupId>com.hzs</groupId>
<groupId>com.bd</groupId>
<artifactId>hzs-api-system</artifactId>
</dependency>

6
hzs-api/hzs-api-bonus/pom.xml
View File

@ -5,9 +5,9 @@
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>com.hzs</groupId>
<groupId>com.bd</groupId>
<artifactId>hzs-api</artifactId>
<version>3.0.0-SNAPSHOT</version>
<version>1.0.0-SNAPSHOT</version>
</parent>
<artifactId>hzs-api-bonus</artifactId>
@ -19,7 +19,7 @@
<dependencies>
<dependency>
<groupId>com.hzs</groupId>
<groupId>com.bd</groupId>
<artifactId>hzs-api-system</artifactId>
</dependency>

6
hzs-api/hzs-api-member/pom.xml
View File

@ -5,9 +5,9 @@
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>com.hzs</groupId>
<groupId>com.bd</groupId>
<artifactId>hzs-api</artifactId>
<version>3.0.0-SNAPSHOT</version>
<version>1.0.0-SNAPSHOT</version>
</parent>
<artifactId>hzs-api-member</artifactId>
@ -19,7 +19,7 @@
<dependencies>
<dependency>
<groupId>com.hzs</groupId>
<groupId>com.bd</groupId>
<artifactId>hzs-api-system</artifactId>
</dependency>

6
hzs-api/hzs-api-report/pom.xml
View File

@ -5,9 +5,9 @@
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>com.hzs</groupId>
<groupId>com.bd</groupId>
<artifactId>hzs-api</artifactId>
<version>3.0.0-SNAPSHOT</version>
<version>1.0.0-SNAPSHOT</version>
</parent>
<artifactId>hzs-api-report</artifactId>
@ -18,7 +18,7 @@
<dependencies>
<dependency>
<groupId>com.hzs</groupId>
<groupId>com.bd</groupId>
<artifactId>hzs-api-system</artifactId>
</dependency>
</dependencies>

6
hzs-api/hzs-api-sale/pom.xml
View File

@ -5,9 +5,9 @@
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>com.hzs</groupId>
<groupId>com.bd</groupId>
<artifactId>hzs-api</artifactId>
<version>3.0.0-SNAPSHOT</version>
<version>1.0.0-SNAPSHOT</version>
</parent>
<artifactId>hzs-api-sale</artifactId>
@ -19,7 +19,7 @@
<dependencies>
<dependency>
<groupId>com.hzs</groupId>
<groupId>com.bd</groupId>
<artifactId>hzs-api-system</artifactId>
</dependency>

8
hzs-api/hzs-api-scm/pom.xml
View File

@ -5,9 +5,9 @@
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>com.hzs</groupId>
<groupId>com.bd</groupId>
<artifactId>hzs-api</artifactId>
<version>3.0.0-SNAPSHOT</version>
<version>1.0.0-SNAPSHOT</version>
</parent>
<artifactId>hzs-api-scm</artifactId>
@ -19,11 +19,11 @@
<dependencies>
<dependency>
<groupId>com.hzs</groupId>
<groupId>com.bd</groupId>
<artifactId>hzs-api-system</artifactId>
</dependency>
<dependency>
<groupId>com.hzs</groupId>
<groupId>com.bd</groupId>
<artifactId>hzs-common-domain</artifactId>
</dependency>

4
hzs-api/hzs-api-system/pom.xml
View File

@ -5,9 +5,9 @@
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>com.hzs</groupId>
<groupId>com.bd</groupId>
<artifactId>hzs-api</artifactId>
<version>3.0.0-SNAPSHOT</version>
<version>1.0.0-SNAPSHOT</version>
</parent>
<artifactId>hzs-api-system</artifactId>

6
hzs-api/hzs-api-third/pom.xml
View File

@ -5,9 +5,9 @@
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>com.hzs</groupId>
<groupId>com.bd</groupId>
<artifactId>hzs-api</artifactId>
<version>3.0.0-SNAPSHOT</version>
<version>1.0.0-SNAPSHOT</version>
</parent>
<artifactId>hzs-api-third</artifactId>
@ -19,7 +19,7 @@
<dependencies>
<dependency>
<groupId>com.hzs</groupId>
<groupId>com.bd</groupId>
<artifactId>hzs-api-system</artifactId>
</dependency>

6
hzs-api/pom.xml
View File

@ -4,9 +4,9 @@
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>com.hzs</groupId>
<groupId>com.bd</groupId>
<artifactId>hzs</artifactId>
<version>3.0.0-SNAPSHOT</version>
<version>1.0.0-SNAPSHOT</version>
</parent>
<artifactId>hzs-api</artifactId>
@ -21,7 +21,7 @@
<!-- hzs common domain-->
<dependency>
<groupId>com.hzs</groupId>
<groupId>com.bd</groupId>
<artifactId>hzs-common-domain</artifactId>
</dependency>

16
hzs-business-lenjoy/hzs-business-lenjoy-member/pom.xml
View File

@ -5,9 +5,9 @@
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>com.hzs</groupId>
<groupId>com.bd</groupId>
<artifactId>hzs-business-lenjoy</artifactId>
<version>3.0.0-SNAPSHOT</version>
<version>1.0.0-SNAPSHOT</version>
</parent>
<artifactId>hzs-business-lenjoy-member</artifactId>
@ -20,36 +20,36 @@
<!-- 会员服务接口 -->
<dependency>
<groupId>com.hzs</groupId>
<groupId>com.bd</groupId>
<artifactId>hzs-api-lenjoy-member</artifactId>
</dependency>
<!-- 业务服务公共 -->
<dependency>
<groupId>com.hzs</groupId>
<groupId>com.bd</groupId>
<artifactId>hzs-business-common</artifactId>
</dependency>
<!-- 系统服务接口 -->
<dependency>
<groupId>com.hzs</groupId>
<groupId>com.bd</groupId>
<artifactId>hzs-api-system</artifactId>
</dependency>
<!-- 乐享销售服务接口 -->
<dependency>
<groupId>com.hzs</groupId>
<groupId>com.bd</groupId>
<artifactId>hzs-api-lenjoy-sale</artifactId>
</dependency>
<!-- 三方服务 -->
<dependency>
<groupId>com.hzs</groupId>
<groupId>com.bd</groupId>
<artifactId>hzs-api-third</artifactId>
</dependency>
<dependency>
<groupId>com.hzs</groupId>
<groupId>com.bd</groupId>
<artifactId>hzs-common-aop</artifactId>
</dependency>

16
hzs-business-lenjoy/hzs-business-lenjoy-sale/pom.xml
View File

@ -5,9 +5,9 @@
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>com.hzs</groupId>
<groupId>com.bd</groupId>
<artifactId>hzs-business-lenjoy</artifactId>
<version>3.0.0-SNAPSHOT</version>
<version>1.0.0-SNAPSHOT</version>
</parent>
<artifactId>hzs-business-lenjoy-sale</artifactId>
@ -20,13 +20,13 @@
<!-- 销售服务接口 -->
<dependency>
<groupId>com.hzs</groupId>
<groupId>com.bd</groupId>
<artifactId>hzs-api-lenjoy-sale</artifactId>
</dependency>
<!-- 业务服务公共 -->
<dependency>
<groupId>com.hzs</groupId>
<groupId>com.bd</groupId>
<artifactId>hzs-business-common</artifactId>
</dependency>
@ -38,25 +38,25 @@
<!-- 销售服务 -->
<dependency>
<groupId>com.hzs</groupId>
<groupId>com.bd</groupId>
<artifactId>hzs-api-sale</artifactId>
</dependency>
<!-- scm 服务 -->
<dependency>
<groupId>com.hzs</groupId>
<groupId>com.bd</groupId>
<artifactId>hzs-api-scm</artifactId>
</dependency>
<!-- 乐享海购会员服务 -->
<dependency>
<groupId>com.hzs</groupId>
<groupId>com.bd</groupId>
<artifactId>hzs-api-lenjoy-member</artifactId>
</dependency>
<!-- 三方服务接口 -->
<dependency>
<groupId>com.hzs</groupId>
<groupId>com.bd</groupId>
<artifactId>hzs-api-third</artifactId>
</dependency>

8
hzs-business-lenjoy/pom.xml
View File

@ -4,9 +4,9 @@
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>com.hzs</groupId>
<groupId>com.bd</groupId>
<artifactId>hzs</artifactId>
<version>3.0.0-SNAPSHOT</version>
<version>1.0.0-SNAPSHOT</version>
</parent>
<artifactId>hzs-business-lenjoy</artifactId>
@ -57,7 +57,7 @@
<!-- hzs common security-->
<dependency>
<groupId>com.hzs</groupId>
<groupId>com.bd</groupId>
<artifactId>hzs-common-security</artifactId>
</dependency>
@ -69,7 +69,7 @@
<!-- 切面逻辑处理 -->
<dependency>
<groupId>com.hzs</groupId>
<groupId>com.bd</groupId>
<artifactId>hzs-common-aop</artifactId>
</dependency>

16
hzs-business/hzs-business-bonus/pom.xml
View File

@ -5,9 +5,9 @@
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>com.hzs</groupId>
<groupId>com.bd</groupId>
<artifactId>hzs-business</artifactId>
<version>3.0.0-SNAPSHOT</version>
<version>1.0.0-SNAPSHOT</version>
</parent>
<artifactId>hzs-business-bonus</artifactId>
@ -19,35 +19,35 @@
<dependencies>
<dependency>
<groupId>com.hzs</groupId>
<groupId>com.bd</groupId>
<artifactId>hzs-business-common</artifactId>
</dependency>
<!-- 订单服务接口 -->
<dependency>
<groupId>com.hzs</groupId>
<groupId>com.bd</groupId>
<artifactId>hzs-api-sale</artifactId>
</dependency>
<!-- 三方服务 -->
<dependency>
<groupId>com.hzs</groupId>
<groupId>com.bd</groupId>
<artifactId>hzs-api-third</artifactId>
</dependency>
<!-- 活动服务
<dependency>
<groupId>com.hzs</groupId>
<groupId>com.bd</groupId>
<artifactId>hzs-api-activity</artifactId>
</dependency>
-->
<dependency>
<groupId>com.hzs</groupId>
<groupId>com.bd</groupId>
<artifactId>hzs-common-aop</artifactId>
</dependency>
<dependency>
<groupId>com.hzs</groupId>
<groupId>com.bd</groupId>
<artifactId>hzs-api-bonus</artifactId>
</dependency>

6
hzs-business/hzs-business-common/pom.xml
View File

@ -4,8 +4,8 @@
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<parent>
<artifactId>hzs-business</artifactId>
<groupId>com.hzs</groupId>
<version>3.0.0-SNAPSHOT</version>
<groupId>com.bd</groupId>
<version>1.0.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
@ -18,7 +18,7 @@
<dependencies>
<dependency>
<groupId>com.hzs</groupId>
<groupId>com.bd</groupId>
<artifactId>hzs-common-domain</artifactId>
</dependency>

18
hzs-business/hzs-business-member/pom.xml
View File

@ -5,9 +5,9 @@
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>com.hzs</groupId>
<groupId>com.bd</groupId>
<artifactId>hzs-business</artifactId>
<version>3.0.0-SNAPSHOT</version>
<version>1.0.0-SNAPSHOT</version>
</parent>
<artifactId>hzs-business-member</artifactId>
@ -19,41 +19,41 @@
<dependencies>
<dependency>
<groupId>com.hzs</groupId>
<groupId>com.bd</groupId>
<artifactId>hzs-business-common</artifactId>
</dependency>
<!-- 会员服务接口 -->
<dependency>
<groupId>com.hzs</groupId>
<groupId>com.bd</groupId>
<artifactId>hzs-api-member</artifactId>
</dependency>
<!-- 系统服务接口 -->
<dependency>
<groupId>com.hzs</groupId>
<groupId>com.bd</groupId>
<artifactId>hzs-api-system</artifactId>
</dependency>
<!-- 订单服务接口 -->
<dependency>
<groupId>com.hzs</groupId>
<groupId>com.bd</groupId>
<artifactId>hzs-api-sale</artifactId>
</dependency>
<dependency>
<groupId>com.hzs</groupId>
<groupId>com.bd</groupId>
<artifactId>hzs-common-aop</artifactId>
</dependency>
<dependency>
<groupId>com.hzs</groupId>
<groupId>com.bd</groupId>
<artifactId>hzs-api-third</artifactId>
</dependency>
<!-- 活动服务接口
<dependency>
<groupId>com.hzs</groupId>
<groupId>com.bd</groupId>
<artifactId>hzs-api-activity</artifactId>
</dependency>
-->

21
hzs-business/hzs-business-member/src/main/java/com/hzs/member/base/controller/manage/CuMemberTeamController.java
View File

@ -22,6 +22,7 @@ import com.hzs.common.util.TransactionUtils;
import com.hzs.member.base.IMemberServiceApi;
import com.hzs.member.base.service.ICuMemberTeamService;
import com.hzs.member.base.vo.CuMemberTeamVO;
import com.hzs.system.base.ITransactionServiceApi;
import org.apache.dubbo.config.annotation.DubboReference;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
@ -45,6 +46,8 @@ public class CuMemberTeamController extends BaseController {
@DubboReference
IMemberServiceApi iMemberServiceApi;
@DubboReference
ITransactionServiceApi iTransactionServiceApi;
private RedisService redisService;
@ -144,6 +147,10 @@ public class CuMemberTeamController extends BaseController {
return AjaxResult.error(TransactionUtils.getContent(ConfigMsgConstants.MEMBER_CODE_REPEAT));
}
cuMemberTeam.setPkMember(member.getData().getPkId());
//字段翻译保存到数据库
R<Integer> pkTransaction = iTransactionServiceApi.createTransaction(pkCountry, ETransactionKey.MEMBER,
cuMemberTeam.getTeamName(), EYesNo.NO, EYesNo.NO);
cuMemberTeam.setPkTransaction(pkTransaction.getData());
cuMemberTeam.setPkCountry(SecurityUtils.getPkCountry());
cuMemberTeam.setPkCreator(SecurityUtils.getUserId());
cuMemberTeam.setCreationTime(new Date());
@ -187,6 +194,15 @@ public class CuMemberTeamController extends BaseController {
return AjaxResult.error(TransactionUtils.getContent(ConfigMsgConstants.MEMBER_CODE_REPEAT));
}
cuMemberTeam.setPkMember(member.getData().getPkId());
if (null != cuMemberTeam.getPkTransaction()) {
iTransactionServiceApi.updateTransaction(pkCountry,
cuMemberTeam.getTeamName(), cuMemberTeam.getPkTransaction(), true);
} else {
//字段翻译保存到数据库
R<Integer> pkTransaction = iTransactionServiceApi.createTransaction(pkCountry, ETransactionKey.MEMBER,
cuMemberTeam.getTeamName(), EYesNo.NO, EYesNo.NO);
cuMemberTeam.setPkTransaction(pkTransaction.getData());
}
cuMemberTeam.setPkModified(SecurityUtils.getUserId());
cuMemberTeam.setModifiedTime(new Date());
redisService.deleteObjectByKey(CacheConstants.CU_MEMBER_TEAM + pkCountry);
@ -227,6 +243,11 @@ public class CuMemberTeamController extends BaseController {
updateWrapper.set("DEL_FLAG", EDelFlag.DELETE.getValue());
updateWrapper.set("PK_MODIFIED", SecurityUtils.getUserId());
updateWrapper.set("MODIFIED_TIME", new Date());
//删除翻译
CuMemberTeam memberTeam = cuMemberTeamService.getById(pkId);
List<Long> pkIdList = new ArrayList<>();
pkIdList.add(memberTeam.getPkTransaction().longValue());
iTransactionServiceApi.removeTransactionByPkId(pkIdList);
redisService.deleteObjectByKey(CacheConstants.CU_MEMBER_TEAM + SecurityUtils.getPkCountry());
return toAjax(cuMemberTeamService.update(updateWrapper));
}

10
hzs-business/hzs-business-report/pom.xml
View File

@ -5,9 +5,9 @@
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>com.hzs</groupId>
<groupId>com.bd</groupId>
<artifactId>hzs-business</artifactId>
<version>3.0.0-SNAPSHOT</version>
<version>1.0.0-SNAPSHOT</version>
</parent>
<artifactId>hzs-business-report</artifactId>
@ -20,18 +20,18 @@
<!-- 报表服务接口 -->
<dependency>
<groupId>com.hzs</groupId>
<groupId>com.bd</groupId>
<artifactId>hzs-api-report</artifactId>
</dependency>
<dependency>
<groupId>com.hzs</groupId>
<groupId>com.bd</groupId>
<artifactId>hzs-api-sale</artifactId>
</dependency>
<!-- 业务服务公共 -->
<dependency>
<groupId>com.hzs</groupId>
<groupId>com.bd</groupId>
<artifactId>hzs-business-common</artifactId>
</dependency>

16
hzs-business/hzs-business-sale/pom.xml
View File

@ -5,9 +5,9 @@
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>com.hzs</groupId>
<groupId>com.bd</groupId>
<artifactId>hzs-business</artifactId>
<version>3.0.0-SNAPSHOT</version>
<version>1.0.0-SNAPSHOT</version>
</parent>
<artifactId>hzs-business-sale</artifactId>
@ -20,19 +20,19 @@
<!-- 销售服务接口 -->
<dependency>
<groupId>com.hzs</groupId>
<groupId>com.bd</groupId>
<artifactId>hzs-api-sale</artifactId>
</dependency>
<!-- 三方服务接口 -->
<dependency>
<groupId>com.hzs</groupId>
<groupId>com.bd</groupId>
<artifactId>hzs-api-third</artifactId>
</dependency>
<!-- 业务服务公共 -->
<dependency>
<groupId>com.hzs</groupId>
<groupId>com.bd</groupId>
<artifactId>hzs-business-common</artifactId>
</dependency>
@ -44,18 +44,18 @@
<!-- 活动服务接口
<dependency>
<groupId>com.hzs</groupId>
<groupId>com.bd</groupId>
<artifactId>hzs-api-activity</artifactId>
</dependency>
-->
<dependency>
<groupId>com.hzs</groupId>
<groupId>com.bd</groupId>
<artifactId>hzs-api-bonus</artifactId>
</dependency>
<!-- scm 服务 -->
<dependency>
<groupId>com.hzs</groupId>
<groupId>com.bd</groupId>
<artifactId>hzs-api-scm</artifactId>
</dependency>
</dependencies>

11
hzs-business/hzs-business-sale/src/main/java/com/hzs/sale/product/service/impl/BdAreaClassifyServiceImpl.java
View File

@ -4,7 +4,10 @@ import cn.hutool.core.bean.BeanUtil;
import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.hzs.common.core.constant.CacheConstants;
import com.hzs.common.core.domain.R;
import com.hzs.common.core.enums.EDelFlag;
import com.hzs.common.core.enums.ETransactionKey;
import com.hzs.common.core.enums.EYesNo;
import com.hzs.common.core.service.RedisService;
import com.hzs.common.domain.sale.product.BdAreaClassify;
import com.hzs.common.domain.sale.product.BdAreaClassifySpecialArea;
@ -14,7 +17,9 @@ import com.hzs.sale.product.mapper.BdAreaClassifyMapper;
import com.hzs.sale.product.service.IBdAreaClassifyService;
import com.hzs.sale.product.service.IBdAreaClassifySpecialAreaService;
import com.hzs.sale.product.vo.AreaClassifyVo;
import com.hzs.system.base.ITransactionServiceApi;
import com.hzs.system.sys.dto.LoginUser;
import org.apache.dubbo.config.annotation.DubboReference;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
@ -38,6 +43,8 @@ public class BdAreaClassifyServiceImpl extends ServiceImpl<BdAreaClassifyMapper,
private IBdAreaClassifyService areaClassifyService;
@Autowired
private IBdAreaClassifySpecialAreaService areaClassifySpecialAreaService;
@DubboReference
ITransactionServiceApi transactionServiceApi;
/**
* 新增商品分类
@ -52,6 +59,8 @@ public class BdAreaClassifyServiceImpl extends ServiceImpl<BdAreaClassifyMapper,
areaClassify.setPkCreator(loginUser.getUserId());
areaClassify.setCreationTime(new Date());
areaClassify.setPkCountry(loginUser.getDataCountry());
R<Integer> transaction = transactionServiceApi.createTransaction(loginUser.getDataCountry(), ETransactionKey.SPEC, areaClassify.getClassifyName(), EYesNo.NO, EYesNo.NO);
areaClassify.setPkTransactionKey(transaction.getData());
baseMapper.insert(areaClassify);
List<BdAreaClassifySpecialArea> list = new ArrayList<>();
if (areaClassifyParam.getSpecialAreaList() != null) {
@ -84,6 +93,8 @@ public class BdAreaClassifyServiceImpl extends ServiceImpl<BdAreaClassifyMapper,
BdAreaClassify areaClassify = BeanUtil.copyProperties(areaClassifyParam, BdAreaClassify.class);
areaClassify.setPkModified(loginUser.getUserId());
areaClassify.setModifiedTime(new Date());
R<Integer> transaction = transactionServiceApi.createTransaction(loginUser.getDataCountry(), ETransactionKey.SPEC, areaClassify.getClassifyName(), EYesNo.NO, EYesNo.NO);
areaClassify.setPkTransactionKey(transaction.getData());
baseMapper.updateById(areaClassify);
// 清空 中间表数据重新添加
areaClassifySpecialAreaService.deleteByAreaClassifyPk(areaClassify.getPkId());

14
hzs-business/hzs-business-scm/pom.xml
View File

@ -5,9 +5,9 @@
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>com.hzs</groupId>
<groupId>com.bd</groupId>
<artifactId>hzs-business</artifactId>
<version>3.0.0-SNAPSHOT</version>
<version>1.0.0-SNAPSHOT</version>
</parent>
<artifactId>hzs-business-scm</artifactId>
@ -19,28 +19,28 @@
<dependencies>
<dependency>
<groupId>com.hzs</groupId>
<groupId>com.bd</groupId>
<artifactId>hzs-business-common</artifactId>
</dependency>
<!-- 订单服务接口 -->
<dependency>
<groupId>com.hzs</groupId>
<groupId>com.bd</groupId>
<artifactId>hzs-api-sale</artifactId>
</dependency>
<!-- 进销存服务接口 -->
<dependency>
<groupId>com.hzs</groupId>
<groupId>com.bd</groupId>
<artifactId>hzs-api-scm</artifactId>
</dependency>
<dependency>
<groupId>com.hzs</groupId>
<groupId>com.bd</groupId>
<artifactId>hzs-common-aop</artifactId>
</dependency>
<dependency>
<groupId>com.hzs</groupId>
<groupId>com.bd</groupId>
<artifactId>hzs-common-domain</artifactId>
</dependency>
<dependency>

20
hzs-business/hzs-business-system/pom.xml
View File

@ -5,9 +5,9 @@
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>com.hzs</groupId>
<groupId>com.bd</groupId>
<artifactId>hzs-business</artifactId>
<version>3.0.0-SNAPSHOT</version>
<version>1.0.0-SNAPSHOT</version>
</parent>
<artifactId>hzs-business-system</artifactId>
@ -20,50 +20,50 @@
<!-- 系统基础服务接口 -->
<dependency>
<groupId>com.hzs</groupId>
<groupId>com.bd</groupId>
<artifactId>hzs-api-system</artifactId>
</dependency>
<!-- 会员服务 -->
<dependency>
<groupId>com.hzs</groupId>
<groupId>com.bd</groupId>
<artifactId>hzs-api-member</artifactId>
</dependency>
<!-- 销售服务 -->
<dependency>
<groupId>com.hzs</groupId>
<groupId>com.bd</groupId>
<artifactId>hzs-api-sale</artifactId>
</dependency>
<!-- 三方服务接口 -->
<dependency>
<groupId>com.hzs</groupId>
<groupId>com.bd</groupId>
<artifactId>hzs-api-third</artifactId>
</dependency>
<!-- 活动服务接口
<dependency>
<groupId>com.hzs</groupId>
<groupId>com.bd</groupId>
<artifactId>hzs-api-activity</artifactId>
</dependency>
-->
<!-- 统计服务接口 -->
<dependency>
<groupId>com.hzs</groupId>
<groupId>com.bd</groupId>
<artifactId>hzs-api-report</artifactId>
</dependency>
<!-- 进销存服务 -->
<dependency>
<groupId>com.hzs</groupId>
<groupId>com.bd</groupId>
<artifactId>hzs-api-scm</artifactId>
</dependency>
<!-- 业务服务公共 -->
<dependency>
<groupId>com.hzs</groupId>
<groupId>com.bd</groupId>
<artifactId>hzs-business-common</artifactId>
</dependency>

7
hzs-business/hzs-business-system/src/main/java/com/hzs/system/config/controller/manage/BdBarCodeItemsController.java
View File

@ -10,7 +10,6 @@ import com.hzs.common.core.constant.EnumsPrefixConstants;
import com.hzs.common.core.constant.msg.ConfigMsgConstants;
import com.hzs.common.core.enums.*;
import com.hzs.common.core.exception.ServiceException;
import com.hzs.common.core.utils.BarcodeToPdfUtil;
import com.hzs.common.core.utils.DateUtils;
import com.hzs.common.core.utils.StringUtils;
import com.hzs.common.core.utils.poi.ExcelUtil;
@ -56,8 +55,6 @@ public class BdBarCodeItemsController extends BaseController {
@Autowired
private IBdBarCodeService barCodeService;
@Autowired
private BarcodeToPdfUtil barcodeToPdfUtil;
@Autowired
private ITransactionCommonService iTransactionCommonService;
/**
@ -165,8 +162,8 @@ public class BdBarCodeItemsController extends BaseController {
List<BdBarCodeItems> list = barCodeItemsService.list(querywrapper);
if(CollectionUtil.isNotEmpty(list)){
List<String> barcodes = list.stream().map(BdBarCodeItems::getBarCode).collect(Collectors.toList());
byte[] b =barcodeToPdfUtil.exportBarcodeToPdfBty(barcodes);
IoUtil.write(response.getOutputStream(),true,b);
// byte[] b =barcodeToPdfUtil.exportBarcodeToPdfBty(barcodes);
// IoUtil.write(response.getOutputStream(),true,b);
//打印完成后更改条形码表中status状态
for(BdBarCodeItems bbc: list){
bbc.setCodeStatus(EBarcodeStatus.PRINT.getValue());

8
hzs-business/pom.xml
View File

@ -4,9 +4,9 @@
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>com.hzs</groupId>
<groupId>com.bd</groupId>
<artifactId>hzs</artifactId>
<version>3.0.0-SNAPSHOT</version>
<version>1.0.0-SNAPSHOT</version>
</parent>
<artifactId>hzs-business</artifactId>
@ -57,7 +57,7 @@
<!-- hzs common security-->
<dependency>
<groupId>com.hzs</groupId>
<groupId>com.bd</groupId>
<artifactId>hzs-common-security</artifactId>
</dependency>
@ -69,7 +69,7 @@
<!-- 切面逻辑处理 -->
<dependency>
<groupId>com.hzs</groupId>
<groupId>com.bd</groupId>
<artifactId>hzs-common-aop</artifactId>
</dependency>

8
hzs-common/hzs-common-aop/pom.xml
View File

@ -5,9 +5,9 @@
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>com.hzs</groupId>
<groupId>com.bd</groupId>
<artifactId>hzs-common</artifactId>
<version>3.0.0-SNAPSHOT</version>
<version>1.0.0-SNAPSHOT</version>
</parent>
<artifactId>hzs-common-aop</artifactId>
@ -20,13 +20,13 @@
<!-- 核心模块 -->
<dependency>
<groupId>com.hzs</groupId>
<groupId>com.bd</groupId>
<artifactId>hzs-common-core</artifactId>
</dependency>
<!-- 系统基础服务接口 -->
<dependency>
<groupId>com.hzs</groupId>
<groupId>com.bd</groupId>
<artifactId>hzs-api-system</artifactId>
</dependency>

7
hzs-common/hzs-common-core/pom.xml
View File

@ -5,9 +5,9 @@
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>com.hzs</groupId>
<groupId>com.bd</groupId>
<artifactId>hzs-common</artifactId>
<version>3.0.0-SNAPSHOT</version>
<version>1.0.0-SNAPSHOT</version>
</parent>
<artifactId>hzs-common-core</artifactId>
@ -170,11 +170,12 @@
<artifactId>hutool-all</artifactId>
</dependency>
<!-- 打印条形码-->
<!-- 打印条形码
<dependency>
<groupId>com.itextpdf</groupId>
<artifactId>itext7-core</artifactId>
</dependency>
-->
<!-- google 图形生成 -->
<dependency>

172
hzs-common/hzs-common-core/src/main/java/com/hzs/common/core/utils/BarcodeToPdfUtil.java
View File

@ -1,172 +0,0 @@
package com.hzs.common.core.utils;
import com.itextpdf.barcodes.Barcode128;
import com.itextpdf.kernel.colors.ColorConstants;
import com.itextpdf.kernel.geom.PageSize;
import com.itextpdf.kernel.pdf.PdfDocument;
import com.itextpdf.kernel.pdf.PdfPage;
import com.itextpdf.kernel.pdf.PdfWriter;
import com.itextpdf.kernel.pdf.canvas.PdfCanvas;
import com.itextpdf.kernel.pdf.xobject.PdfFormXObject;
import com.itextpdf.layout.element.Image;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.stereotype.Component;
import java.io.ByteArrayOutputStream;
import java.io.File;
import java.util.ArrayList;
import java.util.List;
/**
* @author: sui q
* @time: 2021/12/20 16:47
* @description:
* @classname: TestIText
* @package_name: com.hzs.web.controller.manage
*/
@Component
public class BarcodeToPdfUtil {
@Value("${uploadfile.uploadFileUrl}")
private static String filePath;
// public final static String DEST = "/barcode/barcode.pdf";
public PdfFormXObject createBarcode(String code, PdfDocument pdfDoc) {
Barcode128 code128 = new Barcode128(pdfDoc);
code128.setCode("Barcode128 barcode");
code128.setSize(10f);
code128.setBarHeight(50f);
code128.setCode(code);
code128.setBaseline(10f);
code128.setCodeType(Barcode128.CODE128);
PdfFormXObject pdfFormXObject = code128.createFormXObject(ColorConstants.BLACK,
ColorConstants.BLACK,
pdfDoc);
return pdfFormXObject;
}
public Image createBarcodeImage(float mw, float mh, String code, PdfDocument pdfDoc) {
PdfFormXObject pdfFormXObject = createBarcode(code, pdfDoc);
Image image = new Image(pdfFormXObject).scale(mw, mh);
return image;
}
public String exportBarcodeToPdf(String path, List<String> barcodeList) {
try {
path = path + "/barcode.pdf";
File file = new File(path);
if(!file.getParentFile().exists()){
try {
file.getParentFile().mkdirs();
file.createNewFile();
} catch (Exception e) {
e.printStackTrace();
}
}
PdfDocument pdfDoc = new PdfDocument(new PdfWriter(path));
int n = barcodeList.size();
int startIndex = 0;
int endINdex;
while (n > 0) {
List<String> subList;
if (n > 100) {
endINdex = startIndex + 100;
subList = barcodeList.subList(startIndex, endINdex);
startIndex = endINdex;
} else {
endINdex = startIndex + n;
subList = barcodeList.subList(startIndex, endINdex);
}
PdfPage pdfPage = pdfDoc.addNewPage(new PageSize(530, 840));
Integer x = 0;
Integer y = 790;
for (int i = 1; i <= subList.size(); i++) {
PdfCanvas canvas = new PdfCanvas(pdfPage);
PdfFormXObject pdfFormXObject = createBarcode(subList.get(i-1), pdfDoc);
canvas.addXObject(pdfFormXObject, x * 135 + 3, y, 0.85f);
x++;
if (i % 4 == 0) {
x = 0;
y -= 32;
}
}
n -= 100;
}
pdfDoc.close();
} catch (Exception e) {
e.printStackTrace();
}
return path;
}
/**
* @description: 输出字节流
* @author: zhang jing
* @date: 2023/7/31 14:35
* @param: [barcodeList]
* @return: byte[]
**/
public byte[] exportBarcodeToPdfBty(List<String> barcodeList) {
ByteArrayOutputStream outputStream = new ByteArrayOutputStream();
try (PdfDocument pdfDoc = new PdfDocument(new PdfWriter(outputStream))) {
int n = barcodeList.size();
int startIndex = 0;
int endIndex;
while (n > 0) {
List<String> subList;
if (n > 100) {
endIndex = startIndex + 100;
subList = barcodeList.subList(startIndex, endIndex);
startIndex = endIndex;
} else {
endIndex = startIndex + n;
subList = barcodeList.subList(startIndex, endIndex);
}
PdfPage pdfPage = pdfDoc.addNewPage(new PageSize(530, 840));
Integer x = 0;
Integer y = 790;
for (int i = 1; i <= subList.size(); i++) {
PdfCanvas canvas = new PdfCanvas(pdfPage);
PdfFormXObject pdfFormXObject = createBarcode(subList.get(i - 1), pdfDoc);
canvas.addXObject(pdfFormXObject, x * 135 + 3, y, 0.85f);
x++;
if (i % 4 == 0) {
x = 0;
y -= 32;
}
}
n -= 100;
}
} catch (Exception e) {
e.printStackTrace();
}
return outputStream.toByteArray();
}
public static void main(String[] args) {
BarcodeToPdfUtil barcodeToPdf = new BarcodeToPdfUtil();
List<String> barcodeList = new ArrayList<>();
StringBuilder stringBuilder = new StringBuilder();
String code = "YTSJ2112";
Integer num = 600;
for (int i = 1; i <= num; i++) {
stringBuilder.setLength(0);
// 补零之后数字的总长度
int len = 15;
stringBuilder.append(code);
stringBuilder.append(i);
int temp = len - stringBuilder.length();
if (temp > 0) {
//若长度不足进行补零
while (stringBuilder.length() < len) {
stringBuilder.insert(code.length(), "0");
}
}
barcodeList.add(stringBuilder.toString());
}
barcodeToPdf.exportBarcodeToPdf(code, barcodeList);
}
}

6
hzs-common/hzs-common-domain/pom.xml
View File

@ -5,9 +5,9 @@
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>com.hzs</groupId>
<groupId>com.bd</groupId>
<artifactId>hzs-common</artifactId>
<version>3.0.0-SNAPSHOT</version>
<version>1.0.0-SNAPSHOT</version>
</parent>
<artifactId>hzs-common-domain</artifactId>
@ -21,7 +21,7 @@
<!-- hzs common core-->
<!-- 排除数据库链接相关 -->
<dependency>
<groupId>com.hzs</groupId>
<groupId>com.bd</groupId>
<artifactId>hzs-common-core</artifactId>
<exclusions>
<exclusion>

8
hzs-common/hzs-common-security/pom.xml
View File

@ -4,9 +4,9 @@
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>com.hzs</groupId>
<groupId>com.bd</groupId>
<artifactId>hzs-common</artifactId>
<version>3.0.0-SNAPSHOT</version>
<version>1.0.0-SNAPSHOT</version>
</parent>
<artifactId>hzs-common-security</artifactId>
@ -25,13 +25,13 @@
<!-- hzs Api system -->
<dependency>
<groupId>com.hzs</groupId>
<groupId>com.bd</groupId>
<artifactId>hzs-api-system</artifactId>
</dependency>
<!-- hzs Api member -->
<dependency>
<groupId>com.hzs</groupId>
<groupId>com.bd</groupId>
<artifactId>hzs-api-member</artifactId>
</dependency>

4
hzs-common/pom.xml
View File

@ -4,9 +4,9 @@
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>com.hzs</groupId>
<groupId>com.bd</groupId>
<artifactId>hzs</artifactId>
<version>3.0.0-SNAPSHOT</version>
<version>1.0.0-SNAPSHOT</version>
</parent>
<modules>

6
hzs-gateway/pom.xml
View File

@ -4,9 +4,9 @@
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>com.hzs</groupId>
<groupId>com.bd</groupId>
<artifactId>hzs</artifactId>
<version>3.0.0-SNAPSHOT</version>
<version>1.0.0-SNAPSHOT</version>
</parent>
<artifactId>hzs-gateway</artifactId>
@ -73,7 +73,7 @@
<!-- hzs common core-->
<dependency>
<groupId>com.hzs</groupId>
<groupId>com.bd</groupId>
<artifactId>hzs-common-core</artifactId>
</dependency>

2
hzs-gateway/src/main/resources/bootstrap.yml
View File

@ -29,6 +29,8 @@ spring:
shared-configs:
- application-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension}
## 业务模块依赖的公用配置（缓存、数据库、事务、mybatis-plus）
- business-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension}
## 业务模块依赖的公用配置（缓存、数据库、事务、mybatis-plus）
- business-gateway-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension}
sentinel:
# 取消控制台懒加载

16
hzs-shop/pom.xml
View File

@ -4,9 +4,9 @@
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>com.hzs</groupId>
<groupId>com.bd</groupId>
<artifactId>hzs</artifactId>
<version>3.0.0-SNAPSHOT</version>
<version>1.0.0-SNAPSHOT</version>
</parent>
<artifactId>hzs-shop</artifactId>
@ -54,13 +54,13 @@
<!-- hzs Common Security-->
<dependency>
<groupId>com.hzs</groupId>
<groupId>com.bd</groupId>
<artifactId>hzs-common-security</artifactId>
</dependency>
<!-- hzs common core-->
<dependency>
<groupId>com.hzs</groupId>
<groupId>com.bd</groupId>
<artifactId>hzs-common-core</artifactId>
</dependency>
@ -72,25 +72,25 @@
<!-- 切面逻辑处理 -->
<dependency>
<groupId>com.hzs</groupId>
<groupId>com.bd</groupId>
<artifactId>hzs-common-aop</artifactId>
</dependency>
<!-- 业务服务公共 -->
<dependency>
<groupId>com.hzs</groupId>
<groupId>com.bd</groupId>
<artifactId>hzs-business-common</artifactId>
</dependency>
<!-- 会员服务接口 -->
<dependency>
<groupId>com.hzs</groupId>
<groupId>com.bd</groupId>
<artifactId>hzs-api-member</artifactId>
</dependency>
<!-- 销售服务接口 -->
<dependency>
<groupId>com.hzs</groupId>
<groupId>com.bd</groupId>
<artifactId>hzs-api-sale</artifactId>
</dependency>

22
hzs-third/pom.xml
View File

@ -4,9 +4,9 @@
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>com.hzs</groupId>
<groupId>com.bd</groupId>
<artifactId>hzs</artifactId>
<version>3.0.0-SNAPSHOT</version>
<version>1.0.0-SNAPSHOT</version>
</parent>
<artifactId>hzs-third</artifactId>
@ -54,37 +54,37 @@
<!-- 三方服务接口 -->
<dependency>
<groupId>com.hzs</groupId>
<groupId>com.bd</groupId>
<artifactId>hzs-api-third</artifactId>
</dependency>
<!-- hzs Common Security-->
<dependency>
<groupId>com.hzs</groupId>
<groupId>com.bd</groupId>
<artifactId>hzs-common-security</artifactId>
</dependency>
<!-- hzs common core-->
<dependency>
<groupId>com.hzs</groupId>
<groupId>com.bd</groupId>
<artifactId>hzs-common-core</artifactId>
</dependency>
<!-- 销售服务接口 -->
<dependency>
<groupId>com.hzs</groupId>
<groupId>com.bd</groupId>
<artifactId>hzs-api-sale</artifactId>
</dependency>
<!-- 奖金服务接口-->
<dependency>
<groupId>com.hzs</groupId>
<groupId>com.bd</groupId>
<artifactId>hzs-api-bonus</artifactId>
</dependency>
<!-- 报表服务接口 -->
<dependency>
<groupId>com.hzs</groupId>
<groupId>com.bd</groupId>
<artifactId>hzs-api-report</artifactId>
</dependency>
@ -136,13 +136,13 @@
<!-- 切面逻辑处理 -->
<dependency>
<groupId>com.hzs</groupId>
<groupId>com.bd</groupId>
<artifactId>hzs-common-aop</artifactId>
</dependency>
<!-- 业务服务公共 -->
<dependency>
<groupId>com.hzs</groupId>
<groupId>com.bd</groupId>
<artifactId>hzs-business-common</artifactId>
</dependency>
@ -166,7 +166,7 @@
<!-- </dependency>-->
<dependency>
<groupId>com.hzs</groupId>
<groupId>com.bd</groupId>
<artifactId>hzs-api-scm</artifactId>
</dependency>

56
pom.xml
View File

@ -4,9 +4,9 @@
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<groupId>com.hzs</groupId>
<groupId>com.bd</groupId>
<artifactId>hzs</artifactId>
<version>3.0.0-SNAPSHOT</version>
<version>1.0.0-SNAPSHOT</version>
<name>hzs</name>
<description>微服务系统</description>
@ -14,7 +14,7 @@
<packaging>pom</packaging>
<properties>
<hzs.version>3.0.0-SNAPSHOT</hzs.version>
<hzs.version>1.0.0-SNAPSHOT</hzs.version>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
<java.version>1.8</java.version>
@ -179,84 +179,84 @@
<!-- 核心模块 -->
<dependency>
<groupId>com.hzs</groupId>
<groupId>com.bd</groupId>
<artifactId>hzs-common-core</artifactId>
<version>${hzs.version}</version>
</dependency>
<!-- 安全模块 -->
<dependency>
<groupId>com.hzs</groupId>
<groupId>com.bd</groupId>
<artifactId>hzs-common-security</artifactId>
<version>${hzs.version}</version>
</dependency>
<!-- 基础实体 -->
<dependency>
<groupId>com.hzs</groupId>
<groupId>com.bd</groupId>
<artifactId>hzs-common-domain</artifactId>
<version>${hzs.version}</version>
</dependency>
<!-- 活动服务接口
<dependency>
<groupId>com.hzs</groupId>
<groupId>com.bd</groupId>
<artifactId>hzs-api-activity</artifactId>
<version>${hzs.version}</version>
</dependency>
-->
<!-- 会员服务接口 -->
<dependency>
<groupId>com.hzs</groupId>
<groupId>com.bd</groupId>
<artifactId>hzs-api-member</artifactId>
<version>${hzs.version}</version>
</dependency>
<!-- 报表服务接口 -->
<dependency>
<groupId>com.hzs</groupId>
<groupId>com.bd</groupId>
<artifactId>hzs-api-report</artifactId>
<version>${hzs.version}</version>
</dependency>
<!-- 销售服务接口 -->
<dependency>
<groupId>com.hzs</groupId>
<groupId>com.bd</groupId>
<artifactId>hzs-api-sale</artifactId>
<version>${hzs.version}</version>
</dependency>
<!-- 系统基础服务接口 -->
<dependency>
<groupId>com.hzs</groupId>
<groupId>com.bd</groupId>
<artifactId>hzs-api-system</artifactId>
<version>${hzs.version}</version>
</dependency>
<!-- 三方服务接口 -->
<dependency>
<groupId>com.hzs</groupId>
<groupId>com.bd</groupId>
<artifactId>hzs-api-third</artifactId>
<version>${hzs.version}</version>
</dependency>
<!-- 奖金服务接口 -->
<dependency>
<groupId>com.hzs</groupId>
<groupId>com.bd</groupId>
<artifactId>hzs-api-bonus</artifactId>
<version>${hzs.version}</version>
</dependency>
<!-- 进销存服务接口 -->
<dependency>
<groupId>com.hzs</groupId>
<groupId>com.bd</groupId>
<artifactId>hzs-api-scm</artifactId>
<version>${hzs.version}</version>
</dependency>
<!-- aop切面处理 -->
<dependency>
<groupId>com.hzs</groupId>
<groupId>com.bd</groupId>
<artifactId>hzs-common-aop</artifactId>
<version>${hzs.version}</version>
</dependency>
<!-- 业务服务公共 -->
<dependency>
<groupId>com.hzs</groupId>
<groupId>com.bd</groupId>
<artifactId>hzs-business-common</artifactId>
<version>${hzs.version}</version>
</dependency>
@ -308,12 +308,13 @@
<version>${hutool.version}</version>
</dependency>
<!-- 打印条形码-->
<!-- 打印条形码
<dependency>
<groupId>com.itextpdf</groupId>
<artifactId>itext7-core</artifactId>
<version>${itexpdf.version}</version>
</dependency>
-->
<!-- google 图形生成 -->
<dependency>
@ -415,6 +416,7 @@
</dependency>
</dependencies>
<!--
<distributionManagement>
<repository>
<id>nexus-releases</id>
@ -427,9 +429,10 @@
<url>http://182.92.11.203:8090/repository/maven-snapshots/</url>
</snapshotRepository>
</distributionManagement>
-->
<repositories>
<!-- 私有仓库 -->
<!-- 私有仓库
<repository>
<id>maven-public</id>
<name>maven-public</name>
@ -441,6 +444,7 @@
<enabled>true</enabled>
</snapshots>
</repository>
-->
<!--阿里云镜像仓库-->
<repository>
<id>public</id>
@ -484,16 +488,16 @@
<directory>src/main/resources</directory>
<!-- 开启过滤，处理资源文件参数替换 -->
<filtering>true</filtering>
<!-- <excludes>-->
<!-- <exclude>application*.properties</exclude>-->
<!-- </excludes>-->
<!-- <excludes>-->
<!-- <exclude>application*.properties</exclude>-->
<!-- </excludes>-->
</resource>
<resource>
<directory>src/main/resources</directory>
<filtering>true</filtering>
<!-- <includes>-->
<!-- <include>application${spring.profiles.activity}.properties</include>-->
<!-- </includes>-->
<!-- <includes>-->
<!-- <include>application${spring.profiles.activity}.properties</include>-->
<!-- </includes>-->
</resource>
<resource>
<directory>src/main/java</directory>
@ -537,7 +541,7 @@
<!--当前环境-->
<profile.name>test</profile.name>
<!--Nacos服务地址-->
<!-- <config.server-addr>101.200.72.71:8848</config.server-addr>-->
<!-- <config.server-addr>101.200.72.71:8848</config.server-addr>-->
<config.server-addr>172.26.201.166:8848</config.server-addr>
<!--Nacos配置中心命名空间,用于支持多环境.这里必须使用ID，不能使用名称,默认为空-->
<config.namespace></config.namespace>
@ -557,7 +561,7 @@
<!--当前环境-->
<profile.name>online</profile.name>
<!--Nacos服务地址-->
<!-- <config.server-addr>101.200.72.71:8848</config.server-addr>-->
<!-- <config.server-addr>101.200.72.71:8848</config.server-addr>-->
<config.server-addr>172.26.201.166:8848</config.server-addr>
<!--Nacos配置中心命名空间,用于支持多环境.这里必须使用ID，不能使用名称,默认为空-->
<config.namespace></config.namespace>