chenyongxing 7 年 前
コミット
50d4833d78

+ 6 - 0
svr/svr-base/src/main/java/com/yihu/jw/wx/service/WxAccessTokenService.java

@ -10,6 +10,8 @@ import com.yihu.jw.wx.dao.WxAccessTokenDao;
import com.yihu.jw.wx.model.WxAccessToken;
import com.yihu.jw.wx.model.WxWechat;
import org.json.JSONObject;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.util.StringUtils;
@ -24,6 +26,9 @@ import java.util.UUID;
@Service
public class WxAccessTokenService extends BaseJpaService<WxAccessToken, WxAccessTokenDao> {
    private Logger logger= LoggerFactory.getLogger(WxAccessTokenService.class);
    @Autowired
    private WxAccessTokenDao wxAccessTokenDao;
@ -66,6 +71,7 @@ public class WxAccessTokenService extends BaseJpaService<WxAccessToken, WxAccess
            }
            String params = "grant_type=client_credential&appid=" + appId + "&secret=" + appSecret;
            String result = HttpUtil.sendGet(token_url, params);
            logger.info("--------------微信返回结果:"+result+"---------------");
            JSONObject json = new JSONObject(result);
            if (json.has("access_token")) {
                String token = json.get("access_token").toString();

+ 7 - 2
svr/svr-base/src/main/java/com/yihu/jw/wx/service/WxMenuService.java

@ -10,6 +10,8 @@ import com.yihu.jw.wx.model.WxAccessToken;
import com.yihu.jw.wx.model.WxMenu;
import com.yihu.jw.wx.model.WxWechat;
import org.json.JSONObject;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.util.StringUtils;
@ -25,6 +27,8 @@ import java.util.List;
@Service
public class WxMenuService extends BaseJpaService<WxMenu, WxMenuDao> {
    private Logger logger= LoggerFactory.getLogger(WxMenuService.class);
    @Autowired
    private WxMenuDao wxMenuDao;
@ -35,7 +39,7 @@ public class WxMenuService extends BaseJpaService<WxMenu, WxMenuDao> {
    private WxAccessTokenService wxAccessTokenService;
    /**
     * 将菜单保存至数据库(微信未创建)
     * 将菜单保存至数据库
     * @param wxMenu
     * @return
     */
@ -120,18 +124,19 @@ public class WxMenuService extends BaseJpaService<WxMenu, WxMenuDao> {
        if(wechat==null){
            throw new ApiException(WxContants.Wechat.message_fail_wxWechat_is_no_exist, CommonContants.common_error_params_code);
        }
        //首先根据wechatCode获取菜单,然后封装成json字符串
        List<WxMenu> menus = wxMenuDao.findByWechatCode(wechatCode);
        if(menus==null){
            throw new ApiException(WxContants.WxMenu.message_fail_WxMenu_is_no_exist, CommonContants.common_error_params_code);
        }
        String menuJsonString = getMenuToString(menus, wechatCode);
        logger.info("-----------------微信菜单json字符串:"+ menuJsonString+"--------------------");
        WxAccessToken wxAccessTokenByCode = wxAccessTokenService.getWxAccessTokenByCode(wechatCode);
        String token = wxAccessTokenByCode.getAccessToken();
        // 请求微信接口创建菜单
        String url = " https://api.weixin.qq.com/cgi-bin/menu/create?access_token=" + token;
        String jsonStr = HttpUtil.sendPost(url, menuJsonString);
        logger.info("------------------创建微信菜单,微信返回结果:"+jsonStr+"---------------------");
        JSONObject result = new JSONObject(jsonStr);
        return result;
    }

+ 7 - 0
svr/svr-base/src/main/java/com/yihu/jw/wx/service/WxTemplateService.java

@ -10,6 +10,8 @@ import com.yihu.jw.util.HttpUtil;
import com.yihu.jw.wx.dao.WxTemplateDao;
import com.yihu.jw.wx.model.*;
import org.json.JSONObject;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.util.StringUtils;
@ -22,6 +24,8 @@ import java.util.*;
@Service
public class WxTemplateService extends BaseJpaService<WxTemplate, WxTemplateDao> {
    private Logger logger= LoggerFactory.getLogger(WxTemplateService.class);
    @Autowired
    private WxTemplateDao wxTemplateDao;
@ -148,11 +152,14 @@ public class WxTemplateService extends BaseJpaService<WxTemplate, WxTemplateDao>
            wechatTemplate.setData(newDataMap);
            String params = mapper.writeValueAsString(wechatTemplate);
            logger.info("----------------------模版消息json字符串:"+params+"------------------");
            WxAccessToken wxAccessTokenByCode = wxAccessTokenService.getWxAccessTokenByCode(wechatCode);
            String token = wxAccessTokenByCode.getAccessToken();
            String token_url = "https://api.weixin.qq.com/cgi-bin/message/template/send?access_token=" + token;
            String result = HttpUtil.sendPost(token_url, params);
            logger.info("------------------------发送模板消息,微信返回结果:"+result+"-----------------------");
            JSONObject jsonResult = new JSONObject(result);
            return jsonResult;
        } catch (Exception e) {

+ 14 - 15
svr/svr-wlyy/src/main/java/com/yihu/jw/util/AddressUtils.java

@ -34,7 +34,6 @@ public class AddressUtils {
        String returnStr = this.getResult(urlStr, content, encodingString);
        if (returnStr != null) {
            // 处理返回的省市区信息
            System.out.println(returnStr);
            String[] temp = returnStr.split(",");
            if (temp.length < 3) {
                return "0";//无效IP,局域网测试
@ -204,18 +203,18 @@ public class AddressUtils {
    }
    // 测试
    public static void main(String[] args) {
        AddressUtils addressUtils = new AddressUtils();
        // 测试ip 219.136.134.157 中国-华南-广东省-广州市-越秀区-电信
        String ip = "219.136.134.157";
        String address = "";
        try {
            address = addressUtils.getAddresses(ip);
        } catch (UnsupportedEncodingException e) {
            // TODO Auto-generated catch block
            e.printStackTrace();
        }
        System.out.println(address);
        // 输出结果为:广东省,广州市,越秀区
    }
    //public static void main(String[] args) {
    //    AddressUtils addressUtils = new AddressUtils();
    //    // 测试ip 219.136.134.157 中国-华南-广东省-广州市-越秀区-电信
    //    String ip = "219.136.134.157";
    //    String address = "";
    //    try {
    //        address = addressUtils.getAddresses(ip);
    //    } catch (UnsupportedEncodingException e) {
    //        // TODO Auto-generated catch block
    //        e.printStackTrace();
    //    }
    //    System.out.println(address);
    //    // 输出结果为:广东省,广州市,越秀区
    //}
}

+ 8 - 8
svr/svr-wlyy/src/main/java/com/yihu/jw/util/IDCard.java

@ -205,14 +205,14 @@ public class IDCard {
     * @param args
     * @throws ParseException
     */
    @SuppressWarnings("static-access")
    public static void main(String[] args) throws ParseException {
        // String IDCardNum="210102820826411";
        // String IDCardNum="210102198208264114";
        String IDCardNum = "350583199301130079";
        IDCard cc = new IDCard();
        // System.out.println(cc.isDate("1996-02-29"));
    }
    //@SuppressWarnings("static-access")
    //public static void main(String[] args) throws ParseException {
    //    // String IDCardNum="210102820826411";
    //    // String IDCardNum="210102198208264114";
    //    String IDCardNum = "350583199301130079";
    //    IDCard cc = new IDCard();
    //    // System.out.println(cc.isDate("1996-02-29"));
    //}
    /*********************************** 身份证验证结束 ****************************************/
}

+ 10 - 0
svr/svr-wlyy/src/main/java/com/yihu/jw/wlyy/service/patient/AdvertisementService.java

@ -12,6 +12,8 @@ import com.yihu.jw.wlyy.entity.agreement.WlyySignFamily;
import com.yihu.jw.wlyy.entity.patient.WlyyAdvertisement;
import com.yihu.jw.wlyy.service.BaseSaasService;
import com.yihu.jw.wlyy.service.agreement.WlyySignFamilyService;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.util.StringUtils;
@ -28,6 +30,8 @@ import java.util.List;
@Service
public class AdvertisementService extends BaseJpaService<WlyyAdvertisement, AdvertisementDao> {
    private Logger logger= LoggerFactory.getLogger(AdvertisementService.class);
    @Autowired
    private AdvertisementDao advertisementDao;
@ -166,9 +170,11 @@ public class AdvertisementService extends BaseJpaService<WlyyAdvertisement, Adve
     */
    public  List<WlyyAdvertisement> getByHttp(HttpServletRequest request){
        String ipAddress = CusAccessObjectUtil.getIpAddress(request);
        logger.info("-------------请求的ip地址为:"+ipAddress+"--------------");
        AddressUtils addressUtils = new AddressUtils();
        try {
            String address = addressUtils.getAddresses(ipAddress);//"中国-西南-四川省-成都市- -电信"  (没有值,中间用空格隔开  country-area-region-city-county-isp)或者返回0
            logger.info("ip地址:"+ipAddress+"解析为:"+address);
            String[] addresses = address.split("-");
            if(addresses.length<6){
                return  getDefaultList();
@ -187,6 +193,7 @@ public class AdvertisementService extends BaseJpaService<WlyyAdvertisement, Adve
            }
        } catch (UnsupportedEncodingException e) {//解析ip失败,展示默认广告
            logger.warn("解析ip:"+ipAddress+"解析失败,失败原因:"+e.getMessage());
            return  getDefaultList();
        }
@ -199,8 +206,10 @@ public class AdvertisementService extends BaseJpaService<WlyyAdvertisement, Adve
     */
    public  List<WlyyAdvertisement> getListByIp(String ipaddress){
        try {
            logger.info("-------------请求的ip地址为:"+ipaddress+"--------------");
            AddressUtils addressUtils = new AddressUtils();
            String address = addressUtils.getAddresses(ipaddress);
            logger.info("ip地址:"+ipaddress+"解析为:"+address);
            String[] addresses = address.split("-");
            if(addresses.length<6){
                return  getDefaultList();
@ -219,6 +228,7 @@ public class AdvertisementService extends BaseJpaService<WlyyAdvertisement, Adve
            }
        } catch (UnsupportedEncodingException e) {//解析ip失败,展示默认广告
            logger.warn("解析ip:"+ipaddress+"解析失败,失败原因:"+e.getMessage());
            return  getDefaultList();
        }