Merge branch 'local_20221024' into haucheng_panzhihua

yanghui

2022-11-01 84bf62e86220ec8c1f5672666f1fbaf4618f55a9

Merge branch 'local_20221024' into haucheng_panzhihua

 springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/umf/MyAESUtil.java

@@ -51,7 +51,7 @@
    }

    public static void main(String[] args) throws Exception{
        String ryo7M3n8loC5Abcd = MyAESUtil.Encrypt("{\"order_status\":\"6\",\"wash_name\":null,\"wash_mobile\":null,\"phone\":\"13699017236\"}", "Ryo7M3n8loC5Abcd");
        String ryo7M3n8loC5Abcd = MyAESUtil.Encrypt("{\"order_status\":\"3\",\"wash_name\":null,\"wash_mobile\":null,\"phone\":\"13980596944\"}", "Ryo7M3n8loC5Abcd");
//        String ryo7M3n8loC5Abcd = MyAESUtil.Decrypt("Ixp8WMuJ9bnKhiBKmKWq\\/rQXQ7SaWc3fHLB1e\\/PzAvIEN0CH1nXtMCBzMegT49on31S+3Itop388Yc0EGVx30GGVlG81p7ssiqHlLRna2i903Rid9hqbjZdrBomiy2jp", "Ryo7M3n8loC5Abcd");
//        String ryo7M3n8loC5Abcd = MyAESUtil.Decrypt("0H4upa36EW9AFSNcoF9rVX6D5enB9T/9P1hWxLf/NgiGCueg159vz7Ex6+tPAR83aQLPyGeuF74Y5C9VpzQjL7brj8aWdMmnWJp/W1i5lpM=", "Ryo7M3n8loC5Abcd");
//        订单完成13980596944 {"aesString":"0H4upa36EW9AFSNcoF9rVX6D5enB9T\/9P1hWxLf\/NgiGCueg159vz7Ex6+tPAR83aQLPyGeuF74Y5C9VpzQjL2IYlgC9A6hhT82p\/kQTjTk="}

 springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/model/dos/SysUserNoticeDO.java

@@ -3,9 +3,7 @@
import java.io.Serializable;
import java.util.Date;

import com.baomidou.mybatisplus.annotation.FieldFill;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableName;
import com.baomidou.mybatisplus.annotation.*;

import lombok.Data;

@@ -23,6 +21,7 @@
    /**
     * id
     */
    @TableId(type = IdType.ASSIGN_ID)
    private Long id;

    /**

 springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/service/impl/UserServiceImpl.java

@@ -1584,11 +1584,11 @@
                || operlog.getTitle().equals(UPDATEACIDRECORD));
        if (flag) {
            //保存数据
            try {
                operlog.setBeforeUpdateData(saveBeforeUpdateData(operlog));
            } catch (JsonProcessingException e) {
                e.printStackTrace();
            }
//            try {
////                operlog.setBeforeUpdateData(saveBeforeUpdateData(operlog));
//            } catch (JsonProcessingException e) {
//                e.printStackTrace();
//            }
        }
        SysOperLogDO sysOperLogDO = new SysOperLogDO();
        BeanUtils.copyProperties(operlog, sysOperLogDO);