修复整合bug

godaner · godaner · commit c571894c9159 · 2017-10-11T14:44:37.000+08:00
修复整合bug
diff --git a/.settings/org.eclipse.core.resources.prefs b/.settings/org.eclipse.core.resources.prefs
@@ -1,4 +1,5 @@
 eclipse.preferences.version=1
+encoding//WebRoot/common/view/visit.jsp=UTF-8
 encoding//WebRoot/users/css/login_style.css=UTF-8
 encoding//WebRoot/users/css/register_style.css=UTF-8
 encoding//WebRoot/users/view/exception.jsp=UTF-8
diff --git a/WebRoot/common/view/visit.jsp b/WebRoot/common/view/visit.jsp
@@ -1,12 +1,23 @@
 
 <!-- 
-	获取地理位置 
+	è·åå°çä½ç½® 
 	var remote_ip_info = {"ret":1,"start":-1,"end":-1,"country":"\u4e2d\u56fd","province":"\u6c5f\u82cf","city":"\u5357\u901a","district":"","isp":"","type":"","desc":""};
 -->
 <script type="text/javascript" charset="utf-8" src='http://int.dpool.sina.com.cn/iplookup/iplookup.php?format=js'></script>
 <!-- 
-	获取ip 
-	var returnCitySN = {"cip": "180.120.216.21", "cid": "320600", "cname": "江苏省南通市"};
+	è·åip 
+	var returnCitySN = {"cip": "180.120.216.21", "cid": "320600", "cname": "æ±èçåéå¸"};
 -->
 <script type="text/javascript" charset="utf-8" src="http://pv.sohu.com/cityjson?ie=utf-8"></script> 
+<script  type="text/javascript" charset="utf-8">
+	var remote_ip_info = remote_ip_info;
+	if(undefined ==  remote_ip_info){//联网无效处理
+		remote_ip_info = {"cip": "0.0.0.0", "cid": "000000", "cname": "未知"};
+	}
+	var returnCitySN = returnCitySN;
+	if(undefined == returnCitySN){//联网无效处理
+		returnCitySN = {"ret":-1,"start":-1,"end":-1,"country":"未知","province":"未知","city":"未知","district":"","isp":"","type":"","desc":""};
+	}
+</script> 
+
 <script type="text/javascript" charset="utf-8" src="${baseUrl}/common/js/visit.js"></script>
diff --git a/WebRoot/goods/js/index.js b/WebRoot/goods/js/index.js
@@ -286,7 +286,6 @@ $(function () {
 	function getData(min,region,orderByTime,orderByPrice,minPrice,maxPrice,clazzs){
 		console.log("minPrice:"+minPrice);
 		console.log("maxPrice:"+maxPrice);
-		
 		$('.trading_item_info>ul').empty();//清除容器中的所有数据
 		var url ="minLine="+min+
 				  "&region="+region +
diff --git a/WebRoot/users/js/register.js b/WebRoot/users/js/register.js
@@ -31,11 +31,13 @@ $(function(){
 function showregister(){
 	$(".register_box").show();
 	showCover();//遮罩层
+	
 }
 /*关闭注册框*/
 function closeregister(){
 	$(".register_box").hide();
 	hideCover();//遮罩层
+	refreshVC();
 }
 /* 打印错误信息 */
 function RegisterErrorMsg(msg){
@@ -55,6 +57,7 @@ $("#"+id).css("border","solid 1px rgb(243,243,243)");
 }
 
 
+
 /*邮箱验证*/
 function Check_email(){
 	var email_re = $("#email").val().trim();
diff --git a/config/config.properties b/config/config.properties
@@ -24,3 +24,5 @@ config.goods.imgs.maxNumber=5
 config.goods.clazzs.maxNumber=3
 #\u5356\u5bb6\u63d0\u4ea4\u7684\u51ed\u8bc1\u7684\u4fdd\u5b58\u4f4d\u7f6e
 config.src.users.returnmoneybill=d:\\sht_src\\users\\returnmoneybill\\
+#\u963f\u91cc\u652f\u4ed8\u5b9d\u56de\u8c03url
+config.alipay.url=http://av8mjf.natappfree.cc
diff --git a/config/db.properties b/config/db.properties
@@ -1,6 +1,6 @@
 #oracle\u8fde\u63a5\u914d\u7f6e
 db.driver=oracle.jdbc.driver.OracleDriver
-db.url=jdbc:oracle:thin:@localhost:1521:orcl
+db.url=jdbc:oracle:thin:@localhost:1521:xe
 db.username=sht
 db.password=123
 
diff --git a/config/struts/struts-users.xml b/config/struts/struts-users.xml
@@ -7,8 +7,8 @@
 	<package namespace="/users" name="users-package" extends="base-package">
 		<!-- 全局result配置 -->
 		<global-results>
-			<result name="rIndex" type="redirect">/users/view/index.jsp</result>
-			<result name="fIndex">/users/view/index.jsp</result>
+			<result name="rIndex" type="redirect">/goods/view/index.jsp</result>
+			<result name="fIndex">/goods/view/index.jsp</result>
 			
 			<result name="rLogin" type="redirect">/users/view/login.jsp</result>
 			<result name="fLogin">/goods/view/index.jsp</result>
diff --git a/src/com/sht/alipay/config/AlipayConfig.java b/src/com/sht/alipay/config/AlipayConfig.java
@@ -3,6 +3,9 @@
 import java.io.FileWriter;
 import java.io.IOException;
 
+import com.sht.util.Static.CONFIG;
+import com.sht.util.Util;
+
 /* *
  *类名：AlipayConfig
  *功能：基础配置类
@@ -16,7 +19,7 @@
 public class AlipayConfig {
 	
 //↓↓↓↓↓↓↓↓↓↓请在这里配置您的基本信息↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓
-	private static String url = "http://bp59ph.natappfree.cc";
+	private static String url = Util.getValue(CONFIG.FIELD_ALIPAY_CONFIG_URL).toString();
 	// 应用ID,您的APPID，收款账号既是您的APPID对应支付宝账号
 	public static String app_id = "2016081500253717";
 	
diff --git a/src/com/sht/users/action/UsersAction.java b/src/com/sht/users/action/UsersAction.java
@@ -8,10 +8,9 @@
 import org.springframework.context.annotation.Scope;
 import org.springframework.stereotype.Controller;
 
-import antlr.StringUtils;
-
 import com.alipay.api.internal.util.AlipaySignature;
 import com.sht.alipay.config.AlipayConfig;
+import com.sht.po.Users;
 import com.sht.users.po.CustomUsers;
 import com.sht.users.service.UsersServiceI;
 
@@ -101,6 +100,8 @@ public void regist() throws Exception{
 			
 			String code2 = po.getCode();
 			
+			eject(code1 == null,"验证码错误");
+			
 			eject(!code2.toLowerCase().equals(code1.toLowerCase()), "验证码错误");
 			
 			service.regist(po);
@@ -110,8 +111,12 @@ public void regist() throws Exception{
 			//http://localhost:80/sht
 			String webaddr = getWebAddr();
 			
+			
+			//储存验证信息
+			setSessionAttr(po.getId(), uuid);
+			
 			//String conetnt = "<a href='"+webaddr+"/users/verifyEmail.action?email="+po.getEmail()+"&code="+uuid+"'>请点击这里激活</a>";
-			String conetnt = "<a href='"+webaddr+"/users/view/backtoindex.jsp?email="+po.getEmail()+"&code="+uuid+"'>请点击这里激活</a>";
+			String conetnt = "<a href='"+webaddr+"/users/activityUser.action?id="+po.getId()+"&code="+uuid+"'>请点击这里激活</a>";
 			
 			email.sendMessage(po.getEmail(), "二手交易市场邮箱验证", conetnt);
 			
@@ -127,6 +132,35 @@ public void regist() throws Exception{
 			writeJSON(po);
 			po.setMsg(null);
 	}
+	
+	
+	
+	/**
+	  * Title:
+	  * <p>
+	  * Description:激活邮箱验证用户
+	  * <p>
+	  * @author Kor_Zhang
+	  * @date 2017年10月11日 下午2:14:13
+	  * @version 1.0
+	  * @return
+	 * @throws Exception 
+	  */
+	public String activityUser() throws Exception{
+		
+		String c = getSessionAttr(po.getId());
+		if(c != null && c.equals(po.getCode())){
+			
+			po.setStatus(USERS_STATUS.ACTIVITY);
+			
+			service.updateByPrimaryKeySelective(po);
+
+			Users u = service.selectUserById(po.getId());
+			
+			setSessionAttr(FILED_ONLINE_USER,u );
+		}
+		return "fIndex";
+	}
 	/**
 	 * Title:logout
 	 * <p>
@@ -146,7 +180,7 @@ public String logout() throws Exception{
 		
 		setRequestAttr(FIELD_REQUEST_RETURN_MSG, "注销成功");
 		
-		return "fLogin";
+		return "rLogin";
 	}
 	
 	/**
diff --git a/src/com/sht/users/service/UsersServiceI.java b/src/com/sht/users/service/UsersServiceI.java
@@ -1,9 +1,6 @@
 package com.sht.users.service;
 
-import java.awt.image.RenderedImage;
-import java.io.File;
-import java.util.List;
-
+import com.sht.po.Users;
 import com.sht.users.po.CustomUsers;
 
 /**
@@ -92,4 +89,18 @@ public interface UsersServiceI {
 	 */
 	public void changePasswordByObj(CustomUsers po) throws Exception;
 
+	/**
+	  * Title:
+	  * <p>
+	  * Description:selectUserById
+	  * <p>
+	  * @author Kor_Zhang
+	  * @date 2017年10月11日 下午2:21:22
+	  * @version 1.0
+	  * @param id
+	  * @return
+	  * @throws Exception
+	  */
+	public Users selectUserById(String id) throws Exception;
+
 }
diff --git a/src/com/sht/users/service/impl/UsersService.java b/src/com/sht/users/service/impl/UsersService.java
@@ -1,21 +1,16 @@
 ﻿package com.sht.users.service.impl;
 
-import java.awt.image.RenderedImage;
-import java.io.File;
-import java.sql.Timestamp;
 import java.util.Date;
-import java.util.List;
 import java.util.UUID;
 
-import org.apache.ibatis.annotations.Param;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import com.sht.mapper.UsersMapper;
+import com.sht.po.Users;
 import com.sht.users.mapper.CustomUsersMapper;
 import com.sht.users.po.CustomUsers;
 import com.sht.users.service.UsersServiceI;
-import com.sht.util.Static.CONFIG;
 /**
  * Title:UsersService
  * <p>
@@ -166,4 +161,10 @@ public void changePasswordByObj(CustomUsers po) throws Exception {
 		
 	}
 
+	@Override
+	public Users selectUserById(String id) throws Exception {
+		
+		return usersMapper.selectByPrimaryKey(id);
+	}
+
 }
diff --git a/src/com/sht/util/Static.java b/src/com/sht/util/Static.java
@@ -120,6 +120,12 @@ public interface CONFIG{
 		 */
 		static final String FILED_SRC_RETURN_MONEY_BILL = "config.src.users.returnmoneybill";
 		
+		
+		/**
+		 * 回调的url
+		 */
+		static final String FIELD_ALIPAY_CONFIG_URL = "config.alipay.url";
+		
 	}
 	
 	

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,5 @@`
`1`	`1`	`eclipse.preferences.version=1`
	`2`	`+encoding//WebRoot/common/view/visit.jsp=UTF-8`
`2`	`3`	`encoding//WebRoot/users/css/login_style.css=UTF-8`
`3`	`4`	`encoding//WebRoot/users/css/register_style.css=UTF-8`
`4`	`5`	`encoding//WebRoot/users/view/exception.jsp=UTF-8`
Original file line number	Diff line number	Diff line change
`@@ -31,11 +31,13 @@ $(function(){`
`31`	`31`	`function showregister(){`
`32`	`32`	`$(".register_box").show();`
`33`	`33`	`showCover();//遮罩层`
	`34`	`+`
`34`	`35`	`}`
`35`	`36`	`/关闭注册框/`
`36`	`37`	`function closeregister(){`
`37`	`38`	`$(".register_box").hide();`
`38`	`39`	`hideCover();//遮罩层`
	`40`	`+ refreshVC();`
`39`	`41`	`}`
`40`	`42`	`/* 打印错误信息 */`
`41`	`43`	`function RegisterErrorMsg(msg){`
`@@ -55,6 +57,7 @@ $("#"+id).css("border","solid 1px rgb(243,243,243)");`
`55`	`57`	`}`
`56`	`58`
`57`	`59`
	`60`	`+`
`58`	`61`	`/邮箱验证/`
`59`	`62`	`function Check_email(){`
`60`	`63`	`var email_re = $("#email").val().trim();`