Merge remote-tracking branch 'origin/test'

src/main/java/com/ekexiu/portal/dao/ProfessorDao.java

@@ -482,7 +482,7 @@ public abstract class ProfessorDao {
	public EditProfessor queryEditBaseInfo(Connection con, String id) throws SQLException {
		int index = 1;
		String sql = "SELECT P.OFFICE,P.DEPARTMENT,P.TITLE,AUTHENTICATION,AUTH_TYPE,P.AUTH_STATUS,"
				+ " P.ID,P.NAME,P.ADDRESS,P.STAR_LEVEL,P.CONSULT_COUNT,P.ORG_AUTH,ORGANIZATION.NAME,P.SHARE_ID "
				+ " P.ID,P.NAME,P.ADDRESS,P.STAR_LEVEL,P.CONSULT_COUNT,P.ORG_AUTH,ORGANIZATION.NAME,P.SHARE_ID,P.PHONE,P.EMAIL,P.PROVINCE "
				+ " FROM PROFESSOR P LEFT JOIN ORGANIZATION ON P.ORG_ID = ORGANIZATION.ID WHERE P.ID = ?";
		PreparedStatement ps = con.prepareStatement(sql);
		try {
@@ -529,6 +529,9 @@ public abstract class ProfessorDao {
					}
					professor.setOrgName(orgName);
					professor.setShareId(rs.getLong(14));
					professor.setPhone(rs.getString(15));
					professor.setEmail(rs.getString(16));
					professor.setProvince(rs.getString(17));
					return professor;
				} else {
					return null;

src/main/java/com/ekexiu/portal/msg/WebMsgDao.java

@@ -53,12 +53,12 @@ public interface WebMsgDao {
	@UpdateWith
	@From(WebMsgIdx.class)
	@SetSentence("NUM_OF_ACTOR = NUM_OF_ACTOR + 1,SHOW_OF_ACTOR='1'")
	@SetSentence("NUM_OF_ACTOR = NUM_OF_ACTOR + 1,SHOW_OF_ACTOR='1',SHOW_OF_OWNER='1'")
	int incActorNum(Connection con, String owner, String actor, @Set String lastCnt, @Set long lastTime) throws SQLException;
	@UpdateWith
	@From(WebMsgIdx.class)
	@SetSentence("NUM_OF_OWNER = NUM_OF_OWNER + 1,SHOW_OF_OWNER='1'")
	@SetSentence("NUM_OF_OWNER = NUM_OF_OWNER + 1,SHOW_OF_OWNER='1',SHOW_OF_ACTOR='1'")
	int incOwnerNum(Connection con, String owner, String actor, @Set String lastCnt, @Set long lastTime) throws SQLException;
	@UpdateWith

src/main/java/com/ekexiu/portal/oauth/BaseOAuthHandler.java

@@ -0,0 +1,27 @@
package com.ekexiu.portal.oauth;
import org.jfw.util.exception.JfwBaseException;
public class BaseOAuthHandler implements OAuthHandler {
	private String type;
	
	public void setType(String type){
		this.type = type;
	}
	@Override
	public String getType() {
		return type;
	}
	@Override
	public String getLoginUrl() {
		throw new UnsupportedOperationException();
	}
	@Override
	public OAuthUser login(String code) throws JfwBaseException {
		throw new UnsupportedOperationException();
	}
}

src/main/java/com/ekexiu/portal/oauth/OAuthService.java

@@ -1,5 +1,7 @@
package com.ekexiu.portal.oauth;
import java.io.IOException;
import java.lang.reflect.Type;
import java.sql.Connection;
import java.sql.SQLException;
import java.util.HashMap;
@@ -14,6 +16,7 @@ import org.jfw.apt.web.annotation.operate.Post;
import org.jfw.apt.web.annotation.param.JdbcConn;
import org.jfw.util.context.JfwAppContext;
import org.jfw.util.exception.JfwBaseException;
import org.jfw.util.reflect.TypeReference;
import org.jfw.util.state.StateCode;
import com.ekexiu.portal.dao.ProfessorDao;
@@ -23,10 +26,14 @@ import com.ekexiu.portal.po.Professor;
import com.ekexiu.portal.po.User;
import com.ekexiu.portal.po.UserOpenId;
import com.ekexiu.portal.pojo.SessionUser;
import com.ekexiu.portal.util.HttpUtil;
@Path("/oauth")
public class OAuthService {
	private static final Type MAP_TYPE = new TypeReference<Map<String, Object>>() {
	}.getType();
	private long expriesWithOpenId = 1000 * 60 * 10;
	@Autowrie
@@ -36,6 +43,9 @@ public class OAuthService {
	@Autowrie
	private ProfessorDao professorDao;
	private String xcxAppid = "wx92750263b1138a96";
	private String xcxSecret = "246e17b10923a30bfd6cc8da1ca88b8a";
	private Map<String, OAuthHandler> handlers;
	public Map<String, OAuthHandler> getHandlers() {
@@ -122,7 +132,7 @@ public class OAuthService {
		User user = this.userDao.query(con, sc.getValue().getUserid());
		if (null == user)
			return null;
		
		JfwAppContext.removeCachedObject(authCode);
		SessionUser ret = new SessionUser();
		ret.setId(user.getId());
@@ -191,16 +201,14 @@ public class OAuthService {
			}
		}
	}
	
	
	
	@Post
	@Path("/checkAssociated")
	public boolean associcated(@JdbcConn(false) Connection con,String userid,String oauthType)throws SQLException,JfwBaseException{
	public boolean associcated(@JdbcConn(false) Connection con, String userid, String oauthType) throws SQLException, JfwBaseException {
		if (null == this.handlers.get(oauthType)) {
			throw new JfwBaseException(-1, "invalid oauthType");
		}
		return userOpenIdDao.queryByUserid(con, oauthType, userid)!=null;
		return userOpenIdDao.queryByUserid(con, oauthType, userid) != null;
	}
	@Post
@@ -238,6 +246,13 @@ public class OAuthService {
		return ret;
	}
	@Get
	@Path("/xcx/openid")
	public String jscode2session(String code) throws IOException {
		return (String) HttpUtil.<Map<String, Object>> loadJsonObject("https://api.weixin.qq.com/sns/jscode2session?appid=" + this.xcxAppid + "&secret="
				+ this.xcxSecret + "&js_code=" + code + "&grant_type=authorization_code", MAP_TYPE).get("openid");
	}
	public static class AuthLoginResponse {
		private boolean associated;
		private String authCode;

src/main/java/com/ekexiu/portal/service/SysService.java

@@ -46,6 +46,7 @@ import com.ekexiu.portal.po.Professor;
import com.ekexiu.portal.po.User;
import com.ekexiu.portal.po.UserOpenId;
import com.ekexiu.portal.pojo.SessionUser;
import com.ekexiu.portal.util.PictureVC;
@Path
public class SysService {
@@ -1804,9 +1805,18 @@ public class SysService {
	@Get
	@Path("/vcWithBind")
	public String reqBindBindMobilePhone(@JdbcConn(false) Connection con, String userid, String mobilePhone,String vcode,@SessionVal(value="verification",remove=true) String scode) throws JfwBaseException, SQLException {
		if(!vcode.toUpperCase().equals(scode)){
			throw new JfwBaseException(20001, "valid code error");
	public String reqBindBindMobilePhone(@JdbcConn(false) Connection con, String userid, String mobilePhone,String vcode,@Nullable @SessionVal(value="verification",remove=true) String scode,@Nullable String token) throws JfwBaseException, SQLException {
		if(token!=null){
			if(!PictureVC.match(token, vcode.toUpperCase(), true)){
				throw new JfwBaseException(20001, "valid code error");
			}
		}else{
			if(scode==null) {
				throw new IllegalArgumentException("not found session value:verification");
			}
			if(!vcode.toUpperCase().equals(scode)){
				throw new JfwBaseException(20001, "valid code error");
			}
		}
		User user = this.userDao.query(con, userid);
		if (null == user)
@@ -1856,10 +1866,19 @@ public class SysService {
	 */
	@Get
	@Path("/regmobilephone")
	public String regMobilePhone(@JdbcConn(false) Connection con, String mobilePhone, @DefaultValue("true") boolean checkExists,String vcode,@SessionVal(value="verification",remove=true) String scode)
	public String regMobilePhone(@JdbcConn(false) Connection con, String mobilePhone, @DefaultValue("true") boolean checkExists,String vcode,@Nullable @SessionVal(value="verification",remove=true) String scode,@Nullable String token)
			throws JfwBaseException, SQLException {
		if(!vcode.toUpperCase().equals(scode)){
			throw new JfwBaseException(20001, "valid code error");
		if(token!=null){
			if(!PictureVC.match(token, vcode.toUpperCase(), true)){
				throw new JfwBaseException(20001, "valid code error");
			}
		}else{
			if(scode==null) {
				throw new IllegalArgumentException("not found session value:verification");
			}
			if(!vcode.toUpperCase().equals(scode)){
				throw new JfwBaseException(20001, "valid code error");
			}
		}
		if (checkExists) {
			User user = this.userDao.queryByEmailOrMobilePhone(con, mobilePhone);
@@ -1895,9 +1914,18 @@ public class SysService {
	
	@Get
	@Path("/phoneValidCode")
	public String phoneValidCode(String phone,String vcode,@SessionVal(value="verification",remove=true)String scode) throws JfwBaseException{
		if(!vcode.toUpperCase().equals(scode)){
			throw new JfwBaseException(20001, "valid code error");
	public String phoneValidCode(String phone,String vcode,@Nullable @SessionVal(value="verification",remove=true)String scode,@Nullable String token) throws JfwBaseException{
		if(token!=null){
			if(!PictureVC.match(token, vcode.toUpperCase(), true)){
				throw new JfwBaseException(20001, "valid code error");
			}
		}else{
			if(scode==null) {
				throw new IllegalArgumentException("not found session value:verification");
			}
			if(!vcode.toUpperCase().equals(scode)){
				throw new JfwBaseException(20001, "valid code error");
			}
		}
		StateCode<String, String> sc = new StateCode<String, String>();
		final String key = JfwAppContext.cacheObjectAndGenKey(sc);
@@ -2034,8 +2062,13 @@ public class SysService {
	@Post
	@Path("/checkPicture")
	public boolean checkPictureVC(@SessionVal(value = "verification", defaultvalue = "null", remove = true) String verification, String submitVerification)
	public boolean checkPictureVC(@Nullable @SessionVal(value = "verification", remove = false) String verification, String submitVerification,@Nullable String token)
			throws JfwBaseException {
		if(token!=null){
			return PictureVC.match(token, submitVerification.toUpperCase(), false);
		}
		
		
		if (null == verification) {
			throw new JfwBaseException("Picture is expire !");
		}
@@ -2205,6 +2238,12 @@ public class SysService {
		return emails.length;
	}
	@Get
	@Path("/guid")
	public String guid(){
		return StringUtil.buildUUID();
	}
	public void sendInviteMail(@JdbcConn Connection con, String email, @Nullable String mobilePhone, String inviteCode)
			throws SQLException, MessagingException {
		String mailContent = this.inviteMailContentTempalte;

src/main/java/com/ekexiu/portal/service/ToolService.java

@@ -0,0 +1,17 @@
package com.ekexiu.portal.service;
import java.io.IOException;
import org.jfw.apt.web.annotation.Path;
import org.jfw.util.codec.Base64;
import com.ekexiu.portal.util.HttpUtil;
@Path("/tool")
public class ToolService {
	@Path("/resource/url/base64")
	public String urlResource(String uri)throws IOException{
		Base64 bs64 = new Base64();
		return bs64.encodeToString(HttpUtil.load(uri));		
	}
}

src/main/java/com/ekexiu/portal/util/HttpUtil.java

@@ -37,6 +37,19 @@ public final class HttpUtil {
            }
        }
    }
    
    public static byte[] load(String url)throws IOException{
    	   URL aurl = new URL(url);
           HttpURLConnection uc = (HttpURLConnection) aurl.openConnection();
           try {
               return IoUtil.readStream(uc.getInputStream(), true);
           } finally {
               try {
                   uc.disconnect();
               } catch (Throwable th) {
               }
           }
    }
    public static <T> T loadJsonObject(String url, String enc, Type typeOfT) throws IOException {
        URL aurl = new URL(url);

src/main/java/com/ekexiu/portal/util/PictureVC.java

@@ -1,6 +1,9 @@
package com.ekexiu.portal.util;
import java.io.IOException;
import java.util.LinkedList;
import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.TimeUnit;
import javax.servlet.Servlet;
import javax.servlet.ServletException;
@@ -9,23 +12,99 @@ import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import javax.servlet.http.HttpSession;
public class PictureVC extends HttpServlet implements Servlet {  
  
import org.jfw.util.context.JfwAppContext;
import org.jfw.util.state.StateCode;
public class PictureVC extends HttpServlet implements Servlet {
	private static final long serialVersionUID = 2459158903781864570L;
	public void service(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException {  
        response.setHeader("Pragma", "No-cache");  
        response.setHeader("Cache-Control", "no-cache");  
        response.setDateHeader("Expires", 0);  
        response.setContentType("image/jpeg");  
        HttpSession session = request.getSession();
        //生成随机字符串  
        String verifyCode = VerifyCodeUtils.generateVerifyCode(4);
        //将验证码设置到session里 方便验证
        session.setAttribute("verification", verifyCode);
        //生成图片  
        int w = 100, h = 40;  
        VerifyCodeUtils.outputImage(w, h, response.getOutputStream(), verifyCode);  
  
    }  
} 
	private static long timeout = 1000 * 60 * 5;
	private static long interval = 1000 * 60;
	private static ConcurrentHashMap<String, StateCode<String, String>> tokens = new ConcurrentHashMap<String, StateCode<String, String>>();
	public static void put(String key, String val) {
		StateCode<String, String> code = new StateCode<String, String>();
		code.setBuildTime(System.currentTimeMillis());
		code.setExpiredTime(code.getBuildTime() + timeout);
		code.setKey(key);
		code.setValue(val);
		tokens.put(key, code);
	}
	public static boolean match(String key, String val, boolean removed) {
		boolean result = false;
		StateCode<String, String> code = tokens.get(key);
		if (code != null) {
			if (System.currentTimeMillis() < code.getExpiredTime()) {
				result = code.getValue().equals(val);
				if (removed) {
					tokens.remove(key, code);
				}
			}
		}
		return result;
	}
	public void service(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException {
		response.setHeader("Pragma", "No-cache");
		response.setHeader("Cache-Control", "no-cache");
		response.setDateHeader("Expires", 0);
		response.setContentType("image/jpeg");
		// 生成随机字符串
		String verifyCode = VerifyCodeUtils.generateVerifyCode(4);
		String token = request.getParameter("token");
		if (token != null && token.length() == 32) {
			put(token, verifyCode);
		} else {
			HttpSession session = request.getSession();
			// 将验证码设置到session里 方便验证
			session.setAttribute("verification", verifyCode);
		}
		// 生成图片
		int w = 100, h = 40;
		VerifyCodeUtils.outputImage(w, h, response.getOutputStream(), verifyCode);
	}
	@Override
	public void init() throws ServletException {
		long longValue = 0;
		String tmp = this.getServletConfig().getInitParameter("timeout");
		try {
			longValue = Long.parseLong(tmp);
			if (longValue > (1000 * 90)) {
				PictureVC.timeout = longValue;
			}
		} catch (Throwable th) {
		}
		tmp = this.getServletConfig().getInitParameter("cleanInterval");
		try {
			longValue = Long.parseLong(tmp);
			if (longValue > (1000)) {
				PictureVC.interval = longValue;
			}
		} catch (Throwable th) {
		}
		JfwAppContext.getScheduledExecutorService().scheduleAtFixedRate(new Runnable() {
			@Override
			public void run() {
				LinkedList<StateCode<String, String>> list = new LinkedList<StateCode<String, String>>();
				long time = System.currentTimeMillis();
				for (StateCode<String, String> st : tokens.values()) {
					if ((time - st.getExpiredTime()) > 1000) {
						list.add(st);
					}
				}
				for (StateCode<String, String> st : list) {
					tokens.remove(st.getKey(), st);
				}
			}
		}, 1000, PictureVC.interval, TimeUnit.MILLISECONDS);
	}
}

src/main/resources/project-test-dev.properties

@@ -275,4 +275,8 @@ oauthService_handlers.map-key-1=weixin
oauthService_handlers.map-val-1-ref=com_ekexiu_portal_oauth_weixin_WeiXinHandler
com_ekexiu_push_service_PushService.enable::boolean=false
com_ekexiu_portal_cms_TemplateService.source::java.io.File=/kexiu/www/html1/fw_template_r3254
com_ekexiu_portal_cms_TemplateService.dir::java.io.File=/kexiu/webdata1/shtml
com_ekexiu_portal_cms_TemplateService.dir::java.io.File=/kexiu/webdata1/shtml
com_ekexiu_portal_oauth_BaseOAuthHandler=com.ekexiu.portal.oauth.BaseOAuthHandler
com_ekexiu_portal_oauth_BaseOAuthHandler.type=weixinxiaochengxu
oauthService_handlers.map-key-2=weixinxiaochengxu
oauthService_handlers.map-val-2-ref=com_ekexiu_portal_oauth_BaseOAuthHandler

src/main/resources/project-test.properties

@@ -275,4 +275,8 @@ oauthService_handlers.map-key-1=weixin
oauthService_handlers.map-val-1-ref=com_ekexiu_portal_oauth_weixin_WeiXinHandler
com_ekexiu_push_service_PushService.enable::boolean=true
com_ekexiu_portal_cms_TemplateService.source::java.io.File=/kexiu/www/html/fw_template_r3254
com_ekexiu_portal_cms_TemplateService.dir::java.io.File=/kexiu/webdata/shtml
com_ekexiu_portal_cms_TemplateService.dir::java.io.File=/kexiu/webdata/shtml
com_ekexiu_portal_oauth_BaseOAuthHandler=com.ekexiu.portal.oauth.BaseOAuthHandler
com_ekexiu_portal_oauth_BaseOAuthHandler.type=weixinxiaochengxu
oauthService_handlers.map-key-2=weixinxiaochengxu
oauthService_handlers.map-val-2-ref=com_ekexiu_portal_oauth_BaseOAuthHandler

src/main/resources/project.properties

@@ -277,3 +277,8 @@ com_ekexiu_push_service_PushService.appKey=xXqSF9Gmb69SG37XVT3lL2
com_ekexiu_push_service_PushService.appId=vGS5OBXtmV6SrDVJDQ8dGA
com_ekexiu_portal_cms_TemplateService.source::java.io.File=/kexiu/www/html/fw_template_r3254
com_ekexiu_portal_cms_TemplateService.dir::java.io.File=/kexiu/webdata/shtml
com_ekexiu_portal_oauth_BaseOAuthHandler=com.ekexiu.portal.oauth.BaseOAuthHandler
com_ekexiu_portal_oauth_BaseOAuthHandler.type=weixinxiaochengxu
oauthService_handlers.map-key-2=weixinxiaochengxu
oauthService_handlers.map-val-2-ref=com_ekexiu_portal_oauth_BaseOAuthHandler