Merge remote-tracking branch 'origin/base-modify' into base-modify

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

@@ -241,8 +241,8 @@ public class AppPermissionService {
                     userLogin.setUsername(username);
                     appUserLoginBiz.updateSelectiveById(userLogin);
                 }
-                data.put("im_token",access_token);
-                data.put("im_UserId",imUserId);
+                data.put("imToken",access_token);
+                data.put("imUserId",imUserId);
             }
 
             if (data != null) {
@@ -282,7 +282,7 @@ public class AppPermissionService {
             // 返回结果
             // data.put("token", token);
             data.put("username", username);
-            data.put("userid", userid);
+            data.put("userId", userid);
 
         }
         return data;
@@ -366,8 +366,8 @@ public class AppPermissionService {
                     String imPassword=userLogin.getImPassword();
                     if(StringUtils.isNotBlank(imPassword)&&imUserId!=null&&imUserId>0){
                         String  access_token=loginIm(username,imPassword,imUserId);
-                        data.put("im_token",access_token);
-                        data.put("im_UserId",imUserId);
+                        data.put("imToken",access_token);
+                        data.put("imUserId",imUserId);
                     }
                     if (data != null) {
                         return JsonResultUtil.createSuccessResultWithObj(data);
@@ -453,8 +453,8 @@ public class AppPermissionService {
         String imPassword=userLogin.getImPassword();
         if(StringUtils.isNotBlank(imPassword)&&imUserId!=null&&imUserId>0){
             String  access_token=loginIm(userLogin.getUsername(),imPassword,imUserId);
-            data.put("im_token",access_token);
-            data.put("im_UserId",imUserId);
+            data.put("imToken",access_token);
+            data.put("imUserId",imUserId);
         }
         if (data != null) {
             return JsonResultUtil.createSuccessResultWithObj(data);
@@ -495,8 +495,8 @@ public class AppPermissionService {
             String imPassword=user.getImPassword();
             if(StringUtils.isNotBlank(imPassword)&&imUserId!=null&&imUserId>0){
                 String  access_token=loginIm(username,imPassword,imUserId);
-                data.put("im_token",access_token);
-                data.put("im_UserId",imUserId);
+                data.put("imToken",access_token);
+                data.put("imUserId",imUserId);
             }
             if (data != null) {
                 return JsonResultUtil.createSuccessResultWithObj(data);

ace-modules/ace-interface/src/main/java/com/github/wxiaoqi/security/api/vo/config/HeaderConfig.java

@@ -17,8 +17,6 @@ import java.util.Enumeration;
  * @description 设置请求头部信息，防止微服务之间调用请求头部信息丢失
  * @data 2019/6/25 16:22
  */
-@Configuration
-@Component
 public class HeaderConfig implements RequestInterceptor {
 
     @Override

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

@@ -31,10 +31,6 @@ public class BannerBiz extends BaseBiz<BannerMapper,Banner> {
     }*/
 
     public List<Banner> findBannerList(Integer type) {
-        Banner banner = new Banner();
-        banner.setIsDel(0);
-        banner.setType(type);
-        //mapper.findByType(type);
         return  mapper.findBannerListByType(type);
     }
 

xx-im/xx-im-server/src/main/java/com/xxfc/platform/im/biz/UserBiz.java

@@ -75,6 +75,7 @@ public class UserBiz {
         return  baseResponse;
     }
 
+
     /**
      * 登录
      * @param map

xx-tour/xx-tour-api/src/main/java/com/xxfc/platform/tour/dto/GoodSiteDTO.java

@@ -31,7 +31,7 @@ public class GoodSiteDTO {
 
     //分公司id
 	@ApiModelProperty(value = "分公司id")
-	private String companyId;
+	private Integer companyId;
 
 	/**
 	 * 地址-省/直辖市(编码)

xx-tour/xx-tour-api/src/main/java/com/xxfc/platform/tour/entity/TourGoodSite.java

@@ -50,7 +50,7 @@ public class TourGoodSite implements Serializable {
 	 */
 	@Column(name = "company_id")
 	@ApiModelProperty(value = "分公司id")
-	private String companyId;
+	private Integer companyId;
 
 	/**
 	 * 地址-省/直辖市(编码)
@@ -64,7 +64,7 @@ public class TourGoodSite implements Serializable {
 	 */
 	@Column(name = "province_name")
 	@ApiModelProperty("地址-省/直辖市(名称)")
-	private Integer provinceName;
+	private String provinceName;
 
 	/**
 	 * 地址-市(编码)
@@ -78,7 +78,7 @@ public class TourGoodSite implements Serializable {
 	 */
 	@Column(name = "city_name")
 	@ApiModelProperty("地址-市(名称)")
-	private Integer cityName;
+	private String cityName;
 
 	/**
 	 *	出发时间