fhy

deploy.sh

@@ -2,13 +2,14 @@
 
 # 设置远程服务器信息
 REMOTE_USER="root"  # 远程服务器用户名，根据你的实际情况修改
-REMOTE_HOST="111.230.193.88" # 远程服务器地址
+REMOTE_HOST="47.108.133.107" # 远程服务器地址
 REMOTE_BASE_DIR="/home/software"  # 远程服务器上的部署目录，根据你的目录结构修改
 
 # 本地 JAR 包路径  -- 根据你提供的目录结构修改
 LOCAL_FS_ADMIN_JAR="./fs-admin/target/fs-admin.jar" # 假设target目录和你提供的 tree 命令显示的目录同级
 LOCAL_FS_COMPANY_JAR="./fs-company/target/fs-company.jar"
 LOCAL_FS_USER_APP_JAR="./fs-user-app/target/fs-user-app.jar"
+LOCAL_FS_API_APP_JAR="./fs-api/target/fs-api.jar"
 
 # 函数：检查本地文件是否存在
 check_local_file() {
@@ -22,6 +23,7 @@ check_local_file() {
 check_local_file "$LOCAL_FS_ADMIN_JAR"
 check_local_file "$LOCAL_FS_COMPANY_JAR"
 check_local_file "$LOCAL_FS_USER_APP_JAR"
+check_local_file "$LOCAL_FS_API_APP_JAR"
 # 停止远程服务器上可能正在运行的旧版本（假设进程名与 JAR 包名相同）
 stop_remote_app() {
   local app_name=$1
@@ -53,10 +55,11 @@ deploy_jar() {
 deploy_jar "$LOCAL_FS_ADMIN_JAR" "fs-admin"
 
 # 部署 fs-company
-deploy_jar "$LOCAL_FS_COMPANY_JAR" "fs-company"
+#deploy_jar "$LOCAL_FS_COMPANY_JAR" "fs-company"
 
 # 部署 fs-user-app
 deploy_jar "$LOCAL_FS_USER_APP_JAR" "fs-user-app"
+deploy_jar "$LOCAL_FS_API_APP_JAR" "fs-api"
 
 echo "Deployment completed."
 

fs-service-system/src/main/java/com/fs/store/mapper/FsStoreProductMapper.java

@@ -200,7 +200,7 @@ public interface FsStoreProductMapper
             " p.vip_price, p.ot_price, p.postage,p.unit_name,p.sort,p.sales,p.is_show,p.is_hot,p.is_benefit,p.is_best,p.is_new,p.description," +
             " p.create_time,p.update_time,p.is_postage,p.is_del,p.give_integral, p.cost,p.is_good,p.browse,p.code_path,p.temp_id,p.spec_type,p.is_integral,p.integral," +
             " p.product_type,p.prescribe_code,p.prescribe_spec,p.prescribe_factory,p.prescribe_name,ave.sku,ave.stock,ave.price,ave.bar_code,ave.group_bar_code,ave.weight,ave.volume," +
-            "ave.brokerage,ave.brokerage_two,ave.brokerage_three,ave.agent_price,p.warehouse_code,p.usage_method,p.frequency,p.dosage  FROM fs_store_product p " +
+            "ave.brokerage,ave.brokerage_two,ave.brokerage_three,ave.agent_price,p.warehouse_code,ave.usage_method as usageMethod,ave.frequency as frequency,ave.dosage as dosage  FROM fs_store_product p " +
             "  LEFT JOIN fs_store_product_attr_value ave on p.product_id=ave.product_id WHERE  p.product_id is not null " +
             "</script>"})
     List<FsStoreProductExportVO> selectFsStoreProductExportList(@Param("maps")FsStoreProduct fsStoreProduct);

fs-user-app/src/main/java/com/fs/app/controller/WxUserController.java

@@ -155,7 +155,6 @@ public class WxUserController extends AppBaseController{
                     //写入
                     user=new FsUser();
                     user.setUsername("");
-                    user.setPhone("");
                     user.setNickname("微信用户");
                     user.setStatus(1);
                     user.setMaOpenId(session.getOpenid());