初始化

common/src/main/java/com/jpsoft/order/modules/common/utils/WechatMessageUtil.java

@@ -1,218 +0,0 @@
-package com.jpsoft.order.modules.common.utils;
-
-import com.jpsoft.order.modules.wechat.entity.AccessToken;
-import lombok.extern.slf4j.Slf4j;
-import net.sf.json.JSONObject;
-import org.apache.commons.lang3.StringUtils;
-import java.io.BufferedReader;
-import java.io.InputStreamReader;
-import java.io.OutputStream;
-import java.net.HttpURLConnection;
-import java.net.URL;
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
-
-@Slf4j
-public class WechatMessageUtil {
-    public static final String send_template = "https://api.weixin.qq.com/cgi-bin/message/template/send?access_token=ACCESS_TOKEN";
-
-    /**
-     * 微信发送模版
-     *
-     * @param sendData   发送数据
-     * @param templateId 模版Id
-     * @param openId     发送人
-     * @param url        详情跳转地址
-     * @return
-     */
-    public static boolean sendTemplate(JSONObject sendData,String tokenUrl, String appId, String appSecret, String templateId, String openId, String url) {
-        boolean result = false;
-
-        AccessToken accessToken = WeixinUtil.getCommonAccessToken(tokenUrl, appId, appSecret);
-
-        if (accessToken != null) {
-            //发送模版内容
-            String sendTemplateUrl = send_template.replace("ACCESS_TOKEN", accessToken.getToken());
-
-            JSONObject sendTemplateData = new JSONObject();
-
-            sendTemplateData.put("touser", openId);
-            sendTemplateData.put("template_id", templateId);
-            sendTemplateData.put("url", url);
-            sendTemplateData.put("data", sendData);
-
-            log.warn("模版发送Id>>>>" + templateId + ">>>模版发送数据>>>>>" + sendTemplateData.toString());
-
-            String sendTemplateRet = HttpConnectionUtil.requestByPost(sendTemplateUrl, sendTemplateData.toString());
-
-            log.warn("模版发送返回数据>>>>>" + sendTemplateRet);
-
-            if (StringUtils.isNotBlank(sendTemplateRet)) {
-                JSONObject sendTemplateJson = JSONObject.fromObject(sendTemplateRet);
-
-                if ("0".equals(sendTemplateJson.getString("errcode"))) {
-                    //发送成功
-                    result = true;
-                }
-            }
-        }
-
-        return result;
-    }
-
-    public static String sendNativeTemplate(String tokenUrl,String appId,String appSecret,String templateId, String openId,JSONObject sendData,String urlPath) {
-        String result = "";
-
-        try {
-            AccessToken accessToken = WeixinUtil.getCommonAccessToken(tokenUrl,appId, appSecret);
-
-            if (accessToken == null) {
-                throw new Exception("token无法获取");
-            }
-
-            //发送模版内容
-            String sendTemplateUrl = send_template.replace("ACCESS_TOKEN", accessToken.getToken());
-
-            JSONObject sendTemplateData = new JSONObject();
-
-            sendTemplateData.put("touser", openId);
-            sendTemplateData.put("template_id", templateId);
-            sendTemplateData.put("url", urlPath);
-            sendTemplateData.put("data", sendData);
-
-            URL url = new URL(sendTemplateUrl);
-            HttpURLConnection conn = (HttpURLConnection) url.openConnection();
-            conn.setRequestMethod("POST");
-            conn.setDoOutput(true);
-            conn.setDoInput(true);
-            conn.setUseCaches(false);
-            conn.setRequestProperty("Connection", "Keep-Alive");
-            conn.setRequestProperty("Charset", "UTF-8");
-
-            // 设置文件类型:
-            conn.setRequestProperty("Content-Type","application/json; charset=UTF-8");
-
-            // 设置接收类型否则返回415错误
-            //conn.setRequestProperty("accept","*/*")此处为暴力方法设置接受所有类型，以此来防范返回415;
-            conn.setRequestProperty("accept","application/json");
-            conn.setConnectTimeout(5000);
-            conn.setReadTimeout(5000);
-
-            String dataStr = sendTemplateData.toString();
-
-            log.warn("发送数据:" + dataStr);
-            // 往服务器里面发送数据
-            byte[] buffer = dataStr.getBytes("UTF-8");
-
-            // 设置文件长度
-            conn.setRequestProperty("Content-Length", String.valueOf(buffer.length));
-            OutputStream output = conn.getOutputStream();
-            output.write(buffer);
-            output.flush();
-            output.close();
-
-            if (conn.getResponseCode() == 200) {
-                BufferedReader reader = new BufferedReader(new InputStreamReader(conn.getInputStream(),"UTF-8"));
-
-                StringBuilder sb = new StringBuilder();
-                String line = "";
-
-                while ((line = reader.readLine()) != null) {
-                    sb.append(line);
-                }
-
-                result = sb.toString();
-
-                log.warn("接收数据:" + result);
-
-                reader.close();
-            }
-        } catch (Exception ex) {
-            log.error(ex.getMessage(),ex);
-        }
-
-        return result;
-    }
-
-    public static String getContent(String content) {
-        String finallyContent = content;
-        String regex = "<p.*?>(.*?)</p>";
-        Pattern p = Pattern.compile(regex);
-        Matcher m = p.matcher(content);
-        while (m.find()) {
-            finallyContent = m.group(1);
-        }
-
-
-        return finallyContent;
-    }
-
-    /**
-     * 微信发送模版
-     * @return
-     */
-    public static boolean sendMessageTemplate(String userName,String content,
-                                           String sendRemark,
-                                           String sendDate,
-                                           String openId, String templateId,String tokenUrl, String appId, String appSecret) {
-        JSONObject sendData = new JSONObject();
-
-        JSONObject first = new JSONObject();
-        first.put("value", "审核结果通知");
-        first.put("color", "#FF0000");
-
-        JSONObject keyword1 = new JSONObject();
-        keyword1.put("value", userName);
-        keyword1.put("color", "#173177");
-
-        JSONObject keyword2 = new JSONObject();
-        keyword2.put("value", content);
-        keyword2.put("color", "#173177");
-
-        JSONObject keyword3 = new JSONObject();
-        keyword3.put("value", sendDate);
-        keyword3.put("color", "#173177");
-
-        JSONObject remark = new JSONObject();
-        remark.put("value", sendRemark);
-        remark.put("color", "#173177");
-
-        sendData.put("first", first);
-        sendData.put("keyword1", keyword1);
-        sendData.put("keyword2", keyword2);
-        sendData.put("keyword3", keyword3);
-        sendData.put("remark", remark);
-
-        //w8Zk_VQMFIEVSIBPZid7zSrvHmBdrgnqF76u8PLCZEs cs
-        boolean ret = sendTemplate(sendData,tokenUrl, appId, appSecret, templateId, openId, "");
-
-        return ret;
-    }
-
-
-    public static void main(String[] args) {
-		/*AccessToken at = WeixinUtil.getCommonAccessToken(APP_ID, APP_SECRET,"061iw9gy1sZ1dg09dqhy1ae3gy1iw9gq");
-
-		System.out.println(at.getOpenid());*/
-
-		/*for (int i = 0; i < 1; i++) {
-			doorMessage("1111", 2,"2018-09-22 09:00-12:00", 1, "2222222", "3333333", "oiFbN0p9jKphExeGIa3HtyL9HjqM");
-		}*/
-
-        //orderConfirmMessage("12312321312", 1111, DEFAULT_OPEN_ID);
-        //sendBillInfo("测试", "测sendNoticeMessage试", "荆鹏创业", "张三", new BigDecimal(1), "o64fbt6TTUcqLC_tyVJ60I5kzWVc", "1111", new Date());
-        //sendBillPayedMessage("测试", "荆鹏创业", "张三", new BigDecimal(1), "o64fbt6TTUcqLC_tyVJ60I5kzWVc", "11111", new Date());
-        //sendScanPayedMessage("测试", "荆鹏创业", "张三11111", new BigDecimal(1), "o64fbt6TTUcqLC_tyVJ60I5kzWVc", "11111", new Date());
-//sendNoticeMessage("测试", "sdfsdfasfasdfafasdfasdf", "oHjCawgwCGen5k1-hAsimdEX5lZo", "2222","9JKu9t9uTPHL1siIm7WatOJ1KXGolzEPlnmqIbckTUM","wx41ac6791b9dbcf52","3e3d47c5f132d4b47636a536d503fbd4");
-
-	/*	sendBillInfo("1栋-1单元-101",new BigDecimal("0.01"),"oOlFd1BUR6Fi2ayBWUeou81G8ZD4",
-				"物业费","小鹏物业","测试","9e52c923-2179-4526-a108-32becc9aa1d0","vVraOPl4OyNVWDGz6XYlJqRb7qGjjcyJdnVi5HWmFRI","wx41ac6791b9dbcf52","3e3d47c5f132d4b47636a536d503fbd4");*/
-
-        /*sendBillPayedMessage("1栋-1单元-101","物业费",new Date(),new BigDecimal("0.01"),"oOlFd1BUR6Fi2ayBWUeou81G8ZD4","33e7e5e6-5b38-45f5-9ccf-c7ef21978a5b","kbx5u70nzo7PklTVl4B1xvRffksrUtXxnDll8ggEKlo","wx41ac6791b9dbcf52","3e3d47c5f132d4b47636a536d503fbd4");*/
-
-        //sendAlarmNoticeMessage("周界入侵警报", "周界入侵，目标ID：1419，区域范围：(0.327,0.698)(0.674,0.936)(0.67,0.985)(0.352,0.973)", "oHjCawgwCGen5k1-hAsimdEX5lZo", "","8dpP8XM1XaiiIByXiuAeFIZeNjEow1AleG_h8O2xyVA","wx7e70eb62a8459869","909d17e353268da57c4f18cc09798049");
-        //sendNoticeMessage("测试", "sdfsdfasfasdfafasdfasdf", "oHjCawgwCGen5k1-hAsimdEX5lZo", "2222","vsw6sb9lMA3bcsE8MdeaGENvI1HSUy2ht9B8hS3jEzA","wx7e70eb62a8459869","909d17e353268da57c4f18cc09798049");
-//        sendTemperatureAlarmInfo("oLowyuOQ9ULF3LUGt6h3fTrsnbVE", "荆鹏软件_门房考勤机", "wx0b3c41a903053808", "43557bd62f77b0c3d6670e991872f0e7", "Mg9Ldk_kaoHAUwXFHEatrGugTlOz3yrMmMk7VoBca4M");
-//        getContent("<p>内容</p>");
-    }
-}

common/src/main/java/com/jpsoft/order/modules/common/utils/WeixinUtil.java

@@ -1,327 +0,0 @@
-package com.jpsoft.order.modules.common.utils;
-
-import cn.hutool.core.date.DateTime;
-import com.jpsoft.order.modules.wechat.entity.AccessToken;
-import com.jpsoft.order.modules.wechat.vo.UserInfo;
-import net.sf.json.JSONArray;
-import net.sf.json.JSONException;
-import net.sf.json.JSONObject;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.xml.sax.Attributes;
-import org.xml.sax.SAXException;
-import org.xml.sax.helpers.DefaultHandler;
-
-import javax.servlet.ServletInputStream;
-import javax.servlet.http.HttpServletResponse;
-import javax.xml.parsers.SAXParser;
-import javax.xml.parsers.SAXParserFactory;
-import java.io.IOException;
-import java.io.UnsupportedEncodingException;
-import java.security.MessageDigest;
-import java.util.Arrays;
-import java.util.Comparator;
-import java.util.stream.Collectors;
-
-/**
- * 公众平台通用接口工具类
- *
- * @author lt
- * @date 2013-08-09
- */
-public class WeixinUtil {
-	private static Logger log = LoggerFactory.getLogger(WeixinUtil.class);
-
-	// 获取access_token的接口地址（GET） https://api.weixin.qq.com/cgi-bin/token 限2000（次/天）
-//	public final static String access_token_url = "http://ykt.xiaoxinda.com/weixin/token?grant_type=client_credential&appid=APPID&secret=APPSECRET";
-//	public final static String access_token_url = "http://192.168.0.1:8080/weixin/token?grant_type=client_credential&appid=APPID&secret=APPSECRET";
-
-	//获取微信的code
-	public static String code = "https://open.weixin.qq.com/connect/oauth2/authorize?appid=APPID&redirect_uri=REDIRECT_URI&response_type=code&scope=SCOPE&state=STATE#wechat_redirect";
-	public static String getCodeRequest(String appid, String url,String scope){
-        String result = null;
-        String url_encode = "";
-        try {
-			url_encode = java.net.URLEncoder.encode(url, "utf-8");
-		} catch (UnsupportedEncodingException e) {
-			// TODO Auto-generated catch block
-			e.printStackTrace();
-		}
-        result  = code.replace("APPID", appid).replace("REDIRECT_URI",url_encode).replace("SCOPE", scope);
-        return result;
-    }
-
-	//通过code换取网页授权access_token
-	public static String accessTokenurl = "https://api.weixin.qq.com/sns/oauth2/access_token?appid=APPID&secret=SECRET&code=CODE&grant_type=authorization_code";
-	public static AccessToken getAccessToken(String appid, String appsecret,String code) throws Exception {
-        AccessToken accessToken = null;
-        String formatUrl = accessTokenurl.replace("APPID", appid).replace("SECRET",appsecret).replace("CODE", code);
-        JSONObject json  = HttpConnectionUtil.httpRequest(formatUrl, "GET", null);
-        if (!json.isNullObject() && !json.isEmpty()) {
-			try {
-				accessToken = new AccessToken();
-				accessToken.setToken(json.getString("access_token"));
-				accessToken.setExpiresIn(json.getInt("expires_in"));
-				accessToken.setOpenid(json.getString("openid"));
-				accessToken.setScope(json.getString("scope"));
-			} catch (Exception e) {
-
-				// 获取token失败
-				log.error("获取token失败,返回结果result={}", json);
-				if (json.getString("errcode").equals("40163")){
-					throw new Exception("请重新扫码");
-
-				}
-
-			}
-		}
-        return accessToken;
-    }
-
-	public static String jsAccessTokenUrl = "https://api.weixin.qq.com/cgi-bin/ticket/getticket?access_token=ACCESS_TOKEN&type=jsapi";
-	public static String getJsAPI(String accessToken){
-		String formatUrl = jsAccessTokenUrl.replace("ACCESS_TOKEN", accessToken);
-        JSONObject json  = HttpConnectionUtil.httpRequest(formatUrl, "GET", null);
-
-        if (!json.isNullObject() && !json.isEmpty()) {
-			try {
-				return json.getString("ticket");
-			} catch (Exception e) {
-				// 获取token失败
-				log.error("获取jsAPI失败,返回结果result={}", json);
-			}
-		}
-
-        return null;
-	}
-
-	/**
-	 * 获取access_token
-	 *
-	 * @param appid 凭证
-	 * @param appsecret 密钥
-	 * @return
-	 */
-	public static AccessToken getCommonAccessToken(String tokenUrl,String appid, String appsecret) {
-		AccessToken accessToken = null;
-
-		String requestUrl = tokenUrl.replace("APPID", appid).replace("APPSECRET", appsecret);
-//			String commonAccessTokenUrl = "http://ykt.xiaoxinda.com/weixin/token"
-//			String requestUrl = commonAccessTokenUrl
-//					+ "?grant_type=client_credential"
-//					+ "&appid=" + appid
-//					+ "&secret=" + appsecret;
-		JSONObject jsonObject =HttpConnectionUtil.httpRequest(requestUrl, "GET", null);
-		// 如果请求成功
-		if (null != jsonObject) {
-			try {
-				accessToken = new AccessToken();
-				accessToken.setToken(jsonObject.getString("access_token"));
-				accessToken.setExpiresIn(jsonObject.getInt("expires_in"));
-				//accessToken.setOpenid(jsonObject.getString("openid"));
-			} catch (JSONException e) {
-				accessToken = null;
-				// 获取token失败
-				log.error("获取token失败 errcode:{} errmsg:{}", jsonObject.getInt("errcode"), jsonObject.getString("errmsg"));
-			}
-		}
-
-
-		return accessToken;
-	}
-
-	// 获取用户信息
-	public static String user_info_url = "https://api.weixin.qq.com/sns/userinfo?access_token=ACCESS_TOKEN&openid=OPENID&lang=zh_CN";
-	public static String subscribe_user_info_url = "https://api.weixin.qq.com/cgi-bin/user/info?access_token=ACCESS_TOKEN&openid=OPENID&lang=zh_CN ";
-
-	public static UserInfo getUserInfo(String openid, String accessToken) {
-		// 拼装url
-		String url = user_info_url.replace("ACCESS_TOKEN", accessToken).replace("OPENID", openid);;
-
-		JSONObject jsonObject = HttpConnectionUtil.httpRequest(url, "GET", null);
-
-		UserInfo userInfo = null;
-		 if (null != jsonObject) {
-				try {
-					userInfo = new UserInfo();
-					userInfo.setOpenid(jsonObject.getString("openid").replaceAll("\"", ""));
-
-					userInfo.setNickname(jsonObject.getString("nickname").replaceAll("\"", ""));
-					userInfo.setCity(jsonObject.getString("city").replaceAll("\"", ""));
-					userInfo.setProvince(jsonObject.getString("province").replaceAll("\"", ""));
-					userInfo.setCountry(jsonObject.getString("country").replaceAll("\"", ""));
-					userInfo.setHeadimgurl(jsonObject.getString("headimgurl").replaceAll("\"", ""));
-				} catch (JSONException e) {
-					// 获取token失败
-					log.error("获取token失败 errcode:{} errmsg:{}", jsonObject.getInt("errcode"), jsonObject.getString("errmsg"));
-				}
-			}
-		return userInfo;
-	}
-
-	public static boolean checkSignature(String token,String signature, String timestamp, String nonce) {
-		String[] arr = new String[] { token, timestamp, nonce };
-
-		String content = Arrays.stream(arr)
-				.sorted(Comparator.naturalOrder())
-				.collect(Collectors.joining());
-
-		MessageDigest md = null;
-		String tmpStr = null;
-
-		try {
-			md = MessageDigest.getInstance("SHA-1");
-			// 将三个参数字符串拼接成一个字符串进行sha1加密
-			byte[] digest = md.digest(content.getBytes("UTF-8"));
-
-			StringBuffer hexstr = new StringBuffer();
-
-			String shaHex = "";
-
-			for (int i = 0; i < digest.length; i++) {
-				shaHex = Integer.toHexString(digest[i] & 0xFF);
-				if (shaHex.length() < 2) {
-					hexstr.append(0);
-				}
-				hexstr.append(shaHex);
-			}
-
-			tmpStr = hexstr.toString();
-		} catch (Exception e) {
-			e.printStackTrace();
-		}
-
-		// 将sha1加密后的字符串可与signature对比，标识该请求来源于微信
-		return signature.equals(tmpStr);
-	}
-
-	public static cn.hutool.json.JSONObject xmlToJson(ServletInputStream inputStream) throws Exception {
-		cn.hutool.json.JSONObject jsonObject = new cn.hutool.json.JSONObject();
-
-		// 创建sax解析工厂
-		SAXParserFactory factory = SAXParserFactory.newInstance();
-		// 创建sax转换工具
-		SAXParser saxParser = factory.newSAXParser();
-
-		saxParser.parse(inputStream,new DefaultHandler(){
-			private String tagName;
-
-			@Override
-			public void startElement(String uri, String localName, String qName, Attributes attributes) throws SAXException {
-				tagName = qName;
-			}
-
-			@Override
-			public void endElement(String uri, String localName, String qName) throws SAXException {
-				tagName = null;
-			}
-
-			@Override
-			public void characters(char[] ch, int start, int length) throws SAXException {
-				if(tagName!=null){
-					String content = new String(ch,start,length);
-					jsonObject.put(tagName,content);
-				}
-			}
-		});
-
-		return jsonObject;
-	}
-	public static void replyTextMessage(HttpServletResponse response, String fromUserName, String toUserName, String content){
-		StringBuilder sb = new StringBuilder();
-
-		sb.append("<xml>");
-		sb.append("<ToUserName><![CDATA[" + toUserName + "]]></ToUserName>");
-		sb.append("<FromUserName><![CDATA["+ fromUserName + "]]></FromUserName>");
-		sb.append("<CreateTime>" + DateTime.now().getTime() + "</CreateTime>");
-		sb.append("<MsgType><![CDATA[text]]></MsgType>");
-		sb.append("<Content><![CDATA[" + content + "]]></Content>");
-		sb.append("</xml>");
-
-		try {
-			response.getWriter().print(sb.toString());
-			response.getWriter().close();
-		} catch (IOException e) {
-			e.printStackTrace();
-		}
-	}
-
-	public static void replyArticlesMessage(HttpServletResponse response, String fromUserName, String toUserName, String title,String description,String picurl,String url){
-		StringBuilder sb = new StringBuilder();
-		sb.append("<xml>");
-		sb.append("<ToUserName><![CDATA[" + toUserName + "]]></ToUserName>");
-		sb.append("<FromUserName><![CDATA["+ fromUserName + "]]></FromUserName>");
-		sb.append("<CreateTime>" + DateTime.now().getTime() + "</CreateTime>");
-		sb.append("<MsgType><![CDATA[news]]></MsgType>");
-		sb.append("<ArticleCount>" + 1 + "</ArticleCount>");
-		sb.append("<Articles>");
-		sb.append("<item>");
-		sb.append("<Title><![CDATA["+title+"]]></Title> ");
-		sb.append("<Description><![CDATA["+description+"]]></Description>");
-		sb.append("<PicUrl><![CDATA["+picurl+"]]></PicUrl>");
-		sb.append("<Url><![CDATA["+url+"]]></Url>");
-		sb.append("</item>");
-		sb.append("</Articles>");
-		sb.append("</xml>");
-
-		try {
-			response.getWriter().print(sb.toString());
-			response.getWriter().close();
-		} catch (IOException e) {
-			e.printStackTrace();
-		}
-	}
-
-
-	/**
-	 * 创建微信菜单
-	 * @param appid
-	 * @param appSecret
-	 * @return
-	 */
-	public static String createMenu(String tokenUrl,String appid,String appSecret){
-		AccessToken token = WeixinUtil.getCommonAccessToken(tokenUrl,appid, appSecret);
-
-		System.out.println(token.getToken());
-
-		JSONObject data = new JSONObject();
-		JSONArray buttonArray = new JSONArray();
-
-		JSONObject button1 = new JSONObject();
-		button1.put("type", "view");
-		button1.put("name", "疫情监管");
-		button1.put("url", "http://wisdomhousewechat.sudaonline.net/prevention/");
-		buttonArray.add(button1);
-
-		JSONObject button2 = new JSONObject();
-		button2.put("type","view");
-		button2.put("name","智慧物业");
-		button2.put("url","http://wisdomhousewechat.sudaonline.net/#/home/?id=1");
-		buttonArray.add(button2);
-
-		JSONObject button3 = new JSONObject();
-		button3.put("type","click");
-		button3.put("name","关于系统");
-		button3.put("key","文章");
-		buttonArray.add(button3);
-
-		data.put("button", buttonArray);
-		data.put("action_name", "QR_LIMIT_STR_SCENE");
-
-		JSONObject actionInfo = new JSONObject();
-		JSONObject scene = new JSONObject();
-
-		scene.put("scene_str", "6");
-
-		actionInfo.put("scene", scene);
-
-		data.put("action_info", actionInfo);
-		System.out.println(data.toString());
-		//创建菜单
-		String result = HttpConnectionUtil.getHttpContentByPost(" https://api.weixin.qq.com/cgi-bin/menu/create?access_token=" + token.getToken(), "utf-8", data.toString());
-
-		return result;
-	}
-
-
-}

common/src/main/java/com/jpsoft/order/modules/sys/entity/User.java

@@ -31,6 +31,6 @@ public class User {
 	private String createBy;
 	private String updateBy;
 	private List<String> roles;
-	private String schoolId;
-	private String schoolName;
+	private String orgId;
+	private String orgName;
 }

common/src/main/java/com/jpsoft/order/modules/wechat/entity/AccessToken.java

@@ -1,29 +0,0 @@
-package com.jpsoft.order.modules.wechat.entity;
-
-import lombok.Data;
-
-/**
- * @author 墨鱼_mo
- * @date 2019-12-11 15:29
- */
-@Data
-public class AccessToken {
-
-    /**
-     * 获取到的凭证
-     */
-    private String token;
-    /**
-     * 凭证有效时间，单位：秒
-     */
-    private int expiresIn;
-    /**
-     * 用户唯一标识
-     */
-    private String openid;
-
-    /**
-     * 类型
-     */
-    private String scope;
-}

common/src/main/java/com/jpsoft/order/modules/wechat/vo/UserInfo.java

@@ -1,20 +0,0 @@
-package com.jpsoft.order.modules.wechat.vo;
-
-import lombok.Data;
-
-/**
- * 微信通用接口凭证
- * 
- * @author lt
- * @date 2013-08-08
- */
-@Data
-public class UserInfo {
-	private String openid;
-	private String nickname;
-	private String city;
-	private String country;
-	private String province;
-	private String headimgurl;
-
-}

common/src/main/resources/mapper/sys/User.xml

@@ -13,7 +13,7 @@
         <result property="delFlag" column="del_flag"/>
         <result property="createBy" column="create_by"/>
         <result property="updateBy" column="update_by"/>
-        <result property="schoolId" column="school_id"/>
+        <result property="orgId" column="org_id"/>
     </resultMap>
     <insert id="insert" parameterType="com.jpsoft.order.modules.sys.entity.User">
         <!--
@@ -24,7 +24,7 @@
         <![CDATA[
 		insert into sys_user
 	    (id_,user_name,password_,real_name,create_time,update_time,
-	    del_flag,create_by,update_by,school_id)
+	    del_flag,create_by,update_by,org_id)
 		values
 		(
             #{id,jdbcType=VARCHAR}
@@ -36,7 +36,7 @@
             ,#{delFlag,jdbcType= NUMERIC }
             ,#{createBy,jdbcType=VARCHAR}
             ,#{updateBy,jdbcType=VARCHAR}
-            ,#{schoolId,jdbcType=VARCHAR}
+            ,#{orgId,jdbcType=VARCHAR}
 		)
 	]]>
     </insert>
@@ -70,8 +70,8 @@
             <if test="updateBy!=null">
                 update_by=#{updateBy,jdbcType=VARCHAR},
             </if>
-            <if test="schoolId!=null">
-                school_id=#{schoolId,jdbcType=VARCHAR},
+            <if test="orgId!=null">
+                org_id=#{orgId,jdbcType=VARCHAR},
             </if>
         </set>
         where id_=#{id}

web/src/main/java/com/jpsoft/order/modules/wechat/controller/WxController.java

@@ -1,109 +0,0 @@
-package com.jpsoft.order.modules.wechat.controller;
-
-import com.jpsoft.order.config.WechatConfig;
-import com.jpsoft.order.modules.common.dto.MessageResult;
-import com.jpsoft.order.modules.common.utils.Sign;
-import com.jpsoft.order.modules.common.utils.WeixinUtil;
-import com.jpsoft.order.modules.wechat.entity.AccessToken;
-import com.jpsoft.order.modules.wechat.vo.UserInfo;
-import io.swagger.annotations.ApiOperation;
-import lombok.extern.slf4j.Slf4j;
-import org.apache.commons.lang3.StringUtils;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.data.redis.core.RedisTemplate;
-import org.springframework.data.redis.core.SetOperations;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-
-import java.util.HashMap;
-import java.util.Map;
-import java.util.concurrent.TimeUnit;
-
-@Slf4j
-@RequestMapping("/wechat")
-@RestController
-public class WxController {
-    @Autowired
-    private WechatConfig wechatConfig;
-
-    @Autowired
-    private RedisTemplate<String,Object> redisTemplate;
-
-    @Autowired
-    private SetOperations<String,Object> setOperations;
-
-    @ApiOperation(value = "获取微信配置")
-    @GetMapping(value = "/getConfig")
-    public MessageResult getConfig(String url) {
-        int code = 200;
-        String message = "获取成功";
-        Object data = "";
-        boolean result = true;
-
-        try {
-            AccessToken token = WeixinUtil.getCommonAccessToken(wechatConfig.getTokenUrl(),wechatConfig.getAppId(), wechatConfig.getAppSecret());
-
-            Map<String, String> wxMap = Sign.sign(WeixinUtil.getJsAPI(token.getToken()), url);
-
-            wxMap.put("appId", wechatConfig.getAppId());
-
-            HashMap<String, Object> dataMap = new HashMap<String, Object>();
-
-            dataMap.put("wxConfig", wxMap);
-
-            data = dataMap;
-        } catch (Exception ex) {
-            code = 500;
-            result = false;
-            message = "系统错误";
-        }
-
-        return new MessageResult(result, message, data, code);
-    }
-
-    @ApiOperation(value = "获取公众号用户信息")
-    @GetMapping(value = "findUserInfo/{code}")
-    public MessageResult findUserInfo(@PathVariable String code) {
-        try {
-            String key = "wx_userInfo";
-
-            if (!redisTemplate.hasKey(key)){
-                setOperations.add(key, code);
-                redisTemplate.expire(key,6, TimeUnit.HOURS);
-            }
-            else {
-                if (!setOperations.isMember(key, code)) {
-                    setOperations.add(key, code);
-                } else {
-                    log.error(code + "已使用!");
-                    return new MessageResult(false, "获取微信信息失败", "", 500);
-                }
-            }
-
-            AccessToken at = WeixinUtil.getAccessToken(wechatConfig.getAppId(), wechatConfig.getAppSecret(), code);
-
-            if (at != null && StringUtils.isNotBlank(at.getOpenid())) {
-                String openId = at.getOpenid();
-                System.out.println("openId:" + openId);
-
-                UserInfo userInfo = WeixinUtil.getUserInfo(openId, at.getToken());
-
-                HashMap<String, Object> dataMap = new HashMap<String, Object>();
-
-                dataMap.put("userInfo", userInfo);
-
-                return new MessageResult(true, "获取微信信息成功", userInfo, 200);
-
-            } else {
-                return new MessageResult(false, "获取微信信息失败", "", 400);
-            }
-
-        } catch (Exception ex) {
-            log.error(ex.getMessage(),ex);
-
-            return new MessageResult(false, "系统错误", "", 500);
-        }
-    }
-}