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

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

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

@@ -2,6 +2,10 @@ package com.github.wxiaoqi.security.admin.rpc.service;
 
 import com.alibaba.fastjson.JSONObject;
 import com.github.wxiaoqi.security.admin.biz.*;
+import com.github.wxiaoqi.security.admin.biz.AppUserBiz;
+import com.github.wxiaoqi.security.admin.biz.AppUserDetailBiz;
+import com.github.wxiaoqi.security.admin.biz.AppUserLoginBiz;
+import com.github.wxiaoqi.security.admin.biz.ElementBiz;
 import com.github.wxiaoqi.security.admin.constant.RedisKey;
 import com.github.wxiaoqi.security.admin.constant.enumerate.UserSourceEnum;
 import com.github.wxiaoqi.security.admin.entity.*;
@@ -29,7 +33,6 @@ import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.web.client.RestTemplate;
-
 import javax.annotation.Resource;
 import java.util.ArrayList;
 import java.util.HashMap;
@@ -814,14 +817,14 @@ public class AppPermissionService {
      */
     public void  setCreateIPInfo(AppUserLogin appUserLogin){
         String crtHost = appUserLogin.getCrtHost();
-        String ipinfo = restTemplate.getForObject(String.format("%s%s", IPCommon.BASE_IP_PARSING_URL, crtHost), String.class);
-        String base_data = JSONObject.parseObject(ipinfo).getString(IPCommon.BASE_DATA);
-        JSONObject ipJsonObject = JSONObject.parseObject(base_data);
-//        Integer provinceCode = ipJsonObject.getInteger(IPCommon.PROVINCE_CODE);
-//        Integer cityCode = ipJsonObject.getInteger(IPCommon.CITY_CODE);
+        String ipAddress = restTemplate.getForObject(String.format("%s%s", IPAddress.BASE_IP_PARSING_URL, crtHost), String.class);
+        String data = JSONObject.parseObject(ipAddress).getString(IPAddress.BASE_DATA);
+        JSONObject ipJsonObject = JSONObject.parseObject(data);
+//        Integer provinceCode = ipJsonObject.getInteger(IPAddress.PROVINCE_CODE);
+//        Integer cityCode = ipJsonObject.getInteger(IPAddress.CITY_CODE);
         //appUserLogin.setProvinceCode(provinceCode);
         //appUserLogin.setCityCode(cityCode);
-        String cityName = ipJsonObject.getString(IPCommon.CITY_NAME);
+        String cityName = ipJsonObject.getString(IPAddress.CITY_NAME);
         RegionDTO regionDTO = regionFeign.getRegionByCityName(cityName);
         if (null!=regionDTO){
             appUserLogin.setProvinceCode(Integer.valueOf(String.valueOf(regionDTO.getParentId())));
@@ -832,9 +835,9 @@ public class AppPermissionService {
     /**
      * @author libin
      * @version 1.0.0
-     * @dec ip返回字段名常量
+     * @dec ip 解析返回的地址信息
      */
-    static class IPCommon{
+    private static class IPAddress{
         public static final String BASE_IP_PARSING_URL="http://ip.taobao.com/service/getIpInfo.php?ip=";
         public static final String BASE_DATA="data";
         public static final String PROVINCE_CODE="region_id";

xx-campsite/xx-campsite-api/src/main/java/com/xxfc/platform/campsite/dto/CampsiteShopDetailDTO.java

@@ -65,4 +65,7 @@ public class CampsiteShopDetailDTO {
     @ApiModelProperty(value = "纬度")
     private Double latitude;
 
+    @ApiModelProperty(value = "电话")
+    private String phone;
+
 }

xx-campsite/xx-campsite-api/src/main/java/com/xxfc/platform/campsite/vo/CampsiteShopDetailVo.java

@@ -89,4 +89,7 @@ public class CampsiteShopDetailVo {
      */
     @ApiModelProperty("轮播图列表")
     private List<CampsiteShopCarouselDetailVo> campsiteShopCarouselDetailVos;
+
+    @ApiModelProperty(value = "電話")
+    private String phone;
 }

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

@@ -26,7 +26,6 @@ import tk.mybatis.spring.annotation.MapperScan;
 @EnableScheduling
 @EnableFeignClients(value = {"com.github.wxiaoqi.security.auth.client.feign", "com.github.wxiaoqi.security.admin.feign","com.xxfc.platform"},defaultConfiguration = HeaderConfig.class)
 @EnableAceCache
-@EnableCaching
 @MapperScan(basePackages = "com.xxfc.platform.campsite.mapper")
 public class CampSiteApplication {
     public static void main(String[] args) {

xx-campsite/xx-campsite-server/src/main/java/com/xxfc/platform/campsite/config/RedisConfiguration.java

@@ -5,9 +5,12 @@ import org.springframework.context.annotation.Configuration;
 import org.springframework.context.annotation.Primary;
 import org.springframework.data.redis.connection.RedisConnectionFactory;
 import org.springframework.data.redis.core.RedisTemplate;
+import org.springframework.data.redis.serializer.Jackson2JsonRedisSerializer;
 import org.springframework.data.redis.serializer.RedisSerializer;
 import org.springframework.data.redis.serializer.StringRedisSerializer;
 
+import java.util.Objects;
+
 /**
  * ${DESCRIPTION}
  *
@@ -19,7 +22,7 @@ import org.springframework.data.redis.serializer.StringRedisSerializer;
 @Primary
 public class RedisConfiguration {
 
-    @Bean
+    @Bean("customRedisTemplate")
     public RedisTemplate<String, Object> customRedisTemplate(RedisConnectionFactory factory) {
         RedisTemplate redisTemplate = new RedisTemplate();
         redisTemplate.setConnectionFactory(factory);
@@ -27,7 +30,7 @@ public class RedisConfiguration {
         redisTemplate.setKeySerializer(stringSerializer);
         redisTemplate.setValueSerializer(stringSerializer);
         redisTemplate.setHashKeySerializer(stringSerializer);
-        redisTemplate.setHashValueSerializer(stringSerializer);
+        redisTemplate.setHashValueSerializer(new Jackson2JsonRedisSerializer<Object>(Object.class));
         redisTemplate.afterPropertiesSet();
         return redisTemplate;
     }

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

@@ -58,7 +58,7 @@
 
     <!--根据id查询详情-->
     <select id="findCampsiteShopDetailById" resultType="com.xxfc.platform.campsite.dto.CampsiteShopDetailDTO">
-        select `name` as `name`,`province_name` as `provinceName`,`city_name` as `cityName`,`address` as `address`,
+        select `name` as `name`,`province_name` as `provinceName`,`city_name` as `cityName`,`address` as `address`,`service_phone` as `phone`,
         `content` as `content`,`configure` as `configure`,`longitude` as `longitude`,`latitude` as `latitude` from `campsite_shop` where `id`=#{id}
     </select>
 

xx-order/xx-order-server/src/main/java/com/xxfc/platform/order/service/OrderRentVehicleService.java

@@ -212,9 +212,6 @@ public class OrderRentVehicleService extends AbstractOrderHandle<OrderRentVehicl
 
         //生成订单明细
         RentVehiclePriceVO rvp = new RentVehiclePriceVO(){{
-            setOrderAmount(orderAmount);
-            setGoodsAmount(goodsAmount);
-            setRealAmount(orderAmount);
             setDeposit(vehicleModel.getDeposit());
             setDriverPrice(DRIVER_PRICE);
             setDamageSafePrice(DAMAGE_SAFE);
@@ -223,6 +220,9 @@ public class OrderRentVehicleService extends AbstractOrderHandle<OrderRentVehicl
             setVehicleNum(1);
             setDriverNum(1);
         }};
+        rvp.setOrderAmount(orderAmount);
+        rvp.setGoodsAmount(goodsAmount);
+        rvp.setRealAmount(orderAmount);
         rvp.setDriverAmount(driverAmount);
         rvp.setVehicleAmount(vehicleAmount);
         rvp.setDamageSafeAmount(damageSafeAmount);

xx-universal/xx-universal-server/src/main/java/com/xxfc/platform/universal/biz/DictionaryBiz.java

@@ -2,6 +2,7 @@ package com.xxfc.platform.universal.biz;
 
 import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.bean.copier.CopyOptions;
+import com.ace.cache.annotation.Cache;
 import com.github.wxiaoqi.security.common.biz.BaseBiz;
 import com.github.wxiaoqi.security.common.msg.ObjectRestResponse;
 import com.google.common.collect.Lists;
@@ -98,6 +99,7 @@ public class DictionaryBiz extends BaseBiz<DictionaryMapper, Dictionary> {
         return dictionaryList;
     }
 
+    //@Cache()
     public Map<String, Dictionary> getAll4Map(){
 //        List<Dictionary> dictionaries = this.getParentCommon(null);
         List<Dictionary> dictionaries = selectListAll();