修改了对应配置文件和对应的log日志

ics-admin/src/main/java/com/ics/admin/controller/CustomerStaffController.java

@@ -313,6 +313,7 @@ public class CustomerStaffController extends BaseController {
                                 JSONObject jsonObject = JSONUtil.parseObj(persons);
                                 Integer amount = (Integer) jsonObject.get("amount");
                                 if (amount <= 0) {
+                                    log.info("添加用户信息++++++");
                                     DevicePersonDto devicePersonDto = new DevicePersonDto();
                                     ArrayList<FacesDto> facesDtos = new ArrayList<>();
                                     devicePersonDto.setPersonId(String.valueOf(customerStaff.getId()));
@@ -326,14 +327,19 @@ public class CustomerStaffController extends BaseController {
                                     FacesDto facesDto = new FacesDto();
                                     facesDto.setFaceId(String.valueOf(customerStaff.getId()));
                                     String photoUrl = url + customerStaff.getPhoto();
+                                    log.info("ip地址为：" + equipment.getIp());
+
                                     String faceData = BASE64_PREFIX + UrlToBase64Util.imageUrlToBase64(photoUrl);
+                                    log.info("人脸为：" + faceData);
 
                                     facesDto.setData(faceData);
                                     facesDtos.add(facesDto);
                                     devicePersonDto.setFaces(facesDtos);
+                                    log.info("人员信息为：" + devicePersonDto.toString());
                                     String s = DeviceUtils.addPersons(equipment.getIp(), devicePersonDto);
                                     log.info("添加人员返回结果：" + s);
                                 } else {
+                                    log.info("修改用户信息");
                                     //更新用户信息
                                     if (icsCustomerStaff.getPhoto() != null) {
                                         if (!icsCustomerStaff.getPhoto().equals(customer.getPhone())) {

ics-admin/src/main/java/com/ics/admin/service/meeting/IRoomContentService.java

@@ -64,6 +64,7 @@ public interface IRoomContentService extends IService<RoomContent> {
 
     List<RoomContent> selectApiRoomList(RoomContent roomContent);
 
+
     RoomContent selectInfoById(Long id);
 
     Map<String,Object> selectSearchInfoByType(Integer type);

ics-common/ics-common-core/src/main/java/com/ics/common/utils/DeviceUtils.java

@@ -148,42 +148,19 @@ public class DeviceUtils {
      * }
      */
     public static String addPersons(String ip,DevicePersonDto dto) {
+        log.info("ip为{}", ip);
         String url = ip + "/api/viso/v2/addPersons";
         ArrayList<DevicePersonDto> dtos = new ArrayList<>();
         DevicePersonsDto devicePersonDto = new DevicePersonsDto();
-//        DevicePersonDto personDto = new DevicePersonDto();
-//        personDto.setPersonId("013");
-//        personDto.setName("张三");
-//        personDto.setWorkId("001");
-//        personDto.setGender("male");
-//        personDto.setAge("30");
-//        personDto.setCertificateType("111");
-//        personDto.setCertificateNumber("11111");
-//        //添加人员类型
-//        personDto.setPersonType("whitelist");
-//
-//        ArrayList<FacesDto> facesDtos = new ArrayList<>();
-//        FacesDto facesDto = new FacesDto();
-//        facesDto.setFaceId("013");
-//        String imgurl = "E:\\360MoveData\\Users\\Administrator\\Desktop\\图片\\图片\\photo.jpg";
 
-//        String faceData =BASE64_PREFIX+ UrlToBase64Util.imageUrlToBase64("https://img2.imgtp.com/2024/04/04/NQbU30N1.png");
-//        facesDto.setData(faceData);
-//        facesDtos.add(facesDto);
-
-//        personDto.setFaces(facesDtos);
         dtos.add(dto);
 
-        //添加访客时间
-//        personDto.setVisitorValidStartTime("2024-03-12T11:04:40");
-//        personDto.setVisitorValidEndTime("2024-03-14T11:04:40");
-//        dtos.add(dto);
         devicePersonDto.setPersons(dtos);
+        log.info("人员信息为:{}", devicePersonDto);
         String json = JsonUtils.toJson(devicePersonDto);
-//        System.out.println(json);
+
-//        System.out.println(url);
         String msg = HttpUtil.post(url,json);
-//        log.info("设备新增人员:{}", msg);
+        log.info("设备新增人员:{}", msg);
         return msg;
     }
 

ics-common/ics-common-core/src/main/java/com/ics/common/utils/UrlToBase64Util.java

@@ -3,11 +3,15 @@ package com.ics.common.utils;
 import cn.hutool.http.HttpRequest;
 import cn.hutool.http.HttpResponse;
 import com.baomidou.mybatisplus.core.toolkit.ObjectUtils;
+import com.google.common.base.Strings;
 import org.apache.logging.log4j.util.Base64Util;
 import org.apache.commons.codec.binary.Base64;
 
 import java.io.ByteArrayOutputStream;
+import java.io.IOException;
 import java.io.InputStream;
+import java.net.HttpURLConnection;
+import java.net.URL;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
@@ -18,11 +22,13 @@ import java.util.regex.Pattern;
 public class UrlToBase64Util {
 
     //base64前缀
+    private static final String BASE64_PREFIX = "data:image/png;base64,";
 
-//    public static void main(String[] args) throws Exception {
+
-//        String url="https://localhost:8080/upload/file/20221101/test.png";
+    public static void main(String[] args) throws Exception {
-//        System.out.println(BASE64_PREFIX+imageUrlToBase64(url));
+        String url="https://localhost:8080/upload/file/20221101/test.png";
-//    }
+        System.out.println(BASE64_PREFIX+imageUrlToBase64(url));
+    }
 
     /**
      * 图片URL转Base64编码

ics-web/src/main/java/com/ics/controller/mobile/WxLoginAPIController.java

@@ -234,7 +234,6 @@ public class WxLoginAPIController extends BaseController {
             String phoneNumber = phoneInfo.getString("phoneNumber");
             IcsCustomerStaff icsCustomerStaff = new IcsCustomerStaff();
             icsCustomerStaff.setMobile(phoneNumber);
-            //todo  需要根据手机号和对应的openId 查询对应的用户。
             IcsCustomerStaff customerStaff = icsCustomerStaffService.selectUserByMobile(phoneNumber);
             if (customerStaff != null) {
 
@@ -299,7 +298,6 @@ public class WxLoginAPIController extends BaseController {
                 return ajax;
             } else {
                 // 新增用户信息
-                // todo 现根据手机号查询对应的数据。如果存在则不新增，如果不存在则新增
 
                 icsCustomerStaff.setUsername(phoneNumber);
                 icsCustomerStaff.setGender("0");

ics-web/src/main/resources/application-dev.yml

@@ -1,7 +1,7 @@
 spring:
   redis:
     database: 5
-    host: 192.168.0.11
+    host: 127.0.0.1
     port: 6379
 #    password: hycxli#123
     timeout: 6000ms  # 连接超时时长（毫秒）
@@ -17,6 +17,9 @@ spring:
     druid:
       # 主库数据源
       master:
+#        url: jdbc:mysql://192.168.0.50:3306/dbd-meeting?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
+#        username: root
+#        password: boyuekeji2023
         url: jdbc:mysql://222.184.49.22:3306/dbd-meeting?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
         username: root
         password: boyue1!Z
@@ -67,14 +70,21 @@ spring:
 dfs:
   # 此处改成自己服务器存储位置
   #path: /Users/lihongyuan/IdeaProjects/saas-ics/ics/
-  domain: http://demo.metasoft.vip
+#  domain: http://222.184.49.22:9227
-  path: /opt/ics
+#  path: D:/ruoyi/uploadPath
+  domain: http://192.168.0.11:9227
+  path: F:/ruoyi/uploadPath
 
 # 公众号配置(必填)
 wx:
   miniapp:
-    appid: wx22f0f66d57ce48f7
+#    appid: wx22f0f66d57ce48f7
-    secret: 3fe3c634a223cbdbfb7c8b7263031808
+#    appid: wxd9f93ef41a607dd5
+    appid: wx5582a07c1fbbcf06
+    appids:
+#    secret: 3fe3c634a223cbdbfb7c8b7263031808
+#    secret: 417507767334672bc46bb6eb3bf1c29b
+    secret: ad24130a8919c613efd9538f69abafd3
     token:
     aesKey:
     msgDataFormat: JSON              # 消息格式，XML或者JSON.
@@ -127,9 +137,8 @@ mybatis-plus:
 weixin:
   appid: wx5582a07c1fbbcf06 # appid
   mch-serial-no: 5899B7D34B161F9E24EFFCD50E95245521CA40AB # 证书序列号
-  private-key-path: /Users/wangqichao/cert/dbd/apiclient_key.pem # 证书路径
+  private-key-path: F:/cert/dbd/apiclient_key.pem # 证书路径
   mch-id: 1665472343 # 商户号
   key: CHANGYANGKONGGUhenanjianandianzi # APIv3密钥
   domain: https://api.mch.weixin.qq.com # 微信服务器地址
-  notify-domain: http://222.184.49.22:9227 # 回调，自己的回调地址
+  notify-domain: http://b8pyta.natappfree.cc # 回调，自己的回调地址
-

ics-web/src/main/resources/application-prod.yml

@@ -3,7 +3,7 @@ spring:
     database: 1
     host: 127.0.0.1
     port: 6379
-    password: hycxli#123
+    password: 123456
     timeout: 6000ms  # 连接超时时长（毫秒）
     lettuce:
       pool:
@@ -17,9 +17,9 @@ spring:
     druid:
       # 主库数据源
       master:
-        url: jdbc:mysql://localhost:3306/saas-ics?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
+        url: jdbc:mysql://127.0.0.1:3306/dbd-meeting?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
         username: root
-        password: 123456
+        password: Boyue1!Z
       # 从库数据源
       slave:
         #从数据源开关/默认关闭
@@ -65,13 +65,14 @@ spring:
             multi-statement-allow: true
   servlet:
     multipart:
-      location: /opt/SaaS-ICS/tmp
+      location: /usr/local/uploadPath/
 
 # 本地文件上传路径
 dfs:
-  path: /opt/SaaS-ICS/uploadPath/
+  path: /usr/local/uploadPath/
-  domain: https://www.xxxx.com/
+  domain: https://www.chuangzhikj.com//saas-ics
-
+#  domain: http://39.165.217.47:81/saas-ics/
+#  domain: https://www.xxxx.com/
 # 公众号配置(必填)
 wx:
   miniapp:
@@ -122,3 +123,12 @@ sn:
   platformService:
     prefix: 'yyyyMMdd'
     maxLo: 100
+
+weixin:
+  appid: wx5582a07c1fbbcf06 # appid
+  mch-serial-no: 5899B7D34B161F9E24EFFCD50E95245521CA40AB # 证书序列号
+  private-key-path: /usr/local/project/pay/zhengzhou/apiclient_key.pem # 证书路径
+  mch-id: 1665472343 # 商户号
+  key: CHANGYANGKONGGUhenanjianandianzi # APIv3密钥
+  domain: https://api.mch.weixin.qq.com # 微信服务器地址
+  notify-domain: http://b8pyta.natappfree.cc # 回调，自己的回调地址

ics-web/src/main/resources/application.yml

@@ -27,14 +27,14 @@ spring:
   main:
     allow-bean-definition-overriding: true
   profiles:
-    active: dev
+    active: prod
   jackson:
     date-format: yyyy-MM-dd HH:mm:ss
     time-zone: GMT+8
   servlet:
     multipart:
-      maxFileSize: 5MB  #单位必须大写MB或不写(即为B)
+      maxFileSize: 50MB  #单位必须大写MB或不写(即为B)
-      maxRequestSize: 10MB
+      maxRequestSize: 100MB
 
 # 暴露监控端点
 management:
@@ -76,7 +76,7 @@ jwtp:
   ## 拦截路径，默认是/**
   path: /**
   ## 排除拦截路径，默认无
-  exclude-path: /admin/login/slide, //meeting/wxPay/**,  /business/login/slide, /login/slide,/user/check_code,/captcha/check,/captcha/get,/system/sms/send,/user/register/submit,/weixin/login,/meeting/roomItemByRoom/**,/social_user_login/login,/wx/**,/wx/login,/user/check_mobile,/user/send_mobile,/user/search_customer,/user/check_code,/user/register,/password/send_mobile,/password/forgot,/auth/login,/social_user_login/login
+  exclude-path: /admin/login/slide, /meeting/wxPay/**,  /business/login/slide, /login/slide,/user/check_code,/captcha/check,/captcha/get,/system/sms/send,/user/register/submit,/weixin/login,/meeting/roomItemByRoom/**,/social_user_login/login,/changyang_user_login/login,/wx/**,/wx/login,/user/check_mobile,/user/send_mobile,/user/search_customer,/user/check_code,/user/register,/password/send_mobile,/password/forgot,/auth/login,/social_user_login/login
   ## 单个用户最大token数，默认-1不限制
   max-token: 1
   ## url自动对应权限方式，0 简易模式，1 RESTful模式