523096025 1 år sedan
förälder
incheckning
3fb6c2541f

+ 15 - 0
src/main/java/com/huimv/wine/config/VipCofing.java

@@ -0,0 +1,15 @@
+package com.huimv.wine.config;
+
+import lombok.Data;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.context.annotation.Configuration;
+
+@Configuration
+@Data
+public  class VipCofing {
+    @Value("${vip.scan_api}")
+    private String vipScanApi;
+
+    @Value("${vip.callback}")
+    private String vipCallback;
+}

+ 0 - 4
src/main/java/com/huimv/wine/utils/WebsocketManagerUtil.java

@@ -47,9 +47,5 @@ public class WebsocketManagerUtil {
   }
 
 
-  /**
-   * 向所有在线人发送消息
-   * @param message
-   */
 
 }

+ 0 - 2
src/main/java/com/huimv/wine/utils/WebsocketSellerUtil.java

@@ -45,8 +45,6 @@ public class WebsocketSellerUtil {
     }
     // 同步
     RemoteEndpoint.Async async = session.getAsyncRemote ();
-    System.out.println(wsEvent);
-
     async.sendText (JSON.toJSONString(wsEvent));
   }
 

+ 20 - 0
src/main/java/com/huimv/wine/ws/SellerController.java

@@ -1,6 +1,7 @@
 package com.huimv.wine.ws;
 
 import com.fasterxml.jackson.databind.util.BeanUtil;
+import com.huimv.wine.config.VipCofing;
 import com.huimv.wine.entity.Advertise;
 import com.huimv.wine.entity.Device;
 import com.huimv.wine.entity.Params;
@@ -12,6 +13,8 @@ import com.huimv.wine.mapper.ParamsMapper;
 import com.huimv.wine.mapper.WineMapper;
 import com.huimv.wine.utils.SpringContextUtil;
 import com.huimv.wine.utils.WebsocketSellerUtil;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Component;
 import org.springframework.util.ObjectUtils;
 import org.springframework.web.socket.handler.TextWebSocketHandler;
@@ -30,6 +33,8 @@ import java.util.List;
 @Component
 @ServerEndpoint(value = "/seller/{seq}")
 public class SellerController extends TextWebSocketHandler {
+
+
     /**
      * 连接事件,加入注解
      */
@@ -101,6 +106,7 @@ public class SellerController extends TextWebSocketHandler {
         WineMapper wineMapper = SpringContextUtil.getBean(WineMapper.class);
         AdvertiseMapper advertiseMapper = SpringContextUtil.getBean(AdvertiseMapper.class);
         ParamsMapper paramsMapper = SpringContextUtil.getBean(ParamsMapper.class);
+        VipCofing vipCofing = SpringContextUtil.getBean(VipCofing.class);
 
         //初始化酒列表
         List<Wine> wineList = new ArrayList<Wine>();
@@ -118,6 +124,20 @@ public class SellerController extends TextWebSocketHandler {
         List<Params> paramsList  = paramsMapper.listAll();
         WebsocketSellerUtil.sendMessage(session,new WsEvent("runParamResult",paramsList));
 
+        //生成二维码
+        String   url = vipCofing.getVipScanApi() + "&device="+device.getId()+"&callback=" +vipCofing.getVipScanApi();
+        System.out.println("url---->"+url);
+
     }
+    //url := utils.Format("%s?device=%s&callback=%s", utils.VipScanApi, device.Id, utils.VipCallback)
+    //	img, err := qrcode.Encode(url, qrcode.Medium, 512)
+    //	if err != nil {
+    //		utils.Logger.Println(err)
+    //		_ = conn.WriteJSON(utils.WsError("Can't Access to Vip Qrcode"))
+    //		return
+    //	}
+    //	_ = conn.WriteJSON(utils.WsEvent("vipQrcodeResult", img))
+    //
+    //	_ = conn.WriteJSON(utils.WsEvent("initFinish", nil))
 
 }

+ 2 - 1
src/main/resources/application.properties

@@ -1,2 +1,3 @@
 spring.application.name=wine-server
-spring.profiles.active=dev
+spring.profiles.active=dev
+vip.scan_api:http://192.168.1.10:3080/seller/vip-test