Authored by ping

updatea

Showing 21 changed files with 14 additions and 16 deletions
... ... @@ -17,6 +17,7 @@ import com.yoho.error.exception.ServiceException;
* Created by yoho on 2016/6/17.
*/
@Controller
@RequestMapping("/tencentMkt/TencentMktController")
public class TencentMktController {
static Logger log = LoggerFactory.getLogger(TencentMktController.class);
... ... @@ -33,7 +34,7 @@ public class TencentMktController {
* @return
* @throws Exception
*/
@RequestMapping(params = "method=wap.activity.tencent.sendSms")
@RequestMapping("/sendSms")
@ResponseBody
public ApiResponse sendSms(String area, String mobile) throws ServiceException {
log.info("sendSms with area={}, mobile={}", area, mobile);
... ... @@ -51,7 +52,7 @@ public class TencentMktController {
* flag=4表示分享活动未开始,
* flag=1正常
*/
@RequestMapping(params = "method=wap.activity.tencent.getActivityInfo")
@RequestMapping("/getActivityInfo")
@ResponseBody
public ApiResponse getActivityInfo(String activityCode) {
log.info("getActivityInfo param activityCode={}", activityCode);
... ... @@ -74,7 +75,7 @@ public class TencentMktController {
* @return
* @throws ServiceException
*/
@RequestMapping(params = "method=wap.activity.tencent.validRegCodeAndSendCode")
@RequestMapping("/validRegCodeAndSendCode")
@ResponseBody
public ApiResponse validRegCodeAndSendCode(String code, String area, String mobile, String client_id) throws ServiceException {
log.info("validRegCodeAndSendCode with code={},area={}, mobile={},", code, area, mobile);
... ...
... ... @@ -21,6 +21,7 @@
<value>.+/CocacolaController/.+</value>
<value>.+/CouponActivityController/.+</value>
<value>.+/staticFileManage/.+</value>
<value>.+/TencentMktController/.+</value>
</list>
</property>
<property name="excludeMethods">
... ... @@ -28,9 +29,6 @@
<value>app.drawline.sendAwardToLuckyUser</value>
<value>app.drawline.executeAddWhiteUser</value>
<value>app.drawline.executeAddVirtualUser</value>
<value>wap.activity.tencent.sendSms</value>
<value>wap.activity.tencent.getActivityInfo</value>
<value>wap.activity.tencent.validRegCodeAndSendCode</value>
</list>
</property>
</bean>
... ...
... ... @@ -21,11 +21,11 @@
<url-pattern>/sendCoupon/html/*</url-pattern>
<url-pattern>/sendCoupon/images/*</url-pattern>
<url-pattern>/js/*</url-pattern>
<url-pattern>/marketExtend/*</url-pattern>
<url-pattern>/marketExtend/css/*</url-pattern>
<url-pattern>/marketExtend/font/*</url-pattern>
<url-pattern>/marketExtend/img/*</url-pattern>
<url-pattern>/marketExtend/js/*</url-pattern>
<url-pattern>/tencentMkt/index.html</url-pattern>
<url-pattern>/tencentMkt/css/*</url-pattern>
<url-pattern>/tencentMkt/font/*</url-pattern>
<url-pattern>/tencentMkt/img/*</url-pattern>
<url-pattern>/tencentMkt/js/*</url-pattern>
</servlet-mapping>
<servlet>
... ...
... ... @@ -50,8 +50,7 @@
phone,
reg,
tipMessage = $('#tipMessage').html(),
activityID = $('#activityID').html(),
activityCode = $('#activityCode').val();
activityID = $('#activityID').html();
__webpack_require__(14);
... ... @@ -100,7 +99,7 @@
$(function(){
$.ajax({
url: '/activity?method=wap.activity.tencent.getActivityInfo',
url: '/activity/tencentMkt/TencentMktController/getActivityInfo',
data: {
activityCode: activityCode
},
... ... @@ -151,7 +150,7 @@
return;
}
$.ajax({
url: '/activity?method=wap.activity.tencent.sendSms',
url: '/activity/tencentMkt/TencentMktController/sendSms',
data: {
mobile: $('#phone').val(),
activityCode: activityCode
... ... @@ -184,7 +183,7 @@
$('.input-content div').eq('1').removeClass('get');
if ($(this).siblings('input').val().length === 4) {
$.ajax({
url: '/activity?method=wap.activity.tencent.validRegCodeAndSendCode',
url: '/activity/tencentMkt/TencentMktController/validRegCodeAndSendCode',
data: {
code: $('#verification').val(),
mobile: $('#phone').val(),
... ...