abu/wzj-boot
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[feat]修改文章列表。增加app接口

Browse Source
This commit is contained in:
wangqx 2025-08-15 14:23:34 +08:00
parent 584958eb9c
commit 777992a096
7 changed files with 57 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

50
pom.xml
View File

@ -464,6 +464,56 @@
<build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-antrun-plugin</artifactId>
<version>3.1.0</version>
<!-- 依赖 JSch 库（用于 SSH/SCP 操作） -->
<dependencies>
<dependency>
<groupId>com.jcraft</groupId>
<artifactId>jsch</artifactId>
<version>0.1.55</version> <!-- 最新版本可更新 -->
</dependency>
</dependencies>
<executions>
<execution>
<!-- 绑定到 package 阶段之后执行 -->
<phase>package</phase>
<goals>
<goal>run</goal>
</goals>
<configuration>
<target>
<!-- 1. 配置 SSH 连接信息 -->
<property name="ssh.host" value="192.168.1.65" /> <!-- 例如：192.168.1.100 -->
<property name="ssh.port" value="22" /> <!-- SSH 默认端口 -->
<property name="ssh.username" value="wzj" /> <!-- 例如：root -->
<property name="ssh.password" value="123456" /> <!-- 或使用密钥认证 -->
<property name="local.jar.path" value="${project.build.directory}/${project.build.finalName}.jar" /> <!-- 本地 JAR 路径 -->
<property name="remote.jar.path" value="/var/local/docker/java/data" /> <!-- 服务器存放 JAR 的目录，例如：/opt/app/ -->
<!-- 2. 通过 SCP 上传 JAR 包到目标服务器 -->
<scp
file="${local.jar.path}"
todir="${ssh.username}:${ssh.password}@${ssh.host}:${remote.jar.path}"
port="${ssh.port}"
trust="true" /> <!-- 信任未知主机密钥 -->
<!-- 3. 通过 SSH 执行远程命令：重启 docker java 容器 -->
<sshexec
host="${ssh.host}"
port="${ssh.port}"
username="${ssh.username}"
password="${ssh.password}"
command="docker restart java"
trust="true"
failonerror="true" /> <!-- 命令执行失败时，Maven 构建终止 -->
</target>
</configuration>
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>

4
ruoyi-admin/src/main/java/org/dromara/app/AppCarouselController.java Normal file
View File

@ -0,0 +1,4 @@
package org.dromara.app;
public class AppCarouselController {
}

2
ruoyi-modules/ruoyi-content/src/main/java/com/wzj/soopin/content/controller/ArticleCategoryController.java
View File

@ -71,7 +71,7 @@ public class ArticleCategoryController {
@Log(title = "修改", businessType = BusinessType.UPDATE)
@PostMapping("/update")
public R update(@RequestBody ArticleCategoryBO bo) {
service.save(convert.toPo(bo));
service.saveOrUpdate(convert.toPo(bo));
return R.ok();
}

2
ruoyi-modules/ruoyi-content/src/main/java/com/wzj/soopin/content/controller/ArticleController.java
View File

@ -65,7 +65,7 @@ public class ArticleController {
@Log(title = "修改", businessType = BusinessType.UPDATE)
@PostMapping("/update")
public R update(@RequestBody ArticleBO bo) {
service.save(convert.toPo(bo));
service.saveOrUpdate(convert.toPo(bo));
return R.ok();
}

3
ruoyi-modules/ruoyi-member/src/main/java/com/wzj/soopin/member/domain/bo/MemberAccountBO.java
View File

@ -44,8 +44,7 @@ public class MemberAccountBO extends BaseBO {
private String nickname;
private String phone;
@Schema(description ="余额")
private BigDecimal moneyBalance;
public LambdaQueryWrapper<MemberAccount> toWrapper() {
LambdaQueryWrapper<MemberAccount> wrapper = new LambdaQueryWrapper<>();
if (id != null) {

3
ruoyi-modules/ruoyi-member/src/main/java/com/wzj/soopin/member/domain/po/MemberAccount.java
View File

@ -30,9 +30,6 @@ public class MemberAccount extends BaseAudit {
private Long memberId;
private String name;
private Integer type;
@Schema(description ="积分")

6
ruoyi-modules/ruoyi-transaction/src/main/java/com/wzj/soopin/transaction/service/impl/DivideServiceImpl.java
View File

@ -15,7 +15,6 @@ import com.wzj.soopin.transaction.convert.DivideDetailConvert;
import com.wzj.soopin.transaction.domain.bo.DivideBO;
import com.wzj.soopin.transaction.domain.po.Divide;
import com.wzj.soopin.transaction.domain.po.DivideDetail;
import com.wzj.soopin.transaction.domain.po.DivideRuleDetail;
import com.wzj.soopin.transaction.domain.vo.DivideRuleDetailVO;
import com.wzj.soopin.transaction.domain.vo.DivideRuleVO;
import com.wzj.soopin.transaction.domain.vo.DivideVO;
@ -32,7 +31,6 @@ import org.dromara.common.core.exception.ServiceException;
import org.dromara.common.core.service.ConfigService;
import org.dromara.system.domain.vo.SysTenantVo;
import org.dromara.system.service.ISysTenantService;
import org.slf4j.Logger;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
@ -41,7 +39,6 @@ import java.math.BigDecimal;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.stream.Collectors;
/**
* 分账服务实现类
@ -359,7 +356,6 @@ public class DivideServiceImpl extends ServiceImpl<DivideMapper, Divide> impleme
}
return new HashMap<>() {{
put("accountId", account.getId() + "");
put("accountName", account.getName());
}};
}
@ -380,7 +376,6 @@ public class DivideServiceImpl extends ServiceImpl<DivideMapper, Divide> impleme
}
return new HashMap<>() {{
put("accountId", account.getId() + "");
put("accountName", account.getName());
}};
}
@ -404,7 +399,6 @@ public class DivideServiceImpl extends ServiceImpl<DivideMapper, Divide> impleme
// }
return new HashMap<>() {{
put("accountId", account.getId() + "");
put("accountName", account.getName());
}};
}