backend/java-mall
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

修复 实体类的 错误， 优化打包指令

Browse Source
This commit is contained in:
Jack 2025-11-06 16:58:52 +08:00
parent 38b674e05a
commit 45a2f7a07d
4 changed files with 24 additions and 46 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
mall-common/src/main/java/com/suisung/mall/common/modules/store/ShopStoreActivityBase.java
View File

@ -1,6 +1,9 @@
package com.suisung.mall.common.modules.store;
import com.baomidou.mybatisplus.annotation.*;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
@ -119,7 +122,6 @@ public class ShopStoreActivityBase implements Serializable {
@TableField(updateStrategy = NOT_EMPTY)
private Integer activity_share_num;
@Version
@ApiModelProperty(value = "乐观锁")
private Integer version;
@ -127,12 +129,10 @@ public class ShopStoreActivityBase implements Serializable {
@TableField(updateStrategy = NOT_EMPTY)
private String flow_no;
@Version
@ApiModelProperty(value = "在活动时间范围内，用户砍价允许的天数")
private Integer cut_days;
@Version
@ApiModelProperty(value = "活动商品的总数量")
private Integer product_cont;
}

5
mall-shop/src/main/java/com/suisung/mall/shop/store/service/impl/ShopStoreActivityBaseServiceImpl.java
View File

@ -40,7 +40,6 @@ import com.suisung.mall.common.utils.CheckUtil;
import com.suisung.mall.common.utils.I18nUtil;
import com.suisung.mall.common.utils.StringUtils;
import com.suisung.mall.common.utils.UserInfoService;
import com.suisung.mall.core.web.service.RedisService;
import com.suisung.mall.core.web.service.impl.BaseServiceImpl;
import com.suisung.mall.shop.activity.service.*;
import com.suisung.mall.shop.base.service.AccountBaseConfigService;
@ -104,8 +103,6 @@ public class ShopStoreActivityBaseServiceImpl extends BaseServiceImpl<ShopStoreA
@Autowired
private ShopStoreActivityItemService shopStoreActivityItemService;
@Autowired
private ShopBaseActivityTypeService baseActivityTypeService;
@Autowired
private ShopStoreBaseService shopStoreBaseService;
@Autowired
private ShopProductIndexService shopProductIndexService;
@ -116,8 +113,6 @@ public class ShopStoreActivityBaseServiceImpl extends BaseServiceImpl<ShopStoreA
@Autowired
private ShopProductImageService shopProductImageService;
@Autowired
private RedisService redisService;
@Autowired
private ShopActivityMarketingHistoryService shopActivityMarketingHistoryService;
@Autowired
private UserInfoService userInfoService;

7
mall-shop/src/main/resources/mapper/store/ShopStoreActivityBaseMapper.xml
View File

@ -3,11 +3,6 @@
<mapper namespace="com.suisung.mall.shop.store.mapper.ShopStoreActivityBaseMapper">
<!-- 通用查询结果列 -->
<sql id="Base_Column_List">
activity_id, store_id, user_id, activity_name, activity_title, activity_remark, activity_combo_id,
activity_type_id, activity_starttime, activity_endtime, activity_state, activity_rule, activity_type,
activity_order, activity_is_finish, item_id, subsite_id,activity_use_level, activity_releasetime,
activity_on_is_off, activity_share_num, version, flow_no, cut_days, product_cont
</sql>
<sql id="Base_Column_List">*</sql>
</mapper>

48
pom.xml
View File

@ -540,38 +540,23 @@
<artifactId>maven-dependency-plugin</artifactId>
</plugin>
<!-- 使用 Docker 命令删除（如果支持远程操作） -->
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>exec-maven-plugin</artifactId>
<version>3.0.0</version>
<executions>
<execution>
<id>remove-remote-image</id>
<phase>clean</phase>
<goals>
<goal>exec</goal>
</goals>
<configuration>
<executable>curl</executable>
<arguments>
<argument>-X</argument>
<argument>DELETE</argument>
<argument>${docker.registry}/mall/${project.artifactId}:${project.version}</argument>
</arguments>
</configuration>
</execution>
</executions>
</plugin>
<plugin>
<groupId>com.spotify</groupId>
<artifactId>docker-maven-plugin</artifactId>
<version>${docker.maven.plugin.version}</version>
<!--如果想在项目打包时构建镜像添加-->
<executions>
<!-- 使用 Docker 命令删除（如果支持远程操作） -->
<!-- 先删除已存在的镜像 -->
<execution>
<id>remove-old-image</id>
<phase>clean</phase>
<goals>
<goal>removeImage</goal>
</goals>
<configuration>
<imageName>${docker.registry}/mall/${project.artifactId}:${project.version}</imageName>
</configuration>
</execution>
<execution>
<id>build-image</id>
@ -583,10 +568,6 @@
</executions>
<configuration>
<!--定义镜像名称-->
<!-- <imageName>mall/${project.artifactId}:${project.version}</imageName>-->
<!-- &lt;!&ndash; Docker 远程管理地址&ndash;&gt;-->
<!-- <dockerHost>${docker.host}</dockerHost>-->
<imageName>${docker.registry}/mall/${project.artifactId}:${project.version}</imageName>
<!-- Docker 远程管理地址-->
<dockerHost>${docker.host}</dockerHost>
@ -602,6 +583,13 @@
<!-- 打包镜像到 docker registry 中心添加认证配置（账号密码在 maven 配置） -->
<serverId>docker-registry</serverId>
<!-- 强制覆盖配置 -->
<forceTags>true</forceTags>
<imageTags>
<imageTag>${project.version}</imageTag>
<imageTag>latest</imageTag>
</imageTags>
<!--定义容器启动命令，注意不能换行-->
<entryPoint>["sh", "-c", "mkdir -p /tmp /app/temp /root/nacos/naming/public &amp;&amp; chmod -R 777 /tmp /app/temp /root/nacos &amp;&amp; java -Djava.io.tmpdir=/app/temp -Dnacos.naming.cache.dir=/root/nacos/naming -jar -Xms256m -Xmx512m -XX:MetaspaceSize=256m -XX:MaxMetaspaceSize=256m -XX:+UseContainerSupport -XX:MaxRAMPercentage=60.0 -XX:+UseSerialGC -XX:MinHeapFreeRatio=40 -XX:MaxHeapFreeRatio=60 -XX:+PrintGCDetails -XX:+PrintGCDateStamps -Xloggc:./gc.log -XX:+UseGCLogFileRotation -XX:NumberOfGCLogFiles=5 -XX:GCLogFileSize=10M -Dspring.profiles.active=${spring.profile} -Duser.timezone=Asia/Shanghai /${project.build.finalName}.jar"]
</entryPoint>