Merge branch 'master_activity' of...

Merge branch 'master_activity' of http://113.105.137.151:22280/youjj/cloud-platform into master_activity-hf

ace-modules/ace-admin/src/main/java/com/github/wxiaoqi/security/admin/rpc/AppUserRest.java

@@ -254,5 +254,19 @@ public class AppUserRest {
         return ObjectRestResponse.succ();
 }
 
+    @ApiModelProperty("检查手机号验证码")
+    @GetMapping("/unauth/checkMobilecode")
+    public ObjectRestResponse checkMobilecode(@RequestParam(value = "phone") String phone,
+                                    @RequestParam(value = "mobilecode") String mobilecode){
+        if (StringUtils.isBlank(phone)||StringUtils.isBlank(mobilecode)){
+            return ObjectRestResponse.createFailedResult(ResultCode.NULL_CODE, "参数为空");
+        }
+        String redisKey=appPermissionService.checkCodeByUsername(phone,mobilecode);
+        if (StringUtils.isBlank(redisKey)){
+            return ObjectRestResponse.createFailedResult(ResultCode.NOTEXIST_CODE, "验证码错误");
+        }
+        return ObjectRestResponse.succ();
+    }
+
 
 }

xx-summit/xx-summit-api/src/main/java/com/xxfc/platform/summit/entity/Activity.java

@@ -80,6 +80,11 @@ public class Activity {
     @ApiModelProperty("活动场地（地址格式）")
     private String address;
 
+    @Column(name = "address_img")
+    @ApiModelProperty("地址图片")
+    private String addressImg;
+
+
     @Column(name = "latitude")
     @ApiModelProperty("纬度（不展示")
     private BigDecimal latitude;
@@ -88,9 +93,6 @@ public class Activity {
     @ApiModelProperty("经度 （不展示）")
     private BigDecimal longitude;
 
-    @Column(name = "content")
-    @ApiModelProperty("活动图文内容")
-    private String content;
 
     @Column(name = "is_show")
     @ApiModelProperty("活动开关（1开，0关）")
@@ -108,10 +110,22 @@ public class Activity {
     @ApiModelProperty("0-默认；1-报名中，2-进行中；3-已结束")
     private Integer status;
 
+    @Column(name = "content")
+    @ApiModelProperty("活动图文内容（峰会主题）")
+    private String content;
+
     @Column(name = "act_desc")
-    @ApiModelProperty("活动对象说明（不展示）")
+    @ApiModelProperty("活动对象说明（诚邀莅临）")
     private String actDesc;
 
+    @Column(name = "company_desc")
+    @ApiModelProperty("公司简章")
+    private String companyDesc;
+
+    @Column(name = "vehicle_imgs")
+    @ApiModelProperty("房车介绍")
+    private String vehicleImgs;
+
     @Column(name = "process_json")
     @ApiModelProperty("活动流程")
     private String processJson;

xx-summit/xx-summit-server/src/main/java/com/xxfc/platform/summit/config/WebConfiguration.java

@@ -2,7 +2,7 @@ package com.xxfc.platform.summit.config;
 
 
 import com.github.wxiaoqi.security.common.handler.GlobalExceptionHandler;
-import com.xxfc.platform.summit.interceptor.WeChatH5LoginInterceoptor;
+import com.xxfc.platform.summit.interceptor.WeChatH5LoginInterceptor;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.context.annotation.Primary;
@@ -27,8 +27,8 @@ public class WebConfiguration implements WebMvcConfigurer {
     }
 
     @Bean
-    WeChatH5LoginInterceoptor  getWeChatH5LoginRestInterceptor() {
-        return new WeChatH5LoginInterceoptor();
+    WeChatH5LoginInterceptor getWeChatH5LoginRestInterceptor() {
+        return new WeChatH5LoginInterceptor();
     }
 
     /**
@@ -38,7 +38,7 @@ public class WebConfiguration implements WebMvcConfigurer {
     private ArrayList<String> getIncludePathPatterns() {
         ArrayList<String> list = new ArrayList<>();
         String[] urls = {
-                "/activity/**"
+                "/auth/activity/**"
         };
         Collections.addAll(list, urls);
         return list;

xx-summit/xx-summit-server/src/main/java/com/xxfc/platform/summit/interceptor/WeChatH5LoginInterceoptor.java → xx-summit/xx-summit-server/src/main/java/com/xxfc/platform/summit/interceptor/WeChatH5LoginInterceptor.java

@@ -29,7 +29,7 @@ import java.util.concurrent.TimeUnit;
  *
  */
 @Slf4j
-public class WeChatH5LoginInterceoptor extends HandlerInterceptorAdapter {
+public class WeChatH5LoginInterceptor extends HandlerInterceptorAdapter {
 
 
 	@Autowired