Merge branch 'base-modify' of http://10.5.52.3/youjj/cloud-platform into base-modify

ace-auth/ace-auth-server/src/main/java/com/github/wxiaoqi/security/auth/controller/AuthController.java

@@ -154,12 +154,14 @@ public class AuthController {
         log.info(username+"----require reset...");
         JSONObject data=appAuthService.reset(username,mobilecode,password);
         if(data!=null&&data.getInteger("status")== ResultCode.SUCCESS_CODE){
-            JwtAuthenticationRequest authenticationRequest=new JwtAuthenticationRequest();
-            authenticationRequest.setUsername(username);
-            authenticationRequest.setPassword(password);
-            String token=appAuthService.login(authenticationRequest);
+            JSONObject result=data.getJSONObject("data");
+            if(result==null){
+                data.put("status",1001);
+            }else {
+                String token=appAuthService.getToken(username,result.getInteger("userId"));
                 data.put("token",token);
             }
+        }
         return data;
     }
 

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

@@ -153,7 +153,7 @@ public class AppUserRest {
 
     @RequestMapping(value = "/user/reset", method = RequestMethod.POST)
     public @ResponseBody
-    JSONObject login(
+    JSONObject reset(
             @RequestParam(value="username",defaultValue="")String  username,
             @RequestParam(value="mobilecode",defaultValue="")String mobilecode,
             @RequestParam(value="password",defaultValue="")String  password

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

@@ -532,6 +532,14 @@ public class AppPermissionService {
             Integer userid = user.getId();
             String nickname = SystemConfig.USER_NIKENAME_DEFAULT + (int) ((Math.random() * 9 + 1) * 100000);
             JSONObject data = autoLogin(userid, user.getUsername(), SystemConfig.USER_HEADER_URL_DEFAULT, nickname);
+            // 到im注册，获取返回结果
+            Integer  imUserId=user.getImUserid();
+            String imPassword=user.getImPassword();
+            if(StringUtils.isNotBlank(imPassword)&&imUserId!=null&&imUserId>0){
+                String  access_token=loginIm(username,imPassword,imUserId);
+                data.put("imToken",access_token);
+                data.put("imUserId",imUserId);
+            }
             if (data != null) {
                 return JsonResultUtil.createSuccessResultWithObj(data);
             }

xx-app/xx-app-api/src/main/java/com/xxfc/platform/app/entity/vo/BannerVo.java

+package com.xxfc.platform.app.entity.vo;
+
+import lombok.Data;
+
+/**
+ * @author libin
+ * @version 1.0
+ * @description
+ * @data 2019/6/28 9:34
+ */
+@Data
+public class BannerVo {
+
+
+    /**
+     * 封面地址
+     */
+    private String cover;
+
+    /**
+     * 跳转链接地址
+     */
+    private String url;
+}

xx-app/xx-app-server/src/main/java/com/xxfc/platform/app/biz/BannerBiz.java

@@ -4,10 +4,12 @@ import com.github.wxiaoqi.security.admin.feign.dto.UserDTO;
 import com.github.wxiaoqi.security.common.biz.BaseBiz;
 import com.github.wxiaoqi.security.common.vo.PageDataVO;
 import com.xxfc.platform.app.entity.Banner;
+import com.xxfc.platform.app.entity.vo.BannerVo;
 import com.xxfc.platform.app.mapper.BannerMapper;
 import org.springframework.stereotype.Service;
 
 import java.time.Instant;
+import java.util.ArrayList;
 import java.util.List;
 
 /**
@@ -30,8 +32,16 @@ public class BannerBiz extends BaseBiz<BannerMapper,Banner> {
         this.deleteById(id);
     }*/
 
-    public List<Banner> findBannerList(Integer type) {
-        return  mapper.findBannerListByType(type);
+    public List<BannerVo> findBannerList(Integer type) {
+        List<BannerVo> bannerVos = new ArrayList<>();
+        List<Banner> banners = mapper.findBannerListByType(type);
+        banners.forEach(banner -> {
+            BannerVo bannerVo = new BannerVo();
+            bannerVo.setCover(banner.getCover());
+            banner.setUrl(banner.getUrl());
+            bannerVos.add(bannerVo);
+        });
+        return bannerVos;
     }
 
 /*

xx-app/xx-app-server/src/main/java/com/xxfc/platform/app/rest/BannerController.java

@@ -2,7 +2,7 @@ package com.xxfc.platform.app.rest;
 
 import com.github.wxiaoqi.security.common.msg.ObjectRestResponse;
 import com.xxfc.platform.app.biz.BannerBiz;
-import com.xxfc.platform.app.entity.Banner;
+import com.xxfc.platform.app.entity.vo.BannerVo;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
@@ -33,7 +33,7 @@ public class BannerController {
         if (type==null) {
             return ObjectRestResponse.createDefaultFail();
         }
-        List<Banner> bannerList = bannerBiz.findBannerList(type);
+        List<BannerVo> bannerList = bannerBiz.findBannerList(type);
         return  ObjectRestResponse.succ(bannerList);
     }
 }

xx-campsite/xx-campsite-server/pom.xml

@@ -19,6 +19,17 @@
              <artifactId>xx-campsite-api</artifactId>
              <version>2.0-SNAPSHOT</version>
          </dependency>
+         <dependency>
+             <groupId>com.github.wxiaoqi</groupId>
+             <artifactId>ace-common</artifactId>
+             <version>2.0-SNAPSHOT</version>
+             <scope>compile</scope>
+         </dependency>
+         <!--  <dependency>
+               <groupId>org.mapstruct</groupId>
+               <artifactId>mapstruct-processor</artifactId>
+             <version>1.2.0.Final</version>
+           </dependency>-->
      </dependencies>
     <build>
         <plugins>

xx-campsite/xx-campsite-server/src/main/java/com/xxfc/platform/campsite/biz/CampsiteShopBiz.java

@@ -61,6 +61,7 @@ public class CampsiteShopBiz extends BaseBiz<CampsiteShopMapper,CampsiteShop> {
         campsiteShopPageDataVO.setPageSize(pageDataVO.getPageSize());
         campsiteShopPageDataVO.setPageNum(pageDataVO.getPageNum());
         if (CollectionUtils.isEmpty(campsiteShopPageDTOS)){
+            campsiteShopPageDataVO.setData(new ArrayList<CampsiteShopPageVo>());
             return  campsiteShopPageDataVO;
         }
         if (log.isDebugEnabled()){

xx-campsite/xx-campsite-server/src/main/resources/mapper/CampsiteShopMapper.xml

@@ -51,7 +51,7 @@
     <select id="findAllByHome" resultType="com.github.wxiaoqi.security.common.vo.GoodDataVO">
         select cs.id as `id`,cs.name as `name`,cs.logo as `imgUrl`,cs.province_name as `name1`,cs.longitude,cs.latitude
         FROM `campsite_shop`  cs
-        where cs.sale_state=1
+        where cs.sale_state=1 and cs.is_del=0
         order  by cs.hot desc
         limit #{start,jdbcType=INTEGER},#{size,jdbcType=INTEGER}
     </select>

xx-tour/xx-tour-server/src/main/java/com/xxfc/platform/tour/biz/TourTagBannerBiz.java

@@ -169,4 +169,5 @@ public class TourTagBannerBiz extends BaseBiz<TourTagBannerMapper,TourTagBanner>
         }
         return tourTagBannerDTOS.stream().collect(Collectors.groupingBy(TourTagBannerDTO::getTagId));
     }
+
 }
\ No newline at end of file

xx-tour/xx-tour-server/src/main/java/com/xxfc/platform/tour/rest/TourTagBannerController.java

 package com.xxfc.platform.tour.rest;
 
-import com.github.wxiaoqi.security.common.msg.ListRestResponse;
 import com.github.wxiaoqi.security.common.msg.ObjectRestResponse;
 import com.github.wxiaoqi.security.common.rest.BaseController;
 import com.xxfc.platform.tour.biz.TourTagBannerBiz;
+import com.xxfc.platform.tour.dto.TourTagBannerDTO;
 import com.xxfc.platform.tour.entity.TourTagBanner;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
@@ -16,7 +16,6 @@ public class TourTagBannerController extends BaseController<TourTagBannerBiz,Tou
 
 
     @Autowired
-
     private TourTagBannerBiz tagBannerBiz;
 
     @GetMapping("/app/unauth/findById/{tid}")
@@ -26,7 +25,10 @@ public class TourTagBannerController extends BaseController<TourTagBannerBiz,Tou
         return ObjectRestResponse.succ(tourTagBanners);
     }
 
-
-
+    @GetMapping("/app/unauth/findByType/{type}")
+    public ObjectRestResponse findByType(@PathVariable Integer type) {
+        List<TourTagBannerDTO> tourTagBannerDTOS = tagBannerBiz.findTourTagBannersByTagId(type);
+        return ObjectRestResponse.succ(tourTagBannerDTOS);
+    }
 
 }
\ No newline at end of file

xx-tour/xx-tour-server/src/main/resources/mapper/TourGoodMapper.xml

@@ -84,7 +84,7 @@
           from tour_good g
           LEFT JOIN tour_good_tag tag ON g.id=tag.good_id
         LEFT JOIN tour_tag t ON tag.tag_id=t.id
-         where g.recommend=1
+         where g.recommend=1 and g.status=1 and g.is_del=0
          GROUP BY g.id
         ORDER BY g.rank DESC ,g.id DESC
         limit #{start,jdbcType=INTEGER},#{size,jdbcType=INTEGER}