From c7727a1ad68bdc266aca421b9a91435e57b9b79c Mon Sep 17 00:00:00 2001
From: "bo.yang" <bo.yang@bpsemi.com>
Date: Mon, 31 May 2021 11:23:25 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=87=8D=E5=A4=8D=E8=AE=A2?=
 =?UTF-8?q?=E9=98=85=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/ruoyi/bps/service/impl/ExpSubsPushApiServiceImpl.java | 4 ++--
 ruoyi-admin/pom.xml                                           | 2 +-
 ruoyi-admin/src/main/resources/application.yml                | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/box-bps/src/main/java/com/ruoyi/bps/service/impl/ExpSubsPushApiServiceImpl.java b/box-bps/src/main/java/com/ruoyi/bps/service/impl/ExpSubsPushApiServiceImpl.java
index b2e8ab444..be30d63ab 100644
--- a/box-bps/src/main/java/com/ruoyi/bps/service/impl/ExpSubsPushApiServiceImpl.java
+++ b/box-bps/src/main/java/com/ruoyi/bps/service/impl/ExpSubsPushApiServiceImpl.java
@@ -52,7 +52,7 @@ public class ExpSubsPushApiServiceImpl implements IExpSubsPushApiService {
     public SubscribeResp ExpressSubscribe(ExpSubscribe expSubscribe) {
         SubscribeParameters subscribeParameters = new SubscribeParameters();
         SubscribeResp subscribeResp = new SubscribeResp();
-        subscribeParameters.setCallbackurl("http://report.bpsemi.cn:8081/box-admin/anon/subscribeCallBackUrl");
+        subscribeParameters.setCallbackurl("http://report.bpsemi.cn:8081/it_war/anon/subscribeCallBackUrl");
         subscribeParameters.setPhone(expSubscribe.getPhone());
         subscribeParameters.setSalt("bpsemi");
         SubscribeParam subscribeParam = new SubscribeParam();
@@ -67,8 +67,8 @@ public class ExpSubsPushApiServiceImpl implements IExpSubsPushApiService {
 
         IBaseClient subscribe = new Subscribe();
         try{
-            System.out.println(subscribe.execute(subscribeReq));
             HttpResult httpResult= subscribe.execute(subscribeReq);
+            System.out.println(httpResult);
             subscribeResp= new Gson().fromJson(httpResult.getBody(),SubscribeResp.class);
         }catch (Exception e)
         {
diff --git a/ruoyi-admin/pom.xml b/ruoyi-admin/pom.xml
index a45b2253c..b6225cc6d 100644
--- a/ruoyi-admin/pom.xml
+++ b/ruoyi-admin/pom.xml
@@ -8,7 +8,7 @@
         <version>4.6.1</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
-    <packaging>jar</packaging>
+    <packaging>war</packaging>
     <artifactId>ruoyi-admin</artifactId>
 
     <description>
diff --git a/ruoyi-admin/src/main/resources/application.yml b/ruoyi-admin/src/main/resources/application.yml
index 8c26d5c40..05a0bbb5c 100644
--- a/ruoyi-admin/src/main/resources/application.yml
+++ b/ruoyi-admin/src/main/resources/application.yml
@@ -9,7 +9,7 @@ ruoyi:
   # 实例演示开关
   demoEnabled: true
   # 文件路径 示例（ Windows配置D:/ruoyi/uploadPath，Linux配置 /home/ruoyi/uploadPath）
-  profile: C:/ruoyi/uploadPath
+  profile: C:/bps-it/uploadPath
   # 获取ip地址开关
   addressEnabled: false