授权牌bugfix

src/main/java/com/caimei/model/po/CmBrandBannerPo.java

@@ -3,7 +3,7 @@ package com.caimei.model.po;
 import lombok.Data;
 
 /**
- * cm_brand_auth
+ * cm_brand_banner
  * @author : Kaick
  * @date : 2023/3/23
  */

src/main/java/com/caimei/model/vo/ProductFormVo.java

@@ -44,6 +44,15 @@ public class ProductFormVo {
      */
     private String brandName;
 
+    /**
+     * 前缀
+     */
+    private String prefix;
+    /**
+     * 创建人
+     */
+    private Integer createBy;
+
     /**
      * 设备分类id
      */

src/main/java/com/caimei/service/auth/impl/AuthProductServiceImpl.java

@@ -68,6 +68,9 @@ public class AuthProductServiceImpl implements AuthProductService {
     @Value("${caimei.oldapi}")
     private String wwwServer;
 
+    @Value("${caimei.zpapi}")
+    private String zpapiServer;
+
     @Autowired
     private FastDfsClient client;
 
@@ -515,7 +518,8 @@ public class AuthProductServiceImpl implements AuthProductService {
             }
             // 添加二维码信息
             if (StringUtils.isNotEmpty(template.getQrPosition())) {
-                String qrCodeLink = wwwServer + "/product/auth/product-" + product.getProductId() + ".html";
+//                String qrCodeLink = wwwServer + "/product/auth/product-" + product.getProductId() + ".html";
+                String qrCodeLink = zpapiServer + "/"+product.getCreateBy()+"/"+product.getPrefix()+"/approve/device/detail?id=" + product.getProductId() ;
                 map.put("addQr1_link", qrCodeLink);
                 map.put("addQr1_size", template.getQrSize());
                 String[] split = template.getQrPosition().split(",");

src/main/resources/config/dev/application-dev.yml

@@ -3,9 +3,12 @@ spring:
   datasource:
     cmdatasource:
       driver-class-name: com.mysql.cj.jdbc.Driver
-      jdbc-url: jdbc:mysql://192.168.2.100:3306/caimei?characterEncoding=UTF8&serverTimezone=Asia/Shanghai
+      jdbc-url: jdbc:mysql://120.79.25.27:3306/caimei?characterEncoding=UTF8&serverTimezone=Asia/Shanghai
       username: developer
-      password: 05bZ/OxTB:X+yd%1
+      password: J5p3tgOVazNl4ydf
+#      jdbc-url: jdbc:mysql://192.168.2.100:3306/caimei?characterEncoding=UTF8&serverTimezone=Asia/Shanghai
+#      username: developer
+#      password: 05bZ/OxTB:X+yd%1
       type: com.zaxxer.hikari.HikariDataSource
     ldmdatasource:
       driver-class-name: com.mysql.cj.jdbc.Driver
@@ -99,8 +102,8 @@ aliyunConfig:
 
 # rocketmq 配置项，对应 RocketMQProperties 配置类
 rocketmq:
-  # name-server: 127.0.0.1:9876  # RocketMQ Namesrv 本地
-  name-server: 47.107.48.218:9876 # 測試
+  name-server: 127.0.0.1:9876  # RocketMQ Namesrv 本地
+#  name-server: 47.107.48.218:9876 # 測試
   producer:
     group: caimei_dev_group        # 生产者分组
     send-message-timeout: 3000     # 发送消息超时时间，单位：毫秒。默认为 3000 。

src/main/resources/mapper/AuthProductMapper.xml

@@ -254,8 +254,11 @@
                r.id                                                        as relationId,
                r.authType,
                p.authImageLogo,
-               p.authDates
+               p.authDates,
+               p.createBy,
+               au.prefix
         from cm_brand_auth_product p
+                 left join cm_brand_auth_user au on p.createBy = au.authUserId
                  left join cm_brand_product_relation r on p.id = r.productId
                  left join cm_brand_product_type t on p.productTypeId = t.id and t.delFlag = 0
                  left join cm_brand_auth_shop_info i1 on p.infoId = i1.id