Kaynağa Gözat

Merge branch 'test' of jishutao/jitao-server into prod

anderx 4 yıl önce
ebeveyn
işleme
7deaf08a3c

+ 24 - 0
.idea/inspectionProfiles/Project_Default.xml

@@ -0,0 +1,24 @@
+<component name="InspectionProjectProfileManager">
+  <profile version="1.0">
+    <option name="myName" value="Project Default" />
+    <inspection_tool class="HtmlNonExistentInternetResource" enabled="true" level="WARNING" enabled_by_default="true" />
+    <inspection_tool class="HtmlUnknownTag" enabled="false" level="WARNING" enabled_by_default="false">
+      <option name="myValues">
+        <value>
+          <list size="6">
+            <item index="0" class="java.lang.String" itemvalue="nobr" />
+            <item index="1" class="java.lang.String" itemvalue="noembed" />
+            <item index="2" class="java.lang.String" itemvalue="comment" />
+            <item index="3" class="java.lang.String" itemvalue="noscript" />
+            <item index="4" class="java.lang.String" itemvalue="embed" />
+            <item index="5" class="java.lang.String" itemvalue="script" />
+          </list>
+        </value>
+      </option>
+      <option name="myCustomValuesEnabled" value="true" />
+    </inspection_tool>
+    <inspection_tool class="ThymeleafDialectDomInspection" enabled="false" level="ERROR" enabled_by_default="false" />
+    <inspection_tool class="ThymeleafVariablesResolveInspection" enabled="false" level="ERROR" enabled_by_default="false" />
+    <inspection_tool class="XmlInvalidId" enabled="false" level="ERROR" enabled_by_default="false" />
+  </profile>
+</component>

+ 2 - 0
.idea/webContexts.xml

@@ -3,7 +3,9 @@
   <component name="WebContextManager">
     <option name="state">
       <map>
+        <entry key="file://$PROJECT_DIR$/src/main/webapp/WEB-INF/views/common.html" value="file://$PROJECT_DIR$/src/main/webapp/WEB-INF/views" />
         <entry key="file://$PROJECT_DIR$/src/main/webapp/WEB-INF/views/portal/service/services.html" value="file://$PROJECT_DIR$/src/main/webapp/WEB-INF/views/portal/service" />
+        <entry key="file://$PROJECT_DIR$/src/main/webapp/WEB-INF/views/user/signIn.html" value="file://$PROJECT_DIR$/src/main/webapp/WEB-INF/views/user" />
       </map>
     </option>
   </component>

+ 1 - 4
src/main/java/com/goafanti/common/controller/PublicController.java

@@ -5,10 +5,7 @@ import java.io.FileInputStream;
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.OutputStream;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.UUID;
+import java.util.*;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 

+ 13 - 13
src/main/java/com/goafanti/common/utils/VerifyCodeUtils.java

@@ -40,7 +40,7 @@ public class VerifyCodeUtils {
 
 	/**
 	 * 验证码对象
-	 * 
+	 *
 	 */
 	public static class Verify {
 
@@ -67,7 +67,7 @@ public class VerifyCodeUtils {
 
 	/**
 	 * 使用系统默认字符源生成验证码
-	 * 
+	 *
 	 * @param verifySize
 	 *            验证码长度
 	 * @return
@@ -83,7 +83,7 @@ public class VerifyCodeUtils {
 
 	/**
 	 * 使用系统默认字符源生成验证码
-	 * 
+	 *
 	 * @param verifySize
 	 *            验证码长度
 	 * @return
@@ -94,7 +94,7 @@ public class VerifyCodeUtils {
 
 	/**
 	 * 手机验证码
-	 * 
+	 *
 	 * @param verifySize
 	 * @return
 	 */
@@ -121,22 +121,22 @@ public class VerifyCodeUtils {
 	public static void clearVerifyCode() {
 		TokenManager.getSession().removeAttribute(V_CODE);
 	}
-	
+
 	/**
 	 * 清除手机验证码
 	 */
 	public static void clearMobileCode(){
 		TokenManager.getSession().removeAttribute(M_CODE);
 	}
-	
+
 	public static void clearMobileCodeTime(){
 		TokenManager.getSession().removeAttribute(VerifyCodeUtils.M_CODE_TIME);
 	}
-	
+
 	public static void clearResetCode(){
 		TokenManager.getSession().removeAttribute(VerifyCodeUtils.RESET_CODE);
 	}
-	
+
 	public static void clearResetCodeTime(){
 		TokenManager.getSession().removeAttribute(VerifyCodeUtils.RESET_CODE_TIME);
 	}
@@ -151,7 +151,7 @@ public class VerifyCodeUtils {
 
 	/**
 	 * 使用指定源生成验证码
-	 * 
+	 *
 	 * @param verifySize
 	 *            验证码长度
 	 * @param sources
@@ -173,7 +173,7 @@ public class VerifyCodeUtils {
 
 	/**
 	 * 生成随机验证码文件,并返回验证码值
-	 * 
+	 *
 	 * @param w
 	 * @param h
 	 * @param outputFile
@@ -189,7 +189,7 @@ public class VerifyCodeUtils {
 
 	/**
 	 * 输出随机验证码图片流,并返回验证码值
-	 * 
+	 *
 	 * @param w
 	 * @param h
 	 * @param os
@@ -205,7 +205,7 @@ public class VerifyCodeUtils {
 
 	/**
 	 * 生成指定验证码图像文件
-	 * 
+	 *
 	 * @param w
 	 * @param h
 	 * @param outputFile
@@ -232,7 +232,7 @@ public class VerifyCodeUtils {
 
 	/**
 	 * 输出指定验证码图片流
-	 * 
+	 *
 	 * @param w
 	 * @param h
 	 * @param os

+ 25 - 17
src/main/java/com/goafanti/user/controller/UserRegisterController.java

@@ -53,10 +53,10 @@ public class UserRegisterController extends BaseController {
 	@Resource
 	private VoucherService		voucherService;
 	Logger					logger	= Logger.getLogger(UserRegisterController.class);
-	
+
 	/**
 	 * 网站用户注册
-	 * 
+	 *
 	 * @param user
 	 * @return
 	 */
@@ -82,15 +82,23 @@ public class UserRegisterController extends BaseController {
 			res.getError().add(buildError(ErrorConstants.USER_ALREADY_EXIST, "用户已存在"));
 			return res;
 		}
-		if (TokenManager.getSession().getAttribute(VerifyCodeUtils.M_CODE_TIME) ==null||!TokenManager.getSession().getAttribute(VerifyCodeUtils.M_CODE).equals(mobileCode.toLowerCase())) {
-			res.getError().add(buildError(ErrorConstants.MCODE_ERROR, "手机验证码错误"));
-			return res;
-		}
-		// 验证码15分钟有效
-		if (TimeUtils.checkOverTime("register")) {
-			res.getError().add(buildError(ErrorConstants.MCODE_OVERTIME_ERROR, "手机验证码超时失效"));
+		//手机验证码切换成图片验证码
+		String vcode= (String) TokenManager.getVal2Session(VerifyCodeUtils.V_CODE);
+		if (vcode==null ||!vcode.equals(mobileCode)){
+
+			res.getError().add(buildError(ErrorConstants.USER_ALREADY_EXIST, "验证码不存在或错误"));
 			return res;
 		}
+
+//		if (TokenManager.getSession().getAttribute(VerifyCodeUtils.M_CODE_TIME) ==null||!TokenManager.getSession().getAttribute(VerifyCodeUtils.M_CODE).equals(mobileCode.toLowerCase())) {
+//			res.getError().add(buildError(ErrorConstants.MCODE_ERROR, "手机验证码错误"));
+//			return res;
+//		}
+//		// 验证码15分钟有效
+//		if (TimeUtils.checkOverTime("register")) {
+//			res.getError().add(buildError(ErrorConstants.MCODE_OVERTIME_ERROR, "手机验证码超时失效"));
+//			return res;
+//		}
 		if (user.getBeInviteCode()!=null&&!user.getBeInviteCode().equals("")&&userService.checkeToInviteCode(user.getBeInviteCode())) {
 				res.getError().add(buildError("邀请码不存在", "邀请码不存在"));
 				return res;
@@ -120,11 +128,11 @@ public class UserRegisterController extends BaseController {
 		}
 		return res;
 	}
-	
-	
+
+
 	/**
 	 * APP用户注册
-	 * 
+	 *
 	 * @param user
 	 * @return
 	 */
@@ -187,10 +195,10 @@ public class UserRegisterController extends BaseController {
 		}
 		return res;
 	}
-	
+
 	/*public void getVoucher(User u){
 		if (StringUtils.isNotBlank(u.getBackgroundUrl())) {
-			
+
 			List<String> ids=voucherService.getSourceVoucher(VoucherSourceType.BYQFWS.getCode());
 			for (String s : ids) {
 				JtVoucherDetail j=new JtVoucherDetail();
@@ -201,10 +209,10 @@ public class UserRegisterController extends BaseController {
 				j.setStatus(0);
 				voucherDetailService.saveVoucherDetail(j);
 			}
-			
+
 		}
 	}
-	
+
 	private void registerEasemobAfterRegister(String uuid,User u){
 			JSONObject resultObj = new JSONObject();
 			String easemobName =  String.valueOf(u.getNumber());
@@ -215,6 +223,6 @@ public class UserRegisterController extends BaseController {
 			easemobUtils.send(
 					new EasemobInfo().uri("/users/").data(resultObj.toJSONString()).method(HttpMethod.POST));
 			//绑定账号
-			messageService.addJpushEasemobAccount(uuid,u.getId(),easemobName,easemobPass);		
+			messageService.addJpushEasemobAccount(uuid,u.getId(),easemobName,easemobPass);
 	}*/
 }

+ 2 - 2
src/main/resources/props/config_local.properties

@@ -38,13 +38,13 @@ app.name=AFT
 app.mobile.website=http://m.jishutao.com/1.0/template/index.html
 template.cacheable=false
 
-#static.host=//ss.jishutao.com/client/1.2.8
+static.host=//ss.jishutao.com/client/1.2.10
 portal.host=//ss.jishutao.com/portal/1.2.12
 skjt.host=//ss.jishutao.com/skjt/1.3
 
 
 #本地
-static.host=//172.16.1.187/client/1.2.8
+#static.host=//172.16.1.187/client/1.2.8
 #static.host=//172.16.0.255:3000/jitao/client/1.2.9
 #portal.host=//172.16.0.255:3000/jitao/portal/1.2.12
 #portal.host=//172.16.1.187/portal/1.2.11

+ 1 - 2
src/main/webapp/WEB-INF/views/common.html

@@ -7,8 +7,7 @@
   <meta charset="UTF-8">
   <link rel="shortcut icon " type="images/x-icon" th:href="${portalHost+ '/img/ico_logo.png'}">
   <meta name="Keywords" content="高新技术企业认定_双软评估_军工认证_知识产权贯标_知识产权转移_科德"/>
-  <meta name="Description" th:content="${'科德信息咨询有限公司'+yearCount+'年来专注于国家高新技术企业认定,知识产权贯标,知识产权转移,双软评估,
-	体系认证,专利申请,军工三证,工程技术研究中心,创新小巨人等湖南省市科技项目申报、成果转化的信息咨询旗舰企业,获得政府部门权威认证的咨询服务机构.'}"/>
+  <meta name="Description" th:content="${'科德信息咨询有限公司'+yearCount+'年来专注于国家高新技术企业认定,知识产权贯标,知识产权转移,双软评估,体系认证,专利申请,军工三证,工程技术研究中心,创新小巨人等湖南省市科技项目申报、成果转化的信息咨询旗舰企业,获得政府部门权威认证的咨询服务机构.'}"/>
   <meta name="viewport" content="width=device-width, initial-scale=1.0">
   <meta http-equiv="X-UA-Compatible" content="ie=edge">
   <th:block th:replace="${link}" />

+ 7 - 0
src/main/webapp/WEB-INF/views/user/signIn.html

@@ -32,6 +32,13 @@
 						<span class="Tips "></span>
 					</div>
 					<div class="zhuce_input">
+						<img th:src="${portalHost+'/img/indedImg/enroll4.png'}" alt=""/>
+						<input type="text" name="cellCode" placeholder="验证码" id="photo_num" autocomplete="off" />
+						<img id="photo" src="" alt="">
+						<span class="star"> * </span>
+						<span class="Tips"></span>
+					</div>
+					<div class="zhuce_input">
 						<img th:src="${portalHost+'/img/indedImg/enroll6.png'}" alt=""/>
 						<input type="password" name="userPassword" placeholder="请输入密码" id="userpassword" autocomplete="off"/>
 						<span class="star"> * </span>