Kaynağa Gözat

活动策划开发

anderx 3 yıl önce
ebeveyn
işleme
636dc0188e

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

@@ -0,0 +1,23 @@
+<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" />
+  </profile>
+</component>

+ 1 - 0
.idea/webContexts.xml

@@ -4,6 +4,7 @@
     <option name="state">
       <map>
         <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>

+ 19 - 19
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,15 @@ 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, "手机验证码超时失效"));
-			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 +120,11 @@ public class UserRegisterController extends BaseController {
 		}
 		return res;
 	}
-	
-	
+
+
 	/**
 	 * APP用户注册
-	 * 
+	 *
 	 * @param user
 	 * @return
 	 */
@@ -187,10 +187,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 +201,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 +215,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

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

@@ -31,6 +31,10 @@
 						<span class="star"> * </span>
 						<span class="Tips "></span>
 					</div>
+					<div class="slider">
+						拖动滑块验证
+						<div class="slider_btn"></div>
+					</div>
 					<div class="zhuce_input">
 						<img th:src="${portalHost+'/img/indedImg/enroll6.png'}" alt=""/>
 						<input type="password" name="userPassword" placeholder="请输入密码" id="userpassword" autocomplete="off"/>