yanghui
2022-11-01 49f8452f2df3a630cf62e0c03909fe6862c4fc98
Merge branch 'local_20221024' into huacheng_test
6个文件已修改
109 ■■■■ 已修改文件
springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/WxOfficialApi.java 71 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/umf/MyAESUtil.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/utlis/WxUtil.java 18 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/message/AcidMessage.java 2 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/model/dos/SysOperLogDO.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/service/impl/UserServiceImpl.java 14 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/WxOfficialApi.java
@@ -1,15 +1,14 @@
package com.panzhihua.applets.api;
import java.io.*;
import java.net.HttpURLConnection;
import java.net.URL;
import java.nio.charset.StandardCharsets;
import java.util.*;
import java.util.concurrent.TimeUnit;
import javax.annotation.Resource;
import com.panzhihua.common.api.LcApiConstants;
import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONObject;
import com.panzhihua.applets.config.WxMaConfiguration;
import com.panzhihua.common.constants.UserConstants;
import com.panzhihua.common.model.vos.R;
import com.panzhihua.common.utlis.HttpClientUtil;
import com.panzhihua.common.utlis.StringUtils;
import io.swagger.annotations.ApiOperation;
import lombok.extern.slf4j.Slf4j;
import org.springframework.data.redis.core.StringRedisTemplate;
import org.springframework.data.redis.core.ValueOperations;
import org.springframework.web.bind.annotation.GetMapping;
@@ -17,15 +16,13 @@
import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.RestController;
import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONObject;
import com.panzhihua.common.constants.UserConstants;
import com.panzhihua.common.model.vos.R;
import com.panzhihua.common.utlis.HttpClientUtil;
import com.panzhihua.common.utlis.StringUtils;
import io.swagger.annotations.ApiOperation;
import lombok.extern.slf4j.Slf4j;
import javax.annotation.Resource;
import java.io.*;
import java.net.HttpURLConnection;
import java.net.URL;
import java.nio.charset.StandardCharsets;
import java.util.*;
import java.util.concurrent.TimeUnit;
@Slf4j
@RestController
@@ -34,6 +31,8 @@
    @Resource
    private StringRedisTemplate stringRedisTemplate;
    @Resource
    private WxMaConfiguration wxMaConfiguration;
    // 公众号appid
    private List<String> appidList = new ArrayList<String>() {
@@ -67,8 +66,7 @@
    /**
     * 根据文章链接抓取文章内容
     *
     * @param url
     *            文章链接
     * @param url 文章链接
     * @return 文章内容
     */
    public static String getActicle(String url) {
@@ -85,16 +83,19 @@
    /**
     * 获取token
     *
     * @param appid
     *            公众号appid
     * @param secret
     *            公众号secret
     * @param appid  公众号appid
     * @param secret 公众号secret
     * @return token
     */
    private String getToken(String appid, String secret) throws IOException {
        // access_token接口https请求方式: GET
        // https://api.weixin.qq.com/cgi-bin/token?grant_type=client_credential&appid=APPID&secret=APPSECRET
        String path = " https://api.weixin.qq.com/cgi-bin/token?grant_type=client_credential";
        //改从redis中获取
        return stringRedisTemplate.boundValueOps("access_token:access_token:" + appid).get();
/*        String path = " https://api.weixin.qq.com/cgi-bin/token?grant_type=client_credential";
        URL url = new URL(path + "&appid=" + appid + "&secret=" + secret);
        HttpURLConnection connection = (HttpURLConnection)url.openConnection();
        connection.setRequestMethod("GET");
@@ -110,20 +111,19 @@
        // System.out.println(sb.toString());
        in.close();
        return sb.toString();
        return sb.toString();*/
    }
    /**
     * 通过token获取公众号文章
     *
     * @param token
     *            token
     * @param token token
     * @return 获取的文章列表结果
     */
    private String getContentList(String token) throws IOException {
        String path = " https://api.weixin.qq.com/cgi-bin/material/batchget_material?access_token=" + token;
        URL url = new URL(path);
        HttpURLConnection connection = (HttpURLConnection)url.openConnection();
        HttpURLConnection connection = (HttpURLConnection) url.openConnection();
        connection.setRequestMethod("POST");
        connection.setDoOutput(true);
        connection.setRequestProperty("content-type", "application/json;charset=utf-8");
@@ -164,21 +164,20 @@
            for (int i = 0; i < appidList.size(); i++) {
                String token = officialApi.getToken(appidList.get(i), secretList.get(i));
                log.info("通过appid:" + appidList.get(i) + "获取token返回参数:" + token);
                JSONObject tokenJson = JSON.parseObject(token);
                if (StringUtils.isNotEmpty(tokenJson)) {
                    tokenList.add(tokenJson.getString("access_token"));
                if (StringUtils.isNotEmpty(token)) {
                    tokenList.add(token);
                }
            }
        }
        List<JSONObject> resultList = new ArrayList<>();
        Boolean newsListKey = stringRedisTemplate.hasKey(UserConstants.NEWS_LIST);
        if(newsListKey != null && newsListKey){
        if (newsListKey != null && newsListKey) {
            String json = valueOperations.get(UserConstants.NEWS_LIST);
            resultList = JSON.parseArray(json,JSONObject.class);
            resultList = JSON.parseArray(json, JSONObject.class);
            return R.ok(resultList);
        }
        if (!tokenList.isEmpty()) {
            for (String token:tokenList) {
            for (String token : tokenList) {
                try {
                    String url = "https://api.weixin.qq.com/cgi-bin/material/batchget_material?access_token=" + token;
                    String result = getActicle(url);
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\":\"3\",\"wash_name\":null,\"wash_mobile\":null,\"phone\":\"13980596944\"}", "Ryo7M3n8loC5Abcd");
        String ryo7M3n8loC5Abcd = MyAESUtil.Encrypt("{\"order_status\":\"6\",\"wash_name\":null,\"wash_mobile\":null,\"phone\":\"13699017236\"}", "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/common/src/main/java/com/panzhihua/common/utlis/WxUtil.java
@@ -525,7 +525,7 @@
        subscribeDTO.setTemplate_id(templateId);
        subscribeDTO.setPage("packageD/pages/washer/order/index");
        List<TemplateParam> paras=new ArrayList<TemplateParam>();
        paras.add(new TemplateParam("thing9", StrUtil.isBlank(washerName) ? "":washerName));
        paras.add(new TemplateParam("thing9", StrUtil.isBlank(washerName) ? "无":washerName));
        paras.add(new TemplateParam("phone_number10",StrUtil.isBlank(washerMobile) ? "0":washerMobile));
        subscribeDTO.setTemplateParamList(paras);
        try {
@@ -576,8 +576,8 @@
        subscribeDTO.setPage("packageD/pages/washer/order/index");
        List<TemplateParam> paras=new ArrayList<TemplateParam>();
        paras.add(new TemplateParam("thing4", status));
        paras.add(new TemplateParam("thing3", StrUtil.isBlank(washerName) ? "":washerName));
        paras.add(new TemplateParam("thing6",StrUtil.isBlank(washerMobile) ? "":washerMobile));
        paras.add(new TemplateParam("thing3", StrUtil.isBlank(washerName) ? "无":washerName));
        paras.add(new TemplateParam("thing6",StrUtil.isBlank(washerMobile) ? "无":washerMobile));
        subscribeDTO.setTemplateParamList(paras);
        try {
            sendSubscribe(accessToken,subscribeDTO);
@@ -602,8 +602,8 @@
        subscribeDTO.setPage("pages/washer/order/index");
        List<TemplateParam> paras=new ArrayList<TemplateParam>();
        paras.add(new TemplateParam("thing4", status));
        paras.add(new TemplateParam("thing3", StrUtil.isBlank(washerName) ? "":washerName));
        paras.add(new TemplateParam("thing6",StrUtil.isBlank(washerMobile) ? "":washerMobile));
        paras.add(new TemplateParam("thing3", StrUtil.isBlank(washerName) ? "无":washerName));
        paras.add(new TemplateParam("thing6",StrUtil.isBlank(washerMobile) ? "无":washerMobile));
        subscribeDTO.setTemplateParamList(paras);
        try {
            sendSubscribe(accessToken,subscribeDTO);
@@ -628,8 +628,8 @@
        subscribeDTO.setPage("packageD/pages/washer/order/index");
        List<TemplateParam> paras=new ArrayList<TemplateParam>();
        paras.add(new TemplateParam("phrase14", status));
        paras.add(new TemplateParam("name3", StrUtil.isBlank(washerName) ? "":washerName));
        paras.add(new TemplateParam("thing5",StrUtil.isBlank(washerMobile) ? "":washerMobile));
        paras.add(new TemplateParam("name3", StrUtil.isBlank(washerName) ? "无":washerName));
        paras.add(new TemplateParam("thing5",StrUtil.isBlank(washerMobile) ? "无":washerMobile));
        subscribeDTO.setTemplateParamList(paras);
        try {
            sendSubscribe(accessToken,subscribeDTO);
@@ -654,8 +654,8 @@
        subscribeDTO.setPage("pages/washer/order/index");
        List<TemplateParam> paras=new ArrayList<TemplateParam>();
        paras.add(new TemplateParam("phrase14", status));
        paras.add(new TemplateParam("name3", StrUtil.isBlank(washerName) ? "":washerName));
        paras.add(new TemplateParam("thing5",StrUtil.isBlank(washerMobile) ? "":washerMobile));
        paras.add(new TemplateParam("name3", StrUtil.isBlank(washerName) ? "无":washerName));
        paras.add(new TemplateParam("thing5",StrUtil.isBlank(washerMobile) ? "无":washerMobile));
        subscribeDTO.setTemplateParamList(paras);
        try {
            sendSubscribe(accessToken,subscribeDTO);
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/message/AcidMessage.java
@@ -117,8 +117,6 @@
    public void sendMessage(ComActDynVO comActDynVO) {
        try {
            List<String> openIds = sysUserDao.selectOpenId();
            String appId = "wx118de8a734d269f0";
            WxXCXTempSend wxXCXTempSend = new WxXCXTempSend();
            WxMaService maService = wxMaConfiguration.getMaService("wx118de8a734d269f0");
            for (int i = 0; i < openIds.size(); i++) {
                try {
springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/model/dos/SysOperLogDO.java
@@ -15,7 +15,7 @@
 * @create: 2020-12-25 10:34
 **/
@Data
@TableName("sys_oper_log_1")
@TableName("sys_oper_log")
public class SysOperLogDO implements Serializable {
    private static final long serialVersionUID = 1L;
springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/service/impl/UserServiceImpl.java
@@ -1001,7 +1001,7 @@
                userDao.updateComPbMemberUserId(idCard, sysUserDO.getUserId());
            }
            SysUserDO user = userDao.selectById(loginUserInfoVO.getUserId());
            /*SysUserDO user = userDao.selectById(loginUserInfoVO.getUserId());
            if (user != null) {
                // 实名认证成功推送订阅消息给用户
                try {
@@ -1014,7 +1014,7 @@
                } catch (Exception e) {
                    log.error("推送用户订阅消息失败,失败原因:" + e.getMessage());
                }
            }
            }*/
            return R.ok();
        }
        return R.fail();
@@ -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);