admin/AdvisorServer
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

修改产品类型

Browse Source
This commit is contained in:
easonzhu 2025-02-21 14:00:35 +08:00
parent 51b8dbe742
commit 504c52b364
3 changed files with 34 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/main/java/com/syzb/common/constant/ProductType.java
View File

@ -15,19 +15,15 @@ public enum ProductType {
VIEW_SINGLE(2, "单篇观点"), VIEW_SINGLE(2, "单篇观点"),
VIDEO_SINGLE(3, "视频"), VIDEO_SINGLE(3, "视频"),
// COURSE(4, "课程"), // COURSE(4, "课程"),
CIRCLE(5, "交易圈"), // CIRCLE(5, "交易圈"),
LIVE(6, "图文直播"), LIVE(6, "图文直播"),
PORTFOLIO(7, "组合"), PORTFOLIO(7, "组合"),
TIPS(8, "股票池"), TIPS(8, "股票池"),
PACKAGE_PRODUCT(9, "套餐产品"), PACKAGE_PRODUCT(9, "套餐产品"),
H5(10, "H5"), // 仅用于推荐位&Banner H5(10, "H5"), // 仅用于推荐位&Banner
VIDEO_COLUMN(11, "栏目"), // VIDEO_COLUMN(11, "栏目"), //
THIRD_VALUE_PRODUCT(21, "三方产品-增值产品"),
THIRD_COURSE(22, "三方产品-课程"),
THIRD_ETF(23, "三方产品-ETF专区"),
THIRD_STOCK_TOOL(24, "三方产品-选股工具"),
SMALL_PLANE_FINANCE(25, "三方产品-小飞机理财"), THIRD_PRODUCT(21, "三方产品"),
COURSE_PACKAGE(31, "课程包"), COURSE_PACKAGE(31, "课程包"),
COURSE_SINGLE(32, "课程"), COURSE_SINGLE(32, "课程"),
@ -41,8 +37,6 @@ public enum ProductType {
public final String name; public final String name;
public static final List<Integer> THIRD_PRODUCTS = Arrays.asList(THIRD_VALUE_PRODUCT.value, THIRD_COURSE.value, THIRD_ETF.value, THIRD_STOCK_TOOL.value, SMALL_PLANE_FINANCE.value);
ProductType(Integer value, String name) { ProductType(Integer value, String name) {
this.value = value; this.value = value;
this.name = name; this.name = name;

5
src/main/java/com/syzb/common/service/RecommendService.java
View File

@ -140,10 +140,7 @@ public class RecommendService {
} }
MergeProductInfoVO vo = table.get(product.getProductType(), product.getProductId()); MergeProductInfoVO vo = table.get(product.getProductType(), product.getProductId());
if ((ProductType.ADVISOR_INFO.equals(productType) && !AdvisorInfoStatus.PASS.value.equals(vo.getStatus())) if ((ProductType.ADVISOR_INFO.equals(productType) && !AdvisorInfoStatus.PASS.value.equals(vo.getStatus()))
|| (ProductType.THIRD_VALUE_PRODUCT.equals(productType) && !ThirdPartyProductStatus.PASS.value.equals(vo.getStatus())) || (ProductType.THIRD_PRODUCT.equals(productType) && !ThirdPartyProductStatus.PASS.value.equals(vo.getStatus()))
|| (ProductType.THIRD_COURSE.equals(productType) && !ThirdPartyProductStatus.PASS.value.equals(vo.getStatus()))
|| (ProductType.THIRD_ETF.equals(productType) && !ThirdPartyProductStatus.PASS.value.equals(vo.getStatus()))
|| (ProductType.THIRD_STOCK_TOOL.equals(productType) && !ThirdPartyProductStatus.PASS.value.equals(vo.getStatus()))
) { ) {
throw new BizException(ResponseStatus.PRODUCT_STATUS_ERROR); throw new BizException(ResponseStatus.PRODUCT_STATUS_ERROR);
} }

31
start.sh Normal file
View File

@ -0,0 +1,31 @@
#!/bin/bash
# 获取当前日期（格式：yyyyMMdd）
current_date=$(date +"%Y%m%d")
# 日志文件名，包含日期
log_file="advisor_server_${current_date}.log"
# 查找包含 AdvisorServer 的进程
pid=$(ps aux | grep 'AdvisorServer' | grep -v 'grep' | awk '{print $2}')
if [ -n "$pid" ]; then
# 如果找到了进程，则杀掉它
echo "Found process with PID $pid. Killing the process..."
kill -9 $pid
if [ $? -eq 0 ]; then
echo "Process $pid terminated successfully."
else
echo "Failed to terminate process $pid."
fi
else
echo "No process found for AdvisorServer."
fi
# 使用 nohup 启动 jar 包，并设置 JVM 内存参数，同时保存日志，追加输出
echo "Starting /root/AdvisorServer-2.6.7.jar with JVM memory parameters..." >> "$log_file" 2>&1
nohup java -Xms2g -Xmx2g -XX:+UseG1GC -jar AdvisorServer-2.6.7.jar --spring.profiles.active=prod >> "$log_file" 2>&1 &
echo "AdvisorServer-2.6.7.jar started in background with nohup." >> "$log_file" 2>&1